aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-18 22:32:28 -0400
committerPaul Gilbert2016-07-18 22:32:28 -0400
commit2ea4116e0ac29c73cad891cb194e16ba645786fa (patch)
tree3a3db89fc5eaa8f7c66ffd49c87f4730b4bc88ae /engines/titanic/star_control
parent18e06f727ab55eb232a8f97c09cb9950b29eeef8 (diff)
downloadscummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.tar.gz
scummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.tar.bz2
scummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.zip
TITANIC: gcc compilation fixes
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r--engines/titanic/star_control/star_control_sub20.cpp2
-rw-r--r--engines/titanic/star_control/star_control_sub20.h2
-rw-r--r--engines/titanic/star_control/star_control_sub5.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/engines/titanic/star_control/star_control_sub20.cpp b/engines/titanic/star_control/star_control_sub20.cpp
index 4454ead74b..5c6c243eaa 100644
--- a/engines/titanic/star_control/star_control_sub20.cpp
+++ b/engines/titanic/star_control/star_control_sub20.cpp
@@ -98,7 +98,7 @@ void CStarControlSub20::proc11(CErrorCode &errorCode, FVector &v, const FMatrix
void CStarControlSub20::setData(void *data) {
clear();
- _dataP = data;
+ _dataP = (byte *)data;
}
void CStarControlSub20::clear() {
diff --git a/engines/titanic/star_control/star_control_sub20.h b/engines/titanic/star_control/star_control_sub20.h
index 359482bc57..9dbabbb7f1 100644
--- a/engines/titanic/star_control/star_control_sub20.h
+++ b/engines/titanic/star_control/star_control_sub20.h
@@ -43,7 +43,7 @@ struct CStar20Data {
class CStarControlSub20 : public CStar20Data {
public:
int _lockCounter;
- void *_dataP;
+ byte *_dataP;
public:
CStarControlSub20(const CStar20Data *src);
virtual ~CStarControlSub20();
diff --git a/engines/titanic/star_control/star_control_sub5.h b/engines/titanic/star_control/star_control_sub5.h
index 8007f83338..ce92ef1135 100644
--- a/engines/titanic/star_control/star_control_sub5.h
+++ b/engines/titanic/star_control/star_control_sub5.h
@@ -44,6 +44,7 @@ private:
int _field78B0;
public:
CStarControlSub5();
+ virtual ~CStarControlSub5() {}
virtual bool setup();
virtual void proc2();