diff options
| author | Ludvig Strigeus | 2001-10-11 13:36:25 +0000 |
|---|---|---|
| committer | Ludvig Strigeus | 2001-10-11 13:36:25 +0000 |
| commit | 06c64c0d759bf93070609d4e0935c75b9f567afb (patch) | |
| tree | 4961fee9203dba845af43871eef9411fd0c11ef6 /script.cpp | |
| parent | 4fc593009b31df881c54ec5256921b9d0c52bb17 (diff) | |
| download | scummvm-rg350-06c64c0d759bf93070609d4e0935c75b9f567afb.tar.gz scummvm-rg350-06c64c0d759bf93070609d4e0935c75b9f567afb.tar.bz2 scummvm-rg350-06c64c0d759bf93070609d4e0935c75b9f567afb.zip | |
fixed swapped parameters in o_walkActorToActor
svn-id: r3427
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/script.cpp b/script.cpp index df92f2f0d9..698b09c8bf 100644 --- a/script.cpp +++ b/script.cpp @@ -17,8 +17,12 @@ * * Change Log: * $Log$ - * Revision 1.1 2001/10/09 14:30:13 strigeus - * Initial revision + * Revision 1.2 2001/10/11 13:36:25 strigeus + * fixed swapped parameters in o_walkActorToActor + * + * Revision 1.1.1.1 2001/10/09 14:30:13 strigeus + * + * initial revision * * */ @@ -26,6 +30,8 @@ #include "stdafx.h" #include "scumm.h" +#define NO_SOUND_HACK + void Scumm::runScript(int script, int a, int b, int16 *lvarptr) { byte *scriptPtr; uint32 scriptOffs; @@ -33,6 +39,11 @@ void Scumm::runScript(int script, int a, int b, int16 *lvarptr) { int slot,i; ScriptSlot *s; +#ifdef NO_SOUND_HACK + if (script==212 && _currentRoom==50) + return; +#endif + if (script==0) return; @@ -2462,8 +2473,8 @@ void Scumm::o_walkActorToActor() { b = a2->scalex * a->width / 0xFF; b = b + b/2; } - y = a2->x; - x = a2->y; + x = a2->x; + y = a2->y; if (x < a->x) x += b; else |