aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-21 18:09:49 +0000
committerMax Horn2003-05-21 18:09:49 +0000
commit86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8 (patch)
treeaa7c2126baa9dd2ca7dd80910f5835b6aa861294 /scumm/actor.cpp
parent11d29b71ab4400e6e732ba7cd49a343150360eaf (diff)
downloadscummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.gz
scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.bz2
scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.zip
many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index a99817ff99..2daa42f3c1 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1138,7 +1138,7 @@ void Scumm::stopTalk() {
}
void Scumm::clearMsgQueue() {
- _messagePtr = (byte *)" ";
+ _messagePtr = (const byte *)" ";
stopTalk();
}
@@ -1425,8 +1425,9 @@ void Actor::walkActorOld() {
byte *Actor::getActorName() {
byte *ptr = _vm->getResourceAddress(rtActorName, number);
- if (ptr == NULL)
- return (byte *)" ";
+ if (ptr == NULL) {
+ warning("Failed to find name of actor %d\n", number);
+ }
return ptr;
}