← Back to branch summary

~vcs-imports/aethyra/client

« back to all changes in this revision

Viewing changes to src/engine.cpp

  • Committer: Tametomo
  • Date: 2010-10-07 21:11:23 UTC
  • Revision ID: git-v1:dd62b9e123b6d7e4b0efb9b634dc1596d81bfea6
Instead of automatically defaulting to OpenGL, start the client in SDL
mode, then allow the user to select whether they want to use SDL or OpenGl.
Issue originally brought up by Srauls.

Also updated Code::Blocks dependencies to match up with a forthcoming
Windows devpack.

TODO: Eventually make restarting the client doable from within the running
instance, instead of relying on the user to do so themselves.

Signed-off-by: Tametomo <irarice@gmail.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine.cpp
257
257
#endif
258
258
 
259
259
#ifdef USE_OPENGL
260
 
    bool useOpenGL = !options.noOpenGL && (config.getValue("opengl", 1) == 1);
 
260
    options.promptForGraphicsMode = !config.keyExists("opengl");
 
261
    bool useOpenGL = !options.noOpenGL && (config.getValue("opengl", 0) == 1);
261
262
 
262
263
    // Setup image loading for the right image format
263
264
    Image::setLoadAsOpenGL(useOpenGL);