aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v0.cpp
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-07 20:25:01 +0100
committerTobias Gunkel2012-02-11 08:28:21 +0100
commitd8b435917d5cc00ad2b4817c5eabc828439e36f3 (patch)
treee2e37faa58b4b235e9a378a53514072c9b896ffc /engines/scumm/script_v0.cpp
parent706b8cf1c531e15b980a64060a1080e17e854d98 (diff)
downloadscummvm-rg350-d8b435917d5cc00ad2b4817c5eabc828439e36f3.tar.gz
scummvm-rg350-d8b435917d5cc00ad2b4817c5eabc828439e36f3.tar.bz2
scummvm-rg350-d8b435917d5cc00ad2b4817c5eabc828439e36f3.zip
SCUMM: mm c64 cleanup
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r--engines/scumm/script_v0.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 31363ed140..9b39391246 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -406,9 +406,9 @@ void ScummEngine_v0::decodeParseString() {
actorTalk(buffer);
}
-void ScummEngine_v0::drawSentenceObject(int object, int type) {
+void ScummEngine_v0::drawSentenceObject(int object) {
const byte *temp;
- temp = getObjOrActorName(OBJECT_V0(object, type));
+ temp = getObjOrActorName(object);
if (temp) {
_sentenceBuf += " ";
_sentenceBuf += (const char *)temp;
@@ -432,7 +432,7 @@ void ScummEngine_v0::drawSentence() {
if (_activeObjectNr) {
// Draw the 1st active object
- drawSentenceObject(_activeObjectNr, _activeObjectType);
+ drawSentenceObject(OBJECT_V0(_activeObjectNr, _activeObjectType));
// Append verb preposition
int sentencePrep = activeVerbPrep();
@@ -448,7 +448,7 @@ void ScummEngine_v0::drawSentence() {
_sentenceBuf += (const char *)a->getActorName();
// 2nd Object is an inventory or room object
} else {
- drawSentenceObject(_activeObject2Nr, _activeObject2Type);
+ drawSentenceObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type));
}
}
}