stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt balloon colors to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-12-28 08:26:04 +01:00
parent 8b69c62111
commit e140bd8252
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extras/conf/udb/Includes/SRB222_things.cfg
View file

@ -4710,6 +4710,10 @@ udmf
sprite = "BLONA0";
width = 32;
height = 64;
stringarg0
{
title = "Color";
}
}
550
{

4
src/p_mobj.c
View file

@ -12750,8 +12750,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
}
break;
case MT_BALLOON:
if (mthing->angle > 0)
mobj->color = ((mthing->angle - 1) % (numskincolors - 1)) + 1;
if (mthing->stringargs[0])
mobj->color = get_number(mthing->stringargs[0]);
break;
case MT_FLAME:
if (mthing->args[0])

4
src/p_setup.c
View file

@ -4994,6 +4994,10 @@ static void P_ConvertBinaryMap(void)
mapthings[i].args[0] = mapthings[i].angle;
mapthings[i].args[1] = !!(mapthings[i].options & MTF_OBJECTSPECIAL);
break;
case 543: //Balloon
if (mapthings[i].angle > 0)
P_WriteConstant(((mapthings[i].angle - 1) % (numskincolors - 1)) + 1, &mapthings[i].stringargs[0]);
break;
case 555: //Diagonal yellow spring
case 556: //Diagonal red spring
case 557: //Diagonal blue spring