mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 22:12:59 +00:00
Code Issues Releases Wiki Activity

racing:: made the current version compile without CAP_RACING

Browse Source
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
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 #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; } inline bool subscreen_split(reaction_t for_each_subscreen) { return false; }
#endif #endif

2
landlock.cpp
View File

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

4
system.cpp
View File

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