diff options
| author | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
| commit | fb4086cadb8ce3e473dae40558d713e7a31b3858 (patch) | |
| tree | 95c19d544da914c43a43f0538a1977f43e17cb39 /engines/queen | |
| parent | 7b070bbef8275ff25dfc2cbc3106acfdc8de74a5 (diff) | |
| parent | a17e3c444917ca90dfd537c2102a6150e7ffe977 (diff) | |
| download | scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.gz scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.bz2 scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.zip | |
Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/queen.cpp | 4 | ||||
| -rw-r--r-- | engines/queen/resource.cpp | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 10c3d56cb4..5cda4e3208 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -264,9 +264,7 @@ void QueenEngine::writeOptionSettings() { } void QueenEngine::update(bool checkPlayerInput) { - if (_debugger->isAttached()) { - _debugger->onFrame(); - } + _debugger->onFrame(); _graphics->update(_logic->currentRoom()); _logic->update(); diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index a43141ef56..1e2eff8458 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -96,18 +96,7 @@ ResourceEntry *Resource::resourceEntry(const char *filename) const { entryName.toUppercase(); ResourceEntry *re = NULL; -#ifndef PALMOS_MODE re = (ResourceEntry *)bsearch(entryName.c_str(), _resourceTable, _resourceEntries, sizeof(ResourceEntry), compareResourceEntry); -#else - // PALMOS FIXME (?) : still doesn't work for me (????) use this instead - uint32 cur = 0; - do { - if (!strcmp(entryName.c_str(), _resourceTable[cur].filename)) { - re = &_resourceTable[cur]; - break; - } - } while (++cur < _resourceEntries); -#endif return re; } |