stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-03-22 10:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Complete the disabling of the traditional shield mechanism (oversight from initial commit).

Browse source
This commit is contained in:
toaster 2018-10-03 17:14:25 +01:00
parent cfd2b021a4
commit ecfe8e5070
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_local.h
View file

@ -231,7 +231,7 @@ boolean P_MobjWasRemoved(mobj_t *th);
void P_RemoveSavegameMobj(mobj_t *th);
boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state);
boolean P_SetMobjState(mobj_t *mobj, statenum_t state);
void P_RunShields(void);
//void P_RunShields(void);
void P_RunOverlays(void);
void P_RunShadows(void);
void P_MobjThinker(mobj_t *mobj);

16
src/p_mobj.c
View file

@ -6127,7 +6127,7 @@ static boolean P_ShieldLook(mobj_t *thing, shieldtype_t shield)
return true;
}
mobj_t *shields[MAXPLAYERS*2];
/*mobj_t *shields[MAXPLAYERS*2];
INT32 numshields = 0;
void P_RunShields(void)
@ -6175,7 +6175,7 @@ static boolean P_AddShield(mobj_t *thing)
P_SetTarget(&shields[numshields++], thing);
return true;
}
}*/
void P_RunOverlays(void)
{
@ -6609,8 +6609,8 @@ void P_MobjThinker(mobj_t *mobj)
P_RemoveMobj(mobj);
return;
}
else
P_AddOverlay(mobj);
P_AddOverlay(mobj);
break;
case MT_SHADOW:
if (!mobj->target)
@ -6618,10 +6618,10 @@ void P_MobjThinker(mobj_t *mobj)
P_RemoveMobj(mobj);
return;
}
else
P_AddShadow(mobj);
P_AddShadow(mobj);
break;
case MT_BLACKORB:
/*case MT_BLACKORB:
case MT_WHITEORB:
case MT_GREENORB:
case MT_YELLOWORB:
@ -6629,7 +6629,7 @@ void P_MobjThinker(mobj_t *mobj)
case MT_PITYORB:
if (!P_AddShield(mobj))
return;
break;
break;*/
//{ SRB2kart mobs
case MT_ORBINAUT_SHIELD: // Kart orbit/trail items
case MT_JAWZ_SHIELD: