Merge branch 'master' of https://github.com/rheit/zdoom

src/b_bot.cpp

@@ -30,8 +30,6 @@ DBot::DBot ()
 
 void DBot::Clear ()
 {
-	savedyaw = 0;
-	savedpitch = 0;
 	angle = 0;
 	dest = NULL;
 	prev = NULL;
@@ -59,9 +57,15 @@ void DBot::Serialize (FArchive &arc)
 {
 	Super::Serialize (arc);
 
-	arc << savedyaw
+	if (SaveVersion < 4515)
-		<< savedpitch
+	{
-		<< angle
+		angle_t savedyaw;
+		int savedpitch;
+		arc << savedyaw
+			<< savedpitch;
+	}
+
+	arc << angle
 		<< dest
 		<< prev
 		<< enemy

src/b_bot.h

@@ -165,9 +165,6 @@ public:
 	void Clear ();
 	void Serialize (FArchive &arc);
 
-	angle_t		savedyaw;
-	int			savedpitch;
-
 	angle_t		angle;		// The wanted angle that the bot try to get every tic.
 							//  (used to get a smooth view movement)
 	TObjPtr<AActor>		dest;		// Move Destination.

src/b_game.cpp

@@ -102,7 +102,7 @@ void FCajunMaster::Main (int buf)
 
 	BotThinkCycles.Reset();
 
-	if (consoleplayer != Net_Arbitrator || demoplayback)
+	if (demoplayback)
 		return;
 
 	if (gamestate != GS_LEVEL)
@@ -122,37 +122,40 @@ void FCajunMaster::Main (int buf)
 		BotThinkCycles.Unclock();
 	}
 
-	//Add new bots?
+	if (consoleplayer == Net_Arbitrator)
-	if (wanted_botnum > botnum && !freeze)
 	{
-		if (t_join == ((wanted_botnum - botnum) * SPAWN_DELAY))
+		//Add new bots?
+		if (wanted_botnum > botnum && !freeze)
 		{
-            if (!SpawnBot (getspawned[spawn_tries]))
+			if (t_join == ((wanted_botnum - botnum) * SPAWN_DELAY))
-				wanted_botnum--;
+			{
-            spawn_tries++;
+				if (!SpawnBot (getspawned[spawn_tries]))
+					wanted_botnum--;
+				spawn_tries++;
+			}
+
+			t_join--;
 		}
 
-		t_join--;
+		//Check if player should go observer. Or un observe
-	}
+		if (bot_observer && !observer && !netgame)
-
+		{
-	//Check if player should go observer. Or un observe
+			Printf ("%s is now observer\n", players[consoleplayer].userinfo.GetName());
-	if (bot_observer && !observer && !netgame)
+			observer = true;
-	{
+			players[consoleplayer].mo->UnlinkFromWorld ();
-		Printf ("%s is now observer\n", players[consoleplayer].userinfo.GetName());
+			players[consoleplayer].mo->flags = MF_DROPOFF|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH|MF_NOGRAVITY|MF_FRIENDLY;
-		observer = true;
+			players[consoleplayer].mo->flags2 |= MF2_FLY;
-		players[consoleplayer].mo->UnlinkFromWorld ();
+			players[consoleplayer].mo->LinkToWorld ();
-		players[consoleplayer].mo->flags = MF_DROPOFF|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOTDMATCH|MF_NOGRAVITY|MF_FRIENDLY;
+		}
-		players[consoleplayer].mo->flags2 |= MF2_FLY;
+		else if (!bot_observer && observer && !netgame) //Go back
-		players[consoleplayer].mo->LinkToWorld ();
+		{
-	}
+			Printf ("%s returned to the fray\n", players[consoleplayer].userinfo.GetName());
-	else if (!bot_observer && observer && !netgame) //Go back
+			observer = false;
-	{
+			players[consoleplayer].mo->UnlinkFromWorld ();
-		Printf ("%s returned to the fray\n", players[consoleplayer].userinfo.GetName());
+			players[consoleplayer].mo->flags = MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH|MF_FRIENDLY;
-		observer = false;
+			players[consoleplayer].mo->flags2 &= ~MF2_FLY;
-		players[consoleplayer].mo->UnlinkFromWorld ();
+			players[consoleplayer].mo->LinkToWorld ();
-		players[consoleplayer].mo->flags = MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH|MF_FRIENDLY;
+		}
-		players[consoleplayer].mo->flags2 &= ~MF2_FLY;
-		players[consoleplayer].mo->LinkToWorld ();
 	}
 
 	m_Thinking = false;
@@ -348,11 +351,8 @@ void FCajunMaster::TryAddBot (BYTE **stream, int player)
 
 	if (DoAddBot ((BYTE *)info, skill))
 	{
-		if (consoleplayer == Net_Arbitrator)
+		//Increment this.
-		{
+		botnum++;
-			//Increment this.
-			botnum++;
-		}
 
 		if (thebot != NULL)
 		{

src/c_console.cpp

@@ -561,6 +561,11 @@ int PrintString (int printlevel, const char *outline)
 			maybedrawnow (false, false);
 		}
 	}
+	else if (Logfile != NULL)
+	{
+		fputs (outline, Logfile);
+		fflush (Logfile);
+	}
 	return (int)strlen (outline);
 }
 

