diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
| commit | ee8191705826d978b7793497fdd307536c709bff (patch) | |
| tree | 6cfbfc9d72bf636d2da373b4d023705207db4685 /src/render/sdl2softwaregraphics.cpp | |
| parent | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff) | |
| parent | 0c4ed5a9594b849b436fca13c6992dee923915ed (diff) | |
| download | plus-ee8191705826d978b7793497fdd307536c709bff.tar.gz plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2 plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz plus-ee8191705826d978b7793497fdd307536c709bff.zip | |
Merge branch 'temp1' into stable
Diffstat (limited to 'src/render/sdl2softwaregraphics.cpp')
| -rw-r--r-- | src/render/sdl2softwaregraphics.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index 95c8f08b1..088aba98c 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -1468,11 +1468,14 @@ void SDL2SoftwareGraphics::drawLine(int x1, int y1, int x2, int y2) } bool SDL2SoftwareGraphics::setVideoMode(const int w, const int h, - const int bpp, const bool fs, - const bool hwaccel, const bool resize, + const int scale, + const int bpp, + const bool fs, + const bool hwaccel, + const bool resize, const bool noFrame) { - setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame); + setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame); if (!(mWindow = graphicsManager.createWindow(w, h, bpp, getSoftwareFlags()))) |