stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-18 15:32:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
SeventhSentinel 2018-06-28 19:07:16 -04:00
commit 024adee9da
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/Mingw/Debug/.gitignore vendored
View file

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

17
src/dehacked.c
View file

@ -6397,6 +6397,16 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SLOWBOOM9",
"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...
"S_BLUELIGHTNING1",
"S_BLUELIGHTNING2",
@ -7131,7 +7141,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_GREENSHIELD", // Orbinaut stuff
"MT_GREENITEM",
"MT_FIRETRAIL",
"MT_JAWZ", // Jawz stuff
"MT_JAWZ_DUD",
@ -7565,9 +7574,7 @@ static const char *const KARTSTUFF_LIST[] = {
"VOICES",
"TAUNTVOICES",
"BOOSTING",
"FLOORBOOST",
"SPINOUT",
"SPINOUTTYPE",
"DRIFT",
@ -7583,10 +7590,12 @@ static const char *const KARTSTUFF_LIST[] = {
"ITEMROULETTE",
"ROULETTETYPE",
// Item held stuff
"ITEMTYPE",
"ITEMAMOUNT",
"ITEMHELD",
// Some items use timers for their duration or effects
"ATTRACTIONTIMER",
"HYUDOROTIMER",
"STEALINGTIMER",
@ -7600,10 +7609,10 @@ static const char *const KARTSTUFF_LIST[] = {
"EGGMANHELD",
"SPINOUTTIMER",
"JUSTBUMPED",
"POWERITEMTIMER",
"COMEBACKTIMER",
"SADTIMER",
// Battle Mode vars
"BALLOON",
"COMEBACKPOINTS",
"COMEBACKMODE",

4
src/k_kart.c
View file

@ -5070,7 +5070,9 @@ static void K_drawKartFirstPerson(void)
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++;
if (cmd->driftturn > 400) // strong left turn