TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge commit 'Re-enable debug breaks' into unification/master

Browse source 
Requested by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/18
This commit is contained in:
Kp 2014-12-07 23:56:01 +00:00
parent 33c118f999 5d6e6dc2e4
commit d5dcfd24bc
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
similar/arch/sdl/timer.cpp
View file

@ -55,7 +55,8 @@ void timer_delay2(int fps)
while (FrameLoop < 1000u/(GameCfg.VSync?MAXIMUM_FPS:fps))
{
u_int32_t tv_now = SDL_GetTicks();
multi_do_frame(); // during long wait, keep packets flowing
if (Game_mode & GM_MULTI)
multi_do_frame(); // during long wait, keep packets flowing
if (FrameStart > tv_now)
FrameStart = tv_now;
if (!GameCfg.VSync)

3
similar/main/automap.cpp
View file

@ -611,7 +611,8 @@ static void draw_automap(automap *am)
am->t2 = timer_query();
while (am->t2 - am->t1 < F1_0 / (GameCfg.VSync?MAXIMUM_FPS:GameArg.SysMaxFPS)) // ogl is fast enough that the automap can read the input too fast and you start to turn really slow. So delay a bit (and free up some cpu :)
{
multi_do_frame(); // during long wait, keep packets flowing
if (Game_mode & GM_MULTI)
multi_do_frame(); // during long wait, keep packets flowing
if (!GameArg.SysNoNiceFPS && !GameCfg.VSync)
timer_delay(F1_0>>8);
timer_update();

3
similar/main/game.cpp
View file

@ -404,7 +404,8 @@ void calc_frame_time()
while (FrameTime < f1_0 / (GameCfg.VSync?MAXIMUM_FPS:GameArg.SysMaxFPS))
{
multi_do_frame(); // during long wait, keep packets flowing
if (Game_mode & GM_MULTI)
multi_do_frame(); // during long wait, keep packets flowing
if (!GameArg.SysNoNiceFPS && !GameCfg.VSync)
timer_delay(F1_0>>8);
timer_update();