diff options
Diffstat (limited to 'engines')
25 files changed, 211 insertions, 268 deletions
diff --git a/engines/neverhood/collisionman.cpp b/engines/neverhood/collisionman.cpp index 973c0fe853..bafa1e3e82 100644 --- a/engines/neverhood/collisionman.cpp +++ b/engines/neverhood/collisionman.cpp @@ -39,16 +39,6 @@ void CollisionMan::setHitRects(uint32 id) { void CollisionMan::setHitRects(HitRectList *hitRects) { _hitRects = hitRects; - - // DEBUG - if (_hitRects) { - debug("CollisionMan::setHitRects() count = %d", _hitRects->size()); - for (HitRectList::iterator it = _hitRects->begin(); it != _hitRects->end(); it++) { - HitRect *hitRect = &(*it); - debug("(%d, %d, %d, %d) -> %04X", hitRect->rect.x1, hitRect->rect.y1, hitRect->rect.x2, hitRect->rect.y2, hitRect->type); - } - } - } void CollisionMan::clearHitRects() { @@ -63,9 +53,9 @@ HitRect *CollisionMan::findHitRectAtPos(int16 x, int16 y) { return &defaultHitRect; } -void CollisionMan::addSprite(Sprite *sprite) { +void CollisionMan::addCollisionSprite(Sprite *sprite) { int index = 0, insertIndex = -1; - for (Common::Array<Sprite*>::iterator iter = _sprites.begin(); iter != _sprites.end(); iter++) { + for (Common::Array<Sprite*>::iterator iter = _collisionSprites.begin(); iter != _collisionSprites.end(); iter++) { if ((*iter)->getPriority() > sprite->getPriority()) { insertIndex = index; break; @@ -73,26 +63,26 @@ void CollisionMan::addSprite(Sprite *sprite) { index++; } if (insertIndex >= 0) - _sprites.insert_at(insertIndex, sprite); + _collisionSprites.insert_at(insertIndex, sprite); else - _sprites.push_back(sprite); + _collisionSprites.push_back(sprite); } -void CollisionMan::removeSprite(Sprite *sprite) { - for (uint index = 0; index < _sprites.size(); index++) { - if (_sprites[index] == sprite) { - _sprites.remove_at(index); +void CollisionMan::removeCollisionSprite(Sprite *sprite) { + for (uint index = 0; index < _collisionSprites.size(); index++) { + if (_collisionSprites[index] == sprite) { + _collisionSprites.remove_at(index); break; } } } -void CollisionMan::clearSprites() { - _sprites.clear(); +void CollisionMan::clearCollisionSprites() { + _collisionSprites.clear(); } void CollisionMan::checkCollision(Sprite *sprite, uint16 flags, int messageNum, uint32 messageParam) { - for (Common::Array<Sprite*>::iterator iter = _sprites.begin(); iter != _sprites.end(); iter++) { + for (Common::Array<Sprite*>::iterator iter = _collisionSprites.begin(); iter != _collisionSprites.end(); iter++) { Sprite *collSprite = *iter; if ((sprite->getFlags() & flags) && collSprite->checkCollision(sprite->getCollisionBounds())) { sprite->sendMessage(collSprite, messageNum, messageParam); @@ -100,12 +90,4 @@ void CollisionMan::checkCollision(Sprite *sprite, uint16 flags, int messageNum, } } -void CollisionMan::save() { - // TODO -} - -void CollisionMan::restore() { - // TODO -} - } // End of namespace Neverhood diff --git a/engines/neverhood/collisionman.h b/engines/neverhood/collisionman.h index 86359525b0..36bb2a56ad 100644 --- a/engines/neverhood/collisionman.h +++ b/engines/neverhood/collisionman.h @@ -37,18 +37,16 @@ public: void setHitRects(HitRectList *hitRects); void clearHitRects(); HitRect *findHitRectAtPos(int16 x, int16 y); - void addSprite(Sprite *sprite); - void removeSprite(Sprite *sprite); - void clearSprites(); + void addCollisionSprite(Sprite *sprite); + void removeCollisionSprite(Sprite *sprite); + void clearCollisionSprites(); void checkCollision(Sprite *sprite, uint16 flags, int messageNum, uint32 messageParam); - void save(); - void restore(); - uint getSpriteCount() const { return _sprites.size(); } - Sprite *getSprite(uint index) const { return _sprites[index]; } + uint getCollisionSpritesCount() const { return _collisionSprites.size(); } + Sprite *getCollisionSprite(uint index) const { return _collisionSprites[index]; } protected: NeverhoodEngine *_vm; HitRectList *_hitRects; - Common::Array<Sprite*> _sprites; + Common::Array<Sprite*> _collisionSprites; }; diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index c40b9e76c7..9dc4582ba7 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -108,26 +108,6 @@ static const NeverhoodGameDescription gameDescriptions[] = { { AD_TABLE_END_MARKER, 0, 0, 0, 0 } }; -/** - * The fallback game descriptor used by the Neverhood engine's fallbackDetector. - * Contents of this struct are to be overwritten by the fallbackDetector. - */ -static NeverhoodGameDescription g_fallbackDesc = { - { - "", - "", - AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor - Common::UNK_LANG, - Common::kPlatformPC, - ADGF_NO_FLAGS, - GUIO_NONE - }, - 0, - 0, - 0, - 0, -}; - } // End of namespace Neverhood class NeverhoodMetaEngine : public AdvancedMetaEngine { @@ -152,8 +132,6 @@ public: void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; - const ADGameDescription *fallbackDetect(const Common::FSList &fslist) const; - }; bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const { @@ -182,20 +160,6 @@ bool NeverhoodMetaEngine::createInstance(OSystem *syst, Engine **engine, const A return gd != 0; } -const ADGameDescription *NeverhoodMetaEngine::fallbackDetect(const Common::FSList &fslist) const { - // Set the default values for the fallback descriptor's ADGameDescription part. - Neverhood::g_fallbackDesc.desc.language = Common::UNK_LANG; - Neverhood::g_fallbackDesc.desc.platform = Common::kPlatformPC; - Neverhood::g_fallbackDesc.desc.flags = ADGF_NO_FLAGS; - - // Set default values for the fallback descriptor's NeverhoodGameDescription part. - Neverhood::g_fallbackDesc.gameID = 0; - Neverhood::g_fallbackDesc.features = 0; - Neverhood::g_fallbackDesc.version = 3; - - return NULL; -} - SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Neverhood::NeverhoodEngine::SaveHeader header; diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp index d6d4de1a68..fbef6006d5 100644 --- a/engines/neverhood/diskplayerscene.cpp +++ b/engines/neverhood/diskplayerscene.cpp @@ -325,7 +325,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int setPalette(kDiskplayerPaletteFileHashes[paletteIndex]); _ssPlayButton = insertSprite<DiskplayerPlayButton>(this); - _vm->_collisionMan->addSprite(_ssPlayButton); + _vm->_collisionMan->addCollisionSprite(_ssPlayButton); _asKey = insertSprite<AsDiskplayerSceneKey>(); @@ -351,7 +351,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int _finalDiskSlot = new DiskplayerSlot(_vm, this, 20, 0); addEntity(_finalDiskSlot); - insertMouse435(0x000408A8, 20, 620); + insertPuzzleMouse(0x000408A8, 20, 620); showMouse(false); _diskSmackerPlayer = new SmackerPlayer(_vm, this, 0x08288103, false, true); @@ -442,7 +442,6 @@ void DiskplayerScene::update() { } uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam ¶m, Entity *sender) { - uint32 messageResult = 0; Scene::handleMessage(messageNum, param, sender); if (!_inputDisabled) { switch (messageNum) { @@ -473,7 +472,7 @@ uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam ¶m, break; } } - return messageResult; + return 0; } void DiskplayerScene::stop() { diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp index 528d3035ff..521c0e0c72 100644 --- a/engines/neverhood/menumodule.cpp +++ b/engines/neverhood/menumodule.cpp @@ -240,7 +240,7 @@ MainMenu::MainMenu(NeverhoodEngine *vm, Module *parentModule) setBackground(0x08C0020C); setPalette(0x08C0020C); - insertMouse433(0x00208084); + insertScreenMouse(0x00208084); insertStaticSprite(0x41137051, 100); insertStaticSprite(0xC10B2015, 100); @@ -251,7 +251,7 @@ MainMenu::MainMenu(NeverhoodEngine *vm, Module *parentModule) for (uint buttonIndex = 0; buttonIndex < 9; ++buttonIndex) { Sprite *menuButton = insertSprite<MenuButton>(this, buttonIndex, kMenuButtonFileHashes[buttonIndex], kMenuButtonCollisionBounds[buttonIndex]); - _vm->_collisionMan->addSprite(menuButton); + _vm->_collisionMan->addCollisionSprite(menuButton); } SetUpdateHandler(&Scene::update); @@ -466,7 +466,7 @@ TextLabelWidget::TextLabelWidget(NeverhoodEngine *vm, int16 x, int16 y, int16 it void TextLabelWidget::addSprite() { _parentScene->addSprite(this); - _vm->_collisionMan->addSprite(this); + _vm->_collisionMan->addCollisionSprite(this); } int16 TextLabelWidget::getWidth() { @@ -544,7 +544,7 @@ void TextEditWidget::addSprite() { createSurface(_baseSurfacePriority, _spriteResource.getDimensions().width, _spriteResource.getDimensions().height); refreshPosition(); _parentScene->addSprite(this); - _vm->_collisionMan->addSprite(this); + _vm->_collisionMan->addCollisionSprite(this); _surface->setVisible(true); _textLabelWidget = new TextLabelWidget(_vm, _rect.x1, _rect.y1 + (_rect.y2 - _rect.y1 + 1 - _textSurface->getCharHeight()) / 2, 0, _parentScene, _baseObjectPriority + 1, _baseSurfacePriority + 1, @@ -708,7 +708,7 @@ void SavegameListBox::addSprite() { createSurface(_baseSurfacePriority, _spriteResource.getDimensions().width, _spriteResource.getDimensions().height); refreshPosition(); _parentScene->addSprite(this); - _vm->_collisionMan->addSprite(this); + _vm->_collisionMan->addCollisionSprite(this); _surface->setVisible(true); buildItems(); _firstVisibleItem = 0; @@ -809,7 +809,7 @@ SaveGameMenu::SaveGameMenu(NeverhoodEngine *vm, Module *parentModule, StringArra setBackground(0x30084E25); setPalette(0x30084E25); - insertMouse433(0x84E21308, &kMouseRect); + insertScreenMouse(0x84E21308, &kMouseRect); insertStaticSprite(0x1340A5C2, 200); insertStaticSprite(0x1301A7EA, 200); @@ -826,7 +826,7 @@ SaveGameMenu::SaveGameMenu(NeverhoodEngine *vm, Module *parentModule, StringArra for (uint buttonIndex = 0; buttonIndex < 6; ++buttonIndex) { Sprite *menuButton = insertSprite<MenuButton>(this, buttonIndex, kSaveGameMenuButtonFileHashes[buttonIndex], kSaveGameMenuButtonCollisionBounds[buttonIndex]); - _vm->_collisionMan->addSprite(menuButton); + _vm->_collisionMan->addCollisionSprite(menuButton); } diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp index 1aaa0c21a8..6c5cc28065 100644 --- a/engines/neverhood/module1000.cpp +++ b/engines/neverhood/module1000.cpp @@ -344,7 +344,7 @@ Scene1001::Scene1001(NeverhoodEngine *vm, Module *parentModule, int which) setHitRects(0x004B4860); setBackground(0x4086520E); setPalette(0x4086520E); - insertMouse433(0x6520A400); + insertScreenMouse(0x6520A400); if (which < 0) { // Restoring game @@ -1226,7 +1226,7 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which) _vm->_gameState.which = 0; } - insertMouse433(0x23303124); + insertScreenMouse(0x23303124); tempSprite = insertStaticSprite(0xB3242310, 825); tempClipRect.set(tempSprite->getDrawRect().x, tempSprite->getDrawRect().y, @@ -1243,7 +1243,7 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which) _asDoorSpy = insertSprite<AsScene1002DoorSpy>(tempClipRect, this, _asDoor, tempSprite); _ssPressButton = insertSprite<SsCommonPressButton>(this, 0x00412692, 0x140B60BE, 800, 0); _asVenusFlyTrap = insertSprite<AsScene1002VenusFlyTrap>(this, _klayman, false); - _vm->_collisionMan->addSprite(_asVenusFlyTrap); + _vm->_collisionMan->addCollisionSprite(_asVenusFlyTrap); sendEntityMessage(_klayman, 0x2007, _asVenusFlyTrap); @@ -1395,7 +1395,7 @@ StaticScene::StaticScene(NeverhoodEngine *vm, Module *parentModule, uint32 backg setBackground(backgroundFileHash); setPalette(backgroundFileHash); - insertMouse435(cursorFileHash, 20, 620); + insertPuzzleMouse(cursorFileHash, 20, 620); } uint32 StaticScene::handleMessage(int messageNum, const MessageParam ¶m, Entity *sender) { @@ -1460,7 +1460,7 @@ Scene1004::Scene1004(NeverhoodEngine *vm, Module *parentModule, int which) } addEntity(_palette); - insertMouse433(0x03001504); + insertScreenMouse(0x03001504); if (which < 0) { // Restoring game @@ -1550,13 +1550,13 @@ Scene1005::Scene1005(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x2800E011); setPalette(0x2800E011); insertStaticSprite(0x492D5AD7, 100); - insertMouse435(0x0E015288, 20, 620); + insertPuzzleMouse(0x0E015288, 20, 620); } else { setBackground(0x8870A546); setPalette(0x8870A546); insertStaticSprite(0x40D1E0A9, 100); insertStaticSprite(0x149C00A6, 100); - insertMouse435(0x0A54288F, 20, 620); + insertPuzzleMouse(0x0A54288F, 20, 620); } drawTextToBackground(); diff --git a/engines/neverhood/module1100.cpp b/engines/neverhood/module1100.cpp index cc6284b0cc..4b8a8ba75f 100644 --- a/engines/neverhood/module1100.cpp +++ b/engines/neverhood/module1100.cpp @@ -444,8 +444,8 @@ Scene1105::Scene1105(NeverhoodEngine *vm, Module *parentModule) _asTeddyBear = insertSprite<AsScene1105TeddyBear>(this); ssOpenButton = insertSprite<SsScene1105OpenButton>(this); - _vm->_collisionMan->addSprite(ssOpenButton); - insertMouse435(0x10006208, 20, 620); + _vm->_collisionMan->addCollisionSprite(ssOpenButton); + insertPuzzleMouse(0x10006208, 20, 620); loadSound(0, 0x48442057); loadSound(1, 0xC025014F); @@ -555,19 +555,19 @@ void Scene1105::createObjects() { _ssSymbolDice[2] = insertSprite<SsScene1105SymbolDie>(2, 485, 304); _ssSymbol1UpButton = insertSprite<SsScene1105Button>(this, 0x08002860, NRect(146, 362, 192, 403)); - _vm->_collisionMan->addSprite(_ssSymbol1UpButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol1UpButton); _ssSymbol1DownButton = insertSprite<SsScene1105Button>(this, 0x42012460, NRect(147, 404, 191, 442)); - _vm->_collisionMan->addSprite(_ssSymbol1DownButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol1DownButton); _ssSymbol2UpButton = insertSprite<SsScene1105Button>(this, 0x100030A0, NRect(308, 361, 355, 402)); - _vm->_collisionMan->addSprite(_ssSymbol2UpButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol2UpButton); _ssSymbol2DownButton = insertSprite<SsScene1105Button>(this, 0x840228A0, NRect(306, 406, 352, 445)); - _vm->_collisionMan->addSprite(_ssSymbol2DownButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol2DownButton); _ssSymbol3UpButton = insertSprite<SsScene1105Button>(this, 0x20000120, NRect(476, 358, 509, 394)); - _vm->_collisionMan->addSprite(_ssSymbol3UpButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol3UpButton); _ssSymbol3DownButton = insertSprite<SsScene1105Button>(this, 0x08043121, NRect(463, 401, 508, 438)); - _vm->_collisionMan->addSprite(_ssSymbol3DownButton); + _vm->_collisionMan->addCollisionSprite(_ssSymbol3DownButton); _ssActionButton = insertSprite<SsScene1105Button>(this, 0x8248AD35, NRect(280, 170, 354, 245)); - _vm->_collisionMan->addSprite(_ssActionButton); + _vm->_collisionMan->addCollisionSprite(_ssActionButton); _isPanelOpen = true; @@ -575,7 +575,7 @@ void Scene1105::createObjects() { // TODO: Find a nicer way deleteSprite((Sprite**)&_mouseCursor); - insertMouse435(0x18666208, 20, 620); + insertPuzzleMouse(0x18666208, 20, 620); } @@ -652,7 +652,7 @@ Scene1109::Scene1109(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x8449E02F); setPalette(0x8449E02F); - insertMouse433(0x9E02B84C); + insertScreenMouse(0x9E02B84C); _sprite1 = insertStaticSprite(0x600CEF01, 1100); diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp index e86aa003ee..11e29fda7a 100644 --- a/engines/neverhood/module1200.cpp +++ b/engines/neverhood/module1200.cpp @@ -671,10 +671,10 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) setSubVar(VA_TNT_POSITIONS, index, kScene1201InitArray[index]); } - insertMouse433(0x9A2C0409); + insertScreenMouse(0x9A2C0409); _asTape = insertSprite<AsScene1201Tape>(this, 3, 1100, 243, 340, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); tempSprite = insertStaticSprite(0x03C82530, 100); topY1 = tempSprite->getY() + tempSprite->getDrawRect().height; @@ -752,7 +752,7 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) _asTntMan = insertSprite<AsScene1201TntMan>(this, _asTntManRope, which == 1); _asTntMan->setClipRect(x1, 0, x2, 480); _asTntMan->setRepl(64, 0); - _vm->_collisionMan->addSprite(_asTntMan); + _vm->_collisionMan->addCollisionSprite(_asTntMan); tempSprite = insertSprite<AsScene1201TntManFlame>(_asTntMan); tempSprite->setClipRect(x1, 0, x2, 480); } @@ -826,7 +826,7 @@ Scene1201::Scene1201(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_MATCH_STATUS) < 3) { _asMatch = insertSprite<AsScene1201Match>(this); - _vm->_collisionMan->addSprite(_asMatch); + _vm->_collisionMan->addCollisionSprite(_asMatch); } if (getGlobalVar(V_CREATURE_ANGRY) && getGlobalVar(V_CREATURE_EXPLODED) == 0) { @@ -1011,11 +1011,11 @@ Scene1202::Scene1202(NeverhoodEngine *vm, Module *parentModule) _paletteResource.load(0x60250EB5); _paletteResource.copyPalette(_paletteData); - insertMouse435(0x10ED160A, 20, 620); + insertPuzzleMouse(0x10ED160A, 20, 620); for (int tntIndex = 0; tntIndex < 18; tntIndex++) { _asTntItems[tntIndex] = insertSprite<AsScene1202TntItem>(this, tntIndex); - _vm->_collisionMan->addSprite(_asTntItems[tntIndex]); + _vm->_collisionMan->addCollisionSprite(_asTntItems[tntIndex]); } insertStaticSprite(0x8E8419C1, 1100); diff --git a/engines/neverhood/module1300.cpp b/engines/neverhood/module1300.cpp index feebd78485..989ada535d 100644 --- a/engines/neverhood/module1300.cpp +++ b/engines/neverhood/module1300.cpp @@ -427,7 +427,7 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B0A38); setBackground(0x420643C4); setPalette(0x420643C4); - insertMouse433(0x643C0428); + insertScreenMouse(0x643C0428); _class595 = insertStaticSprite(0xB0420130, 1015); _sprite1 = insertStaticSprite(0x942FC224, 300); @@ -456,7 +456,7 @@ Scene1302::Scene1302(NeverhoodEngine *vm, Module *parentModule, int which) _klayman->setClipRect(0, 0, _sprite3->getDrawRect().x2(), 480); _asVenusFlyTrap = insertSprite<AsScene1002VenusFlyTrap>(this, _klayman, true); - _vm->_collisionMan->addSprite(_asVenusFlyTrap); + _vm->_collisionMan->addCollisionSprite(_asVenusFlyTrap); sendEntityMessage(_klayman, 0x2007, _asVenusFlyTrap); @@ -637,11 +637,11 @@ Scene1303::Scene1303(NeverhoodEngine *vm, Module *parentModule) setRectList(0x004AF9E8); setBackground(0x01581A9C); setPalette(0x01581A9C); - insertMouse433(0x81A9801D); + insertScreenMouse(0x81A9801D); if (!getGlobalVar(V_BALLOON_POPPED)) { _asBalloon = insertSprite<AsScene1303Balloon>(this); - _vm->_collisionMan->addSprite(_asBalloon); + _vm->_collisionMan->addCollisionSprite(_asBalloon); } _sprite1 = insertStaticSprite(0xA014216B, 1100); @@ -699,18 +699,18 @@ Scene1304::Scene1304(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B91A8); setBackground(0x062C0214); setPalette(0x062C0214); - insertMouse433(0xC021006A); + insertScreenMouse(0xC021006A); if (getGlobalVar(V_BALLOON_POPPED)) { _asKey = insertSprite<AsCommonKey>(this, 0, 1100, 278, 347); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } else { _asKey = insertSprite<AnimatedSprite>(0x80106018, 100, 279, 48); } if (!getGlobalVar(V_HAS_NEEDLE)) { _asNeedle = insertSprite<AsScene1304Needle>(this, 1100, 278, 347); - _vm->_collisionMan->addSprite(_asNeedle); + _vm->_collisionMan->addCollisionSprite(_asNeedle); } _sprite1 = insertStaticSprite(0x0562E621, 1100); @@ -763,7 +763,7 @@ Scene1305::Scene1305(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B6E98); setBackground(0x28801B64); setPalette(0x28801B64); - insertMouse433(0x01B60280); + insertScreenMouse(0x01B60280); if (which < 0) { // Restoring game @@ -876,11 +876,11 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x05303114); setPalette(0x05303114); - insertMouse433(0x0311005B); + insertScreenMouse(0x0311005B); if (getGlobalVar(V_KEY3_LOCATION) == 4) { _asKey = insertSprite<AsCommonKey>(this, 2, 1100, 435, 445); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } _ssButton = insertSprite<SsCommonButtonSprite>(this, 0x404A36A0, 100, 0x440C1000); @@ -897,14 +897,14 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which) insertKlayman<KmScene1306>(380, 440); setMessageList(0x004AFAD0); sendMessage(this, 0x2000, 0); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (which == 1) { // Klaymen teleporting in insertKlayman<KmScene1306>(136, 440); sendMessage(_klayman, 0x2000, 1); setMessageList(0x004AFAF0); sendMessage(this, 0x2000, 1); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (which == 2) { // Klaymen returning from diskplayer if (getGlobalVar(V_KLAYMAN_IS_DELTA_X)) { @@ -915,27 +915,27 @@ Scene1306::Scene1306(NeverhoodEngine *vm, Module *parentModule, int which) } setMessageList(0x004AFBC8); sendMessage(this, 0x2000, 0); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (which == 3) { // Klaymen returning from window insertKlayman<KmScene1306>(534, 440); setMessageList(0x004AFC30); sendMessage(this, 0x2000, 0); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (which == 4) { // Klaymen teleporting out insertKlayman<KmScene1306>(136, 440); sendMessage(_klayman, 0x2000, 1); setMessageList(0x004AFC38); sendMessage(this, 0x2000, 1); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (which == 5) { // Klaymen returning from teleporter insertKlayman<KmScene1306>(136, 440); sendMessage(_klayman, 0x2000, 1); setMessageList(0x004AFB00); sendMessage(this, 0x2000, 1); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else { // Klaymen coming up in elevator insertKlayman<KmScene1306>(286, 408); @@ -1007,7 +1007,7 @@ uint32 Scene1306::handleMessage(int messageNum, const MessageParam ¶m, Entit setSurfacePriority(_asElevatorDoor->getSurface(), 90); setSurfacePriority(_sprite1->getSurface(), 80); sendMessage(this, 0x2000, 0); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); break; } return 0; @@ -1033,7 +1033,7 @@ uint32 Scene1306::handleMessage416EB0(int messageNum, const MessageParam ¶m, setSurfacePriority(_asElevatorDoor->getSurface(), 90); setSurfacePriority(_sprite1->getSurface(), 80); sendMessage(this, 0x2000, 0); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); break; } return 0; @@ -1246,7 +1246,7 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule) setBackground(0xA8006200); setPalette(0xA8006200); addEntity(_palette); - insertMouse435(0x06204A88, 20, 620); + insertPuzzleMouse(0x06204A88, 20, 620); tempSprite = insertStaticSprite(0x00A3621C, 800); _clipRects[0].set(tempSprite->getDrawRect().x, 0, 640, 480); @@ -1260,7 +1260,7 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule) for (uint keyIndex = 0; keyIndex < 3; keyIndex++) { if (getSubVar(VA_IS_KEY_INSERTED, keyIndex)) { _asKeys[keyIndex] = insertSprite<AsScene1307Key>(this, keyIndex, _clipRects); - _vm->_collisionMan->addSprite(_asKeys[keyIndex]); + _vm->_collisionMan->addCollisionSprite(_asKeys[keyIndex]); } else { _asKeys[keyIndex] = NULL; } @@ -1527,10 +1527,10 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x41024202); setPalette(0x41024202); - insertMouse433(0x24206418); + insertScreenMouse(0x24206418); _asTape = insertSprite<AsScene1201Tape>(this, 17, 1100, 502, 445, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); if (getGlobalVar(V_MOUSE_SUCKED_IN)) { insertSprite<AsScene1308Mouse>(); @@ -1603,7 +1603,7 @@ Scene1308::Scene1308(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_PROJECTOR_LOCATION) == 4) { _asProjector = insertSprite<AsCommonProjector>(this, _klayman, (Sprite*)NULL); - _vm->_collisionMan->addSprite(_asProjector); + _vm->_collisionMan->addCollisionSprite(_asProjector); _asProjector->setClipRect(0, 0, 640, _sprite2->getDrawRect().y2()); _asProjector->setRepl(64, 0); } @@ -1701,7 +1701,7 @@ Scene1317::Scene1317(NeverhoodEngine *vm, Module *parentModule) SetMessageHandler(&Scene1317::handleMessage); _smackerPlayer = addSmackerPlayer(new SmackerPlayer(_vm, this, 0x08982841, true, false)); - insertMouse433(0x08284011); + insertScreenMouse(0x08284011); showMouse(false); _smackerFileHash = 0; _keepLastSmackerFrame = false; diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp index e0cf2c5ec3..521981e995 100644 --- a/engines/neverhood/module1400.cpp +++ b/engines/neverhood/module1400.cpp @@ -637,7 +637,7 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B6758); setBackground(0x08221FA5); setPalette(0x08221FA5); - insertMouse433(0x21FA108A); + insertScreenMouse(0x21FA108A); _ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x980F3124, 0x12192892, 100, 0); _asPipe = insertSprite<AsScene1401Pipe>(); @@ -678,7 +678,7 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_PROJECTOR_LOCATION) == 2) { _asProjector = insertSprite<AsCommonProjector>(this, _klayman, _asPipe); - _vm->_collisionMan->addSprite(_asProjector); + _vm->_collisionMan->addCollisionSprite(_asProjector); if (getGlobalVar(V_PROJECTOR_SLOT) == 6) { sendEntityMessage(_klayman, 0x1014, _asProjector); _klayman->setX(_asProjector->getX() + 100); @@ -850,7 +850,7 @@ Scene1402::Scene1402(NeverhoodEngine *vm, Module *parentModule, int which) setBackgroundY(-10); setPalette(0x231482F0); _palette->addPalette(0x91D3A391, 0, 64, 0); - insertMouse433(0x482F4239); + insertScreenMouse(0x482F4239); _ssBridgePart1 = insertSprite<SsScene1402BridgePart>(0x15402D64, 1100); _ssBridgePart2 = insertSprite<SsScene1402BridgePart>(0x10A02120, 1100); @@ -898,7 +898,7 @@ Scene1402::Scene1402(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_PROJECTOR_LOCATION) == 1) { _asProjector = insertSprite<AsCommonProjector>(this, _klayman, (Sprite*)NULL); - _vm->_collisionMan->addSprite(_asProjector); + _vm->_collisionMan->addCollisionSprite(_asProjector); if (getGlobalVar(V_PROJECTOR_SLOT) == 4) { sendEntityMessage(_klayman, 0x1014, _asProjector); _klayman->setX(_asProjector->getX() + 100); @@ -1227,7 +1227,7 @@ Scene1407::Scene1407(NeverhoodEngine *vm, Module *parentModule) setBackground(0x00442225); setPalette(0x00442225); - insertMouse435(0x4222100C, 20, 620); + insertPuzzleMouse(0x4222100C, 20, 620); _asMouse = insertSprite<AsScene1407Mouse>(this); _ssResetButton = insertStaticSprite(0x12006600, 100); @@ -1285,17 +1285,17 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B1FF8); setBackground(0x2110A234); setPalette(0x2110A234); - insertMouse433(0x0A230219); + insertScreenMouse(0x0A230219); _sprite1 = insertStaticSprite(0x01102A33, 100); _sprite1->setVisible(false); _sprite2 = insertStaticSprite(0x04442520, 995); _sprite3 = insertStaticSprite(0x08742271, 995); _asTape1 = insertSprite<AsScene1201Tape>(this, 12, 1100, 201, 468, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape1); + _vm->_collisionMan->addCollisionSprite(_asTape1); _asTape1->setRepl(64, 0); _asTape2 = insertSprite<AsScene1201Tape>(this, 16, 1100, 498, 468, 0x9048A093); - _vm->_collisionMan->addSprite(_asTape2); + _vm->_collisionMan->addCollisionSprite(_asTape2); _asTape2->setRepl(64, 0); if (which < 0) { @@ -1311,7 +1311,7 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_PROJECTOR_LOCATION) == 4) { _asProjector = insertSprite<AsCommonProjector>(this, _klayman, (Sprite*)NULL); - _vm->_collisionMan->addSprite(_asProjector); + _vm->_collisionMan->addCollisionSprite(_asProjector); if (getGlobalVar(V_PROJECTOR_SLOT) == 4) { sendEntityMessage(_klayman, 0x1014, _asProjector); _klayman->setX(_asProjector->getX() + 100); @@ -1393,16 +1393,16 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0xAC0B006F); setPalette(0xAC0B006F); _palette->addPalette(0x00801510, 0, 65, 0); - insertMouse433(0xB006BAC8); + insertScreenMouse(0xB006BAC8); if (getGlobalVar(V_KEY3_LOCATION) == 5) { _asKey = insertSprite<AsCommonKey>(this, 2, 1100, 267, 411); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } _sprite1 = insertStaticSprite(0x1900A1F8, 1100); _asTape = insertSprite<AsScene1201Tape>(this, 14, 1100, 281, 411, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); if (which < 0) { // Restoring game @@ -1429,7 +1429,7 @@ Scene1404::Scene1404(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_PROJECTOR_LOCATION) == 3) { _asProjector = insertSprite<AsCommonProjector>(this, _klayman, (Sprite*)NULL); - _vm->_collisionMan->addSprite(_asProjector); + _vm->_collisionMan->addCollisionSprite(_asProjector); if (getGlobalVar(V_PROJECTOR_SLOT) == 0) { sendEntityMessage(_klayman, 0x1014, _asProjector); _klayman->setX(_asProjector->getX() - 100); @@ -1561,11 +1561,11 @@ Scene1405::Scene1405(NeverhoodEngine *vm, Module *parentModule) setBackground(0x0C0C007D); setPalette(0x0C0C007D); - insertMouse435(0xC00790C8, 20, 620); + insertPuzzleMouse(0xC00790C8, 20, 620); for (uint32 tileIndex = 0; tileIndex < 48; tileIndex++) { _tiles[tileIndex] = insertSprite<AsScene1405Tile>(this, tileIndex); - _vm->_collisionMan->addSprite(_tiles[tileIndex]); + _vm->_collisionMan->addCollisionSprite(_tiles[tileIndex]); if (getSubVar(VA_IS_TILE_MATCH, tileIndex)) _tilesLeft--; } diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/module1600.cpp index 41fc415cfb..b40d580c4e 100644 --- a/engines/neverhood/module1600.cpp +++ b/engines/neverhood/module1600.cpp @@ -996,7 +996,7 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene1608::hmLowerFloor); _asKey = insertSprite<AsCommonKey>(this, 1, 1100, 198, 220); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); if (which < 0) { // Restoring game @@ -1014,10 +1014,10 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x10080E01); setPalette(0x10080E01); _asTape = insertSprite<AsScene1201Tape>(this, 13, 1100, 412, 443, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _klayman->setClipRect(_sprite1->getDrawRect().x, 0, 640, 480); SetUpdateHandler(&Scene1608::upLowerFloor); - insertMouse433(0x80E05108); + insertScreenMouse(0x80E05108); insertStaticSprite(0x4B18F868, 1200); } } else if (which == 0) { @@ -1031,8 +1031,8 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x10080E01); setPalette(0x10080E01); _asTape = insertSprite<AsScene1201Tape>(this, 13, 1100, 412, 443, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); - insertMouse433(0x80E05108); + _vm->_collisionMan->addCollisionSprite(_asTape); + insertScreenMouse(0x80E05108); _sprite1 = insertStaticSprite(0x7D0404E8, 1100); _klayman->setClipRect(_sprite1->getDrawRect().x, 0, 640, 480); SetUpdateHandler(&Scene1608::upLowerFloor); @@ -1045,7 +1045,7 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x98001604); setPalette(0x98001604); _palette->addPalette("paPodRed", 65, 31, 65); - insertMouse433(0x01600988); + insertScreenMouse(0x01600988); _sprite2 = insertStaticSprite(0x491F38A8, 1100); _asCar = createSprite<AsCommonCar>(this, 375, 227); // Create but don't add to the sprite list yet _asIdleCarLower = insertSprite<AsCommonIdleCarLower>(375, 227); @@ -1072,7 +1072,7 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) _asIdleCarLower->setClipRect(_clipRect1); _asIdleCarFull->setClipRect(_clipRect1); _asTape = insertSprite<AsScene1201Tape>(this, 13, 1100, 412, 443, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); insertSprite<AsCommonCarConnector>(_asCar)->setClipRect(_clipRect1); _klaymanInCar = false; _carClipFlag = false; @@ -1089,7 +1089,7 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x98001604); setPalette(0x98001604); _palette->addPalette("paPodRed", 65, 31, 65); - insertMouse433(0x01600988); + insertScreenMouse(0x01600988); _asCar = insertSprite<AsCommonCar>(this, 375, 227); _asIdleCarLower = insertSprite<AsCommonIdleCarLower>(375, 227); _asIdleCarFull = insertSprite<AsCommonIdleCarFull>(375, 227); @@ -1114,7 +1114,7 @@ Scene1608::Scene1608(NeverhoodEngine *vm, Module *parentModule, int which) _asIdleCarLower->setClipRect(_clipRect1); _asIdleCarFull->setClipRect(_clipRect1); _asTape = insertSprite<AsScene1201Tape>(this, 13, 1100, 412, 443, 0x9148A011); - // ... _vm->_collisionMan->addSprite(_asTape); + // ... _vm->_collisionMan->addCollisionSprite(_asTape); insertSprite<AsCommonCarConnector>(_asCar)->setClipRect(_clipRect1); _klaymanInCar = true; _carClipFlag = true; @@ -1313,13 +1313,13 @@ Scene1609::Scene1609(NeverhoodEngine *vm, Module *parentModule) setBackground(0x92124A14); setPalette(0x92124A14); - insertMouse435(0x24A10929, 20, 620); + insertPuzzleMouse(0x24A10929, 20, 620); for (int symbolPosition = 0; symbolPosition < 12; symbolPosition++) _asSymbols[symbolPosition] = insertSprite<AsScene3011Symbol>(symbolPosition, false); _ssButton = insertSprite<SsScene3011Button>(this, true); - _vm->_collisionMan->addSprite(_ssButton); + _vm->_collisionMan->addCollisionSprite(_ssButton); loadSound(0, 0x68E25540); } diff --git a/engines/neverhood/module1700.cpp b/engines/neverhood/module1700.cpp index aa145290eb..cf2fe63984 100644 --- a/engines/neverhood/module1700.cpp +++ b/engines/neverhood/module1700.cpp @@ -193,14 +193,14 @@ Scene1705::Scene1705(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addBasePalette(0x91D3A391, 0, 64, 0); _palette->copyBasePalette(0, 256, 0); addEntity(_palette); - insertMouse433(0x18222039); + insertScreenMouse(0x18222039); insertSprite<SsScene1705WallSymbol>(kScene1705FileHashes[getSubVar(VA_GOOD_CANNON_SYMBOLS_2, 0)], 0); insertSprite<SsScene1705WallSymbol>(kScene1705FileHashes[getSubVar(VA_GOOD_CANNON_SYMBOLS_2, 1)], 1); insertSprite<SsScene1705WallSymbol>(kScene1705FileHashes[getSubVar(VA_GOOD_CANNON_SYMBOLS_2, 2)], 2); _sprite = insertStaticSprite(0x31313A22, 1100); _ssTape = insertSprite<SsScene1705Tape>(this, 15, 1100, 238, 439, 0x02363852); - _vm->_collisionMan->addSprite(_ssTape); + _vm->_collisionMan->addCollisionSprite(_ssTape); if (which < 0) { // Restoring game diff --git a/engines/neverhood/module1900.cpp b/engines/neverhood/module1900.cpp index 269fd840a9..2557121c41 100644 --- a/engines/neverhood/module1900.cpp +++ b/engines/neverhood/module1900.cpp @@ -95,7 +95,7 @@ Scene1901::Scene1901(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x01303227); setPalette(0x01303227); - insertMouse433(0x0322301B); + insertScreenMouse(0x0322301B); insertStaticSprite(0x42213133, 1100); @@ -358,8 +358,8 @@ void AsScene1907Symbol::stFallOffHitGround() { playSound(1); sendMessage(_parentScene, 0x1022, 1000 + _newPositionIndex); Entity::_priority = 1000 - _newPositionIndex; - _vm->_collisionMan->removeSprite(this); - _vm->_collisionMan->addSprite(this); + _vm->_collisionMan->removeCollisionSprite(this); + _vm->_collisionMan->addCollisionSprite(this); SetSpriteUpdate(&AsScene1907Symbol::suFallOffHitGround); NextState(&AsScene1907Symbol::cbFallOffHitGroundEvent); _newStickFrameIndex = 0; @@ -527,15 +527,15 @@ Scene1907::Scene1907(NeverhoodEngine *vm, Module *parentModule) for (int i = 0; i < 9; i++) { _asSymbols[i] = insertSprite<AsScene1907Symbol>(this, i, getRandomPositionIndex()); - _vm->_collisionMan->addSprite(_asSymbols[i]); + _vm->_collisionMan->addCollisionSprite(_asSymbols[i]); } _ssUpDownButton = insertSprite<SsScene1907UpDownButton>(this, _asSymbols[8]); - _vm->_collisionMan->addSprite(_ssUpDownButton); + _vm->_collisionMan->addCollisionSprite(_ssUpDownButton); _asWaterHint = insertSprite<AsScene1907WaterHint>(); - insertMouse435(0x28E0120E, 20, 620); + insertPuzzleMouse(0x28E0120E, 20, 620); SetMessageHandler(&Scene1907::handleMessage); SetUpdateHandler(&Scene1907::update); diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/module2000.cpp index ce871de5e8..643bec4d49 100644 --- a/engines/neverhood/module2000.cpp +++ b/engines/neverhood/module2000.cpp @@ -103,7 +103,7 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0xA6417244); setPalette(0xA6417244); - insertMouse433(0x17240A6C); + insertScreenMouse(0x17240A6C); tempSprite = insertStaticSprite(0x0D641724, 1100); diff --git a/engines/neverhood/module2100.cpp b/engines/neverhood/module2100.cpp index 7bbb9e8158..12b10b43e2 100644 --- a/engines/neverhood/module2100.cpp +++ b/engines/neverhood/module2100.cpp @@ -203,15 +203,15 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x44242305); setPalette(0x44242305); - insertMouse433(0x4230144A); + insertScreenMouse(0x4230144A); insertStaticSprite(0x00502330, 1100); tempSprite = insertStaticSprite(0x78492010, 1100); _ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x72427010, 0x32423010, 200, 0); _asTape1 = insertSprite<AsScene1201Tape>(this, 18, 1100, 412, 443, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape1); + _vm->_collisionMan->addCollisionSprite(_asTape1); _asTape2 = insertSprite<AsScene1201Tape>(this, 11, 1100, 441, 443, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape2); + _vm->_collisionMan->addCollisionSprite(_asTape2); if (which < 0) { insertKlayman<KmScene2101>(380, 438); diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp index 8061e977f1..dc77a5ea08 100644 --- a/engines/neverhood/module2200.cpp +++ b/engines/neverhood/module2200.cpp @@ -548,10 +548,10 @@ Scene2201::Scene2201(NeverhoodEngine *vm, Module *parentModule, int which) loadHitRectList(); setBackground(0x40008208); setPalette(0x40008208); - insertMouse433(0x0820C408); + insertScreenMouse(0x0820C408); _asTape = insertSprite<AsScene1201Tape>(this, 7, 1100, 459, 432, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _ssDoorButton = insertSprite<SsCommonPressButton>(this, 0xE4A43E29, 0xE4A43E29, 100, 0); for (uint32 cubeIndex = 0; cubeIndex < 9; cubeIndex++) @@ -881,13 +881,13 @@ Scene2202::Scene2202(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x08100A0C); setPalette(0x08100A0C); addEntity(_palette); - insertMouse435(0x00A08089, 20, 620); + insertPuzzleMouse(0x00A08089, 20, 620); for (uint32 cubePosition = 0; cubePosition < 9; cubePosition++) { int16 cubeSymbol = (int16)getSubVar(VA_CUBE_POSITIONS, cubePosition); if (cubeSymbol >= 0) { Sprite *puzzleCubeSprite = insertSprite<SsScene2202PuzzleCube>(this, cubePosition, cubeSymbol); - _vm->_collisionMan->addSprite(puzzleCubeSprite); + _vm->_collisionMan->addCollisionSprite(puzzleCubeSprite); } } @@ -1094,17 +1094,17 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x82C80334); setPalette(0x82C80334); - insertMouse433(0x80330824); + insertScreenMouse(0x80330824); setHitRects(0x004B8320); setRectList(0x004B8420); if (getGlobalVar(V_KEY3_LOCATION) == 1) { _asKey = insertSprite<AsCommonKey>(this, 2, 1100, 282, 432); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } _asTape = insertSprite<AsScene1201Tape>(this, 1, 1100, 435, 432, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _asLeftDoor = insertSprite<AsScene2203Door>(this, 0); _asRightDoor = insertSprite<AsScene2203Door>(this, 1); _ssSmallLeftDoor = insertStaticSprite(0x542CC072, 1100); @@ -1113,8 +1113,8 @@ Scene2203::Scene2203(NeverhoodEngine *vm, Module *parentModule, int which) _rightDoorClipRect.set(0, 0, _ssSmallRightDoor->getDrawRect().x2(), 480); sendEntityMessage(_asLeftDoor, 0x2000, _asRightDoor); sendEntityMessage(_asRightDoor, 0x2000, _asLeftDoor); - _vm->_collisionMan->addSprite(_asLeftDoor); - _vm->_collisionMan->addSprite(_asRightDoor); + _vm->_collisionMan->addCollisionSprite(_asLeftDoor); + _vm->_collisionMan->addCollisionSprite(_asRightDoor); if (which < 0) { // Restoring game @@ -1227,14 +1227,14 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x0008028D); setPalette(0x0008028D); addEntity(_palette); - insertMouse433(0x80289008); + insertScreenMouse(0x80289008); _ssLightSwitch = insertSprite<SsCommonPressButton>(this, 0x2D339030, 0x2D309030, 100, 0); } else { _isLightOn = false; setBackground(0xD00A028D); setPalette(0xD00A028D); addEntity(_palette); - insertMouse433(0xA0289D08); + insertScreenMouse(0xA0289D08); _ssLightSwitch = insertSprite<SsCommonPressButton>(this, 0x2D339030, 0xDAC86E84, 100, 0); } _palette->addBasePalette(0xD00A028D, 0, 256, 0); @@ -1467,7 +1467,7 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which) _asDoorSpikes->setClipRect(_sprite2->getDrawRect().x, 0, 640, 480); setRectList(0x004B8AF8); _ssButton = insertSprite<SsCommonButtonSprite>(this, 0x0E038022, 100, 0); - insertMouse433(0x83212411); + insertScreenMouse(0x83212411); _ssTestTube = insertSprite<SsScene2206TestTube>(this, 1100, /*464, 433, */0x5E00E262); _asPlatform = insertSprite<AsScene2206Platform>(0x085E25E0); } else { @@ -1479,7 +1479,7 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which) _asDoorSpikes->setClipRect(_sprite2->getDrawRect().x, 0, 640, 480); setRectList(0x004B8B58); _ssButton = insertSprite<SsCommonButtonSprite>(this, 0x16882608, 100, 0); - insertMouse433(0x02A41E09); + insertScreenMouse(0x02A41E09); _ssTestTube = insertSprite<SsScene2206TestTube>(this, 1100, /*464, 433, */0x52032563); _asPlatform = insertSprite<AsScene2206Platform>(0x317831A0); } @@ -1491,7 +1491,7 @@ Scene2206::Scene2206(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addBasePalette(fileHash, 0, 256, 0); if (!getGlobalVar(V_LIGHTS_ON)) _palette->addPalette(0x0263D144, 0, 65, 0); - _vm->_collisionMan->addSprite(_ssTestTube); + _vm->_collisionMan->addCollisionSprite(_ssTestTube); if (which < 0) { // Restoring game @@ -1944,14 +1944,14 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule) if (getGlobalVar(V_LIGHTS_ON)) { setBackground(0x88C00241); setPalette(0x88C00241); - insertMouse433(0x00245884); + insertScreenMouse(0x00245884); _ssMaskPart1 = insertStaticSprite(0xE20A28A0, 1200); _ssMaskPart2 = insertStaticSprite(0x688F62A5, 1100); _ssMaskPart3 = insertStaticSprite(0x0043B038, 1100); _asTape = insertSprite<AsScene1201Tape>(this, 4, 1100, 277, 428, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _asLever = insertSprite<AsScene2207Lever>(this, 527, 333, 0); - _vm->_collisionMan->addSprite(_asLever); + _vm->_collisionMan->addCollisionSprite(_asLever); _asWallRobotAnimation = insertSprite<AsScene2207WallRobotAnimation>(this); _asWallCannonAnimation = insertSprite<AsScene2207WallCannonAnimation>(); _asWallRobotAnimation->setVisible(false); @@ -1964,7 +1964,7 @@ Scene2207::Scene2207(NeverhoodEngine *vm, Module *parentModule) setGlobalVar(V_SEEN_SYMBOLS_NO_LIGHT, 1); setBackground(0x05C02A55); setPalette(0x05C02A55); - insertMouse433(0x02A51054); + insertScreenMouse(0x02A51054); _ssMaskPart1 = insertStaticSprite(0x980E46A4, 1200); insertSprite<SsScene2207Symbol>(kScene2207FileHashes[getSubVar(VA_GOOD_CANNON_SYMBOLS_1, 0)], 0); insertSprite<SsScene2207Symbol>(kScene2207FileHashes[getSubVar(VA_GOOD_CANNON_SYMBOLS_1, 1)], 1); @@ -2134,7 +2134,7 @@ Scene2208::Scene2208(NeverhoodEngine *vm, Module *parentModule, int which) addBackground(_background); setPalette(0x08100289); addEntity(_palette); - insertMouse435(0x0028D089, 40, 600); + insertPuzzleMouse(0x0028D089, 40, 600); createFontSurface(); _backgroundSurface = new BaseSurface(_vm, 0, 640, 480); @@ -2296,7 +2296,7 @@ Scene2242::Scene2242(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_LIGHTS_ON)) { setBackground(0x11840E24); setPalette(0x11840E24); - insertMouse433(0x40E20110); + insertScreenMouse(0x40E20110); setRectList(0x004B3DC8); } else { setBackground(0x25848E24); @@ -2304,12 +2304,12 @@ Scene2242::Scene2242(NeverhoodEngine *vm, Module *parentModule, int which) addEntity(_palette); _palette->copyBasePalette(0, 256, 0); _palette->addPalette(0x68033B1C, 0, 65, 0); - insertMouse433(0x48E20250); + insertScreenMouse(0x48E20250); setRectList(0x004B3E18); } _asTape = insertSprite<AsScene1201Tape>(this, 10, 1100, 464, 435, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); if (which < 0) { // Restoring game @@ -2418,12 +2418,12 @@ HallOfRecordsScene::HallOfRecordsScene(NeverhoodEngine *vm, Module *parentModule setRectList(0x004B2BF8); setBackground(_hallOfRecordsInfo->bgFilename2); setPalette(_hallOfRecordsInfo->bgFilename2); - insertMouse433(0x14320138); + insertScreenMouse(0x14320138); } else { setRectList(0x004B2BB8); setBackground(_hallOfRecordsInfo->bgFilename1); setPalette(_hallOfRecordsInfo->bgFilename1); - insertMouse433(0x63A40028); + insertScreenMouse(0x63A40028); } if (which < 0) { @@ -2507,12 +2507,12 @@ Scene2247::Scene2247(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004B5588); setBackground(0x40339414); setPalette(0x40339414); - insertMouse433(0x3941040B); + insertScreenMouse(0x3941040B); } else { setRectList(0x004B55C8); setBackground(0x071963E5); setPalette(0x071963E5); - insertMouse433(0x14320138); + insertScreenMouse(0x14320138); } if (which < 0) { diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp index 3acb8b4a1f..ed9e23155d 100644 --- a/engines/neverhood/module2400.cpp +++ b/engines/neverhood/module2400.cpp @@ -382,7 +382,7 @@ Scene2401::Scene2401(NeverhoodEngine *vm, Module *parentModule, int which) addEntity(_palette); _palette->addBasePalette(0x8C030206, 0, 256, 0); _palette->addPalette(0x91D3A391, 0, 65, 0); - insertMouse433(0x302028C8); + insertScreenMouse(0x302028C8); _sprite1 = insertStaticSprite(0x2E068A23, 200); insertStaticSprite(0x401410A6, 200); @@ -694,9 +694,9 @@ Scene2402::Scene2402(NeverhoodEngine *vm, Module *parentModule, int which) setRectList(0x004AF900); setBackground(0x81660220); setPalette(0x81660220); - insertMouse433(0x6022481E); + insertScreenMouse(0x6022481E); _asTape = insertSprite<AsScene1201Tape>(this, 9, 1100, 286, 409, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _ssButton = insertSprite<SsCommonButtonSprite>(this, 0x15288120, 100, 0); if (which < 0) { @@ -794,9 +794,9 @@ Scene2403::Scene2403(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x0C05060C); setPalette(0x0C05060C); _palette->addPalette(0x414364B0, 0, 65, 0); - insertMouse433(0x506080C8); + insertScreenMouse(0x506080C8); _asTape = insertSprite<AsScene1201Tape>(this, 2, 1100, 480, 454, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); _asLightCord = insertSprite<AsScene2803LightCord>(this, 0xA1095A10, 0x836D3813, 368, 200); _asLightCord->setClipRect(0, 25, 640, 480); @@ -889,15 +889,15 @@ Scene2406::Scene2406(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene2406::handleMessage); setRectList(0x004B78C8); - insertMouse433(0xB03001A8); + insertScreenMouse(0xB03001A8); if (getGlobalVar(V_KEY3_LOCATION) == 2) { _asKey = insertSprite<AsCommonKey>(this, 2, 1100, 560, 409); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } _asTape = insertSprite<AsScene1201Tape>(this, 5, 1100, 456, 409, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); tempSprite2 = insertStaticSprite(0x19625293, 1100); _clipRects[0].x1 = 0; _clipRects[0].y1 = 0; diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp index 34793877c6..3fc508a4a6 100644 --- a/engines/neverhood/module2500.cpp +++ b/engines/neverhood/module2500.cpp @@ -232,7 +232,7 @@ Scene2501::Scene2501(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(0x1B8E8115); _palette->addPalette(0x00128842, 65, 31, 65); _palette->addPalette("paKlayRed", 0, 64, 0); - insertMouse433(0xE81111B0); + insertScreenMouse(0xE81111B0); _ssTrackShadowBackground = createSprite<SsCommonTrackShadowBackground>(0x99BE9015); // Don't add this to the sprite list addEntity(_ssTrackShadowBackground); @@ -542,8 +542,8 @@ Scene2504::Scene2504(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x90791B80); setPalette(0x90791B80); ssButton = insertSprite<SsScene2504Button>(); - _vm->_collisionMan->addSprite(ssButton); - insertMouse435(0x91B8490F, 20, 620); + _vm->_collisionMan->addCollisionSprite(ssButton); + insertPuzzleMouse(0x91B8490F, 20, 620); SetMessageHandler(&Scene2504::handleMessage); SetUpdateHandler(&Scene::update); } diff --git a/engines/neverhood/module2600.cpp b/engines/neverhood/module2600.cpp index 741f4138b9..91132c030a 100644 --- a/engines/neverhood/module2600.cpp +++ b/engines/neverhood/module2600.cpp @@ -317,8 +317,8 @@ Scene2609::Scene2609(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(0x51409A16); _asWater = insertSprite<AsScene2609Water>(); _ssButton = insertSprite<SsScene2609Button>(this); - _vm->_collisionMan->addSprite(_ssButton); - insertMouse435(0x09A1251C, 20, 620); + _vm->_collisionMan->addCollisionSprite(_ssButton); + insertPuzzleMouse(0x09A1251C, 20, 620); insertStaticSprite(0x02138002, 1200); insertStaticSprite(0x825E2827, 1200); } diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp index 50b4b24e65..b22da94048 100644 --- a/engines/neverhood/module2700.cpp +++ b/engines/neverhood/module2700.cpp @@ -626,7 +626,7 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(sceneInfo->bgFilename); _palette->addPalette(calcHash("paPodFloor"), 65, 31, 65); _palette->addPalette(calcHash("paKlayFloor"), 0, 65, 0); - insertMouse433(0x08B08180); + insertScreenMouse(0x08B08180); tempSprite = insertStaticSprite(0x1E086325, 1200); clipRect.set(0, 0, 640, tempSprite->getDrawRect().y2()); @@ -734,7 +734,7 @@ Scene2702::Scene2702(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addPalette(calcHash("paPodFloor"), 65, 31, 65); _palette->addPalette(calcHash("paKlayFloor"), 0, 65, 0); addEntity(_palette); - insertMouse433(0x08B04180); + insertScreenMouse(0x08B04180); _ssTrackShadowBackground = createSprite<SsCommonTrackShadowBackground>(0x12002035); addEntity(_ssTrackShadowBackground); @@ -894,7 +894,7 @@ Scene2703::Scene2703(NeverhoodEngine *vm, Module *parentModule, int which, uint3 _palette->addPalette(calcHash("paPodShade"), 65, 31, 65); _palette->addPalette(calcHash("paKlayShade"), 0, 65, 0); addEntity(_palette); - insertMouse433(sceneInfo->mouseCursorFilename); + insertScreenMouse(sceneInfo->mouseCursorFilename); _palStatus = 2; @@ -1015,7 +1015,7 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3 while (staticSprites && *staticSprites) insertStaticSprite(*staticSprites++, 1100); - insertMouse433(sceneInfo->mouseCursorFilename); + insertScreenMouse(sceneInfo->mouseCursorFilename); if (sceneInfo->bgShadowFilename) { _ssTrackShadowBackground = createSprite<SsCommonTrackShadowBackground>(sceneInfo->bgShadowFilename); @@ -1111,7 +1111,7 @@ Scene2706::Scene2706(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addPalette(calcHash("paPodShade"), 65, 31, 65); _palette->addPalette(calcHash("paKlayShade"), 0, 65, 0); - insertMouse433(0x08B8C180); + insertScreenMouse(0x08B8C180); _ssTrackShadowBackground = createSprite<SsCommonTrackShadowBackground>(0x18808B88); addEntity(_ssTrackShadowBackground); @@ -1224,7 +1224,7 @@ Scene2732::Scene2732(NeverhoodEngine *vm, Module *parentModule) setBackground(0x0220C041); setPalette(0x0220C041); - insertMouse433(0x0C04502A); + insertScreenMouse(0x0C04502A); setRectList(0x004AE360); insertKlayman<KmScene2732>(108, 331); diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp index e40890a882..25360ac9d5 100644 --- a/engines/neverhood/module2800.cpp +++ b/engines/neverhood/module2800.cpp @@ -468,9 +468,9 @@ Scene2801::Scene2801(NeverhoodEngine *vm, Module *parentModule, int which) _sprite1 = insertStaticSprite(0x100CA0A8, 1100); _sprite2 = insertStaticSprite(0x287C21A4, 1100); _klayman->setClipRect(_sprite1->getDrawRect().x, 0, _sprite2->getDrawRect().x2(), 480); - insertMouse433(0x0066201C); + insertScreenMouse(0x0066201C); _asTape = insertSprite<AsScene1201Tape>(this, 8, 1100, 302, 437, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else if (getGlobalVar(V_RADIO_ROOM_RIGHT_DOOR)) { setRectList(0x004B6CD0); setBackground(0x11E00684); @@ -479,9 +479,9 @@ Scene2801::Scene2801(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addBasePalette(0x11E00684, 0, 256, 0); _sprite2 = insertStaticSprite(0x061601C8, 1100); _klayman->setClipRect(0, 0, _sprite2->getDrawRect().x2(), 480); - insertMouse433(0x00680116); + insertScreenMouse(0x00680116); _asTape = insertSprite<SsScene1705Tape>(this, 8, 1100, 302, 437, 0x01142428); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else { setRectList(0x004B6CF0); setBackground(0x030006E6); @@ -490,9 +490,9 @@ Scene2801::Scene2801(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addBasePalette(0x030006E6, 0, 256, 0); _sprite2 = insertStaticSprite(0x273801CE, 1100); _klayman->setClipRect(0, 0, _sprite2->getDrawRect().x2(), 480); - insertMouse433(0x006E2038); + insertScreenMouse(0x006E2038); _asTape = insertSprite<AsScene1201Tape>(this, 8, 1100, 302, 437, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } addEntity(_palette); @@ -537,7 +537,7 @@ Scene2802::Scene2802(NeverhoodEngine *vm, Module *parentModule, int which) SetMessageHandler(&Scene2802::handleMessage); SetUpdateHandler(&Scene2802::update); - insertMouse435(0x008810A8, 20, 620); + insertPuzzleMouse(0x008810A8, 20, 620); _smackerPlayer = addSmackerPlayer(new SmackerPlayer(_vm, this, 0x8284C100, true, true, true)); _currRadioMusicIndex = getGlobalVar(V_CURR_RADIO_MUSIC_INDEX); // Need to go to the first frame first to load up the palette @@ -871,7 +871,7 @@ Scene2803::Scene2803(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(0x412A423E); addEntity(_palette); - insertMouse433(0xA423A41A); + insertScreenMouse(0xA423A41A); if (getSubVar(VA_GOOD_TEST_TUBES_LEVEL_1, 0) == 0) { _asTestTubeOne = (StaticSprite*)insertStaticSprite(0x66121222, 100); @@ -1121,7 +1121,7 @@ Scene2803Small::Scene2803Small(NeverhoodEngine *vm, Module *parentModule, int wh SetMessageHandler(&Scene2803Small::handleMessage); loadDataResource(0x81120132); - insertMouse433(0x00A05290); + insertScreenMouse(0x00A05290); insertSprite<AsScene2803LightCord>(this, 0xAFAD591A, 0x276E321D, 578, 200); @@ -1743,7 +1743,7 @@ Scene2804::Scene2804(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0xA1D03005); setPalette(0xA1D03005); addEntity(_palette); - insertMouse435(0x03001A15, 20, 620); + insertPuzzleMouse(0x03001A15, 20, 620); _asCoil = insertSprite<SsScene2804LightCoil>(); _asTarget = insertSprite<SsScene2804LightTarget>(); } else { @@ -1751,7 +1751,7 @@ Scene2804::Scene2804(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x01C01414); setPalette(0x01C01414); addEntity(_palette); - insertMouse435(0x01410014, 20, 620); + insertPuzzleMouse(0x01410014, 20, 620); ssBeamCoilBody = insertSprite<SsScene2804BeamCoilBody>(); _asCoil = insertSprite<AsScene2804BeamCoil>(this, ssBeamCoilBody); _asTarget = insertSprite<AsScene2804BeamTarget>(); @@ -1759,7 +1759,7 @@ Scene2804::Scene2804(NeverhoodEngine *vm, Module *parentModule, int which) } _ssRedButton = insertSprite<SsScene2804RedButton>(this); - _vm->_collisionMan->addSprite(_ssRedButton); + _vm->_collisionMan->addCollisionSprite(_ssRedButton); for (uint crystalIndex = 0; crystalIndex < 5; crystalIndex++) { AsScene2804CrystalWaves *asCrystalWaves = NULL; @@ -1767,7 +1767,7 @@ Scene2804::Scene2804(NeverhoodEngine *vm, Module *parentModule, int which) asCrystalWaves = insertSprite<AsScene2804CrystalWaves>(crystalIndex); _asCrystals[crystalIndex] = insertSprite<AsScene2804Crystal>(asCrystalWaves, crystalIndex); _ssCrystalButtons[crystalIndex] = insertSprite<SsScene2804CrystalButton>(this, _asCrystals[crystalIndex], crystalIndex); - _vm->_collisionMan->addSprite(_ssCrystalButtons[crystalIndex]); + _vm->_collisionMan->addCollisionSprite(_ssCrystalButtons[crystalIndex]); } } @@ -1889,7 +1889,7 @@ Scene2805::Scene2805(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x08021E04); setPalette(0x08021E04); _palette->addPalette(0x8A6B1F91, 0, 65, 0); - insertMouse433(0x21E00088); + insertScreenMouse(0x21E00088); _sprite1 = insertStaticSprite(0x008261E7, 1100); _sprite2 = insertStaticSprite(0x020CE421, 1100); @@ -1982,7 +1982,7 @@ Scene2806::Scene2806(NeverhoodEngine *vm, Module *parentModule, int which) _pointList = _dataResource.getPointArray(0x3606A422); - insertMouse433(0x22114C13); + insertScreenMouse(0x22114C13); setBackground(0xC1B22110); setPalette(0xC1B22110); @@ -2119,7 +2119,7 @@ Scene2807::Scene2807(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x3E049A95); setPalette(0x3E049A95); - insertMouse435(0x49A913E8, 20, 620); + insertPuzzleMouse(0x49A913E8, 20, 620); } @@ -2438,19 +2438,19 @@ Scene2808::Scene2808(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(kScene2808FileHashes1[which]); asHandle = insertSprite<AsScene2808Handle>(this, which); - _vm->_collisionMan->addSprite(asHandle); + _vm->_collisionMan->addCollisionSprite(asHandle); _asFlow = insertSprite<AsScene2808Flow>(this, which); insertSprite<AsScene2808LightEffect>(which); for (int testTubeIndex = 0; testTubeIndex < 3; testTubeIndex++) { SsScene2808Dispenser *ssDispenser = insertSprite<SsScene2808Dispenser>(this, which, testTubeIndex); - _vm->_collisionMan->addSprite(ssDispenser); + _vm->_collisionMan->addCollisionSprite(ssDispenser); _asTestTubes[testTubeIndex] = insertSprite<AsScene2808TestTube>(which, testTubeIndex, ssDispenser); - _vm->_collisionMan->addSprite(_asTestTubes[testTubeIndex]); + _vm->_collisionMan->addCollisionSprite(_asTestTubes[testTubeIndex]); } - insertMouse433(kScene2808FileHashes2[which]); + insertScreenMouse(kScene2808FileHashes2[which]); } @@ -2570,7 +2570,7 @@ Scene2809::Scene2809(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0xB22116C5); setPalette(0xB22116C5); - insertMouse433(0x116C1B2A); + insertScreenMouse(0x116C1B2A); _sprite1 = insertStaticSprite(0x1FA2EB82, 1100); @@ -2711,7 +2711,7 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0x26508804); setPalette(0x26508804); - insertMouse433(0x0880026D); + insertScreenMouse(0x0880026D); _sprite6 = insertStaticSprite(0x03615227, 1100); _sprite5 = insertStaticSprite(0xE059A224, 1100); @@ -2727,10 +2727,10 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) if (getGlobalVar(V_KLAYMAN_SMALL)) { _asTape = insertSprite<AsScene1201Tape>(this, 0, 900, 245, 429, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } else { _asTape = insertSprite<AsScene1201Tape>(this, 0, 1100, 245, 429, 0x9148A011); - _vm->_collisionMan->addSprite(_asTape); + _vm->_collisionMan->addCollisionSprite(_asTape); } _sprite1 = insertStaticSprite(0x430001C4, 1200); @@ -2752,7 +2752,7 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) setMessageList(0x004AE438); setRectList(0x004AE810); _isRopingDown = false; - _vm->_collisionMan->removeSprite(_asTape); + _vm->_collisionMan->removeCollisionSprite(_asTape); } else { insertKlayman<KmScene2810>(300, 424, _clipRects, 2); setMessageList(0x004AE438); @@ -2796,7 +2796,7 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) setMessageList(0x004AE6D8); setRectList(0x004AE810); _isRopingDown = false; - _vm->_collisionMan->removeSprite(_asTape); + _vm->_collisionMan->removeCollisionSprite(_asTape); } else { insertKlaymanLadder(); if (getGlobalVar(V_LADDER_DOWN_ACTION)) { @@ -2819,7 +2819,7 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) setMessageList(0x004AE428); setRectList(0x004AE810); _isRopingDown = false; - _vm->_collisionMan->removeSprite(_asTape); + _vm->_collisionMan->removeCollisionSprite(_asTape); } else { insertKlayman<KmScene2810>(450, 424, _clipRects, 2); setMessageList(0x004AE418); @@ -2838,7 +2838,7 @@ Scene2810::Scene2810(NeverhoodEngine *vm, Module *parentModule, int which) setMessageList(0x004AE410); setRectList(0x004AE810); _isRopingDown = false; - _vm->_collisionMan->removeSprite(_asTape); + _vm->_collisionMan->removeCollisionSprite(_asTape); } } @@ -3035,15 +3035,15 @@ Scene2812::Scene2812(NeverhoodEngine *vm, Module *parentModule, int which) _palette->addBasePalette(0x03600606, 0, 256, 0); _sprite1 = insertStaticSprite(0x0C06C860, 1100); - insertMouse433(0x0060203E); + insertScreenMouse(0x0060203E); if (getGlobalVar(V_KEY3_LOCATION) == 3) { _asKey = insertSprite<AsCommonKey>(this, 2, 1100, 474, 437); - _vm->_collisionMan->addSprite(_asKey); + _vm->_collisionMan->addCollisionSprite(_asKey); } _ssTape = insertSprite<SsScene1705Tape>(this, 6, 1100, 513, 437, 0xA1361863); - _vm->_collisionMan->addSprite(_ssTape); + _vm->_collisionMan->addCollisionSprite(_ssTape); _asWinch = insertSprite<AsScene2812Winch>(); _asTrapDoor = insertSprite<AsScene2812TrapDoor>(); @@ -3181,7 +3181,7 @@ Scene2822::Scene2822(NeverhoodEngine *vm, Module *parentModule, int which) addBackground(_background); _background->getSurface()->getDrawRect().y = -10; setPalette(0xD542022E); - insertMouse435(0x0028D089, 20, 620); + insertPuzzleMouse(0x0028D089, 20, 620); _ssButton = insertStaticSprite(0x1A4D4120, 1100); _ssButton->setVisible(false); loadSound(2, 0x19044E72); diff --git a/engines/neverhood/module2900.cpp b/engines/neverhood/module2900.cpp index 4b8f28ea7e..551d6cbce7 100644 --- a/engines/neverhood/module2900.cpp +++ b/engines/neverhood/module2900.cpp @@ -365,7 +365,7 @@ Scene2901::Scene2901(NeverhoodEngine *vm, Module *parentModule, int which) for (uint i = 0; i < 6; ++i) { if (i != 2 || !_isButton2Broken) { _ssLocationButtons[i] = insertSprite<SsScene2901LocationButton>(this, _currLocationButtonNum, i); - _vm->_collisionMan->addSprite(_ssLocationButtons[i]); + _vm->_collisionMan->addCollisionSprite(_ssLocationButtons[i]); _ssLocationButtonLights[i] = insertSprite<SsScene2901LocationButtonLight>(_currLocationButtonNum, i); } } @@ -374,9 +374,9 @@ Scene2901::Scene2901(NeverhoodEngine *vm, Module *parentModule, int which) insertSprite<SsScene2901BrokenButton>(_currLocationButtonNum); _ssBigButton = insertSprite<SsScene2901BigButton>(this, _currLocationButtonNum); - _vm->_collisionMan->addSprite(_ssBigButton); + _vm->_collisionMan->addCollisionSprite(_ssBigButton); - insertMouse435(kScene2901FileHashes2[_currLocationButtonNum], 20, 620); + insertPuzzleMouse(kScene2901FileHashes2[_currLocationButtonNum], 20, 620); SetUpdateHandler(&Scene2901::update); SetMessageHandler(&Scene2901::handleMessage); diff --git a/engines/neverhood/module3000.cpp b/engines/neverhood/module3000.cpp index 1fc1f5339b..6767aa56ea 100644 --- a/engines/neverhood/module3000.cpp +++ b/engines/neverhood/module3000.cpp @@ -712,9 +712,9 @@ AsScene3009Symbol::AsScene3009Symbol(NeverhoodEngine *vm, Scene3009 *parentScene SetUpdateHandler(&AnimatedSprite::update); SetMessageHandler(&AsScene3009Symbol::handleMessage); _ssArrowPrev = _parentScene->insertSprite<SsScene3009SymbolArrow>(this, _symbolPosition * 2 + 0); - _vm->_collisionMan->addSprite(_ssArrowPrev); + _vm->_collisionMan->addCollisionSprite(_ssArrowPrev); _ssArrowNext = _parentScene->insertSprite<SsScene3009SymbolArrow>(this, _symbolPosition * 2 + 1); - _vm->_collisionMan->addSprite(_ssArrowNext); + _vm->_collisionMan->addCollisionSprite(_ssArrowNext); } uint32 AsScene3009Symbol::handleMessage(int messageNum, const MessageParam ¶m, Entity *sender) { @@ -766,16 +766,16 @@ Scene3009::Scene3009(NeverhoodEngine *vm, Module *parentModule, int which) setBackground(0xD000420C); setPalette(0xD000420C); - insertMouse435(0x04208D08, 20, 620); + insertPuzzleMouse(0x04208D08, 20, 620); _ssFireCannonButton = insertSprite<SsScene3009FireCannonButton>(this); - _vm->_collisionMan->addSprite(_ssFireCannonButton); + _vm->_collisionMan->addCollisionSprite(_ssFireCannonButton); _asVerticalIndicator = insertSprite<AsScene3009VerticalIndicator>(this, _cannonTargetStatus); - _vm->_collisionMan->addSprite(_asVerticalIndicator); + _vm->_collisionMan->addCollisionSprite(_asVerticalIndicator); _asHorizontalIndicator = insertSprite<AsScene3009HorizontalIndicator>(this, _cannonTargetStatus); - _vm->_collisionMan->addSprite(_asHorizontalIndicator); + _vm->_collisionMan->addCollisionSprite(_asHorizontalIndicator); if (_cannonTargetStatus != kCTSNull && _cannonTargetStatus != kCTSRightRobotNoTarget && _cannonTargetStatus != kCTSRightRobotIsTarget && _cannonTargetStatus != kCTSRightNoRobot) { _keepVideo = true; @@ -1235,7 +1235,7 @@ Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which) for (int i = 0; i < 3; i++) { _asDeadBolts[i] = insertSprite<AsScene3010DeadBolt>(this, i, which == 1);//CHECKME _ssDeadBoltButtons[i] = insertSprite<SsScene3010DeadBoltButton>(this, i, initCountdown, which == 1);//CHECKME - _vm->_collisionMan->addSprite(_ssDeadBoltButtons[i]); + _vm->_collisionMan->addCollisionSprite(_ssDeadBoltButtons[i]); if (getSubVar(VA_LOCKS_DISABLED, kScene3010ButtonNameHashes[i])) initCountdown++; _boltUnlocking[i] = false; @@ -1243,7 +1243,7 @@ Scene3010::Scene3010(NeverhoodEngine *vm, Module *parentModule, int which) } if (which == 0) { - insertMouse435(0x02622800, 20, 620); + insertPuzzleMouse(0x02622800, 20, 620); } loadSound(0, 0x68E25540); @@ -1460,13 +1460,13 @@ Scene3011::Scene3011(NeverhoodEngine *vm, Module *parentModule, int which) setPalette(0xA4070114); addEntity(_palette); - insertMouse435(0x24A00929, 20, 620); + insertPuzzleMouse(0x24A00929, 20, 620); for (int symbolIndex = 0; symbolIndex < 12; symbolIndex++) _asSymbols[symbolIndex] = insertSprite<AsScene3011Symbol>(symbolIndex, true); _ssButton = insertSprite<SsScene3011Button>(this, true); - _vm->_collisionMan->addSprite(_ssButton); + _vm->_collisionMan->addCollisionSprite(_ssButton); } diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp index c899a59408..3f0c92f233 100644 --- a/engines/neverhood/scene.cpp +++ b/engines/neverhood/scene.cpp @@ -42,7 +42,7 @@ Scene::Scene(NeverhoodEngine *vm, Module *parentModule, bool clearHitRects) _background = NULL; if (clearHitRects) { _vm->_collisionMan->clearHitRects(); - _vm->_collisionMan->clearSprites(); + _vm->_collisionMan->clearCollisionSprites(); } _vm->_screen->setFps(24); _vm->_screen->setSmackerDecoder(NULL); @@ -160,7 +160,7 @@ void Scene::setSpriteSurfacePriority(Sprite *sprite, int priority) { } void Scene::deleteSprite(Sprite **sprite) { - _vm->_collisionMan->removeSprite(*sprite); + _vm->_collisionMan->removeCollisionSprite(*sprite); removeSurface((*sprite)->getSurface()); removeEntity(*sprite); delete *sprite; @@ -194,7 +194,7 @@ Sprite *Scene::insertStaticSprite(uint32 fileHash, int surfacePriority) { return addSprite(new StaticSprite(_vm, fileHash, surfacePriority)); } -void Scene::insertMouse433(uint32 fileHash, const NRect *mouseRect) { +void Scene::insertScreenMouse(uint32 fileHash, const NRect *mouseRect) { NRect rect(-1, -1, -1, -1); if (mouseRect) rect = *mouseRect; @@ -202,7 +202,7 @@ void Scene::insertMouse433(uint32 fileHash, const NRect *mouseRect) { addEntity(_mouseCursor); } -void Scene::insertMouse435(uint32 fileHash, int16 x1, int16 x2) { +void Scene::insertPuzzleMouse(uint32 fileHash, int16 x1, int16 x2) { _mouseCursor = new Mouse(_vm, fileHash, x1, x2); addEntity(_mouseCursor); } @@ -317,8 +317,8 @@ uint32 Scene::handleMessage(int messageNum, const MessageParam ¶m, Entity *s } bool Scene::queryPositionSprite(int16 mouseX, int16 mouseY) { - for (uint i = 0; i < _vm->_collisionMan->getSpriteCount(); i++) { - Sprite *sprite = _vm->_collisionMan->getSprite(i); + for (uint i = 0; i < _vm->_collisionMan->getCollisionSpritesCount(); i++) { + Sprite *sprite = _vm->_collisionMan->getCollisionSprite(i); if (sprite->hasMessageHandler() && sprite->isPointInside(mouseX, mouseY) && sendPointMessage(sprite, 0x1011, _mouseClickPos) != 0) { return true; diff --git a/engines/neverhood/scene.h b/engines/neverhood/scene.h index b531796f40..a9e1674325 100644 --- a/engines/neverhood/scene.h +++ b/engines/neverhood/scene.h @@ -59,8 +59,8 @@ public: void setPalette(uint32 fileHash = 0); void setHitRects(uint32 id); Sprite *insertStaticSprite(uint32 fileHash, int surfacePriority); - void insertMouse433(uint32 fileHash, const NRect *mouseRect = NULL); - void insertMouse435(uint32 fileHash, int16 x1, int16 x2); + void insertScreenMouse(uint32 fileHash, const NRect *mouseRect = NULL); + void insertPuzzleMouse(uint32 fileHash, int16 x1, int16 x2); void insertNavigationMouse(uint32 fileHash, int type); void showMouse(bool visible); void changeMouseCursor(uint32 fileHash); |