[Scummvm-cvs-logs] SF.net SVN: scummvm:[45652] scummvm/trunk/engines/sci/engine/kstring.cpp

[thebluegr at users.sourceforge.net]

Revision: 45652
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45652&view=rev
Author:   thebluegr
Date:     2009-11-04 09:31:35 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kstring.cpp

Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp	2009-11-04 08:38:32 UTC (rev 45651)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp	2009-11-04 09:31:35 UTC (rev 45652)
@@ -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 @@
 #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 @@
 	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 @@
 	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]));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.