diff options
author | johndoe123 | 2013-01-17 15:41:17 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:40 +0200 |
commit | 51979c4f3f522c6d98290b93de7ecad141980b42 (patch) | |
tree | d49ae1aed9e7be0aeeaadba644a28f95183c347f | |
parent | 5bf8fb3e96506a758b59d67f68fa6c255e77456a (diff) | |
download | scummvm-rg350-51979c4f3f522c6d98290b93de7ecad141980b42.tar.gz scummvm-rg350-51979c4f3f522c6d98290b93de7ecad141980b42.tar.bz2 scummvm-rg350-51979c4f3f522c6d98290b93de7ecad141980b42.zip |
NEVERHOOD: Rename SceneInfo2700 to TrackInfo
-rw-r--r-- | engines/neverhood/module1600.h | 2 | ||||
-rw-r--r-- | engines/neverhood/module2500.cpp | 6 | ||||
-rw-r--r-- | engines/neverhood/module2700.cpp | 24 | ||||
-rw-r--r-- | engines/neverhood/staticdata.cpp | 40 | ||||
-rw-r--r-- | engines/neverhood/staticdata.h | 6 |
5 files changed, 39 insertions, 39 deletions
diff --git a/engines/neverhood/module1600.h b/engines/neverhood/module1600.h index eaf8986637..6bffb2d9ed 100644 --- a/engines/neverhood/module1600.h +++ b/engines/neverhood/module1600.h @@ -121,7 +121,7 @@ protected: void update(); }; -class Tracks : public Common::Array<SceneInfo2700*> { +class Tracks : public Common::Array<TrackInfo*> { public: void findTrackPoint(NPoint pt, int &minMatchTrackIndex, int &minMatchDistance, DataResource &dataResource); diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp index 851ee61722..f5894e9dad 100644 --- a/engines/neverhood/module2500.cpp +++ b/engines/neverhood/module2500.cpp @@ -220,9 +220,9 @@ void Module2500::createScene2704(int which, uint32 sceneInfoId, int16 value, con Scene2501::Scene2501(NeverhoodEngine *vm, Module *parentModule, int which) : Scene(vm, parentModule) { - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B2628)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B264C)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B2670)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B2628)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B264C)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B2670)); setGlobalVar(V_CAR_DELTA_X, 1); SetUpdateHandler(&Scene2501::update); diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp index f1cb571421..b5db9118d9 100644 --- a/engines/neverhood/module2700.cpp +++ b/engines/neverhood/module2700.cpp @@ -619,7 +619,7 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which) Sprite *tempSprite; NRect clipRect; - SceneInfo2700 *tracks = _vm->_staticData->getSceneInfo2700(0x004B2240); + TrackInfo *tracks = _vm->_staticData->getTrackInfo(0x004B2240); setGlobalVar(V_CAR_DELTA_X, 1); setBackground(tracks->bgFilename); @@ -765,13 +765,13 @@ Scene2702::Scene2702(NeverhoodEngine *vm, Module *parentModule, int which) } if (_isUpperTrack) { - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B5F68)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B5F8C)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B5FB0)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B5F68)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B5F8C)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B5FB0)); } else { - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B5FD8)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B5FFC)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B6020)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B5FD8)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B5FFC)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B6020)); } _trackPoints = _dataResource.getPointArray(_tracks[_currTrackIndex]->trackPointsName); @@ -872,7 +872,7 @@ void Scene2702::changeTrack() { Scene2703::Scene2703(NeverhoodEngine *vm, Module *parentModule, int which, uint32 trackInfoId) : Scene(vm, parentModule) { - SceneInfo2700 *tracks = _vm->_staticData->getSceneInfo2700(trackInfoId); + TrackInfo *tracks = _vm->_staticData->getTrackInfo(trackInfoId); SetMessageHandler(&Scene2703::handleMessage); SetUpdateHandler(&Scene2703::update); @@ -986,7 +986,7 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3 const uint32 *staticSprites, const NRect *clipRect) : Scene(vm, parentModule) { - SceneInfo2700 *tracks = _vm->_staticData->getSceneInfo2700(trackInfoId); + TrackInfo *tracks = _vm->_staticData->getTrackInfo(trackInfoId); SetMessageHandler(&Scene2704::handleMessage); SetUpdateHandler(&Scene2704::update); @@ -1086,9 +1086,9 @@ Scene2706::Scene2706(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene2706::handleMessage); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B22A0)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B22C4)); - _tracks.push_back(_vm->_staticData->getSceneInfo2700(0x004B22E8)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B22A0)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B22C4)); + _tracks.push_back(_vm->_staticData->getTrackInfo(0x004B22E8)); setBackground(0x18808B88); setPalette(0x18808B88); diff --git a/engines/neverhood/staticdata.cpp b/engines/neverhood/staticdata.cpp index cf272e573a..45935945f7 100644 --- a/engines/neverhood/staticdata.cpp +++ b/engines/neverhood/staticdata.cpp @@ -140,23 +140,23 @@ void StaticData::load(const char *filename) { _hallOfRecordsInfoItems[id] = hallOfRecordsInfo; } - // Load SceneInfo2700 items - uint32 sceneInfo2700ItemsCount = fd.readUint32LE(); - debug("sceneInfo2700ItemsCount: %d", sceneInfo2700ItemsCount); - for (uint32 i = 0; i < sceneInfo2700ItemsCount; i++) { - SceneInfo2700 *sceneInfo2700 = new SceneInfo2700(); + // Load TrackInfo items + uint32 trackInfoItemsCount = fd.readUint32LE(); + debug("trackInfoItemsCount: %d", trackInfoItemsCount); + for (uint32 i = 0; i < trackInfoItemsCount; i++) { + TrackInfo *trackInfo = new TrackInfo(); uint32 id = fd.readUint32LE(); - sceneInfo2700->bgFilename = fd.readUint32LE(); - sceneInfo2700->bgShadowFilename = fd.readUint32LE(); - sceneInfo2700->dataResourceFilename = fd.readUint32LE(); - sceneInfo2700->trackPointsName = fd.readUint32LE(); - sceneInfo2700->rectListName = fd.readUint32LE(); - sceneInfo2700->exPaletteFilename2 = fd.readUint32LE(); - sceneInfo2700->exPaletteFilename1 = fd.readUint32LE(); - sceneInfo2700->mouseCursorFilename = fd.readUint32LE(); - sceneInfo2700->which1 = fd.readUint16LE(); - sceneInfo2700->which2 = fd.readUint16LE(); - _sceneInfo2700Items[id] = sceneInfo2700; + trackInfo->bgFilename = fd.readUint32LE(); + trackInfo->bgShadowFilename = fd.readUint32LE(); + trackInfo->dataResourceFilename = fd.readUint32LE(); + trackInfo->trackPointsName = fd.readUint32LE(); + trackInfo->rectListName = fd.readUint32LE(); + trackInfo->exPaletteFilename2 = fd.readUint32LE(); + trackInfo->exPaletteFilename1 = fd.readUint32LE(); + trackInfo->mouseCursorFilename = fd.readUint32LE(); + trackInfo->which1 = fd.readUint16LE(); + trackInfo->which2 = fd.readUint16LE(); + _trackInfoItems[id] = trackInfo; } } @@ -191,10 +191,10 @@ HallOfRecordsInfo *StaticData::getHallOfRecordsInfoItem(uint32 id) { return _hallOfRecordsInfoItems[id]; } -SceneInfo2700 *StaticData::getSceneInfo2700(uint32 id) { - if (!_sceneInfo2700Items[id]) - error("StaticData::getSceneInfo2700() SceneInfo2700 with id %08X not found", id); - return _sceneInfo2700Items[id]; +TrackInfo *StaticData::getTrackInfo(uint32 id) { + if (!_trackInfoItems[id]) + error("StaticData::getTrackInfo() TrackInfo with id %08X not found", id); + return _trackInfoItems[id]; } } // End of namespace Neverhood diff --git a/engines/neverhood/staticdata.h b/engines/neverhood/staticdata.h index 874a8a52e0..b1cab3bfcd 100644 --- a/engines/neverhood/staticdata.h +++ b/engines/neverhood/staticdata.h @@ -77,7 +77,7 @@ struct HallOfRecordsInfo { byte count; }; -struct SceneInfo2700 { +struct TrackInfo { uint32 id; uint32 bgFilename; uint32 bgShadowFilename; @@ -101,14 +101,14 @@ public: MessageList *getMessageList(uint32 id); NavigationList *getNavigationList(uint32 id); HallOfRecordsInfo *getHallOfRecordsInfoItem(uint32 id); - SceneInfo2700 *getSceneInfo2700(uint32 id); + TrackInfo *getTrackInfo(uint32 id); protected: Common::HashMap<uint32, HitRectList*> _hitRectLists; Common::HashMap<uint32, RectList*> _rectLists; Common::HashMap<uint32, MessageList*> _messageLists; Common::HashMap<uint32, NavigationList*> _navigationLists; Common::HashMap<uint32, HallOfRecordsInfo*> _hallOfRecordsInfoItems; - Common::HashMap<uint32, SceneInfo2700*> _sceneInfo2700Items; + Common::HashMap<uint32, TrackInfo*> _trackInfoItems; }; } // End of namespace Neverhood |