[Scummvm-cvs-logs] scummvm master -> 99b1c736396799260cd715b40a074cf32d104485

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
99b1c73639 SCI: Fix silly typo


Commit: 99b1c736396799260cd715b40a074cf32d104485
    https://github.com/scummvm/scummvm/commit/99b1c736396799260cd715b40a074cf32d104485
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-06-21T12:57:00-07:00

Commit Message:
SCI: Fix silly typo

Thanks to digitall for spotting this

Changed paths:
    engines/sci/engine/kstring.cpp



diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 9eebf2c..c22d7c7 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -126,8 +126,8 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) {
 			value = tmp.getOffset() & 0x00ff;
 			if (argc > 2) { /* Request to modify this char */
 				uint16 tmpOffset = tmp.toUint16();
-				offset &= 0xff00;
-				offset |= newvalue;
+				tmpOffset &= 0xff00;
+				tmpOffset |= newvalue;
 				tmp.setOffset(tmpOffset);
 				tmp.setSegment(0);
 			}
@@ -135,8 +135,8 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) {
 			value = tmp.getOffset() >> 8;
 			if (argc > 2)  { /* Request to modify this char */
 				uint16 tmpOffset = tmp.toUint16();
-				offset &= 0x00ff;
-				offset |= newvalue << 8;
+				tmpOffset &= 0x00ff;
+				tmpOffset |= newvalue << 8;
 				tmp.setOffset(tmpOffset);
 				tmp.setSegment(0);
 			}