diff options
| author | Vicent Marti | 2008-10-05 20:31:18 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-10-05 20:31:18 +0000 |
| commit | 000eedb0737dbe400d016edf213928dbb1a227d3 (patch) | |
| tree | d1287ed86ca81a97075281d75f924b31d415a668 /common | |
| parent | 5f30b1f320ca34fa05246736d9fe074c204cdf38 (diff) | |
| parent | 03d8f7e196c5e951055da4c646c097b8219ea346 (diff) | |
| download | scummvm-rg350-000eedb0737dbe400d016edf213928dbb1a227d3.tar.gz scummvm-rg350-000eedb0737dbe400d016edf213928dbb1a227d3.tar.bz2 scummvm-rg350-000eedb0737dbe400d016edf213928dbb1a227d3.zip | |
Merged revisions 34748,34750 via svnmerge from
https://tanoku@scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r34748 | dreammaster | 2008-10-05 12:25:35 +0200 (Sun, 05 Oct 2008) | 1 line
Changed NPC schedules to be loaded when an NPC is activated - this avoids an issue with the Castle Skorl's pre-activation room number being invalid room #99
........
r34750 | fingolfin | 2008-10-05 14:18:16 +0200 (Sun, 05 Oct 2008) | 1 line
Fixed ambiguous 'else'
........
svn-id: r34752
Diffstat (limited to 'common')
| -rw-r--r-- | common/unarj.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/unarj.cpp b/common/unarj.cpp index 00f51ac252..9162e437da 100644 --- a/common/unarj.cpp +++ b/common/unarj.cpp @@ -146,10 +146,10 @@ int32 ArjFile::findHeader(void) { _currArchive.seek(tmp_pos, SEEK_SET); id = _currArchive.readByte(); while (tmp_pos < end_pos) { - if (id == HEADER_ID_LO) + if (id == HEADER_ID_LO) { if ((id = _currArchive.readByte()) == HEADER_ID_HI) break; - else + } else id = _currArchive.readByte(); tmp_pos++; } |