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

[thebluegr at users.sourceforge.net]

Revision: 40804
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40804&view=rev
Author:   thebluegr
Date:     2009-05-23 10:22:27 +0000 (Sat, 23 May 2009)

Log Message:
-----------
Turned some errors into warnings, as they occur in KQ5CD

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

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-05-23 10:07:01 UTC (rev 40803)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-05-23 10:22:27 UTC (rev 40804)
@@ -200,7 +200,8 @@
 		byte *ref = kernel_dereference_bulk_pointer(s, argv[1], 2);
 
 		if (!ref) {
-			error("Attempt to poke invalid memory at %04x:%04x!\n", PRINT_REG(argv[1]));
+			// This occurs in KQ5CD when interacting with certain objects
+			warning("Attempt to poke invalid memory at %04x:%04x!\n", PRINT_REG(argv[1]));
 			return s->r_acc;
 		}
 		if (s->seg_manager->_heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS)
@@ -213,7 +214,8 @@
 		byte *ref = kernel_dereference_bulk_pointer(s, argv[1], 2);
 
 		if (!ref) {
-			error("Attempt to poke invalid memory at %04x:%04x!\n", PRINT_REG(argv[1]));
+			// This occurs in KQ5CD when interacting with certain objects
+			warning("Attempt to poke invalid memory at %04x:%04x!\n", PRINT_REG(argv[1]));
 			return s->r_acc;
 		}
 

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-05-23 10:07:01 UTC (rev 40803)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-05-23 10:22:27 UTC (rev 40804)
@@ -982,13 +982,15 @@
 	if (pointer.offset < SYS_STRINGS_MAX && strings[pointer.offset].name)
 		return (byte *)(strings[pointer.offset].value);
 
-	error("Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
+	// This occurs in KQ5CD when interacting with certain objects
+	warning("Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
 	return NULL;
 }
 
 byte *SegManager::dereference(reg_t pointer, int *size) {
 	if (!pointer.segment || (pointer.segment >= _heap.size()) || !_heap[pointer.segment]) {
-		error("Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
+		// This occurs in KQ5CD when interacting with certain objects
+		warning("Attempt to dereference invalid pointer %04x:%04x", PRINT_REG(pointer));
 		return NULL; /* Invalid */
 	}
 


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