aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core/game_object.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/core/game_object.h')
-rw-r--r--engines/titanic/core/game_object.h48
1 files changed, 33 insertions, 15 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index a56095c60f..b214cf8c9e 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -77,13 +77,11 @@ private:
protected:
static CCreditText *_credits;
protected:
- double _field34;
- double _field38;
- double _field3C;
+ double _unused1;
+ double _unused2;
+ double _unused3;
bool _nonvisual;
- int _field44;
- int _field48;
- int _field4C;
+ byte _toggleR, _toggleG, _toggleB;
CMovieClipList _movieClips;
int _initialFrame;
CMovieRangeInfoList _movieRangeInfoList;
@@ -91,11 +89,10 @@ protected:
CTextControl *_text;
uint _textBorder;
uint _textBorderRight;
- int _field9C;
Common::Point _savedPos;
CVideoSurface *_surface;
CString _resource;
- int _fieldB8;
+ int _unused4;
protected:
/**
* Saves the current position the object is located at
@@ -277,7 +274,10 @@ protected:
*/
void setGlobalSoundVolume(int mode, uint seconds, int handleIndex);
- void sound8(bool flag) const;
+ /**
+ * Stops sound channel 3 or 0
+ */
+ void stopSoundChannel(bool channel3);
/**
* Adds a timer
@@ -462,7 +462,11 @@ protected:
*/
void setPassengerClass(PassengerClass newClass);
- void fn10(int v1, int v2, int v3);
+ /**
+ * Sets color RGB for toggles
+ * @remarks The color set isn't actually used anywhere
+ */
+ void setToggleColor(byte r, byte g, byte b);
/**
* Gets the duration of a specified clip in milliseconds
@@ -523,7 +527,7 @@ public:
bool _isPendingMail;
uint _destRoomFlags;
uint _roomFlags;
- int _field60;
+ bool _handleMouseFlag;
CursorId _cursorId;
bool _visible;
public:
@@ -942,7 +946,11 @@ public:
CStarControl *getStarControl() const;
void starFn1(int v);
- bool starFn2();
+
+ /**
+ * Returns true if the starmap puzzle has been solved
+ */
+ bool starIsSolved() const;
/*--- CTrueTalkManager Methods ---*/
@@ -987,7 +995,10 @@ public:
/*--- CGameState Methods ---*/
- void setState1C(bool flag);
+ /**
+ * Sets whether a background sound maker is allowed for the rooms if available
+ */
+ void stateSetSoundMakerAllowed(bool flag);
/**
* Change to the next season
@@ -1009,8 +1020,15 @@ public:
*/
bool stateGetParrotMet() const;
- void stateInc38();
- int stateGet38() const;
+ /**
+ * Moves the parrot to the next idle response
+ */
+ void incParrotResponse();
+
+ /**
+ * Gets the index to use for parrot idle responses
+ */
+ int getParrotResponse() const;
/**
* Gets the game state node changed counter