openttd-ottdgrfs: comparison src/main

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 static byte _terraform_size = 1;
 RailType _last_built_railtype;
 static int _scengen_town_size = 2; // depress medium-sized towns per default
-extern void GenerateIndustries(void);
+extern void GenerateIndustries();
-extern bool GenerateTowns(void);
+extern bool GenerateTowns();
 void HandleOnEditText(const char *str)
 {
 	int id = _rename_id;
 static void ToolbarPauseClick(Window *w)
 {
 	if (_networking && !_network_server) return; // only server can pause the game
-	if (DoCommandP(0, _pause ? 0 : 1, 0, NULL, CMD_PAUSE)) SndPlayFx(SND_15_BEEP);
+	if (DoCommandP(0, _pause_game ? 0 : 1, 0, NULL, CMD_PAUSE)) SndPlayFx(SND_15_BEEP);
 }
 static void ToolbarFastForwardClick(Window *w)
 {
 	_fast_forward ^= true;
 	}
 }
 static void MenuClickShowTrains(int index)
 {
-	ShowVehicleListWindow((PlayerID)index, VEH_Train);
+	ShowVehicleListWindow((PlayerID)index, VEH_TRAIN);
 }
 static void MenuClickShowRoad(int index)
 {
-	ShowVehicleListWindow((PlayerID)index, VEH_Road);
+	ShowVehicleListWindow((PlayerID)index, VEH_ROAD);
 }
 static void MenuClickShowShips(int index)
 {
-	ShowVehicleListWindow((PlayerID)index, VEH_Ship);
+	ShowVehicleListWindow((PlayerID)index, VEH_SHIP);
 }
 static void MenuClickShowAir(int index)
 {
-	ShowVehicleListWindow((PlayerID)index, VEH_Aircraft);
+	ShowVehicleListWindow((PlayerID)index, VEH_AIRCRAFT);
 }
 static void MenuClickBuildRail(int index)
 {
 	_last_built_railtype = (RailType)index;
 	_rename_what = 1;
 	SetDParam(0, id);
 	ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, 30, 180, NULL, CS_ALPHANUMERAL);
 }
-static void SelectSignTool(void)
+static void SelectSignTool()
 {
 	if (_cursor.sprite == SPR_CURSOR_SIGN) {
 		ResetObjectToPlace();
 	} else {
 		SetObjectToPlace(SPR_CURSOR_SIGN, PAL_NONE, 1, WC_MAIN_TOOLBAR, 0);
 		case 1: ShowMessageOptions();  break;
 		case 2: ShowMessageHistory();  break;
 	}
 }
-static void MenuClickSmallScreenshot(void)
+static void MenuClickSmallScreenshot()
 {
 	SetScreenshotType(SC_VIEWPORT);
 }
-static void MenuClickWorldScreenshot(void)
+static void MenuClickWorldScreenshot()
 {
 	SetScreenshotType(SC_WORLD);
 }
 static void MenuClickHelp(int index)
 {
 	const Vehicle *v;
 	int dis = -1;
 	FOR_ALL_VEHICLES(v) {
-		if (v->type == VEH_Train && IsFrontEngine(v)) CLRBIT(dis, v->owner);
+		if (v->type == VEH_TRAIN && IsFrontEngine(v)) CLRBIT(dis, v->owner);
 	}
 	PopupMainPlayerToolbMenu(w, 310, 13, dis);
 }
 static void ToolbarRoadClick(Window *w)
 {
 	const Vehicle *v;
 	int dis = -1;
 	FOR_ALL_VEHICLES(v) {
-		if (v->type == VEH_Road) CLRBIT(dis, v->owner);
+		if (v->type == VEH_ROAD) CLRBIT(dis, v->owner);
 	}
 	PopupMainPlayerToolbMenu(w, 332, 14, dis);
 }
 static void ToolbarShipClick(Window *w)
 {
 	const Vehicle *v;
 	int dis = -1;
 	FOR_ALL_VEHICLES(v) {
-		if (v->type == VEH_Ship) CLRBIT(dis, v->owner);
+		if (v->type == VEH_SHIP) CLRBIT(dis, v->owner);
 	}
 	PopupMainPlayerToolbMenu(w, 354, 15, dis);
 }
 static void ToolbarAirClick(Window *w)
 {
 	const Vehicle *v;
 	int dis = -1;
 	FOR_ALL_VEHICLES(v) {
-		if (v->type == VEH_Aircraft) CLRBIT(dis, v->owner);
+		if (v->type == VEH_AIRCRAFT) CLRBIT(dis, v->owner);
 	}
 	PopupMainPlayerToolbMenu(w, 376, 16, dis);
 }
 /* Zooms a viewport in a window in or out */
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_scen_edit_land_gen_widgets,
 	ScenEditLandGenWndProc,
 };
-static inline void ShowEditorTerraformToolBar(void)
+static inline void ShowEditorTerraformToolBar()
 {
 	AllocateWindowDescFront(&_scen_edit_land_gen_desc, 0);
 }
 static void ToolbarScenGenLand(Window *w)
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   172,   183, STR_0261_SUGAR_MINE,          STR_0284_CONSTRUCT_SUGAR_MINE},
 {   WIDGETS_END},
 };
