Merge commit 'Re-enable debug breaks' into unification/master
Requested by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/18
This commit is contained in:
commit
d5dcfd24bc
|
@ -55,7 +55,8 @@ void timer_delay2(int fps)
|
||||||
while (FrameLoop < 1000u/(GameCfg.VSync?MAXIMUM_FPS:fps))
|
while (FrameLoop < 1000u/(GameCfg.VSync?MAXIMUM_FPS:fps))
|
||||||
{
|
{
|
||||||
u_int32_t tv_now = SDL_GetTicks();
|
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)
|
if (FrameStart > tv_now)
|
||||||
FrameStart = tv_now;
|
FrameStart = tv_now;
|
||||||
if (!GameCfg.VSync)
|
if (!GameCfg.VSync)
|
||||||
|
|
|
@ -611,7 +611,8 @@ static void draw_automap(automap *am)
|
||||||
am->t2 = timer_query();
|
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 :)
|
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)
|
if (!GameArg.SysNoNiceFPS && !GameCfg.VSync)
|
||||||
timer_delay(F1_0>>8);
|
timer_delay(F1_0>>8);
|
||||||
timer_update();
|
timer_update();
|
||||||
|
|
|
@ -404,7 +404,8 @@ void calc_frame_time()
|
||||||
|
|
||||||
while (FrameTime < f1_0 / (GameCfg.VSync?MAXIMUM_FPS:GameArg.SysMaxFPS))
|
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)
|
if (!GameArg.SysNoNiceFPS && !GameCfg.VSync)
|
||||||
timer_delay(F1_0>>8);
|
timer_delay(F1_0>>8);
|
||||||
timer_update();
|
timer_update();
|
||||||
|
|
Loading…
Reference in a new issue