aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/titanic/module.mk4
-rw-r--r--engines/titanic/pet_control/pet_control.h4
-rw-r--r--engines/titanic/pet_control/pet_control_sub1.h6
-rw-r--r--engines/titanic/pet_control/pet_control_sub2.h4
-rw-r--r--engines/titanic/pet_control/pet_control_sub3.h4
-rw-r--r--engines/titanic/pet_control/pet_control_sub5.h6
-rw-r--r--engines/titanic/pet_control/pet_control_sub6.h4
-rw-r--r--engines/titanic/pet_control/pet_control_sub7.h4
-rw-r--r--engines/titanic/pet_control/pet_control_sub8.h4
-rw-r--r--engines/titanic/pet_control/pet_inventory_section.cpp (renamed from engines/titanic/pet_control/pet_control_sub4.cpp)12
-rw-r--r--engines/titanic/pet_control/pet_inventory_section.h (renamed from engines/titanic/pet_control/pet_control_sub4.h)12
-rw-r--r--engines/titanic/pet_control/pet_section.cpp (renamed from engines/titanic/pet_control/pet_control_sub_base.cpp)18
-rw-r--r--engines/titanic/pet_control/pet_section.h (renamed from engines/titanic/pet_control/pet_control_sub_base.h)18
13 files changed, 50 insertions, 50 deletions
diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index afd8453d88..914df8cdb0 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -382,11 +382,11 @@ MODULE_OBJS := \
pet_control/pet_control.o \
pet_control/pet_control_list_item.o \
pet_control/pet_control_list_item2.o \
- pet_control/pet_control_sub_base.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_control_sub4.o \
+ pet_control/pet_inventory_section.o \
pet_control/pet_control_sub5.o \
pet_control/pet_control_sub6.o \
pet_control/pet_control_sub7.o \
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index b0762736fb..e4ea16ef46 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -29,7 +29,7 @@
#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_control_sub4.h"
+#include "titanic/pet_control/pet_inventory_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"
@@ -46,7 +46,7 @@ private:
CPetControlSub1 _sub1;
CPetControlSub2 _sub2;
CPetControlSub3 _sub3;
- CPetControlSub4 _sub4;
+ CPetInventorySection _sub4;
CPetControlSub5 _sub5;
CPetControlSub6 _sub6;
CPetControlSub7 _sub7;
diff --git a/engines/titanic/pet_control/pet_control_sub1.h b/engines/titanic/pet_control/pet_control_sub1.h
index 5d0edb6c9f..8812581f80 100644
--- a/engines/titanic/pet_control/pet_control_sub1.h
+++ b/engines/titanic/pet_control/pet_control_sub1.h
@@ -23,13 +23,13 @@
#ifndef TITANIC_PET_CONTROL_SUB1_H
#define TITANIC_PET_CONTROL_SUB1_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub12.h"
#include "titanic/pet_control/pet_val.h"
namespace Titanic {
-class CPetControlSub1 : public CPetControlSubBase {
+class CPetControlSub1 : public CPetSection {
private:
CPetVal _val1;
CPetVal _val2;
@@ -38,7 +38,7 @@ private:
CPetVal _val4;
CPetVal _val5;
CPetVal _val6;
- CPetControlSubData _field14C;
+ int _field14C;
CPetVal _val7;
CPetVal _val8;
CPetVal _val9;
diff --git a/engines/titanic/pet_control/pet_control_sub2.h b/engines/titanic/pet_control/pet_control_sub2.h
index d32b30aea0..a3eb834b74 100644
--- a/engines/titanic/pet_control/pet_control_sub2.h
+++ b/engines/titanic/pet_control/pet_control_sub2.h
@@ -23,14 +23,14 @@
#ifndef TITANIC_PET_CONTROL_SUB2_H
#define TITANIC_PET_CONTROL_SUB2_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub11.h"
#include "titanic/pet_control/pet_control_sub12.h"
#include "titanic/pet_control/pet_control_list_item2.h"
namespace Titanic {
-class CPetControlSub2 : public CPetControlSubBase {
+class CPetControlSub2 : public CPetSection {
private:
CPetControlSub11 _sub11;
CPetControlListItem2 _listItem;
diff --git a/engines/titanic/pet_control/pet_control_sub3.h b/engines/titanic/pet_control/pet_control_sub3.h
index aa53db5e00..4143697d6d 100644
--- a/engines/titanic/pet_control/pet_control_sub3.h
+++ b/engines/titanic/pet_control/pet_control_sub3.h
@@ -23,14 +23,14 @@
#ifndef TITANIC_PET_CONTROL_SUB3_H
#define TITANIC_PET_CONTROL_SUB3_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub10.h"
#include "titanic/pet_control/pet_control_sub12.h"
#include "titanic/pet_control/pet_val.h"
namespace Titanic {
-class CPetControlSub3 : public CPetControlSubBase {
+class CPetControlSub3 : public CPetSection {
private:
CPetControlSub10 _sub10;
CPetVal _val1;
diff --git a/engines/titanic/pet_control/pet_control_sub5.h b/engines/titanic/pet_control/pet_control_sub5.h
index 5ef1b26312..1da1822a6a 100644
--- a/engines/titanic/pet_control/pet_control_sub5.h
+++ b/engines/titanic/pet_control/pet_control_sub5.h
@@ -23,13 +23,13 @@
#ifndef TITANIC_PET_CONTROL_SUB5_H
#define TITANIC_PET_CONTROL_SUB5_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub12.h"
#include "titanic/pet_control/pet_val.h"
namespace Titanic {
-class CPetControlSub5 : public CPetControlSubBase {
+class CPetControlSub5 : public CPetSection {
private:
CPetVal _val1;
CPetVal _val2;
@@ -39,7 +39,7 @@ private:
int _field9C;
int _fieldA0;
CPetVal _valArray1[6];
- CPetControlSubData _field17C;
+ int _field17C;
int _field18C;
CPetControlSub12 _sub12;
int _field20C;
diff --git a/engines/titanic/pet_control/pet_control_sub6.h b/engines/titanic/pet_control/pet_control_sub6.h
index 420da0c7ae..208d6f2b6d 100644
--- a/engines/titanic/pet_control/pet_control_sub6.h
+++ b/engines/titanic/pet_control/pet_control_sub6.h
@@ -23,13 +23,13 @@
#ifndef TITANIC_PET_CONTROL_SUB6_H
#define TITANIC_PET_CONTROL_SUB6_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub10.h"
#include "titanic/pet_control/pet_control_sub12.h"
namespace Titanic {
-class CPetControlSub6 : public CPetControlSubBase {
+class CPetControlSub6 : public CPetSection {
private:
CPetControlSub10 _sub10;
CPetControlSub10 _sub12;
diff --git a/engines/titanic/pet_control/pet_control_sub7.h b/engines/titanic/pet_control/pet_control_sub7.h
index f4a1decf12..fba7d2d6bf 100644
--- a/engines/titanic/pet_control/pet_control_sub7.h
+++ b/engines/titanic/pet_control/pet_control_sub7.h
@@ -23,12 +23,12 @@
#ifndef TITANIC_PET_CONTROL_SUB7_H
#define TITANIC_PET_CONTROL_SUB7_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub12.h"
namespace Titanic {
-class CPetControlSub7 : public CPetControlSubBase {
+class CPetControlSub7 : public CPetSection {
private:
CPetControlSub12 _sub1;
CPetControlSub12 _sub2;
diff --git a/engines/titanic/pet_control/pet_control_sub8.h b/engines/titanic/pet_control/pet_control_sub8.h
index 115e6d508f..a3d9fab3b9 100644
--- a/engines/titanic/pet_control/pet_control_sub8.h
+++ b/engines/titanic/pet_control/pet_control_sub8.h
@@ -23,12 +23,12 @@
#ifndef TITANIC_PET_CONTROL_SUB8_H
#define TITANIC_PET_CONTROL_SUB8_H
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_val.h"
namespace Titanic {
-class CPetControlSub8 : public CPetControlSubBase {
+class CPetControlSub8 : public CPetSection {
private:
static int _indexes[6];
diff --git a/engines/titanic/pet_control/pet_control_sub4.cpp b/engines/titanic/pet_control/pet_inventory_section.cpp
index 041bf50fa6..d859576399 100644
--- a/engines/titanic/pet_control/pet_control_sub4.cpp
+++ b/engines/titanic/pet_control/pet_inventory_section.cpp
@@ -20,22 +20,22 @@
*
*/
-#include "titanic/pet_control/pet_control_sub4.h"
+#include "titanic/pet_control/pet_inventory_section.h"
namespace Titanic {
-CPetControlSub4::CPetControlSub4() : _field28C(0),
- _field290(0), _field294(0), _field298(0) {
+CPetInventorySection::CPetInventorySection() : CPetSection(),
+ _field28C(0), _field290(0), _field294(0), _field298(0) {
for (int idx = 0; idx < 46; ++idx) {
_valArray1[idx] = _valArray2[idx] = 0;
}
}
-void CPetControlSub4::save(SimpleFile *file, int indent) const {
-
+void CPetInventorySection::save(SimpleFile *file, int indent) const {
+ file->writeNumberLine(_field298, indent);
}
-void CPetControlSub4::load(SimpleFile *file, int param) {
+void CPetInventorySection::load(SimpleFile *file, int param) {
_field298 = file->readNumber();
}
diff --git a/engines/titanic/pet_control/pet_control_sub4.h b/engines/titanic/pet_control/pet_inventory_section.h
index 18dbd7c1ae..4adad469a7 100644
--- a/engines/titanic/pet_control/pet_control_sub4.h
+++ b/engines/titanic/pet_control/pet_inventory_section.h
@@ -20,17 +20,17 @@
*
*/
-#ifndef TITANIC_PET_CONTROL_SUB4_H
-#define TITANIC_PET_CONTROL_SUB4_H
+#ifndef TITANIC_PET_INVENTORY_SECTION_H
+#define TITANIC_PET_INVENTORY_SECTION_H
#include "titanic/simple_file.h"
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
#include "titanic/pet_control/pet_control_sub10.h"
#include "titanic/pet_control/pet_control_sub12.h"
namespace Titanic {
-class CPetControlSub4 : public CPetControlSubBase {
+class CPetInventorySection : public CPetSection {
private:
CPetControlSub12 _sub12;
CPetControlSub10 _sub10;
@@ -41,7 +41,7 @@ private:
int _field294;
int _field298;
public:
- CPetControlSub4();
+ CPetInventorySection();
/**
* Save the data for the class to file
@@ -56,4 +56,4 @@ public:
} // End of namespace Titanic
-#endif /* TITANIC_PET_CONTROL_SUB4_H */
+#endif /* TITANIC_PET_INVENTORY_SECTION_H */
diff --git a/engines/titanic/pet_control/pet_control_sub_base.cpp b/engines/titanic/pet_control/pet_section.cpp
index 05a3425b5f..321f1fb94f 100644
--- a/engines/titanic/pet_control/pet_control_sub_base.cpp
+++ b/engines/titanic/pet_control/pet_section.cpp
@@ -21,39 +21,39 @@
*/
#include "common/textconsole.h"
-#include "titanic/pet_control/pet_control_sub_base.h"
+#include "titanic/pet_control/pet_section.h"
namespace Titanic {
-void CPetControlSubBase::proc4() {
+void CPetSection::proc4() {
error("TODO");
}
-void CPetControlSubBase::proc16() {
+void CPetSection::proc16() {
error("TODO");
}
-void CPetControlSubBase::proc25() {
+void CPetSection::proc25() {
error("TODO");
}
-void CPetControlSubBase::proc27() {
+void CPetSection::proc27() {
error("TODO");
}
-void CPetControlSubBase::proc28() {
+void CPetSection::proc28() {
error("TODO");
}
-void CPetControlSubBase::proc29() {
+void CPetSection::proc29() {
error("TODO");
}
-void CPetControlSubBase::proc30() {
+void CPetSection::proc30() {
error("TODO");
}
-void CPetControlSubBase::proc31() {
+void CPetSection::proc31() {
error("TODO");
}
diff --git a/engines/titanic/pet_control/pet_control_sub_base.h b/engines/titanic/pet_control/pet_section.h
index f95e1a98f5..d3006f5ad6 100644
--- a/engines/titanic/pet_control/pet_control_sub_base.h
+++ b/engines/titanic/pet_control/pet_section.h
@@ -20,30 +20,30 @@
*
*/
-#ifndef TITANIC_PET_CONTROL_SUB_BASE_H
-#define TITANIC_PET_CONTROL_SUB_BASE_H
+#ifndef TITANIC_PET_SECTION_H
+#define TITANIC_PET_SECTION_H
#include "titanic/simple_file.h"
#include "titanic/core/room_item.h"
namespace Titanic {
-struct CPetControlSubData {
+struct CPetSectionSubData {
int _field0;
int _field4;
int _field8;
int _fieldC;
- CPetControlSubData() : _field0(0), _field4(0),
- _field8(0), _fieldC(0) {}
+ CPetSectionSubData() : _field0(0), _field4(0), _field8(0),
+ _fieldC(0) {}
};
-class CPetControlSubBase {
+class CPetSection {
protected:
int _field4;
public:
- CPetControlSubBase() : _field4(0) {}
- virtual ~CPetControlSubBase() {}
+ CPetSection() : _field4(0) {}
+ virtual ~CPetSection() {}
virtual int proc1() { return 0; }
virtual int proc2() { return 0; }
@@ -106,4 +106,4 @@ public:
} // End of namespace Titanic
-#endif /* TITANIC_PET_CONTROL_SUB_BASE_H */
+#endif /* TITANIC_PET_SECTION_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:07:31 +0000