From: Holger Schemel Date: Fri, 1 Sep 2000 17:55:53 +0000 (+0200) Subject: rnd-20000901-1-src X-Git-Tag: 2.0.0^2~45 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=bb2ddcf13df18d69e4472d4697da173981970e9d;p=rocksndiamonds.git rnd-20000901-1-src --- diff --git a/src/events.c b/src/events.c index d7466911..a46f3548 100644 --- a/src/events.c +++ b/src/events.c @@ -619,6 +619,38 @@ void HandleKey(Key key, int key_status) GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay); break; + case KEY_d: + if (options.debug) + { + options.debug = FALSE; + printf("debug mode disabled\n"); + } + else + { + options.debug = TRUE; + printf("debug mode enabled\n"); + } + break; + + case KEY_s: + if (!global.fps_slowdown) + { + global.fps_slowdown = TRUE; + global.fps_slowdown_factor = 2; + printf("fps slowdown enabled -- display only every 2nd frame\n"); + } + else if (global.fps_slowdown_factor == 2) + { + global.fps_slowdown_factor = 4; + printf("fps slowdown enabled -- display only every 4th frame\n"); + } + else + { + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; + printf("fps slowdown disabled\n"); + } + break; #if 0 case KEY_a: diff --git a/src/main.h b/src/main.h index dfec496c..fca22e59 100644 --- a/src/main.h +++ b/src/main.h @@ -445,6 +445,8 @@ struct GameInfo struct GlobalInfo { float frames_per_second; + boolean fps_slowdown; + int fps_slowdown_factor; }; extern Display *display; diff --git a/src/misc.c b/src/misc.c index 90bbe16a..2389f59a 100644 --- a/src/misc.c +++ b/src/misc.c @@ -468,6 +468,8 @@ void GetOptions(char *argv[]) /* initialize some more global variables */ global.frames_per_second = 0; + global.fps_slowdown = FALSE; + global.fps_slowdown_factor = 1; while (*options_left) { diff --git a/src/tools.c b/src/tools.c index d4e42abb..89ad7c74 100644 --- a/src/tools.c +++ b/src/tools.c @@ -99,49 +99,36 @@ void BackToFront() if (!redraw_mask) return; - - - if (1 && game_status == PLAYING) + if (global.fps_slowdown && game_status == PLAYING) { - static boolean last_frame_skipped = 0; - int fps_slowdown_factor = 2; - boolean skip_even_when_not_scrolling = 1; + static boolean last_frame_skipped = FALSE; + boolean skip_even_when_not_scrolling = TRUE; boolean just_scrolling = (ScreenMovDir != 0); - boolean p = 0; - - /* - printf("ScreenMovDir = %d\n", ScreenMovDir); - */ + boolean verbose = FALSE; - /* - printf("ScreenGfxPos = %d\n", ScreenGfxPos); - */ - - if (fps_slowdown_factor > 1 && - (FrameCounter % fps_slowdown_factor) && + if (global.fps_slowdown_factor > 1 && + (FrameCounter % global.fps_slowdown_factor) && (just_scrolling || skip_even_when_not_scrolling)) { redraw_mask &= ~REDRAW_MAIN; - if (p) - printf("FRAME SKIPPED\n"); + last_frame_skipped = TRUE; - last_frame_skipped = 1; + if (verbose) + printf("FRAME SKIPPED\n"); } else { if (last_frame_skipped) redraw_mask |= REDRAW_FIELD; - last_frame_skipped = 0; + last_frame_skipped = FALSE; - if (p) + if (verbose) printf("frame not skipped\n"); } } - - /* synchronize X11 graphics at this point; if we would synchronize the display immediately after the buffer switching (after the XFlush), this could mean that we have to wait for the graphics to complete, @@ -254,8 +241,13 @@ void BackToFront() if (redraw_mask & REDRAW_FPS) /* display frames per second */ { char text[100]; + char info1[100]; + + sprintf(info1, " (only every %d. frame)", global.fps_slowdown_factor); + if (!global.fps_slowdown) + info1[0] = '\0'; - sprintf(text, "%.1f fps", global.frames_per_second); + sprintf(text, "%.1f fps%s", global.frames_per_second, info1); DrawTextExt(window, gc, SX, SY, text, FS_SMALL, FC_YELLOW); }