racing:: made the current version compile without CAP_RACING
This commit is contained in:
parent
28edeea169
commit
cd01e6bbf1
2
hyper.h
2
hyper.h
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -763,7 +763,8 @@ eLand getNewLand(eLand old) {
|
||||||
if(old == laEAir && lchance(old)) return hrand(2) ? laEWater : laEFire;
|
if(old == laEAir && lchance(old)) return hrand(2) ? laEWater : laEFire;
|
||||||
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;
|
||||||
|
|
|
@ -112,8 +112,10 @@ void initgame() {
|
||||||
shrand(safetyseed);
|
shrand(safetyseed);
|
||||||
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();
|
||||||
|
|
||||||
|
@ -1237,7 +1239,8 @@ void switch_game_mode(char switchWhat) {
|
||||||
racing::on = false;
|
racing::on = false;
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue