From fdb447ac55fc7faffe6b7477a4ecfa7733b9a03d Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 2 Dec 2004 22:53:07 +0000 Subject: (svn r901) Small step in the process to clean up the DPARAM mess: - reduce to 2 sizes (*DParam64 for 64bit values, *DParam for the rest) - use inline functions instead of macros - add assert()s to check for buffer overruns --- subsidy_gui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'subsidy_gui.c') diff --git a/subsidy_gui.c b/subsidy_gui.c index 4227c4bb5..0e32e7504 100644 --- a/subsidy_gui.c +++ b/subsidy_gui.c @@ -92,7 +92,7 @@ static void DrawSubsidiesWindow(Window *w) SetupSubsidyDecodeParam(s, 1); x2 = DrawString(x+2, y, STR_2027_FROM_TO, 0); - SET_DPARAM16(0, _date - ymd.day + 384 - s->age * 32); + SetDParam(0, _date - ymd.day + 384 - s->age * 32); DrawString(x2, y, STR_2028_BY, 0); y += 10; num++; @@ -113,12 +113,12 @@ static void DrawSubsidiesWindow(Window *w) SetupSubsidyDecodeParam(s, 1); p = DEREF_PLAYER(DEREF_STATION(s->to)->owner); - SET_DPARAM16(3, p->name_1); - SET_DPARAM32(4, p->name_2); + SetDParam(3, p->name_1); + SetDParam(4, p->name_2); xt = DrawString(x+2, y, STR_202C_FROM_TO, 0); - SET_DPARAM16(0, _date - ymd.day + 768 - s->age * 32); + SetDParam(0, _date - ymd.day + 768 - s->age * 32); DrawString(xt, y, STR_202D_UNTIL, 0); y += 10; num++; -- cgit v1.2.3-70-g09d2