aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-03-04 19:17:51 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-03-04 19:17:51 +0100
commit3c222d0ae3d55440864e3a52ac2944b008a8ec8f (patch)
treee3b248c328b4ad7a9835602a7d3ef7434603650a
parent7ce02e7900c9682a35f77dfa873fefc59b5014d2 (diff)
Fix merge fail
-rw-r--r--src/server/game/Entities/Player/Player.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 5f13fd0d33a..c708179fe04 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1675,7 +1675,7 @@ class Player : public Unit, public GridObject<Player>
void setRegenTimerCount(uint32 time) {m_regenTimerCount = time;}
void setWeaponChangeTimer(uint32 time) {m_weaponChangeTimer = time;}
- uint64 GetMoney() const { return GetUInt32Value(PLAYER_FIELD_COINAGE); }
+ uint64 GetMoney() const { return GetUInt64Value(PLAYER_FIELD_COINAGE); }
bool ModifyMoney(int64 amount, bool sendError = true);
bool HasEnoughMoney(uint64 amount) const { return (GetMoney() >= amount); }
bool HasEnoughMoney(int64 amount) const;