From 9cb1390c2636f6b586b0f6dfca6573bc05dc6592 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 28 Feb 2016 07:49:21 -0500 Subject: TITANIC: Implemented CClickResponder and descendents --- engines/titanic/core/click_responder.cpp | 43 +++++++++++++++++++++ engines/titanic/core/click_responder.h | 52 +++++++++++++++++++++++++ engines/titanic/core/saveable_object.cpp | 12 ++++++ engines/titanic/game/desk_click_responder.cpp | 43 +++++++++++++++++++++ engines/titanic/game/desk_click_responder.h | 53 ++++++++++++++++++++++++++ engines/titanic/game/null_port_hole.cpp | 48 +++++++++++++++++++++++ engines/titanic/game/null_port_hole.h | 52 +++++++++++++++++++++++++ engines/titanic/game/sgt_upper_doors_sound.cpp | 45 ++++++++++++++++++++++ engines/titanic/game/sgt_upper_doors_sound.h | 52 +++++++++++++++++++++++++ engines/titanic/module.mk | 4 ++ 10 files changed, 404 insertions(+) create mode 100644 engines/titanic/core/click_responder.cpp create mode 100644 engines/titanic/core/click_responder.h create mode 100644 engines/titanic/game/desk_click_responder.cpp create mode 100644 engines/titanic/game/desk_click_responder.h create mode 100644 engines/titanic/game/null_port_hole.cpp create mode 100644 engines/titanic/game/null_port_hole.h create mode 100644 engines/titanic/game/sgt_upper_doors_sound.cpp create mode 100644 engines/titanic/game/sgt_upper_doors_sound.h (limited to 'engines/titanic') diff --git a/engines/titanic/core/click_responder.cpp b/engines/titanic/core/click_responder.cpp new file mode 100644 index 0000000000..9e8564b6d5 --- /dev/null +++ b/engines/titanic/core/click_responder.cpp @@ -0,0 +1,43 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/core/click_responder.h" + +namespace Titanic { + +void CClickResponder::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeQuotedLine(_string1, indent); + file->writeQuotedLine(_string2, indent); + + CGameObject::save(file, indent); +} + +void CClickResponder::load(SimpleFile *file) { + file->readNumber(); + _string1 = file->readString(); + _string2 = file->readString(); + + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/core/click_responder.h b/engines/titanic/core/click_responder.h new file mode 100644 index 0000000000..1f2fa72f18 --- /dev/null +++ b/engines/titanic/core/click_responder.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_CLICK_RESPONDER_H +#define TITANIC_CLICK_RESPONDER_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CClickResponder : public CGameObject { +protected: + CString _string1, _string2; +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CClickResponder"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_CLICK_RESPONDER_H */ diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index dbbf8aa205..3ad4c7365b 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -51,6 +51,7 @@ #include "titanic/core/saveable_object.h" #include "titanic/core/background.h" +#include "titanic/core/click_responder.h" #include "titanic/core/file_item.h" #include "titanic/core/link_item.h" #include "titanic/core/list.h" @@ -70,14 +71,17 @@ #include "titanic/game/cdrom_tray.h" #include "titanic/game/computer_screen.h" #include "titanic/game/dead_area.h" +#include "titanic/game/desk_click_responder.h" #include "titanic/game/doorbot_home_handler.h" #include "titanic/game/drawer.h" #include "titanic/game/drop_target.h" #include "titanic/game/hammer_dispensor_button.h" +#include "titanic/game/null_port_hole.h" #include "titanic/game/pet_position.h" #include "titanic/game/room_item.h" #include "titanic/game/service_elevator_door.h" #include "titanic/game/sgt_state_room.h" +#include "titanic/game/sgt_upper_doors_sound.h" #include "titanic/game/start_action.h" #include "titanic/game/sub_glass.h" #include "titanic/game/television.h" @@ -180,6 +184,7 @@ DEFFN(CPlugIn); DEFFN(CSweets); DEFFN(CBackground); +DEFFN(CClickResponder); DEFFN(CFileItem); DEFFN(CFileListItem); DEFFN(CLinkItem); @@ -199,13 +204,16 @@ DEFFN(CCDROMComputer); DEFFN(CCDROMTray); DEFFN(CComputerScreen); DEFFN(CDeadArea); +DEFFN(CDeskClickResponder); DEFFN(CDoorbotHomeHandler); DEFFN(CDropTarget); DEFFN(CHammerDispensorButton); +DEFFN(CNullPortHole); DEFFN(CPETPosition); DEFFN(CRoomItem); DEFFN(CServiceElevatorDoor); DEFFN(CSGTStateRoom); +DEFFN(CSGTUpperDoorsSound); DEFFN(CStartAction); DEFFN(CSUBGlass); DEFFN(CTelevision); @@ -472,6 +480,7 @@ void CSaveableObject::initClassList() { ADDFN(CSweets); ADDFN(CBackground); + ADDFN(CClickResponder); ADDFN(CFileItem); ADDFN(CFileListItem); ADDFN(CLinkItem); @@ -491,13 +500,16 @@ void CSaveableObject::initClassList() { ADDFN(CCDROMTray); ADDFN(CComputerScreen); ADDFN(CDeadArea); + ADDFN(CDeskClickResponder); ADDFN(CDoorbotHomeHandler); ADDFN(CDropTarget); ADDFN(CHammerDispensorButton); + ADDFN(CNullPortHole); ADDFN(CPETPosition); ADDFN(CRoomItem); ADDFN(CServiceElevatorDoor); ADDFN(CSGTStateRoom); + ADDFN(CSGTUpperDoorsSound); ADDFN(CStartAction); ADDFN(CSUBGlass); ADDFN(CTelevision); diff --git a/engines/titanic/game/desk_click_responder.cpp b/engines/titanic/game/desk_click_responder.cpp new file mode 100644 index 0000000000..312fe564af --- /dev/null +++ b/engines/titanic/game/desk_click_responder.cpp @@ -0,0 +1,43 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/game/desk_click_responder.h" + +namespace Titanic { + +void CDeskClickResponder::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeNumberLine(_fieldD4, indent); + file->writeNumberLine(_fieldD8, indent); + + CClickResponder::save(file, indent); +} + +void CDeskClickResponder::load(SimpleFile *file) { + file->readNumber(); + _fieldD4 = file->readNumber(); + _fieldD8 = file->readNumber(); + + CClickResponder::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/desk_click_responder.h b/engines/titanic/game/desk_click_responder.h new file mode 100644 index 0000000000..94afece266 --- /dev/null +++ b/engines/titanic/game/desk_click_responder.h @@ -0,0 +1,53 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_DESK_CLICK_RESPONDER_H +#define TITANIC_DESK_CLICK_RESPONDER_H + +#include "titanic/core/click_responder.h" + +namespace Titanic { + +class CDeskClickResponder : public CClickResponder { +protected: + int _fieldD4; + int _fieldD8; +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CDeskClickResponder"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_DESK_CLICK_RESPONDER_H */ diff --git a/engines/titanic/game/null_port_hole.cpp b/engines/titanic/game/null_port_hole.cpp new file mode 100644 index 0000000000..c437dfea10 --- /dev/null +++ b/engines/titanic/game/null_port_hole.cpp @@ -0,0 +1,48 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/game/null_port_hole.h" + +namespace Titanic { + +CNullPortHole::CNullPortHole() : CClickResponder() { + _string1 = "For a better view, why not visit the Promenade Deck?"; + _string2 = "b#48.wav"; +} + +void CNullPortHole::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeQuotedLine(_string2, indent); + file->writeQuotedLine(_string1, indent); + + CClickResponder::save(file, indent); +} + +void CNullPortHole::load(SimpleFile *file) { + file->readNumber(); + _string2 = file->readString(); + _string1 = file->readString(); + + CClickResponder::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/null_port_hole.h b/engines/titanic/game/null_port_hole.h new file mode 100644 index 0000000000..2caff276d5 --- /dev/null +++ b/engines/titanic/game/null_port_hole.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_NULL_PORT_HOLE_H +#define TITANIC_NULL_PORT_HOLE_H + +#include "titanic/core/click_responder.h" + +namespace Titanic { + +class CNullPortHole : public CClickResponder { +public: + CNullPortHole(); + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CNullPortHole"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_NULL_PORT_HOLE_H */ diff --git a/engines/titanic/game/sgt_upper_doors_sound.cpp b/engines/titanic/game/sgt_upper_doors_sound.cpp new file mode 100644 index 0000000000..23809262e1 --- /dev/null +++ b/engines/titanic/game/sgt_upper_doors_sound.cpp @@ -0,0 +1,45 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/game/sgt_upper_doors_sound.h" + +namespace Titanic { + +CSGTUpperDoorsSound::CSGTUpperDoorsSound() { + _string2 = "b#53.wav"; +} + +void CSGTUpperDoorsSound::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeQuotedLine(_string2, indent); + + CClickResponder::save(file, indent); +} + +void CSGTUpperDoorsSound::load(SimpleFile *file) { + file->readNumber(); + _string2 = file->readString(); + + CClickResponder::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/sgt_upper_doors_sound.h b/engines/titanic/game/sgt_upper_doors_sound.h new file mode 100644 index 0000000000..ed97627315 --- /dev/null +++ b/engines/titanic/game/sgt_upper_doors_sound.h @@ -0,0 +1,52 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_SGT_UPPER_DOORS_SOUND_H +#define TITANIC_SGT_UPPER_DOORS_SOUND_H + +#include "titanic/core/click_responder.h" + +namespace Titanic { + +class CSGTUpperDoorsSound : public CClickResponder { +public: + CSGTUpperDoorsSound(); + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CSGTUpperDoorsSound"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_SGT_UPPER_DOORS_SOUND_H */ diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index d8fdbebc73..855ba0bcb7 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -44,6 +44,7 @@ MODULE_OBJS := \ carry/plug_in.o \ carry/sweets.o \ core/background.o \ + core/click_responder.o \ core/dont_save_file_item.o \ core/file_item.o \ core/game_object.o \ @@ -67,14 +68,17 @@ MODULE_OBJS := \ game/cdrom_tray.o \ game/computer_screen.o \ game/dead_area.o \ + game/desk_click_responder.o \ game/doorbot_home_handler.o \ game/drawer.o \ game/drop_target.o \ game/hammer_dispensor_button.o \ game/pet_position.o \ + game/null_port_hole.o \ game/room_item.o \ game/service_elevator_door.o \ game/sgt_state_room.o \ + game/sgt_upper_doors_sound.o \ game/start_action.o \ game/sub_glass.o \ game/television.o \ -- cgit v1.2.3