aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v0.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-25 01:39:44 +0000
committerJohannes Schickel2010-01-25 01:39:44 +0000
commitaed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch)
tree95f119e687a666f65aad5041910c43bdfd4f2929 /engines/scumm/script_v0.cpp
parentec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff)
downloadscummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz
scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2
scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r--engines/scumm/script_v0.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index d0339f478a..d21b26beb3 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -411,7 +411,7 @@ void ScummEngine_v0::decodeParseString() {
void ScummEngine_v0::drawSentenceWord(int object, bool usePrep, bool objInInventory) {
const byte *temp;
int sentencePrep = 0;
-
+
// If object not in inventory, we except an index
if (!objInInventory)
_v0ObjectIndex = true;
@@ -497,7 +497,7 @@ void ScummEngine_v0::drawSentence() {
else
inventoryFirst = true;
}
-
+
// Draw the inventory?
if (_activeInventory > 0 && _activeObject2 == 0) {
@@ -511,8 +511,8 @@ void ScummEngine_v0::drawSentence() {
} else // Room based
drawSentenceWord(_activeObjectIndex, inventoryFirst, false);
}
-
- // Draw the 2nd active object
+
+ // Draw the 2nd active object
} else if (_activeObject2) {
// 2nd Object is in inventory
@@ -527,7 +527,7 @@ void ScummEngine_v0::drawSentence() {
// Draw the active actor
if (_activeActor) {
Actor *a = derefActor(_activeActor, "");
-
+
strcat(_sentenceBuf, " ");
strcat(_sentenceBuf, (const char*)a->getActorName());
}
@@ -780,7 +780,7 @@ void ScummEngine_v0::o_pickupObject() {
if (whereIsObjectInventory(_activeObject2) == WIO_INVENTORY) /* Don't take an */
return; /* object twice */
-
+
addObjectToInventory(obj, _roomResource);
markObjectRectAsDirty(obj);
putOwner(obj, VAR(VAR_EGO));
@@ -803,7 +803,7 @@ void ScummEngine_v0::o_setActorBitVar() {
byte act = getVarOrDirectByte(PARAM_1);
byte mask = getVarOrDirectByte(PARAM_2);
byte mod = getVarOrDirectByte(PARAM_3);
-
+
// 0x63ED
if (act >= _numActors)
return;