From 658080deeda79d20ea40643569fbcb072573e7cf Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 28 Jan 2012 01:15:49 +0100 Subject: ALL: Avoid using is* macros from ctype.h On some systems, passing signed chars to macros like isspace() etc. lead to a runtime error. Hence, mark these macros as forbidden by default, and introduce otherwise equivalent alternatives for them. --- engines/queen/talk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/queen') diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index f38c78c825..72cb40bd7a 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -657,7 +657,7 @@ void Talk::stringAnimation(const SpeechParameters *parameters, int startFrame, i } else if (parameters->animation[0] == 'E') { // Talking head animation return; - } else if (!isdigit(static_cast(parameters->animation[0]))) { + } else if (!isDigit(parameters->animation[0])) { debug(6, "Error in speak string animation: '%s'", parameters->animation); return; } else -- cgit v1.2.3 From 4f8665fc836898ebf54fc73b1061125b748183bc Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 20 Feb 2012 16:03:39 +0100 Subject: COMMON: Move isFoo functions to namespace Common, add doxygen comments --- engines/queen/talk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/queen') diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 72cb40bd7a..94bc105bb0 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -657,7 +657,7 @@ void Talk::stringAnimation(const SpeechParameters *parameters, int startFrame, i } else if (parameters->animation[0] == 'E') { // Talking head animation return; - } else if (!isDigit(parameters->animation[0])) { + } else if (!Common::isDigit(parameters->animation[0])) { debug(6, "Error in speak string animation: '%s'", parameters->animation); return; } else -- cgit v1.2.3