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/news_gui.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/news_gui.cpp')
| -rw-r--r-- | src/news_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 58ba6d7cc..27ec0a1e7 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -124,7 +124,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e) DrawStringRightAligned(428, 1, STR_01FF, 0); if (!(ni->flags & NF_VIEWPORT)) { - COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); + CopyInDParam(0, ni->params, lengthof(ni->params)); DrawStringMultiCenter(215, ni->display_mode == NM_NORMAL ? 76 : 56, ni->string_id, w->width - 4); } else { @@ -141,7 +141,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e) (ni->flags & NF_INCOLOR ? PALETTE_TO_TRANSPARENT : PALETTE_TO_STRUCT_GREY) | (1 << USE_COLORTABLE) ); - COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); + CopyInDParam(0, ni->params, lengthof(ni->params)); DrawStringMultiCenter(w->width / 2, 20, ni->string_id, w->width - 4); } break; @@ -155,11 +155,11 @@ static void NewsWindowProc(Window *w, WindowEvent *e) default: { DrawWindowWidgets(w); if (!(ni->flags & NF_VIEWPORT)) { - COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); + CopyInDParam(0, ni->params, lengthof(ni->params)); DrawStringMultiCenter(140, 38, ni->string_id, 276); } else { DrawWindowViewport(w); - COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); + CopyInDParam(0, ni->params, lengthof(ni->params)); DrawStringMultiCenter(w->width / 2, w->height - 16, ni->string_id, w->width - 4); } break; @@ -300,7 +300,7 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b) ni->data_a = data_a; ni->data_b = data_b; ni->date = _date; - COPY_OUT_DPARAM(ni->params, 0, lengthof(ni->params)); + CopyOutDParam(ni->params, 0, lengthof(ni->params)); w = FindWindowById(WC_MESSAGE_HISTORY, 0); if (w == NULL) return; @@ -611,7 +611,7 @@ static void DrawNewsString(int x, int y, uint16 color, const NewsItem *ni, uint if (ni->display_mode == 3) { str = _get_news_string_callback[ni->callback](ni); } else { - COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); + CopyInDParam(0, ni->params, lengthof(ni->params)); str = ni->string_id; } |