(svn r27086) -Codechange: Simplify opening of windows by always returning a valid window pointer.

2 files changed, 9 insertions, 7 deletions

diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index 4abfa4b1f..82c7a7d22 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -702,8 +702,8 @@ void ShowNewGRFInspectWindow(GrfSpecFeature feature, uint index, const uint32 gr
 	if (!IsNewGRFInspectable(feature, index)) return;
 
 	WindowNumber wno = GetInspectWindowNumber(feature, index);
-	NewGRFInspectWindow *w = AllocateWindowDescFront<NewGRFInspectWindow>(feature == GSF_TRAINS || feature == GSF_ROADVEHICLES ? &_newgrf_inspect_chain_desc : &_newgrf_inspect_desc, wno);
-	if (w == NULL) w = (NewGRFInspectWindow *)FindWindowById(WC_NEWGRF_INSPECT, wno);
+	WindowDesc *desc = (feature == GSF_TRAINS || feature == GSF_ROADVEHICLES) ? &_newgrf_inspect_chain_desc : &_newgrf_inspect_desc;
+	NewGRFInspectWindow *w = AllocateWindowDescFront<NewGRFInspectWindow>(desc, wno, true);
 	w->SetCallerGRFID(grfid);
 }
 
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);
 }