[Scummvm-git-logs] scummvm master -> 3fdfd47ea3f4bcd7bab397f0ec9d84c89c897113

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3fdfd47ea3 TITANIC: Rename CStarControlSub2 to CStarFieldBase


Commit: 3fdfd47ea3f4bcd7bab397f0ec9d84c89c897113
    https://github.com/scummvm/scummvm/commit/3fdfd47ea3f4bcd7bab397f0ec9d84c89c897113
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-07T22:06:22-04:00

Commit Message:
TITANIC: Rename CStarControlSub2 to CStarFieldBase

Changed paths:
  A engines/titanic/star_control/star_field_base.cpp
  A engines/titanic/star_control/star_field_base.h
  R engines/titanic/star_control/star_control_sub2.cpp
  R engines/titanic/star_control/star_control_sub2.h
    engines/titanic/module.mk
    engines/titanic/star_control/star_field.h


diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index e3f4392..6cc95f4 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -448,8 +448,8 @@ MODULE_OBJS := \
 	star_control/orientation_changer.o \
 	star_control/star_camera.o \
 	star_control/star_closeup.o \
-	star_control/star_control_sub2.o \
 	star_control/star_crosshairs.o \
+	star_control/star_field_base.o \
 	star_control/star_field.o \
 	star_control/star_markers.o \
 	star_control/star_points1.o \
diff --git a/engines/titanic/star_control/star_control_sub2.cpp b/engines/titanic/star_control/star_control_sub2.cpp
deleted file mode 100644
index 6eb918c..0000000
--- a/engines/titanic/star_control/star_control_sub2.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "titanic/star_control/star_control_sub2.h"
-#include "titanic/star_control/star_camera.h"
-#include "titanic/titanic.h"
-
-namespace Titanic {
-
-bool CStarControlSub2::setup() {
-	loadData("STARFIELD/132");
-	return true;
-}
-
-bool CStarControlSub2::loadYale(int v1) {
-	clear();
-	error("Original loadYale not supported");
-	return true;
-}
-
-bool CStarControlSub2::selectStar(CSurfaceArea *surfaceArea,
-		CStarCamera *camera, const Common::Point &pt, void *handler) {
-		int index = findStar(surfaceArea, camera, pt);
-	if (index == -1) {
-		return false;
-	} else if (!handler) {
-		debugC(DEBUG_BASIC, kDebugStarfield, "Select star %d", index);
-		camera->setDestination(_data[index]._position);
-		return true;
-	} else {
-		error("no handler ever passed in original");
-	}
-}
-
-bool CStarControlSub2::loadStar() {
-	error("loadStar not supported");
-}
-
-} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control_sub2.h b/engines/titanic/star_control/star_control_sub2.h
deleted file mode 100644
index cd82b02..0000000
--- a/engines/titanic/star_control/star_control_sub2.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef TITANIC_STAR_CONTROL_SUB2_H
-#define TITANIC_STAR_CONTROL_SUB2_H
-
-#include "titanic/star_control/base_stars.h"
-
-namespace Titanic {
-
-class CStarControlSub2: public CBaseStars {
-public:
-	virtual ~CStarControlSub2() {}
-
-	virtual bool loadYale(int v1);
-
-	/**
-	 * Selects a star
-	 */
-	virtual bool selectStar(CSurfaceArea *surfaceArea, CStarCamera *camera,
-		const Common::Point &pt, void *handler = nullptr);
-
-	virtual bool loadStar();
-
-	/**
-	 * Setup the control
-	 */
-	bool setup();
-};
-
-} // End of namespace Titanic
-
-#endif /* TITANIC_STAR_CONTROL_SUB2_H */
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index e367cfe..63eb68d 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -23,7 +23,7 @@
 #ifndef TITANIC_STAR_FIELD_H
 #define TITANIC_STAR_FIELD_H
 
-#include "titanic/star_control/star_control_sub2.h"
+#include "titanic/star_control/star_field_base.h"
 #include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/star_markers.h"
 #include "titanic/star_control/star_crosshairs.h"
@@ -32,7 +32,7 @@
 
 namespace Titanic {
 
-class CStarField : public CStarControlSub2 {
+class CStarField : public CStarFieldBase {
 private:
 	CStarMarkers _markers;
 	CStarCrosshairs _crosshairs;
diff --git a/engines/titanic/star_control/star_field_base.cpp b/engines/titanic/star_control/star_field_base.cpp
new file mode 100644
index 0000000..7641e4a
--- /dev/null
+++ b/engines/titanic/star_control/star_field_base.cpp
@@ -0,0 +1,58 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "titanic/star_control/star_field_base.h"
+#include "titanic/star_control/star_camera.h"
+#include "titanic/titanic.h"
+
+namespace Titanic {
+
+bool CStarFieldBase::setup() {
+	loadData("STARFIELD/132");
+	return true;
+}
+
+bool CStarFieldBase::loadYale(int v1) {
+	clear();
+	error("Original loadYale not supported");
+	return true;
+}
+
+bool CStarFieldBase::selectStar(CSurfaceArea *surfaceArea,
+		CStarCamera *camera, const Common::Point &pt, void *handler) {
+		int index = findStar(surfaceArea, camera, pt);
+	if (index == -1) {
+		return false;
+	} else if (!handler) {
+		debugC(DEBUG_BASIC, kDebugStarfield, "Select star %d", index);
+		camera->setDestination(_data[index]._position);
+		return true;
+	} else {
+		error("no handler ever passed in original");
+	}
+}
+
+bool CStarFieldBase::loadStar() {
+	error("loadStar not supported");
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_field_base.h b/engines/titanic/star_control/star_field_base.h
new file mode 100644
index 0000000..2df2ccb
--- /dev/null
+++ b/engines/titanic/star_control/star_field_base.h
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TITANIC_STAR_FIELD_BASE_H
+#define TITANIC_STAR_FIELD_BASE_H
+
+#include "titanic/star_control/base_stars.h"
+
+namespace Titanic {
+
+class CStarFieldBase: public CBaseStars {
+public:
+	virtual ~CStarFieldBase() {}
+
+	virtual bool loadYale(int v1);
+
+	/**
+	 * Selects a star
+	 */
+	virtual bool selectStar(CSurfaceArea *surfaceArea, CStarCamera *camera,
+		const Common::Point &pt, void *handler = nullptr);
+
+	virtual bool loadStar();
+
+	/**
+	 * Setup the control
+	 */
+	bool setup();
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_STAR_FIELD_BASE_H */