(svn r26538) -Codechange: remove double accounting of the drivers

This commit is contained in:
rubidium
2014-04-28 21:06:51 +00:00
parent 39e2e5af1e
commit beb540ec55
24 changed files with 97 additions and 75 deletions

View File

@@ -289,9 +289,9 @@ static bool SwitchNewGRFBlitter()
break;
}
if (!_video_driver->AfterBlitterChange()) {
if (!VideoDriver::GetInstance()->AfterBlitterChange()) {
/* Failed to switch blitter, let's hope we can return to the old one. */
if (BlitterFactory::SelectBlitter(cur_blitter) == NULL || !_video_driver->AfterBlitterChange()) usererror("Failed to reinitialize video driver. Specify a fixed blitter in the config");
if (BlitterFactory::SelectBlitter(cur_blitter) == NULL || !VideoDriver::GetInstance()->AfterBlitterChange()) usererror("Failed to reinitialize video driver. Specify a fixed blitter in the config");
}
return true;