-static bool AnyTownExists(void)
+static bool AnyTownExists()
 {
 	const Town *t;
 	FOR_ALL_TOWNS(t) return true;
 		case WKC_F8: ShowPlayerFinances(_local_player); break;
 		case WKC_F9: ShowPlayerCompany(_local_player); break;
 		case WKC_F10:ShowOperatingProfitGraph(); break;
 		case WKC_F11: ShowCompanyLeagueTable(); break;
 		case WKC_F12: ShowBuildIndustryWindow(); break;
-		case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, VEH_Train); break;
+		case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, VEH_TRAIN); break;
-		case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(_local_player, VEH_Road); break;
+		case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(_local_player, VEH_ROAD); break;
-		case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(_local_player, VEH_Ship); break;
+		case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(_local_player, VEH_SHIP); break;
-		case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(_local_player, VEH_Aircraft); break;
+		case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(_local_player, VEH_AIRCRAFT); break;
 		case WKC_SHIFT | WKC_F5: ToolbarZoomInClick(w); break;
 		case WKC_SHIFT | WKC_F6: ToolbarZoomOutClick(w); break;
 		case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype, -1); break;
 		case WKC_SHIFT | WKC_F8: ShowBuildRoadToolbar(); break;
 		case WKC_SHIFT | WKC_F9: ShowBuildDocksToolbar(); break;
 		RaiseWindowWidget(w, 25);
 		SetWindowDirty(w);
 	} break;
 	case WE_MOUSELOOP:
-		if (IsWindowWidgetLowered(w, 0) != !!_pause) {
+		if (IsWindowWidgetLowered(w, 0) != !!_pause_game) {
 			ToggleWidgetLoweredState(w, 0);
 			InvalidateWidget(w, 0);
 		}
 		if (IsWindowWidgetLowered(w, 1) != !!_fast_forward) {
 		RaiseWindowWidget(w, 25);
 		SetWindowDirty(w);
 	} break;
 	case WE_MOUSELOOP:
-		if (IsWindowWidgetLowered(w, 0) != !!_pause) {
+		if (IsWindowWidgetLowered(w, 0) != !!_pause_game) {
 			ToggleWidgetLoweredState(w, 0);
 			SetWindowDirty(w);
 		}
 		if (IsWindowWidgetLowered(w, 1) != !!_fast_forward) {
 		const Player *p = (_local_player == PLAYER_SPECTATOR) ? NULL : GetPlayer(_local_player);
 		DrawWindowWidgets(w);
 		SetDParam(0, _date);
 		DrawStringCentered(
-			70, 1, (_pause || _patches.status_long_date) ? STR_00AF : STR_00AE, 0
+			70, 1, (_pause_game || _patches.status_long_date) ? STR_00AF : STR_00AE, 0
 		);
 		if (p != NULL) {
 			/* Draw player money */
 			SetDParam64(0, p->money64);
 		/* Draw status bar */
 		if (w->message.msg) { // true when saving is active
 			DrawStringCentered(320, 1, STR_SAVING_GAME, 0);
 		} else if (_do_autosave) {
 			DrawStringCentered(320, 1, STR_032F_AUTOSAVE, 0);
-		} else if (_pause) {
+		} else if (_pause_game) {
 			DrawStringCentered(320, 1, STR_0319_PAUSED, 0);
 		} else if (WP(w,def_d).data_1 > -1280 && FindWindowById(WC_NEWS_WINDOW,0) == NULL && _statusbar_news_item.string_id != 0) {
 			/* Draw the scrolling news text */
 			if (!DrawScrollingStatusText(&_statusbar_news_item, WP(w,def_d).data_1))
 				WP(w,def_d).data_1 = -1280;
 			default: ResetObjectToPlace();
 		}
 		break;
 	case WE_TICK: {
-		if (_pause) return;
+		if (_pause_game) return;
 		if (WP(w, def_d).data_1 > -1280) { // Scrolling text
 			WP(w, def_d).data_1 -= 2;
 			InvalidateWidget(w, 1);
 		}
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_main_status_widgets,
 	StatusBarWndProc
 };
-extern void UpdateAllStationVirtCoord(void);
+extern void UpdateAllStationVirtCoord();
 static void MainWindowWndProc(Window *w, WindowEvent *e)
 {
 	int off_x;
 			break;
 	}
 }
-void ShowSelectGameWindow(void);
+void ShowSelectGameWindow();
-void SetupColorsAndInitialWindow(void)
+void SetupColorsAndInitialWindow()
 {
 	uint i;
 	Window *w;
 	int width, height;
 			ShowVitalWindows();
 			break;
 	}
 }
-void ShowVitalWindows(void)
+void ShowVitalWindows()
 {
 	Window *w;
 	w = AllocateWindowDesc((_game_mode != GM_EDITOR) ? &_toolb_normal_desc : &_toolb_scen_desc);
 	DoZoomInOutWindow(ZOOM_NONE, w);
 	CLRBITS(w->flags4, WF_WHITE_BORDER_MASK);
 	WP(w,def_d).data_1 = -1280;
 }
-void GameSizeChanged(void)
+void GameSizeChanged()
 {
 	_cur_resolution[0] = _screen.width;
 	_cur_resolution[1] = _screen.height;
 	RelocateAllWindows(_screen.width, _screen.height);
 	ScreenSizeChanged();
 	MarkWholeScreenDirty();
 }
-void InitializeMainGui(void)
+void InitializeMainGui()
 {
 	/* Clean old GUI values */
 	_last_built_railtype = RAILTYPE_RAIL;
 }

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6527	f584ab6d87f8
child 9906	6f41b8713b65