mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

racing:: made the current version compile without CAP_RACING

This commit is contained in:
Zeno Rogue 2018-11-30 14:47:13 +01:00
parent 28edeea169
commit cd01e6bbf1
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hyper.h
View File

@ -4697,7 +4697,7 @@ bool subscreen_split(reaction_t for_each_subscreen);
#else
namespace racing { static const bool on = false; }
namespace racing { static bool on = false; }
inline bool subscreen_split(reaction_t for_each_subscreen) { return false; }
#endif

4
landlock.cpp
View File

@ -763,7 +763,8 @@ eLand getNewLand(eLand old) {
if(old == laEAir && lchance(old)) return hrand(2) ? laEWater : laEFire;
if(old == laEWater && lchance(old)) return hrand(2) ? laEEarth : laEAir;
if(old == laEFire && lchance(old)) return hrand(2) ? laEEarth : laEAir;
#if CAP_RACING
if(racing::on && old != laElementalWall) {
eLand l = old;
using racing::race_lands;
@ -772,6 +773,7 @@ eLand getNewLand(eLand old) {
if(l == laMirror) l = laCrossroads;
return l;
}
#endif
if(tactic::on && !(tactic::trailer && old == specialland)) return specialland;
if(weirdhyperbolic && specialland != old && specialland != laCrossroads4 && !chaosmode && old != laBarrier) return specialland;

8
system.cpp
View File

@ -112,8 +112,10 @@ void initgame() {
shrand(safetyseed);
firstland = safetyland;
}
#if CAP_RACING
if(racing::on) racing::apply_seed();
#endif
bool use_special_land = do_use_special_land();
@ -1237,7 +1239,8 @@ void switch_game_mode(char switchWhat) {
racing::on = false;
if(!yendor::on) firstland = laIce;
break;
#if CAP_RACING
case rg::racing:
racing::on = !racing::on;
shmup::on = racing::on;
@ -1247,6 +1250,7 @@ void switch_game_mode(char switchWhat) {
chaosmode = false;
princess::challenge = false;
break;
#endif
case rg::tactic:
tactic::on = !tactic::on;