src/d_main.cpp

@@ -975,25 +975,6 @@ void D_DoomLoop ()
 				I_StartTic ();
 				D_ProcessEvents ();
 				G_BuildTiccmd (&netcmds[consoleplayer][maketic%BACKUPTICS]);
-				//Added by MC: For some of that bot stuff. The main bot function.
-				int i;
-				for (i = 0; i < MAXPLAYERS; i++)
-				{
-					if (playeringame[i] && players[i].Bot != NULL && players[i].mo)
-					{
-						players[i].Bot->savedyaw = players[i].mo->angle;
-						players[i].Bot->savedpitch = players[i].mo->pitch;
-					}
-				}
-				bglobal.Main (maketic%BACKUPTICS);
-				for (i = 0; i < MAXPLAYERS; i++)
-				{
-					if (playeringame[i] && players[i].Bot != NULL && players[i].mo)
-					{
-						players[i].mo->angle = players[i].Bot->savedyaw;
-						players[i].mo->pitch = players[i].Bot->savedpitch;
-					}
-				}
 				if (advancedemo)
 					D_DoAdvanceDemo ();
 				C_Ticker ();

src/d_net.cpp

@@ -691,9 +691,6 @@ void PlayerIsGone (int netnode, int netconsole)
 
 	if (netconsole == Net_Arbitrator)
 	{
-		bglobal.RemoveAllBots(true);
-		Printf("Removed all bots\n");
-
 		// Pick a new network arbitrator
 		for (int i = 0; i < MAXPLAYERS; i++)
 		{
@@ -824,7 +821,6 @@ void GetPackets (void)
 		}
 
 		if (netbuffer[0] & NCMD_QUITTERS)
-
 		{
 			numplayers = netbuffer[k++];
 			for (int i = 0; i < numplayers; ++i)
@@ -902,64 +898,18 @@ void GetPackets (void)
 
 			for (i = 0; i < numplayers; ++i)
 			{
-				int node = (players[playerbytes[i]].Bot == NULL) ?
+				int node = nodeforplayer[playerbytes[i]];
-					nodeforplayer[playerbytes[i]] : netnode;
 
 				SkipTicCmd (&start, nettics[node] - realstart);
 				for (tics = nettics[node]; tics < realend; tics++)
 					ReadTicCmd (&start, playerbytes[i], tics);
-			}
-			// Update the number of tics received from each node. This must
-			// be separate from the above loop in case the master is also
-			// sending bot movements. If it's not separate, then the bots
-			// will only move on the master, because the other players will
-			// read the master's tics and then think they already got all
-			// the tics for the bots and skip the bot tics included in the
-			// packet.
-			for (i = 0; i < numplayers; ++i)
-			{
-				if (players[playerbytes[i]].Bot == NULL)
-				{
-					nettics[nodeforplayer[playerbytes[i]]] = realend;
-				}
-			}
-		}
-	}
-}
 
-void AdjustBots (int gameticdiv)
+				nettics[nodeforplayer[playerbytes[i]]] = realend;
-{
-	// [RH] This loop adjusts the bots' rotations for ticcmds that have
-	// been already created but not yet executed. This way, the bot is still
-	// able to create ticcmds that accurately reflect the state it wants to
-	// be in even when gametic lags behind maketic.
-	for (int i = 0; i < MAXPLAYERS; i++)
-	{
-		if (playeringame[i] && players[i].Bot != NULL && players[i].mo)
-		{
-			players[i].Bot->savedyaw = players[i].mo->angle;
-			players[i].Bot->savedpitch = players[i].mo->pitch;
-			for (int j = gameticdiv; j < maketic/ticdup; j++)
-			{
-				players[i].mo->angle += (netcmds[i][j%BACKUPTICS].ucmd.yaw << 16) * ticdup;
-				players[i].mo->pitch -= (netcmds[i][j%BACKUPTICS].ucmd.pitch << 16) * ticdup;
 			}
 		}
 	}
 }
 
