cpp/openttd-patchpack/source Changeset - r9240:ae20a4f3f8ae

Changeset - r9240:ae20a4f3f8ae

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-05-15 19:00:20
rubidium@openttd.org

(svn r13106) -Codechange: rework the toolbar code a little so functions do not have to return the Window they just created.

3 files changed with 40 insertions and 47 deletions:

src/main_gui.cpp

src/toolbar_gui.cpp

src/toolbar_gui.h

0 comments (0 inline, 0 general)

src/main_gui.cpp

➞

Show inline comments

@@ @@ -432,14 +432,13 @@ void SetupColorsAndInitialWindow() @@
+}
 extern void ShowStatusBar();
 void ShowVitalWindows()
+{
 	Window *w = AllocateToolbar();
 	DoZoomInOutWindow(ZOOM_NONE, w);
 	AllocateToolbar();
 	/* Status bad only for normal games */
 	if (_game_mode == GM_EDITOR) return;
 	ShowStatusBar();
+}

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -42,14 +42,14 @@ @@
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 static Window *PopupMainToolbMenu(Window *w, uint16 parent_button, StringID base_string, byte item_count, byte disabled_mask);
 static Window *PopupMainPlayerToolbMenu(Window *w, int main_button, int gray);
 static void PopupMainToolbMenu(Window *parent, uint16 parent_button, StringID base_string, byte item_count, byte disabled_mask = 0, int sel_index = 0, int checked_items = 0);
 static void PopupMainPlayerToolbMenu(Window *parent, int main_button, int gray);
 RailType _last_built_railtype;
 RoadType _last_built_roadtype;
 static void SelectSignTool()
