minor performance improvements, optional mouse, mouse cursor now drawn

[dosdemo] / src / tinyfps.c

diff --git a/src/tinyfps.c b/src/tinyfps.c
index 4c97424..41102e6 100644 (file)
--- a/src/tinyfps.c
+++ b/src/tinyfps.c
@@ -4,9 +4,10 @@
 #include "tinyfps.h"
 #include "demo.h"
 
-// TinyFPS, just a minimal fraps like font to show FPS during the demo and not just after.
-// I'll be using it in my effects for my performance test purposes, just adding it here.
-// Maybe it would be nice if initFpsFonts would be called in demo.c once but I avoided touching that code.
+/* TinyFPS, just a minimal fraps like font to show FPS during the demo and not just after.
+ * I'll be using it in my effects for my performance test purposes, just adding it here.
+ * Maybe it would be nice if initFpsFonts would be called in demo.c once but I avoided touching that code.
+ */
 
 /*
 1110 0010 1110 1110 1010 1110 1110 1110 1110 1110
@@ -47,6 +48,7 @@ void initFpsFonts()
                        }
                }
 
+               i = 0;
                for (n = 0; n < FPS_FONTS_NUM; n++)
                {
                        for (y = 0; y < FPS_FONT_HEIGHT; y++)
@@ -69,7 +71,7 @@ static void drawFont(unsigned char decimal, int posX, int posY, unsigned char zo
 
     unsigned short *fontData = (unsigned short*)&miniDecimalFonts[decimal * FPS_FONT_WIDTH * FPS_FONT_HEIGHT];
 
-       vram += posY * fb_width + posX;
+       vram += posY * FB_WIDTH + posX;
 
        if (zoom < 1) zoom = 1;
        if (zoom > 4) zoom = 4;
@@ -86,13 +88,13 @@ static void drawFont(unsigned char decimal, int posX, int posY, unsigned char zo
                 {
                     for (k=0; k<zoom; k++)
                     {
-                        *(vram + j * fb_width + k) ^= c;
+                        *(vram + j * FB_WIDTH + k) ^= c;
                     }
                 }
             }
             vram += zoom;
         }
-        vram += (-FPS_FONT_WIDTH * zoom + fb_width * zoom);
+        vram += (-FPS_FONT_WIDTH * zoom + FB_WIDTH * zoom);
     }
 }
 
@@ -122,5 +124,7 @@ void drawFps(unsigned short *vram)
                startingFpsTime = time_msec;
                nFrames = 0;
        }
-       drawDecimal(fps, 4, 4, 2, vram);
+       /*drawDecimal(fps, 4, 4, 2, vram);*/
+       /* Moving this on the lower left side of screen for now, since the lack of double buffering generates flickering for this atm */
+       drawDecimal(fps, 4, FB_HEIGHT - 12, 2, vram);
 }