177 switch (index) { |
177 switch (index) { |
178 case 0: ShowGameOptions(); return; |
178 case 0: ShowGameOptions(); return; |
179 case 1: ShowGameDifficulty(); return; |
179 case 1: ShowGameDifficulty(); return; |
180 case 2: ShowPatchesSelection(); return; |
180 case 2: ShowPatchesSelection(); return; |
181 case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return; |
181 case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return; |
182 |
182 case 4: ShowTransparencyToolbar(); break; |
183 case 5: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break; |
183 |
184 case 6: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break; |
184 case 6: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break; |
185 case 7: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break; |
185 case 7: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break; |
186 case 8: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break; |
186 case 8: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break; |
187 case 9: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break; |
187 case 9: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break; |
188 case 10: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break; |
188 case 10: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break; |
189 case 11: ToggleTransparency(); break; |
189 case 11: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break; |
190 case 12: TOGGLEBIT(_transparent_opt, TO_SIGNS); break; |
190 case 12: ToggleTransparency(); break; |
|
191 case 13: TOGGLEBIT(_transparent_opt, TO_SIGNS); break; |
191 } |
192 } |
192 MarkWholeScreenDirty(); |
193 MarkWholeScreenDirty(); |
193 } |
194 } |
194 |
195 |
195 static void MenuClickSaveLoad(int index) |
196 static void MenuClickSaveLoad(int index) |
789 PopupMainToolbMenu(w, 3, STR_015C_SAVE_GAME, 4, 0); |
789 PopupMainToolbMenu(w, 3, STR_015C_SAVE_GAME, 4, 0); |
790 } |
790 } |
791 |
791 |
792 static void ToolbarMapClick(Window *w) |
792 static void ToolbarMapClick(Window *w) |
793 { |
793 { |
794 PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 4, 0); |
794 PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 3, 0); |
795 } |
795 } |
796 |
796 |
797 static void ToolbarTownClick(Window *w) |
797 static void ToolbarTownClick(Window *w) |
798 { |
798 { |
799 PopupMainToolbMenu(w, 5, STR_02BB_TOWN_DIRECTORY, 1, 0); |
799 PopupMainToolbMenu(w, 5, STR_02BB_TOWN_DIRECTORY, 1, 0); |
986 |
986 |
987 static void ToolbarOptionsClick(Window *w) |
987 static void ToolbarOptionsClick(Window *w) |
988 { |
988 { |
989 uint16 x = 0; |
989 uint16 x = 0; |
990 |
990 |
991 w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0); |
991 w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 14, 0); |
992 |
992 |
993 if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) SETBIT(x, 5); |
993 if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) SETBIT(x, 6); |
994 if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x, 6); |
994 if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x, 7); |
995 if (HASBIT(_display_opt, DO_SHOW_SIGNS)) SETBIT(x, 7); |
995 if (HASBIT(_display_opt, DO_SHOW_SIGNS)) SETBIT(x, 8); |
996 if (HASBIT(_display_opt, DO_WAYPOINTS)) SETBIT(x, 8); |
996 if (HASBIT(_display_opt, DO_WAYPOINTS)) SETBIT(x, 9); |
997 if (HASBIT(_display_opt, DO_FULL_ANIMATION)) SETBIT(x, 9); |
997 if (HASBIT(_display_opt, DO_FULL_ANIMATION)) SETBIT(x, 10); |
998 if (HASBIT(_display_opt, DO_FULL_DETAIL)) SETBIT(x, 10); |
998 if (HASBIT(_display_opt, DO_FULL_DETAIL)) SETBIT(x, 11); |
999 if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 11); |
999 if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 12); |
1000 if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 12); |
1000 if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 13); |
1001 WP(w,menu_d).checked_items = x; |
1001 WP(w,menu_d).checked_items = x; |
1002 } |
1002 } |
1003 |
1003 |
1004 |
1004 |
1005 static void ToolbarScenSaveOrLoad(Window *w) |
1005 static void ToolbarScenSaveOrLoad(Window *w) |