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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Jul 19 12:19:14 CEST 2010


Revision: 51023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51023&view=rev
Author:   m_kiewitz
Date:     2010-07-19 10:19:13 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
SCI: fix ult to work for pq2 japanese

pq2 japanese compares pointers to 2000 to find out if its a resourceid or a pointer

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-19 10:00:20 UTC (rev 51022)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-19 10:19:13 UTC (rev 51023)
@@ -1444,7 +1444,8 @@
 			r_temp = POP32();
 
 			// See above
-			if (r_temp.segment && (s->r_acc == make_reg(0, 1000)))
+			// PQ2 japanese compares pointers to 2000 to find out if its a pointer or a resourceid
+			if (r_temp.segment && (s->r_acc == make_reg(0, 1000) || (s->r_acc == make_reg(0, 2000))))
 				s->r_acc = NULL_REG;
 			else if (r_temp.segment && s->r_acc.segment)
 				s->r_acc = make_reg(0, (r_temp.segment == s->r_acc.segment) && r_temp.offset < s->r_acc.offset);


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




More information about the Scummvm-git-logs mailing list