From de9e25d5b394fd0f2e6bc71384671df8ea1243c8 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Thu, 14 Feb 2019 20:59:07 -0500 Subject: [PATCH] Add missing ifdefs --- src/k_kart.c | 6 ++++++ src/w_wad.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index 49fd54e6..3ac50485 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1891,8 +1891,10 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto } } +#ifdef HAVE_BLUA if (LUAh_PlayerSpin(player, inflictor, source)) // Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case. return; +#endif if (source && source != player->mo && source->player) K_PlayHitEmSound(source); @@ -2022,8 +2024,10 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor) } } +#ifdef HAVE_BLUA if (LUAh_PlayerSquish(player, inflictor, source)) // Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case. return; +#endif player->kartstuff[k_sneakertimer] = 0; player->kartstuff[k_driftboost] = 0; @@ -2136,8 +2140,10 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b } } +#ifdef HAVE_BLUA if (LUAh_PlayerExplode(player, inflictor, source)) // Same thing. Also make sure to let Instashield happen blah blah return; +#endif if (source && source != player->mo && source->player) K_PlayHitEmSound(source); diff --git a/src/w_wad.c b/src/w_wad.c index efa09ce4..29e1ba22 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -191,8 +191,10 @@ static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum) { posEnd = W_CheckNumForFolderEndPK3("Lua/", wadnum, posStart); posStart++; +#ifdef HAVE_BLUA for (; posStart < posEnd; posStart++) LUA_LoadLump(wadnum, posStart); +#endif } posStart = W_CheckNumForFolderStartPK3("SOC/", wadnum, 0); if (posStart != INT16_MAX) @@ -794,7 +796,9 @@ UINT16 W_InitFile(const char *filename) DEH_LoadDehackedLumpPwad(numwadfiles - 1, 0); break; case RET_LUA: +#ifdef HAVE_BLUA LUA_LoadLump(numwadfiles - 1, 0); +#endif break; default: break;