Added a fix to get QFG3 working and changed an error to a warning to get EcoQuest 2 working

svn-id: r40944
This commit is contained in:
Filippos Karapetis 2009-05-27 17:13:42 +00:00
parent c75bdbc8e9
commit 4717533dea
2 changed files with 4 additions and 3 deletions

View File

@ -276,8 +276,8 @@ PaletteEntry get_pic_color(EngineState *s, int color) {
else if (color < s->gfx_state->gfxResMan->getColorCount())
return s->gfx_state->gfxResMan->getColor(color);
else {
error("Color index %d out of bounds for pic %d (%d max)", color, s->gfx_state->pic_nr, s->gfx_state->gfxResMan->getColorCount());
BREAKPOINT();
// Happens in the beginning of EcoQuest 2, when the dialog box of the customs officer shows up
warning("Color index %d out of bounds for pic %d (%d max)", color, s->gfx_state->pic_nr, s->gfx_state->gfxResMan->getColorCount());
return PaletteEntry(0,0,0);
}
}

View File

@ -141,7 +141,8 @@ bool vocab_get_opcodes(ResourceManager *resmgr, Common::Array<opcode> &o) {
int offset = READ_LE_UINT16(r->data + 2 + i * 2);
int len = READ_LE_UINT16(r->data + offset) - 2;
o[i].type = READ_LE_UINT16(r->data + offset + 2);
o[i].name = Common::String((char *)r->data + offset + 4, len);
// QFG3 has empty opcodes
o[i].name = len > 0 ? Common::String((char *)r->data + offset + 4, len) : "Dummy";
#if 1 //def VOCABULARY_DEBUG
printf("Opcode %02X: %s, %d\n", i, o[i].name.c_str(), o[i].type);
#endif