diff --git a/config.cpp b/config.cpp index 38e428dd..f98c57c7 100644 --- a/config.cpp +++ b/config.cpp @@ -344,7 +344,7 @@ bool inSpecialMode() { vid.wallmode != DEFAULT_WALLMODE; } -void resetModes(char leave = 'c') { +void resetModes(char leave) { popAllGames(); firstland = laIce; vid.scfg.players = 1; if(shmup::on != (leave == 's')) restartGame('s'); diff --git a/hyper.h b/hyper.h index 013d4a92..43223022 100644 --- a/hyper.h +++ b/hyper.h @@ -742,6 +742,7 @@ namespace rug { extern bool rendernogl; extern int texturesize; extern ld model_distance; + extern transmatrix currentrot; #if CAP_RUG void show(); void init(); @@ -1107,6 +1108,11 @@ bool checkOrb(eMonster m1, eItem orb); movedir vectodir(const hyperpoint& P); +namespace tortoise { + extern int seekbits; + int getRandomBits(); + } + namespace sword { extern int angle[MAXPLAYER]; @@ -1166,6 +1172,7 @@ namespace dialog { void addSelItem(string body, string value, int key); void addBoolItem(string body, bool value, int key); + void addBigItem(string body, int key); void addColorItem(string body, int value, int key); void openColorDialog(unsigned int& col, unsigned int *pal = palette); void addHelp(string body); @@ -2457,4 +2464,21 @@ eMonster genRuinMonster(cell *c); template void hrandom_shuffle(T* x, int n) { for(int k=1; k