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

added some declarations to hyper.h

Browse Source
This commit is contained in:
Zeno Rogue 2018-01-14 21:21:32 +01:00
parent a1b7226837
commit 7859455bfb
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.cpp
View File

@ -344,7 +344,7 @@ bool inSpecialMode() {
vid.wallmode != DEFAULT_WALLMODE; vid.wallmode != DEFAULT_WALLMODE;
} }
void resetModes(char leave = 'c') { void resetModes(char leave) {
popAllGames(); popAllGames();
firstland = laIce; vid.scfg.players = 1; firstland = laIce; vid.scfg.players = 1;
if(shmup::on != (leave == 's')) restartGame('s'); if(shmup::on != (leave == 's')) restartGame('s');

24
hyper.h
View File

@ -742,6 +742,7 @@ namespace rug {
extern bool rendernogl; extern bool rendernogl;
extern int texturesize; extern int texturesize;
extern ld model_distance; extern ld model_distance;
extern transmatrix currentrot;
#if CAP_RUG #if CAP_RUG
void show(); void show();
void init(); void init();
@ -1107,6 +1108,11 @@ bool checkOrb(eMonster m1, eItem orb);
movedir vectodir(const hyperpoint& P); movedir vectodir(const hyperpoint& P);
namespace tortoise {
extern int seekbits;
int getRandomBits();
}
namespace sword { namespace sword {
extern int angle[MAXPLAYER]; extern int angle[MAXPLAYER];
@ -1166,6 +1172,7 @@ namespace dialog {
void addSelItem(string body, string value, int key); void addSelItem(string body, string value, int key);
void addBoolItem(string body, bool 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 addColorItem(string body, int value, int key);
void openColorDialog(unsigned int& col, unsigned int *pal = palette); void openColorDialog(unsigned int& col, unsigned int *pal = palette);
void addHelp(string body); void addHelp(string body);
@ -2458,3 +2465,20 @@ template<class T> void hrandom_shuffle(T* x, int n) {
for(int k=1; k<n; k++) swap(x[k], x[hrand(k+1)]); for(int k=1; k<n; k++) swap(x[k], x[hrand(k+1)]);
} }
void resetModes(char leave = 'c');
void activateSafety(eLand l);
void showMainMenu();
extern bool nomenukey;
void resetConfig();
void welcomeMessage();
void jumpTo(cell *dest, eItem byWhat, int bonuskill = 0, eMonster dashmon = moNone);
extern bool canmove;
void activateSafety(eLand l);
extern bool childbug;
void fullcenter();
void mainloop();
void clearAnimations();
transmatrix rotmatrix(double rotation, int c0, int c1);

2
orbs.cpp
View File

@ -567,7 +567,7 @@ void teleportTo(cell *dest) {
checkmoveO(); checkmoveO();
} }
void jumpTo(cell *dest, eItem byWhat, int bonuskill = 0, eMonster dashmon = moNone) { void jumpTo(cell *dest, eItem byWhat, int bonuskill, eMonster dashmon) {
if(byWhat != itStrongWind) playSound(dest, "orb-frog"); if(byWhat != itStrongWind) playSound(dest, "orb-frog");
movecost(cwt.c, dest); movecost(cwt.c, dest);