aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kstring.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2012-06-21 22:24:22 +0300
committerFilippos Karapetis2012-06-21 22:24:22 +0300
commit76f3f1b13621b43781c4a2c505e646d9d52fdab7 (patch)
tree0a449a12fbc95169d3afc05ec681c539719bdf6f /engines/sci/engine/kstring.cpp
parent105fb47c89e727e9dccd2798afcab7ce290d43fa (diff)
downloadscummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.gz
scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.tar.bz2
scummvm-rg350-76f3f1b13621b43781c4a2c505e646d9d52fdab7.zip
SCI: Fix warnings
Diffstat (limited to 'engines/sci/engine/kstring.cpp')
-rw-r--r--engines/sci/engine/kstring.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 8d627efacf..9eebf2c88a 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -96,7 +96,7 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) {
byte value;
byte newvalue = 0;
- unsigned int offset = argv[1].toUint16();
+ uint16 offset = argv[1].toUint16();
if (argc > 2)
newvalue = argv[2].toSint16();
@@ -125,19 +125,19 @@ reg_t kStrAt(EngineState *s, int argc, reg_t *argv) {
if (!oddOffset) {
value = tmp.getOffset() & 0x00ff;
if (argc > 2) { /* Request to modify this char */
- uint16 offset = tmp.toUint16();
+ uint16 tmpOffset = tmp.toUint16();
offset &= 0xff00;
offset |= newvalue;
- tmp.setOffset(offset);
+ tmp.setOffset(tmpOffset);
tmp.setSegment(0);
}
} else {
value = tmp.getOffset() >> 8;
if (argc > 2) { /* Request to modify this char */
- uint16 offset = tmp.toUint16();
+ uint16 tmpOffset = tmp.toUint16();
offset &= 0x00ff;
offset |= newvalue << 8;
- tmp.setOffset(offset);
+ tmp.setOffset(tmpOffset);
tmp.setSegment(0);
}
}