diff options
| author | tron <tron@openttd.org> | 2005-02-20 09:05:28 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-02-20 09:05:28 +0000 |
| commit | f13bfccc37237e612d1eb5194d41246072bbc20f (patch) | |
| tree | aa888f7d5d91cd2a75fad6a759189a3193a9b03b | |
| parent | a348bc69ef32b670d71e463490569cf911cb863c (diff) | |
| download | openttd-f13bfccc37237e612d1eb5194d41246072bbc20f.tar.xz | |
(svn r1893) If -i was specified respect it
| -rw-r--r-- | spritecache.c | 5 |
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; |