cpp/openttd-patchpack/source Changeset - r17483:fc8b6fa18903

Changeset - r17483:fc8b6fa18903

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 13 years ago 2011-03-13 21:34:49
frosch@openttd.org

(svn r22248) -Codechange: Make OnInvalidateData() process 'delete this;' already in command scope.

3 files changed with 2 insertions and 4 deletions:

src/ai/ai_gui.cpp

src/misc_gui.cpp

src/network/network_chat_gui.cpp

0 comments (0 inline, 0 general)

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -189,12 +189,13 @@ struct AIListWindow : public Window { @@
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+	{
 		if (!gui_scope) return;
 		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
 			delete this;
 			return;
+		}
 		if (!gui_scope) return;
 		this->vscroll->SetCount((int)this->ai_info_list->size() + 1);
 		/* selected goes from -1 .. length of ai list - 1. */
@@ @@ -450,7 +451,6 @@ struct AISettingsWindow : public Window @@
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+	{
 		if (!gui_scope) return;
 		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) delete this;
+	}
 };

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -652,7 +652,6 @@ public: @@
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+	{
 		if (!gui_scope) return;
 		/* If company gets shut down, while displaying an error about it, remove the error message. */
 		if (this->face != INVALID_COMPANY && !Company::IsValidID(this->face)) delete this;
+	}

src/network/network_chat_gui.cpp

➞

Show inline comments

@@ @@ -538,7 +538,6 @@ struct NetworkChatWindow : public QueryS @@
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+	{
 		if (!gui_scope) return;
 		if (data == this->dest) delete this;
+	}
 };

0 comments (0 inline, 0 general)