From 3a8a5a6150d6bdd8c72d751c1e589cb80189a1c6 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 24 Jan 2019 14:50:36 +0100 Subject: [PATCH] fixed missing CAP_RACING guards --- config.cpp | 2 ++ graph.cpp | 2 ++ hud.cpp | 4 ++++ sysconfig.h | 8 ++------ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config.cpp b/config.cpp index e2a83d38..9597b8ff 100644 --- a/config.cpp +++ b/config.cpp @@ -348,6 +348,7 @@ void initConfig() { addsaver(vid.consider_shader_projection, "shader-projection", true); +#if CAP_RACING addsaver(racing::race_advance, "race_advance"); addsaver(racing::race_angle, "race_angle"); addsaver(racing::ghosts_to_show, "race_ghosts_to_show"); @@ -355,6 +356,7 @@ void initConfig() { addsaver(racing::guiding, "race_guiding"); addsaver(racing::player_relative, "race_player_relative"); addsaver(racing::standard_centering, "race_standard_centering"); +#endif #if CAP_SHMUP shmup::initConfig(); diff --git a/graph.cpp b/graph.cpp index e5b9324a..44443f26 100644 --- a/graph.cpp +++ b/graph.cpp @@ -931,8 +931,10 @@ bool drawMonsterType(eMonster m, cell *where, const transmatrix& V, color_t col, if(peace::on) ; else if(racing::on) { +#if CAP_RACING if(racing::trophy[multi::cpid]) queuepoly(VWPN, shTrophy, racing::trophy[multi::cpid]); +#endif } else if(items[itOrbThorns]) queuepoly(VWPN, shHedgehogBladePlayer, items[itOrbDiscord] ? watercolor(0) : 0x00FF00FF); diff --git a/hud.cpp b/hud.cpp index b0f11579..707877f2 100644 --- a/hud.cpp +++ b/hud.cpp @@ -374,7 +374,11 @@ void drawStats() { } if(racing::on) +#if CAP_RACING racing::drawStats(); +#else + {} +#endif else if(vid.xres > vid.yres * 85/100 && vid.yres > vid.xres * 85/100) { int bycorner[4]; for(int u=0; u<4; u++) bycorner[u] = 0; diff --git a/sysconfig.h b/sysconfig.h index 78d417ab..6989cf6f 100644 --- a/sysconfig.h +++ b/sysconfig.h @@ -249,16 +249,12 @@ #define CAP_SHMUP_GOOD (!ISMOBWEB) #endif -#ifndef CAP_BONUS -#define CAP_BONUS 1 -#endif - #ifndef CAP_COMPLEX2 -#define CAP_COMPLEX2 CAP_BONUS +#define CAP_COMPLEX2 1 #endif #ifndef CAP_RACING -#define CAP_RACING CAP_BONUS +#define CAP_RACING (!ISMOBWEB) #endif #if ISMOBILE