- floatification of p_teleport and p_switch.cpp.

Author: Christoph Oelckers

src/d_net.cpp

@@ -2203,7 +2203,7 @@ void Net_DoCommand (int type, BYTE **stream, int player)
 			x = ReadWord (stream);
 			y = ReadWord (stream);
 			z = ReadWord (stream);
-			P_TeleportMove (players[player].mo, x * 65536, y * 65536, z * 65536, true);
+			P_TeleportMove (players[player].mo, DVector3(x, y, z), true);
 		}
 		break;
 

src/p_local.h

@@ -259,15 +259,6 @@ void	P_ApplyTorque(AActor *mo);
 
 bool	P_TeleportMove(AActor* thing, const DVector3 &pos, bool telefrag, bool modifyactor = true);	// [RH] Added z and telefrag parameters
 
-inline bool	P_TeleportMove (AActor* thing, fixed_t x, fixed_t y, fixed_t z, bool telefrag, bool modifyactor = true)
-{
-	return P_TeleportMove(thing, DVector3(FIXED2DBL(x), FIXED2DBL(y), FIXED2DBL(z)), telefrag, modifyactor);
-}
-inline bool	P_TeleportMove(AActor* thing, const fixedvec3 &pos, bool telefrag, bool modifyactor = true)
-{
-	return P_TeleportMove(thing, DVector3(FIXED2DBL(pos.x), FIXED2DBL(pos.y), FIXED2DBL(pos.z)), telefrag, modifyactor);
-}
-
 void	P_PlayerStartStomp (AActor *actor, bool mononly=false);		// [RH] Stomp on things for a newly spawned player
 void	P_SlideMove (AActor* mo, const DVector2 &pos, int numsteps);
 bool	P_BounceWall (AActor *mo);

src/p_spec.cpp

