diff options
Diffstat (limited to 'engines/titanic/core')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 14 | ||||
-rw-r--r-- | engines/titanic/core/game_object.h | 19 |
2 files changed, 27 insertions, 6 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 59ae96138d..a1427b131e 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1536,14 +1536,24 @@ bool CGameObject::petDoorOrBellbotPresent() const { return pet ? pet->isDoorOrBellbotPresent() : false; } +void CGameObject::petDisplayMessage(int unused, StringId stringId) { + petDisplayMessage(stringId); +} + +void CGameObject::petDisplayMessage(StringId stringId, int param) { + CPetControl *pet = getPetControl(); + if (pet) + pet->displayMessage(stringId, param); +} + void CGameObject::petDisplayMessage(int unused, const CString &msg) { petDisplayMessage(msg); } -void CGameObject::petDisplayMessage(const CString &msg) { +void CGameObject::petDisplayMessage(const CString &msg, int param) { CPetControl *pet = getPetControl(); if (pet) - pet->displayMessage(msg); + pet->displayMessage(msg, param); } void CGameObject::petInvChange() { diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 0da3fad605..b9a55ac008 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -25,13 +25,14 @@ #include "audio/mixer.h" #include "common/stream.h" +#include "titanic/core/named_item.h" +#include "titanic/sound/proximity.h" #include "titanic/support/mouse_cursor.h" #include "titanic/support/credit_text.h" #include "titanic/support/movie_range_info.h" -#include "titanic/sound/proximity.h" #include "titanic/support/rect.h" +#include "titanic/support/strings.h" #include "titanic/support/movie_clip.h" -#include "titanic/core/named_item.h" #include "titanic/pet_control/pet_section.h" #include "titanic/pet_control/pet_text.h" #include "titanic/game_state.h" @@ -826,12 +827,22 @@ public: /** * Display a message in the PET */ - void petDisplayMessage(int unused, const CString &msg); + void petDisplayMessage(int unused, StringId stringId); + + /** + * Display a message in the PET + */ + void petDisplayMessage(int unused, const CString &str); + + /** + * Display a message in the PET + */ + void petDisplayMessage(StringId stringId, int param = 0); /** * Display a message in the PET */ - void petDisplayMessage(const CString &msg); + void petDisplayMessage(const CString &str, int param = 0); /** * Gets the entry number used when last arriving at the well |