aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v8.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/script_v8.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/script_v8.cpp')
-rw-r--r--scumm/script_v8.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 7ef345029c..e43c15e207 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1291,7 +1291,7 @@ void Scumm_v8::o8_verbOps() {
case 0xA4: // SO_VERB_NAME_STR Set verb name
a = pop();
if (a == 0) {
- loadPtrToResource(rtVerb, _curVerbSlot, (byte *)"");
+ loadPtrToResource(rtVerb, _curVerbSlot, (const byte *)"");
} else {
loadPtrToResource(rtVerb, _curVerbSlot, getStringAddress(a));
}
@@ -1343,10 +1343,10 @@ void Scumm_v8::o8_system() {
void Scumm_v8::o8_startVideo() {
int len = resStrLen(_scriptPointer);
- warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer);
+ warning("o8_startVideo(%s/%s)", getGameDataPath(), (const char*)_scriptPointer);
SmushPlayer *sp = new SmushPlayer(this, 83333, !_noSubtitles);
- sp->play((char*)_scriptPointer, getGameDataPath());
+ sp->play((const char*)_scriptPointer, getGameDataPath());
delete sp;
_scriptPointer += len + 1;