stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 01:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt Glaregoyles to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-12-28 23:06:48 +01:00
parent a091b7d16d
commit 2a868ca60d
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7030,6 +7030,10 @@ udmf
type = 11;
enum = "pushablebehavior";
}
arg1
{
title = "Starting delay";
}
}
1501
{
@ -7045,6 +7049,10 @@ udmf
type = 11;
enum = "pushablebehavior";
}
arg1
{
title = "Starting delay";
}
}
1502
{
@ -7060,6 +7068,10 @@ udmf
type = 11;
enum = "pushablebehavior";
}
arg1
{
title = "Starting delay";
}
}
1503
{
@ -7075,6 +7087,10 @@ udmf
type = 11;
enum = "pushablebehavior";
}
arg1
{
title = "Starting delay";
}
}
1504
{

3
src/p_mobj.c
View file

@ -12884,8 +12884,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
case MT_GLAREGOYLEUP:
case MT_GLAREGOYLEDOWN:
case MT_GLAREGOYLELONG:
if (mthing->angle >= 360)
mobj->tics += 7*(mthing->angle/360) + 1; // starting delay
mobj->tics += mthing->args[1]; // starting delay
break;
case MT_DSZSTALAGMITE:
case MT_DSZ2STALAGMITE:

7
src/p_setup.c
View file

@ -5358,6 +5358,13 @@ static void P_ConvertBinaryMap(void)
case 1305: //Rollout Rock
mapthings[i].args[0] = !!(mapthings[i].options & MTF_AMBUSH);
break;
case 1500: //Glaregoyle
case 1501: //Glaregoyle (Up)
case 1502: //Glaregoyle (Down)
case 1503: //Glaregoyle (Long)
if (mapthings[i].angle >= 360)
mapthings[i].args[1] = 7*(mapthings[i].angle/360) + 1;
break;
case 1700: //Axis
mapthings[i].args[2] = mapthings[i].angle & 16383;
mapthings[i].args[3] = !!(mapthings[i].angle & 16384);