diff options
| author | Max Horn | 2003-05-31 14:27:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-31 14:27:47 +0000 |
| commit | f8e64d7134c80aafe92b1f4aca0a4a2e92c29a71 (patch) | |
| tree | ef0415b18274c9a52865f5aa72be644c7044ea1c /scumm/actor.h | |
| parent | 6762073acd4982708fd00677f676c2d07c5ead3a (diff) | |
| download | scummvm-rg350-f8e64d7134c80aafe92b1f4aca0a4a2e92c29a71.tar.gz scummvm-rg350-f8e64d7134c80aafe92b1f4aca0a4a2e92c29a71.tar.bz2 scummvm-rg350-f8e64d7134c80aafe92b1f4aca0a4a2e92c29a71.zip | |
renamed walk_script/talk_script -> walkScript/talkScript
svn-id: r8178
Diffstat (limited to 'scumm/actor.h')
| -rw-r--r-- | scumm/actor.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |