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 pop-up turret to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-12-21 17:45:43 +01:00
parent 7eee8b10a9
commit cbebdc219d
3 changed files with 8 additions and 4 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

@ -3635,6 +3635,10 @@ udmf
sprite = "TURRI1";
width = 12;
height = 64;
arg0
{
title = "Firing delay";
}
}
122
{

5
src/p_mobj.c
View file

@ -12806,10 +12806,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
return false;
break;
case MT_POPUPTURRET:
if (mthing->angle)
mobj->threshold = mthing->angle;
else
mobj->threshold = (TICRATE*2)-1;
mobj->threshold = mthing->args[0] ? mthing->args[0] : (TICRATE*2)-1;
break;
case MT_NIGHTSBUMPER:
// Pitch of the bumper is set in 30 degree increments.

3
src/p_setup.c
View file

@ -4886,6 +4886,9 @@ static void P_ConvertBinaryMap(void)
case 110: //THZ Turret
mapthings[i].args[0] = LE_TURRET;
break;
case 111: //Pop-up Turret
mapthings[i].args[0] = mapthings[i].angle;
break;
case 754: //Push point
case 755: //Pull point
{