From 0d8dcacee2dbd1ae639f8851a2847b3806c7da16 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 20 Feb 2005 09:05:28 +0000 Subject: [PATCH] (svn r1893) If -i was specified respect it --- spritecache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spritecache.c b/spritecache.c index 1b969ec6dd..ea0d952945 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;