From 79141ea6a1e39d1bd2ffddb30613c7a7d09dd060 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Tue, 31 Dec 2013 05:13:30 +0200 Subject: [PATCH] [12776] Missing changes --- src/game/Player.cpp | 6 +++--- src/game/movement/spline.h | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index c8ae55cdb..d302ca146 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16194,7 +16194,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder) uint32 savedhealth = fields[46].GetUInt32(); SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth); - static_assert(MAX_STORED_POWERS == 5, "Query not updated."); + COMPILE_ASSERT(MAX_STORED_POWERS == 5, "Query not updated."); for (uint32 i = 0; i < MAX_STORED_POWERS; ++i) { uint32 savedpower = fields[47 + i].GetUInt32(); @@ -17625,7 +17625,7 @@ void Player::SaveToDB() uberInsert.addUInt32(GetHealth()); - static_assert(MAX_STORED_POWERS == 5, "Query not updated."); + COMPILE_ASSERT(MAX_STORED_POWERS == 5, "Query not updated."); for (uint32 i = 0; i < MAX_STORED_POWERS; ++i) uberInsert.addUInt32(GetPowerByIndex(i)); @@ -18306,7 +18306,7 @@ void Player::_SaveStats() stmt.addUInt32(GetGUIDLow()); stmt.addUInt32(GetMaxHealth()); - static_assert(MAX_STORED_POWERS == 5, "Query not updated."); + COMPILE_ASSERT(MAX_STORED_POWERS == 5, "Query not updated."); for (uint32 i = 0; i < MAX_STORED_POWERS; ++i) stmt.addUInt32(GetMaxPowerByIndex(i)); for (int i = 0; i < MAX_STATS; ++i) diff --git a/src/game/movement/spline.h b/src/game/movement/spline.h index 0f5a164df..382ef704d 100644 --- a/src/game/movement/spline.h +++ b/src/game/movement/spline.h @@ -57,7 +57,7 @@ namespace Movement // client's value is 20, blizzs use 2-3 steps to compute length STEPS_PER_SEGMENT = 3, }; - static_assert(STEPS_PER_SEGMENT > 0, "shouldn't be lesser than 1"); + COMPILE_ASSERT(STEPS_PER_SEGMENT > 0, "shouldn't be lesser than 1"); protected: void EvaluateLinear(index_type, float, Vector3&) const; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1353f4b98..b5746b985 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12775" + #define REVISION_NR "12776" #endif // __REVISION_NR_H__