aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_tim.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-09 06:00:35 +0100
committerJohannes Schickel2013-01-09 06:01:28 +0100
commit8d5b4b75d406bb56130fb4ccd91edda4ba1f4906 (patch)
treef6f481c09553c1f454c31bbb88490de26e326069 /engines/kyra/script_tim.cpp
parentff296175bc558ce5758a0948ab91333a6d3b918e (diff)
downloadscummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.tar.gz
scummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.tar.bz2
scummvm-rg350-8d5b4b75d406bb56130fb4ccd91edda4ba1f4906.zip
KYRA: Make all hex constants use uppercase letters.
Done with: git ls-files "*.cpp" *".h" | xargs sed -i -e 's/0x\([0-9a-f]*\)/0x\U\1/g'
Diffstat (limited to 'engines/kyra/script_tim.cpp')
-rw-r--r--engines/kyra/script_tim.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index c358091223..82ec3dc658 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -393,14 +393,14 @@ void TIMInterpreter::displayText(uint16 textId, int16 flags, uint8 color) {
int y = 0;
if (_vm->gameFlags().use16ColorMode) {
- if (color == 0xda)
- color = 0xa1;
- else if (color == 0xf2)
- color = 0xe1;
+ if (color == 0xDA)
+ color = 0xA1;
+ else if (color == 0xF2)
+ color = 0xE1;
else if (flags < 0)
- color = 0xe1;
+ color = 0xE1;
else
- color = 0xc1;
+ color = 0xC1;
}
while (str[0]) {
@@ -1083,7 +1083,7 @@ int TIMInterpreter_LoL::cmd_dialogueBox(const uint16 *param) {
int cnt = 0;
for (int i = 1; i < 4; i++) {
- if (param[i] != 0xffff) {
+ if (param[i] != 0xFFFF) {
tmpStr[i-1] = getTableString(param[i]);
cnt++;
} else {