diff options
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_deserter.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_icecrown.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Debugging/Errors.cpp | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 25419632a29..ebe3792420b 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -902,7 +902,7 @@ LFGDungeonEntry const* GetLFGDungeon(uint32 mapId, Difficulty difficulty) if (!dungeon) continue; - if (dungeon->map == mapId && Difficulty(dungeon->difficulty) == difficulty) + if (dungeon->map == (int)mapId && Difficulty(dungeon->difficulty) == difficulty) return dungeon; } diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index 3850456fcb3..ef2cd7b45b9 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -45,20 +45,20 @@ public: ChatCommand* GetCommands() const { - static ChatCommand deserterInstanceCommandTable[] = + static ChatCommand deserterInstanceCommandTable[] = { { "add", SEC_ADMINISTRATOR, false, &HandleDeserterInstanceAdd, "", NULL }, { "remove", SEC_ADMINISTRATOR, false, &HandleDeserterInstanceRemove, "", NULL }, { NULL, SEC_PLAYER, false, NULL, "", NULL } }; - static ChatCommand deserterBGCommandTable[] = + static ChatCommand deserterBGCommandTable[] = { { "add", SEC_ADMINISTRATOR, false, &HandleDeserterBGAdd, "", NULL }, { "remove", SEC_ADMINISTRATOR, false, &HandleDeserterBGRemove, "", NULL }, { NULL, SEC_PLAYER, false, NULL, "", NULL } }; - static ChatCommand deserterCommandTable[] = + static ChatCommand deserterCommandTable[] = { { "instance", SEC_ADMINISTRATOR, false, NULL, "", deserterInstanceCommandTable }, { "bg", SEC_ADMINISTRATOR, false, NULL, "", deserterBGCommandTable }, diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 0d39fbf5505..64a315eb465 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -3078,10 +3078,12 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader if (InstanceScript* instance = GetCaster()->GetInstanceScript()) if (Creature* yogg = ObjectAccessor::GetCreature(*GetCaster(), instance->GetData64(BOSS_YOGG_SARON))) if (yogg->FindCurrentSpellBySpellId(SPELL_DEAFENING_ROAR)) + { if (GetCaster()->GetDistance(yogg) > 20.0f) return SPELL_FAILED_OUT_OF_RANGE; else return SPELL_CAST_OK; + } return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; } diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 70b500166c9..0447d70b502 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -921,7 +921,7 @@ class npc_frostbrood_skytalon : public CreatureScript if (id == POINT_GRAB_DECOY) if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummoner()) - DoCast(summoner, SPELL_GRAB); + DoCast(summoner, SPELL_GRAB); } void UpdateAI(uint32 diff) diff --git a/src/server/shared/Debugging/Errors.cpp b/src/server/shared/Debugging/Errors.cpp index 10ede3ae402..877d7554c43 100644 --- a/src/server/shared/Debugging/Errors.cpp +++ b/src/server/shared/Debugging/Errors.cpp @@ -20,6 +20,7 @@ #include <ace/Stack_Trace.h> #include <ace/OS_NS_unistd.h> +#include <cstdlib> namespace Trinity { @@ -29,6 +30,7 @@ void Assert(char const *file, int line, char const *function, char const *messag fprintf(stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", file, line, function, message, st.c_str()); *((volatile int*)NULL) = 0; + exit(1); } void Fatal(char const *file, int line, char const *function, char const *message) @@ -37,6 +39,7 @@ void Fatal(char const *file, int line, char const *function, char const *message file, line, function, message); ACE_OS::sleep(10); *((volatile int*)NULL) = 0; + exit(1); } void Error(char const *file, int line, char const *function, char const *message) @@ -44,6 +47,7 @@ void Error(char const *file, int line, char const *function, char const *message fprintf(stderr, "\n%s:%i in %s ERROR:\n %s\n", file, line, function, message); *((volatile int*)NULL) = 0; + exit(1); } void Warning(char const *file, int line, char const *function, char const *message) |