summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-02-20 09:05:28 +0000
committertron <tron@openttd.org>2005-02-20 09:05:28 +0000
commit0d8dcacee2dbd1ae639f8851a2847b3806c7da16 (patch)
treeaa888f7d5d91cd2a75fad6a759189a3193a9b03b
parentae2cfeefe3572fbdc0e95cb1ca38cb7122d81930 (diff)
downloadopenttd-0d8dcacee2dbd1ae639f8851a2847b3806c7da16.tar.xz
(svn r1893) If -i was specified respect it
-rw-r--r--spritecache.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/spritecache.c b/spritecache.c
index 1b969ec6d..ea0d95294 100644
--- a/spritecache.c
+++ b/spritecache.c
@@ -835,12 +835,15 @@ void CheckExternalFiles(void)
printf("Your sample.cat file is corrupted or missing!");
/*
+ * forced DOS palette via command line -> leave it that way
* all Windows files present -> Windows palette
* all DOS files present -> DOS palette
* no Windows files present and any DOS file present -> DOS palette
* otherwise -> Windows palette
*/
- if (win == 5) {
+ if (_use_dos_palette) {
+ return;
+ } else if (win == 5) {
_use_dos_palette = false;
} else if (dos == 5 || (win == 0 && dos > 0)) {
_use_dos_palette = true;