From: <bal...@us...> - 2003-11-15 16:27:54
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1:/tmp/cvs-serv24710/Core Modified Files: Interface.cpp Log Message: Changed an error message while cannot find a Bif File Archive Index: Interface.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Interface.cpp 14 Nov 2003 23:02:08 -0000 1.51 --- Interface.cpp 15 Nov 2003 16:27:51 -0000 1.52 *************** *** 186,194 **** strings->Open(fs, true); printMessage("Core", "Loading Palettes...\n", WHITE); ! DataStream * bmppal256 = key->GetResource("MPAL256\0", IE_BMP_CLASS_ID); ! DataStream * bmppal16 = key->GetResource("MPALETTE", IE_BMP_CLASS_ID); ! pal256 = (ImageMgr*)this->GetInterface(IE_BMP_CLASS_ID); pal16 = (ImageMgr*)this->GetInterface(IE_BMP_CLASS_ID); - pal256->Open(bmppal256, true); pal16->Open(bmppal16, true); printMessage("Core", "Palettes Loaded\n", LIGHT_GREEN); --- 186,199 ---- strings->Open(fs, true); printMessage("Core", "Loading Palettes...\n", WHITE); ! DataStream * bmppal256m = NULL, * bmppal16 = NULL; ! if(stricmp(core->GameType, "bg1") != 0) { ! bmppal256 = key->GetResource("MPAL256\0", IE_BMP_CLASS_ID); ! pal256 = (ImageMgr*)this->GetInterface(IE_BMP_CLASS_ID); ! pal256->Open(bmppal256, true); ! } ! else ! pal256 = NULL; ! bmppal16 = key->GetResource("MPALETTE", IE_BMP_CLASS_ID); pal16 = (ImageMgr*)this->GetInterface(IE_BMP_CLASS_ID); pal16->Open(bmppal16, true); printMessage("Core", "Palettes Loaded\n", LIGHT_GREEN); |