diff options
| author | Paul Gilbert | 2016-06-28 21:28:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:25:47 -0400 |
| commit | 123966554abab05646f666b85a29726b02342661 (patch) | |
| tree | 09f8e882a340942069edf3228528f68fc6939cf2 /engines/titanic/core | |
| parent | 5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99 (diff) | |
| download | scummvm-rg350-123966554abab05646f666b85a29726b02342661.tar.gz scummvm-rg350-123966554abab05646f666b85a29726b02342661.tar.bz2 scummvm-rg350-123966554abab05646f666b85a29726b02342661.zip | |
TITANIC: gcc compilation fixes
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/core/message_target.h | 1 |
2 files changed, 1 insertions, 2 deletions
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<CStarControl *>(view->findChildInstanceOf(CStarControl::_type)); + starControl = static_cast<CStarControl *>(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 } \ |