aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp4
-rw-r--r--src/tools/map_extractor/System.cpp10
-rw-r--r--src/tools/mmaps_generator/PathGenerator.cpp2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index f438a117a5f..1c1cdbdac53 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -1407,9 +1407,7 @@ public:
{
uiDespawnTimer = 28000;
if (instance)
- {
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
- }
DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO);
}
@@ -1504,9 +1502,7 @@ public:
void Reset() OVERRIDE
{
if (instance)
- {
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
- }
m_uiFadeArmorTimer = 1000;
m_uiHatchEggTimer = 20000;
}
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index bf88a92c32a..2173dab4e1c 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -89,11 +89,17 @@ static const char* const langs[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koK
void CreateDir( const std::string& Path )
{
+ int ret;
#ifdef _WIN32
- _mkdir( Path.c_str());
+ ret = _mkdir( Path.c_str());
#else
- mkdir( Path.c_str(), 0777 );
+ ret = mkdir( Path.c_str(), 0777 );
#endif
+ if (ret != 0)
+ {
+ printf("Fatal Error: Could not create directory %s check your permissions", Path.c_str());
+ exit(1);
+ }
}
bool FileExists( const char* FileName )
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
index ed114491b27..882ec7ffb66 100644
--- a/src/tools/mmaps_generator/PathGenerator.cpp
+++ b/src/tools/mmaps_generator/PathGenerator.cpp
@@ -235,7 +235,7 @@ bool handleArgs(int argc, char** argv,
int finish(const char* message, int returnValue)
{
printf("%s", message);
- getchar();
+ getchar(); // Wait for user input
return returnValue;
}