summaryrefslogtreecommitdiff
path: root/src/graphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-30 03:46:59 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-30 03:46:59 +0300
commitece00592ecd93f7a96db0ca82589d00846e2f938 (patch)
treec36bde1e1a46d11ee47438d0debaa8317cd0db6e /src/graphics.cpp
parentd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (diff)
parent2c3c118c03ece5cad2b73affffbcbbc5a5746c7a (diff)
downloadmanaverse-ece00592ecd93f7a96db0ca82589d00846e2f938.tar.gz
manaverse-ece00592ecd93f7a96db0ca82589d00846e2f938.tar.bz2
manaverse-ece00592ecd93f7a96db0ca82589d00846e2f938.tar.xz
manaverse-ece00592ecd93f7a96db0ca82589d00846e2f938.zip
Merge branch 'master' into strippedstripped1.1.10.30
Diffstat (limited to 'src/graphics.cpp')
-rw-r--r--src/graphics.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp
index efa1058a6..d914b0b00 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -53,6 +53,7 @@ Graphics::Graphics():
mRect.y = 0;
mRect.w = 0;
mRect.h = 0;
+ mOpenGL = 0;
}
Graphics::~Graphics()
@@ -100,7 +101,10 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
logger->log("Double buffer mode: %s", mDoubleBuffer ? "yes" : "no");
if (mTarget->format)
+ {
logger->log("Bits per pixel: %d", mTarget->format->BytesPerPixel);
+ bpp = mTarget->format->BytesPerPixel;
+ }
const SDL_VideoInfo *vi = SDL_GetVideoInfo();
if (!vi)