Merge branch 'accurate' into portable
This commit is contained in:
commit
22622ae69a
1 changed files with 21 additions and 0 deletions
21
src/Main.cpp
21
src/Main.cpp
|
@ -218,10 +218,24 @@ int main(int argc, char *argv[])
|
||||||
if (window == NULL)
|
if (window == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (conf.display_mode == 1)
|
||||||
|
{
|
||||||
|
if (!StartDirectDraw(window, 0))
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if !(StartDirectDraw(window, 1))
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
// Doesn't handle StartDirectDraw failing
|
||||||
if (conf.display_mode == 1)
|
if (conf.display_mode == 1)
|
||||||
StartDirectDraw(window, 0);
|
StartDirectDraw(window, 0);
|
||||||
else
|
else
|
||||||
StartDirectDraw(window, 1);
|
StartDirectDraw(window, 1);
|
||||||
|
#endif
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -237,7 +251,14 @@ int main(int argc, char *argv[])
|
||||||
if (window == NULL)
|
if (window == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
if (!StartDirectDraw(window, 2))
|
||||||
|
return 0;
|
||||||
|
#else
|
||||||
|
// Doesn't handle StartDirectDraw failing
|
||||||
StartDirectDraw(window, 2);
|
StartDirectDraw(window, 2);
|
||||||
|
#endif
|
||||||
|
|
||||||
bFullscreen = TRUE;
|
bFullscreen = TRUE;
|
||||||
|
|
||||||
SDL_ShowCursor(SDL_DISABLE);
|
SDL_ShowCursor(SDL_DISABLE);
|
||||||
|
|
Loading…
Add table
Reference in a new issue