diff options
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r-- | engines/titanic/star_control/star_field.h | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field_base.cpp (renamed from engines/titanic/star_control/star_control_sub2.cpp) | 10 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field_base.h (renamed from engines/titanic/star_control/star_control_sub2.h) | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h index e367cfe9ba..63eb68d853 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_control_sub2.cpp b/engines/titanic/star_control/star_field_base.cpp index 6eb918ca00..7641e4a951 100644 --- a/engines/titanic/star_control/star_control_sub2.cpp +++ b/engines/titanic/star_control/star_field_base.cpp @@ -20,24 +20,24 @@ * */ -#include "titanic/star_control/star_control_sub2.h" +#include "titanic/star_control/star_field_base.h" #include "titanic/star_control/star_camera.h" #include "titanic/titanic.h" namespace Titanic { -bool CStarControlSub2::setup() { +bool CStarFieldBase::setup() { loadData("STARFIELD/132"); return true; } -bool CStarControlSub2::loadYale(int v1) { +bool CStarFieldBase::loadYale(int v1) { clear(); error("Original loadYale not supported"); return true; } -bool CStarControlSub2::selectStar(CSurfaceArea *surfaceArea, +bool CStarFieldBase::selectStar(CSurfaceArea *surfaceArea, CStarCamera *camera, const Common::Point &pt, void *handler) { int index = findStar(surfaceArea, camera, pt); if (index == -1) { @@ -51,7 +51,7 @@ bool CStarControlSub2::selectStar(CSurfaceArea *surfaceArea, } } -bool CStarControlSub2::loadStar() { +bool CStarFieldBase::loadStar() { error("loadStar not supported"); } diff --git a/engines/titanic/star_control/star_control_sub2.h b/engines/titanic/star_control/star_field_base.h index cd82b025cb..2df2ccbe8a 100644 --- a/engines/titanic/star_control/star_control_sub2.h +++ b/engines/titanic/star_control/star_field_base.h @@ -20,16 +20,16 @@ * */ -#ifndef TITANIC_STAR_CONTROL_SUB2_H -#define TITANIC_STAR_CONTROL_SUB2_H +#ifndef TITANIC_STAR_FIELD_BASE_H +#define TITANIC_STAR_FIELD_BASE_H #include "titanic/star_control/base_stars.h" namespace Titanic { -class CStarControlSub2: public CBaseStars { +class CStarFieldBase: public CBaseStars { public: - virtual ~CStarControlSub2() {} + virtual ~CStarFieldBase() {} virtual bool loadYale(int v1); @@ -49,4 +49,4 @@ public: } // End of namespace Titanic -#endif /* TITANIC_STAR_CONTROL_SUB2_H */ +#endif /* TITANIC_STAR_FIELD_BASE_H */ |