mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 20:41:46 +00:00
Add P_IsKartFieldItem, an item that is not attached to a player
This commit is contained in:
parent
5d8df43b10
commit
a3caba4f20
2 changed files with 42 additions and 12 deletions
53
src/p_mobj.c
53
src/p_mobj.c
|
|
@ -4992,20 +4992,49 @@ cont:
|
||||||
}
|
}
|
||||||
|
|
||||||
// Kartitem stuff.
|
// Kartitem stuff.
|
||||||
|
|
||||||
|
// This item is never attached to a player -- it can DIE
|
||||||
|
// unconditionally in death sectors.
|
||||||
|
boolean P_IsKartFieldItem(INT32 type)
|
||||||
|
{
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case MT_BANANA:
|
||||||
|
case MT_EGGMANITEM:
|
||||||
|
case MT_ORBINAUT:
|
||||||
|
case MT_JAWZ:
|
||||||
|
case MT_SSMINE:
|
||||||
|
case MT_LANDMINE:
|
||||||
|
case MT_BALLHOG:
|
||||||
|
case MT_BUBBLESHIELDTRAP:
|
||||||
|
case MT_POGOSPRING:
|
||||||
|
case MT_SINK:
|
||||||
|
case MT_DROPTARGET:
|
||||||
|
return true;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
boolean P_IsKartItem(INT32 type)
|
boolean P_IsKartItem(INT32 type)
|
||||||
{
|
{
|
||||||
if (type == MT_EGGMANITEM || type == MT_EGGMANITEM_SHIELD ||
|
switch (type)
|
||||||
type == MT_BANANA || type == MT_BANANA_SHIELD ||
|
{
|
||||||
type == MT_DROPTARGET || type == MT_DROPTARGET_SHIELD ||
|
case MT_EGGMANITEM_SHIELD:
|
||||||
type == MT_ORBINAUT || type == MT_ORBINAUT_SHIELD ||
|
case MT_BANANA_SHIELD:
|
||||||
type == MT_JAWZ || type == MT_JAWZ_SHIELD ||
|
case MT_DROPTARGET_SHIELD:
|
||||||
type == MT_SSMINE || type == MT_SSMINE_SHIELD ||
|
case MT_ORBINAUT_SHIELD:
|
||||||
type == MT_SINK || type == MT_SINK_SHIELD ||
|
case MT_JAWZ_SHIELD:
|
||||||
type == MT_SPB || type == MT_BALLHOG || type == MT_BUBBLESHIELDTRAP ||
|
case MT_SSMINE_SHIELD:
|
||||||
type == MT_LANDMINE)
|
case MT_SINK_SHIELD:
|
||||||
return true;
|
case MT_SPB:
|
||||||
else
|
case MT_HYUDORO:
|
||||||
return false;
|
return true;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return P_IsKartFieldItem(type);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when a kart item "thinks"
|
// Called when a kart item "thinks"
|
||||||
|
|
|
||||||
|
|
@ -499,6 +499,7 @@ void P_RunCachedActions(void);
|
||||||
void P_AddCachedAction(mobj_t *mobj, INT32 statenum);
|
void P_AddCachedAction(mobj_t *mobj, INT32 statenum);
|
||||||
|
|
||||||
// kartitem stuff: Returns true if the specified 'type' is one of the kart item constants we want in the kitemcap list
|
// kartitem stuff: Returns true if the specified 'type' is one of the kart item constants we want in the kitemcap list
|
||||||
|
boolean P_IsKartFieldItem(INT32 type);
|
||||||
boolean P_IsKartItem(INT32 type);
|
boolean P_IsKartItem(INT32 type);
|
||||||
void P_AddKartItem(mobj_t *thing); // needs to be called in k_kart.c
|
void P_AddKartItem(mobj_t *thing); // needs to be called in k_kart.c
|
||||||
void P_RunKartItems(void);
|
void P_RunKartItems(void);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue