dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'enhanced_viewport_overlay' into jgrpp

Browse Source 
# Conflicts:
#	src/misc_gui.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-26 20:26:15 +01:00
parent 4979309094 d94e37d9d1
commit 668702dc7e
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/viewport_gui.cpp
View File

@@ -225,7 +225,7 @@ void ShowTooltipForTile(Window *w, const TileIndex tile)
case MP_HOUSE: {
if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES)) return; // No need for a town name tooltip when it is already displayed
SetDParam(0, GetTownIndex(tile));
GuiShowTooltips(w, STR_TOWN_NAME_TOOLTIP, 0, NULL, TCC_HOVER);
GuiShowTooltips(w, STR_TOWN_NAME_TOOLTIP, 0, NULL, TCC_HOVER_VIEWPORT);
break;
}
case MP_INDUSTRY: {
@@ -243,7 +243,7 @@ void ShowTooltipForTile(Window *w, const TileIndex tile)
str++;
}
}
GuiShowTooltips(w, str, 0, NULL, TCC_HOVER);
GuiShowTooltips(w, str, 0, NULL, TCC_HOVER_VIEWPORT);
break;
}
default: