pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 12:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_mem

Browse Source
This commit is contained in:
KimLS
2013-02-22 22:36:30 -08:00
parent 9eaa98675b 1b44123551
commit 8c425ff9d8
9 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/aggro.cpp
+9
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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