thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into upstream-merge

Browse source
This commit is contained in:
Alam Arias 2019-03-02 13:27:10 -05:00
commit 4eb655569e
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dehacked.c
View file

@ -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; }