mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r22248) -Codechange: Make OnInvalidateData() process 'delete this;' already in command scope.
This commit is contained in:
parent
652c9cb663
commit
141f2eba50
|
@ -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;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -538,7 +538,6 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
|
|||
*/
|
||||
virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
|
||||
{
|
||||
if (!gui_scope) return;
|
||||
if (data == this->dest) delete this;
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue