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

Codefix: access pool via PoolItem, not the pool itself

pull/13425/head
Rubidium 2025-02-01 00:27:43 +01:00 committed by rubidium42
parent 4ca1fe6c32
commit b4e3425a5f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/story.cpp
View File

@ -214,7 +214,7 @@ std::tuple<CommandCost, StoryPageID> CmdCreateStoryPage(DoCommandFlag flags, Com
if (company != INVALID_COMPANY && !Company::IsValidID(company)) return { CMD_ERROR, INVALID_STORY_PAGE }; if (company != INVALID_COMPANY && !Company::IsValidID(company)) return { CMD_ERROR, INVALID_STORY_PAGE };
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (_story_page_pool.items == 0) { if (StoryPage::GetNumItems() == 0) {
/* Initialize the next sort value variable. */ /* Initialize the next sort value variable. */
_story_page_next_sort_value = 0; _story_page_next_sort_value = 0;
} }
@ -262,7 +262,7 @@ std::tuple<CommandCost, StoryPageElementID> CmdCreateStoryPageElement(DoCommandF
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (_story_page_element_pool.items == 0) { if (StoryPageElement::GetNumItems() == 0) {
/* Initialize the next sort value variable. */ /* Initialize the next sort value variable. */
_story_page_element_next_sort_value = 0; _story_page_element_next_sort_value = 0;
} }

14
src/story_gui.cpp
View File

@ -133,8 +133,8 @@ protected:
*/ */
StoryPage *GetSelPage() const StoryPage *GetSelPage() const
{ {
if (!_story_page_pool.IsValidID(selected_page_id)) return nullptr; if (!StoryPage::IsValidID(selected_page_id)) return nullptr;
return _story_page_pool.Get(selected_page_id); return StoryPage::Get(selected_page_id);
} }
/** /**
@ -159,7 +159,7 @@ protected:
bool IsFirstPageSelected() bool IsFirstPageSelected()
{ {
/* Verify that the selected page exist. */ /* Verify that the selected page exist. */
if (!_story_page_pool.IsValidID(this->selected_page_id)) return false; if (!StoryPage::IsValidID(this->selected_page_id)) return false;
return this->story_pages.front()->index == this->selected_page_id; return this->story_pages.front()->index == this->selected_page_id;
} }
@ -170,7 +170,7 @@ protected:
bool IsLastPageSelected() bool IsLastPageSelected()
{ {
/* Verify that the selected page exist. */ /* Verify that the selected page exist. */
if (!_story_page_pool.IsValidID(this->selected_page_id)) return false; if (!StoryPage::IsValidID(this->selected_page_id)) return false;
if (this->story_pages.size() <= 1) return true; if (this->story_pages.size() <= 1) return true;
const StoryPage *last = this->story_pages.back(); const StoryPage *last = this->story_pages.back();
@ -205,7 +205,7 @@ protected:
*/ */
void SelectPrevPage() void SelectPrevPage()
{ {
if (!_story_page_pool.IsValidID(this->selected_page_id)) return; if (!StoryPage::IsValidID(this->selected_page_id)) return;
/* Find the last available page which is previous to the current selected page. */ /* Find the last available page which is previous to the current selected page. */
const StoryPage *last_available; const StoryPage *last_available;
@ -225,7 +225,7 @@ protected:
*/ */
void SelectNextPage() void SelectNextPage()
{ {
if (!_story_page_pool.IsValidID(this->selected_page_id)) return; if (!StoryPage::IsValidID(this->selected_page_id)) return;
/* Find selected page. */ /* Find selected page. */
for (auto iter = this->story_pages.begin(); iter != this->story_pages.end(); iter++) { for (auto iter = this->story_pages.begin(); iter != this->story_pages.end(); iter++) {
@ -872,7 +872,7 @@ public:
} }
/* Verify page selection. */ /* Verify page selection. */
if (!_story_page_pool.IsValidID(this->selected_page_id)) { if (!StoryPage::IsValidID(this->selected_page_id)) {
this->selected_page_id = INVALID_STORY_PAGE; this->selected_page_id = INVALID_STORY_PAGE;
} }
if (this->selected_page_id == INVALID_STORY_PAGE && !this->story_pages.empty()) { if (this->selected_page_id == INVALID_STORY_PAGE && !this->story_pages.empty()) {