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

fixed some shmup-related crashes

Browse Source
This commit is contained in:
Zeno Rogue
2018-11-17 19:26:35 +01:00
parent e7b90fdb05
commit d7a235bc8c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system.cpp
View File

@@ -97,6 +97,12 @@ void initgame() {
DEBB(DF_INIT, (debugfile,"initGame\n"));
callhooks(hooks_initgame);
if(!safety) multi::players = vid.scfg.players;
if(multi::players < 1 || multi::players > MAXPLAYER)
multi::players = 1;
multi::whereto[0].d = MD_UNDECIDED;
multi::cpid = 0;
yendor::init(1);
if(safety && safetyseed) {
@@ -160,6 +166,8 @@ void initgame() {
yendor::lastchallenge = yendor::challenge;
if(shmup::on) shmup::init();
yendor::init(2);
clear_euland(specialland);
@@ -180,14 +188,6 @@ void initgame() {
for(int i=0; i<numplayers(); i++) sword::angle[i] = PURE ? 10 : 11;
if(!safety) multi::players = vid.scfg.players;
if(multi::players < 1 || multi::players > MAXPLAYER)
multi::players = 1;
multi::whereto[0].d = MD_UNDECIDED;
multi::cpid = 0;
if(shmup::on) shmup::init();
#if CAP_DAILY
daily::split();
#endif