openttd-ottdgrfs: comparison main

equal deleted inserted replaced

-:98c586218b01
+:8de2aaf20800
 typedef void MenuClickedProc(int index);
-void MenuClickSettings(int index)
+static void MenuClickSettings(int index)
 {
 	switch(index) {
 	case 0: ShowGameOptions(); return;
 	case 1: ShowGameDifficulty(); return;
 	case 2: ShowPatchesSelection(); return;
 	case 9: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return;
 	case 10: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return;
 	}
 }
-void MenuClickSaveLoad(int index)
+static void MenuClickSaveLoad(int index)
 {
 	if (_game_mode == GM_EDITOR) {
 		switch(index) {
 		case 0:
 			ShowSaveLoadDialog(SLD_SAVE_SCENARIO);
 			break;
 		}
 	}
 }
-void MenuClickMap(int index)
+static void MenuClickMap(int index)
 {
 	switch(index) {
 	case 0: ShowSmallMap(); break;
 	case 1: ShowExtraViewPortWindow(); break;
 	}
 }
-void MenuClickTown(int index)
+static void MenuClickTown(int index)
 {
 	ShowTownDirectory();
 }
-void MenuClickScenMap(int index)
+static void MenuClickScenMap(int index)
 {
 	switch(index) {
 	case 0: ShowSmallMap(); break;
 	case 1: ShowExtraViewPortWindow(); break;
 	case 2: ShowTownDirectory(); break;
 	}
 }
-void MenuClickSubsidies(int index)
+static void MenuClickSubsidies(int index)
 {
 	ShowSubsidiesList();
 }
-void MenuClickStations(int index)
+static void MenuClickStations(int index)
 {
 	ShowPlayerStations(index);
 }
-void MenuClickFinances(int index)
+static void MenuClickFinances(int index)
 {
 	ShowPlayerFinances(index);
 }
-void MenuClickCompany(int index)
+static void MenuClickCompany(int index)
 {
 	ShowPlayerCompany(index);
 }
-void MenuClickGraphs(int index)
+static void MenuClickGraphs(int index)
 {
 	switch(index) {
 	case 0: ShowOperatingProfitGraph(); return;
 	case 1: ShowIncomeGraph(); return;
 	case 2: ShowDeliveredCargoGraph(); return;
 	case 4: ShowCompanyValueGraph(); return;
 	case 5: ShowCargoPaymentRates(); return;
 	}
 }
-void MenuClickLeague(int index)
+static void MenuClickLeague(int index)
 {
 	switch(index) {
 	case 0: ShowCompanyLeagueTable(); return;
 	case 1: ShowPerformanceRatingDetail(); return;
 	}
 }
-void MenuClickIndustry(int index)
+static void MenuClickIndustry(int index)
 {
 	switch(index) {
 	case 0: ShowIndustryDirectory(); break;
 	case 1: ShowBuildIndustryWindow(); break;
 	}
 }
-void MenuClickShowTrains(int index)
+static void MenuClickShowTrains(int index)
 {
 	ShowPlayerTrains(index);
 }
-void MenuClickShowRoad(int index)
+static void MenuClickShowRoad(int index)
 {
 	ShowPlayerRoadVehicles(index);
 }
-void MenuClickShowShips(int index)
+static void MenuClickShowShips(int index)
 {
 	ShowPlayerShips(index);
 }
-void MenuClickShowAir(int index)
+static void MenuClickShowAir(int index)
 {
 	ShowPlayerAircraft(index);
 }
-void MenuClickBuildRail(int index)
+static void MenuClickBuildRail(int index)
 {
 	Player *p = DEREF_PLAYER(_local_player);
 	_last_built_railtype = min(index, p->max_railtype-1);
 	ShowBuildRailToolbar(_last_built_railtype, -1);
 }
-void MenuClickBuildRoad(int index)
+static void MenuClickBuildRoad(int index)
 {
 	ShowBuildRoadToolbar();
 }
-void MenuClickBuildWater(int index)
+static void MenuClickBuildWater(int index)
 {
 	ShowBuildDocksToolbar();
 }
-void MenuClickBuildAir(int index)
+static void MenuClickBuildAir(int index)
 {
 	ShowBuildAirToolbar();
 }
 void ShowRenameSignWindow(SignStruct *ss)
 		SetObjectToPlace(0x2D2, 1, 1, 0);
 		_place_proc = PlaceProc_Sign;
 	}
 }
