incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix balloon coloring

Browse source
This commit is contained in:
NepDisk 2024-09-13 22:49:39 -04:00
parent 124bc25cee
commit 0d7e9fc691
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_mobj.c
View file

@ -12037,8 +12037,11 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
mobj->health = FixedMul(mobj->subsector->sector->ceilingheight - mobj->subsector->sector->floorheight, 3*(FRACUNIT/4)) >> FRACBITS;
break;
case MT_BALLOON:
if (mthing->stringargs[0])
if (mthing->args[1])
mobj->color = mthing->args[1];
else if (mthing->stringargs[0])
mobj->color = get_number(mthing->stringargs[0]);
if (mthing->args[0])
mobj->flags2 |= MF2_AMBUSH;
break;

4
src/p_setup.c
View file

@ -6621,11 +6621,11 @@ static void P_ConvertBinaryThingTypes(void)
mapthings[i].args[2] = !(mapthings[i].options & (MTF_AMBUSH|MTF_OBJECTSPECIAL));
break;
case 462: //Balloon
mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
if (mapthings[i].angle > 0)
{
P_WriteSkincolor(((mapthings[i].angle - 1) % (numskincolors - 1)) + 1, &mapthings[i].stringargs[0]);
mapthings[i].args[1] = (1 + (mapthings[i].angle % (numskincolors-1)));
}
mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
break;
case 500: //Air bubble patch
mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);