TITANIC: More renamings of PET sections

9 files changed, 47 insertions, 46 deletions

diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 914df8cdb0..3e018a25c5 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -382,10 +382,10 @@ MODULE_OBJS := \
 	pet_control/pet_control.o \
 	pet_control/pet_control_list_item.o \
 	pet_control/pet_control_list_item2.o \
+	pet_control/pet_conversation_section.o \
 	pet_control/pet_section.o \
-	pet_control/pet_control_sub1.o \
-	pet_control/pet_control_sub2.o \
-	pet_control/pet_control_sub3.o \
+	pet_control/pet_rooms_section.o \
+	pet_control/pet_remote_section.o \
 	pet_control/pet_inventory_section.o \
 	pet_control/pet_control_sub5.o \
 	pet_control/pet_control_sub6.o \
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index f3e78a2212..7ef4c1494b 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -52,17 +52,17 @@ void CPetControl::load(SimpleFile *file) {
 }
 
 bool CPetControl::isValid() const {
-	return _sub1.isValid() && _sub2.isValid()
-		&& _sub3.isValid() && _sub4.isValid()
+	return _convSection.isValid() && _roomsSection.isValid()
+		&& _remoteSection.isValid() && _invSection.isValid()
 		&& _sub5.isValid() && _sub6.isValid()
 		&& _sub7.isValid() && _sub8.isValid();
 }
 
 void CPetControl::loadSubObjects(SimpleFile *file, int param) {
-	_sub1.load(file, param);
-	_sub2.load(file, param);
-	_sub3.load(file, param);
-	_sub4.load(file, param);
+	_convSection.load(file, param);
+	_roomsSection.load(file, param);
+	_remoteSection.load(file, param);
+	_invSection.load(file, param);
 	_sub5.load(file, param);
 	_sub6.load(file, param);
 	_sub7.load(file, param);
@@ -70,10 +70,10 @@ void CPetControl::loadSubObjects(SimpleFile *file, int param) {
 }
 
 void CPetControl::saveSubObjects(SimpleFile *file, int indent) const {
-	_sub1.save(file, indent);
-	_sub2.save(file, indent);
-	_sub3.save(file, indent);
-	_sub4.save(file, indent);
+	_convSection.save(file, indent);
+	_roomsSection.save(file, indent);
+	_remoteSection.save(file, indent);
+	_invSection.save(file, indent);
 	_sub5.save(file, indent);
 	_sub6.save(file, indent);
 	_sub7.save(file, indent);
@@ -93,8 +93,8 @@ void CPetControl::enterNode(CNodeItem *node) {
 }
 
 void CPetControl::enterRoom(CRoomItem *room) {
-	_sub2.enterRoom(room);
-	_sub3.enterRoom(room);
+	_roomsSection.enterRoom(room);
+	_remoteSection.enterRoom(room);
 }
 
 void CPetControl::clear() {
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index e4ea16ef46..d6fc9d01a2 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -26,10 +26,10 @@
 #include "titanic/core/game_object.h"
 #include "titanic/core/node_item.h"
 #include "titanic/core/room_item.h"
-#include "titanic/pet_control/pet_control_sub1.h"
-#include "titanic/pet_control/pet_control_sub2.h"
-#include "titanic/pet_control/pet_control_sub3.h"
+#include "titanic/pet_control/pet_conversation_section.h"
 #include "titanic/pet_control/pet_inventory_section.h"
+#include "titanic/pet_control/pet_remote_section.h"
+#include "titanic/pet_control/pet_rooms_section.h"
 #include "titanic/pet_control/pet_control_sub5.h"
 #include "titanic/pet_control/pet_control_sub6.h"
 #include "titanic/pet_control/pet_control_sub7.h"
@@ -43,10 +43,10 @@ private:
 	int _fieldC0;
 	int _fieldC4;
 	int _fieldC8;
-	CPetControlSub1 _sub1;
-	CPetControlSub2 _sub2;
-	CPetControlSub3 _sub3;
-	CPetInventorySection _sub4;
+	CPetConversationSection _convSection;
+	CPetInventorySection _invSection;
+	CPetRemoteSection _remoteSection;
+	CPetRoomsSection _roomsSection;
 	CPetControlSub5 _sub5;
 	CPetControlSub6 _sub6;
 	CPetControlSub7 _sub7;
diff --git a/engines/titanic/pet_control/pet_control_sub1.cpp b/engines/titanic/pet_control/pet_conversation_section.cpp
index 0daae0637d..890a03dac6 100644
--- a/engines/titanic/pet_control/pet_control_sub1.cpp
+++ b/engines/titanic/pet_control/pet_conversation_section.cpp
@@ -20,18 +20,19 @@
  *
  */
 
-#include "titanic/pet_control/pet_control_sub1.h"
+#include "titanic/pet_control/pet_conversation_section.h"
 
 namespace Titanic {
 
-CPetControlSub1::CPetControlSub1() : _field414(0), _field418(0) {
+CPetConversationSection::CPetConversationSection() : CPetSection(),
+		_field414(0), _field418(0) {
 }
 
-void CPetControlSub1::save(SimpleFile *file, int indent) const {
+void CPetConversationSection::save(SimpleFile *file, int indent) const {
 
 }
 
-void CPetControlSub1::load(SimpleFile *file, int param) {
+void CPetConversationSection::load(SimpleFile *file, int param) {
 	_sub2.load(file, param);
 	_sub1.load(file, param);
 
diff --git a/engines/titanic/pet_control/pet_control_sub1.h b/engines/titanic/pet_control/pet_conversation_section.h
index 8812581f80..c9f4547a20 100644
--- a/engines/titanic/pet_control/pet_control_sub1.h
+++ b/engines/titanic/pet_control/pet_conversation_section.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_CONTROL_SUB1_H
-#define TITANIC_PET_CONTROL_SUB1_H
+#ifndef TITANIC_PET_CONVERSATION_SECTION_H
+#define TITANIC_PET_CONVERSATION_SECTION_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub12.h"
@@ -29,7 +29,7 @@
 
 namespace Titanic {
 
-class CPetControlSub1 : public CPetSection {
+class CPetConversationSection : public CPetSection {
 private:
 	CPetVal _val1;
 	CPetVal _val2;
@@ -51,7 +51,7 @@ private:
 	int _field418;
 	CString _string1;
 public:
-	CPetControlSub1();
+	CPetConversationSection();
 
 	/**
 	 * Save the data for the class to file
@@ -66,4 +66,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_CONTROL_SUB1_H */
+#endif /* TITANIC_PET_CONVERSATION_SECTION_H */
diff --git a/engines/titanic/pet_control/pet_control_sub3.cpp b/engines/titanic/pet_control/pet_remote_section.cpp
index d134b1bbc3..7cdde01252 100644
--- a/engines/titanic/pet_control/pet_control_sub3.cpp
+++ b/engines/titanic/pet_control/pet_remote_section.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/pet_control/pet_control_sub3.h"
+#include "titanic/pet_control/pet_remote_section.h"
 
 namespace Titanic {
 
diff --git a/engines/titanic/pet_control/pet_control_sub3.h b/engines/titanic/pet_control/pet_remote_section.h
index 4143697d6d..e3b543c3fa 100644
--- a/engines/titanic/pet_control/pet_control_sub3.h
+++ b/engines/titanic/pet_control/pet_remote_section.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_CONTROL_SUB3_H
-#define TITANIC_PET_CONTROL_SUB3_H
+#ifndef TITANIC_PET_REMOTE_SECTION_H
+#define TITANIC_PET_REMOTE_SECTION_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub10.h"
@@ -30,7 +30,7 @@
 
 namespace Titanic {
 
-class CPetControlSub3 : public CPetSection {
+class CPetRemoteSection : public CPetSection {
 private:
 	CPetControlSub10 _sub10;
 	CPetVal _val1;
@@ -52,4 +52,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_CONTROL_SUB3_H */
+#endif /* TITANIC_PET_REMOTE_SECTION_H */
diff --git a/engines/titanic/pet_control/pet_control_sub2.cpp b/engines/titanic/pet_control/pet_rooms_section.cpp
index 2e8b35e2f0..b866fb349d 100644
--- a/engines/titanic/pet_control/pet_control_sub2.cpp
+++ b/engines/titanic/pet_control/pet_rooms_section.cpp
@@ -20,29 +20,29 @@
  *
  */
 
-#include "titanic/pet_control/pet_control_sub2.h"
+#include "titanic/pet_control/pet_rooms_section.h"
 
 namespace Titanic {
 
-CPetControlSub2::CPetControlSub2() :
+CPetRoomsSection::CPetRoomsSection() :
 	_field100(0), _field104(0), _field108(0), _field10C(0),
 	_field110(0), _field114(0), _field118(0), _field11C(0),
 	_field1C0(0), _field1C4(0), _field1C8(0), _field1CC(0),
 	_field1D0(0), _field1D4(0) {
 }
 
-void CPetControlSub2::save(SimpleFile *file, int indent) const {
+void CPetRoomsSection::save(SimpleFile *file, int indent) const {
 
 }
 
-void CPetControlSub2::load(SimpleFile *file, int param) {
+void CPetRoomsSection::load(SimpleFile *file, int param) {
 	if (!param) {
 		int count = file->readNumber();
 
 		for (int idx = 0; idx < count; ++idx) {
 			int v1 = file->readNumber();
 			int v2 = file->readNumber();
-			warning("TODO: CPetControlSub2::load - %d,%d", v1, v2);
+			warning("TODO: CPetRoomsSection::load - %d,%d", v1, v2);
 		}
 
 		_listItem.setField34(file->readNumber());
diff --git a/engines/titanic/pet_control/pet_control_sub2.h b/engines/titanic/pet_control/pet_rooms_section.h
index a3eb834b74..54996fa950 100644
--- a/engines/titanic/pet_control/pet_control_sub2.h
+++ b/engines/titanic/pet_control/pet_rooms_section.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PET_CONTROL_SUB2_H
-#define TITANIC_PET_CONTROL_SUB2_H
+#ifndef TITANIC_PET_ROOMS_SECTION_H
+#define TITANIC_PET_ROOMS_SECTION_H
 
 #include "titanic/pet_control/pet_section.h"
 #include "titanic/pet_control/pet_control_sub11.h"
@@ -30,7 +30,7 @@
 
 namespace Titanic {
 
-class CPetControlSub2 : public CPetSection {
+class CPetRoomsSection : public CPetSection {
 private:
 	CPetControlSub11 _sub11;
 	CPetControlListItem2 _listItem;
@@ -51,7 +51,7 @@ private:
 	int _field1D0;
 	int _field1D4;
 public:
-	CPetControlSub2();
+	CPetRoomsSection();
 
 	/**
 	 * Save the data for the class to file
@@ -66,4 +66,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_CONTROL_SUB2_H */
+#endif /* TITANIC_PET_ROOMS_SECTION_H */