-void MenuClickForest(int index)
+static void MenuClickForest(int index)
 {
 	switch(index) {
 	case 0: ShowTerraformToolbar(); break;
 	case 1: ShowBuildTreesToolbar(); break;
 	case 2: SelectSignTool(); break;
 	}
 }
-void MenuClickMusicWindow(int index)
+static void MenuClickMusicWindow(int index)
 {
 	ShowMusicWindow();
 }
-void MenuClickNewspaper(int index)
+static void MenuClickNewspaper(int index)
 {
 	switch(index) {
 	case 0: ShowLastNewsMessage(); break;
 	case 1: ShowMessageOptions(); break;
 	case 2: ShowMessageHistory(); break;
 	case 3: ; /* XXX: chat not done */
 	}
 }
-void MenuClickHelp(int index)
+static void MenuClickHelp(int index)
 {
 	switch(index) {
 	case 0: PlaceLandBlockInfo(); break;
 	case 2: _make_screenshot = 1; break;
 	case 3: _make_screenshot = 2; break;
 			DoZoomInOutWindow(in ? ZOOM_IN : ZOOM_OUT, w);
 		}
 	}
 }
-void ResetLandscape()
+static void ResetLandscape()
 {
 	_random_seeds[0][0] = InteractiveRandom();
 	_random_seeds[0][1] = InteractiveRandom();
 	GenerateWorld(1);
 	}
 	_generating_world = false;
 }
-void PlaceProc_RaiseBigLand(uint tile)
+static void PlaceProc_RaiseBigLand(uint tile)
 {
 	CommonRaiseLowerBigLand(tile, 1);
 }
-void PlaceProc_LowerBigLand(uint tile)
+static void PlaceProc_LowerBigLand(uint tile)
 {
 	CommonRaiseLowerBigLand(tile, 0);
 }
 //static void CcDemolish(bool success, uint tile, uint32 p1, uint32 p2)
 //{
 //	DoCommandP(tile, 0, 0, CcDemolish, CMD_LANDSCAPE_CLEAR | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
 //}
-void PlaceProc_RockyArea(uint tile)
+static void PlaceProc_RockyArea(uint tile)
 {
 	if (!IS_TILETYPE(tile, MP_CLEAR))
 		return;
 	_map5[tile] = (_map5[tile] & ~0x1C) | 8;
 	MarkTileDirtyByTile(tile);
 	SndPlayTileFx(0x1D, tile);
 }
-void PlaceProc_LightHouse(uint tile)
+static void PlaceProc_LightHouse(uint tile)
 {
 	TileInfo ti;
 	FindLandscapeHeightByTile(&ti, tile);
 	if (ti.type != MP_CLEAR || (ti.tileh & 0x10))
 	ModifyTile(tile, MP_SETTYPE(MP_UNMOVABLE) | MP_MAP5, 1);
 	SndPlayTileFx(0x1D, tile);
 }
-void PlaceProc_Transmitter(uint tile)
+static void PlaceProc_Transmitter(uint tile)
 {
 	TileInfo ti;
 	FindLandscapeHeightByTile(&ti, tile);
 	if (ti.type != MP_CLEAR || (ti.tileh & 0x10))
 	ModifyTile(tile, MP_SETTYPE(MP_UNMOVABLE) | MP_MAP5, 0);
 	SndPlayTileFx(0x1D, tile);
 }
-void PlaceProc_Desert(uint tile)
+static void PlaceProc_Desert(uint tile)
 {
 	SetMapExtraBits(tile, GetMapExtraBits(tile) == 1 ? 0 : 1);
 }
 static const Widget _scen_edit_land_gen_widgets[] = {
 		SndPlayTileFx(0x1D, tile);
 		ResetObjectToPlace();
 	}
 }
-void PlaceProc_Town(uint tile)
+static void PlaceProc_Town(uint tile)
 {
 	DoCommandP(tile, 0, 0, CcBuildTown, CMD_BUILD_TOWN | CMD_MSG(STR_0236_CAN_T_BUILD_TOWN_HERE));
 }
 	_cur_dpi = old_dpi;
 	return x > 0;
 }
-void StatusBarWndProc(Window *w, WindowEvent *e)
+static void StatusBarWndProc(Window *w, WindowEvent *e)
 {
 	Player *p;
 	switch(e->event) {
 	case WE_PAINT:

changeset 410	8de2aaf20800
parent 395	4c990f33dab7
child 424	4c7808af7526