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

(svn r12104) -Fix (r12103): remember loading indicators transparency settings and make in switchable by Ctrl+9

release/0.6
smatz 2008-02-10 18:31:33 +00:00
parent 8a768652c8
commit 9e0a93d286
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@ -3344,8 +3344,8 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Toggle t
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. CTRL+click to lock. STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. CTRL+click to lock.
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Toggle transparency for bridges. CTRL+click to lock. STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Toggle transparency for bridges. CTRL+click to lock.
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Toggle transparency for structures like lighthouses and antennas. CTRL+click to lock. STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Toggle transparency for structures like lighthouses and antennas. CTRL+click to lock.
STR_TRANSPARENT_LOADING_DESC :{BLACK}Toggle transparency for loading indicators. CTRL+click to lock.
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Toggle transparency for catenary. CTRL+click to lock. STR_TRANSPARENT_CATENARY_DESC :{BLACK}Toggle transparency for catenary. CTRL+click to lock.
STR_TRANSPARENT_LOADING_DESC :{BLACK}Toggle transparency for loading indicators. CTRL+click to lock.
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW} STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
STR_PERCENT_UP :{WHITE}{NUM}%{UPARROW} STR_PERCENT_UP :{WHITE}{NUM}%{UPARROW}

1
src/main_gui.cpp
View File

@ -1914,6 +1914,7 @@ static void MainWindowWndProc(Window *w, WindowEvent *e)
case '6' | WKC_CTRL: case '6' | WKC_CTRL:
case '7' | WKC_CTRL: case '7' | WKC_CTRL:
case '8' | WKC_CTRL: case '8' | WKC_CTRL:
case '9' | WKC_CTRL:
/* Transparency toggle hot keys */ /* Transparency toggle hot keys */
ToggleTransparency((TransparencyOption)(e->we.keypress.keycode - ('1' | WKC_CTRL))); ToggleTransparency((TransparencyOption)(e->we.keypress.keycode - ('1' | WKC_CTRL)));
MarkWholeScreenDirty(); MarkWholeScreenDirty();

2
src/road_map.h
View File

@ -19,7 +19,7 @@ enum RoadTileType {
}; };
static inline RoadTileType GetRoadTileType(TileIndex t) static inline RoadTileType GetRoadTileType(TileIndex t)
{ {
assert(IsTileType(t, MP_ROAD)); assert(IsTileType(t, MP_ROAD));
return (RoadTileType)GB(_m[t].m5, 6, 2); return (RoadTileType)GB(_m[t].m5, 6, 2);
} }

4
src/settings.cpp
View File

@ -1282,8 +1282,8 @@ static const SettingDescGlobVarList _misc_settings[] = {
#endif #endif
SDTG_VAR("sprite_cache_size",SLE_UINT, S, 0, _sprite_cache_size, 4, 1, 64, 0, STR_NULL, NULL), SDTG_VAR("sprite_cache_size",SLE_UINT, S, 0, _sprite_cache_size, 4, 1, 64, 0, STR_NULL, NULL),
SDTG_VAR("player_face", SLE_UINT32, S, 0, _player_face, 0,0,0xFFFFFFFF,0, STR_NULL, NULL), SDTG_VAR("player_face", SLE_UINT32, S, 0, _player_face, 0,0,0xFFFFFFFF,0, STR_NULL, NULL),
SDTG_VAR("transparency_options", SLE_UINT, S, 0, _transparency_opt, 0, 0,0xFF,0, STR_NULL, NULL), SDTG_VAR("transparency_options", SLE_UINT, S, 0, _transparency_opt, 0,0,0x1FF,0, STR_NULL, NULL),
SDTG_VAR("transparency_locks", SLE_UINT, S, 0, _transparency_lock, 0, 0,0xFF,0, STR_NULL, NULL), SDTG_VAR("transparency_locks", SLE_UINT, S, 0, _transparency_lock, 0,0,0x1FF,0, STR_NULL, NULL),
SDTG_END() SDTG_END()
}; };

2
src/transparency.h
View File

@ -11,8 +11,6 @@
* Transparency option bits: which position in _transparency_opt stands for which transparency. * Transparency option bits: which position in _transparency_opt stands for which transparency.
* If you change the order, change the order of the ShowTransparencyToolbar() stuff in transparency_gui.cpp too. * If you change the order, change the order of the ShowTransparencyToolbar() stuff in transparency_gui.cpp too.
* If you add or remove an option don't forget to change the transparency 'hot keys' in main_gui.cpp. * If you add or remove an option don't forget to change the transparency 'hot keys' in main_gui.cpp.
* If you add an option and have more then 8, change the typedef TransparencyOptionBits and
* the save stuff (e.g. SLE_UINT8 to SLE_UINT16) in settings.cpp .
*/ */
enum TransparencyOption { enum TransparencyOption {
TO_SIGNS = 0, ///< signs TO_SIGNS = 0, ///< signs