diff options
author | Max Horn | 2003-05-21 18:09:49 +0000 |
---|---|---|
committer | Max Horn | 2003-05-21 18:09:49 +0000 |
commit | 86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8 (patch) | |
tree | aa7c2126baa9dd2ca7dd80910f5835b6aa861294 /scumm/script_v6.cpp | |
parent | 11d29b71ab4400e6e732ba7cd49a343150360eaf (diff) | |
download | scummvm-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_v6.cpp')
-rw-r--r-- | scumm/script_v6.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 6f68df086a..8ac3b69b5a 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1761,7 +1761,7 @@ void Scumm_v6::o6_actorOps() { void Scumm_v6::o6_verbOps() { int slot, a, b; VerbSlot *vs; - byte *ptr, op; + byte op; // Full Throttle implements conversation by creating new verbs, one // for each option, but it never tells when to actually draw them. @@ -1853,11 +1853,10 @@ void Scumm_v6::o6_verbOps() { case 137: a = pop(); if (a == 0) { - ptr = (byte *)""; + loadPtrToResource(rtVerb, slot, (const byte *)""); } else { - ptr = getStringAddress(a); + loadPtrToResource(rtVerb, slot, getStringAddress(a)); } - loadPtrToResource(rtVerb, slot, ptr); vs->type = kTextVerbType; vs->imgindex = 0; break; |