(svn r1884) Change palette detection algorithm: Use the DOS palette if there are no Windows .grfs but at least one DOS .grf

This commit is contained in:
tron 2005-02-18 08:29:17 +00:00
parent 513eb4d7bb
commit 9f14253baf

View File

@ -834,11 +834,17 @@ void CheckExternalFiles(void)
if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false)) if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false))
printf("Your sample.cat file is corrupted or missing!"); printf("Your sample.cat file is corrupted or missing!");
if (win == 5) { // always use the Windows palette if all Windows files are present /*
* 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) {
_use_dos_palette = false; _use_dos_palette = false;
} else if (dos == 5) { // else use the DOS palette if all DOS files are present } else if (dos == 5 || (win == 0 && dos > 0) {
_use_dos_palette = true; _use_dos_palette = true;
} else { // some files are missing, regardless of palette. Use Windows } else {
_use_dos_palette = false; _use_dos_palette = false;
} }
} }