aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2010-04-17 23:19:52 +0000
committerMax Horn2010-04-17 23:19:52 +0000
commitbb26c040530f4ea212e17716702963a88165a3b0 (patch)
tree815b162100e9178b7f27a2f836bc019b4ce1ce02 /engines
parentaaa6e7ee541fc8d149ffc536e9ff6a015b40d179 (diff)
downloadscummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.gz
scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.tar.bz2
scummvm-rg350-bb26c040530f4ea212e17716702963a88165a3b0.zip
Fixing some warnings (with gcc 3.3.6)
svn-id: r48694
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sound/drivers/pcjr.cpp2
-rw-r--r--engines/teenagent/surface.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp
index e2544869ac..bdf90eff5c 100644
--- a/engines/sci/sound/drivers/pcjr.cpp
+++ b/engines/sci/sound/drivers/pcjr.cpp
@@ -34,7 +34,7 @@ namespace Sci {
#define BASE_NOTE 129 // A10
#define BASE_OCTAVE 10 // A10, as I said
-const static int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12)
+static const int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(x/12)
28160, // A10
29834,
31608,
diff --git a/engines/teenagent/surface.cpp b/engines/teenagent/surface.cpp
index 735ce67785..129d1bcd6f 100644
--- a/engines/teenagent/surface.cpp
+++ b/engines/teenagent/surface.cpp
@@ -87,7 +87,7 @@ Common::Rect Surface::render(Graphics::Surface *surface, int dx, int dy, bool mi
return Common::Rect();
if (zoom == 256) {
- byte *src = (byte *)getBasePtr(0, src_rect.top);
+ const byte *src = (const byte *)getBasePtr(0, src_rect.top);
byte *dst_base = (byte *)surface->getBasePtr(dst_rect.left, dst_rect.top);
for (int i = src_rect.top; i < src_rect.bottom; ++i) {
@@ -107,7 +107,7 @@ Common::Rect Surface::render(Graphics::Surface *surface, int dx, int dy, bool mi
for(int i = 0; i < dst_rect.height(); ++i) {
for (int j = 0; j < dst_rect.width(); ++j) {
int px = j * 256 / zoom;
- byte *src = (byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom);
+ const byte *src = (const byte *)getBasePtr(src_rect.left + (mirror? w - px - 1: px), src_rect.top + i * 256 / zoom);
byte p = *src;
if (p != 0xff)
dst[j] = p;