Merge pull request #921 from EQEmu/master_build_revert

Build merge into master again

zone/client.cpp

@@ -41,7 +41,6 @@ extern volatile bool RunLoops;
 #include "../common/profanity_manager.h"
 #include "data_bucket.h"
 #include "position.h"
-#include "net.h"
 #include "worldserver.h"
 #include "zonedb.h"
 #include "petitions.h"
@@ -67,6 +66,8 @@ extern PetitionList petition_list;
 bool commandlogged;
 char entirecommand[255];
 
+void UpdateWindowTitle(char* iNewTitle);
+
 Client::Client(EQStreamInterface* ieqs)
 : Mob("No name",	// name
 	"",	// lastname
@@ -244,7 +245,7 @@ Client::Client(EQStreamInterface* ieqs)
 	PendingRezzSpellID = 0;
 	numclients++;
 	// emuerror;
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	horseId = 0;
 	tgb = false;
 	tribute_master_id = 0xFFFFFFFF;
@@ -454,7 +455,7 @@ Client::~Client() {
 	ClearRespawnOptions();
 
 	numclients--;
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	if(zone)
 		zone->RemoveAuth(GetName(), lskey);