+{
@@ @@ -119,24 +119,22 @@ static void ToolbarFastForwardClick(Wind @@
 /* --- Options button menu --- */
 static void ToolbarOptionsClick(Window *w)
+{
 	uint16 x = 0;
 	w = PopupMainToolbMenu(w, 2, STR_02C4_GAME_OPTIONS, 14, 0);
 	if (HasBit(_display_opt, DO_SHOW_TOWN_NAMES))    SetBit(x,  6);
 	if (HasBit(_display_opt, DO_SHOW_STATION_NAMES)) SetBit(x,  7);
 	if (HasBit(_display_opt, DO_SHOW_SIGNS))         SetBit(x,  8);
 	if (HasBit(_display_opt, DO_WAYPOINTS))          SetBit(x,  9);
 	if (HasBit(_display_opt, DO_FULL_ANIMATION))     SetBit(x, 10);
 	if (HasBit(_display_opt, DO_FULL_DETAIL))        SetBit(x, 11);
 	if (IsTransparencySet(TO_HOUSES))                SetBit(x, 12);
 	if (IsTransparencySet(TO_SIGNS))                 SetBit(x, 13);
 	WP(w, menu_d).checked_items = x;
 	PopupMainToolbMenu(w, 2, STR_02C4_GAME_OPTIONS, 14, 0, 0, x);
+}
 static void MenuClickSettings(int index)
+{
 	switch (index) {
 		case 0: ShowGameOptions();      return;
@@ @@ -158,18 +156,18 @@ static void MenuClickSettings(int index) @@
+}
 /* --- Saving/loading button menu --- */
 static void ToolbarSaveClick(Window *w)
+{
-	PopupMainToolbMenu(w, 3, STR_015C_SAVE_GAME, 4, 0);
 	PopupMainToolbMenu(w, 3, STR_015C_SAVE_GAME, 4);
+}
 static void ToolbarScenSaveOrLoad(Window *w)
+{
-	PopupMainToolbMenu(w, 3, STR_0292_SAVE_SCENARIO, 6, 0);
 	PopupMainToolbMenu(w, 3, STR_0292_SAVE_SCENARIO, 6);
+}
 static void MenuClickSaveLoad(int index)
+{
 	if (_game_mode == GM_EDITOR) {
 		switch (index) {
@@ @@ -190,13 +188,13 @@ static void MenuClickSaveLoad(int index) @@
+}
 /* --- Map button menu --- */
 static void ToolbarMapClick(Window *w)
+{
-	PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 3, 0);
 	PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 3);
+}
 static void MenuClickMap(int index)
+{
 	switch (index) {
 		case 0: ShowSmallMap();            break;
@@ @@ -216,25 +214,25 @@ static void MenuClickScenMap(int index) @@
+}
 /* --- Town button menu --- */
 static void ToolbarTownClick(Window *w)
+{
-	PopupMainToolbMenu(w, 5, STR_02BB_TOWN_DIRECTORY, 1, 0);
 	PopupMainToolbMenu(w, 5, STR_02BB_TOWN_DIRECTORY, 1);
+}
 static void MenuClickTown(int index)
+{
 	ShowTownDirectory();
+}
 /* --- Subidies button menu --- */
 static void ToolbarSubsidiesClick(Window *w)
+{
-	PopupMainToolbMenu(w, 6, STR_02DD_SUBSIDIES, 1, 0);
 	PopupMainToolbMenu(w, 6, STR_02DD_SUBSIDIES, 1);
+}
 static void MenuClickSubsidies(int index)
+{
 	ShowSubsidiesList();
+}
@@ @@ -281,13 +279,13 @@ static void MenuClickCompany(int index) @@
+}
 /* --- Graphs button menu --- */
 static void ToolbarGraphsClick(Window *w)
+{
-	PopupMainToolbMenu(w, 10, STR_0154_OPERATING_PROFIT_GRAPH, 6, 0);
 	PopupMainToolbMenu(w, 10, STR_0154_OPERATING_PROFIT_GRAPH, 6);
+}
 static void MenuClickGraphs(int index)
+{
 	switch (index) {
 		case 0: ShowOperatingProfitGraph();    break;
@@ @@ -300,13 +298,13 @@ static void MenuClickGraphs(int index) @@
+}
 /* --- League button menu --- */
 static void ToolbarLeagueClick(Window *w)
+{
-	PopupMainToolbMenu(w, 11, STR_015A_COMPANY_LEAGUE_TABLE, 2, 0);
 	PopupMainToolbMenu(w, 11, STR_015A_COMPANY_LEAGUE_TABLE, 2);
+}
 static void MenuClickLeague(int index)
+{
 	switch (index) {
 		case 0: ShowCompanyLeagueTable();      break;
@@ @@ -412,14 +410,13 @@ static void ToolbarZoomOutClick(Window * @@
 /* --- Rail button menu --- */
 static void ToolbarBuildRailClick(Window *w)
+{
 	const Player *p = GetPlayer(_local_player);
 	Window *w2 = PopupMainToolbMenu(w, 19, STR_1015_RAILROAD_CONSTRUCTION, RAILTYPE_END, ~p->avail_railtypes);
 	WP(w2, menu_d).sel_index = _last_built_railtype;
 	PopupMainToolbMenu(w, 19, STR_1015_RAILROAD_CONSTRUCTION, RAILTYPE_END, ~p->avail_railtypes, _last_built_railtype);
+}
 static void MenuClickBuildRail(int index)
+{
 	_last_built_railtype = (RailType)index;
 	ShowBuildRailToolbar(_last_built_railtype, -1);
@@ @@ -428,51 +425,50 @@ static void MenuClickBuildRail(int index @@
 /* --- Road button menu --- */
 static void ToolbarBuildRoadClick(Window *w)
+{
 	const Player *p = GetPlayer(_local_player);
 	/* The standard road button is *always* available */
 	Window *w2 = PopupMainToolbMenu(w, 20, STR_180A_ROAD_CONSTRUCTION, 2, ~(p->avail_roadtypes | ROADTYPES_ROAD));
 	WP(w2, menu_d).sel_index = _last_built_roadtype;
 	PopupMainToolbMenu(w, 20, STR_180A_ROAD_CONSTRUCTION, 2, ~(p->avail_roadtypes | ROADTYPES_ROAD), _last_built_roadtype);
+}
 static void MenuClickBuildRoad(int index)
+{
 	_last_built_roadtype = (RoadType)index;
 	ShowBuildRoadToolbar(_last_built_roadtype);
+}
 /* --- Water button menu --- */
 static void ToolbarBuildWaterClick(Window *w)
+{
-	PopupMainToolbMenu(w, 21, STR_9800_DOCK_CONSTRUCTION, 1, 0);
 	PopupMainToolbMenu(w, 21, STR_9800_DOCK_CONSTRUCTION, 1);
+}
 static void MenuClickBuildWater(int index)
+{
 	ShowBuildDocksToolbar();
+}
 /* --- Airport button menu --- */
 static void ToolbarBuildAirClick(Window *w)
+{
-	PopupMainToolbMenu(w, 22, STR_A01D_AIRPORT_CONSTRUCTION, 1, 0);
 	PopupMainToolbMenu(w, 22, STR_A01D_AIRPORT_CONSTRUCTION, 1);
+}
 static void MenuClickBuildAir(int index)
+{
 	ShowBuildAirToolbar();
+}
 /* --- Forest button menu --- */
 static void ToolbarForestClick(Window *w)
+{
-	PopupMainToolbMenu(w, 23, STR_LANDSCAPING, 3, 0);
 	PopupMainToolbMenu(w, 23, STR_LANDSCAPING, 3);
+}
 static void MenuClickForest(int index)
+{
 	switch (index) {
 		case 0: ShowTerraformToolbar();  break;
@@ @@ -482,25 +478,25 @@ static void MenuClickForest(int index) @@
+}
 /* --- Music button menu --- */
 static void ToolbarMusicClick(Window *w)
+{
-	PopupMainToolbMenu(w, 24, STR_01D3_SOUND_MUSIC, 1, 0);
 	PopupMainToolbMenu(w, 24, STR_01D3_SOUND_MUSIC, 1);
+}
 static void MenuClickMusicWindow(int index)
+{
 	ShowMusicWindow();
+}
 /* --- Newspaper button menu --- */
 static void ToolbarNewspaperClick(Window *w)
+{
-	PopupMainToolbMenu(w, 25, STR_0200_LAST_MESSAGE_NEWS_REPORT, 3, 0);
 	PopupMainToolbMenu(w, 25, STR_0200_LAST_MESSAGE_NEWS_REPORT, 3);
+}
 static void MenuClickNewspaper(int index)
+{
 	switch (index) {
 		case 0: ShowLastNewsMessage(); break;
@@ @@ -510,13 +506,13 @@ static void MenuClickNewspaper(int index @@
+}
 /* --- Help button menu --- */
 static void ToolbarHelpClick(Window *w)
+{
-	PopupMainToolbMenu(w, 26, STR_02D5_LAND_BLOCK_INFO, 6, 0);
 	PopupMainToolbMenu(w, 26, STR_02D5_LAND_BLOCK_INFO, 6);
+}
 static void MenuClickSmallScreenshot()
+{
 	SetScreenshotType(SC_VIEWPORT);
+}
@@ @@ -565,13 +561,13 @@ static void ToolbarScenDateForward(Windo @@
 	_left_button_clicked = false;
+}
 static void ToolbarScenMapTownDir(Window *w)
+{
 	/* Scenario editor button, *hack*hack* use different button to activate */
-	PopupMainToolbMenu(w, 8 | (17 << 8), STR_02DE_MAP_OF_WORLD, 4, 0);
 	PopupMainToolbMenu(w, 8 | (17 << 8), STR_02DE_MAP_OF_WORLD, 4);
+}
 static void ToolbarScenZoomIn(Window *w)
+{
 	if (DoZoomInOutWindow(ZOOM_IN, FindWindowById(WC_MAIN_WINDOW, 0))) {
 		w->HandleButtonClick(9);
@@ @@ -1217,13 +1213,13 @@ static int GetStringListMaxWidth(StringI @@
  * defaults to the left side of the parent_button, eg the button that caused
  * this window to appear. The only exceptions are when the right side of this
  * dropdown would fall outside the main toolbar window, in that case it is
  * aligned with the toolbar's right side.
  * Since the disable-mask is only 8 bits right now, these dropdowns are
  * restricted to 8 items max if any bits of disabled_mask are active.
- * @param w Pointer to a window this dropdown menu belongs to. Has no effect
+ * @param parent Pointer to a window this dropdown menu belongs to. Has no effect
  * whatsoever, only graphically for positioning.
  * @param parent_button The widget identifier of the button that was clicked for
  * this dropdown. The created dropdown then knows what button to raise (button) on
  * action and whose function to execute (action).
  * It is possible to appoint another button for an action event by setting the
  * upper 8 bits of this parameter. If non is set, action is presumed to be the same
@@ @@ -1231,41 +1227,43 @@ static int GetStringListMaxWidth(StringI @@
  * button bits 0 -  7 - widget clicked to get dropdown
  * action bits 8 - 15 - function of widget to execute on select (defaults to bits 0 - 7)
  * @param base_string The first StringID shown in the dropdown list. All others are
  * consecutive indeces from the language file. XXX - fix? Use ingame-string tables?
  * @param item_count Number of strings in the list, see previous parameter
  * @param disabled_mask Bitmask of disabled strings in the list
  * @return Return a pointer to the newly created dropdown window */
 static Window *PopupMainToolbMenu(Window *w, uint16 parent_button, StringID base_string, byte item_count, byte disabled_mask)
  * @param sel_index The selected toolbar item
  * @param check_items The items to have a checked mark in front of them.
  * @return Return a pointer to the newly created dropdown window
  */
 static void PopupMainToolbMenu(Window *parent, uint16 parent_button, StringID base_string, byte item_count, byte disabled_mask, int sel_index, int checked_items)
+{
 	assert(disabled_mask == 0 || item_count <= 8);
 	w->LowerWidget(parent_button);
 	w->InvalidateWidget(parent_button);
 	parent->LowerWidget(parent_button);
 	parent->InvalidateWidget(parent_button);
 	DeleteWindowById(WC_TOOLBAR_MENU, 0);
 	/* Extend the dropdown toolbar to the longest string in the list */
 	int width = max(GetStringListMaxWidth(base_string, item_count) + 6, 140);
 	int height = item_count * 10 + 2;
 	Point pos = GetToolbarDropdownPos(parent_button, width, height);
 	w = new Window(pos.x, pos.y, width, height, MenuWndProc, WC_TOOLBAR_MENU, _menu_widgets);
+	Window *w = new Window(pos.x, pos.y, width, height, MenuWndProc, WC_TOOLBAR_MENU, _menu_widgets);
 	w->widget[0].bottom = item_count * 10 + 1;
 	w->flags4 &= ~WF_WHITE_BORDER_MASK;
 	WP(w, menu_d).item_count = item_count;
-	WP(w, menu_d).sel_index = 0;
+	WP(w, menu_d).sel_index = sel_index;
 	WP(w, menu_d).main_button = GB(parent_button, 0, 8);
 	WP(w, menu_d).action_id = (GB(parent_button, 8, 8) != 0) ? GB(parent_button, 8, 8) : parent_button;
 	WP(w, menu_d).string_id = base_string;
-	WP(w, menu_d).checked_items = 0;
+	WP(w, menu_d).checked_items = checked_items;
 	WP(w, menu_d).disabled_items = disabled_mask;
 	SndPlayFx(SND_15_BEEP);
 	return w;
+}
 /* --- Rendering/drawing the player menu --- */
 static int GetPlayerIndexFromMenu(int index)
+{
 	if (index >= 0) {
@@ @@ -1394,20 +1392,20 @@ static void PlayerMenuWndProc(Window *w, @@
 static const Widget _player_menu_widgets[] = {
 {    WWT_PANEL, RESIZE_NONE, 14, 0, 240, 0, 81, 0x0, STR_NULL},
 { WIDGETS_END},
 };
-static Window *PopupMainPlayerToolbMenu(Window *w, int main_button, int gray)
+static void PopupMainPlayerToolbMenu(Window *parent, int main_button, int gray)
+{
 	w->LowerWidget(main_button);
 	w->InvalidateWidget(main_button);
 	parent->LowerWidget(main_button);
 	parent->InvalidateWidget(main_button);
 	DeleteWindowById(WC_TOOLBAR_MENU, 0);
 	Point pos = GetToolbarDropdownPos(main_button, 241, 82);
 	w = new Window(pos.x, pos.y, 241, 82, PlayerMenuWndProc, WC_TOOLBAR_MENU, _player_menu_widgets);
+	Window *w = new Window(pos.x, pos.y, 241, 82, PlayerMenuWndProc, WC_TOOLBAR_MENU, _player_menu_widgets);
 	w->flags4 &= ~WF_WHITE_BORDER_MASK;
 	WP(w, menu_d).item_count = 0;
 	WP(w, menu_d).sel_index = (_local_player != PLAYER_SPECTATOR) ? _local_player : GetPlayerIndexFromMenu(0);
 	if (_networking && main_button == 9) {
 		if (_local_player != PLAYER_SPECTATOR) {
 			WP(w, menu_d).sel_index++;
@@ @@ -1419,29 +1417,27 @@ static Window *PopupMainPlayerToolbMenu( @@
 	WP(w, menu_d).action_id = main_button;
 	WP(w, menu_d).main_button = main_button;
 	WP(w, menu_d).checked_items = gray;
 	WP(w, menu_d).disabled_items = 0;
 	SndPlayFx(SND_15_BEEP);
 	return w;
+}
 /* --- Allocating the toolbar --- */
-Window *AllocateToolbar()
+void AllocateToolbar()
+{
 	/* Clean old GUI values; railtype is (re)set by rail_gui.cpp */
 	_last_built_roadtype = ROADTYPE_ROAD;
 	Window *w = new Window((_game_mode != GM_EDITOR) ? &_toolb_normal_desc : &_toolb_scen_desc);
-	if (w == NULL) return NULL;
+	assert(w != NULL);
 	CLRBITS(w->flags4, WF_WHITE_BORDER_MASK);
 	w->SetWidgetDisabledState(0, _networking && !_network_server); // if not server, disable pause button
 	w->SetWidgetDisabledState(1, _networking); // if networking, disable fast-forward button
 	/* 'w' is for sure a WC_MAIN_TOOLBAR */
 	PositionMainToolbar(w);
 	return w;
 	DoZoomInOutWindow(ZOOM_NONE, w);
+}

src/toolbar_gui.h

➞

Show inline comments

@@ @@ -2,11 +2,9 @@ @@
 /** @file toolbar_gui.h Stuff related to the (main) toolbar. */
 #ifndef TOOLBAR_GUI_H
 #define TOOLBAR_GUI_H
 #include "window_type.h"
 Window *AllocateToolbar();
 void AllocateToolbar();
 #endif /*TOOLBAR_GUI_H*/

0 comments (0 inline, 0 general)