diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index ec568e865ed8d657473cd3d7444ae5e818db2ad9..81d8ed1930cbcc4712104e1e90d6ed0f929c0088 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -435,8 +435,8 @@ sectortypes
112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Spheres Parameters";
- 176 = "Custom Global Gravity";
+ 160 = "Special Stage Time/Spheres Parameters <deprecated>";
+ 176 = "Custom Global Gravity <deprecated>";
512 = "Wind/Current";
1024 = "Conveyor Belt";
1280 = "Speed Pad";
@@ -490,8 +490,8 @@ gen_sectortypes
112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Spheres Parameters";
- 176 = "Custom Global Gravity";
+ 160 = "Special Stage Time/Spheres Parameters <deprecated>";
+ 176 = "Custom Global Gravity <deprecated>";
}
third
diff --git a/extras/conf/udb/Includes/SRB222_sectors.cfg b/extras/conf/udb/Includes/SRB222_sectors.cfg
index e02bfd7ccf6035ee698e4961a1a827487b142a87..412aed155f1e6047f3890687296e09ee4964b704 100644
--- a/extras/conf/udb/Includes/SRB222_sectors.cfg
+++ b/extras/conf/udb/Includes/SRB222_sectors.cfg
@@ -22,11 +22,11 @@ sectortypes
64 = "Trigger Line Ex. (Anywhere in Sector)";
80 = "Trigger Line Ex. (Floor Touch)";
96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
- 112 = "Trigger Line Ex. (NiGHTS Mare)";
+ 112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Spheres Parameters";
- 176 = "Custom Global Gravity";
+ 160 = "Special Stage Time/Spheres Parameters <deprecated>";
+ 176 = "Custom Global Gravity <deprecated>";
512 = "Wind/Current";
1024 = "Conveyor Belt";
1280 = "Speed Pad";
@@ -75,11 +75,11 @@ gen_sectortypes
64 = "Trigger Line Ex. (Anywhere in Sector)";
80 = "Trigger Line Ex. (Floor Touch)";
96 = "Trigger Line Ex. (Emerald Check) <deprecated>";
- 112 = "Trigger Line Ex. (NiGHTS Mare)";
+ 112 = "Trigger Line Ex. (NiGHTS Mare) <deprecated>";
128 = "Check for Linedef Executor on FOFs";
144 = "Egg Capsule";
- 160 = "Special Stage Time/Spheres Parameters";
- 176 = "Custom Global Gravity";
+ 160 = "Special Stage Time/Spheres Parameters <deprecated>";
+ 176 = "Custom Global Gravity <deprecated>";
}
third
diff --git a/src/p_spec.c b/src/p_spec.c
index 9fe9ad8efcfb5bb5e218e37804fa94f22e4017a5..388440d75b925d538ae1fde6594d7e9a87cfc7c1 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4871,6 +4871,8 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
break;
/* FALLTHRU */
case 10: // Ring Drainer (No Floor Touch)
+ if (udmf)
+ break;
if (leveltime % (TICRATE/2) == 0 && player->rings > 0)
{
player->rings--;
@@ -6036,6 +6038,8 @@ void P_SpawnSpecials(boolean fromnetsave)
sector->flags |= MSF_TRIGGERSPECIAL_TOUCH;
break;
case 15: // Bouncy FOF
+ if (udmf)
+ break;
CONS_Alert(CONS_WARNING, M_GetText("Deprecated bouncy FOF sector type detected. Please use linedef type 76 instead.\n"));
CheckForBouncySector = true;
break;
@@ -6045,21 +6049,21 @@ void P_SpawnSpecials(boolean fromnetsave)
switch(GETSECSPECIAL(sector->special, 2))
{
case 10: // Time for special stage
+ if (udmf)
+ break;
+ CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for special stage requirements detected. Please use the SpecialStageTime and SpecialStageSpheres level header options instead.\n"));
sstimer = (sector->floorheight>>FRACBITS) * TICRATE + 6; // Time to finish
ssspheres = sector->ceilingheight>>FRACBITS; // Ring count for special stage
break;
case 11: // Custom global gravity!
+ if (udmf)
+ break;
+ CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for global gravity detected. Please use the Gravity level header option instead.\n"));
gravity = sector->floorheight/1000;
break;
}
- // Process Section 3
-/* switch(GETSECSPECIAL(player->specialsector, 3))
- {
-
- }*/
-
// Process Section 4
switch(GETSECSPECIAL(sector->special, 4))
{
diff --git a/src/p_user.c b/src/p_user.c
index d94b7556fee3ccfe043aa9f0255a13963c802a20..45c64500f3622c5f27e4834c4604e7992bf45a84 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2677,7 +2677,7 @@ static void P_CheckBouncySectors(player_t *player)
continue; // FOFs should not be bouncy if they don't even "exist"
// Handle deprecated bouncy FOF sector type
- if (GETSECSPECIAL(rover->master->frontsector->special, 1) == 15)
+ if (!udmf && GETSECSPECIAL(rover->master->frontsector->special, 1) == 15)
{
rover->flags |= FF_BOUNCY;
rover->bouncestrength = P_AproxDistance(rover->master->dx, rover->master->dy)/100;