openttd-ottdgrfs: comparison src/openttd.cpp

equal deleted inserted replaced

-:550db5cefcc2
+:8a2d1c2ceb88
 #include "news.h"
 #include "engine.h"
 #include "sound.h"
 #include "economy.h"
 #include "fileio.h"
-#include "hal.h"
 #include "airport.h"
 #include "aircraft.h"
 #include "console.h"
 #include "screenshot.h"
 #include "network/network.h"
 #include "newgrf_house.h"
 #include "newgrf_commons.h"
 #include "player_face.h"
 #include "group.h"
 #include "blitter/factory.hpp"
+#include "sound/sound_driver.hpp"
+#include "music/music_driver.hpp"
+#include "video/video_driver.hpp"
 #include "bridge_map.h"
 #include "clear_map.h"
 #include "rail_map.h"
 #include "road_map.h"
 	va_start(va, s);
 	vsnprintf(buf, lengthof(buf), s, va);
 	va_end(va);
 	ShowOSErrorBox(buf);
-	if (_video_driver != NULL) _video_driver->stop();
+	if (_video_driver != NULL) _video_driver->Stop();
 	assert(0);
 	exit(1);
 }
 		"  -c config_file      = Use 'config_file' instead of 'openttd.cfg'\n"
 		"  -x                  = Do not automatically save to config file on exit\n\n",
 		lastof(buf)
 	);
-	p = GetDriverList(p, lastof(buf));
+	/* List the drivers */
+	p = VideoDriverFactoryBase::GetDriversInfo(p, lastof(buf));
 	/* List the blitters */
 	p = BlitterFactoryBase::GetBlittersInfo(p, lastof(buf));
 	/* We need to initialize the AI, so it finds the AIs */
 static void InitializeDynamicVariables()
 {
 	/* Dynamic stuff needs to be initialized somewhere... */
 	_town_sort     = NULL;
 	_industry_sort = NULL;
+	_industry_mngr.ResetMapping();
+	_industile_mngr.ResetMapping();
 }
 static void UnInitializeGame()
 {
 	_scrolling_viewport = 0;
 	_cursor.fix_at = false;
 	MarkWholeScreenDirty();
 	/* Play main theme */
-	if (_music_driver->is_song_playing()) ResetMusic();
+	if (_music_driver->IsSongPlaying()) ResetMusic();
 }
 #if defined(UNIX) && !defined(__MORPHOS__)
 extern void DedicatedFork();
 #endif
 	GfxInitPalettes();
 	DEBUG(misc, 1, "Loading blitter '%s'...", blitter);
 	if (BlitterFactoryBase::SelectBlitter(blitter) == NULL)
 		error("Failed to select requested blitter '%s'; does it exist?", blitter);
 	DEBUG(driver, 1, "Loading drivers...");
-	LoadDriver(SOUND_DRIVER, _ini_sounddriver);
-	LoadDriver(MUSIC_DRIVER, _ini_musicdriver);
+	_sound_driver = (SoundDriver*)SoundDriverFactoryBase::SelectDriver(_ini_sounddriver, Driver::DT_SOUND);
-	LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads
+	if (_sound_driver == NULL) {
+		StrEmpty(_ini_sounddriver) ?
+			error("Failed to autoprobe sound driver") :
+			error("Failed to select requested sound driver '%s'", _ini_sounddriver);
+	}
+	_music_driver = (MusicDriver*)MusicDriverFactoryBase::SelectDriver(_ini_musicdriver, Driver::DT_MUSIC);
+	if (_music_driver == NULL) {
+		StrEmpty(_ini_musicdriver) ?
+			error("Failed to autoprobe music driver") :
+			error("Failed to select requested music driver '%s'", _ini_musicdriver);
+	}
+	_video_driver = (VideoDriver*)VideoDriverFactoryBase::SelectDriver(_ini_videodriver, Driver::DT_VIDEO);
+	if (_video_driver == NULL) {
+		StrEmpty(_ini_videodriver) ?
+			error("Failed to autoprobe video driver") :
+			error("Failed to select requested video driver '%s'", _ini_videodriver);
+	}
 	_savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
 	/* Initialize the zoom level of the screen to normal */
 	_screen.zoom = ZOOM_LVL_NORMAL;
 	/* restore saved music volume */
