aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNyeriah <sarah.trysan@live.com>2014-10-18 20:17:31 -0300
committerNyeriah <sarah.trysan@live.com>2014-10-18 20:17:31 -0300
commit54629368967b1c5fcb1d423801151bc4ce8ce1f2 (patch)
treed998184ad8f58247f376083ecf008b9eefab2c72 /src
parent15a9c6729ee274044b2ba78f8b9ad3c167c94bd1 (diff)
Scripts/Commands: Fix static analysis issues
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_instance.cpp4
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index d2cec87e08f..0bc352be842 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -308,6 +308,8 @@ public:
return false;
}
+ encounterId = atoi(param1);
+
if (encounterId > map->ToInstanceMap()->GetInstanceScript()->GetEncounterCount())
{
handler->PSendSysMessage(LANG_BAD_VALUE);
@@ -315,8 +317,6 @@ public:
return false;
}
- encounterId = atoi(param1);
-
uint8 state = map->ToInstanceMap()->GetInstanceScript()->GetBossState(encounterId);
handler->PSendSysMessage(LANG_COMMAND_INST_GET_BOSS_STATE, encounterId, state);
return true;
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index f8400406bdc..42627ec082f 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1963,12 +1963,12 @@ public:
// we have to manually set the string for mutedate
time_t sqlTime = fields[0].GetUInt32();
- struct tm* timeinfo;
+ tm timeinfo;
char buffer[80];
// set it to string
- timeinfo = localtime_r(&sqlTime);
- strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", timeinfo);
+ localtime_r(&sqlTime, &timeinfo);
+ strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", &timeinfo);
handler->PSendSysMessage(LANG_COMMAND_MUTEHISTORY_OUTPUT, buffer, fields[1].GetUInt32(), fields[2].GetCString(), fields[3].GetCString());
} while (result->NextRow());