more big endian fixes (overlays on minimaps)

[micropolis] / src / sim / g_map.c

diff --git a/src/sim/g_map.c b/src/sim/g_map.c
index 87c7e273b1c508c041e40b11de5ed4422e98d282..667cfae5000a2344eecad485c896c51a55265f7c 100644 (file)
--- a/src/sim/g_map.c
+++ b/src/sim/g_map.c
@@ -406,25 +406,15 @@ drawRect(SimView *view, int pixel, int solid,
        unsigned char *image = 
          &data[(line * y) + (x * pixelBytes)];
 
-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (solid || stipple++ & 1)
              *image = pixel;
-             image++;
-           }
-           image += line - w;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             if (stipple++ & 1)
-               *image = pixel;
-             image++;
-           }
-           if (!(w & 1))
-             stipple++;
-           image += line - w;
+           image++;
          }
+         if (!(w & 1))
+           stipple++;
+         image += line - w;
        }
       }
       break;
@@ -438,26 +428,22 @@ drawRect(SimView *view, int pixel, int solid,
        image = 
          &data[(line * y) + x];
 
-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             *image = pixel;
-             image++;
-           }
-           image += line - w;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             if (stipple++ & 1)
-               *image = pixel;
-             image++;
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (solid || stipple++ & 1) {
+             if (view->x->x_big_endian) {
+               *image = ((pixel & 0xff) << 8) | ((pixel & 0xff00) >> 8);
+             } else {
+               *image = pixel;
+             }
            }
-           if (!(w & 1))
-             stipple++;
-           image += line - w;
+           image++;
          }
+         if (!(w & 1))
+           stipple++;
+         image += line - w;
        }
+
       }
       break;
 
@@ -470,37 +456,36 @@ drawRect(SimView *view, int pixel, int solid,
        image = 
          &data[(line * y) + x * pixelBytes];
 
-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             *(image++) = (pixel >> 0) & 0xff;
-             *(image++) = (pixel >> 8) & 0xff;
-             *(image++) = (pixel >> 16) & 0xff;
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (view->x->x_big_endian) {
              if (pixelBytes == 4) {
                image++;
              }
-           }
-           image += line - w * pixelBytes;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
+             if (solid || stipple++ & 1) {
+               *(image++) = (pixel >> 16) & 0xff;
+               *(image++) = (pixel >> 8) & 0xff;
+               *(image++) = (pixel >> 0) & 0xff;
+             } else {
+               image += 3;
+             }
+           } else {
              if (stipple++ & 1) {
-               *(image++) = (pixel >> 0) & 0xff;
-               *(image++) = (pixel >> 8) & 0xff;
-               *(image++) = (pixel >> 16) & 0xff;
+               *(image++) = (pixel >> 0) & 0xff;
+               *(image++) = (pixel >> 8) & 0xff;
+               *(image++) = (pixel >> 16) & 0xff;
              } else {
                image += 3;
              }
              if (pixelBytes == 4) {
-               image++;
+               image++;
              }
            }
-           if (!(w & 1)) {
-             stipple++;
-           }
-           image += line - w * pixelBytes;
          }
+         if (!(w & 1)) {
+           stipple++;
+         }
+         image += line - w * pixelBytes;
        }
       }
       break;