(svn r1893) If -i was specified respect it

This commit is contained in:
tron 2005-02-20 09:05:28 +00:00
parent a348bc69ef
commit f13bfccc37

View File

@ -835,12 +835,15 @@ void CheckExternalFiles(void)
printf("Your sample.cat file is corrupted or missing!"); 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 Windows files present -> Windows palette
* all DOS files present -> DOS palette * all DOS files present -> DOS palette
* no Windows files present and any DOS file present -> DOS palette * no Windows files present and any DOS file present -> DOS palette
* otherwise -> Windows palette * otherwise -> Windows palette
*/ */
if (win == 5) { if (_use_dos_palette) {
return;
} else if (win == 5) {
_use_dos_palette = false; _use_dos_palette = false;
} else if (dos == 5 || (win == 0 && dos > 0)) { } else if (dos == 5 || (win == 0 && dos > 0)) {
_use_dos_palette = true; _use_dos_palette = true;