thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fuckup

Browse source
This commit is contained in:
James R 2020-10-30 19:00:37 -07:00
parent cb941050e2
commit 6864705b67
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -22946,7 +22946,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass 100, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SLIDEME|MF_SPECIAL|MF_DONTENCOREMAP, // flags MF_SLIDEME|MF_DONTENCOREMAP, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

10
src/k_collide.c
View file

@ -409,6 +409,9 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2)
{ {
player_t * player = t2->player; player_t * player = t2->player;
if (t1->health < 1)
return true;
if (! player) if (! player)
return true; return true;
@ -418,8 +421,8 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2)
if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0) if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0)
return true; return true;
player->kartstuff[k_itemtype] = t2->threshold; player->kartstuff[k_itemtype] = t1->threshold;
player->kartstuff[k_itemamount] += t2->movecount; player->kartstuff[k_itemamount] += t1->movecount;
if (player->kartstuff[k_itemamount] > 255) if (player->kartstuff[k_itemamount] > 255)
player->kartstuff[k_itemamount] = 255; player->kartstuff[k_itemamount] = 255;
@ -430,6 +433,7 @@ boolean K_FloatingItemCollide(mobj_t *t1, mobj_t *t2)
t1->destscale = mapobjectscale>>4; t1->destscale = mapobjectscale>>4;
t1->scalespeed <<= 1; t1->scalespeed <<= 1;
t1->flags &= ~MF_SPECIAL; t1->health--;
return false; return false;
} }