aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/maitred/maitred_prod_receptor.cpp8
-rw-r--r--engines/titanic/game/sauce_dispensor.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/game/maitred/maitred_prod_receptor.cpp b/engines/titanic/game/maitred/maitred_prod_receptor.cpp
index 66533a542f..2977d417a2 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 && static_cast<CGameObject *>(getParent())->hasActiveMovie()) {
+ if (_fieldBC == 2 && dynamic_cast<CGameObject *>(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 && static_cast<CGameObject *>(getParent())->hasActiveMovie())
+ if (_fieldBC == 2 && dynamic_cast<CGameObject *>(getParent())->hasActiveMovie())
return false;
else if (++_counter < 20)
return true;
@@ -80,7 +80,7 @@ bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) {
else if (isEquals("Perch"))
prodMsg._value = 125;
- CMaitreD *maitreD = static_cast<CMaitreD *>(findRoomObject("MaitreD"));
+ CMaitreD *maitreD = dynamic_cast<CMaitreD *>(findRoomObject("MaitreD"));
if (maitreD->_field100 <= 0)
prodMsg.execute(this);
@@ -89,7 +89,7 @@ bool CMaitreDProdReceptor::MouseMoveMsg(CMouseMoveMsg *msg) {
bool CMaitreDProdReceptor::ProdMaitreDMsg(CProdMaitreDMsg *msg) {
if (_fieldC4) {
- CMaitreD *maitreD = static_cast<CMaitreD *>(findRoomObject("MaitreD"));
+ CMaitreD *maitreD = dynamic_cast<CMaitreD *>(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 29f0be7ee4..adc0b828a2 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 = static_cast<CChicken *>(msg->_item);
+ CChicken *chicken = dynamic_cast<CChicken *>(msg->_item);
_field104 = true;
if (_fieldF0) {
playSound("b#15.wav", 50);
@@ -98,7 +98,7 @@ bool CSauceDispensor::Use(CUse *msg) {
petDisplayMessage(1, "Sadly, this dispenser is currently empty.");
} else if (msg->_item->isEquals("BeerGlass")) {
- CGlass *glass = static_cast<CGlass *>(msg->_item);
+ CGlass *glass = dynamic_cast<CGlass *>(msg->_item);
_field108 = true;
if (_field104 || _fieldF0) {