diff options
Diffstat (limited to 'src')
31 files changed, 148 insertions, 148 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 465c92d7f88..3e9bdf37c16 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -1085,7 +1085,7 @@ void LoadDatabase() case ACTION_T_SET_FACTION: /*if (temp.action[j].param1 !=0 && !GetFactionStore()->LookupEntry(temp.action[j].param1)) { - error_db_log("SD2: Event %u Action %u uses non-existant FactionId %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant FactionId %u.", i, j+1, temp.action[j].param1); temp.action[j].param1 = 0; }*/ break; @@ -1125,14 +1125,14 @@ void LoadDatabase() { const SpellEntry *spell = GetSpellStore()->LookupEntry(temp.action[j].param1); if (!spell) - error_db_log("SD2: Event %u Action %u uses non-existant SpellID %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant SpellID %u.", i, j+1, temp.action[j].param1); else { if (spell->RecoveryTime > 0 && temp.event_flags & EFLAG_REPEATABLE) { //output as debug for now, also because there's no general rule all spells have RecoveryTime if (temp.event_param3 < spell->RecoveryTime) - debug_log("SD2: Event %u Action %u uses SpellID %u but cooldown is longer(%u) than minumum defined in event param3(%u).", i, j+1,temp.action[j].param1, spell->RecoveryTime, temp.event_param3); + debug_log("TSCR: Event %u Action %u uses SpellID %u but cooldown is longer(%u) than minumum defined in event param3(%u).", i, j+1,temp.action[j].param1, spell->RecoveryTime, temp.event_param3); } } @@ -1155,13 +1155,13 @@ void LoadDatabase() if (Quest const* qid = GetQuestTemplateStore(temp.action[j].param1)) { if (!qid->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) - error_db_log("SD2: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, temp.action[j].param1); } else - error_db_log("SD2: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); if (temp.action[j].param2 >= TARGET_T_END) - error_db_log("SD2: Event %u Action %u uses incorrect Target type", i, j+1); + error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); } break; case ACTION_T_QUEST_EVENT_ALL: @@ -1169,31 +1169,31 @@ void LoadDatabase() if (Quest const* qid = GetQuestTemplateStore(temp.action[j].param1)) { if (!qid->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT)) - error_db_log("SD2: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, temp.action[j].param1); } else - error_db_log("SD2: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); } break; case ACTION_T_CASTCREATUREGO: { if (!GetCreatureTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); if (!GetSpellStore()->LookupEntry(temp.action[j].param2)) error_db_log("TSCR: Event %u Action %u uses non-existant SpellID %u.", i, j+1, temp.action[j].param2); if (temp.action[j].param3 >= TARGET_T_END) - error_db_log("SD2: Event %u Action %u uses incorrect Target type", i, j+1); + error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); } break; case ACTION_T_CASTCREATUREGO_ALL: { if (!GetQuestTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant Quest entry %u.", i, j+1, temp.action[j].param1); if (!GetSpellStore()->LookupEntry(temp.action[j].param2)) - error_db_log("SD2: Event %u Action %u uses non-existant SpellID %u.", i, j+1, temp.action[j].param2); + error_db_log("TSCR: Event %u Action %u uses non-existant SpellID %u.", i, j+1, temp.action[j].param2); } break; @@ -1201,7 +1201,7 @@ void LoadDatabase() case ACTION_T_SUMMON_ID: { if (!GetCreatureTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); if (EventAI_Summon_Map.find(temp.action[j].param3) == EventAI_Summon_Map.end()) error_db_log("TSCR: Event %u Action %u summons missing EventAI_Summon %u", i, j+1, temp.action[j].param3); @@ -1213,19 +1213,19 @@ void LoadDatabase() case ACTION_T_KILLED_MONSTER: { if (!GetCreatureTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); if (temp.action[j].param2 >= TARGET_T_END) - error_db_log("SD2: Event %u Action %u uses incorrect Target type", i, j+1); + error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); } break; case ACTION_T_SUMMON: { if (!GetCreatureTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); if (temp.action[j].param2 >= TARGET_T_END) - error_db_log("SD2: Event %u Action %u uses incorrect Target type", i, j+1); + error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); } break; case ACTION_T_THREAT_SINGLE_PCT: @@ -1238,7 +1238,7 @@ void LoadDatabase() //3rd param target case ACTION_T_SET_UNIT_FIELD: if (temp.action[j].param1 < OBJECT_END || temp.action[j].param1 >= UNIT_END) - error_db_log("SD2: Event %u Action %u param1 (UNIT_FIELD*). Index out of range for intended use.", i, j+1); + error_db_log("TSCR: Event %u Action %u param1 (UNIT_FIELD*). Index out of range for intended use.", i, j+1); if (temp.action[j].param3 >= TARGET_T_END) error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); break; @@ -1250,31 +1250,31 @@ void LoadDatabase() case ACTION_T_INC_PHASE: if (!temp.action[j].param1) - error_db_log("SD2: Event %u Action %u is incrementing phase by 0. Was this intended?", i, j+1); + error_db_log("TSCR: Event %u Action %u is incrementing phase by 0. Was this intended?", i, j+1); break; case ACTION_T_SET_INST_DATA: { if (!(temp.event_flags & EFLAG_NORMAL) && !(temp.event_flags & EFLAG_HEROIC)) - error_db_log("SD2: Event %u Action %u. Cannot set instance data without event flags (normal/heroic).", i, j+1); + error_db_log("TSCR: Event %u Action %u. Cannot set instance data without event flags (normal/heroic).", i, j+1); if (temp.action[j].param2 > SPECIAL) - error_db_log("SD2: Event %u Action %u attempts to set instance data above encounter state 4. Custom case?", i, j+1); + error_db_log("TSCR: Event %u Action %u attempts to set instance data above encounter state 4. Custom case?", i, j+1); } break; case ACTION_T_SET_INST_DATA64: { if (!(temp.event_flags & EFLAG_NORMAL) && !(temp.event_flags & EFLAG_HEROIC)) - error_db_log("SD2: Event %u Action %u. Cannot set instance data without event flags (normal/heroic).", i, j+1); + error_db_log("TSCR: Event %u Action %u. Cannot set instance data without event flags (normal/heroic).", i, j+1); if (temp.action[j].param2 >= TARGET_T_END) - error_db_log("SD2: Event %u Action %u uses incorrect Target type", i, j+1); + error_db_log("TSCR: Event %u Action %u uses incorrect Target type", i, j+1); } break; case ACTION_T_UPDATE_TEMPLATE: { if (!GetCreatureTemplateStore(temp.action[j].param1)) - error_db_log("SD2: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); + error_db_log("TSCR: Event %u Action %u uses non-existant creature entry %u.", i, j+1, temp.action[j].param1); } break; case ACTION_T_RANDOM_SAY: diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index f04f757d43e..0615d865f9f 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -240,7 +240,7 @@ void ScriptedAI::DoPlaySoundToSet(Unit* unit, uint32 sound) if (!GetSoundEntriesStore()->LookupEntry(sound)) { - error_log("SD2: Invalid soundId %u used in DoPlaySoundToSet (by unit TypeId %u, guid %u)", sound, unit->GetTypeId(), unit->GetGUID()); + error_log("TSCR: Invalid soundId %u used in DoPlaySoundToSet (by unit TypeId %u, guid %u)", sound, unit->GetTypeId(), unit->GetGUID()); return; } @@ -647,13 +647,13 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit) if (!map->IsDungeon()) //use IsDungeon instead of Instanceable, in case battlegrounds will be instantiated { - error_log("SD2: DoZoneInCombat call for map that isn't an instance (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0); + error_log("TSCR: DoZoneInCombat call for map that isn't an instance (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0); return; } if (!pUnit->CanHaveThreatList() || pUnit->getThreatManager().isThreatListEmpty()) { - error_log("SD2: DoZoneInCombat called for creature that either cannot have threat list or has empty threat list (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0); + error_log("TSCR: DoZoneInCombat called for creature that either cannot have threat list or has empty threat list (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0); return; } @@ -675,7 +675,7 @@ void ScriptedAI::DoResetThreat() { if (!m_creature->CanHaveThreatList() || m_creature->getThreatManager().isThreatListEmpty()) { - error_log("SD2: DoResetThreat called for creature that either cannot have threat list or has empty threat list (m_creature entry = %d)", m_creature->GetEntry()); + error_log("TSCR: DoResetThreat called for creature that either cannot have threat list or has empty threat list (m_creature entry = %d)", m_creature->GetEntry()); return; } @@ -715,7 +715,7 @@ void ScriptedAI::DoTeleportPlayer(Unit* pUnit, float x, float y, float z, float if(!pUnit || pUnit->GetTypeId() != TYPEID_PLAYER) { if(pUnit) - error_log("SD2: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), x, y, z, o); + error_log("TSCR: Creature %u (Entry: %u) Tried to teleport non-player unit (Type: %u GUID: %u) to x: %f y:%f z: %f o: %f. Aborted.", m_creature->GetGUID(), m_creature->GetEntry(), pUnit->GetTypeId(), pUnit->GetGUID(), x, y, z, o); return; } diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h index 75a25490419..4443c510110 100644 --- a/src/bindings/scripts/include/sc_instance.h +++ b/src/bindings/scripts/include/sc_instance.h @@ -17,11 +17,11 @@ enum EncounterState SPECIAL = 4 }; -#define OUT_SAVE_INST_DATA debug_log("SD2: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) -#define OUT_SAVE_INST_DATA_COMPLETE debug_log("SD2: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) -#define OUT_LOAD_INST_DATA(a) debug_log("SD2: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a) -#define OUT_LOAD_INST_DATA_COMPLETE debug_log("SD2: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) -#define OUT_LOAD_INST_DATA_FAIL error_log("SD2: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_SAVE_INST_DATA debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_SAVE_INST_DATA_COMPLETE debug_log("TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_LOAD_INST_DATA(a) debug_log("TSCR: Loading Instance Data for Instance %s (Map %d, Instance Id %d). Input is '%s'", instance->GetMapName(), instance->GetId(), instance->GetInstanceId(), a) +#define OUT_LOAD_INST_DATA_COMPLETE debug_log("TSCR: Instance Data Load for Instance %s (Map %d, Instance Id: %d) is complete.",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) +#define OUT_LOAD_INST_DATA_FAIL error_log("TSCR: Unable to load Instance Data for Instance %s (Map %d, Instance Id: %d).",instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) class TRINITY_DLL_DECL ScriptedInstance : public InstanceData { diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp index b1af88b948f..5ae059f0a30 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -397,7 +397,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -423,7 +423,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -448,7 +448,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has RandomMax < RandomMin. Event repeating disabled.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); pHolder.Enabled = false; } } @@ -459,7 +459,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI break; default: if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); + error_db_log("TSCR: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type); break; } @@ -695,7 +695,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI } }else if (EAI_ErrorLevel > 0) - error_db_log("SD2: EventAI event %d creature %d attempt to cast spell that doesn't exist %d", EventId, m_creature->GetEntry(), param1); + error_db_log("TSCR: EventAI event %d creature %d attempt to cast spell that doesn't exist %d", EventId, m_creature->GetEntry(), param1); } } break; @@ -712,7 +712,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!pCreature) { if (EAI_ErrorLevel > 0) - error_db_log( "SD2: EventAI failed to spawn creature %u. Spawn event %d is on creature %d", param1, EventId, m_creature->GetEntry()); + error_db_log( "TSCR: EventAI failed to spawn creature %u. Spawn event %d is on creature %d", param1, EventId, m_creature->GetEntry()); } else if (param2 != TARGET_T_SELF && target) pCreature->AI()->AttackStart(target); @@ -815,7 +815,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (Phase > 31) if (EAI_ErrorLevel > 0) - error_db_log( "SD2: Event %d incremented Phase above 31. Phase mask cannot be used with phases past 31. CreatureEntry = %d", EventId, m_creature->GetEntry()); + error_db_log( "TSCR: Event %d incremented Phase above 31. Phase mask cannot be used with phases past 31. CreatureEntry = %d", EventId, m_creature->GetEntry()); } break; case ACTION_T_EVADE: @@ -889,7 +889,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI Phase = param1 + (rnd % (param2 - param1)); } else if (EAI_ErrorLevel > 0) - error_db_log( "SD2: ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature->GetEntry()); + error_db_log( "TSCR: ACTION_T_RANDOM_PHASE_RANGE cannot have Param2 <= Param1. Divide by Zero. Event = %d. CreatureEntry = %d", EventId, m_creature->GetEntry()); } break; case ACTION_T_SUMMON_ID: @@ -904,7 +904,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (i == EventAI_Summon_Map.end()) { if (EAI_ErrorLevel > 0) - error_db_log( "SD2: EventAI failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", param1, param3, EventId, m_creature->GetEntry()); + error_db_log( "TSCR: EventAI failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", param1, param3, EventId, m_creature->GetEntry()); return; } @@ -915,7 +915,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!pCreature) { if (EAI_ErrorLevel > 0) - error_db_log( "SD2: EventAI failed to spawn creature %u. EventId %d.Creature %d", param1, EventId, m_creature->GetEntry()); + error_db_log( "TSCR: EventAI failed to spawn creature %u. EventId %d.Creature %d", param1, EventId, m_creature->GetEntry()); } else if (param2 != TARGET_T_SELF && target) pCreature->AI()->AttackStart(target); @@ -935,7 +935,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!pInst) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry()); return; } @@ -949,7 +949,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!target) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry()); return; } @@ -958,7 +958,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!pInst) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry()); return; } @@ -970,7 +970,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (m_creature->GetEntry() == param1) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry()); return; } @@ -982,7 +982,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (m_creature->isDead()) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry()); return; } m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -993,7 +993,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!m_creature->isInCombat() || !m_creature->GetMap()->IsDungeon()) { if (EAI_ErrorLevel > 0) - error_db_log("SD2: Event %d ACTION_T_ZONE_COMBAT_PULSE on creature out of combat or in non-dungeon map. Creature %d", EventId, m_creature->GetEntry()); + error_db_log("TSCR: Event %d ACTION_T_ZONE_COMBAT_PULSE on creature out of combat or in non-dungeon map. Creature %d", EventId, m_creature->GetEntry()); return; } @@ -1010,7 +1010,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI if (!pObject) { if (EAI_ErrorLevel > 0) - error_db_log( "SD2: EventAI failed to spawn object %u. Spawn event %d is on creature %d", param1, EventId, m_creature->GetEntry()); + error_db_log( "TSCR: EventAI failed to spawn object %u. Spawn event %d is on creature %d", param1, EventId, m_creature->GetEntry()); } } break; @@ -1068,7 +1068,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); (*i).Enabled = true; }else if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); } break; //default: @@ -1184,7 +1184,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI (*i).Time = urand((*i).Event.event_param1, (*i).Event.event_param2); (*i).Enabled = true; }else if (EAI_ErrorLevel > 0) - error_db_log("SD2: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); + error_db_log("TSCR: Creature %u using Event %u (Type = %u) has InitialMax < InitialMin. Event disabled.", m_creature->GetEntry(), (*i).Event.event_id, (*i).Event.event_type); break; //All normal events need to be re-enabled and their time set to 0 default: @@ -1422,13 +1422,13 @@ CreatureAI* GetAI_Mob_EventAI(Creature *pCreature) if (EventList.empty()) { if (EAI_ErrorLevel > 1) - error_db_log("SD2: CreatureId has events but no events added to list because of instance flags.", pCreature->GetEntry()); + error_db_log("TSCR: CreatureId has events but no events added to list because of instance flags.", pCreature->GetEntry()); } } else { if (EAI_ErrorLevel > 1) - error_db_log("SD2: EventMap for Creature %u is empty but creature is using Mob_EventAI.", pCreature->GetEntry()); + error_db_log("TSCR: EventMap for Creature %u is empty but creature is using Mob_EventAI.", pCreature->GetEntry()); } return new Mob_EventAI (pCreature, EventList); diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.h b/src/bindings/scripts/scripts/creature/mob_event_ai.h index 8182717d5d4..e1b952b4e25 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.h +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.h @@ -217,7 +217,7 @@ struct EventAI_CreatureError extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList; //Defines -#define EVENTAI_EMPTY_EVENTLIST "SD2: Eventlist for Creature %i is empty but creature is using Mob_EventAI. Preventing EventAI on this creature." +#define EVENTAI_EMPTY_EVENTLIST "TSCR: Eventlist for Creature %i is empty but creature is using Mob_EventAI. Preventing EventAI on this creature." */ #endif diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp index a2e02069e15..b8c79e01ab7 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/item/item_scripts.cpp @@ -211,7 +211,7 @@ bool ItemUse_item_flying_machine(Player *player, Item* _Item, SpellCastTargets c if( player->GetBaseSkillValue(SKILL_RIDING) == 300 ) return false; - debug_log("SD2: Player attempt to use item %u, but did not meet riding requirement",itemId); + debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId); player->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL); return true; } diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp index 9699505f293..3e4d416f44a 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp @@ -44,7 +44,7 @@ void npc_escortAI::AttackStart(Unit *who) //Store last position m_creature->GetPosition(LastPos.x, LastPos.y, LastPos.z); - debug_log("SD2: EscortAI has entered combat and stored last location."); + debug_log("TSCR: EscortAI has entered combat and stored last location."); } Aggro(who); @@ -89,7 +89,7 @@ void npc_escortAI::EnterEvadeMode() if (IsBeingEscorted) { - debug_log("SD2: EscortAI has left combat and is now returning to last point."); + debug_log("TSCR: EscortAI has left combat and is now returning to last point."); Returning = true; m_creature->GetMotionMaster()->MovementExpired(); m_creature->GetMotionMaster()->MovePoint(WP_LAST_POINT, LastPos.x, LastPos.y, LastPos.z); @@ -121,7 +121,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) if( !IsOnHold ) { m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z ); - debug_log("SD2: EscortAI Reconnect WP is: %u, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); + debug_log("TSCR: EscortAI Reconnect WP is: %u, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); WaitTimer = 0; ReconnectWP = false; return; @@ -133,7 +133,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) { if(DespawnAtEnd) { - debug_log("SD2: EscortAI reached end of waypoints"); + debug_log("TSCR: EscortAI reached end of waypoints"); m_creature->setDeathState(JUST_DIED); m_creature->SetHealth(0); @@ -149,7 +149,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) WaitTimer = 0; return; }else{ - debug_log("SD2: EscortAI reached end of waypoints with Despawn off"); + debug_log("TSCR: EscortAI reached end of waypoints with Despawn off"); IsBeingEscorted = false; WaitTimer = 0; return; @@ -159,7 +159,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) if( !IsOnHold ) { m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z ); - debug_log("SD2: EscortAI Next WP is: %u, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); + debug_log("TSCR: EscortAI Next WP is: %u, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); WaitTimer = 0; } }else WaitTimer -= diff; @@ -177,7 +177,7 @@ void npc_escortAI::UpdateAI(const uint32 diff) JustDied(m_creature); IsBeingEscorted = false; - debug_log("SD2: EscortAI Evaded back to spawn point because player was to far away or not found"); + debug_log("TSCR: EscortAI Evaded back to spawn point because player was to far away or not found"); m_creature->setDeathState(JUST_DIED); m_creature->SetHealth(0); @@ -220,7 +220,7 @@ void npc_escortAI::MovementInform(uint32 type, uint32 id) //Original position reached, continue waypoint movement if (id == WP_LAST_POINT) { - debug_log("SD2: EscortAI has returned to original position before combat"); + debug_log("TSCR: EscortAI has returned to original position before combat"); ReconnectWP = true; Returning = false; WaitTimer = 1; @@ -234,7 +234,7 @@ void npc_escortAI::MovementInform(uint32 type, uint32 id) return; } - debug_log("SD2: EscortAI Waypoint %d reached", CurrentWP->id); + debug_log("TSCR: EscortAI Waypoint %d reached", CurrentWP->id); //Call WP function WaypointReached(CurrentWP->id); @@ -290,7 +290,7 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) Run = bRun; PlayerGUID = pGUID; - debug_log("SD2: EscortAI started with %d waypoints. Attack = %d, Defend = %d, Run = %d, PlayerGUID = %d", WaypointList.size(), Attack, Defend, Run, PlayerGUID); + debug_log("TSCR: EscortAI started with %d waypoints. Attack = %d, Defend = %d, Run = %d, PlayerGUID = %d", WaypointList.size(), Attack, Defend, Run, PlayerGUID); CurrentWP = WaypointList.begin(); @@ -301,7 +301,7 @@ void npc_escortAI::Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID) //Start WP m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z ); - debug_log("SD2: EscortAI Next WP is: %d, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); + debug_log("TSCR: EscortAI Next WP is: %d, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z); IsBeingEscorted = true; ReconnectWP = false; Returning = false; diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp index a13dc927603..00c9b602c6e 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp @@ -238,7 +238,7 @@ bool EquippedOk(Player* player, uint32 spellId) if( pItem->GetProto()->RequiredSpell == reqSpell ) { //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first - debug_log("SD2: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId); + debug_log("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId); return false; } } diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index eae009edd24..252ca107031 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -554,7 +554,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff) case DOCTOR_ALLIANCE: patientEntry = AllianceSoldierId[rand()%3]; break; case DOCTOR_HORDE: patientEntry = HordeSoldierId[rand()%3]; break; default: - error_log("SD2: Invalid entry for Triage doctor. Please check your database"); + error_log("TSCR: Invalid entry for Triage doctor. Please check your database"); return; } diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index a3966975f95..ec0c8a47d7a 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance break; case 18796: ++FelOverseerCount; - debug_log("SD2: Shadow Labyrinth: counting %u Fel Overseers.",FelOverseerCount); + debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",FelOverseerCount); break; } } @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance } } - debug_log("SD2: Instance Shadow Labyrinth: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Shadow Labyrinth: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance if (!player || !guid) { - debug_log("SD2: Shadow Labyrinth: HandleGameObject fail"); + debug_log("TSCR: Shadow Labyrinth: HandleGameObject fail"); return; } @@ -133,16 +133,16 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance case TYPE_OVERSEER: if( data != DONE ) - error_log("SD2: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE"); + error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE"); if( FelOverseerCount ) { --FelOverseerCount; - debug_log("SD2: Shadow Labyrinth: %u Fel Overseers left to kill.",FelOverseerCount); + debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",FelOverseerCount); } if( FelOverseerCount == 0 ) { Encounter[1] = DONE; - debug_log("SD2: Shadow Labyrinth: TYPE_OVERSEER == DONE"); + debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE"); } break; diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index 21227969cdf..8dc8ca344dd 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI if(reseting) return; - debug_log("SD2: Increasing Death Count for Shade of Akama encounter"); + debug_log("TSCR: Increasing Death Count for Shade of Akama encounter"); ++DeathCount; m_creature->RemoveSingleAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2, 0); if(guid) @@ -358,7 +358,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI { ((mob_ashtongue_channelerAI*)(*itr)->AI())->ShadeGUID = m_creature->GetGUID(); Channelers.push_back((*itr)->GetGUID()); - debug_log("SD2: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID()); + debug_log("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID()); } } else error_log("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy"); diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index b16add3e46a..7ad8ccaca9b 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI if (GameObject *go = GameObject::GetGameObject(*m_creature,pInstance->GetData64(id))) go->SetGoState(state); - debug_log("SD2: npc_grimstone, arena gate update state."); + debug_log("TSCR: npc_grimstone, arena gate update state."); } //TODO: move them to center @@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI if (pInstance) { pInstance->SetData(TYPE_RING_OF_LAW,DONE); - debug_log("SD2: npc_grimstone: event reached end and set complete."); + debug_log("TSCR: npc_grimstone: event reached end and set complete."); } break; } diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp index 2d5615779a7..ffdc304bc6e 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp @@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance } } - debug_log("SD2: Instance Blackrock Depths: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Blackrock Depths: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -170,11 +170,11 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance if (!player) { - debug_log("SD2: Instance Blackrock Depths: SetData (Type: %u Data %u) cannot find any player.", type, data); + debug_log("TSCR: Instance Blackrock Depths: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } - debug_log("SD2: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); + debug_log("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); switch(type) { diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index ea6751605c0..093ca7b901d 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI Nefarian->setFaction(103); NefarianGUID = Nefarian->GetGUID(); } - else error_log("SD2: Blackwing Lair: Unable to spawn nefarian properly."); + else error_log("TSCR: Blackwing Lair: Unable to spawn nefarian properly."); } AddSpawnTimer = 4000; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index cbe3c4273a2..e64a867a641 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -306,7 +306,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI mRiftWaveCount = 0; entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - debug_log("SD2: npc_time_rift: summoning wave creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + debug_log("TSCR: npc_time_rift: summoning wave creature (Wave %u, Entry %u).",mRiftWaveCount,entry); ++mRiftWaveCount; @@ -331,7 +331,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI if (m_creature->IsNonMeleeSpellCasted(false)) return; - debug_log("SD2: npc_time_rift: not casting anylonger, i need to die."); + debug_log("TSCR: npc_time_rift: not casting anylonger, i need to die."); m_creature->setDeathState(JUST_DIED); pInstance->SetData(TYPE_RIFT,SPECIAL); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index 39445fe727c..830917a7ad1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance } } - debug_log("SD2: Instance Black Portal: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Black Portal: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance if (Player* player = itr->getSource()) player->SendUpdateWorldState(id,state); } - }else debug_log("SD2: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!"); + }else debug_log("TSCR: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!"); } void InitWorldState(bool Enable = true) @@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance if (!player) { - debug_log("SD2: Instance Black Portal: SetData (Type: %u Data %u) cannot find any player.", type, data); + debug_log("TSCR: Instance Black Portal: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } @@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance { if (data == IN_PROGRESS) { - debug_log("SD2: Instance Dark Portal: Starting event."); + debug_log("TSCR: Instance Dark Portal: Starting event."); InitWorldState(); Encounter[1] = IN_PROGRESS; NextPortal_Timer = 15000; @@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance //normalize Z-level if we can, if rift is not at ground level. z = std::max(instance->GetHeight(x, y, MAX_HEIGHT), instance->GetWaterLevel(x, y)); - debug_log("SD2: Instance Dark Portal: Summoning rift boss entry %u.",entry); + debug_log("TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); Unit *Summon = source->SummonCreature(entry,x,y,z,source->GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); @@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance if (Summon) return Summon; - debug_log("SD2: Instance Dark Portal: what just happened there? No boss, no loot, no fun..."); + debug_log("TSCR: Instance Dark Portal: what just happened there? No boss, no loot, no fun..."); return NULL; } @@ -307,7 +307,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance int tmp = rand()%4; if (tmp != CurrentRiftId) { - debug_log("SD2: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); + debug_log("TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); CurrentRiftId = tmp; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index 312aa90a686..ad8206dce3e 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -104,7 +104,7 @@ bool GossipSelect_npc_jaina_proudmoore(Player *player, Creature *_Creature, uint break; case GOSSIP_ACTION_INFO_DEF: ai->Debug = !ai->Debug; - debug_log("SD2: HyjalAI - Debug mode has been toggled"); + debug_log("TSCR: HyjalAI - Debug mode has been toggled"); break; } return true; @@ -174,7 +174,7 @@ bool GossipSelect_npc_thrall(Player *player, Creature *_Creature, uint32 sender, break; case GOSSIP_ACTION_INFO_DEF: ai->Debug = !ai->Debug; - debug_log("SD2: HyjalAI - Debug mode has been toggled"); + debug_log("TSCR: HyjalAI - Debug mode has been toggled"); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp index b4fc3a65222..9ce778b3600 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp @@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance break; } - debug_log("SD2: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); + debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); if(data == DONE) SaveToDB(); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index f18e29edf6d..330d7d5c62a 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance } } - debug_log("SD2: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Old Hillsbrad: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance } } }else - debug_log("SD2: Instance Old Hillsbrad: UpdateOHWorldState, but PlayerList is empty!"); + debug_log("TSCR: Instance Old Hillsbrad: UpdateOHWorldState, but PlayerList is empty!"); } void OnCreatureCreate(Creature *creature, uint32 creature_entry) @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance if (!player) { - debug_log("SD2: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); + debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance ++mBarrelCount; UpdateOHWorldState(); - debug_log("SD2: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); + debug_log("TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); Encounter[0] = IN_PROGRESS; @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance { mThrallEventCount++; Encounter[1] = NOT_STARTED; - debug_log("SD2: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); Encounter[2] = NOT_STARTED; Encounter[3] = NOT_STARTED; Encounter[4] = NOT_STARTED; @@ -167,29 +167,29 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance Encounter[3] = data; Encounter[4] = data; Encounter[5] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); } } else Encounter[1] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); + debug_log("TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); break; } case TYPE_THRALL_PART1: Encounter[2] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); break; case TYPE_THRALL_PART2: Encounter[3] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); break; case TYPE_THRALL_PART3: Encounter[4] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); break; case TYPE_THRALL_PART4: Encounter[5] = data; - debug_log("SD2: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); + debug_log("TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); break; } } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index b76cfedb777..e268ca97112 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance } } - debug_log("SD2: Instance Steamvault: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Steamvault: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance if (!player) { - debug_log("SD2: Instance Steamvault: SetData (Type: %u Data %u) cannot find any player.", type, data); + debug_log("TSCR: Instance Steamvault: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } @@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance if (GameObject *_go = GameObject::GetGameObject(*player,MainChambersDoor)) _go->SetGoState(0); } - debug_log("SD2: Instance Steamvault: Access panel used."); + debug_log("TSCR: Instance Steamvault: Access panel used."); } Encounter[0] = data; break; @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance if (GameObject *_go = GameObject::GetGameObject(*player,MainChambersDoor)) _go->SetGoState(0); } - debug_log("SD2: Instance Steamvault: Access panel used."); + debug_log("TSCR: Instance Steamvault: Access panel used."); } Encounter[1] = data; break; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp index f98d85f9125..02480d14d66 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp @@ -567,7 +567,7 @@ CreatureAI* GetAI_water_elemental(Creature *_Creature) // CONVERT TO ACID CreatureAI* GetAI_shadow_of_aran(Creature *_Creature) { - outstring_log("SD2: Convert simpleAI script for Creature Entry %u to ACID", _Creature->GetEntry()); + outstring_log("TSCR: Convert simpleAI script for Creature Entry %u to ACID", _Creature->GetEntry()); SimpleAI* ai = new SimpleAI (_Creature); ai->Spell[0].Enabled = true; diff --git a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h index d08911d9c76..be007134fe4 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h +++ b/src/bindings/scripts/scripts/zone/karazhan/def_karazhan.h @@ -39,6 +39,6 @@ #define EVENT_HOOD 2 #define EVENT_RAJ 3 -#define ERROR_INST_DATA(a) error_log("SD2: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); +#define ERROR_INST_DATA(a) error_log("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry()); #endif diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index bdf7eed9f3a..e3babcf89df 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -320,7 +320,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI void PrepareEncounter() { - debug_log("SD2: Barnes Opera Event - Introduction complete - preparing encounter %d", Event); + debug_log("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", Event); uint8 index = 0; uint8 count = 0; switch(Event) diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index b056e2329e4..a56d6a4dd3d 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI for(uint8 i = 0; i < size; ++i) { uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL); - debug_log("SD2: Selin: Adding Fel Crystal %u to list", guid); + debug_log("TSCR: Selin: Adding Fel Crystal %u to list", guid); Crystals.push_back(guid); } } @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI else { // Make an error message in case something weird happened here - error_log("SD2: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned"); + error_log("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned"); DrainingCrystal = false; } } diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp index 5afb79e84d0..4ef61128257 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance DoorState[0] = data1; DoorState[1] = data2; DoorState[2] = data3; - }else error_log("SD2: Magister's Terrace: corrupted save data."); + }else error_log("TSCR: Magister's Terrace: corrupted save data."); } void OnCreatureCreate(Creature *creature, uint32 entry) @@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance { if(FelCrystals.empty()) { - error_log("SD2: Magisters Terrace: No Fel Crystals loaded in Inst Data"); + error_log("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data"); return 0; } diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index 3e7caef435f..967cff5c769 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance if (!player || !guid) { - debug_log("SD2: Instance Shadowfang Keep: HandleGameObject fail"); + debug_log("TSCR: Instance Shadowfang Keep: HandleGameObject fail"); return; } diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index 142c38f06d6..68718bd2dec 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance } } - debug_log("SD2: Instance Stratholme: GetPlayerInMap, but PlayerList is empty!"); + debug_log("TSCR: Instance Stratholme: GetPlayerInMap, but PlayerList is empty!"); return NULL; } @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance return true; } - debug_log("SD2: Instance Stratholme: Cannot open slaugther square yet."); + debug_log("TSCR: Instance Stratholme: Cannot open slaugther square yet."); return false; } @@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (!player) { - debug_log("SD2: Instance Stratholme: SetData (Type: %u Data %u) cannot find any player.", type, data); + debug_log("TSCR: Instance Stratholme: SetData (Type: %u Data %u) cannot find any player.", type, data); return; } @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (Encounter[0] == IN_PROGRESS || Encounter[0] == FAIL) break; BaronRun_Timer = 2700000; - debug_log("SD2: Instance Stratholme: Baron run in progress."); + debug_log("TSCR: Instance Stratholme: Baron run in progress."); break; case FAIL: //may add code to remove aura from players, but in theory the time should be up already and removed. @@ -257,13 +257,13 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance //a bit itchy, it should close the door after 10 secs, but it doesn't. skipping it for now. //UpdateGoState(ziggurat4GUID,0,true); player->SummonCreature(C_RAMSTEIN,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); - debug_log("SD2: Instance Stratholme: Ramstein spawned."); - } else debug_log("SD2: Instance Stratholme: %u Abomnation left to kill.",count); + debug_log("TSCR: Instance Stratholme: Ramstein spawned."); + } else debug_log("TSCR: Instance Stratholme: %u Abomnation left to kill.",count); } if (data == DONE) { SlaugtherSquare_Timer = 300000; - debug_log("SD2: Instance Stratholme: Slaugther event will continue in 5 minutes."); + debug_log("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes."); } Encounter[4] = data; break; @@ -357,7 +357,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (GetData(TYPE_BARON_RUN) != DONE) SetData(TYPE_BARON_RUN, FAIL); BaronRun_Timer = 0; - debug_log("SD2: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN)); + debug_log("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN)); }else BaronRun_Timer -= diff; } @@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance UpdateGoState(ziggurat4GUID,0,false); UpdateGoState(ziggurat5GUID,0,false); - debug_log("SD2: Instance Stratholme: Black guard sentries spawned. Opening gates to baron."); + debug_log("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron."); } SlaugtherSquare_Timer = 0; }else SlaugtherSquare_Timer -= diff; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index ae19cedf75a..5501f057dd1 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -389,8 +389,8 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI if(!AdvisorGuid[0] || !AdvisorGuid[1] || !AdvisorGuid[2] || !AdvisorGuid[3]) { - error_log("SD2: Kael'Thas One or more advisors missing, Skipping Phases 1-3"); - DoYell("SD2: Kael'Thas One or more advisors missing, Skipping Phases 1-3", LANG_UNIVERSAL, NULL); + error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3"); + DoYell("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3", LANG_UNIVERSAL, NULL); DoScriptText(SAY_PHASE4_INTRO2, m_creature); Phase = 4; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index c054340a4a5..9f28016dd46 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI { pInst = (ScriptedInstance*)c->GetInstanceData(); if (!pInst) - error_log("SD2: No Instance eye_of_cthunAI"); + error_log("TSCR: No Instance eye_of_cthunAI"); } ScriptedInstance* pInst; @@ -437,7 +437,7 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI { pInst = (ScriptedInstance*)c->GetInstanceData(); if (!pInst) - error_log("SD2: No Instance eye_of_cthunAI"); + error_log("TSCR: No Instance eye_of_cthunAI"); } ScriptedInstance* pInst; diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp index a56cdf3f9a7..fa33bf578f9 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance ss << "S " << BossKilled << " " << ChestLooted << " " << QuestMinute; char* data = new char[ss.str().length()+1]; strcpy(data, ss.str().c_str()); - //error_log("SD2: Zul'aman saved, %s.", data); + //error_log("TSCR: Zul'aman saved, %s.", data); return data; } @@ -193,17 +193,17 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance { if(!load) return; std::istringstream ss(load); - //error_log("SD2: Zul'aman loaded, %s.", ss.str().c_str()); + //error_log("TSCR: Zul'aman loaded, %s.", ss.str().c_str()); char dataHead; // S uint16 data1, data2, data3; ss >> dataHead >> data1 >> data2 >> data3; - //error_log("SD2: Zul'aman loaded, %d %d %d.", data1, data2, data3); + //error_log("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3); if(dataHead == 'S') { BossKilled = data1; ChestLooted = data2; QuestMinute = data3; - }else error_log("SD2: Zul'aman: corrupted save data."); + }else error_log("TSCR: Zul'aman: corrupted save data."); } void SetData(uint32 type, uint32 data) diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index ac607bfd7ac..622dc7842e7 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -37,6 +37,6 @@ void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go) if(go) go->SetGoState(open ? 0 : 1); else - debug_log("SD2: InstanceData: HandleGameObject failed"); + debug_log("TSCR: InstanceData: HandleGameObject failed"); } |