summaryrefslogtreecommitdiff
path: root/src/guichan/sdl
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-30 22:03:32 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-30 22:03:32 +0300
commit1d0044cbc81e547ad688a295288910d58e1a3fb1 (patch)
tree0a4575b8ff5f76b571891ea0f30df02fe61f4f29 /src/guichan/sdl
parentb82ee801506790283d2f03060949bb5089086de8 (diff)
downloadmanaverse-1d0044cbc81e547ad688a295288910d58e1a3fb1.tar.gz
manaverse-1d0044cbc81e547ad688a295288910d58e1a3fb1.tar.bz2
manaverse-1d0044cbc81e547ad688a295288910d58e1a3fb1.tar.xz
manaverse-1d0044cbc81e547ad688a295288910d58e1a3fb1.zip
Fix compilation warnings after guichan integration.
Remove temp file.
Diffstat (limited to 'src/guichan/sdl')
-rw-r--r--src/guichan/sdl/sdlgraphics.cpp8
-rw-r--r--src/guichan/sdl/sdlpixel.hpp8
2 files changed, 14 insertions, 2 deletions
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index 8c4504a59..c64018755 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -353,6 +353,8 @@ namespace gcn
}
break;
}
+ default:
+ break;
} // end switch
@@ -413,7 +415,7 @@ namespace gcn
Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b);
switch(bpp)
- {
+ {
case 1:
for (;y1 <= y2; ++y1)
{
@@ -467,7 +469,9 @@ namespace gcn
p += mTarget->pitch;
}
break;
-
+
+ default:
+ break;
} // end switch
SDL_UnlockSurface(mTarget);
diff --git a/src/guichan/sdl/sdlpixel.hpp b/src/guichan/sdl/sdlpixel.hpp
index 49686ebc1..a5d9ca5a1 100644
--- a/src/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/sdl/sdlpixel.hpp
@@ -93,6 +93,9 @@ namespace gcn
color = *(Uint32 *)p;
break;
+ default:
+ color = *p;
+ break;
}
unsigned char r,g,b,a;
@@ -148,6 +151,9 @@ namespace gcn
case 4:
*(Uint32 *)p = pixel;
break;
+
+ default:
+ break;
}
SDL_UnlockSurface(surface);
@@ -251,6 +257,8 @@ namespace gcn
case 4:
*(Uint32 *)p = SDLAlpha32(pixel, *(Uint32 *)p, color.a);
break;
+ default:
+ break;
}
SDL_UnlockSurface(surface);