diff options
author | rubidium <rubidium@openttd.org> | 2007-06-21 17:25:17 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-06-21 17:25:17 +0000 |
commit | d0fa4eb9de1a3ee1ebaff4d71890a2fee5e4e32d (patch) | |
tree | 9b6fd14e50d7ab0c8fb901cfad2e00092a6b0470 /src/misc_gui.cpp | |
parent | a482793a32692197572e09b07df35a2b28cd6b9b (diff) | |
download | openttd-d0fa4eb9de1a3ee1ebaff4d71890a2fee5e4e32d.tar.xz |
(svn r10258) -Codechange: as we are now using int64 all over the place, it's better to use int64 variables in the string generating too instead of packing them into two int32s.
-Fix: some displays of money were wrong.
Diffstat (limited to 'src/misc_gui.cpp')
-rw-r--r-- | src/misc_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 1a5b9bbd8..2a36406af 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -122,7 +122,7 @@ static void Place_LandInfo(TileIndex tile) str = STR_01A4_COST_TO_CLEAR_N_A; if (CmdSucceeded(costclear)) { - SetDParamMoney(0, costclear.GetCost()); + SetDParam(0, costclear.GetCost()); str = STR_01A5_COST_TO_CLEAR; } GetString(_landinfo_data[2], str, lastof(_landinfo_data[2])); @@ -478,7 +478,7 @@ void ShowBuildTreesScenToolbar() AllocateWindowDescFront(&_build_trees_scen_desc, 0); } -static uint32 _errmsg_decode_params[20]; +static uint64 _errmsg_decode_params[20]; static StringID _errmsg_message_1, _errmsg_message_2; static uint _errmsg_duration; @@ -618,7 +618,7 @@ void ShowEstimatedCostOrIncome(Money cost, int x, int y) cost = -cost; msg = STR_0807_ESTIMATED_INCOME; } - SetDParamMoney(0, cost); + SetDParam(0, cost); ShowErrorMessage(INVALID_STRING_ID, msg, x, y); } @@ -632,7 +632,7 @@ void ShowCostOrIncomeAnimation(int x, int y, int z, Money cost) cost = -cost; msg = STR_0803_INCOME; } - SetDParamMoney(0, cost); + SetDParam(0, cost); AddTextEffect(msg, pt.x, pt.y, 0x250, TE_RISING); } @@ -640,7 +640,7 @@ void ShowFeederIncomeAnimation(int x, int y, int z, Money cost) { Point pt = RemapCoords(x,y,z); - SetDParamMoney(0, cost); + SetDParam(0, cost); AddTextEffect(STR_FEEDER, pt.x, pt.y, 0x250, TE_RISING); } @@ -1845,7 +1845,7 @@ static void CheatsWndProc(Window *w, WindowEvent *e) if (ce->flags & CE_CLICK) { DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, 0, (clk - (i * 2) == 1) ? FR_LOWERED : FR_NONE); if (i == 0) { // XXX - hack/hack for first element which is increase money. Told ya it's a mess - SetDParam64(0, 10000000); + SetDParam(0, 10000000); } else { SetDParam(0, false); } |