aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-12 22:08:39 +0000
committerMax Horn2003-05-12 22:08:39 +0000
commit81bfe8cd5116e99f794ddfa105378aa1d9a3f401 (patch)
tree42b793b32def16436bb43ab8981b1a9dce2ffb36 /scumm/script_v6.cpp
parent47227fdf77f52dfb392dfd4fa26c3e76d8f6e523 (diff)
downloadscummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.tar.gz
scummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.tar.bz2
scummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.zip
swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp
svn-id: r7481
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 7b69a6578c..fd44c9617c 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1698,8 +1698,8 @@ void Scumm_v6::o6_actorOps() {
a->shadow_mode = pop();
break;
case 99:
- a->talkPosX = pop();
a->talkPosY = pop();
+ a->talkPosX = pop();
break;
case 198: /* set anim variable */
i = pop(); /* value */