Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo

diff --combined src/mike.c
index fda18fe,93b3f21..850c09a
--- 1/src/mike.c
--- 2/src/mike.c
+++ b/src/mike.c
@@@ -121,7 -121,6 +121,7 @@@ static void draw(void
                        *dst++ = src[i + scroll + d];
                }
                src += backgroundW;
 +              disp += backgroundW;
        }
  }
  
@@@ -141,16 -140,18 +141,18 @@@ static void convert32To16(unsigned int 
  /* Scale normal with depth and unpack R component (horizontal component) */
  static void processNormal() {
        int scanline;
-       unsigned int *normalmap = (unsigned int*)background;
-       normalmap += NORMALMAP_SCANLINE * backgroundW;
-       unsigned short *dst = normalmap;
-       displacementMap = (short*)dst;
-       short *dst2 = displacementMap;
        float scale;
        int i;
        int x;
        short maxDisplacement = 0;
        short minDisplacement = 256;
+       unsigned short *dst;
+       short *dst2;
+       unsigned int *normalmap = (unsigned int*)background;
+       normalmap += NORMALMAP_SCANLINE * backgroundW;
+       dst = (unsigned short*)normalmap;
+       displacementMap = (short*)dst;
+       dst2 = displacementMap;
  
        for (scanline = 0; scanline < REFLECTION_HEIGHT; scanline++) {
                scale = 2.0f - (float)scanline / ((float)REFLECTION_HEIGHT - 1);
@@@ -203,4 -204,4 +205,4 @@@ static void updateScrollTables(float dt
                scrollTable[i] += scrollSpeedTable[i] * dt;
                scrollTableRounded[i] = (int)(scrollTable[i] + 0.5f) % scrollModTable[i];
        }
- }
+ }