fixing C compatibility problems

diff --git a/Makefile b/Makefile
index e22c1fa..810d2ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 baseobj = main.obj
 demoobj = demo.obj screen.obj gfxutil.obj 3dgfx.obj polyfill.obj
 baseobj = main.obj
 demoobj = demo.obj screen.obj gfxutil.obj 3dgfx.obj polyfill.obj

-scrobj = tunnel.obj fract.obj grise.obj polytest.obj
-sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
+scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.obj
+sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj tinyfps.obj

 obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
 bin = demo.exe
 
 obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
 bin = demo.exe
 

diff --git a/src/grise.c b/src/grise.c
index 9226cc6..543b51e 100644 (file)
--- a/src/grise.c
+++ b/src/grise.c
@@ -496,6 +496,7 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride,
        unsigned int *output32;
        unsigned char *input;
        int scanlineCounter = 0;
        unsigned int *output32;
        unsigned char *input;
        int scanlineCounter = 0;

+       int scaleXFixed;

        static unsigned char scan[512];
 
        int blitW = (int)(bitmap->w * scaleX + 0.5f);
        static unsigned char scan[512];
 
        int blitW = (int)(bitmap->w * scaleX + 0.5f);

@@ -504,8 +505,8 @@ static void rleBlitScale(unsigned short *dst, int dstW, int dstH, int dstStride,
        /* From this point on, scaleY will be inverted */
        scaleY = 1.0f / scaleY;
 
        /* From this point on, scaleY will be inverted */
        scaleY = 1.0f / scaleY;
 

-       int scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f);
-       
+       scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f);
+

        dst += blitX + blitY * dstStride;
 
        for (scanline = blitY; scanline < blitY + blitH; scanline++) {
        dst += blitX + blitY * dstStride;
 
        for (scanline = blitY; scanline < blitY + blitH; scanline++) {

@@ -556,6 +557,7 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri
        unsigned int *output32;
        unsigned char *input;
        int scanlineCounter = 0;
        unsigned int *output32;
        unsigned char *input;
        int scanlineCounter = 0;

+       int scaleXFixed;

        static unsigned char scan[512];
 
        int blitW = (int)(bitmap->w * scaleX + 0.5f);
        static unsigned char scan[512];
 
        int blitW = (int)(bitmap->w * scaleX + 0.5f);

@@ -564,7 +566,7 @@ static void rleBlitScaleInv(unsigned short *dst, int dstW, int dstH, int dstStri
        /* From this point on, scaleY will be inverted */
        scaleY = 1.0f / scaleY;
 
        /* From this point on, scaleY will be inverted */
        scaleY = 1.0f / scaleY;
 

-       int scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f);
+       scaleXFixed = (int)(scaleX * (float)(1 << RLE_FIXED_BITS) + 0.5f);

 
        dst += blitX + blitY * dstStride;
 
 
        dst += blitX + blitY * dstStride;
 

diff --git a/src/tinyfps.c b/src/tinyfps.c
index 4b9d9db..4c97424 100644 (file)
--- a/src/tinyfps.c
+++ b/src/tinyfps.c
@@ -1,3 +1,4 @@
+#include <stdio.h>

 #include <stdlib.h>
 
 #include "tinyfps.h"
 #include <stdlib.h>
 
 #include "tinyfps.h"

@@ -15,29 +16,30 @@
 1110 0010 1110 1110 0010 1110 1110 0010 1110 1110
 */
 
 1110 0010 1110 1110 0010 1110 1110 0010 1110 1110
 */
 

-const unsigned char miniDecimalData[] = { 0xE2, 0xEE, 0xAE, 0xEE, 0xEE,
+static const unsigned char miniDecimalData[] = { 0xE2, 0xEE, 0xAE, 0xEE, 0xEE,

 0xA2, 0x22, 0xA8, 0x82, 0xAA,
 0xA2, 0xE6, 0xEE, 0xE2, 0xEE,
 0xA2, 0x82, 0x22, 0xA2, 0xA2,
 0xE2, 0xEE, 0x2E, 0xE2, 0xEE };
 
 0xA2, 0x22, 0xA8, 0x82, 0xAA,
 0xA2, 0xE6, 0xEE, 0xE2, 0xEE,
 0xA2, 0x82, 0x22, 0xA2, 0xA2,
 0xE2, 0xEE, 0x2E, 0xE2, 0xEE };
 

-unsigned short miniDecimalFonts[FPS_FONT_NUM_PIXELS];
+static unsigned short miniDecimalFonts[FPS_FONT_NUM_PIXELS];

 
 

-unsigned long startingFpsTime = 0;
-int fpsFontsInit = 0;
-int nFrames = 0;
+static unsigned long startingFpsTime = 0;
+static int fpsFontsInit = 0;
+static int nFrames = 0;

 
 void initFpsFonts()
 {
        if (fpsFontsInit == 0)
        {
                unsigned char miniDecimalPixels[FPS_FONT_NUM_PIXELS];
 
 void initFpsFonts()
 {
        if (fpsFontsInit == 0)
        {
                unsigned char miniDecimalPixels[FPS_FONT_NUM_PIXELS];

+               int i, j, k = 0;
+               int x, y, n;

 
 

-               int k = 0;
-               for (int i = 0; i < FPS_FONT_NUM_PIXELS / 8; i++)
+               for (i = 0; i < FPS_FONT_NUM_PIXELS / 8; i++)

                {
                        unsigned char d = miniDecimalData[i];
                {
                        unsigned char d = miniDecimalData[i];

-                       for (int j = 0; j < 8; j++)
+                       for (j = 0; j < 8; j++)

                        {
                                unsigned char c = (d & 0x80) >> 7;
                                miniDecimalPixels[k++] = c;
                        {
                                unsigned char c = (d & 0x80) >> 7;
                                miniDecimalPixels[k++] = c;

@@ -45,12 +47,11 @@ void initFpsFonts()
                        }
                }
 
                        }
                }
 

-               int i = 0;
-               for (int n = 0; n < FPS_FONTS_NUM; n++)
+               for (n = 0; n < FPS_FONTS_NUM; n++)

                {
                {

-                       for (int y = 0; y < FPS_FONT_HEIGHT; y++)
+                       for (y = 0; y < FPS_FONT_HEIGHT; y++)

                        {
                        {

-                               for (int x = 0; x < FPS_FONT_WIDTH; x++)
+                               for (x = 0; x < FPS_FONT_WIDTH; x++)

                                {
                                        miniDecimalFonts[i++] = miniDecimalPixels[n * FPS_FONT_WIDTH + x + y * FPS_FONT_WIDTH * FPS_FONTS_NUM] * 0xFFFF;
                                }
                                {
                                        miniDecimalFonts[i++] = miniDecimalPixels[n * FPS_FONT_WIDTH + x + y * FPS_FONT_WIDTH * FPS_FONTS_NUM] * 0xFFFF;
                                }

@@ -61,7 +62,7 @@ void initFpsFonts()
        }
 }
 
        }
 }
 

-void drawFont(unsigned char decimal, int posX, int posY, unsigned char zoom, unsigned short *vram)
+static void drawFont(unsigned char decimal, int posX, int posY, unsigned char zoom, unsigned short *vram)

 {
        int x, y, j, k;
        unsigned short c;
 {
        int x, y, j, k;
        unsigned short c;

@@ -95,12 +96,12 @@ void drawFont(unsigned char decimal, int posX, int posY, unsigned char zoom, uns
     }
 }
 
     }
 }
 

-void drawDecimal(unsigned int number, int posX, int posY, unsigned char zoom, unsigned short *vram)
+static void drawDecimal(unsigned int number, int posX, int posY, unsigned char zoom, unsigned short *vram)

 {
        int i = 0;
     char buffer[8];
 
 {
        int i = 0;
     char buffer[8];
 

-    itoa(number, buffer, 10);
+       sprintf(buffer, "%d", number);

 
        while(i < 8 && buffer[i] != 0)
     {
 
        while(i < 8 && buffer[i] != 0)
     {