mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 15:40:26 +00:00
Code Issues Releases Wiki Activity

racing:: failure now uses gamegen_failure flag -- no more game starting multiple times

Browse Source
This commit is contained in:
Zeno Rogue 2018-12-04 19:16:39 +01:00
parent cd01e6bbf1
commit 04f26cdf1d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
racing.cpp
View File

@ -206,9 +206,8 @@ void generate_track() {
traversed++;
if(cellbydist.empty()) {
printf("reset after traversing %d\n", traversed);
stop_game();
race_try++;
start_game();
gamegen_failure = true;
return;
}
auto it = cellbydist.end();
@ -435,9 +434,8 @@ void generate_track() {
}
if(!goal) {
printf("error: goal unreachable\n");
stop_game();
gamegen_failure = true;
race_try++;
start_game();
return;
}
}

10
system.cpp
View File

@ -22,6 +22,8 @@ bool timerstopped;
int savecount;
bool showoff = false, doCross = false;
bool gamegen_failure;
eLand top_land;
bool verless(string v, string cmp) {
@ -98,6 +100,7 @@ hookset<void()> *hooks_initgame;
// initialize the game
void initgame() {
restart:
DEBB(DF_INIT, (debugfile,"initGame\n"));
callhooks(hooks_initgame);
@ -105,6 +108,8 @@ void initgame() {
multi::players = 1;
multi::whereto[0].d = MD_UNDECIDED;
multi::cpid = 0;
gamegen_failure = false;
yendor::init(1);
@ -183,6 +188,11 @@ void initgame() {
if(racing::on) racing::generate_track();
#endif
if(gamegen_failure) {
stop_game();
goto restart;
}
clear_euland(specialland);
if(euclid && specialland == laPrincessQuest) {