diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /src/opengl1graphics.h | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'src/opengl1graphics.h')
| -rw-r--r-- | src/opengl1graphics.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h index 87458d8b9..76dc3ef00 100644 --- a/src/opengl1graphics.h +++ b/src/opengl1graphics.h @@ -45,10 +45,12 @@ class OpenGL1Graphics : public Graphics * the next call to setVideoMode(). Only implemented on MacOS for now. */ void setSync(bool sync); + bool getSync() const { return mSync; } - bool setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel); + bool setVideoMode(int w, int h, int bpp, bool fs, + bool hwaccel, bool resize, bool noFrame); bool drawImage(Image *image, int srcX, int srcY, |