mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-14 17:29:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue 2024-02-21 10:25:29 +01:00
commit 9a590ecc42
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
help.cpp
View File

@ -881,6 +881,7 @@ EX void describeMouseover() {
if(shmup::on) if(shmup::on)
out += " (" + its(c->landparam)+")"; out += " (" + its(c->landparam)+")";
else { else {
calcTidalPhase();
bool b = c->landparam >= tide[(turncount-1) % tidalsize]; bool b = c->landparam >= tide[(turncount-1) % tidalsize];
int t = 1; int t = 1;
for(; t < 1000 && b == (c->landparam >= tide[(turncount+t-1) % tidalsize]); t++) ; for(; t < 1000 && b == (c->landparam >= tide[(turncount+t-1) % tidalsize]); t++) ;

5
system.cpp
View File

@ -443,7 +443,7 @@ EX namespace scores {
/** \brief the amount of boxes reserved for each hr::score item */ /** \brief the amount of boxes reserved for each hr::score item */
#define MAXBOX 500 #define MAXBOX 500
/** \brief currently used boxes in hr::score */ /** \brief currently used boxes in hr::score */
#define POSSCORE 408 #define POSSCORE 410
/** \brief a struct to keep local score from an earlier game */ /** \brief a struct to keep local score from an earlier game */
struct score { struct score {
/** \brief version used */ /** \brief version used */
@ -941,6 +941,9 @@ EX void applyBoxes() {
applyBoxEnum(bow::weapon, "weapon choice"); applyBoxEnum(bow::weapon, "weapon choice");
applyBoxEnum(bow::style, "crossbow style"); applyBoxEnum(bow::style, "crossbow style");
applyBoxOrb(itOrbFish);
list_invorb();
if(POSSCORE != boxid) printf("ERROR: %d boxes\n", boxid); if(POSSCORE != boxid) printf("ERROR: %d boxes\n", boxid);
if(isize(invorb)) { println(hlog, "ERROR: Orbs not taken into account"); exit(1); } if(isize(invorb)) { println(hlog, "ERROR: Orbs not taken into account"); exit(1); }
} }