aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control/base_star.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-03-10 22:15:20 -0500
committerPaul Gilbert2017-03-10 22:15:20 -0500
commitb51421229bb96e15181d62f6706601967fe571c4 (patch)
tree50be367bad668e8f97b04027dc9187dd39667110 /engines/titanic/star_control/base_star.h
parentf323cffdf6c9eb03a0c4eb3a52c32ea47d739e8b (diff)
downloadscummvm-rg350-b51421229bb96e15181d62f6706601967fe571c4.tar.gz
scummvm-rg350-b51421229bb96e15181d62f6706601967fe571c4.tar.bz2
scummvm-rg350-b51421229bb96e15181d62f6706601967fe571c4.zip
TITANIC: Implementing star reference classes
Diffstat (limited to 'engines/titanic/star_control/base_star.h')
-rw-r--r--engines/titanic/star_control/base_star.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/engines/titanic/star_control/base_star.h b/engines/titanic/star_control/base_star.h
index c348b1fe12..1335980c20 100644
--- a/engines/titanic/star_control/base_star.h
+++ b/engines/titanic/star_control/base_star.h
@@ -53,6 +53,13 @@ struct CBaseStarEntry {
bool operator==(const CBaseStarEntry &s) const;
};
+struct CStarPosition {
+ Common::Point _position;
+ int _index1;
+ int _index2;
+ CStarPosition() : _index1(0), _index2(0) {}
+};
+
class CBaseStar {
private:
void draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
@@ -82,9 +89,6 @@ protected:
* Reset the data for an entry
*/
void resetEntry(CBaseStarEntry &entry);
-
- void baseFn1(int v1, int v2, int v3, int v4);
- int baseFn2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
public:
CBaseStar();
virtual ~CBaseStar() {}
@@ -100,7 +104,7 @@ public:
* Selects a star
*/
virtual bool selectStar(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12,
- int flags, const Common::Point &pt) { return false; }
+ const Common::Point &pt, int flags = 0) { return false; }
/**
* Adds a new star, or removes one if already present at the given co-ordinates
@@ -132,6 +136,11 @@ public:
* Get a pointer to a data entry
*/
const CBaseStarEntry *getDataPtr(int index) const;
+
+ void baseFn1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12,
+ const Common::Point &pt);
+
+ int baseFn2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
};
} // End of namespace Titanic