toaster · 2d50dd1f · 2d50dd1f · 2d50dd1f · 2d50dd1f · 04a38a68
--- a/src/p_spec.c
+++ b/src/p_spec.c
 	return NULL;
 }

+#define TELEPORTED (player->mo->subsector->sector != originalsector)
+
 /** Checks if a player is standing on or is inside a 3D floor (e.g. water) and
 * applies any specials.
 *
 * \param player Player to check.
 * \sa P_ThingOnSpecial3DFloor, P_PlayerInSpecialSector
 */
-static void P_PlayerOnSpecial3DFloor(player_t *player, sector_t *sector)
+static void P_PlayerOnSpecial3DFloor(player_t *player, sector_t *sector, sector_t *originalsector)
--- a/src/p_spec.c
+++ b/src/p_spec.c
 				{
 					if (roversector)
 					{
-						if (players[i].mo->subsector->sector != roversector)
+						if (!(players[i].mo->subsector->sector == roversector
+							|| sector->flags & SF_TRIGGERSPECIAL_TOUCH))
--- a/src/p_floor.c
+++ b/src/p_floor.c
 				if ((netgame || multiplayer) && players[i].spectator)
 					continue;

-				if (players[i].mo->subsector->sector != sec)
+				if (players[i].mo->subsector->sector == targetsec)