[Scummvm-cvs-logs] SF.net SVN: scummvm:[39248] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 39248
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39248&view=rev
Author:   Kirben
Date:     2009-03-08 22:54:00 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
Replace samewrd() function, with scumm_strnicmp.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/script_pn.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2009-03-08 22:51:19 UTC (rev 39247)
+++ scummvm/trunk/engines/agos/agos.h	2009-03-08 22:54:00 UTC (rev 39248)
@@ -1455,7 +1455,6 @@
 	int findentry();
 	int findset();
 	int gvwrd(uint8 *wptr, int mask);
-	int samewrd(uint8 *w1, uint8 *w2, int ln);
 	int wrdmatch(uint8 *word1, int mask1, uint8 *word2, int mask2);
 
 	bool testContainer(uint16 a);

Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp	2009-03-08 22:51:19 UTC (rev 39247)
+++ scummvm/trunk/engines/agos/script_pn.cpp	2009-03-08 22:54:00 UTC (rev 39248)
@@ -984,21 +984,6 @@
 
 
 // FIXME/TODO: Isn't this just scumm_strnicmp ?
-int AGOSEngine_PN::samewrd(uint8 *w1, uint8 *w2, int ln) {
-	int ct = 0;
-
-	while (ct < ln) {
-		if (toupper(*w1) > toupper(*w2))
-			return 1;
-		if (toupper(*w1) < toupper(*w2))
-			return -1;
-		ct++;
-		w1++;
-		w2++;
-	}
-	return 0;
-}
-
 int AGOSEngine_PN::setposition(int process, int line) {
 	uint8 *ourptr;
 	int np;
@@ -1034,7 +1019,7 @@
 
 	sv = *word1;
 	*word1 &= 127;
-	if (samewrd(word1, word2, _dataBase[57])) {
+	if (scumm_strnicmp((const char *)word1, (const char *)word2, _dataBase[57])) {
 		*word1 = sv;
 		return 0;
 	}


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