summaryrefslogtreecommitdiff
path: root/src/crashlog.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-04-28 21:06:51 +0000
committerrubidium <rubidium@openttd.org>2014-04-28 21:06:51 +0000
commitb476086c394c6bcf893f292ef67565ef2b5496a2 (patch)
tree7bbdfcc4597cae1378070d82c5da36c8668171e0 /src/crashlog.cpp
parent3b634b628c8b8ce30cdd11d38a38cf2f455a1c73 (diff)
downloadopenttd-b476086c394c6bcf893f292ef67565ef2b5496a2.tar.xz
(svn r26538) -Codechange: remove double accounting of the drivers
Diffstat (limited to 'src/crashlog.cpp')
-rw-r--r--src/crashlog.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 9159836c8..e8290a7c3 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -140,14 +140,14 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
BaseGraphics::GetUsedSet() == NULL ? "none" : BaseGraphics::GetUsedSet()->name,
BaseGraphics::GetUsedSet() == NULL ? UINT32_MAX : BaseGraphics::GetUsedSet()->version,
_current_language == NULL ? "none" : _current_language->file,
- _music_driver == NULL ? "none" : _music_driver->GetName(),
+ MusicDriver::GetInstance() == NULL ? "none" : MusicDriver::GetInstance()->GetName(),
BaseMusic::GetUsedSet() == NULL ? "none" : BaseMusic::GetUsedSet()->name,
BaseMusic::GetUsedSet() == NULL ? UINT32_MAX : BaseMusic::GetUsedSet()->version,
_networking ? (_network_server ? "server" : "client") : "no",
- _sound_driver == NULL ? "none" : _sound_driver->GetName(),
+ SoundDriver::GetInstance() == NULL ? "none" : SoundDriver::GetInstance()->GetName(),
BaseSounds::GetUsedSet() == NULL ? "none" : BaseSounds::GetUsedSet()->name,
BaseSounds::GetUsedSet() == NULL ? UINT32_MAX : BaseSounds::GetUsedSet()->version,
- _video_driver == NULL ? "none" : _video_driver->GetName()
+ VideoDriver::GetInstance() == NULL ? "none" : VideoDriver::GetInstance()->GetName()
);
buffer += seprintf(buffer, last,
@@ -484,7 +484,7 @@ bool CrashLog::MakeCrashLog() const
*/
/* static */ void CrashLog::AfterCrashLogCleanup()
{
- if (_music_driver != NULL) _music_driver->Stop();
- if (_sound_driver != NULL) _sound_driver->Stop();
- if (_video_driver != NULL) _video_driver->Stop();
+ if (MusicDriver::GetInstance() != NULL) MusicDriver::GetInstance()->Stop();
+ if (SoundDriver::GetInstance() != NULL) SoundDriver::GetInstance()->Stop();
+ if (VideoDriver::GetInstance() != NULL) VideoDriver::GetInstance()->Stop();
}