diff options
Diffstat (limited to 'src/server/scripts')
39 files changed, 175 insertions, 169 deletions
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 8393d338e93..1fa697f3f44 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -101,7 +101,7 @@ public: if (!tEntry) return false; - whereClause << "WHERE id = '" << tEntry << "'"; + whereClause << "WHERE id = '" << tEntry << '\''; } else { @@ -114,11 +114,11 @@ public: { std::string name = pParam1; WorldDatabase.EscapeString(name); - whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << "'"; + whereClause << ", creature_template WHERE creature.id = creature_template.entry AND creature_template.name "_LIKE_" '" << name << '\''; } else { - whereClause << "WHERE guid = '" << guid << "'"; + whereClause << "WHERE guid = '" << guid << '\''; } } //sLog->outError("DEBUG: %s", whereClause.c_str()); diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 204012224d5..c51ab45acea 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -254,13 +254,13 @@ public: initString =false; } else - eventFilter << ", " << *itr; + eventFilter << ',' << *itr; } if (!initString) eventFilter << "))"; else - eventFilter << ")"; + eventFilter << ')'; result = WorldDatabase.PQuery("SELECT gameobject.guid, id, position_x, position_y, position_z, orientation, map, phaseMask, " "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject " diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index d78fefa1592..aef3e1b3502 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -50,14 +50,14 @@ public: { mob_water_elementalAI(Creature* c) : ScriptedAI(c) {} - uint32 uiWaterBoltTimer; - uint64 uiBalindaGUID; - uint32 uiResetTimer; + uint32 waterBoltTimer; + uint64 balindaGUID; + uint32 resetTimer; void Reset() { - uiWaterBoltTimer = 3*IN_MILLISECONDS; - uiResetTimer = 5*IN_MILLISECONDS; + waterBoltTimer = 3*IN_MILLISECONDS; + resetTimer = 5*IN_MILLISECONDS; } void UpdateAI(const uint32 diff) @@ -65,20 +65,20 @@ public: if (!UpdateVictim()) return; - if (uiWaterBoltTimer < diff) + if (waterBoltTimer < diff) { DoCast(me->getVictim(), SPELL_WATERBOLT); - uiWaterBoltTimer = 5*IN_MILLISECONDS; - } else uiWaterBoltTimer -= diff; + waterBoltTimer = 5*IN_MILLISECONDS; + } else waterBoltTimer -= diff; // check if creature is not outside of building - if (uiResetTimer < diff) + if (resetTimer < diff) { - if (Creature* pBalinda = Unit::GetCreature(*me, uiBalindaGUID)) + if (Creature* pBalinda = Unit::GetCreature(*me, balindaGUID)) if (me->GetDistance2d(pBalinda->GetHomePosition().GetPositionX(), pBalinda->GetHomePosition().GetPositionY()) > 50) EnterEvadeMode(); - uiResetTimer = 5*IN_MILLISECONDS; - } else uiResetTimer -= diff; + resetTimer = 5*IN_MILLISECONDS; + } else resetTimer -= diff; DoMeleeAttackIfReady(); } @@ -97,27 +97,27 @@ public: struct boss_balindaAI : public ScriptedAI { - boss_balindaAI(Creature* c) : ScriptedAI(c), Summons(me) {} + boss_balindaAI(Creature* c) : ScriptedAI(c), summons(me) {} - uint32 uiArcaneExplosionTimer; - uint32 uiConeOfColdTimer; - uint32 uiFireBoltTimer; - uint32 uiFrostboltTimer; - uint32 uiResetTimer; - uint32 uiWaterElementalTimer; + uint32 arcaneExplosionTimer; + uint32 coneOfColdTimer; + uint32 fireBoltTimer; + uint32 frostboltTimer; + uint32 resetTimer; + uint32 waterElementalTimer; - SummonList Summons; + SummonList summons; void Reset() { - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); - uiConeOfColdTimer = 8*IN_MILLISECONDS; - uiFireBoltTimer = 1*IN_MILLISECONDS; - uiFrostboltTimer = 4*IN_MILLISECONDS; - uiResetTimer = 5*IN_MILLISECONDS; - uiWaterElementalTimer = 0; - - Summons.DespawnAll(); + arcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); + coneOfColdTimer = 8*IN_MILLISECONDS; + fireBoltTimer = 1*IN_MILLISECONDS; + frostboltTimer = 4*IN_MILLISECONDS; + resetTimer = 5*IN_MILLISECONDS; + waterElementalTimer = 0; + + summons.DespawnAll(); } void EnterCombat(Unit* /*who*/) @@ -132,15 +132,15 @@ public: void JustSummoned(Creature* summoned) { - CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->uiBalindaGUID = me->GetGUID(); + CAST_AI(mob_water_elemental::mob_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); summoned->setFaction(me->getFaction()); - Summons.Summon(summoned); + summons.Summon(summoned); } void JustDied(Unit* /*Killer*/) { - Summons.DespawnAll(); + summons.DespawnAll(); } void UpdateAI(const uint32 diff) @@ -148,47 +148,47 @@ public: if (!UpdateVictim()) return; - if (uiWaterElementalTimer < diff) + if (waterElementalTimer < diff) { - if (Summons.empty()) + if (summons.empty()) me->SummonCreature(NPC_WATER_ELEMENTAL, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45*IN_MILLISECONDS); - uiWaterElementalTimer = 50*IN_MILLISECONDS; - } else uiWaterElementalTimer -= diff; + waterElementalTimer = 50*IN_MILLISECONDS; + } else waterElementalTimer -= diff; - if (uiArcaneExplosionTimer < diff) + if (arcaneExplosionTimer < diff) { DoCast(me->getVictim(), SPELL_ARCANE_EXPLOSION); - uiArcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); - } else uiArcaneExplosionTimer -= diff; + arcaneExplosionTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS); + } else arcaneExplosionTimer -= diff; - if (uiConeOfColdTimer < diff) + if (coneOfColdTimer < diff) { DoCast(me->getVictim(), SPELL_CONE_OF_COLD); - uiConeOfColdTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); - } else uiConeOfColdTimer -= diff; + coneOfColdTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); + } else coneOfColdTimer -= diff; - if (uiFireBoltTimer < diff) + if (fireBoltTimer < diff) { DoCast(me->getVictim(), SPELL_FIREBALL); - uiFireBoltTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); - } else uiFireBoltTimer -= diff; + fireBoltTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); + } else fireBoltTimer -= diff; - if (uiFrostboltTimer < diff) + if (frostboltTimer < diff) { DoCast(me->getVictim(), SPELL_FROSTBOLT); - uiFrostboltTimer = urand(4*IN_MILLISECONDS, 12*IN_MILLISECONDS); - } else uiFrostboltTimer -= diff; + frostboltTimer = urand(4*IN_MILLISECONDS, 12*IN_MILLISECONDS); + } else frostboltTimer -= diff; // check if creature is not outside of building - if (uiResetTimer < diff) + if (resetTimer < diff) { if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50) { EnterEvadeMode(); DoScriptText(YELL_EVADE, me); } - uiResetTimer = 5*IN_MILLISECONDS; - } else uiResetTimer -= diff; + resetTimer = 5*IN_MILLISECONDS; + } else resetTimer -= diff; DoMeleeAttackIfReady(); } @@ -204,4 +204,4 @@ void AddSC_boss_balinda() { new boss_balinda; new mob_water_elemental; -};
\ No newline at end of file +}; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 9a5956f41b1..95d15ceb4bd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -265,8 +265,8 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << GhostKillCount; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' + << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' << m_auiEncounter[5] << ' ' << GhostKillCount; str_data = saveStream.str(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 2b0806f9e5e..05ad283a428 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -170,9 +170,9 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << m_auiEncounter[6] << " " - << m_auiEncounter[7] << " " << m_auiEncounter[8] << " " << m_auiEncounter[9] << " " << m_auiEncounter[10] << " " << m_auiEncounter[11]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' + << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' << m_auiEncounter[5] << ' ' << m_auiEncounter[6] << ' ' + << m_auiEncounter[7] << ' ' << m_auiEncounter[8] << ' ' << m_auiEncounter[9] << ' ' << m_auiEncounter[10] << ' ' << m_auiEncounter[11]; strSaveData = saveStream.str(); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 583cd5fc791..b08a73c320b 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -181,7 +181,7 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; str_data = saveStream.str(); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index f5f407d4218..618ac8b7c27 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -367,8 +367,8 @@ class instance_stratholme : public InstanceMapScript OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << EncounterState[0] << " " << EncounterState[1] << " " << EncounterState[2] << " " - << EncounterState[3] << " " << EncounterState[4] << " " << EncounterState[5]; + saveStream << EncounterState[0] << ' ' << EncounterState[1] << ' ' << EncounterState[2] << ' ' + << EncounterState[3] << ' ' << EncounterState[4] << ' ' << EncounterState[5]; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 4ad483d7fb7..fb412b018f2 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -273,8 +273,8 @@ public: { OUT_SAVE_INST_DATA; std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " - << m_auiEncounter[4] << " " << m_auiEncounter[5]; + stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3] << ' ' + << m_auiEncounter[4] << ' ' << m_auiEncounter[5]; char* out = new char[stream.str().length() + 1]; strcpy(out, stream.str().c_str()); if (out) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 5a16c21d21c..ea1a260b3af 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -377,7 +377,7 @@ class instance_uldaman : public InstanceMapScript OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2]; str_data = saveStream.str(); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 2759d595b4d..35d103f2bb7 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -179,7 +179,7 @@ class instance_zulaman : public InstanceMapScript std::string GetSaveData() { std::ostringstream ss; - ss << "S " << BossKilled << " " << ChestLooted << " " << QuestMinute; + ss << "S " << BossKilled << ' ' << ChestLooted << ' ' << QuestMinute; char* data = new char[ss.str().length()+1]; strcpy(data, ss.str().c_str()); //sLog->outError("TSCR: Zul'aman saved, %s.", data); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 847a1f36ed8..282b0192f57 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -267,10 +267,10 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] - << " " << allianceRetreat << " " << hordeRetreat - << " " << RaidDamage; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' + << m_auiEncounter[3] << ' ' << m_auiEncounter[4] + << ' ' << allianceRetreat << ' ' << hordeRetreat + << ' ' << RaidDamage; str_data = saveStream.str(); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index f0b871e0cc0..d69036f3819 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -248,8 +248,8 @@ class instance_culling_of_stratholme : public InstanceMapScript OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "C S " << _encounterState[0] << " " << _encounterState[1] << " " - << _encounterState[2] << " " << _encounterState[3] << " " << _encounterState[4]; + saveStream << "C S " << _encounterState[0] << ' ' << _encounterState[1] << ' ' + << _encounterState[2] << ' ' << _encounterState[3] << ' ' << _encounterState[4]; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 738c4761bc2..60cd1b5f82a 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -60,7 +60,7 @@ public: std::ostringstream saveStream; saveStream << "T C " << m_auiEncounter[0] - << " " << uiGongWaves; + << ' ' << uiGongWaves; str_data = saveStream.str(); diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index bb9c56724a8..945b8b7bc63 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -108,9 +108,9 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " - << m_auiEncounter[6] << " " << m_auiEncounter[7] << " " << m_auiEncounter[8]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' + << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' << m_auiEncounter[5] << ' ' + << m_auiEncounter[6] << ' ' << m_auiEncounter[7] << ' ' << m_auiEncounter[8]; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 383689b3ec8..997b11fb084 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -164,7 +164,7 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "A N " << auiEncounter[0] << " " << auiEncounter[1] << " " + saveStream << "A N " << auiEncounter[0] << ' ' << auiEncounter[1] << ' ' << auiEncounter[2]; OUT_SAVE_INST_DATA_COMPLETE; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index b10a49b7116..f9922009b1f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -249,9 +249,9 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "A K " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " - << spheres[0] << " " << spheres[1]; + saveStream << "A K " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' + << spheres[0] << ' ' << spheres[1]; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 5f22a0fa3f9..426b41c3f02 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -60,8 +60,8 @@ enum eSpells enum eModels { - MODEL_SKELETON = 29846, - MODEL_GHOST = 21300 + MODEL_SKELETON = 29846, + MODEL_GHOST = 21300 }; enum ePhases @@ -325,7 +325,7 @@ public: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { if (target && target->isAlive()) - DoCast(target, (SPELL_LEAP)); + DoCast(target, (SPELL_LEAP)); } uiAttackTimer = 3500; } else uiAttackTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index e05f2044f74..884da9fc119 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -286,11 +286,11 @@ public: std::ostringstream saveStream; saveStream << "T C " << m_auiEncounter[0] - << " " << m_auiEncounter[1] - << " " << m_auiEncounter[2] - << " " << m_auiEncounter[3] - << " " << uiGrandChampionsDeaths - << " " << uiMovementDone; + << ' ' << m_auiEncounter[1] + << ' ' << m_auiEncounter[2] + << ' ' << m_auiEncounter[3] + << ' ' << uiGrandChampionsDeaths + << ' ' << uiMovementDone; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index e6ab05a75e9..8c9741f407f 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -284,7 +284,7 @@ public: switch (uiId) { - case 0: // JUMP!? Fuck! THAT'S BEEZARR! Would someone PLEASE make MotionMaster->Move* work better? + case 0: if (m_bTargetDied) me->DespawnOrUnsummon(); break; @@ -728,7 +728,7 @@ public: switch (uiId) { - case 0: // JUMP!? Fuck! THAT'S BEEZARR! Would someone PLEASE make MotionMaster->Move* work better? + case 0: if (me->GetDistance2d(ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY()) < 6.0f) { // Middle of the room diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 8a404c447fd..e4d7d051676 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -619,7 +619,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript std::ostringstream saveStream; for (uint8 i = 0; i < MAX_ENCOUNTERS; ++i) - saveStream << EncounterStatus[i] << " "; + saveStream << EncounterStatus[i] << ' '; saveStream << TrialCounter; SaveDataBuffer = saveStream.str(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 8be1d4b7538..22f129c8418 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -191,8 +191,8 @@ public: std::string str_data; std::ostringstream saveStream; - saveStream << "D K " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3]; + saveStream << "D K " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 8cf78c92810..f86acaf623a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -274,7 +274,7 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "H R 1 " << uiEncounter[0] << " " << uiEncounter[1] << " " << uiEncounter[2]; + saveStream << "H R 1 " << uiEncounter[0] << ' ' << uiEncounter[1] << ' ' << uiEncounter[2]; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 46e979cee9b..8eca03a2075 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -366,11 +366,11 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "G D " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " - << (uiSladRanStatue ? GetObjState(uiSladRanStatue) : GO_STATE_ACTIVE) << " " << (uiMoorabiStatue ? GetObjState(uiMoorabiStatue) : GO_STATE_ACTIVE) << " " - << (uiDrakkariColossusStatue ? GetObjState(uiDrakkariColossusStatue) : GO_STATE_ACTIVE) << " " << (uiGalDarahStatue ? GetObjState(uiGalDarahStatue) : GO_STATE_READY) << " " - << (uiBridge ? GetObjState(uiBridge) : GO_STATE_ACTIVE) << " " << (uiCollision ? GetObjState(uiCollision) : GO_STATE_READY); + saveStream << "G D " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' + << (uiSladRanStatue ? GetObjState(uiSladRanStatue) : GO_STATE_ACTIVE) << ' ' << (uiMoorabiStatue ? GetObjState(uiMoorabiStatue) : GO_STATE_ACTIVE) << ' ' + << (uiDrakkariColossusStatue ? GetObjState(uiDrakkariColossusStatue) : GO_STATE_ACTIVE) << ' ' << (uiGalDarahStatue ? GetObjState(uiGalDarahStatue) : GO_STATE_READY) << ' ' + << (uiBridge ? GetObjState(uiBridge) : GO_STATE_ACTIVE) << ' ' << (uiCollision ? GetObjState(uiCollision) : GO_STATE_READY); str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 7890f2fd8fa..890fb66cb2b 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -1013,8 +1013,8 @@ class instance_icecrown_citadel : public InstanceMapScript OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "I C " << GetBossSaveData() << HeroicAttempts << " " - << ColdflameJetsState << " " << BloodQuickeningState << " " << BloodQuickeningMinutes; + saveStream << "I C " << GetBossSaveData() << HeroicAttempts << ' ' + << ColdflameJetsState << ' ' << BloodQuickeningState << ' ' << BloodQuickeningMinutes; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 5b0571a7dcd..f57a81f4296 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -371,7 +371,7 @@ public: std::string GetSaveData() { std::ostringstream saveStream; - saveStream << GetBossSaveData() << " " << gothikDoorState; + saveStream << GetBossSaveData() << ' ' << gothikDoorState; return saveStream.str(); } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 9f2a0c05ae4..5ab6a96dff3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -206,7 +206,7 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; strInstData = saveStream.str(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 92a6e590b36..0fefb28e9ab 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -210,8 +210,8 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "H L " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3]; + saveStream << "H L " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index e28d082062f..9285d852404 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -225,7 +225,7 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "H S " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + saveStream << "H S " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 94f17de43f0..b8e595a3452 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -261,8 +261,8 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "U K " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << forge_event[0] << " " << forge_event[1] << " " << forge_event[2]; + saveStream << "U K " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << forge_event[0] << ' ' << forge_event[1] << ' ' << forge_event[2]; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp index 60259a8c413..e2c5dc5d341 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -211,8 +211,8 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << "U P " << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3]; + saveStream << "U P " << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; str_data = saveStream.str(); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index f4e1489c8ce..b6e40f21c6e 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -617,10 +617,10 @@ public: std::ostringstream saveStream; saveStream << "V H " << (uint16)m_auiEncounter[0] - << " " << (uint16)m_auiEncounter[1] - << " " << (uint16)m_auiEncounter[2] - << " " << (uint16)uiFirstBoss - << " " << (uint16)uiSecondBoss; + << ' ' << (uint16)m_auiEncounter[1] + << ' ' << (uint16)m_auiEncounter[2] + << ' ' << (uint16)uiFirstBoss + << ' ' << (uint16)uiSecondBoss; str_data = saveStream.str(); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index a7309ba146c..70c97b9073c 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -144,12 +144,10 @@ public: // TODO: Find better way to handle emote // Emote - std::string *emote = new std::string(EMOTE_FOCUSES_ON); - emote->append(target->GetName()); - emote->append("!"); - const char* text = emote->c_str(); - me->MonsterTextEmote(text, 0, true); - delete emote; + std::string emote(EMOTE_FOCUSES_ON); + emote.append(target->GetName()); + emote.push_back('!'); + me->MonsterTextEmote(emote.c_str(), 0, true); } FocusFire_Timer = 15000+(rand()%5000); } else FocusFire_Timer -= diff; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index 5558a98f559..3288c1336e9 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -167,8 +167,8 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3] << ' ' << m_auiEncounter[4]; str_data = saveStream.str(); diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 3b8e86293eb..4feca05c111 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -284,10 +284,10 @@ public: OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " - << m_auiEncounter[2] << " " << m_auiEncounter[3] << " " << m_auiEncounter[4] - << " " << m_auiEncounter[5] << " " << m_auiEncounter[6] << " " << m_auiEncounter[7] - << " " << m_auiEncounter[8]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' + << m_auiEncounter[2] << ' ' << m_auiEncounter[3] << ' ' << m_auiEncounter[4] + << ' ' << m_auiEncounter[5] << ' ' << m_auiEncounter[6] << ' ' << m_auiEncounter[7] + << ' ' << m_auiEncounter[8]; str_data = saveStream.str(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 73719c14163..88350e4ea0b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -383,8 +383,8 @@ class instance_serpent_shrine : public InstanceMapScript { OUT_SAVE_INST_DATA; std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " - << m_auiEncounter[3] << " " << m_auiEncounter[4] << " " << m_auiEncounter[5] << " " << TrashCount; + stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' + << m_auiEncounter[3] << ' ' << m_auiEncounter[4] << ' ' << m_auiEncounter[5] << ' ' << TrashCount; OUT_SAVE_INST_DATA_COMPLETE; return stream.str(); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 451983eeaf4..88496899bb1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -200,7 +200,7 @@ public: { OUT_SAVE_INST_DATA; std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; char* out = new char[stream.str().length() + 1]; strcpy(out, stream.str().c_str()); if (out) diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 20159b41a58..79b6be51d5c 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -100,9 +100,12 @@ public: { case 184468: MaulgarDoor = go->GetGUID(); - if (m_auiEncounter[0] == DONE) HandleGameObject(0, true, go); + if (m_auiEncounter[0] == DONE) + HandleGameObject(0, true, go); + break; + case 184662: + GruulDoor = go->GetGUID(); break; - case 184662: GruulDoor = go->GetGUID(); break; } } @@ -159,7 +162,7 @@ public: { OUT_SAVE_INST_DATA; std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1]; + stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1]; char* out = new char[stream.str().length() + 1]; strcpy(out, stream.str().c_str()); if (out) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 5abc7303c12..8c15bbace2d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -94,44 +94,49 @@ class instance_blood_furnace : public InstanceMapScript { switch(creature->GetEntry()) { - case 17381: The_MakerGUID = creature->GetGUID(); break; - case 17380: BroggokGUID = creature->GetGUID(); break; - case 17377: Kelidan_The_BreakerGUID = creature->GetGUID(); break; + case 17381: + The_MakerGUID = creature->GetGUID(); + break; + case 17380: + BroggokGUID = creature->GetGUID(); + break; + case 17377: + Kelidan_The_BreakerGUID = creature->GetGUID(); + break; } } void OnGameObjectCreate(GameObject* go) { - - if (go->GetEntry() == 181766) //Final exit door - Door1GUID = go->GetGUID(); - if (go->GetEntry() == 181811) //The Maker Front door - Door2GUID = go->GetGUID(); - if (go->GetEntry() == 181812) //The Maker Rear door - Door3GUID = go->GetGUID(); - if (go->GetEntry() == 181822) //Broggok Front door - Door4GUID = go->GetGUID(); - if (go->GetEntry() == 181819) //Broggok Rear door - Door5GUID = go->GetGUID(); - if (go->GetEntry() == 181823) //Kelidan exit door - Door6GUID = go->GetGUID(); - - if (go->GetEntry() == 181813) //The Maker prison cell front right - PrisonCell1GUID = go->GetGUID(); - if (go->GetEntry() == 181814) //The Maker prison cell back right - PrisonCell2GUID = go->GetGUID(); - if (go->GetEntry() == 181816) //The Maker prison cell front left - PrisonCell3GUID = go->GetGUID(); - if (go->GetEntry() == 181815) //The Maker prison cell back left - PrisonCell4GUID = go->GetGUID(); - if (go->GetEntry() == 181821) //Broggok prison cell front right - PrisonCell5GUID = go->GetGUID(); - if (go->GetEntry() == 181818) //Broggok prison cell back right - PrisonCell6GUID = go->GetGUID(); - if (go->GetEntry() == 181820) //Broggok prison cell front left - PrisonCell7GUID = go->GetGUID(); - if (go->GetEntry() == 181817) //Broggok prison cell back left - PrisonCell8GUID = go->GetGUID(); + if (go->GetEntry() == 181766) //Final exit door + Door1GUID = go->GetGUID(); + if (go->GetEntry() == 181811) //The Maker Front door + Door2GUID = go->GetGUID(); + if (go->GetEntry() == 181812) //The Maker Rear door + Door3GUID = go->GetGUID(); + if (go->GetEntry() == 181822) //Broggok Front door + Door4GUID = go->GetGUID(); + if (go->GetEntry() == 181819) //Broggok Rear door + Door5GUID = go->GetGUID(); + if (go->GetEntry() == 181823) //Kelidan exit door + Door6GUID = go->GetGUID(); + + if (go->GetEntry() == 181813) //The Maker prison cell front right + PrisonCell1GUID = go->GetGUID(); + if (go->GetEntry() == 181814) //The Maker prison cell back right + PrisonCell2GUID = go->GetGUID(); + if (go->GetEntry() == 181816) //The Maker prison cell front left + PrisonCell3GUID = go->GetGUID(); + if (go->GetEntry() == 181815) //The Maker prison cell back left + PrisonCell4GUID = go->GetGUID(); + if (go->GetEntry() == 181821) //Broggok prison cell front right + PrisonCell5GUID = go->GetGUID(); + if (go->GetEntry() == 181818) //Broggok prison cell back right + PrisonCell6GUID = go->GetGUID(); + if (go->GetEntry() == 181820) //Broggok prison cell front left + PrisonCell7GUID = go->GetGUID(); + if (go->GetEntry() == 181817) //Broggok prison cell back left + PrisonCell8GUID = go->GetGUID(); } uint64 GetData64(uint32 data) @@ -174,7 +179,7 @@ class instance_blood_furnace : public InstanceMapScript OUT_SAVE_INST_DATA; std::ostringstream saveStream; - saveStream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2]; + saveStream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2]; str_data = saveStream.str(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 1444dd2c1c4..8af59582a18 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -165,7 +165,7 @@ class instance_the_eye : public InstanceMapScript { OUT_SAVE_INST_DATA; std::ostringstream stream; - stream << m_auiEncounter[0] << " " << m_auiEncounter[1] << " " << m_auiEncounter[2] << " " << m_auiEncounter[3]; + stream << m_auiEncounter[0] << ' ' << m_auiEncounter[1] << ' ' << m_auiEncounter[2] << ' ' << m_auiEncounter[3]; char* out = new char[stream.str().length() + 1]; strcpy(out, stream.str().c_str()); if (out) |