Merge branch 'no_lua' into 'master'
be able to compile without blua support See merge request KartKrew/Kart-Public!97
This commit is contained in:
commit
7799732988
|
@ -2542,6 +2542,8 @@ static void CL_RemovePlayer(INT32 playernum, INT32 reason)
|
||||||
|
|
||||||
#ifdef HAVE_BLUA
|
#ifdef HAVE_BLUA
|
||||||
LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting
|
LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting
|
||||||
|
#else
|
||||||
|
(void)reason;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Reset player data
|
// Reset player data
|
||||||
|
|
|
@ -8254,6 +8254,7 @@ static const char *const POWERS_LIST[] = {
|
||||||
"INGOOP" // In goop
|
"INGOOP" // In goop
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef HAVE_BLUA
|
||||||
static const char *const KARTSTUFF_LIST[] = {
|
static const char *const KARTSTUFF_LIST[] = {
|
||||||
"POSITION",
|
"POSITION",
|
||||||
"OLDPOSITION",
|
"OLDPOSITION",
|
||||||
|
@ -8337,6 +8338,7 @@ static const char *const KARTSTUFF_LIST[] = {
|
||||||
"JAWZTARGETDELAY",
|
"JAWZTARGETDELAY",
|
||||||
"SPECTATEWAIT"
|
"SPECTATEWAIT"
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
static const char *const HUDITEMS_LIST[] = {
|
static const char *const HUDITEMS_LIST[] = {
|
||||||
"LIVESNAME",
|
"LIVESNAME",
|
||||||
|
@ -9042,20 +9044,6 @@ static powertype_t get_power(const char *word)
|
||||||
return pw_invulnerability;
|
return pw_invulnerability;
|
||||||
}
|
}
|
||||||
|
|
||||||
static kartstufftype_t get_kartstuff(const char *word)
|
|
||||||
{ // Returns the vlaue of k_ enumerations
|
|
||||||
kartstufftype_t i;
|
|
||||||
if (*word >= '0' && *word <= '9')
|
|
||||||
return atoi(word);
|
|
||||||
if (fastncmp("K_",word,2))
|
|
||||||
word += 2; // take off the k_
|
|
||||||
for (i = 0; i < NUMKARTSTUFF; i++)
|
|
||||||
if (fastcmp(word, KARTSTUFF_LIST[i]))
|
|
||||||
return i;
|
|
||||||
deh_warning("Couldn't find power named 'k_%s'",word);
|
|
||||||
return k_position;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// \todo Make ANY of this completely over-the-top math craziness obey the order of operations.
|
/// \todo Make ANY of this completely over-the-top math craziness obey the order of operations.
|
||||||
static fixed_t op_mul(fixed_t a, fixed_t b) { return a*b; }
|
static fixed_t op_mul(fixed_t a, fixed_t b) { return a*b; }
|
||||||
static fixed_t op_div(fixed_t a, fixed_t b) { return a/b; }
|
static fixed_t op_div(fixed_t a, fixed_t b) { return a/b; }
|
||||||
|
|
Loading…
Reference in a new issue