diff options
| author | Max Horn | 2004-03-15 03:09:48 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-15 03:09:48 +0000 |
| commit | ba5aa37dccbb466f70984c8e7c51fbebf757457a (patch) | |
| tree | 3aa3ba50bd863645eafe5e0aa20978f01aff1fe5 /scumm/script_v2.cpp | |
| parent | 759c05f936ab9a0317d28343a799d7c6857c3e27 (diff) | |
| download | scummvm-rg350-ba5aa37dccbb466f70984c8e7c51fbebf757457a.tar.gz scummvm-rg350-ba5aa37dccbb466f70984c8e7c51fbebf757457a.tar.bz2 scummvm-rg350-ba5aa37dccbb466f70984c8e7c51fbebf757457a.zip | |
refactor use of _messagePtr -> instead of using it as an implicit parameter for various methods, pass its value explicitly to those methods. Note: this *should* be just a code transformation, with no change to the program logic - unless I messed up once again <sigh>
svn-id: r13298
Diffstat (limited to 'scumm/script_v2.cpp')
| -rw-r--r-- | scumm/script_v2.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 5eae8ebc77..28a73a0b16 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -428,8 +428,7 @@ void ScummEngine_v2::decodeParseString() { _string[textSlot].color = v1_mm_actor_speech_color[_actorToPrintStrFor]; } - _messagePtr = buffer; - actorTalk(); + actorTalk(buffer); } int ScummEngine_v2::readVar(uint var) { @@ -1055,15 +1054,13 @@ void ScummEngine_v2::o2_drawSentence() { ptr++; } - _messagePtr = (byte*)sentence; - sentenceline.top = virtscr[2].topline; sentenceline.bottom = virtscr[2].topline + 8; sentenceline.left = 0; sentenceline.right = 319; restoreBG(sentenceline); - drawString(2); + drawString(2, (byte*)sentence); } void ScummEngine_v2::o2_ifClassOfIs() { |