diff options
| author | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
| commit | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (patch) | |
| tree | e568d96f6d7f64c5e58b4c7cd1c4fda7e649bfc7 /engines/cruise/script.cpp | |
| parent | d7411acc2b1c7702280dbff1c3e1bafee528184b (diff) | |
| parent | e25e85fbb047fef895ede97c3c2c73451631052c (diff) | |
| download | scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.gz scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.bz2 scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/cruise/script.cpp')
| -rw-r--r-- | engines/cruise/script.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index 4e76194a45..cf28548e7d 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -231,9 +231,7 @@ int32 opcodeType2() { int type = getByteFromScript(); int overlay = getByteFromScript(); - int firstOffset; - int offset; - firstOffset = offset = getShortFromScript(); + int offset = getShortFromScript(); offset += index; int typ7 = type & 7; |