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

[thebluegr at users.sourceforge.net]

Revision: 49652
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49652&view=rev
Author:   thebluegr
Date:     2010-06-14 13:53:15 +0000 (Mon, 14 Jun 2010)

Log Message:
-----------
Really silence the warning with _bufSize

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

Modified: scummvm/trunk/engines/sci/engine/segment.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.cpp	2010-06-14 13:41:06 UTC (rev 49651)
+++ scummvm/trunk/engines/sci/engine/segment.cpp	2010-06-14 13:53:15 UTC (rev 49652)
@@ -161,7 +161,7 @@
 		}
 
 		// As mentioned above, the script and the heap together should not exceed 64KB
-		if (_bufSize > 65535)
+		if (script->size + heap->size > 65535)
 			error("Script and heap sizes combined exceed 64K. This means a fundamental "
 					"design bug was made regarding SCI1.1 and newer games.\nPlease "
 					"report this error to the ScummVM team");

Modified: scummvm/trunk/engines/sci/engine/segment.h
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.h	2010-06-14 13:41:06 UTC (rev 49651)
+++ scummvm/trunk/engines/sci/engine/segment.h	2010-06-14 13:53:15 UTC (rev 49652)
@@ -354,7 +354,7 @@
 private:
 	size_t _scriptSize;
 	size_t _heapSize;
-	size_t _bufSize;
+	uint16 _bufSize;
 
 	const uint16 *_exportTable; /**< Abs. offset of the export table or 0 if not present */
 	uint16 _numExports; /**< Number of entries in the exports table */


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