Merge branch 'master' into shared_mem

changelog.txt

@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 02/22/2013 ==
+demonstar55: Mobs will now be removed from XTargets when they get back to their way point, should be last instance of XTarget mobs not clearing when they are not aggroed anymore
+
 == 02/19/2013 ==
 Derision: World should no longer crash if the start_zone query fails at character creation.
 

common/servertalk.h

@@ -1,8 +1,6 @@
 #ifndef EQ_SOPCODES_H
 #define EQ_SOPCODES_H
 
-#define EQEMU_PROTOCOL_VERSION	"0.3.10"
-
 #include "../common/types.h"
 #include "../common/packet_functions.h"
 #include "../common/eq_packet_structs.h"

common/version.h

@@ -1,5 +1,5 @@
 /*  EQEMu:  Everquest Server Emulator
-    Copyright (C) 2001-2002  EQEMu Development Team (http://eqemu.org)
+    Copyright (C) 2001-2013  EQEMu Development Team (http://eqemulator.net)
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,16 +16,15 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef VERSION_H
+#ifndef _EQEMU_VERSION_H
-#define VERSION_H
+#define _EQEMU_VERSION_H
 
-#define CURRENT_VERSION	        "0.8.0"
+#define LOGIN_VERSION "0.8.0"
-#define CURRENT_CHAT_VERSION    "EQEmulator " CURRENT_VERSION
+#define EQEMU_PROTOCOL_VERSION "0.3.10"
-#define CURRENT_ZONE_VERSION	"EQEmulator " CURRENT_VERSION
+
-#define CURRENT_WORLD_VERSION   "EQEmulator " CURRENT_VERSION
+#define CURRENT_VERSION "1.0.0"
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
-#define	SVN_REVISION		"$Rev: 986 $"
 #ifndef WIN32
 	#define LAST_MODIFIED	__TIME__
 #else

world/LoginServer.cpp

@@ -268,7 +268,7 @@ void LoginServer::SendInfo() {
 	memset(pack->pBuffer, 0, pack->size);
 	ServerLSInfo_Struct* lsi = (ServerLSInfo_Struct*) pack->pBuffer;
 	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, CURRENT_VERSION);
+	strcpy(lsi->serverversion, LOGIN_VERSION);
 	strcpy(lsi->name, Config->LongName.c_str());
 	strcpy(lsi->account, LoginAccount);
 	strcpy(lsi->password, LoginPassword);
@@ -288,7 +288,7 @@ void LoginServer::SendNewInfo() {
 	memset(pack->pBuffer, 0, pack->size);
 	ServerNewLSInfo_Struct* lsi = (ServerNewLSInfo_Struct*) pack->pBuffer;
 	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, CURRENT_VERSION);
+	strcpy(lsi->serverversion, LOGIN_VERSION);
 	strcpy(lsi->name, Config->LongName.c_str());
 	strcpy(lsi->shortname, Config->ShortName.c_str());
 	strcpy(lsi->account, LoginAccount);

world/console.cpp

@@ -750,7 +750,7 @@ void Console::ProcessCommand(const char* command) {
 			}
 			else if (strcasecmp(sep.arg[0], "version") == 0 && admin >= consoleWorldStatus) {
 				SendMessage(1, "Current version information.");
-				SendMessage(1, "  %s", CURRENT_WORLD_VERSION);
+				SendMessage(1, "  %s", CURRENT_VERSION);
 				SendMessage(1, "  Compiled on: %s at %s", COMPILE_DATE, COMPILE_TIME);
 				SendMessage(1, "  Last modified on: %s", LAST_MODIFIED);
 			}

world/net.cpp

@@ -143,7 +143,7 @@ int main(int argc, char** argv) {
 		_log(WORLD__INIT, "Log settings loaded from %s", Config->LogSettingsFile.c_str());
 
 
-	_log(WORLD__INIT, "CURRENT_WORLD_VERSION:%s", CURRENT_WORLD_VERSION);
+	_log(WORLD__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
 	
 	#ifdef _DEBUG
 		_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);

zone/aggro.cpp

@@ -1422,6 +1422,15 @@ void Mob::RemoveFromFeignMemory(Client* attacker) {
 }
 
 void Mob::ClearFeignMemory() {
+    std::set<uint32>::iterator RememberedCharID = feign_memory_list.begin();
+    while (RememberedCharID != feign_memory_list.end()) 
+    {
+        Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
+        if(remember_client != NULL) //Still in zone
+            remember_client->RemoveXTarget(this, false);
+        ++RememberedCharID;
+    }
+
 	feign_memory_list.clear();
 	minLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMin);
 	maxLastFightingDelayMoving = RuleI(NPC, LastFightingDelayMovingMax);

zone/command.cpp

@@ -942,7 +942,7 @@ void command_help(Client *c, const Seperator *sep)
 void command_version(Client *c, const Seperator *sep)
 {
 	c->Message(0, "Current version information.");
-	c->Message(0, "	%s", CURRENT_ZONE_VERSION);
+	c->Message(0, "	%s", CURRENT_VERSION);
 	c->Message(0, "	Compiled on: %s at %s", COMPILE_DATE, COMPILE_TIME);
 	c->Message(0, "	Last modified on: %s", LAST_MODIFIED);
 }

zone/net.cpp

@@ -200,7 +200,7 @@ int main(int argc, char** argv) {
 	_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 	
-	_log(ZONE__INIT, "CURRENT_ZONE_VERSION: %s", CURRENT_ZONE_VERSION);
+	_log(ZONE__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
 	
 	/*
 	 * Setup nice signal handlers