diff --git a/src/story_gui.cpp b/src/story_gui.cpp index 9195035308..a9108508ea 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -641,15 +641,16 @@ public: { switch (widget) { case WID_SB_SEL_PAGE: { - StoryPage *page = this->GetSelPage(); - return GetString(stringid, page != nullptr && !page->title.empty() ? page->title : this->selected_generic_title); + const StoryPage *page = this->GetSelPage(); + /* Encoded string from game script needs to be formatted. */ + return GetString(STR_JUST_RAW_STRING, page != nullptr && !page->title.empty() ? page->title : this->selected_generic_title); } case WID_SB_CAPTION: if (this->window_number == CompanyID::Invalid()) { - return GetString(stringid, STR_STORY_BOOK_SPECTATOR_CAPTION); + return GetString(STR_STORY_BOOK_SPECTATOR_CAPTION); } - return GetString(stringid, STR_STORY_BOOK_CAPTION, this->window_number); + return GetString(STR_STORY_BOOK_CAPTION, this->window_number); default: return this->Window::GetWidgetString(widget, stringid); @@ -936,7 +937,7 @@ const std::initializer_list Story static constexpr NWidgetPart _nested_story_book_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_BROWN), - NWidget(WWT_CAPTION, COLOUR_BROWN, WID_SB_CAPTION), SetStringTip(STR_JUST_STRING1, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_BROWN, WID_SB_CAPTION), NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), @@ -948,7 +949,7 @@ static constexpr NWidgetPart _nested_story_book_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_SB_PREV_PAGE), SetMinimalSize(100, 0), SetFill(0, 0), SetStringTip(STR_STORY_BOOK_PREV_PAGE, STR_STORY_BOOK_PREV_PAGE_TOOLTIP), NWidget(NWID_BUTTON_DROPDOWN, COLOUR_BROWN, WID_SB_SEL_PAGE), SetMinimalSize(93, 12), SetFill(1, 0), - SetStringTip(STR_JUST_RAW_STRING, STR_STORY_BOOK_SEL_PAGE_TOOLTIP), SetResize(1, 0), + SetToolTip(STR_STORY_BOOK_SEL_PAGE_TOOLTIP), SetResize(1, 0), NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_SB_NEXT_PAGE), SetMinimalSize(100, 0), SetFill(0, 0), SetStringTip(STR_STORY_BOOK_NEXT_PAGE, STR_STORY_BOOK_NEXT_PAGE_TOOLTIP), NWidget(WWT_RESIZEBOX, COLOUR_BROWN), EndContainer(),