From 610aab1c635f170348179ac5a2ecccc6971874f8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 5 Sep 2016 10:06:21 -0400 Subject: TITANIC: Convert some dynamic_casts back to static_cast as appropriate --- engines/titanic/core/game_object.cpp | 2 +- engines/titanic/core/project_item.cpp | 2 +- engines/titanic/game/maitred/maitred_prod_receptor.cpp | 8 ++++---- engines/titanic/game/sauce_dispensor.cpp | 2 +- engines/titanic/pet_control/pet_inventory_glyphs.cpp | 4 ++-- engines/titanic/pet_control/pet_remote_glyphs.cpp | 2 +- engines/titanic/pet_control/pet_rooms.cpp | 2 +- engines/titanic/pet_control/pet_rooms_glyphs.cpp | 6 +++--- engines/titanic/true_talk/tt_vocab.cpp | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index edfce7f2ee..59ae96138d 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1630,7 +1630,7 @@ bool CGameObject::starFn2() { /*------------------------------------------------------------------------*/ void CGameObject::startTalking(const CString &npcName, uint id, CViewItem *view) { - CTrueTalkNPC *npc = dynamic_cast(getRoot()->findByName(npcName)); + CTrueTalkNPC *npc = static_cast(getRoot()->findByName(npcName)); startTalking(npc, id, view); } diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp index df48bad501..76293233b0 100644 --- a/engines/titanic/core/project_item.cpp +++ b/engines/titanic/core/project_item.cpp @@ -85,7 +85,7 @@ void CProjectItem::buildFilesList() { CTreeItem *treeItem = getFirstChild(); while (treeItem) { if (treeItem->isFileItem()) { - CString name = dynamic_cast(treeItem)->getFilename(); + CString name = static_cast(treeItem)->getFilename(); _files.add()->_name = name; } diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.cpp b/engines/titanic/game/maitred/maitred_prod_receptor.cpp index 2977d417a2..95e029af44 100644 --- a/engines/titanic/game/maitred/maitred_prod_receptor.cpp +++ b/engines/titanic/game/maitred/maitred_prod_receptor.cpp @@ -51,7 +51,7 @@ void CMaitreDProdReceptor::load(SimpleFile *file) { } bool CMaitreDProdReceptor::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (_fieldBC == 2 && dynamic_cast(getParent())->hasActiveMovie()) { + if (_fieldBC == 2 && static_cast(getParent())->hasActiveMovie()) { return false; } else { CProdMaitreDMsg prodMsg(126); @@ -61,7 +61,7 @@ bool CMaitreDProdReceptor::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) { - if (_fieldBC == 2 && dynamic_cast(getParent())->hasActiveMovie()) + if (_fieldBC == 2 && static_cast(getParent())->hasActiveMovie()) return false; else if (++_counter < 20) return true; @@ -81,7 +81,7 @@ bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) { prodMsg._value = 125; CMaitreD *maitreD = dynamic_cast(findRoomObject("MaitreD")); - if (maitreD->_field100 <= 0) + if (maitreD && maitreD->_field100 <= 0) prodMsg.execute(this); return true; @@ -89,7 +89,7 @@ bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) { bool CMaitreDProdReceptor::ProdMaitreDMsg(CProdMaitreDMsg *msg) { if (_fieldC4) { - CMaitreD *maitreD = dynamic_cast(findRoomObject("MaitreD")); + CMaitreD *maitreD = static_cast(findRoomObject("MaitreD")); if (maitreD->_field100 <= 0) { CViewItem *view = findView(); startTalking(maitreD, msg->_value, view); diff --git a/engines/titanic/game/sauce_dispensor.cpp b/engines/titanic/game/sauce_dispensor.cpp index adc0b828a2..fda7082ba6 100644 --- a/engines/titanic/game/sauce_dispensor.cpp +++ b/engines/titanic/game/sauce_dispensor.cpp @@ -69,7 +69,7 @@ bool CSauceDispensor::Use(CUse *msg) { CVisibleMsg visibleMsg(true); if (msg->_item->isEquals("Chicken")) { - CChicken *chicken = dynamic_cast(msg->_item); + CChicken *chicken = static_cast(msg->_item); _field104 = true; if (_fieldF0) { playSound("b#15.wav", 50); diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp index 38974547f5..03293eb453 100644 --- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp +++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp @@ -203,8 +203,8 @@ void CPetInventoryGlyph::setItem(CGameObject *item, bool isLoading) { if (_owner && item) { int v1 = populateItem(item, isLoading); - _background = dynamic_cast(_owner)->getBackground(v1); - _image = dynamic_cast(getPetSection())->getImage(v1); + _background = static_cast(_owner)->getBackground(v1); + _image = static_cast(getPetSection())->getImage(v1); } } diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp index 35a7ab39ac..953428ff0c 100644 --- a/engines/titanic/pet_control/pet_remote_glyphs.cpp +++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp @@ -48,7 +48,7 @@ CPetRemoteGlyphs *CPetRemoteGlyph::getOwner() const { } CPetGfxElement *CPetRemoteGlyph::getElement(uint id) const { - CPetRemote *remote = dynamic_cast(_owner->getOwner()); + CPetRemote *remote = static_cast(_owner->getOwner()); return remote->getElement(id); } diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp index 2ec66b08e2..fb92f2692d 100644 --- a/engines/titanic/pet_control/pet_rooms.cpp +++ b/engines/titanic/pet_control/pet_rooms.cpp @@ -340,7 +340,7 @@ bool CPetRooms::changeLocationClass(int newClassNum) { bool CPetRooms::hasRoomFlags(uint roomFlags) const { for (CPetRoomsGlyphs::const_iterator i = _glyphs.begin(); i != _glyphs.end(); ++i) { - const CPetRoomsGlyph *glyph = dynamic_cast(*i); + const CPetRoomsGlyph *glyph = static_cast(*i); if (glyph->isAssigned() && glyph->getRoomFlags() == roomFlags) return true; } diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp index d7ac634f5d..e89e8072dc 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp +++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp @@ -141,7 +141,7 @@ bool CPetRoomsGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg) { void CPetRoomsGlyph::getTooltip(CPetText *text) { CRoomFlags roomFlags(_roomFlags); - CPetRooms *owner = dynamic_cast(getPetSection()); + CPetRooms *owner = static_cast(getPetSection()); CString msg; if (isCurrentlyAssigned()) { @@ -172,7 +172,7 @@ void CPetRoomsGlyph::saveGlyph(SimpleFile *file, int indent) { } bool CPetRoomsGlyph::proc33(CPetGlyph *glyph) { - CPetRoomsGlyph *roomGlyph = dynamic_cast(glyph); + CPetRoomsGlyph *roomGlyph = static_cast(glyph); return CPetGlyph::proc33(glyph) && _roomFlags == roomGlyph->_roomFlags; } @@ -246,7 +246,7 @@ CPetRoomsGlyph *CPetRoomsGlyphs::findAssignedRoom() const { CPetRoomsGlyph *CPetRoomsGlyphs::findGlyphByFlags(uint flags) const { for (const_iterator i = begin(); i != end(); ++i) { - CPetRoomsGlyph *glyph = dynamic_cast(*i); + CPetRoomsGlyph *glyph = static_cast(*i); if (glyph->getRoomFlags() == flags) return glyph; } diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 414bf8561c..062a6b65c0 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -311,7 +311,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) { if (word->_wordClass == WC_ADJECTIVE) { - TTadj *adj = dynamic_cast(word); + TTadj *adj = static_cast(word); int val1 = word->proc15(); int val2 = word->proc15(); @@ -373,7 +373,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) { if (word->_wordClass == WC_ADJECTIVE) { - TTadj *adj = dynamic_cast(word); + TTadj *adj = static_cast(word); int val1 = word->proc15(); int val2 = word->proc15(); @@ -529,7 +529,7 @@ TTword *TTvocab::getPrefixedWord(TTstring &str) const { if (!word) tempStr = str; else if (word->_wordClass == WC_ADJECTIVE) { - TTadj *adj = dynamic_cast(word); + TTadj *adj = static_cast(word); int val1 = word->proc15(); int val2 = word->proc15(); -- cgit v1.2.3