cpp/openttd-patchpack/source Changeset - r20368:8351bea887fd

Changeset - r20368:8351bea887fd

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

zuu - 11 years ago 2013-06-09 14:13:59
zuu@openttd.org

(svn r25381) -Fix: Silent story book compiler warnings

2 files changed with 7 insertions and 8 deletions:

src/script/api/script_story_page.cpp

src/story_gui.cpp

0 comments (0 inline, 0 general)

src/script/api/script_story_page.cpp

➞

Show inline comments

@@ @@ -86,16 +86,16 @@ @@
 	StoryPage *p = StoryPage::Get(pe->page);
 	::StoryPageElementType type = pe->type;
 	EnforcePrecondition(false, (type != SPET_TEXT && type != SPET_LOCATION) || (text != NULL && !StrEmpty(text->GetEncodedText())));
 	EnforcePrecondition(false, type != SPET_LOCATION || ::IsValidTile(reference));
 	EnforcePrecondition(false, type != SPET_GOAL || ScriptGoal::IsValidGoal((ScriptGoal::GoalID)reference));
 	EnforcePrecondition(false, type != SPET_GOAL || !(p->company == INVALID_COMPANY && Goal::Get(reference)->company != INVALID_COMPANY));
 	EnforcePrecondition(false, (type != ::SPET_TEXT && type != ::SPET_LOCATION) || (text != NULL && !StrEmpty(text->GetEncodedText())));
 	EnforcePrecondition(false, type != ::SPET_LOCATION || ::IsValidTile(reference));
 	EnforcePrecondition(false, type != ::SPET_GOAL || ScriptGoal::IsValidGoal((ScriptGoal::GoalID)reference));
 	EnforcePrecondition(false, type != ::SPET_GOAL || !(p->company == INVALID_COMPANY && Goal::Get(reference)->company != INVALID_COMPANY));
 	return ScriptObject::DoCommand(type == SPET_LOCATION ? reference : 0,
+	return ScriptObject::DoCommand(type == ::SPET_LOCATION ? reference : 0,
 			pe->page,
 			type == SPET_GOAL ? reference : 0,
+			type == ::SPET_GOAL ? reference : 0,
 			CMD_UPDATE_STORY_PAGE_ELEMENT,
 			type == SPET_TEXT || type == SPET_LOCATION ? text->GetEncodedText() : NULL,
+			type == ::SPET_TEXT || type == ::SPET_LOCATION ? text->GetEncodedText() : NULL,
 			&ScriptInstance::DoCommandReturnStoryPageElementID);
+}

src/story_gui.cpp

➞

Show inline comments

@@ @@ -234,7 +234,6 @@ protected: @@
 		uint16 page_num = 1;
 		for (const StoryPage *const*iter = this->story_pages.Begin(); iter != this->story_pages.End(); iter++) {
 			const StoryPage *p = *iter;
 			char *title = p->title;
 			bool current_page = p->index == this->selected_page_id;
 			DropDownListStringItem *item = NULL;
 			if (p->title != NULL) {

0 comments (0 inline, 0 general)