-void UnadjustBots ()
-{
-	for (int i = 0; i < MAXPLAYERS; i++)
-	{
-		if (playeringame[i] && players[i].Bot != NULL && players[i].mo)
-		{
-			players[i].mo->angle = players[i].Bot->savedyaw;
-			players[i].mo->pitch = players[i].Bot->savedpitch;
-		}
-	}
-}
-
 //
 // NetUpdate
 // Builds ticcmds for console player,
@@ -1006,9 +956,7 @@ void NetUpdate (void)
 		newtics = 0;
 	}
 
-	// build new ticcmds for console player (and bots if I am the arbitrator)
+	// build new ticcmds for console player
-	AdjustBots (gametic / ticdup);
-
 	for (i = 0; i < newtics; i++)
 	{
 		I_StartTic ();
@@ -1018,11 +966,6 @@ void NetUpdate (void)
 		
 		//Printf ("mk:%i ",maketic);
 		G_BuildTiccmd (&localcmds[maketic % LOCALCMDTICS]);
-		if (maketic % ticdup == 0)
-		{
-			//Added by MC: For some of that bot stuff. The main bot function.
-			bglobal.Main ((maketic / ticdup) % BACKUPTICS);
-		}
 		maketic++;
 
 		if (ticdup == 1 || maketic == 0)
@@ -1102,8 +1045,6 @@ void NetUpdate (void)
 		}
 	}
 
-	UnadjustBots ();
-
 	if (singletics)
 		return; 		// singletic update is synchronous
 
@@ -1123,14 +1064,11 @@ void NetUpdate (void)
 
 	if (consoleplayer == Net_Arbitrator)
 	{
-		for (j = 0; j < MAXPLAYERS; j++)
+		for (j = 0; j < doomcom.numnodes; j++)
 		{
-			if (playeringame[j])
+			if (nodeingame[j] && NetMode == NET_PacketServer)
 			{
-				if (players[j].Bot != NULL || NetMode == NET_PacketServer)
+				count++;
-				{
-					count++;
-				}
 			}
 		}
 
@@ -1265,15 +1203,12 @@ void NetUpdate (void)
 				netbuffer[0] |= NCMD_MULTI;
 				netbuffer[k++] = count;
 
-				for (l = 1, j = 0; j < MAXPLAYERS; j++)
+				for (l = 1, j = 0; j < doomcom.numnodes; j++)
 				{
-					if (playeringame[j] && j != playerfornode[i] && j != consoleplayer)
+					if (nodeingame[j] && j != i && j != nodeforplayer[consoleplayer] && NetMode == NET_PacketServer)
 					{
-						if (players[j].Bot != NULL || NetMode == NET_PacketServer)
+						playerbytes[l++] = playerfornode[j];
-						{
+						netbuffer[k++] = playerfornode[j];
-							playerbytes[l++] = j;
-							netbuffer[k++] = j;
-						}
 					}
 				}
 			}
@@ -1293,7 +1228,7 @@ void NetUpdate (void)
 					prev %= BACKUPTICS;
 
 					// The local player has their tics sent first, followed by
