diff options
author | Willem Jan Palenstijn | 2012-02-21 11:33:32 -0800 |
---|---|---|
committer | Willem Jan Palenstijn | 2012-02-21 11:33:32 -0800 |
commit | 9ffe3e11d905b5af194dd3265e2fe11545bf5020 (patch) | |
tree | f9fb97d7eb2368d0123aa3bd9d91c560cded3315 /engines/scumm | |
parent | 80b34398174973b6d70673fce94a8a1f670c3f4d (diff) | |
parent | 02ebd552141173775b9462f4414083d3b8d49a80 (diff) | |
download | scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.tar.gz scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.tar.bz2 scummvm-rg350-9ffe3e11d905b5af194dd3265e2fe11545bf5020.zip |
Merge pull request #182 from fingolfin/forbid-ctype
ALL: Avoid using is* macros from ctype.h
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/smush/smush_player.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/string.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 2f4e86bf61..a53b808ba1 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -90,13 +90,13 @@ public: assert(def_end != NULL); char *id_end = def_end; - while (id_end >= def_start && !isdigit(static_cast<unsigned char>(*(id_end-1)))) { + while (id_end >= def_start && !Common::isDigit(*(id_end-1))) { id_end--; } assert(id_end > def_start); char *id_start = id_end; - while (isdigit(static_cast<unsigned char>(*(id_start - 1)))) { + while (Common::isDigit(*(id_start - 1))) { id_start--; } diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 3d254b1ce4..975307d0d0 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -1389,10 +1389,10 @@ void ScummEngine_v7::loadLanguageBundle() { } else if (*ptr == '#') { // Number of subtags following a given basetag. We don't need that // information so we just skip it - } else if (isdigit(static_cast<unsigned char>(*ptr))) { + } else if (Common::isDigit(*ptr)) { int idx = 0; // A number (up to three digits)... - while (isdigit(static_cast<unsigned char>(*ptr))) { + while (Common::isDigit(*ptr)) { idx = idx * 10 + (*ptr - '0'); ptr++; } @@ -1430,12 +1430,12 @@ void ScummEngine_v7::loadLanguageBundle() { for (i = 0; i < _languageIndexSize; i++) { // First 8 chars in the line give the string ID / 'tag' int j; - for (j = 0; j < 8 && !isspace(static_cast<unsigned char>(*ptr)); j++, ptr++) + for (j = 0; j < 8 && !Common::isSpace(*ptr); j++, ptr++) _languageIndex[i].tag[j] = toupper(*ptr); _languageIndex[i].tag[j] = 0; // After that follows a single space which we skip - assert(isspace(static_cast<unsigned char>(*ptr))); + assert(Common::isSpace(*ptr)); ptr++; // Then comes the translated string: we record an offset to that. |