moved the drawFps call to the backends so it works automatically for

[dosdemo] / src / sdl / main.c

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 6b65796..05744e8 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -3,6 +3,7 @@
 #include <limits.h>
 #include <SDL/SDL.h>
 #include "demo.h"
+#include "tinyfps.h"
 
 static void handle_event(SDL_Event *ev);
 static void toggle_fullscreen(void);
@@ -61,6 +62,7 @@ int main(int argc, char **argv)
 
                time_msec = SDL_GetTicks() - start_time;
                demo_draw();
+               drawFps(fb_pixels);
 
                if(SDL_MUSTLOCK(fbsurf)) {
                        SDL_LockSurface(fbsurf);
@@ -129,10 +131,10 @@ static void handle_event(SDL_Event *ev)
                break;
 
        case SDL_MOUSEBUTTONDOWN:
-               mouse_bmask |= 1 << ev->button.button;
+               mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
                if(0) {
        case SDL_MOUSEBUTTONUP:
-                       mouse_bmask &= ~(1 << ev->button.button);
+                       mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
                }
                mouse_x = ev->button.x / fbscale;
                mouse_y = ev->button.y / fbscale;