libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 19:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Make all use of message targets public inheritance

Browse Source
This commit is contained in:
Paul Gilbert 2016-03-24 12:51:44 -04:00
parent 66e198d665
commit d9cc2908f8
28 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/titanic/core/view_item.h
View File

@ -29,8 +29,11 @@
namespace Titanic {
class CViewItem : public CNamedItem, CMouseButtonDownMsgTarget,
CMouseButtonUpMsgTarget, CMouseMoveMsgTarget, CMouseDoubleClickMsgTarget {
class CViewItem : public CNamedItem,
public CMouseButtonDownMsgTarget,
public CMouseButtonUpMsgTarget,
public CMouseMoveMsgTarget,
public CMouseDoubleClickMsgTarget {
private:
CTreeItem *_buttonUpTargets[4];
private:

12
engines/titanic/game/arboretum_gate.h
View File

@ -29,10 +29,14 @@
namespace Titanic {
class CArboretumGate : public CBackground, public CActMsgTarget,
public CLeaveViewMsgTarget, public CTurnOffTarget,
public CMouseButtonDownMsgTarget, public CEnterViewMsgTarget,
public CTurnOnTarget, public CMovieEndMsgTarget {
class CArboretumGate : public CBackground,
public CActMsgTarget,
public CLeaveViewMsgTarget,
public CTurnOffTarget,
public CMouseButtonDownMsgTarget,
public CEnterViewMsgTarget,
public CTurnOnTarget,
public CMovieEndMsgTarget {
private:
static int _v1;
static int _v2;

3
engines/titanic/game/bar_bell.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CBarBell : public CGameObject, CEnterRoomMsgTarget {
class CBarBell : public CGameObject,
public CEnterRoomMsgTarget {
public:
int _fieldBC;
int _fieldC0;

3
engines/titanic/game/bomb.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CBomb : public CBackground, CEnterRoomMsgTarget {
class CBomb : public CBackground,
public CEnterRoomMsgTarget {
private:
int _fieldE0;
int _fieldE4;

3
engines/titanic/game/chicken_cooler.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CChickenCooler : public CGameObject, CEnterRoomMsgTarget {
class CChickenCooler : public CGameObject,
public CEnterRoomMsgTarget {
private:
int _fieldBC;
int _fieldC0;

3
engines/titanic/game/doorbot_elevator_handler.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CDoorbotElevatorHandler : public CGameObject, CEnterNodeMsgTarget {
class CDoorbotElevatorHandler : public CGameObject,
public CEnterNodeMsgTarget {
private:
static int _v1;
int _value;

3
engines/titanic/game/end_sequence_control.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CEndSequenceControl : public CGameObject, CEnterRoomMsgTarget {
class CEndSequenceControl : public CGameObject,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:

3
engines/titanic/game/fan_noises.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CFanNoises : public CGameObject, CEnterRoomMsgTarget {
class CFanNoises : public CGameObject,
public CEnterRoomMsgTarget {
private:
int _fieldBC;
int _fieldC0;

3
engines/titanic/game/get_lift_eye2.h
View File

@ -27,7 +27,8 @@
#include "titanic/messages/messages.h"
namespace Titanic {
class CGetLiftEye2 : public CGameObject, CEnterRoomMsgTarget {
class CGetLiftEye2 : public CGameObject,
public CEnterRoomMsgTarget {
private:
static CString *_v1;
protected:

3
engines/titanic/game/gondolier/gondolier_mixer.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CGondolierMixer : public CGondolierBase, CEnterRoomMsgTarget {
class CGondolierMixer : public CGondolierBase,
public CEnterRoomMsgTarget {
private:
int _fieldBC;
int _fieldC0;

3
engines/titanic/game/light.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CLight : public CBackground, CEnterRoomMsgTarget {
class CLight : public CBackground,
public CEnterRoomMsgTarget {
private:
int _fieldE0;
int _fieldE4;

3
engines/titanic/game/light_switch.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CLightSwitch : public CBackground, CEnterRoomMsgTarget {
class CLightSwitch : public CBackground,
public CEnterRoomMsgTarget {
public:
static int _v1;
private:

3
engines/titanic/game/parrot/player_meets_parrot.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CPlayerMeetsParrot : public CGameObject, CEnterRoomMsgTarget {
class CPlayerMeetsParrot : public CGameObject,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:

3
engines/titanic/game/pet/pet_monitor.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CPETMonitor : public CGameObject, CEnterRoomMsgTarget {
class CPETMonitor : public CGameObject,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:

3
engines/titanic/game/pet/pet_position.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CPETPosition : public CGameObject, CEnterRoomMsgTarget {
class CPETPosition : public CGameObject,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:

3
engines/titanic/game/pet/pet_transport.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CPETTransport : public CGameObject, CEnterRoomMsgTarget {
class CPETTransport : public CGameObject,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public:

3
engines/titanic/game/sgt/sgt_state_room.h
View File

@ -45,7 +45,8 @@ struct CSGTStateRoomStatics {
int _v14;
};
class CSGTStateRoom : public CBackground, CEnterRoomMsgTarget {
class CSGTStateRoom : public CBackground,
public CEnterRoomMsgTarget {
private:
static CSGTStateRoomStatics *_statics;
private:

3
engines/titanic/game/ship_setting.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CShipSetting : public CBackground, CEnterRoomMsgTarget {
class CShipSetting : public CBackground,
public CEnterRoomMsgTarget {
private:
CString _string3;
Point _pos1;

3
engines/titanic/game/transport/lift.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CLift : public CTransport, CEnterRoomMsgTarget {
class CLift : public CTransport,
public CEnterRoomMsgTarget {
private:
static int _v1;
static int _v2;

3
engines/titanic/game/transport/pellerator.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CPellerator : public CTransport, CEnterRoomMsgTarget {
class CPellerator : public CTransport,
public CEnterRoomMsgTarget {
private:
static int _v1;
static int _v2;

3
engines/titanic/game/up_lighter.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CUpLighter : public CDropTarget, CEnterRoomMsgTarget {
class CUpLighter : public CDropTarget,
public CEnterRoomMsgTarget {
private:
int _field118;
int _field11C;

3
engines/titanic/moves/enter_bridge.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CEnterBridge : public CGameObject, CEnterRoomMsgTarget {
class CEnterBridge : public CGameObject,
public CEnterRoomMsgTarget {
private:
int _value;
protected:

3
engines/titanic/npcs/barbot.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CBarbot : public CTrueTalkNPC, CEnterRoomMsgTarget {
class CBarbot : public CTrueTalkNPC,
public CEnterRoomMsgTarget {
private:
static int _v0;
private:

3
engines/titanic/npcs/liftbot.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CLiftBot : public CTrueTalkNPC, CEnterRoomMsgTarget {
class CLiftBot : public CTrueTalkNPC,
public CEnterRoomMsgTarget {
private:
static int _v1;
static int _v2;

3
engines/titanic/sound/auto_music_player.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CAutoMusicPlayer : public CAutoMusicPlayerBase, CEnterRoomMsgTarget {
class CAutoMusicPlayer : public CAutoMusicPlayerBase,
public CEnterRoomMsgTarget {
private:
CString _string2;
protected:

3
engines/titanic/sound/music_player.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CMusicPlayer : public CGameObject, CEnterRoomMsgTarget {
class CMusicPlayer : public CGameObject,
public CEnterRoomMsgTarget {
protected:
int _fieldBC;
CString _string1;

3
engines/titanic/sound/node_auto_sound_player.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CNodeAutoSoundPlayer : public CAutoSoundPlayer, CEnterNodeMsgTarget {
class CNodeAutoSoundPlayer : public CAutoSoundPlayer,
public CEnterNodeMsgTarget {
private:
int _fieldEC;
protected:

3
engines/titanic/sound/room_auto_sound_player.h
View File

@ -28,7 +28,8 @@
namespace Titanic {
class CRoomAutoSoundPlayer : public CAutoSoundPlayer, CEnterRoomMsgTarget {
class CRoomAutoSoundPlayer : public CAutoSoundPlayer,
public CEnterRoomMsgTarget {
protected:
virtual bool handleMessage(CEnterRoomMsg &msg);
public: