[Scummvm-cvs-logs] SF.net SVN: scummvm:[41570] scummvm/trunk/engines/gob/parse.cpp

[drmccoy at users.sourceforge.net]

Revision: 41570
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41570&view=rev
Author:   drmccoy
Date:     2009-06-15 23:09:57 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Using cmpHelper for OP_NEQ too, since the original does a normal strcmp there as well. No idea where the stricmp came from

Modified Paths:
--------------
    scummvm/trunk/engines/gob/parse.cpp

Modified: scummvm/trunk/engines/gob/parse.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse.cpp	2009-06-15 23:09:37 UTC (rev 41569)
+++ scummvm/trunk/engines/gob/parse.cpp	2009-06-15 23:09:57 UTC (rev 41570)
@@ -1036,26 +1036,12 @@
 					valPtr -= 2;
 					break;
 
-				case OP_NEQ: {
-					int cmpTemp = 0;
-
-					if (operPtr[-3] == OP_LOAD_IMM_INT16) {
-						cmpTemp = valPtr[-3] - valPtr[-1];
-					} else if (operPtr[-3] == OP_LOAD_IMM_STR) {
-						if ((char *) decodePtr(valPtr[-3]) != _vm->_global->_inter_resStr) {
-							strcpy(_vm->_global->_inter_resStr, (char *) decodePtr(valPtr[-3]));
-							valPtr[-3] = encodePtr((byte *) _vm->_global->_inter_resStr, kResStr);
-						}
-						// FIXME: Why scumm_stricmp here and strcmp everywhere else?
-						cmpTemp = scumm_stricmp(_vm->_global->_inter_resStr, (char *) decodePtr(valPtr[-1]));
-					}
-					operPtr[-3] = (cmpTemp != 0) ? GOB_TRUE : GOB_FALSE;
-					//operPtr[-3] = (cmpHelper(operPtr, valPtr) != 0) ? GOB_TRUE : GOB_FALSE;
+				case OP_NEQ:
+					operPtr[-3] = (cmpHelper(operPtr, valPtr) != 0) ? GOB_TRUE : GOB_FALSE;
 					stkPos -= 2;
 					operPtr -= 2;
 					valPtr -= 2;
 					break;
-					}
 
 				default:
 					escape = true;


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