diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg index c5a881c5cecb4c42559df830e3ec53d375f26489..53d70647bb94563eec15abba98081f221ff44bf1 100644 --- a/extras/conf/udb/Includes/SRB222_things.cfg +++ b/extras/conf/udb/Includes/SRB222_things.cfg @@ -3044,6 +3044,20 @@ doom } } + tutorial + { + color = 10; // Green + title = "Tutorial"; + + 799 + { + title = "Tutorial Plant"; + sprite = "TUPFH0"; + width = 40; + height = 144; + } + } + flickies { color = 10; // Green @@ -7867,6 +7881,24 @@ udmf } } + tutorial + { + color = 10; // Green + title = "Tutorial"; + + 799 + { + title = "Tutorial Plant"; + sprite = "TUPFH0"; + width = 40; + height = 144; + arg0 + { + title = "Start frame"; + } + } + } + flickies { color = 10; // Green diff --git a/src/p_mobj.c b/src/p_mobj.c index ea53395edb0854cf6a07c81c8114d6b9f5f7591b..9056f5a3f7c0f839fed32c5a509bec2f8797d008 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12922,15 +12922,15 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean { segment = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_TUTORIALLEAF); segment->angle = mobj->angle + FixedAngle(i*60*FRACUNIT); - P_SetMobjState(segment, S_TUTORIALLEAF1 + mthing->extrainfo); + P_SetMobjState(segment, S_TUTORIALLEAF1 + mthing->args[0]); } for (i = 0; i < 3; i++) { segment = P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWER); segment->angle = mobj->angle + FixedAngle(i*120*FRACUNIT); - P_SetMobjState(segment, S_TUTORIALFLOWER1 + mthing->extrainfo); + P_SetMobjState(segment, S_TUTORIALFLOWER1 + mthing->args[0]); } - P_SetMobjState(P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWERF), S_TUTORIALFLOWERF1 + mthing->extrainfo); + P_SetMobjState(P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWERF), S_TUTORIALFLOWERF1 + mthing->args[0]); } break; case MT_CEZPOLE1: diff --git a/src/p_setup.c b/src/p_setup.c index 45c5cc3b3f1b7fe559261cb671699e3a4082e593..89e7175bc5e1866016dddf9a7b9259b2100998bc 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -5262,6 +5262,9 @@ static void P_ConvertBinaryMap(void) case 780: //Skybox mapthings[i].args[0] = !!(mapthings[i].options & MTF_OBJECTSPECIAL); break; + case 799: //Tutorial plant + mapthings[i].args[0] = mapthings[i].extrainfo; + break; case 1002: //Dripping water mapthings[i].args[0] = mapthings[i].angle; break;