aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/resource.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2006-08-08 21:34:19 +0000
committerJohannes Schickel2006-08-08 21:34:19 +0000
commiteee50637b8b8e93c38b4138b0b01c72dfa5ca412 (patch)
tree42bd964470436566316b466d9fa422277624caf6 /engines/kyra/resource.cpp
parent389c7a403c42724ecd53493aa037829c3e46e1a0 (diff)
downloadscummvm-rg350-eee50637b8b8e93c38b4138b0b01c72dfa5ca412.tar.gz
scummvm-rg350-eee50637b8b8e93c38b4138b0b01c72dfa5ca412.tar.bz2
scummvm-rg350-eee50637b8b8e93c38b4138b0b01c72dfa5ca412.zip
Little Common::String usage 'fix'.
svn-id: r23698
Diffstat (limited to 'engines/kyra/resource.cpp')
-rw-r--r--engines/kyra/resource.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 995d8869c5..2109210e09 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -282,10 +282,11 @@ PAKFile::PAKFile(const char *file, bool isAmiga) : ResourceFile() {
PakChunk chunk;
// saves the name
+ if (!(*((const char*)buffer + pos)))
+ break;
+
chunk._name = (const char*)buffer + pos;
pos += strlen(chunk._name.c_str()) + 1;
- if (!(chunk._name[0]))
- break;
if (!_isAmiga) {
endoffset = READ_LE_UINT32(buffer + pos);