[Scummvm-cvs-logs] SF.net SVN: scummvm: [21776] scummvm/trunk/engines/simon/simon.cpp

[kirben at users.sourceforge.net]

Revision: 21776
Author:   kirben
Date:     2006-04-10 17:42:19 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21776&view=rev

Log Message:
-----------
Ooops, re-enable code in allocBlock()

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-11 00:37:54 UTC (rev 21775)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-11 00:42:19 UTC (rev 21776)
@@ -2150,20 +2150,20 @@
 
 		blockEnd = block + size;
 
-		//if (blockEnd >= _vgaBufEnd) {
-		//	_vgaBufFreeStart = _vgaBufStart;
-		//} else {
-		//	_rejectBlock = false;
-		//	checkNoOverWrite(blockEnd);
-		//	if (_rejectBlock)
-		//		continue;
-		//	checkRunningAnims(blockEnd);
-		//	if (_rejectBlock)
-		//		continue;
-		//	checkZonePtrs(blockEnd);
+		if (blockEnd >= _vgaBufEnd) {
+			_vgaBufFreeStart = _vgaBufStart;
+		} else {
+			_rejectBlock = false;
+			checkNoOverWrite(blockEnd);
+			if (_rejectBlock)
+				continue;
+			checkRunningAnims(blockEnd);
+			if (_rejectBlock)
+				continue;
+			checkZonePtrs(blockEnd);
 			_vgaBufFreeStart = blockEnd;
 			return block;
-		//}
+		}
 	}
 }
 


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