diff options
| -rw-r--r-- | engines/scumm/actor.h | 2 | ||||
| -rw-r--r-- | engines/scumm/costume.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/script.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/script_v0.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/scumm_v0.h | 4 | ||||
| -rw-r--r-- | engines/scumm/verbs.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h index d3271f4eaa..4e251d0e3c 100644 --- a/engines/scumm/actor.h +++ b/engines/scumm/actor.h @@ -343,7 +343,7 @@ enum ActorC64MiscFlags { kActorMiscFlag_10 = 0x10, // ??? kActorMiscFlag_20 = 0x20, // ??? kActorMiscFlagFreeze = 0x40, // Stop moving - kActorMiscFlagHide = 0x80, // Kid is invisible (dead or in radiation suit) + kActorMiscFlagHide = 0x80 // Kid is invisible (dead or in radiation suit) }; class ActorC64 : public Actor_v2 { diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp index b2ad4b9b33..489c1f46e7 100644 --- a/engines/scumm/costume.cpp +++ b/engines/scumm/costume.cpp @@ -1179,7 +1179,7 @@ static const byte actorColorsMMC64[25] = { } byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) { - ActorC64* A = (ActorC64*) a; + const ActorC64* A = (const ActorC64 *)a; if (limb >= 8) return 0; diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 63f04c1f32..8880963698 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1200,8 +1200,8 @@ bool ScummEngine_v0::checkPendingWalkAction() { b->faceToObject(actorToObj(actor)); } } else { // walk to object finished - int x, y, dir; - getObjectXYPos(_walkToObject, x, y, dir); + int tmpX, tmpY, dir; + getObjectXYPos(_walkToObject, tmpX, tmpY, dir); a->turnToDirection(dir); } _walkToObjectState = kWalkToObjectStateTurn; diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index faac991193..8de95858f2 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -464,7 +464,7 @@ void ScummEngine_v0::drawSentenceLine() { if (_activeVerb == kVerbNewKid) { _sentenceBuf = ""; for (int i = 0; i < 3; ++i) { - char *actorName; + const char *actorName; int actorId = VAR(97 + i); if (actorId == 0) { // after usage of the radiation suit, kid vars are set to 0 diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h index a5af34b1ff..a64f108243 100644 --- a/engines/scumm/scumm_v0.h +++ b/engines/scumm/scumm_v0.h @@ -36,13 +36,13 @@ protected: kModeCutscene = 0, // cutscene active kModeKeypad = 1, // kid selection / dial pad / save-load dialog kModeNoNewKid = 2, // verb "new kid" disabled (e.g. when entering lab) - kModeNormal = 3, // normal playing mode + kModeNormal = 3 // normal playing mode }; enum WalkToObjectState { kWalkToObjectStateDone = 0, kWalkToObjectStateWalk = 1, - kWalkToObjectStateTurn = 2, + kWalkToObjectStateTurn = 2 }; protected: diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h index fce260ea63..0aa008b4de 100644 --- a/engines/scumm/verbs.h +++ b/engines/scumm/verbs.h @@ -82,7 +82,7 @@ enum VerbPrepsV0 { kVerbPrepWith = 2, kVerbPrepOn = 3, kVerbPrepTo = 4, - kVerbPrepObject = 0xFF, // prep depends on object (USE) + kVerbPrepObject = 0xFF // prep depends on object (USE) }; } // End of namespace Scumm |