mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-24 15:00:14 +00:00
Code Issues Releases Wiki Activity

shmup:: no longer ignores frame limit (just sets it to 30)

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-06 21:03:26 +02:00
parent 32bf6e959e
commit 64ad97cf2f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control.cpp
View File

@ -540,6 +540,8 @@ void resize_screen_to(int x, int y) {
setvideomode(); setvideomode();
} }
int lastframe;
void mainloopiter() { void mainloopiter() {
DEBB(DF_GRAPH, ("main loop\n")); DEBB(DF_GRAPH, ("main loop\n"));
@ -553,16 +555,17 @@ void mainloopiter() {
conformal::configure(); conformal::configure();
lastt = ticks;
ticks = SDL_GetTicks(); ticks = SDL_GetTicks();
callhooks(hooks_fixticks); callhooks(hooks_fixticks);
timetowait = lastt + 1000 / cframelimit - ticks; timetowait = lastframe + 1000 / cframelimit - ticks;
cframelimit = vid.framelimit; cframelimit = vid.framelimit;
if(outoffocus && cframelimit > 10) cframelimit = 10; if(outoffocus && cframelimit > 10) cframelimit = 10;
bool normal = cmode & sm::NORMAL; bool normal = cmode & sm::NORMAL;
shmup::turn(ticks - lastt); shmup::turn(ticks - lastt);
if(!shmup::on && (multi::alwaysuse || multi::players > 1) && normal) if(!shmup::on && (multi::alwaysuse || multi::players > 1) && normal)
@ -615,7 +618,7 @@ void mainloopiter() {
if(!outoffocus) { if(!outoffocus) {
drawscreen(); drawscreen();
} }
lastt = ticks; lastframe = ticks;
} }
Uint8 *keystate = SDL_GetKeyState(NULL); Uint8 *keystate = SDL_GetKeyState(NULL);

2
shmup.cpp
View File

@ -3338,8 +3338,6 @@ void turn(int delta) {
return; return;
} }
timetowait = 0;
passive_switch = (gold() & 1) ? moSwitch1 : moSwitch2; passive_switch = (gold() & 1) ? moSwitch1 : moSwitch2;
if(delta > 1000) delta = 1000; if(delta > 1000) delta = 1000;