diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
| commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
| tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /src/graphics.cpp | |
| parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
| parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
| download | manaplus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz manaplus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 manaplus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz manaplus-b30a5d2289a0b68410dee5343e148aba88ea4839.zip | |
Merge branch 'master' into stripped
Diffstat (limited to 'src/graphics.cpp')
| -rw-r--r-- | src/graphics.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 5848d8c14..5241bbcc6 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -24,7 +24,6 @@ #include "graphicsvertexes.h" #include "logger.h" -#include "map.h" #include "resources/image.h" #include "resources/imageloader.h" @@ -113,7 +112,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, if (mTarget->format) { logger->log("Bits per pixel: %d", mTarget->format->BytesPerPixel); - bpp = mTarget->format->BytesPerPixel; +// bpp = mTarget->format->BytesPerPixel; } const SDL_VideoInfo *vi = SDL_GetVideoInfo(); @@ -719,10 +718,10 @@ int Graphics::SDL_FakeUpperBlit(SDL_Surface *src, SDL_Rect *srcrect, /* Make sure the surfaces aren't locked */ if (!src || !dst) - return(-1); + return -1; if (src->locked || dst->locked) - return(-1); + return -1; /* If the destination rectangle is nullptr, use the entire dest surface */ if (!dstrect) @@ -841,7 +840,7 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle) Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (y = y1; y < y2; y++) |