mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23943) -Fix (r23835) [FS#5061]: Also list DEITY signs in the signlist in SE.

release/1.2
frosch 2012-02-13 17:34:53 +00:00
parent 060cac439c
commit 6ceda44d3b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/signs_gui.cpp
View File

@ -131,7 +131,7 @@ struct SignList {
{ {
assert(!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS)); assert(!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS));
/* Hide sign if non-own signs are hidden in the viewport */ /* Hide sign if non-own signs are hidden in the viewport */
return (*a)->owner == _local_company; return (*a)->owner == _local_company || (*a)->owner == OWNER_DEITY;
} }
/** Filter out signs from the sign list that does not match the name filter */ /** Filter out signs from the sign list that does not match the name filter */
@ -139,7 +139,7 @@ struct SignList {
{ {
FilterInfo filter_info = {this->filter_string, this->match_case}; FilterInfo filter_info = {this->filter_string, this->match_case};
this->signs.Filter(&SignNameFilter, filter_info); this->signs.Filter(&SignNameFilter, filter_info);
this->signs.Filter(&OwnerDeityFilter, filter_info); if (_game_mode != GM_EDITOR) this->signs.Filter(&OwnerDeityFilter, filter_info);
if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS)) { if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS)) {
this->signs.Filter(&OwnerVisibilityFilter, filter_info); this->signs.Filter(&OwnerVisibilityFilter, filter_info);
} }
@ -642,7 +642,7 @@ static const WindowDesc _query_sign_edit_desc(
*/ */
void HandleClickOnSign(const Sign *si) void HandleClickOnSign(const Sign *si)
{ {
if (_ctrl_pressed && si->owner == _local_company) { if (_ctrl_pressed && (si->owner == _local_company || (si->owner == OWNER_DEITY && _game_mode == GM_EDITOR))) {
RenameSign(si->index, NULL); RenameSign(si->index, NULL);
return; return;
} }