diff options
| author | rubidium <rubidium@openttd.org> | 2007-07-16 09:16:58 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-07-16 09:16:58 +0000 |
| commit | efc7fdf2fdad3d17a0e5acdcf744c32ae4065ea3 (patch) | |
| tree | e5f239c13d0bce3b501cd16094df719e1af4be61 /src/economy.cpp | |
| parent | 4896d437b17bb91840108450fe899f5e3a2ec644 (diff) | |
| download | openttd-efc7fdf2fdad3d17a0e5acdcf744c32ae4065ea3.tar.xz | |
(svn r10587) -Codechange: move the string/dparam related stuff from variables.h to strings.h
Diffstat (limited to 'src/economy.cpp')
| -rw-r--r-- | src/economy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/economy.cpp b/src/economy.cpp index a8aef3542..4f6136923 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -538,7 +538,7 @@ void DrawNewsBankrupcy(Window *w) int32 price; DrawStringCentered(w->width>>1, 1, STR_7059_TRANSPORT_COMPANY_MERGER, 0); - COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2); + CopyInDParam(0,WP(w,news_d).ni->params, 2); SetDParam(2, p->index); price = WP(w,news_d).ni->params[2]; SetDParam(3, price); @@ -552,7 +552,7 @@ void DrawNewsBankrupcy(Window *w) case NB_BBANKRUPT: DrawStringCentered(w->width>>1, 1, STR_705C_BANKRUPT, 0); - COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2); + CopyInDParam(0,WP(w,news_d).ni->params, 2); DrawStringMultiCenter( ((w->width - 101) >> 1) + 98, 90, @@ -563,7 +563,7 @@ void DrawNewsBankrupcy(Window *w) case NB_BNEWCOMPANY: DrawStringCentered(w->width>>1, 1, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED, 0); SetDParam(0, p->index); - COPY_IN_DPARAM(1,WP(w,news_d).ni->params, 2); + CopyInDParam(1,WP(w,news_d).ni->params, 2); DrawStringMultiCenter( ((w->width - 101) >> 1) + 98, 90, @@ -589,20 +589,20 @@ StringID GetNewsStringBankrupcy(const NewsItem *ni) case NB_BMERGER: SetDParam(0, STR_7059_TRANSPORT_COMPANY_MERGER); SetDParam(1, STR_705A_HAS_BEEN_SOLD_TO_FOR); - COPY_IN_DPARAM(2,ni->params, 2); + CopyInDParam(2,ni->params, 2); SetDParam(4, p->index); - COPY_IN_DPARAM(5,ni->params + 2, 1); + CopyInDParam(5,ni->params + 2, 1); return STR_02B6; case NB_BBANKRUPT: SetDParam(0, STR_705C_BANKRUPT); SetDParam(1, STR_705D_HAS_BEEN_CLOSED_DOWN_BY); - COPY_IN_DPARAM(2,ni->params, 2); + CopyInDParam(2,ni->params, 2); return STR_02B6; case NB_BNEWCOMPANY: SetDParam(0, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED); SetDParam(1, STR_705F_STARTS_CONSTRUCTION_NEAR); SetDParam(2, p->index); - COPY_IN_DPARAM(3,ni->params, 2); + CopyInDParam(3,ni->params, 2); return STR_02B6; default: NOT_REACHED(); |