@@ -453,7 +453,7 @@ static void DoSectorDamage(AActor *actor, sector_t *sec, int amount, FName type,
 	if (!(flags & DAMAGE_PLAYERS) && actor->player != NULL)
 		return;
 
-	if (!(flags & DAMAGE_IN_AIR) && actor->_f_Z() != sec->floorplane.ZatPoint(actor) && !actor->waterlevel)
+	if (!(flags & DAMAGE_IN_AIR) && !actor->isAtZ(sec->floorplane.ZatPointF(actor)) && !actor->waterlevel)
 		return;
 
 	if (protectClass != NULL)
@@ -490,21 +490,21 @@ void P_SectorDamage(int tag, int amount, FName type, PClassActor *protectClass,
 			{
 				next = actor->snext;
 				// Only affect actors touching the 3D floor
-				fixed_t z1 = sec->floorplane.ZatPoint(actor);
-				fixed_t z2 = sec->ceilingplane.ZatPoint(actor);
+				double z1 = sec->floorplane.ZatPointF(actor);
+				double z2 = sec->ceilingplane.ZatPointF(actor);
 				if (z2 < z1)
 				{
 					// Account for Vavoom-style 3D floors
-					fixed_t zz = z1;
+					double zz = z1;
 					z1 = z2;
 					z2 = zz;
 				}
-				if (actor->_f_Z() + actor->_f_height() > z1)
+				if (actor->Top() > z1)
 				{
 					// If DAMAGE_IN_AIR is used, anything not beneath the 3D floor will be
 					// damaged (so, anything touching it or above it). Other 3D floors between
 					// the actor and this one will not stop this effect.
-					if ((flags & DAMAGE_IN_AIR) || actor->_f_Z() <= z2)
+					if ((flags & DAMAGE_IN_AIR) || !actor->isAbove(z2))
 					{
 						// Here we pass the DAMAGE_IN_AIR flag to disable the floor check, since it
 						// only works with the real sector's floor. We did the appropriate height checks
@@ -901,15 +901,15 @@ void P_SetupPortals()
 	}
 }
 
-static void SetPortal(sector_t *sector, int plane, ASkyViewpoint *portal, fixed_t alpha)
+static void SetPortal(sector_t *sector, int plane, ASkyViewpoint *portal, double alpha)
 {
 	// plane: 0=floor, 1=ceiling, 2=both
 	if (plane > 0)
 	{
 		if (sector->SkyBoxes[sector_t::ceiling] == NULL || !barrier_cast<ASkyViewpoint*>(sector->SkyBoxes[sector_t::ceiling])->bAlways)
 		{
 			sector->SkyBoxes[sector_t::ceiling] = portal;
-			if (sector->GetAlpha(sector_t::ceiling) == OPAQUE)
+			if (sector->GetAlphaF(sector_t::ceiling) == 1.)
 				sector->SetAlpha(sector_t::ceiling, alpha);
 
 			if (!portal->bAlways) sector->SetTexture(sector_t::ceiling, skyflatnum);
@@ -921,14 +921,14 @@ static void SetPortal(sector_t *sector, int plane, ASkyViewpoint *portal, fixed_
 		{
 			sector->SkyBoxes[sector_t::floor] = portal;
 		}
-		if (sector->GetAlpha(sector_t::floor) == OPAQUE)
+		if (sector->GetAlphaF(sector_t::floor) == 1.)
 			sector->SetAlpha(sector_t::floor, alpha);
 
 		if (!portal->bAlways) sector->SetTexture(sector_t::floor, skyflatnum);
 	}
 }
 
-static void CopyPortal(int sectortag, int plane, ASkyViewpoint *origin, fixed_t alpha, bool tolines)
+static void CopyPortal(int sectortag, int plane, ASkyViewpoint *origin, double alpha, bool tolines)
 {
 	int s;
 	FSectorTagIterator itr(sectortag);
@@ -962,7 +962,7 @@ static void CopyPortal(int sectortag, int plane, ASkyViewpoint *origin, fixed_t
 	}
 }
 
-void P_SpawnPortal(line_t *line, int sectortag, int plane, int alpha, int linked)
+void P_SpawnPortal(line_t *line, int sectortag, int plane, int bytealpha, int linked)
 {
 	if (plane < 0 || plane > 2 || (linked && plane == 2)) return;
 	for (int i=0;i<numlines;i++)
@@ -980,7 +980,7 @@ void P_SpawnPortal(line_t *line, int sectortag, int plane, int alpha, int linked
 			DVector3 pos2((lines[i].v1->fX() + lines[i].v2->fX()) / 2, (lines[i].v1->fY() + lines[i].v2->fY()) / 2, 0);
 			double z = linked ? line->frontsector->GetPlaneTexZF(plane) : 0;	// the map's sector height defines the portal plane for linked portals
 
-			fixed_t alpha = Scale (lines[i].args[4], OPAQUE, 255);
+			double alpha = bytealpha / 255.;
 
 			AStackPoint *anchor = Spawn<AStackPoint>(pos1, NO_REPLACE);
 			AStackPoint *reference = Spawn<AStackPoint>(pos2, NO_REPLACE);
@@ -1012,7 +1012,7 @@ void P_SpawnSkybox(ASkyViewpoint *origin)
 	if (Sector == NULL)
 	{
 		Printf("Sector not initialized for SkyCamCompat\n");
-		origin->Sector = Sector = P_PointInSector(origin->_f_X(), origin->_f_Y());
+		origin->Sector = Sector = P_PointInSector(origin->Pos());
 	}
 	if (Sector)
 	{
@@ -1410,7 +1410,7 @@ void P_SpawnSpecials (void)
 
 			case Init_Damage:
 				{
-					int damage = P_AproxDistance (lines[i].dx, lines[i].dy) >> FRACBITS;
+					int damage = int(lines[i].Delta().Length());
 					FSectorTagIterator itr(lines[i].args[0]);
 					while ((s = itr.Next()) >= 0)
 					{

src/p_spec.h

@@ -878,11 +878,7 @@ inline void P_SpawnTeleportFog(AActor *mobj, double x, double y, double z, bool
 }
 */
 
-bool P_Teleport (AActor *thing, fixed_t x, fixed_t y, fixed_t z, DAngle angle, int flags); // bool useFog, bool sourceFog, bool keepOrientation, bool haltVelocity = true, bool keepHeight = false
-inline bool P_Teleport(AActor *thing, const DVector3 &pos, DAngle angle, int flags)
-{
-	return P_Teleport(thing, FLOAT2FIXED(pos.X), FLOAT2FIXED(pos.Y), FLOAT2FIXED(pos.Z), angle, flags);
-}
+inline bool P_Teleport(AActor *thing, DVector3 pos, DAngle angle, int flags);
 bool EV_Teleport (int tid, int tag, line_t *line, int side, AActor *thing, int flags);
 bool EV_SilentLineTeleport (line_t *line, int side, AActor *thing, int id, INTBOOL reverse);
 bool EV_TeleportOther (int other_tid, int dest_tid, bool fog);

src/p_switch.cpp

@@ -59,7 +59,7 @@ class DActiveButton : public DThinker
 	DECLARE_CLASS (DActiveButton, DThinker)
 public:
 	DActiveButton ();
-	DActiveButton (side_t *, int, FSwitchDef *, fixed_t x, fixed_t y, bool flippable);
+	DActiveButton (side_t *, int, FSwitchDef *, const DVector2 &pos, bool flippable);
 
 	void Serialize (FArchive &arc);
 	void Tick ();
@@ -71,7 +71,7 @@ class DActiveButton : public DThinker
 	FSwitchDef		*m_SwitchDef;
 	SDWORD			m_Frame;
 	DWORD			m_Timer;
-	fixed_t			m_X, m_Y;	// Location of timer sound
+	DVector2		m_Pos;
 
 protected:
 	bool AdvanceFrame ();
@@ -85,7 +85,7 @@ class DActiveButton : public DThinker
 //
 //==========================================================================
 
-static bool P_StartButton (side_t *side, int Where, FSwitchDef *Switch, fixed_t x, fixed_t y, bool useagain)
+static bool P_StartButton (side_t *side, int Where, FSwitchDef *Switch, const DVector2 &pos, bool useagain)
 {
 	DActiveButton *button;
 	TThinkerIterator<DActiveButton> iterator;
@@ -100,7 +100,7 @@ static bool P_StartButton (side_t *side, int Where, FSwitchDef *Switch, fixed_t
 		}
 	}
 
-	new DActiveButton (side, Where, Switch, x, y, useagain);
+	new DActiveButton (side, Where, Switch, pos, useagain);
 	return true;
 }
 
@@ -185,13 +185,12 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
 		// Check 3D floors on back side
 		{
 			sector_t * back = line->sidedef[1 - sideno]->sector;
-			for (unsigned i = 0; i < back->e->XFloor.ffloors.Size(); i++)
+			for (auto rover : back->e->XFloor.ffloors)
 			{
-				F3DFloor *rover = back->e->XFloor.ffloors[i];
 				if (!(rover->flags & FF_EXISTS)) continue;
 				if (!(rover->flags & FF_UPPERTEXTURE)) continue;
 
-				if (user->Z() > rover->top.plane->ZatPoint(check) ||
+				if (user->isAbove(rover->top.plane->ZatPoint(check)) ||
 					user->Top() < rover->bottom.plane->ZatPoint(check))
 					continue;
 
@@ -213,7 +212,7 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
 				if (!(rover->flags & FF_EXISTS)) continue;
 				if (!(rover->flags & FF_LOWERTEXTURE)) continue;
 
-				if (user->Z() > rover->top.plane->ZatPoint(check) ||
+				if (user->isAbove(rover->top.plane->ZatPoint(check)) ||
 					user->Top() < rover->bottom.plane->ZatPoint(check))
 					continue;
 
@@ -230,12 +229,12 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
 		// to keep compatibility with Eternity's implementation.
 		if (!P_GetMidTexturePosition(line, sideno, &checktop, &checkbot))
 			return false;
-		return user->Z() < checktop && user->Top() > checkbot;
+		return user->isBelow(checktop) && user->Top() > checkbot;
 	}
 	else
 	{
 		// no switch found. Check whether the player can touch either top or bottom texture
-		return (user->Top() > open.top) || (user->Z() < open.bottom);
+		return (user->Top() > open.top) || (user->isBelow(open.bottom));
 	}
 }
 
@@ -292,24 +291,21 @@ bool P_ChangeSwitchTexture (side_t *side, int useAgain, BYTE special, bool *ques
 	//		which wasn't necessarily anywhere near the switch if it was
 	//		facing a big sector (and which wasn't necessarily for the
 	//		button just activated, either).
-	fixed_t pt[2];
-	line_t *line = side->linedef;
+	DVector2 pt(side->linedef->v1->fPos() + side->linedef->Delta() / 2);
 	bool playsound;
 
-	pt[0] = line->v1->x + (line->dx >> 1);
-	pt[1] = line->v1->y + (line->dy >> 1);
 	side->SetTexture(texture, Switch->frames[0].Texture);
 	if (useAgain || Switch->NumFrames > 1)
 	{
-		playsound = P_StartButton (side, texture, Switch, pt[0], pt[1], !!useAgain);
+		playsound = P_StartButton (side, texture, Switch, pt, !!useAgain);
 	}
 	else 
 	{
 		playsound = true;
 	}
 	if (playsound)
 	{
-		S_Sound (DVector3(FIXED2DBL(pt[0]), FIXED2DBL(pt[1]), 0), CHAN_VOICE|CHAN_LISTENERZ, sound, 1, ATTN_STATIC);
+		S_Sound (DVector3(pt, 0), CHAN_VOICE|CHAN_LISTENERZ, sound, 1, ATTN_STATIC);
 	}
 	if (quest != NULL)
 	{
@@ -332,20 +328,18 @@ DActiveButton::DActiveButton ()
 	m_Part = -1;
 	m_SwitchDef = 0;
 	m_Timer = 0;
-	m_X = 0;
-	m_Y = 0;
+	m_Pos = { 0,0 };
 	bFlippable = false;
 	bReturning = false;
 	m_Frame = 0;
 }
 
 DActiveButton::DActiveButton (side_t *side, int Where, FSwitchDef *Switch,
-							  fixed_t x, fixed_t y, bool useagain)
+							  const DVector2 &pos, bool useagain)
 {
 	m_Side = side;
 	m_Part = SBYTE(Where);
-	m_X = x;
-	m_Y = y;
+	m_Pos = pos;
 	bFlippable = useagain;
 	bReturning = false;
 
@@ -363,7 +357,7 @@ DActiveButton::DActiveButton (side_t *side, int Where, FSwitchDef *Switch,
 void DActiveButton::Serialize (FArchive &arc)
 {
 	Super::Serialize (arc);
-	arc << m_Side << m_Part << m_SwitchDef << m_Frame << m_Timer << bFlippable << m_X << m_Y << bReturning;
+	arc << m_Side << m_Part << m_SwitchDef << m_Frame << m_Timer << bFlippable << m_Pos << bReturning;
 }
 
 //==========================================================================
@@ -391,7 +385,7 @@ void DActiveButton::Tick ()
 			if (def != NULL)
 			{
 				m_Frame = -1;
-				S_Sound (DVector3(FIXED2DBL(m_X), FIXED2DBL(m_Y), 0), CHAN_VOICE|CHAN_LISTENERZ,
+				S_Sound (DVector3(m_Pos, 0), CHAN_VOICE|CHAN_LISTENERZ,
 					def->Sound != 0 ? FSoundID(def->Sound) : FSoundID("switches/normbutn"),
 					1, ATTN_STATIC);
 				bFlippable = false;