From 123966554abab05646f666b85a29726b02342661 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 28 Jun 2016 21:28:42 -0400 Subject: TITANIC: gcc compilation fixes --- engines/titanic/core/game_object.cpp | 2 +- engines/titanic/core/message_target.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'engines/titanic') diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index d1f3a32493..9e155908d5 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1410,7 +1410,7 @@ CStarControl *CGameObject::getStarControl() const { if (!starControl) { CViewItem *view = getGameManager()->getView(); if (view) - starControl = starControl = static_cast(view->findChildInstanceOf(CStarControl::_type)); + starControl = static_cast(view->findChildInstanceOf(CStarControl::_type)); } return starControl; diff --git a/engines/titanic/core/message_target.h b/engines/titanic/core/message_target.h index e5bdf3e08a..42e9e5a3c4 100644 --- a/engines/titanic/core/message_target.h +++ b/engines/titanic/core/message_target.h @@ -73,7 +73,6 @@ protected: \ { return getThisMessageMap(); } \ const MSGMAP *theClass::getThisMessageMap() \ { \ - typedef theClass ThisClass; \ typedef baseClass TheBaseClass; \ static const MSGMAP_ENTRY _messageEntries[] = { \ { (PMSG)nullptr, nullptr } \ -- cgit v1.2.3