diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg index 303bfe396957ceb438b6abfa3cecf0776e7ce8ac..03c2fc82d222cdc9e7deee323a082c6af87c5c3c 100644 --- a/extras/conf/udb/Includes/SRB222_things.cfg +++ b/extras/conf/udb/Includes/SRB222_things.cfg @@ -4773,6 +4773,14 @@ udmf { title = "Zoom Tube Waypoint"; sprite = "internal:zoom"; + arg0 + { + title = "Sequence"; + } + arg1 + { + title = "Order"; + } } 754 diff --git a/src/p_mobj.c b/src/p_mobj.c index 65c337cf2b03a0f92fcc978f7b87bfc8de2c2b27..7f12a190b8e35b8e258a46735ab5900f20feadd6 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12819,8 +12819,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean break; case MT_TUBEWAYPOINT: { - UINT8 sequence = mthing->angle >> 8; - UINT8 id = mthing->angle & 255; + UINT8 sequence = mthing->args[0]; + UINT8 id = mthing->args[1]; mobj->health = id; mobj->threshold = sequence; P_AddWaypoint(sequence, id, mobj); diff --git a/src/p_setup.c b/src/p_setup.c index ba3544d1206eab713df24adadb54dc20d4da1869..bf12c88bcbd25ca919025035c20fd5b57f488a49 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4890,6 +4890,10 @@ static void P_ConvertBinaryMap(void) case 111: //Pop-up Turret mapthings[i].args[0] = mapthings[i].angle; break; + case 753: //Zoom tube waypoint + mapthings[i].args[0] = mapthings[i].angle >> 8; + mapthings[i].args[1] = mapthings[i].angle & 255; + break; case 754: //Push point case 755: //Pull point {