aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl
diff options
context:
space:
mode:
authorJohannes Schickel2008-06-04 17:20:25 +0000
committerJohannes Schickel2008-06-04 17:20:25 +0000
commit73da6ab51ef86b89adad28a935ac22bad257b834 (patch)
tree176ae7f067d513f01a330757f97559d4922f693b /backends/platform/sdl
parent0931f926d45db807806f433cde9114839c4de65e (diff)
downloadscummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.gz
scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.bz2
scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.zip
- Removed -Wconversion from compiler options for g++ 4.3, it's behavior has fundamently changed in g++ 4.3
- Added -Wno-empty-body and -Wno-parentheses as compiler flags for g++ 4.3 for *now* (we should think of removing -Wparentheses though) - Fixed some warnings for g++ 4.3 (only for the engines I'm using) svn-id: r32540
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r--backends/platform/sdl/events.cpp2
-rw-r--r--backends/platform/sdl/sdl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 9a0a33f45c..a4a72ca380 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -148,7 +148,7 @@ void OSystem_SDL::handleKbdMouse() {
_km.y_down_count = 1;
}
- SDL_WarpMouse(_km.x, _km.y);
+ SDL_WarpMouse((Uint16)_km.x, (Uint16)_km.y);
}
}
}
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index b750864ad8..be3aaad926 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -406,7 +406,7 @@ bool OSystem_SDL::setSoundCallback(SoundProc proc, void *param) {
// about 1/32th of a second. Note that it must be a power of two.
// So e.g. at 22050 Hz, we request a sample buffer size of 2048.
int samples = 8192;
- while (32 * samples >= _samplesPerSec) {
+ while (16 * samples >= _samplesPerSec) {
samples >>= 1;
}