nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-17 06:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed travis build errors with Talamortis.

Browse Source 
# Conflicts:
#	src/authserver/Server/AuthSocket.cpp
#	src/game/AI/SmartScripts/SmartScript.cpp
#	src/game/Calendar/CalendarMgr.cpp
#	src/game/Chat/Channels/Channel.cpp
#	src/game/Conditions/ConditionMgr.cpp
#	src/game/DungeonFinding/LFGMgr.cpp
#	src/game/DungeonFinding/LFGScripts.cpp
#	src/game/Entities/Player/Player.cpp
#	src/game/Entities/Unit/Unit.cpp
#	src/game/Entities/Vehicle/Vehicle.cpp
#	src/game/Guilds/Guild.cpp
#	src/game/Handlers/ChannelHandler.cpp
#	src/game/Handlers/GuildHandler.cpp
#	src/game/Handlers/LFGHandler.cpp
#	src/game/Handlers/LootHandler.cpp
#	src/game/Handlers/MailHandler.cpp
#	src/game/Handlers/MiscHandler.cpp
#	src/game/Handlers/NPCHandler.cpp
#	src/game/Handlers/PetHandler.cpp
#	src/game/Handlers/PetitionsHandler.cpp
#	src/game/Handlers/QueryHandler.cpp
#	src/game/Handlers/QuestHandler.cpp
#	src/game/Movement/MotionMaster.cpp
#	src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
#	src/game/Server/WorldSession.cpp
#	src/game/Server/WorldSocket.cpp
#	src/game/Spells/SpellEffects.cpp
#	src/scripts/Commands/cs_modify.cpp
This commit is contained in:
Yehonal
2017-08-19 20:31:24 +02:00
parent f794ad2acf
commit bf80a43d78
27 changed files with 44 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -194,10 +194,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
mUseTextTimer = true;
sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), talkTarget);
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u",
#endif
// talker->GetName().c_str(), talker->GetGUIDLow(), GUID_LOPART(mTextGUID));
break;
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u", talker->GetName().c_str(), talker->GetGUIDLow(), GUID_LOPART(mTextGUID));
#endif break;
}
case SMART_ACTION_SIMPLE_TALK:
{