diff options
| author | johndoe123 | 2013-01-18 19:00:28 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:47:40 +0200 |
| commit | e51bea9b4e4d2857b1225cdd7c0ebbe137b530ee (patch) | |
| tree | 7fee197ac216e111ec2378d73b71b337fba634f7 /engines/neverhood/staticdata.cpp | |
| parent | eea9dbe2da9c6195431f234e89671fffd1e1ac29 (diff) | |
| download | scummvm-rg350-e51bea9b4e4d2857b1225cdd7c0ebbe137b530ee.tar.gz scummvm-rg350-e51bea9b4e4d2857b1225cdd7c0ebbe137b530ee.tar.bz2 scummvm-rg350-e51bea9b4e4d2857b1225cdd7c0ebbe137b530ee.zip | |
NEVERHOOD: Don't load a DataResource if the same data is already loaded; this fixes a nasty bug in several scenes which use message lists from a DataResource
Diffstat (limited to 'engines/neverhood/staticdata.cpp')
| -rw-r--r-- | engines/neverhood/staticdata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/neverhood/staticdata.cpp b/engines/neverhood/staticdata.cpp index 45935945f7..3f89c2236f 100644 --- a/engines/neverhood/staticdata.cpp +++ b/engines/neverhood/staticdata.cpp @@ -42,7 +42,7 @@ void StaticData::load(const char *filename) { // Load message lists uint32 messageListsCount = fd.readUint32LE(); - debug("messageListsCount: %d", messageListsCount); + debug(3, "messageListsCount: %d", messageListsCount); for (uint32 i = 0; i < messageListsCount; i++) { MessageList *messageList = new MessageList(); uint32 id = fd.readUint32LE(); @@ -58,7 +58,7 @@ void StaticData::load(const char *filename) { // Load rect lists uint32 rectListsCount = fd.readUint32LE(); - debug("rectListsCount: %d", rectListsCount); + debug(3, "rectListsCount: %d", rectListsCount); for (uint32 i = 0; i < rectListsCount; i++) { RectList *rectList = new RectList(); uint32 id = fd.readUint32LE(); @@ -87,7 +87,7 @@ void StaticData::load(const char *filename) { // Load hit rects uint32 hitRectListsCount = fd.readUint32LE(); - debug("hitRectListsCount: %d", hitRectListsCount); + debug(3, "hitRectListsCount: %d", hitRectListsCount); for (uint32 i = 0; i < hitRectListsCount; i++) { HitRectList *hitRectList = new HitRectList(); uint32 id = fd.readUint32LE(); @@ -106,7 +106,7 @@ void StaticData::load(const char *filename) { // Load navigation lists uint32 navigationListsCount = fd.readUint32LE(); - debug("navigationListsCount: %d", navigationListsCount); + debug(3, "navigationListsCount: %d", navigationListsCount); for (uint32 i = 0; i < navigationListsCount; i++) { NavigationList *navigationList = new NavigationList(); uint32 id = fd.readUint32LE(); @@ -127,7 +127,7 @@ void StaticData::load(const char *filename) { // Load HallOfRecordsInfo items uint32 hallOfRecordsInfoItemsCount = fd.readUint32LE(); - debug("hallOfRecordsInfoItemsCount: %d", hallOfRecordsInfoItemsCount); + debug(3, "hallOfRecordsInfoItemsCount: %d", hallOfRecordsInfoItemsCount); for (uint32 i = 0; i < hallOfRecordsInfoItemsCount; i++) { HallOfRecordsInfo *hallOfRecordsInfo = new HallOfRecordsInfo(); uint32 id = fd.readUint32LE(); @@ -142,7 +142,7 @@ void StaticData::load(const char *filename) { // Load TrackInfo items uint32 trackInfoItemsCount = fd.readUint32LE(); - debug("trackInfoItemsCount: %d", trackInfoItemsCount); + debug(3, "trackInfoItemsCount: %d", trackInfoItemsCount); for (uint32 i = 0; i < trackInfoItemsCount; i++) { TrackInfo *trackInfo = new TrackInfo(); uint32 id = fd.readUint32LE(); |