aboutsummaryrefslogtreecommitdiff
path: root/engines/sky
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2012-02-21 11:33:32 -0800
committerWillem Jan Palenstijn2012-02-21 11:33:32 -0800
commit9ffe3e11d905b5af194dd3265e2fe11545bf5020 (patch)
treef9fb97d7eb2368d0123aa3bd9d91c560cded3315 /engines/sky
parent80b34398174973b6d70673fce94a8a1f670c3f4d (diff)
parent02ebd552141173775b9462f4414083d3b8d49a80 (diff)
downloadscummvm-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/sky')
-rw-r--r--engines/sky/control.cpp2
-rw-r--r--engines/sky/detection.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 83dab4ee77..c1ed763281 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -974,7 +974,7 @@ void Control::handleKeyPress(Common::KeyState kbd, Common::String &textBuf) {
// Allow the key only if is a letter, a digit, or one of a selected
// list of extra characters
- if (isalnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
+ if (Common::isAlnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
textBuf += kbd.ascii;
}
}
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index a078200edd..2b702e99ea 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -206,7 +206,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
// Extract the extension
Common::String ext = file->c_str() + file->size() - 3;
ext.toUppercase();
- if (isdigit(static_cast<unsigned char>(ext[0])) && isdigit(static_cast<unsigned char>(ext[1])) && isdigit(static_cast<unsigned char>(ext[2]))){
+ if (Common::isDigit(ext[0]) && Common::isDigit(ext[1]) && Common::isDigit(ext[2])) {
int slotNum = atoi(ext.c_str());
Common::InSaveFile *in = saveFileMan->openForLoading(*file);
if (in) {