From 66d3540f2caf23a4ba9fd59bd30d13302f1d8064 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 4 Nov 2009 09:31:35 +0000
Subject: Cleanup

svn-id: r45652
---
 engines/sci/engine/kstring.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index b09b34c435..b32edf7a68 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -32,12 +32,6 @@
 
 namespace Sci {
 
-#define CHECK_OVERFLOW1(pt, size, rv) \
-	if (((pt) - (str_base)) + (size) > maxsize) { \
-		error("String expansion exceeded heap boundaries"); \
-		return rv;\
-	}
-
 /* Returns the string the script intended to address */
 Common::String kernel_lookup_text(EngineState *s, reg_t address, int index) {
 	char *seeker;
@@ -361,6 +355,12 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
 #define ALIGN_LEFT -1
 #define ALIGN_CENTRE 2
 
+#define CHECK_OVERFLOW1(pt, size, rv) \
+	if (((pt) - (targetbuf)) + (size) > maxsize) { \
+		error("String expansion exceeded heap boundaries"); \
+		return rv;\
+	}
+
 /*  Format(targ_address, textresnr, index_inside_res, ...)
 ** or
 **  Format(targ_address, heap_text_addr, ...)
@@ -375,7 +375,6 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
 	char *target = targetbuf;
 	reg_t position = argv[1]; /* source */
 	int index = argv[2].toUint16();
-	char *str_base = target;
 	int mode = 0;
 	int paramindex = 0; /* Next parameter to evaluate */
 	char xfer;
@@ -584,6 +583,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
 	return dest; /* Return target addr */
 }
 
+#undef CHECK_OVERFLOW1
 
 reg_t kStrLen(EngineState *s, int argc, reg_t *argv) {
 	return make_reg(0, s->_segMan->strlen(argv[0]));
-- 
cgit v1.2.3