diff options
Diffstat (limited to 'engines/tsage/resources.cpp')
| -rw-r--r-- | engines/tsage/resources.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp index 4a188c12f7..676d319ba9 100644 --- a/engines/tsage/resources.cpp +++ b/engines/tsage/resources.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/scummsys.h" @@ -200,11 +197,11 @@ struct DecodeReference { */ byte *TLib::getResource(uint16 id, bool suppressErrors) { // Scan for an entry for the given Id - ResourceEntry *re= NULL; - ResourceList::iterator i; - for (i = _resources.begin(); i != _resources.end(); ++i) { - if ((*i).id == id) { - re = &(*i); + ResourceEntry *re = NULL; + ResourceList::iterator iter; + for (iter = _resources.begin(); iter != _resources.end(); ++iter) { + if ((*iter).id == id) { + re = &(*iter); break; } } @@ -404,11 +401,11 @@ byte *TLib::getSubResource(int resNum, int rlbNum, int index, uint *size, bool s /** * Retrieves a given message resource, and returns the specified message number */ -Common::String TLib::getMessage(int resNum, int lineNum, bool suppressErrors) { - byte *msgData = getResource(RES_MESSAGE, resNum, 0); +bool TLib::getMessage(int resNum, int lineNum, Common::String &result, bool suppressErrors) { + byte *msgData = getResource(RES_MESSAGE, resNum, 0, true); if (!msgData) { if (suppressErrors) - return Common::String(); + return false; error("Unknown message %d line %d", resNum, lineNum); } @@ -417,9 +414,9 @@ Common::String TLib::getMessage(int resNum, int lineNum, bool suppressErrors) { while (lineNum-- > 0) srcP += strlen(srcP) + 1; - Common::String result(srcP); + result = Common::String(srcP); _memoryManager.deallocate(msgData); - return result; + return true; } /*--------------------------------------------------------------------------*/ @@ -489,8 +486,7 @@ Common::String ResourceManager::getMessage(int resNum, int lineNum, bool suppres Common::String result; for (uint idx = 0; idx < _libList.size(); ++idx) { - result = _libList[idx]->getMessage(resNum, lineNum, true); - if (!result.empty()) + if (_libList[idx]->getMessage(resNum, lineNum, result, true)) return result; } |