Merge branch 'master' into gonesolong

Conflicts:
	src/CMakeLists.txt
	src/b_think.cpp
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_fighterplayer.cpp
	src/namedef.h
	src/p_enemy.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/p_teleport.cpp
	src/sc_man_tokens.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_function.cpp
	src/thingdef/thingdef_parse.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt

- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
  were added to thingdef_function.cpp over the past year, as this file no
  longer exists in this branch.

src/b_bot.cpp

@@ -1,7 +1,7 @@
-// Cajun bot console commands.
+// Cajun bot
 //
-// [RH] Moved out of d_netcmd.c (in Cajun source), because they don't really
-// belong there.
+// [RH] Moved console commands out of d_netcmd.c (in Cajun source), because
+// they don't really belong there.
 
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -14,6 +14,102 @@
 #include "d_net.h"
 #include "farchive.h"
 
+IMPLEMENT_POINTY_CLASS(DBot)
+ DECLARE_POINTER(dest)
+ DECLARE_POINTER(prev)
+ DECLARE_POINTER(enemy)
+ DECLARE_POINTER(missile)
+ DECLARE_POINTER(mate)
+ DECLARE_POINTER(last_mate)
+END_POINTERS
+
+DBot::DBot ()
+: DThinker(STAT_BOT)
+{
+	Clear ();
+}
+
+void DBot::Clear ()
+{
+	player = NULL;
+	angle = 0;
+	dest = NULL;
+	prev = NULL;
+	enemy = NULL;
+	missile = NULL;
+	mate = NULL;
+	last_mate = NULL;
+	memset(&skill, 0, sizeof(skill));
+	t_active = 0;
+	t_respawn = 0;
+	t_strafe = 0;
+	t_react = 0;
+	t_fight = 0;
+	t_roam = 0;
+	t_rocket = 0;
+	first_shot = true;
+	sleft = false;
+	allround = false;
+	increase = false;
+	oldx = 0;
+	oldy = 0;
+}
+
+void DBot::Serialize (FArchive &arc)
+{
+	Super::Serialize (arc);
+
+	if (SaveVersion < 4515)
+	{
+		angle_t savedyaw;
+		int savedpitch;
+		arc << savedyaw
+			<< savedpitch;
+	}
+	else
+	{
+		arc << player;
+	}
+
+	arc << angle
+		<< dest
+		<< prev
+		<< enemy
+		<< missile
+		<< mate
+		<< last_mate
+		<< skill
+		<< t_active
+		<< t_respawn
+		<< t_strafe
+		<< t_react
+		<< t_fight
+		<< t_roam
+		<< t_rocket
+		<< first_shot
+		<< sleft
+		<< allround
+		<< increase
+		<< oldx
+		<< oldy;
+}
+
+void DBot::Tick ()
+{
+	Super::Tick ();
+
+	if (player->mo == NULL || bglobal.freeze)
+	{
+		return;
+	}
+
+	BotThinkCycles.Clock();
+	bglobal.m_Thinking = true;
+	Think ();
+	bglobal.m_Thinking = false;
+	BotThinkCycles.Unclock();
+}
+
 CVAR (Int, bot_next_color, 11, 0)
 CVAR (Bool, bot_observer, false, 0)
 
@@ -55,9 +151,14 @@ void FCajunMaster::ClearPlayer (int i, bool keepTeam)
 		bot = bot->next;
 	if (bot)
 	{
-		bot->inuse = false;
+		bot->inuse = BOTINUSE_No;
 		bot->lastteam = keepTeam ? players[i].userinfo.GetTeam() : TEAM_NONE;
 	}
+	if (players[i].Bot != NULL)
+	{
+		players[i].Bot->Destroy ();
+		players[i].Bot = NULL;
+	}
 	players[i].~player_t();
 	::new(&players[i]) player_t;
 	players[i].userinfo.Reset();
@@ -66,6 +167,12 @@ void FCajunMaster::ClearPlayer (int i, bool keepTeam)
 
 CCMD (removebots)
 {
+	if (!players[consoleplayer].settings_controller)
+	{
+		Printf ("Only setting controllers can remove bots\n");
+		return;
+	}
+
 	Net_WriteByte (DEM_KILLBOTS);
 }
 
@@ -91,7 +198,7 @@ CCMD (listbots)
 
 	while (thebot)
 	{
-		Printf ("%s%s\n", thebot->name, thebot->inuse ? " (active)" : "");
+		Printf ("%s%s\n", thebot->name, thebot->inuse == BOTINUSE_Yes ? " (active)" : "");
 		thebot = thebot->next;
 		count++;
 	}