diff options
| author | rubidium <rubidium@openttd.org> | 2013-11-25 14:26:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2013-11-25 14:26:46 +0000 |
| commit | 6996b441d9d104bc6d7041b64362f4426425f600 (patch) | |
| tree | 074989fd03a7f672e137423688c40d1efc466a95 /src/openttd.cpp | |
| parent | a399fc667ce506abcdcfd853d1ad58f0bb8dbb4f (diff) | |
| download | openttd-6996b441d9d104bc6d7041b64362f4426425f600.tar.xz | |
(svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 98c6503bb..e878d0894 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -190,7 +190,7 @@ static void ShowHelp() p = BaseMusic::GetSetsList(p, lastof(buf)); /* List the drivers */ - p = VideoDriverFactoryBase::GetDriversInfo(p, lastof(buf)); + p = DriverFactoryBase::GetDriversInfo(p, lastof(buf)); /* List the blitters */ p = BlitterFactoryBase::GetBlittersInfo(p, lastof(buf)); @@ -767,7 +767,7 @@ int openttd_main(int argc, char *argv[]) free(blitter); if (videodriver == NULL && _ini_videodriver != NULL) videodriver = strdup(_ini_videodriver); - _video_driver = (VideoDriver*)VideoDriverFactoryBase::SelectDriver(videodriver, Driver::DT_VIDEO); + _video_driver = (VideoDriver*)DriverFactoryBase::SelectDriver(videodriver, Driver::DT_VIDEO); if (_video_driver == NULL) { StrEmpty(videodriver) ? usererror("Failed to autoprobe video driver") : @@ -833,7 +833,7 @@ int openttd_main(int argc, char *argv[]) free(music_set); if (sounddriver == NULL && _ini_sounddriver != NULL) sounddriver = strdup(_ini_sounddriver); - _sound_driver = (SoundDriver*)SoundDriverFactoryBase::SelectDriver(sounddriver, Driver::DT_SOUND); + _sound_driver = (SoundDriver*)DriverFactoryBase::SelectDriver(sounddriver, Driver::DT_SOUND); if (_sound_driver == NULL) { StrEmpty(sounddriver) ? usererror("Failed to autoprobe sound driver") : @@ -842,7 +842,7 @@ int openttd_main(int argc, char *argv[]) free(sounddriver); if (musicdriver == NULL && _ini_musicdriver != NULL) musicdriver = strdup(_ini_musicdriver); - _music_driver = (MusicDriver*)MusicDriverFactoryBase::SelectDriver(musicdriver, Driver::DT_MUSIC); + _music_driver = (MusicDriver*)DriverFactoryBase::SelectDriver(musicdriver, Driver::DT_MUSIC); if (_music_driver == NULL) { StrEmpty(musicdriver) ? usererror("Failed to autoprobe music driver") : |