diff options
| author | Barbz <yhool_server@gmx.com> | 2017-06-30 18:16:17 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2017-08-19 19:47:35 +0200 |
| commit | f794ad2acfd8156ffe60ea5df1233ff5bb63be53 (patch) | |
| tree | 4a27a4a1262e5aaa2e05a353e1e3349bffc666f1 | |
| parent | c1586e0d995de5dd278b0acfe410acf66f6c2c6d (diff) | |
Fixed these 3 fatal errors for travis build (thanks to @Talamortis )
# Conflicts:
# src/authserver/Server/AuthSocket.cpp
# src/game/AI/SmartScripts/SmartScript.cpp
| -rw-r--r-- | src/authserver/Server/AuthSocket.cpp | 5 | ||||
| -rw-r--r-- | src/game/AI/CreatureAISelector.cpp | 2 | ||||
| -rw-r--r-- | src/game/AI/SmartScripts/SmartScript.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/authserver/Server/AuthSocket.cpp b/src/authserver/Server/AuthSocket.cpp index d53f7fcc48..7631140790 100644 --- a/src/authserver/Server/AuthSocket.cpp +++ b/src/authserver/Server/AuthSocket.cpp @@ -547,11 +547,10 @@ bool AuthSocket::_HandleLogonChallenge() for (int i = 0; i < 4; ++i) _localizationName[i] = ch->country[4-i-1]; + #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS - sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(), + sLog->outDebug( LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) ); #endif - // _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) - // ); ///- All good, await client's proof _status = STATUS_LOGON_PROOF; diff --git a/src/game/AI/CreatureAISelector.cpp b/src/game/AI/CreatureAISelector.cpp index e45097b7aa..cde8e0b816 100644 --- a/src/game/AI/CreatureAISelector.cpp +++ b/src/game/AI/CreatureAISelector.cpp @@ -134,7 +134,7 @@ namespace FactorySelector //future goAI types go here // xinef: unused - //std::string ainame = (ai_factory == NULL || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key(); + std::string ainame = (ai_factory == NULL || go->GetScriptId()) ? "NullGameObjectAI" : ai_factory->key(); #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS sLog->outDebug(LOG_FILTER_TSCR, "GameObject %u used AI is %s.", go->GetGUIDLow(), ainame.c_str()); diff --git a/src/game/AI/SmartScripts/SmartScript.cpp b/src/game/AI/SmartScripts/SmartScript.cpp index 527c9c6694..9eceda60bd 100644 --- a/src/game/AI/SmartScripts/SmartScript.cpp +++ b/src/game/AI/SmartScripts/SmartScript.cpp @@ -144,8 +144,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (unit) mLastInvoker = unit->GetGUID(); - //if (Unit* tempInvoker = GetLastInvoker()) #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS + if (Unit* tempInvoker = GetLastInvoker()) sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: Invoker: %s (guidlow: %u)", tempInvoker->GetName().c_str(), tempInvoker->GetGUIDLow()); #endif |