Update to 1.10.0-beta1

This commit is contained in:
dP
2019-10-31 22:24:28 +03:00
parent b84a475e14
commit 599ccf0c2b
1470 changed files with 354219 additions and 16795 deletions

View File

@@ -34,10 +34,10 @@
if (ScriptGame::IsMultiplayer()) return false;
if (number == NUMBER_ALL) {
return (FindWindowByClass((::WindowClass)window) != NULL);
return (FindWindowByClass((::WindowClass)window) != nullptr);
}
return FindWindowById((::WindowClass)window, number) != NULL;
return FindWindowById((::WindowClass)window, number) != nullptr;
}
/* static */ void ScriptWindow::Highlight(WindowClass window, uint32 number, uint8 widget, TextColour colour)
@@ -56,6 +56,6 @@
}
const NWidgetBase *wid = w->GetWidget<NWidgetBase>(widget);
if (wid == NULL) return;
if (wid == nullptr) return;
w->SetWidgetHighlight(widget, (::TextColour)colour);
}