diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/actor.cpp | 14 | ||||
-rw-r--r-- | scumm/actor.h | 4 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 6 | ||||
-rw-r--r-- | scumm/script_v8.cpp | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 74578c979b..5f8507465b 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -93,14 +93,14 @@ void Actor::initActor(int mode) { talkStopFrame = 5; } - walk_script = 0; - talk_script = 0; + walkScript = 0; + talkScript = 0; _vm->_classData[number] = (_vm->_features & GF_AFTER_V7) ? _vm->_classData[0] : 0; } void Actor::stopActorMoving() { - _vm->stopScript(walk_script); + _vm->stopScript(walkScript); moving = 0; } @@ -1205,12 +1205,12 @@ void Actor::startWalkAnim(int cmd, int angle) { * work as usual */ #if 1 - if (walk_script != 0) { + if (walkScript != 0) { int args[16]; args[0] = number; args[1] = cmd; args[2] = angle; - _vm->runScript(walk_script, 1, 0, args); + _vm->runScript(walkScript, 1, 0, args); } else #endif { @@ -1564,8 +1564,8 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { MKLINE(Actor, layer, sleByte, VER_V8), - MKLINE(Actor, talk_script, sleUint16, VER_V8), - MKLINE(Actor, walk_script, sleUint16, VER_V8), + MKLINE(Actor, talkScript, sleUint16, VER_V8), + MKLINE(Actor, walkScript, sleUint16, VER_V8), MKLINE(Actor, walkdata.destx, sleInt16, VER_V8), MKLINE(Actor, walkdata.desty, sleInt16, VER_V8), diff --git a/scumm/actor.h b/scumm/actor.h index dff77df71a..1c47484f18 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -101,7 +101,7 @@ public: byte walkbox; byte animProgress, animSpeed; int16 talkPosX, talkPosY; - uint16 talk_script, walk_script; + uint16 talkScript, walkScript; bool ignoreTurns; // TODO - we do not honor this flag at all currently! int8 layer; uint16 sound[8]; @@ -131,7 +131,7 @@ public: memset(animVariable, 0, sizeof(animVariable)); memset(palette, 0, sizeof(palette)); - walk_script = 0; + walkScript = 0; initActor(1); } diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index a0dfe10d10..ce7056ceb8 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1740,7 +1740,7 @@ void Scumm_v6::o6_actorOps() { a->layer = pop(); break; case 228: /* walk script */ - a->walk_script = pop(); + a->walkScript = pop(); break; case 229: /* stand */ a->stopActorMoving(); @@ -1759,8 +1759,8 @@ void Scumm_v6::o6_actorOps() { case 234: /* unfreeze actor */ a->moving &= ~MF_FROZEN; break; - case 235: /* talk_script */ - a->talk_script = pop(); + case 235: /* talkScript */ + a->talkScript = pop(); break; default: error("o6_actorOps: default case %d", b); diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index fda688c9ed..7ffea222bd 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1151,10 +1151,10 @@ void Scumm_v8::o8_actorOps() { a->turnToDirection(pop()); break; case 0x83: // SO_ACTOR_WALK_SCRIPT Set walk script for actor? - a->walk_script = pop(); + a->walkScript = pop(); break; case 0x84: // SO_ACTOR_TALK_SCRIPT Set talk script for actor? - a->talk_script = pop(); + a->talkScript = pop(); break; case 0x85: // SO_ACTOR_WALK_PAUSE a->moving |= MF_FROZEN; |