-					// the other players/bots.
+					// the other players.
 					if (l == 0)
 					{
 						WriteWord (localcmds[localstart].consistancy, &cmddata);
@@ -1308,23 +1243,17 @@ void NetUpdate (void)
 					}
 					else if (i != 0)
 					{
-						if (players[playerbytes[l]].Bot != NULL)
+						int len;
-						{
+						BYTE *spec;
-							WriteWord (0, &cmddata);	// fake consistancy word
-						}
-						else
-						{
-							int len;
-							BYTE *spec;
 
-							WriteWord (netcmds[playerbytes[l]][start].consistancy, &cmddata);
+						WriteWord (netcmds[playerbytes[l]][start].consistancy, &cmddata);
-							spec = NetSpecs[playerbytes[l]][start].GetData (&len);
+						spec = NetSpecs[playerbytes[l]][start].GetData (&len);
-							if (spec != NULL)
+						if (spec != NULL)
-							{
+						{
-								memcpy (cmddata, spec, len);
+							memcpy (cmddata, spec, len);
-								cmddata += len;
+							cmddata += len;
-							}
 						}
+
 						WriteUserCmdMessage (&netcmds[playerbytes[l]][start].ucmd,
 							prev >= 0 ? &netcmds[playerbytes[l]][prev].ucmd : NULL, &cmddata);
 					}

src/g_game.cpp

@@ -1127,6 +1127,12 @@ void G_Ticker ()
 	// check, not just the player's x position like BOOM.
 	DWORD rngsum = FRandom::StaticSumSeeds ();
 
+	if ((gametic % ticdup) == 0)
+	{
+		//Added by MC: For some of that bot stuff. The main bot function.
+		bglobal.Main (buf);
+	}
+
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (playeringame[i])

src/p_acs.cpp

@@ -2881,9 +2881,57 @@ DACSThinker::~DACSThinker ()
 void DACSThinker::Serialize (FArchive &arc)
 {
 	int scriptnum;
+	int scriptcount = 0;
 
 	Super::Serialize (arc);
-	arc << Scripts << LastScript;
+	if (SaveVersion < 4515)
+		arc << Scripts << LastScript;
+	else
+	{
+		if (arc.IsStoring())
+		{
+			DLevelScript *script;
+			script = Scripts;
+			while (script)
+			{
+				scriptcount++;
+
+				// We want to store this list backwards, so we can't loose the last pointer
+				if (script->next == NULL)
+					break;
+				script = script->next;
+			}
+			arc << scriptcount;
+
+			while (script)
+			{
+				arc << script;
+				script = script->prev;
+			}
+		}
+		else
+		{
+			// We are running through this list backwards, so the next entry is the last processed
+			DLevelScript *next = NULL;
+			arc << scriptcount;
+			Scripts = NULL;
+			LastScript = NULL;
+			for (int i = 0; i < scriptcount; i++)
+			{
+				arc << Scripts;
+
+				Scripts->next = next;
+				Scripts->prev = NULL;
+				if (next != NULL)
+					next->prev = Scripts;
+
+				next = Scripts;
+
+				if (i == 0)
+					LastScript = Scripts;
+			}
+		}
+	}
 	if (arc.IsStoring ())
 	{
 		ScriptMap::Iterator it(RunningScripts);
@@ -2969,7 +3017,8 @@ void DLevelScript::Serialize (FArchive &arc)
 	DWORD i;
 
 	Super::Serialize (arc);
-	arc << next << prev;
+	if (SaveVersion < 4515)
+		arc << next << prev;
 
 	P_SerializeACSScriptNumber(arc, script, false);
 

src/p_interaction.cpp

@@ -606,7 +606,7 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags)
 		player->respawn_time = level.time + TICRATE;
 
 		//Added by MC: Respawn bots
-		if (bglobal.botnum && consoleplayer == Net_Arbitrator && !demoplayback)
+		if (bglobal.botnum && !demoplayback)
 		{
 			if (player->Bot != NULL)
 				player->Bot->t_respawn = (pr_botrespawn()%15)+((bglobal.botnum-1)*2)+TICRATE+1;

src/p_mobj.cpp

@@ -3228,7 +3228,7 @@ void AActor::Tick ()
 			}
 		}
 
-		if (bglobal.botnum && consoleplayer == Net_Arbitrator && !demoplayback &&
+		if (bglobal.botnum && !demoplayback &&
 			((flags & (MF_SPECIAL|MF_MISSILE)) || (flags3 & MF3_ISMONSTER)))
 		{
 			BotSupportCycles.Clock();

src/thingdef/thingdef_codeptr.cpp

@@ -3781,6 +3781,17 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseSiblings)
 	}
 }
 
+//===========================================================================
+//
+// [TP] A_FaceConsolePlayer
+//
+//===========================================================================
+DEFINE_ACTION_FUNCTION_PARAMS (AActor, A_FaceConsolePlayer) {
+	ACTION_PARAM_START (1);
+	ACTION_PARAM_ANGLE (MaxTurnAngle, 0);
+	// NOTE: It does nothing for zdoom.
+}
+
 //===========================================================================
 //
 // A_MonsterRefire
@@ -4678,7 +4689,7 @@ enum RadiusGiveFlags
 	RGF_OBJECTS		=   1 << 3,
 	RGF_VOODOO		=	1 << 4,
 	RGF_CORPSES		=	1 << 5,
-	RGF_MASK		=	63,
+	RGF_MASK		=	2111,
 	RGF_NOTARGET	=	1 << 6,
 	RGF_NOTRACER	=	1 << 7,
 	RGF_NOMASTER	=	1 << 8,

src/version.h

@@ -76,7 +76,7 @@ const char *GetVersionString();
 
 // Use 4500 as the base git save version, since it's higher than the
 // SVN revision ever got.
-#define SAVEVER 4514
+#define SAVEVER 4515
 
 #define SAVEVERSTRINGIFY2(x) #x
 #define SAVEVERSTRINGIFY(x) SAVEVERSTRINGIFY2(x)

wadsrc/static/actors/actor.txt

@@ -186,6 +186,7 @@ ACTOR Actor native //: Thinker
 	action native A_ClearSoundTarget();
 	action native A_FireAssaultGun();
 	action native A_CheckTerrain();
+	action native A_FaceConsolePlayer(float MaxTurnAngle = 0); // [TP]
 
 	action native A_MissileAttack();
 	action native A_MeleeAttack();