diff options
| author | Paul Gilbert | 2016-07-18 22:32:28 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-18 22:32:28 -0400 |
| commit | 2ea4116e0ac29c73cad891cb194e16ba645786fa (patch) | |
| tree | 3a3db89fc5eaa8f7c66ffd49c87f4730b4bc88ae /engines | |
| parent | 18e06f727ab55eb232a8f97c09cb9950b29eeef8 (diff) | |
| download | scummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.tar.gz scummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.tar.bz2 scummvm-rg350-2ea4116e0ac29c73cad891cb194e16ba645786fa.zip | |
TITANIC: gcc compilation fixes
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/pet_control/pet_drag_chev.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub20.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub20.h | 2 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub5.h | 1 | ||||
| -rw-r--r-- | engines/titanic/support/avi_surface.h | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_drag_chev.cpp b/engines/titanic/pet_control/pet_drag_chev.cpp index beaac4e763..d437d43799 100644 --- a/engines/titanic/pet_control/pet_drag_chev.cpp +++ b/engines/titanic/pet_control/pet_drag_chev.cpp @@ -28,7 +28,9 @@ namespace Titanic { BEGIN_MESSAGE_MAP(CPetDragChev, CPetGraphic2) - + ON_MESSAGE(MouseDragStartMsg) + ON_MESSAGE(MouseDragMoveMsg) + ON_MESSAGE(MouseDragEndMsg) END_MESSAGE_MAP() void CPetDragChev::save(SimpleFile *file, int indent) { 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(); diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h index f74f6a808e..32db925d7a 100644 --- a/engines/titanic/support/avi_surface.h +++ b/engines/titanic/support/avi_surface.h @@ -84,7 +84,7 @@ public: double _frameRate; public: AVISurface(const CResourceKey &key); - ~AVISurface(); + virtual ~AVISurface(); /** * Start playing the loaded AVI video |