-	_music_driver->set_volume(msf.music_vol);
+	_music_driver->SetVolume(msf.music_vol);
 	NetworkStartUp(); // initialize network-core
 #if defined(ENABLE_NETWORK)
 	if (debuglog_conn != NULL && _network_available) {
 			NetworkClientConnectGame(network_conn, rport);
 		}
 	}
 #endif /* ENABLE_NETWORK */
-	_video_driver->main_loop();
+	_video_driver->MainLoop();
 	WaitTillSaved();
 	IConsoleFree();
 	if (_network_available) NetworkShutDown(); // Shut down the network and close any open connections
-	_video_driver->stop();
+	_video_driver->Stop();
-	_music_driver->stop();
+	_music_driver->Stop();
-	_sound_driver->stop();
+	_sound_driver->Stop();
 	/* only save config if we have to */
 	if (save_config) {
 		SaveToConfig();
 		SaveToHighScore();
 {
 	_game_mode = GM_NORMAL;
 	ResetGRFConfig(true);
 	_house_mngr.ResetMapping();
+	_industile_mngr.ResetMapping();
+	_industry_mngr.ResetMapping();
 	GenerateWorldSetCallback(&MakeNewGameDone);
 	GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y);
 }
 	if (_switch_mode_errorstr != INVALID_STRING_ID) {
 		ShowErrorMessage(INVALID_STRING_ID, _switch_mode_errorstr, 0, 0);
 	}
 }
-#include "cargopacket.h"
-void CheckCargoPacketLeaks()
-{
-	CargoPacket *cp;
-	FOR_ALL_CARGOPACKETS(cp) cp->touched = false;
-	Vehicle *v;
-	FOR_ALL_VEHICLES(v) {
-		const CargoList::List *packets = v->cargo.Packets();
-		for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) (*it)->touched = true;
-	}
-	Station *st;
-	FOR_ALL_STATIONS(st) {
-		for (CargoID c = 0; c < NUM_CARGO; c++) {
-			GoodsEntry *ge = &st->goods[c];
-			const CargoList::List *packets = ge->cargo.Packets();
-			for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) (*it)->touched = true;
-		}
-	}
-	FOR_ALL_CARGOPACKETS(cp) assert(cp->touched);
-}
 /* State controlling game loop.
 * The state must not be changed from anywhere
 * but here.
 * That check is enforced in DoCommand. */
 		AI_RunGameLoop();
 		CallWindowTickEvent();
 		NewsLoop();
 		_current_player = p;
-		CheckCargoPacketLeaks();
 	}
 }
 /** Create an autosave. The default name is "autosave#.sav". However with
 * the patch setting 'keep_all_autosave' the name defaults to company-name + date */
 				SETBIT(v->u.road.state, RVS_IS_STOPPING);
 			}
 		}
 	}
+	if (CheckSavegameVersion(70)) {
+		/* Added variables to support newindustries */
+		Industry *i;
+		FOR_ALL_INDUSTRIES(i) i->founder = OWNER_NONE;
+	}
 	/* Recalculate */
 	Group *g;
 	FOR_ALL_GROUPS(g) {
 		const Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 	/* check that house ids are still valid */
 	CheckHouseIDs();
 	/* redraw the whole screen */
 	MarkWholeScreenDirty();
 }
-HalMusicDriver *_music_driver;
-HalSoundDriver *_sound_driver;
-HalVideoDriver *_video_driver;

branch	noai
changeset 9631	8a2d1c2ceb88
parent 9629	66dde6412125
child 9686	d3c195c226f9