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

Fix up the sink some

Browse source
This commit is contained in:
SeventhSentinel 2018-06-25 07:28:27 -04:00
parent 18b3d2d14c
commit d726f82000
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/info.c
View file

@ -14998,7 +14998,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_SINK, // spawnstate S_SINK, // spawnstate
105, // spawnhealth 105, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
256*FRACUNIT, // painstate 256*FRACUNIT, // painstate
@ -15016,7 +15016,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass 100, // mass
1, // damage 1, // damage
sfx_bomb, // activesound sfx_bomb, // activesound
MF_BOUNCE|MF_FLOAT|MF_NOCLIPTHING|MF_MISSILE|MF_SHOOTABLE, // flags MF_BOUNCE|MF_SHOOTABLE, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

2
src/k_kart.c
View file

@ -2113,7 +2113,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
{ {
if (player->kartstuff[k_throwdir] == 1) if (player->kartstuff[k_throwdir] == 1)
dir = 2; dir = 2;
else if (player->kartstuff[k_throwdir] == -1) else if (player->kartstuff[k_throwdir] == -1 && mapthing != MT_SINK)
dir = -1; dir = -1;
else else
dir = 1; dir = 1;

8
src/p_mobj.c
View file

@ -1404,6 +1404,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
case MT_BANANA: case MT_BANANA:
case MT_FAKEITEM: case MT_FAKEITEM:
case MT_SSMINE: case MT_SSMINE:
case MT_SINK:
gravityadd = FixedMul(gravityadd, 5*FRACUNIT/2); gravityadd = FixedMul(gravityadd, 5*FRACUNIT/2);
default: default:
break; break;
@ -8123,6 +8124,8 @@ void P_MobjThinker(mobj_t *mobj)
mobj->threshold--; mobj->threshold--;
break; break;
case MT_SINK: case MT_SINK:
if (mobj->momx || mobj->momy)
P_SpawnGhostMobj(mobj);
if (mobj->z <= mobj->floorz) if (mobj->z <= mobj->floorz)
{ {
S_StartSound(mobj, mobj->info->deathsound); S_StartSound(mobj, mobj->info->deathsound);
@ -9071,12 +9074,13 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
case MT_BIGMACE: case MT_SMALLMACE: case MT_BIGMACE: case MT_SMALLMACE:
case MT_FALLINGROCK: case MT_FALLINGROCK:
//case MT_RANDOMITEM: //case MT_RANDOMITEM:
case MT_BATTLEBALLOON:
case MT_BANANA: case MT_BANANA_SHIELD: case MT_BANANA: case MT_BANANA_SHIELD:
case MT_FAKEITEM: case MT_FAKESHIELD:
case MT_GREENITEM: case MT_GREENSHIELD: case MT_GREENITEM: case MT_GREENSHIELD:
case MT_JAWZ: case MT_JAWZ_DUD: case MT_JAWZ_SHIELD: case MT_JAWZ: case MT_JAWZ_DUD: case MT_JAWZ_SHIELD:
case MT_BATTLEBALLOON: case MT_FIREBALL:
case MT_FAKEITEM: case MT_FAKESHIELD:
case MT_SSMINE: case MT_SSMINE_SHIELD: case MT_SSMINE: case MT_SSMINE_SHIELD:
case MT_FIREBALL: case MT_SINK:
P_SpawnShadowMobj(mobj); P_SpawnShadowMobj(mobj);
default: default:
break; break;