From 7a72dcb3b57b70214c4d402be89f9b1dd158d790 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 18 Jun 2007 21:00:14 +0000 Subject: (svn r10207) -Codechange: remove the redundant player_money in favour of the money64, which is now renamed to player_money. --- src/economy.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/economy.cpp') diff --git a/src/economy.cpp b/src/economy.cpp index 2152823ca..aa2be9247 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -88,7 +88,7 @@ int64 CalculateCompanyValue(const Player* p) } } - value += p->money64 - p->current_loan; // add real money value + value += p->player_money - p->current_loan; // add real money value return max(value, 1LL); } @@ -287,8 +287,7 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player) * removing his/her property doesn't fail because of lack of money. * Not too drastically though, because it could overflow */ if (new_player == PLAYER_SPECTATOR) { - GetPlayer(old_player)->money64 = MAX_UVALUE(uint64) >>2; // jackpot ;p - UpdatePlayerMoney32(GetPlayer(old_player)); + GetPlayer(old_player)->player_money = MAX_UVALUE(uint64) >> 2; // jackpot ;p } if (new_player == PLAYER_SPECTATOR) { @@ -1788,9 +1787,8 @@ static void DoAcquireCompany(Player *p) for (i = 0; i != 4; i++) { if (p->share_owners[i] != PLAYER_SPECTATOR) { owner = GetPlayer(p->share_owners[i]); - owner->money64 += value; + owner->player_money += value; owner->yearly_expenses[0][EXPENSES_OTHER] += value; - UpdatePlayerMoney32(owner); } } -- cgit v1.2.3-54-g00ecf