From c11ea1a594c1401f21317975ad9ab8fd4f5c2fb4 Mon Sep 17 00:00:00 2001 From: Antz Date: Mon, 6 Mar 2017 22:40:53 +0000 Subject: [PATCH] Fix VS2010/2012 build. Thanks H0zen for help --- src/game/Server/SharedDefines.h | 4 ++-- src/game/WorldHandlers/World.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h index 3376ed62..7911aebd 100644 --- a/src/game/Server/SharedDefines.h +++ b/src/game/Server/SharedDefines.h @@ -153,7 +153,7 @@ enum Powers POWER_RAGE = 1, ///< This is what warriors use to cast their spells POWER_FOCUS = 2, ///< Used by hunters after Cataclysm (4.x) POWER_ENERGY = 3, ///< Used by rouges to do their spells - POWER_HAPPINESS = 4, ///< Hunters pet's happiness affect their damage + POWER_HAPPINESS = 4, ///< Hunter's pet's happiness affect their damage MAX_POWERS = 5, POWER_ALL = 127, // default for class? - need check for TBC POWER_HEALTH = 0xFFFFFFFE ///< Health, everyone has this (-2 as signed value) @@ -2576,7 +2576,7 @@ enum TrackedAuraType // will only support 1.12.1 client (build 5875), 1.12.2 client (build 6005) and 1.12.3 client (build 6141).. #define EXPECTED_MANGOSD_CLIENT_BUILD {5875, 6005, 6141, 0} -#define EXPECTED_MANGOSD_CLIENT_VERSION {"1.12.x"} +#define EXPECTED_MANGOSD_CLIENT_VERSION "1.12.x" // Max creature level (included some bosses and elite) #define DEFAULT_MAX_CREATURE_LEVEL 65 diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index d760a05f..c145b0dc 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -1561,7 +1561,7 @@ void World::showFooter() modules_.insert(" Warden : Disabled"); } - std::string thisClientVersion = EXPECTED_MANGOSD_CLIENT_VERSION; + std::string thisClientVersion (EXPECTED_MANGOSD_CLIENT_VERSION); std::string thisClientBuilds = AcceptableClientBuildsListStr(); std::string sModules;