From bb26c040530f4ea212e17716702963a88165a3b0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 17 Apr 2010 23:19:52 +0000
Subject: Fixing some warnings (with gcc 3.3.6)

svn-id: r48694
---
 engines/sci/sound/drivers/pcjr.cpp | 2 +-
 engines/teenagent/surface.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3