cpp/openttd-patchpack/source Changeset - r20585:41a511c50437

Changeset - r20585:41a511c50437

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

zuu - 11 years ago 2013-07-21 15:21:55
zuu@openttd.org

(svn r25621) -Fix (r25342): Also delete page elments when their page is removed (so that they don't reappear on a new page later on)

1 file changed with 13 insertions and 3 deletions:

src/story_base.h

0 comments (0 inline, 0 general)

src/story_base.h

➞

Show inline comments

@@ @@ -63,6 +63,9 @@ struct StoryPageElement : StoryPageEleme @@
 	inline ~StoryPageElement() { free(this->text); }
 };
 #define FOR_ALL_STORY_PAGE_ELEMENTS_FROM(var, start) FOR_ALL_ITEMS_FROM(StoryPageElement, story_page_element_index, var, start)
 #define FOR_ALL_STORY_PAGE_ELEMENTS(var) FOR_ALL_STORY_PAGE_ELEMENTS_FROM(var, 0)
 /** Struct about stories, current and completed */
 struct StoryPage : StoryPagePool::PoolItem<&_story_page_pool> {
 	uint32 sort_value;   ///< A number that increases for every created story page. Used for sorting. The id of a story page is the pool index.
@@ @@ -79,11 +82,18 @@ struct StoryPage : StoryPagePool::PoolIt @@
 	/**
 	 * (Empty) destructor has to be defined else operator delete might be called with NULL parameter
 	 */
 	inline ~StoryPage() { free(this->title); }
 	inline ~StoryPage()
+	{
 		if (!this->CleaningPool()) {
 			StoryPageElement *spe;
 			FOR_ALL_STORY_PAGE_ELEMENTS(spe) {
 				if (spe->page == this->index) delete spe;
+			}
+		}
 		free(this->title);
+	}
 };
 #define FOR_ALL_STORY_PAGE_ELEMENTS_FROM(var, start) FOR_ALL_ITEMS_FROM(StoryPageElement, story_page_element_index, var, start)
 #define FOR_ALL_STORY_PAGE_ELEMENTS(var) FOR_ALL_STORY_PAGE_ELEMENTS_FROM(var, 0)
 #define FOR_ALL_STORY_PAGES_FROM(var, start) FOR_ALL_ITEMS_FROM(StoryPage, story_page_index, var, start)
 #define FOR_ALL_STORY_PAGES(var) FOR_ALL_STORY_PAGES_FROM(var, 0)

0 comments (0 inline, 0 general)