diff options
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 | ||||
| -rw-r--r-- | src/server/worldserver/CommandLine/CliRunnable.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7ba3e6b7976..197354b0a22 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -101,8 +101,8 @@ static bool procPrepared = InitTriggerAuraData(); Unit::Unit(): WorldObject(), m_movedPlayer(NULL), IsAIEnabled(false), NeedChangeAI(false), m_ControlledByPlayer(false), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0), -m_removedAurasCount(0), m_vehicle(NULL), i_motionMaster(this), m_vehicleKit(NULL), -m_ThreatManager(this), m_unitTypeMask(UNIT_MASK_NONE), m_HostileRefManager(this) +m_removedAurasCount(0), i_motionMaster(this), m_ThreatManager(this), m_vehicle(NULL), +m_vehicleKit(NULL), m_unitTypeMask(UNIT_MASK_NONE), m_HostileRefManager(this) { #ifdef _MSC_VER #pragma warning(default:4355) diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 0a5b16563f5..15618936013 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -106,7 +106,7 @@ void utf8print(void* /*arg*/, const char* str) printf(temp_buf); #else { - va_list v; + va_list v = NULL; vprintf(str, v); va_end(v); fflush(stdout); |