diff options
| author | Travis Howell | 2009-03-08 22:54:00 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-03-08 22:54:00 +0000 |
| commit | 2abfb968a601031e211e01d742f7d78f9b5e8134 (patch) | |
| tree | 3cd3601ccad0aa7d791b3a72046b4e7149443f6b | |
| parent | b2ec4050119d8a2cbfef8a7cdcb7c96051a4b63e (diff) | |
| download | scummvm-rg350-2abfb968a601031e211e01d742f7d78f9b5e8134.tar.gz scummvm-rg350-2abfb968a601031e211e01d742f7d78f9b5e8134.tar.bz2 scummvm-rg350-2abfb968a601031e211e01d742f7d78f9b5e8134.zip | |
Replace samewrd() function, with scumm_strnicmp.
svn-id: r39248
| -rw-r--r-- | engines/agos/agos.h | 1 | ||||
| -rw-r--r-- | engines/agos/script_pn.cpp | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 5c66a9f747..4f098ae9f2 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -1455,7 +1455,6 @@ public: 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); diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index d508d10c7a..8bf7d83ad4 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -984,21 +984,6 @@ int AGOSEngine_PN::gvwrd(uint8 *wptr, int mask) { // 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 @@ int AGOSEngine_PN::wrdmatch(uint8 *word1, int mask1, uint8 *word2, int mask2) { 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; } |