Merge branch 'sonicitems' of http://git.magicalgirl.moe/KartKrew/Kart into sonicitems

This commit is contained in:
SeventhSentinel 2018-06-28 19:07:16 -04:00
commit 5b50a4a998
3 changed files with 17 additions and 5 deletions

View file

@ -1,3 +1,4 @@
*.exe *.exe
*.mo *.mo
r_opengl.dll r_opengl.dll
*.bat

View file

@ -6397,6 +6397,16 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SLOWBOOM9", "S_SLOWBOOM9",
"S_SLOWBOOM10", "S_SLOWBOOM10",
// Ballhog
"S_BALLHOG1",
"S_BALLHOG2",
"S_BALLHOG3",
"S_BALLHOG4",
"S_BALLHOG5",
"S_BALLHOG6",
"S_BALLHOG7",
"S_BALLHOG8",
// Self-Propelled Bomb - just an explosion for now... // Self-Propelled Bomb - just an explosion for now...
"S_BLUELIGHTNING1", "S_BLUELIGHTNING1",
"S_BLUELIGHTNING2", "S_BLUELIGHTNING2",
@ -7131,7 +7141,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_GREENSHIELD", // Orbinaut stuff "MT_GREENSHIELD", // Orbinaut stuff
"MT_GREENITEM", "MT_GREENITEM",
"MT_FIRETRAIL",
"MT_JAWZ", // Jawz stuff "MT_JAWZ", // Jawz stuff
"MT_JAWZ_DUD", "MT_JAWZ_DUD",
@ -7565,9 +7574,7 @@ static const char *const KARTSTUFF_LIST[] = {
"VOICES", "VOICES",
"TAUNTVOICES", "TAUNTVOICES",
"BOOSTING",
"FLOORBOOST", "FLOORBOOST",
"SPINOUT",
"SPINOUTTYPE", "SPINOUTTYPE",
"DRIFT", "DRIFT",
@ -7583,10 +7590,12 @@ static const char *const KARTSTUFF_LIST[] = {
"ITEMROULETTE", "ITEMROULETTE",
"ROULETTETYPE", "ROULETTETYPE",
// Item held stuff
"ITEMTYPE", "ITEMTYPE",
"ITEMAMOUNT", "ITEMAMOUNT",
"ITEMHELD", "ITEMHELD",
// Some items use timers for their duration or effects
"ATTRACTIONTIMER", "ATTRACTIONTIMER",
"HYUDOROTIMER", "HYUDOROTIMER",
"STEALINGTIMER", "STEALINGTIMER",
@ -7600,10 +7609,10 @@ static const char *const KARTSTUFF_LIST[] = {
"EGGMANHELD", "EGGMANHELD",
"SPINOUTTIMER", "SPINOUTTIMER",
"JUSTBUMPED", "JUSTBUMPED",
"POWERITEMTIMER",
"COMEBACKTIMER", "COMEBACKTIMER",
"SADTIMER", "SADTIMER",
// Battle Mode vars
"BALLOON", "BALLOON",
"COMEBACKPOINTS", "COMEBACKPOINTS",
"COMEBACKMODE", "COMEBACKMODE",

View file

@ -5070,7 +5070,9 @@ static void K_drawKartFirstPerson(void)
x /= 2; x /= 2;
} }
if (stplyr->speed < FixedMul(stplyr->runspeed, stplyr->mo->scale) && (leveltime & 1)) if (stplyr->spectator || !stplyr->mo)
splitflags |= FF_TRANS50;
else if (stplyr->speed < FixedMul(stplyr->runspeed, stplyr->mo->scale) && (leveltime & 1))
y++; y++;
if (cmd->driftturn > 400) // strong left turn if (cmd->driftturn > 400) // strong left turn