Makefile: Micropolis build fixes for recent macOS

[micropolis] / src / sim / g_smmaps.c

diff --git a/src/sim/g_smmaps.c b/src/sim/g_smmaps.c
index 84b7a474045623e91eea170d83518dd276a81883..e66ad40a27cd7fc3640595f037ad8e7260866979 100644 (file)
--- a/src/sim/g_smmaps.c
+++ b/src/sim/g_smmaps.c
@@ -295,14 +295,26 @@ void drawPower(SimView *view)
                case 16:
                  { 
                        unsigned short *p;
                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;
                        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;
                        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;
                        image += lineBytes;
                  }
                  break;


@@ -315,12 +327,21 @@ void drawPower(SimView *view)
                          unsigned char *img =
                                image;
                          for (x = 0; x < 4; x++) {
                          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
                          } // for x
                          image += lineBytes;
                        } // for y


@@ -346,29 +367,29 @@ int dynamicFilter(int col, int row)
   c = col >>1;
 
   if (((DynamicData[0] > DynamicData[1]) ||
   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]) ||
       ((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]) ||
       ((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]) ||
       ((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]) ||
       ((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]) ||
       ((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]) ||
       ((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]) ||
       ((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;
     return 1;
   } else {
     return 0;