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

[kirben at users.sourceforge.net]

Revision: 22049
Author:   kirben
Date:     2006-04-19 22:54:25 -0700 (Wed, 19 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22049&view=rev

Log Message:
-----------
Update resource managment, missed several changes from FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-20 02:42:54 UTC (rev 22048)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-20 05:54:25 UTC (rev 22049)
@@ -2175,15 +2175,15 @@
 
 	vpe = &_vgaBufferPointers[_noOverWrite];
 
-	if (_vgaBufFreeStart <= vpe->vgaFile1 && end >= vpe->vgaFile1End) {
+	if (vpe->vgaFile1 < end && vpe->vgaFile1End > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->vgaFile1End;
-	} else if (_vgaBufFreeStart <= vpe->vgaFile2 && end >= vpe->vgaFile2End) {
+	} else if (vpe->vgaFile2 < end && vpe->vgaFile2End > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->vgaFile2End;
-	} else if (_vgaBufFreeStart <= vpe->sfxFile && end >= vpe->sfxFileEnd) {
+	} else if (vpe->sfxFile && vpe->sfxFile < end && vpe->sfxFileEnd > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->sfxFileEnd;
@@ -2210,9 +2210,9 @@
 	uint count = ARRAYSIZE(_vgaBufferPointers);
 	VgaPointersEntry *vpe = _vgaBufferPointers;
 	do {
-		if (_vgaBufFreeStart <= vpe->vgaFile1 && end >= vpe->vgaFile1End ||
-				_vgaBufFreeStart <= vpe->vgaFile2 && end >= vpe->vgaFile2End ||
-				_vgaBufFreeStart <= vpe->sfxFile && end >= vpe->sfxFileEnd) {
+		if (vpe->vgaFile1 < end && vpe->vgaFile1End > _vgaBufFreeStart ||
+				vpe->vgaFile2 < end && vpe->vgaFile2End > _vgaBufFreeStart ||
+				vpe->sfxFile < end && vpe->sfxFileEnd > _vgaBufFreeStart) {
 			vpe->vgaFile1 = NULL;
 			vpe->vgaFile1End = NULL;
 			vpe->vgaFile2 = NULL;
@@ -2229,15 +2229,15 @@
 
 	vpe = &_vgaBufferPointers[a];
 
-	if (_vgaBufFreeStart <= vpe->vgaFile1 && end >= vpe->vgaFile1End) {
+	if (vpe->vgaFile1 < end && vpe->vgaFile1End > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->vgaFile1End;
-	} else if (_vgaBufFreeStart <= vpe->vgaFile2 && end >= vpe->vgaFile2End) {
+	} else if (vpe->vgaFile2 < end && vpe->vgaFile2End > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->vgaFile2End;
-	} else if (_vgaBufFreeStart <= vpe->sfxFile && end >= vpe->sfxFileEnd) {
+	} else if (vpe->sfxFile && vpe->sfxFile < end && vpe->sfxFileEnd > _vgaBufFreeStart) {
 		_rejectBlock = true;
 		_rejectCount++;
 		_vgaBufFreeStart = vpe->sfxFileEnd;


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