stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-18 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Undo Unintentional Changes

Browse source
This commit is contained in:
SMS Alfredo 2023-10-05 11:36:19 -05:00
parent c3640c5aa9
commit 01491a4d31
1 changed files with 14 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/p_mobj.c
View file

@ -9684,6 +9684,11 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
A_AttractChase(mobj);
break;
case MT_EMBLEM:
if (P_EmblemWasCollected(mobj->health - 1) || !P_CanPickupEmblem(&players[consoleplayer], mobj->health - 1))
mobj->frame |= (tr_trans50 << FF_TRANSSHIFT);
else
mobj->frame &= ~FF_TRANSMASK;
if (mobj->flags2 & MF2_NIGHTSPULL)
P_NightsItemChase(mobj);
break;
@ -11993,8 +11998,8 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
break;
case MT_EMBLEM:
if (netgame || multiplayer)
return false; // Single player (You're next on my shit list)
if (!G_CoopGametype())
return false; // Gametype's not right
break;
default:
break;
@ -12138,7 +12143,6 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
INT32 j;
emblem_t* emblem = M_GetLevelEmblems(gamemap);
skincolornum_t emcolor;
boolean validEmblem = true;
while (emblem)
{
@ -12163,42 +12167,19 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
mobj->color = (UINT16)emcolor;
validEmblem = !emblemlocations[j].collected;
mobj->frame &= ~FF_TRANSMASK;
if (emblemlocations[j].type == ET_SKIN)
if (emblemlocations[j].type == ET_GLOBAL)
{
INT32 skinnum = M_EmblemSkinNum(&emblemlocations[j]);
if (players[0].skin != skinnum)
mobj->reactiontime = emblemlocations[j].var;
if (emblemlocations[j].var & GE_NIGHTSITEM)
{
validEmblem = false;
mobj->flags |= MF_NIGHTSITEM;
mobj->flags &= ~MF_SPECIAL;
mobj->flags2 |= MF2_DONTDRAW;
}
}
if (validEmblem == false)
{
P_UnsetThingPosition(mobj);
mobj->flags |= MF_NOCLIP;
mobj->flags &= ~MF_SPECIAL;
mobj->flags |= MF_NOBLOCKMAP;
mobj->frame |= (tr_trans50 << FF_TRANSSHIFT);
P_SetThingPosition(mobj);
}
else
{
mobj->frame &= ~FF_TRANSMASK;
if (emblemlocations[j].type == ET_GLOBAL)
{
mobj->reactiontime = emblemlocations[j].var;
if (emblemlocations[j].var & GE_NIGHTSITEM)
{
mobj->flags |= MF_NIGHTSITEM;
mobj->flags &= ~MF_SPECIAL;
mobj->flags2 |= MF2_DONTDRAW;
}
}
}
return true;
}
@ -13697,7 +13678,6 @@ void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime)
UINT8 numitemtypes;
if (!udmf)
return;
CONS_Printf("Itemstring: %s\n", mthing->stringargs[0]);
P_ParseItemTypes(mthing->stringargs[0], itemtypes, &numitemtypes);
P_SpawnItemCircle(mthing, itemtypes, numitemtypes, mthing->args[0], mthing->args[1] << FRACBITS, bonustime);
return;