cpp/openttd-patchpack/source Changeset - r9519:fe3a548bb00f

Changeset - r9519:fe3a548bb00f

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 16 years ago 2008-06-14 02:00:20
belugas@openttd.org

(svn r13515) -Codechange: Widget enumification for scenario editor

1 file changed with 26 insertions and 21 deletions:

src/toolbar_gui.cpp

0 comments (0 inline, 0 general)

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -55,12 +55,28 @@ RoadType _last_built_roadtype; @@
 enum ToolbarMode {
 	TB_NORMAL,
 	TB_UPPER,
 	TB_LOWER
 };
 enum ToolbarScenEditorWidgets {
 	TBSE_PAUSE        = 0,
 	TBSE_FASTFORWARD,
 	TBSE_SPACERPANEL  = 4,
 	TBSE_DATEBACKWARD = 6,
 	TBSE_DATEFORWARD,
 	TBSE_ZOOMIN       = 9,
 	TBSE_ZOOMOUT,
 	TBSE_LANDGENERATE,
 	TBSE_TOWNGENERATE,
 	TBSE_INDUSTRYGENERATE,
 	TBSE_BUILDROAD,
 	TBSE_PLANTTREES,
 	TBSE_PLACESIGNS,
 };
 static ToolbarMode _toolbar_mode;
 static void SelectSignTool()
+{
 	if (_cursor.sprite == SPR_CURSOR_SIGN) {
 		ResetObjectToPlace();
@@ @@ -564,26 +580,26 @@ static void ToolbarSwitchClick(Window *w @@
 /* --- Scenario editor specific handlers. */
 static void ToolbarScenDateBackward(Window *w)
+{
 	/* don't allow too fast scrolling */
 	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-		w->HandleButtonClick(6);
+		w->HandleButtonClick(TBSE_DATEBACKWARD);
 		w->SetDirty();
 		_settings_newgame.game_creation.starting_year = Clamp(_settings_newgame.game_creation.starting_year - 1, MIN_YEAR, MAX_YEAR);
 		SetDate(ConvertYMDToDate(_settings_newgame.game_creation.starting_year, 0, 1));
+	}
 	_left_button_clicked = false;
+}
 static void ToolbarScenDateForward(Window *w)
+{
 	/* don't allow too fast scrolling */
 	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
-		w->HandleButtonClick(7);
+		w->HandleButtonClick(TBSE_DATEFORWARD);
 		w->SetDirty();
 		_settings_newgame.game_creation.starting_year = Clamp(_settings_newgame.game_creation.starting_year + 1, MIN_YEAR, MAX_YEAR);
 		SetDate(ConvertYMDToDate(_settings_newgame.game_creation.starting_year, 0, 1));
+	}
 	_left_button_clicked = false;
@@ @@ -595,65 +611,65 @@ static void ToolbarScenMapTownDir(Window @@
 	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);
+		w->HandleButtonClick(TBSE_ZOOMIN);
 		SndPlayFx(SND_15_BEEP);
+	}
+}
 static void ToolbarScenZoomOut(Window *w)
+{
 	if (DoZoomInOutWindow(ZOOM_OUT, FindWindowById(WC_MAIN_WINDOW, 0))) {
-		w->HandleButtonClick(10);
+		w->HandleButtonClick(TBSE_ZOOMOUT);
 		SndPlayFx(SND_15_BEEP);
+	}
+}
 static void ToolbarScenGenLand(Window *w)
+{
-	w->HandleButtonClick(11);
+	w->HandleButtonClick(TBSE_LANDGENERATE);
 	SndPlayFx(SND_15_BEEP);
 	ShowEditorTerraformToolbar();
+}
 static void ToolbarScenGenTown(Window *w)
+{
-	w->HandleButtonClick(12);
+	w->HandleButtonClick(TBSE_TOWNGENERATE);
 	SndPlayFx(SND_15_BEEP);
 	ShowBuildTownWindow();
+}
 static void ToolbarScenGenIndustry(Window *w)
+{
-	w->HandleButtonClick(13);
+	w->HandleButtonClick(TBSE_INDUSTRYGENERATE);
 	SndPlayFx(SND_15_BEEP);
 	ShowBuildIndustryWindow();
+}
 static void ToolbarScenBuildRoad(Window *w)
+{
-	w->HandleButtonClick(14);
+	w->HandleButtonClick(TBSE_BUILDROAD);
 	SndPlayFx(SND_15_BEEP);
 	ShowBuildRoadScenToolbar();
+}
 static void ToolbarScenPlantTrees(Window *w)
+{
-	w->HandleButtonClick(15);
+	w->HandleButtonClick(TBSE_PLANTTREES);
 	SndPlayFx(SND_15_BEEP);
 	ShowBuildTreesToolbar();
+}
 static void ToolbarScenPlaceSign(Window *w)
+{
-	w->HandleButtonClick(16);
+	w->HandleButtonClick(TBSE_PLACESIGNS);
 	SndPlayFx(SND_15_BEEP);
 	SelectSignTool();
+}
 static void ToolbarBtn_NULL(Window *w)
+{
@@ @@ -980,23 +996,12 @@ static ToolbarButtonProc * const _scen_t @@
 	ToolbarMusicClick,
 	NULL,
 	ToolbarHelpClick,
 };
 struct ScenarioEditorToolbarWindow : Window {
 private:
 	enum ToolbarScenEditorWidgets {
 		TBSE_PAUSE        = 0,
 		TBSE_FASTFORWARD,
 		TBSE_SPACERPANEL  = 4,
 		TBSE_DATEBACKWARD = 6,
 		TBSE_DATEFORWARD,
 		TBSE_ZOOMIN       = 9,
 		TBSE_ZOOMOUT,
 	};
 public:
 	ScenarioEditorToolbarWindow(const WindowDesc *desc) : Window(desc)
+	{
 		CLRBITS(this->flags4, WF_WHITE_BORDER_MASK);
 		this->FindWindowPlacementAndResize(desc);

0 comments (0 inline, 0 general)