diff options
| author | Travis Howell | 2004-08-14 03:16:32 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-14 03:16:32 +0000 |
| commit | 66cb97e66b521ee52a0ec739580363572e2f6f9d (patch) | |
| tree | 786fd6f4c50386ece26d7aa338fa2920e2f1e3b2 | |
| parent | 4d86651ae2d79474cd8c15a09e7557f50c913c66 (diff) | |
| download | scummvm-rg350-66cb97e66b521ee52a0ec739580363572e2f6f9d.tar.gz scummvm-rg350-66cb97e66b521ee52a0ec739580363572e2f6f9d.tar.bz2 scummvm-rg350-66cb97e66b521ee52a0ec739580363572e2f6f9d.zip | |
Shorter check
svn-id: r14592
| -rw-r--r-- | scumm/resource.cpp | 3 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 249a21f049..babb2f0671 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -799,8 +799,7 @@ void ScummEngine::ensureResourceLoaded(int type, int i) { loadResource(type, i); - if (_version == 5) - if (type == rtRoom && i == _roomResource) + if (_version == 5 && type == rtRoom && i == _roomResource) VAR(VAR_ROOM_FLAG) = 1; } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index aec7d7848f..4a04a78bff 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1189,9 +1189,8 @@ void ScummEngine::scummInit() { _actors[i].initActor(1); // this is from IDB - if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) { + if ((_version == 1) || (_gameId == GID_MANIAC && _demoMode)) _actors[i].setActorCostume(i); - } } if (_gameId == GID_MANIAC && _version == 1) { |