diff options
| author | Paul Gilbert | 2016-06-23 21:22:59 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:24:22 -0400 |
| commit | 5b98885f8797d5c36336a22a9399611b11a3715f (patch) | |
| tree | 48c087f9fa697bb5375c3d6ff0441f8d5343e8cc /engines/titanic/core | |
| parent | f7d6db05e849855cbd17a60c3bbc3b1e96d1453a (diff) | |
| download | scummvm-rg350-5b98885f8797d5c36336a22a9399611b11a3715f.tar.gz scummvm-rg350-5b98885f8797d5c36336a22a9399611b11a3715f.tar.bz2 scummvm-rg350-5b98885f8797d5c36336a22a9399611b11a3715f.zip | |
TITANIC: Figured out PET Room Glyph modes
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 5 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index f0fd08ae94..735caad288 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1062,11 +1062,10 @@ int CGameObject::petGetRooms1D0() const { return petControl ? petControl->getRooms1D0() : 0; } -void CGameObject::petAddRandomRoom(int passClassNum) { +void CGameObject::reassignRoom(int passClassNum) { CPetControl *petControl = getPetControl(); if (petControl) - petControl->addRandomRoom(passClassNum); + petControl->reassignRoom(passClassNum); } - } // End of namespace Titanic diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 0a6070463f..059b705700 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -271,11 +271,6 @@ protected: void endTalking(CTrueTalkNPC *npc, uint id, CViewItem *view = nullptr); /** - * Load the surface - */ - void loadSurface(); - - /** * Change the view */ bool changeView(const CString &viewName, const CString &clipName); @@ -529,6 +524,11 @@ public: void loadFrame(int frameNumber); /** + * Load the surface + */ + void loadSurface(); + + /** * Marks the area occupied by the object as dirty, requiring re-rendering */ void makeDirty(); @@ -570,9 +570,9 @@ public: int petGetRooms1D0() const; /** - * Adds a random room to the pET + * Gives the player a new assigned room in the specified passenger class */ - void petAddRandomRoom(int passClassNum); + void reassignRoom(int passClassNum); }; } // End of namespace Titanic |