TITANIC: Implemented more game classes, fleshed out season handling

2 files changed, 16 insertions, 6 deletions

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 0289e78823..f450e028d2 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1025,12 +1025,12 @@ void CGameObject::moveToView(const CString &name) {
 	addUnder(view);
 }
 
-void CGameObject::stateInc14() {
-	getGameManager()->_gameState.inc14();
+void CGameObject::stateChangeSeason() {
+	getGameManager()->_gameState.changeSeason();
 }
 
-int CGameObject::stateGet14() const {
-	return getGameManager()->_gameState._field14;
+Season CGameObject::stateGetSeason() const {
+	return getGameManager()->_gameState._seasonNum;
 }
 
 void CGameObject::stateSet24() {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 53e26b5f6b..39cdb609c2 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -33,6 +33,7 @@
 #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"
 
 namespace Titanic {
 
@@ -941,8 +942,17 @@ public:
 	/*--- CGameState Methods ---*/
 
 	void setState1C(bool flag);
-	void stateInc14();
-	int stateGet14() const;
+	
+	/**
+	 * Change to the next season
+	 */
+	void stateChangeSeason();
+	
+	/**
+	 * Returns the currently active season
+	 */
+	Season stateGetSeason() const;
+	
 	void stateSet24();
 	int stateGet24() const;
 	void stateInc38();