diff options
author | alberth <alberth@openttd.org> | 2014-12-18 18:22:23 +0000 |
---|---|---|
committer | alberth <alberth@openttd.org> | 2014-12-18 18:22:23 +0000 |
commit | 107bf32953f3261a0d7c02fa9113afeb94b68219 (patch) | |
tree | 5369e1e38edbef69201aa91f20e0c20001bece23 /src/story_gui.cpp | |
parent | 78896895cf23deead6ebffe6bcd615729a833d3a (diff) | |
download | openttd-107bf32953f3261a0d7c02fa9113afeb94b68219.tar.xz |
(svn r27086) -Codechange: Simplify opening of windows by always returning a valid window pointer.
Diffstat (limited to 'src/story_gui.cpp')
-rw-r--r-- | src/story_gui.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/story_gui.cpp b/src/story_gui.cpp index 1c0edd925..003843310 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -758,13 +758,15 @@ static WindowDesc _story_book_desc( _nested_story_book_widgets, lengthof(_nested_story_book_widgets) ); +/** + * Raise or create the story book window for \a company, at page \a page_id. + * @param company 'Owner' of the story book, may be #INVALID_COMPANY. + * @param page_id Page to open, may be #INVALID_STORY_PAGE. + */ void ShowStoryBook(CompanyID company, uint16 page_id) { if (!Company::IsValidID(company)) company = (CompanyID)INVALID_COMPANY; - StoryBookWindow *w = AllocateWindowDescFront<StoryBookWindow>(&_story_book_desc, company); - if (page_id != INVALID_STORY_PAGE) { - if (w == NULL) w = (StoryBookWindow *)FindWindowById(WC_STORY_BOOK, company); - w->SetSelectedPage(page_id); - } + StoryBookWindow *w = AllocateWindowDescFront<StoryBookWindow>(&_story_book_desc, company, true); + if (page_id != INVALID_STORY_PAGE) w->SetSelectedPage(page_id); } |