summaryrefslogtreecommitdiff
path: root/textscreen/txt_main.c
diff options
context:
space:
mode:
authorRussell Rice2006-09-21 11:13:28 +0000
committerRussell Rice2006-09-21 11:13:28 +0000
commit6339c4cbeb608b008eafe0b1e358285ae08ef902 (patch)
tree10ea17c49b4d38a8b5ec769ccee965d30ab1a08c /textscreen/txt_main.c
parent16c1bc056105cee72e86b3dda1cc323f1be2c7b2 (diff)
downloadchocolate-doom-6339c4cbeb608b008eafe0b1e358285ae08ef902.tar.gz
chocolate-doom-6339c4cbeb608b008eafe0b1e358285ae08ef902.tar.bz2
chocolate-doom-6339c4cbeb608b008eafe0b1e358285ae08ef902.zip
Fix a lot of warnings (for fussy compilers) and one always-true check
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 641
Diffstat (limited to 'textscreen/txt_main.c')
-rw-r--r--textscreen/txt_main.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/textscreen/txt_main.c b/textscreen/txt_main.c
index 72760449..a4a7f7e3 100644
--- a/textscreen/txt_main.c
+++ b/textscreen/txt_main.c
@@ -47,22 +47,22 @@ static unsigned char *screendata;
static SDL_Color ega_colors[] =
{
- {0x00, 0x00, 0x00}, // 0: Black
- {0x00, 0x00, 0xa8}, // 1: Blue
- {0x00, 0xa8, 0x00}, // 2: Green
- {0x00, 0xa8, 0xa8}, // 3: Cyan
- {0xa8, 0x00, 0x00}, // 4: Red
- {0xa8, 0x00, 0xa8}, // 5: Magenta
- {0xa8, 0x54, 0x00}, // 6: Brown
- {0xa8, 0xa8, 0xa8}, // 7: Grey
- {0x54, 0x54, 0x54}, // 8: Dark grey
- {0x54, 0x54, 0xfe}, // 9: Bright blue
- {0x54, 0xfe, 0x54}, // 10: Bright green
- {0x54, 0xfe, 0xfe}, // 11: Bright cyan
- {0xfe, 0x54, 0x54}, // 12: Bright red
- {0xfe, 0x54, 0xfe}, // 13: Bright magenta
- {0xfe, 0xfe, 0x54}, // 14: Yellow
- {0xfe, 0xfe, 0xfe}, // 15: Bright white
+ {0x00, 0x00, 0x00, 0x00}, // 0: Black
+ {0x00, 0x00, 0xa8, 0x00}, // 1: Blue
+ {0x00, 0xa8, 0x00, 0x00}, // 2: Green
+ {0x00, 0xa8, 0xa8, 0x00}, // 3: Cyan
+ {0xa8, 0x00, 0x00, 0x00}, // 4: Red
+ {0xa8, 0x00, 0xa8, 0x00}, // 5: Magenta
+ {0xa8, 0x54, 0x00, 0x00}, // 6: Brown
+ {0xa8, 0xa8, 0xa8, 0x00}, // 7: Grey
+ {0x54, 0x54, 0x54, 0x00}, // 8: Dark grey
+ {0x54, 0x54, 0xfe, 0x00}, // 9: Bright blue
+ {0x54, 0xfe, 0x54, 0x00}, // 10: Bright green
+ {0x54, 0xfe, 0xfe, 0x00}, // 11: Bright cyan
+ {0xfe, 0x54, 0x54, 0x00}, // 12: Bright red
+ {0xfe, 0x54, 0xfe, 0x00}, // 13: Bright magenta
+ {0xfe, 0xfe, 0x54, 0x00}, // 14: Yellow
+ {0xfe, 0xfe, 0xfe, 0x00}, // 15: Bright white
};
//