diff options
| author | Paul Gilbert | 2016-08-27 12:45:36 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 12:45:36 -0400 |
| commit | 5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (patch) | |
| tree | 7f5e6d224f8d14a1ef8f69a83c91b498ec80add3 /engines/titanic/core | |
| parent | c1b6fc3824018118618685fcbfcabe413e865531 (diff) | |
| download | scummvm-rg350-5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a.tar.gz scummvm-rg350-5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a.tar.bz2 scummvm-rg350-5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a.zip | |
TITANIC: Implemented more game classes
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/saveable_object.cpp | 12 | ||||
| -rw-r--r-- | engines/titanic/core/tree_item.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 6abf9c407a..eee71cfc43 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -252,7 +252,7 @@ #include "titanic/game/pickup/pick_up_vis_centre.h" #include "titanic/game/placeholder/bar_shelf_vis_centre.h" #include "titanic/game/placeholder/lemon_on_bar.h" -#include "titanic/game/placeholder/place_holder_item.h" +#include "titanic/game/placeholder/place_holder.h" #include "titanic/game/placeholder/tv_on_bar.h" #include "titanic/game/sgt/armchair.h" #include "titanic/game/sgt/basin.h" @@ -669,7 +669,7 @@ DEFFN(CPickUpSpeechCentre); DEFFN(CPickUpVisCentre); DEFFN(CBarShelfVisCentre); DEFFN(CLemonOnBar); -DEFFN(CPlaceHolderItem); +DEFFN(CPlaceHolder); DEFFN(CTVOnBar); DEFFN(CArmchair); DEFFN(CBasin); @@ -1251,10 +1251,10 @@ void CSaveableObject::initClassList() { ADDFN(CPickUpLemon, CPickUp); ADDFN(CPickUpSpeechCentre, CPickUp); ADDFN(CPickUpVisCentre, CPickUp); - ADDFN(CBarShelfVisCentre, CPlaceHolderItem); - ADDFN(CLemonOnBar, CPlaceHolderItem); - ADDFN(CPlaceHolderItem, CGameObject); - ADDFN(CTVOnBar, CPlaceHolderItem); + ADDFN(CBarShelfVisCentre, CPlaceHolder); + ADDFN(CLemonOnBar, CPlaceHolder); + ADDFN(CPlaceHolder, CGameObject); + ADDFN(CTVOnBar, CPlaceHolder); ADDFN(CArmchair, CSGTStateRoom); ADDFN(CBasin, CSGTStateRoom); ADDFN(CBedfoot, CSGTStateRoom); diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp index 870ee38016..86c34cab8b 100644 --- a/engines/titanic/core/tree_item.cpp +++ b/engines/titanic/core/tree_item.cpp @@ -34,7 +34,7 @@ #include "titanic/core/room_item.h" #include "titanic/pet_control/pet_control.h" #include "titanic/game_manager.h" -#include "titanic/game/placeholder/place_holder_item.h" +#include "titanic/game/placeholder/place_holder.h" namespace Titanic { @@ -96,7 +96,7 @@ bool CTreeItem::isLinkItem() const { } bool CTreeItem::isPlaceHolderItem() const { - return isInstanceOf(CPlaceHolderItem::_type); + return isInstanceOf(CPlaceHolder::_type); } bool CTreeItem::isNamedItem() const { |