X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/blobdiff_plain/efad9d6d0b164bd37c84a9581dbf6397c7ffb3fa..34e37af786a9743ebe7bd76a518911affb9db72b:/src/sim/g_smmaps.c?ds=sidebyside

diff --git a/src/sim/g_smmaps.c b/src/sim/g_smmaps.c
index 4ca499a..e66ad40 100644
--- a/src/sim/g_smmaps.c
+++ b/src/sim/g_smmaps.c
@@ -142,9 +142,9 @@ int DynamicData[32];
 #define BE_ROW3_32 BE_ROW1_32(0) BE_ROW1_32(1) BE_ROW1_32(2)
 
 #define ROW3_8 if (view->x->needs_swap) { BE_ROW3_8 } else { LE_ROW3_8 }
-#define ROW3_16 if (view->x->needs_swap) { BE_ROW3_16 } else { LE_ROW3_16 }
-#define ROW3_24 if (view->x->needs_swap) { BE_ROW3_24 } else { LE_ROW3_24 }
-#define ROW3_32 if (view->x->needs_swap) { BE_ROW3_32 } else { LE_ROW3_32 }
+#define ROW3_16 LE_ROW3_16
+#define ROW3_24 LE_ROW3_24
+#define ROW3_32 LE_ROW3_32
 
 #define ROW3 \
 	  switch (view->x->depth) { \
@@ -295,14 +295,26 @@ void drawPower(SimView *view)
 		case 16:
 		  { 
 			unsigned short *p;
-			p = (short *)image;
-			p[0] = p[1] = p[2] = pix;
+			p = (unsigned short *)image;
+			if (view->x->x_big_endian) {
+			  p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+			} else {
+			  p[0] = p[1] = p[2] = pix;
+			}
 			image += lineBytes;
-			p = (short *)image;
-			p[0] = p[1] = p[2] = pix;
+			p = (unsigned short *)image;
+			if (view->x->x_big_endian) {
+			  p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+			} else {
+			  p[0] = p[1] = p[2] = pix;
+			}
 			image += lineBytes;
-			p = (short *)image;
-			p[0] = p[1] = p[2] = pix;
+			p = (unsigned short *)image;
+			if (view->x->x_big_endian) {
+			  p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+			} else {
+			  p[0] = p[1] = p[2] = pix;
+			}
 			image += lineBytes;
 		  }
 		  break;
@@ -315,12 +327,21 @@ void drawPower(SimView *view)
 			  unsigned char *img =
 				image;
 			  for (x = 0; x < 4; x++) {
-				*(img++) = (pix >> 0) & 0xff;
-				*(img++) = (pix >> 8) & 0xff;
-				*(img++) = (pix >> 16) & 0xff;
-				if (pixelBytes == 4) {
-				  img++;
-				} // if
+			  	if (view->x->x_big_endian) {
+				  if (pixelBytes == 4) {
+				    img++;
+				  } // if
+				  *(img++) = (pix >> 16) & 0xff;
+				  *(img++) = (pix >> 8) & 0xff;
+				  *(img++) = (pix >> 0) & 0xff;
+				} else {
+				  *(img++) = (pix >> 0) & 0xff;
+				  *(img++) = (pix >> 8) & 0xff;
+				  *(img++) = (pix >> 16) & 0xff;
+				  if (pixelBytes == 4) {
+				    img++;
+				  } // if
+				}
 			  } // for x
 			  image += lineBytes;
 			} // for y
@@ -346,29 +367,29 @@ int dynamicFilter(int col, int row)
   c = col >>1;
 
   if (((DynamicData[0] > DynamicData[1]) ||
-       ((x = PopDensity[c][r])			>= DynamicData[0]) &&
-       (x								<= DynamicData[1])) &&
+       (((x = PopDensity[c][r])			>= DynamicData[0]) &&
+       (x								<= DynamicData[1]))) &&
       ((DynamicData[2] > DynamicData[3]) ||
-       ((x = RateOGMem[c>>2][r>>2])		>= ((2 * DynamicData[2]) - 256)) &&
-       (x								<= ((2 * DynamicData[3]) - 256))) &&
+       (((x = RateOGMem[c>>2][r>>2])		>= ((2 * DynamicData[2]) - 256)) &&
+       (x								<= ((2 * DynamicData[3]) - 256)))) &&
       ((DynamicData[4] > DynamicData[5]) ||
-       ((x = TrfDensity[c][r])			>= DynamicData[4]) &&
-       (x								<= DynamicData[5])) &&
+       (((x = TrfDensity[c][r])			>= DynamicData[4]) &&
+       (x								<= DynamicData[5]))) &&
       ((DynamicData[6] > DynamicData[7]) ||
-       ((x = PollutionMem[c][r])		>= DynamicData[6]) &&
-       (x								<= DynamicData[7])) &&
+       (((x = PollutionMem[c][r])		>= DynamicData[6]) &&
+       (x								<= DynamicData[7]))) &&
       ((DynamicData[8] > DynamicData[9]) ||
-       ((x = CrimeMem[c][r])			>= DynamicData[8]) &&
-       (x								<= DynamicData[9])) &&
+       (((x = CrimeMem[c][r])			>= DynamicData[8]) &&
+       (x								<= DynamicData[9]))) &&
       ((DynamicData[10] > DynamicData[11]) ||
-       ((x = LandValueMem[c][r])		>= DynamicData[10]) &&
-       (x								<= DynamicData[11])) &&
+       (((x = LandValueMem[c][r])		>= DynamicData[10]) &&
+       (x								<= DynamicData[11]))) &&
       ((DynamicData[12] > DynamicData[13]) ||
-       ((x = PoliceMapEffect[c>>2][r>>2]) >= DynamicData[12]) &&
-       (x								<= DynamicData[13])) &&
+       (((x = PoliceMapEffect[c>>2][r>>2]) >= DynamicData[12]) &&
+       (x								<= DynamicData[13]))) &&
       ((DynamicData[14] > DynamicData[15]) ||
-       ((x = FireRate[c>>2][r>>2])		>= DynamicData[14]) &&
-       (x								<= DynamicData[15]))) {
+       (((x = FireRate[c>>2][r>>2])		>= DynamicData[14]) &&
+       (x								<= DynamicData[15])))) {
     return 1;
   } else {
     return 0;