mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17204) -Codechange: Move viewport initialization into the constructor of the news item window.

release/1.0
alberth 2009-08-16 16:06:06 +00:00
parent c89621540c
commit 4f1758b51a
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/news_gui.cpp
View File

@ -193,6 +193,24 @@ struct NewsWindow : Window {
this->flags4 |= WF_DISABLE_VP_SCROLL; this->flags4 |= WF_DISABLE_VP_SCROLL;
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
const NewsMode display_mode = _news_subtype_data[this->ni->subtype].display_mode;
switch (display_mode) {
case NM_NORMAL:
break;
case NM_THIN:
InitializeWindowViewport(this, 2, 58, 426, 70,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
break;
case NM_SMALL:
InitializeWindowViewport(this, 3, 17, 274, 47,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
break;
default: NOT_REACHED();
}
} }
void DrawNewsBorder() void DrawNewsBorder()
@ -430,17 +448,11 @@ static void ShowNewspaper(NewsItem *ni)
case NM_THIN: case NM_THIN:
_thin_news_desc.top = top; _thin_news_desc.top = top;
w = new NewsWindow(&_thin_news_desc, ni); w = new NewsWindow(&_thin_news_desc, ni);
InitializeWindowViewport(w, 2, 58, 426, 70,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
break; break;
case NM_SMALL: case NM_SMALL:
_smalll_news_desc.top = top; _smalll_news_desc.top = top;
w = new NewsWindow(&_smalll_news_desc, ni); w = new NewsWindow(&_smalll_news_desc, ni);
InitializeWindowViewport(w, 3, 17, 274, 47,
ni->reftype1 == NR_VEHICLE ? 0x80000000 | ni->ref1 : GetReferenceTile(ni->reftype1, ni->ref1), ZOOM_LVL_NEWS);
break; break;
default: NOT_REACHED(); default: NOT_REACHED();