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

Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-11-29 02:17:14 +02:00
parent 47b01a0528 39662aabef
commit 2f6b20cbfd
667 changed files with 66564 additions and 29169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/signs_gui.cpp
View File

@@ -58,7 +58,7 @@ struct SignList {
{
if (!this->signs.NeedRebuild()) return;
DEBUG(misc, 3, "Building sign list");
Debug(misc, 3, "Building sign list");
this->signs.clear();
@@ -530,7 +530,7 @@ struct SignWindow : Window, SignList {
FALLTHROUGH;
case WID_QES_CANCEL:
delete this;
this->Close();
break;
}
}
@@ -569,7 +569,7 @@ static WindowDesc _query_sign_edit_desc(
void HandleClickOnSign(const Sign *si)
{
if (_ctrl_pressed && (si->owner == _local_company || (si->owner == OWNER_DEITY && _game_mode == GM_EDITOR))) {
RenameSign(si->index, nullptr);
RenameSign(si->index, "");
return;
}
ShowRenameSignWindow(si);
@@ -582,7 +582,7 @@ void HandleClickOnSign(const Sign *si)
void ShowRenameSignWindow(const Sign *si)
{
/* Delete all other edit windows */
DeleteWindowByClass(WC_QUERY_STRING);
CloseWindowByClass(WC_QUERY_STRING);
new SignWindow(&_query_sign_edit_desc, si);
}
@@ -595,5 +595,5 @@ void DeleteRenameSignWindow(SignID sign)
{
SignWindow *w = dynamic_cast<SignWindow *>(FindWindowById(WC_QUERY_STRING, WN_QUERY_STRING_SIGN));
if (w != nullptr && w->cur_sign == sign) delete w;
if (w != nullptr && w->cur_sign == sign) w->Close();
}