diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 08:01:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 08:01:09 +0400 |
commit | ff683ca5e511638da82357816a8d9e053536e2b5 (patch) | |
tree | 7e83686c805aed90dae93337e0ee5dcb083e5c52 /source/gameengine/GamePlayer/ghost | |
parent | 7dd63e6c40e22a5eeb7a44aed34bf1728ce13e0e (diff) |
misc small edits, remove remaining Id's
Diffstat (limited to 'source/gameengine/GamePlayer/ghost')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index b1781f1703e..140dbadee60 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -365,7 +365,6 @@ int main(int argc, char** argv) GHOST_TEmbedderWindowID parentWindow = 0; bool isBlenderPlayer = false; int validArguments=0; - bool samplesParFound = false; GHOST_TUns16 aasamples = 0; #ifdef __linux__ @@ -407,8 +406,6 @@ int main(int argc, char** argv) initglobals(); - // Blender's VBOs cause odd problems with modifiers (we have our own vbo code) - U.gameflags |= USER_DISABLE_VBO; // We load our own G.main, so free the one that initglobals() gives us free_main(G.main); G.main = NULL; @@ -584,14 +581,8 @@ int main(int argc, char** argv) break; case 'm': i++; - samplesParFound = true; if ((i+1) <= validArguments ) - aasamples = atoi(argv[i++]); - else - { - error = true; - printf("error: No argument supplied for -m"); - } + aasamples = atoi(argv[i++]); break; case 'c': i++; @@ -827,7 +818,7 @@ int main(int argc, char** argv) if ((!fullScreenParFound) && (!windowParFound)) { // Only use file settings when command line did not override - if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) { + if (scene->gm.fullscreen) { //printf("fullscreen option found in Blender file\n"); fullScreen = true; fullScreenWidth= scene->gm.xplay; @@ -856,9 +847,6 @@ int main(int argc, char** argv) else scene->gm.stereoflag = STEREO_ENABLED; - if (!samplesParFound) - aasamples = scene->gm.aasamples; - if (stereoFlag == STEREO_DOME){ stereomode = RAS_IRasterizer::RAS_STEREO_DOME; scene->gm.stereoflag = STEREO_DOME; @@ -904,7 +892,7 @@ int main(int argc, char** argv) #endif { app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency, - stereoWindow, stereomode, aasamples, (scene->gm.playerflag & GAME_PLAYER_DESKTOP_RESOLUTION)); + stereoWindow, stereomode, aasamples); } } else |