aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-03 19:13:32 -0400
committerPaul Gilbert2016-07-15 19:27:19 -0400
commitf99b16f564315be5863de57bd03bb8354673f0c5 (patch)
tree97bee4d749bc993090347894b8530c1742d7b0f4 /engines/titanic/star_control
parent8b2d85f8e5b30aeb73817894974a4db53588565b (diff)
downloadscummvm-rg350-f99b16f564315be5863de57bd03bb8354673f0c5.tar.gz
scummvm-rg350-f99b16f564315be5863de57bd03bb8354673f0c5.tar.bz2
scummvm-rg350-f99b16f564315be5863de57bd03bb8354673f0c5.zip
TITANIC: Suppress some warnings in unimplemented code
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r--engines/titanic/star_control/base_star.cpp4
-rw-r--r--engines/titanic/star_control/star_array.cpp1
-rw-r--r--engines/titanic/star_control/star_control_sub9.cpp3
3 files changed, 6 insertions, 2 deletions
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index 7b57b88f6b..4f4f838c12 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -81,8 +81,8 @@ CBaseStarEntry *CBaseStar::getDataPtr(int index) {
void CBaseStar::loadData(Common::SeekableReadStream &s) {
uint headerId = s.readUint32LE();
uint count = s.readUint32LE();
- if (headerId != 100 || count == 0);
- error("Invalid star data");
+ if (headerId != 100 || count == 0)
+ error("Invalid star data");
// Initialize the data array
clear();
diff --git a/engines/titanic/star_control/star_array.cpp b/engines/titanic/star_control/star_array.cpp
index f25d8376e7..8049cb567f 100644
--- a/engines/titanic/star_control/star_array.cpp
+++ b/engines/titanic/star_control/star_array.cpp
@@ -43,6 +43,7 @@ void CStarArray::initialize() {
int v2 = stream->readUint32LE();
stream->readUint32LE();
+ warning("TODO: %d %d", v1, v2);
// Pre-process them
// TODO
}
diff --git a/engines/titanic/star_control/star_control_sub9.cpp b/engines/titanic/star_control/star_control_sub9.cpp
index be06e46f45..fda2f5b5bf 100644
--- a/engines/titanic/star_control/star_control_sub9.cpp
+++ b/engines/titanic/star_control/star_control_sub9.cpp
@@ -40,11 +40,14 @@ void CStarControlSub9::initialize() {
RootEntry &rootEntry = _data[rootCtr];
rootEntry.resize(count);
for (int idx = 0; idx < count; ++idx) {
+ DataEntry &entry = rootEntry[idx];
int v1 = stream->readSint32LE();
int v2 = stream->readSint32LE();
int v3 = stream->readSint32LE();
int v4 = stream->readSint32LE();
+ warning("TODO: %d %d %d %d", v1, v2, v3, v4);
+ entry._v1 = 0;
// TODO: Processing here
}
}