Fix up mod displays for airdrop
This commit is contained in:
parent
922bb9b873
commit
9e54882b59
4 changed files with 9 additions and 13 deletions
|
|
@ -2523,7 +2523,7 @@ void K_SetScoreboardModStatus(const char *name, SINT8 active)
|
|||
CONS_Alert(CONS_WARNING, "Server mod '%s' does not exist so status cannot be changed.\n", name);
|
||||
}
|
||||
|
||||
#define BASEMODS 16
|
||||
#define BASEMODS 19
|
||||
static void K_DrawServerMods(INT32 x, INT32 y)
|
||||
{
|
||||
UINT8 i, j;
|
||||
|
|
@ -2542,8 +2542,9 @@ static void K_DrawServerMods(INT32 x, INT32 y)
|
|||
{"Chain Offroad", 0, &cv_kartchainingoffroad, -1, true},
|
||||
{"Slope Boost", 0, NULL, K_PurpleDriftActive() > 0, true},
|
||||
{"Drafting", 0, NULL, K_DraftingActive() > 0, true},
|
||||
{"Light Air Drop", 0, NULL, K_AirDropActive() == AIRDROP_LIGHT, true},
|
||||
{"Heavy Air Drop", 0, NULL, K_AirDropActive() >= AIRDROP_HEAVY, true},
|
||||
{"Light AirDrop", 0, NULL, K_AirDropActive() == AIRDROP_LIGHT, true},
|
||||
{"Heavy AirDrop", 0, NULL, K_AirDropActive() == AIRDROP_HEAVY, true},
|
||||
{"Fus. AirDrop", 0, NULL, K_AirDropActive() == AIRDROP_FUSION, true},
|
||||
{"Air Thrust", 0, NULL, K_AirThrustActive() > 0, true},
|
||||
{"Recovery Dash", 0, NULL, K_RecoveryDashActive() > 0, true},
|
||||
{"Bump Spark", 0, &cv_kartbumpspark, -1, true},
|
||||
|
|
|
|||
10
src/k_kart.c
10
src/k_kart.c
|
|
@ -11739,15 +11739,9 @@ boolean K_DraftingActive(void)
|
|||
return false;
|
||||
}
|
||||
|
||||
boolean K_AirDropActive(void)
|
||||
SINT8 K_AirDropActive(void)
|
||||
{
|
||||
if (airdropactive > AIRDROP_NONE)
|
||||
{
|
||||
// Air Drop is enabled!
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return airdropactive;
|
||||
}
|
||||
|
||||
boolean K_AirThrustActive(void)
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ boolean K_ChainingActive(void);
|
|||
boolean K_SlipdashActive(void);
|
||||
boolean K_SlopeBoostActive(void);
|
||||
boolean K_DraftingActive(void);
|
||||
boolean K_AirDropActive(void);
|
||||
SINT8 K_AirDropActive(void);
|
||||
boolean K_AirThrustActive(void);
|
||||
boolean K_RecoveryDashActive(void);
|
||||
boolean K_WaterskipBricksActive(void);
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
/// \file lua_baselib.c
|
||||
/// \brief basic functions for Lua scripting
|
||||
|
||||
#include "blua/lua.h"
|
||||
#include "doomdef.h"
|
||||
#include "p_local.h"
|
||||
#include "p_setup.h" // So we can have P_SetupLevelSky
|
||||
|
|
@ -4406,7 +4407,7 @@ static int lib_kDraftingActive(lua_State *L)
|
|||
// Checks if Air Drop is active.
|
||||
static int lib_kAirDropActive(lua_State *L)
|
||||
{
|
||||
lua_pushboolean(L, K_AirDropActive());
|
||||
lua_pushinteger(L, K_AirDropActive());
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue