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

[thebluegr at users.sourceforge.net]

Revision: 40938
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40938&view=rev
Author:   thebluegr
Date:     2009-05-27 12:46:11 +0000 (Wed, 27 May 2009)

Log Message:
-----------
Fixed a typo, and added parentheses to clarify order

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

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2009-05-27 09:52:32 UTC (rev 40937)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2009-05-27 12:46:11 UTC (rev 40938)
@@ -438,7 +438,7 @@
 	s->bp_list = NULL; // No breakpoints defined
 	s->have_bp = 0;
 
-	if (s->flags & GF_SCI1_LOFSABSOLUTE && s->version < SCI_VERSION_1_1)
+	if ((s->flags & GF_SCI1_LOFSABSOLUTE) && s->version < SCI_VERSION_1_1)
 		s->seg_manager->setExportWidth(1);
 	else
 		s->seg_manager->setExportWidth(0);

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-05-27 09:52:32 UTC (rev 40937)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-05-27 12:46:11 UTC (rev 40938)
@@ -201,7 +201,7 @@
 
 		if (!ref) {
 			// This occurs in KQ5CD when interacting with certain objects
-			warning("Attempt to poke invalid memory at %04x:%04x", PRINT_REG(argv[1]));
+			warning("Attempt to peek invalid memory at %04x:%04x", PRINT_REG(argv[1]));
 			return s->r_acc;
 		}
 		if (s->seg_manager->_heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS)
@@ -214,7 +214,6 @@
 		byte *ref = kernel_dereference_bulk_pointer(s, argv[1], 2);
 
 		if (!ref) {
-			// This occurs in KQ5CD when interacting with certain objects
 			warning("Attempt to poke invalid memory at %04x:%04x", PRINT_REG(argv[1]));
 			return s->r_acc;
 		}


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