diff options
| author | David Corrales | 2007-05-31 23:44:43 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-31 23:44:43 +0000 |
| commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
| tree | 9e6580328542f1db230e019ba77e3db1be8fa50b /engines/agos/rooms.cpp | |
| parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
| parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
| download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip | |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
Diffstat (limited to 'engines/agos/rooms.cpp')
| -rw-r--r-- | engines/agos/rooms.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp index 3996b33839..f7c0254c4f 100644 --- a/engines/agos/rooms.cpp +++ b/engines/agos/rooms.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -349,7 +351,7 @@ void AGOSEngine_Elvira2::setSRExit(Item *i, int n, int d, uint16 s) { } // Waxworks specific -bool AGOSEngine_Waxworks::loadRoomItems(uint item) { +bool AGOSEngine::loadRoomItems(uint item) { byte *p; uint i, min_num, max_num; char filename[30]; @@ -359,6 +361,7 @@ bool AGOSEngine_Waxworks::loadRoomItems(uint item) { if (p == NULL) return 0; + _currentRoom = item; item -= 2; while (*p) { @@ -375,7 +378,6 @@ bool AGOSEngine_Waxworks::loadRoomItems(uint item) { max_num = READ_BE_UINT16(p); p += 2; if (item >= min_num && item <= max_num) { - in.open(filename); if (in.isOpen() == false) { error("loadRoomItems: Can't load rooms file '%s'", filename); |