miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(svn r26544) [1.4] -Backport from trunk:

Browse Source 
- Fix: [Windows] Crash when the operating system performs the "paint" callback during window creation [FS#5994] (r26539, r26538)
- Fix: OpenBSD compilation [FS#5992] (r26523)
- Fix: prevent from ever reading huge (or negative) amounts of data in strgen (r26521)
- Fix: Severity rating of dedicated server messages during world generation (r26518)
This commit is contained in:
frosch
2014-04-29 18:41:19 +00:00
committed by Sergii Pylypenko
parent e69b50c898
commit 3493750241
26 changed files with 114 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gfxinit.cpp
View File

@@ -282,9 +282,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;