miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream branch 1.8

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-05-31 22:59:50 +03:00
parent 59edb9d606 080d57d97a
commit 66e3334f0e
240 changed files with 9656 additions and 2536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc_gui.cpp
View File

@@ -404,6 +404,7 @@ static const char * const _credits[] = {
"Original graphics by Simon Foster",
"",
"The OpenTTD team (in alphabetical order):",
" Grzegorz Duczy\xC5\x84ski (adf88) - General coding (since 1.7.2)",
" Albert Hofkamp (Alberth) - GUI expert (since 0.7)",
" Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)",
" Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)",
@@ -1040,10 +1041,12 @@ struct QueryStringWindow : public Window
switch (widget) {
case WID_QS_DEFAULT:
this->editbox.text.DeleteAll();
/* FALL THROUGH */
FALLTHROUGH;
case WID_QS_OK:
this->OnOk();
/* FALL THROUGH */
FALLTHROUGH;
case WID_QS_CANCEL:
delete this;
break;
@@ -1194,7 +1197,8 @@ struct QueryWindow : public Window {
this->proc(this->parent, true);
this->proc = NULL;
}
/* FALL THROUGH */
FALLTHROUGH;
case WKC_ESC:
delete this;
return ES_HANDLED;