From fa015808acb611f681a8027128e48fb458a84d14 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 28 Feb 2016 11:53:57 -0500 Subject: TITANIC: Implement bowl and ear classes --- engines/titanic/carry/bowl_ear.cpp | 37 ++++++++++++++++++++++ engines/titanic/carry/bowl_ear.h | 50 +++++++++++++++++++++++++++++ engines/titanic/carry/phonograph_ear.cpp | 37 ++++++++++++++++++++++ engines/titanic/carry/phonograph_ear.h | 50 +++++++++++++++++++++++++++++ engines/titanic/core/saveable_object.cpp | 24 +++++++++++++- engines/titanic/game/bowl_unlocker.cpp | 39 +++++++++++++++++++++++ engines/titanic/game/bowl_unlocker.h | 54 ++++++++++++++++++++++++++++++++ engines/titanic/game/ear_sweet_bowl.cpp | 37 ++++++++++++++++++++++ engines/titanic/game/ear_sweet_bowl.h | 50 +++++++++++++++++++++++++++++ engines/titanic/game/empty_nut_bowl.cpp | 39 +++++++++++++++++++++++ engines/titanic/game/empty_nut_bowl.h | 54 ++++++++++++++++++++++++++++++++ engines/titanic/game/no_nut_bowl.cpp | 37 ++++++++++++++++++++++ engines/titanic/game/no_nut_bowl.h | 50 +++++++++++++++++++++++++++++ engines/titanic/game/nut_replacer.cpp | 37 ++++++++++++++++++++++ engines/titanic/game/nut_replacer.h | 50 +++++++++++++++++++++++++++++ engines/titanic/module.mk | 7 +++++ 16 files changed, 651 insertions(+), 1 deletion(-) create mode 100644 engines/titanic/carry/bowl_ear.cpp create mode 100644 engines/titanic/carry/bowl_ear.h create mode 100644 engines/titanic/carry/phonograph_ear.cpp create mode 100644 engines/titanic/carry/phonograph_ear.h create mode 100644 engines/titanic/game/bowl_unlocker.cpp create mode 100644 engines/titanic/game/bowl_unlocker.h create mode 100644 engines/titanic/game/ear_sweet_bowl.cpp create mode 100644 engines/titanic/game/ear_sweet_bowl.h create mode 100644 engines/titanic/game/empty_nut_bowl.cpp create mode 100644 engines/titanic/game/empty_nut_bowl.h create mode 100644 engines/titanic/game/no_nut_bowl.cpp create mode 100644 engines/titanic/game/no_nut_bowl.h create mode 100644 engines/titanic/game/nut_replacer.cpp create mode 100644 engines/titanic/game/nut_replacer.h (limited to 'engines') diff --git a/engines/titanic/carry/bowl_ear.cpp b/engines/titanic/carry/bowl_ear.cpp new file mode 100644 index 0000000000..70d2409a05 --- /dev/null +++ b/engines/titanic/carry/bowl_ear.cpp @@ -0,0 +1,37 @@ +/* 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/carry/bowl_ear.h" + +namespace Titanic { + +void CBowlEar::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CEar::save(file, indent); +} + +void CBowlEar::load(SimpleFile *file) { + file->readNumber(); + CEar::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/carry/bowl_ear.h b/engines/titanic/carry/bowl_ear.h new file mode 100644 index 0000000000..c03446dc99 --- /dev/null +++ b/engines/titanic/carry/bowl_ear.h @@ -0,0 +1,50 @@ +/* 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_BOWL_EAR_H +#define TITANIC_BOWL_EAR_H + +#include "titanic/carry/ear.h" + +namespace Titanic { + +class CBowlEar : public CEar { +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CBowlEar"; } + + /** + * 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_BOWL_EAR_H */ diff --git a/engines/titanic/carry/phonograph_ear.cpp b/engines/titanic/carry/phonograph_ear.cpp new file mode 100644 index 0000000000..759356ab30 --- /dev/null +++ b/engines/titanic/carry/phonograph_ear.cpp @@ -0,0 +1,37 @@ +/* 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/carry/phonograph_ear.h" + +namespace Titanic { + +void CPhonographEar::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CEar::save(file, indent); +} + +void CPhonographEar::load(SimpleFile *file) { + file->readNumber(); + CEar::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/carry/phonograph_ear.h b/engines/titanic/carry/phonograph_ear.h new file mode 100644 index 0000000000..59042000c9 --- /dev/null +++ b/engines/titanic/carry/phonograph_ear.h @@ -0,0 +1,50 @@ +/* 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_PHONOGRAPH_EYE_H +#define TITANIC_PHONOGRAPH_EYE_H + +#include "titanic/carry/ear.h" + +namespace Titanic { + +class CPhonographEar : public CEar { +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CPhonographEar"; } + + /** + * 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_PHONOGRAPH_EYE_H */ diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp index 411f1b4ff9..f0429a73d3 100644 --- a/engines/titanic/core/saveable_object.cpp +++ b/engines/titanic/core/saveable_object.cpp @@ -21,13 +21,13 @@ */ #include "titanic/carry/arm.h" +#include "titanic/carry/bowl_ear.h" #include "titanic/carry/brain.h" #include "titanic/carry/bridge_piece.h" #include "titanic/carry/carry.h" #include "titanic/carry/carry_parrot.h" #include "titanic/carry/chicken.h" #include "titanic/carry/crushed_tv.h" -#include "titanic/carry/ear.h" #include "titanic/carry/eye.h" #include "titanic/carry/feathers.h" #include "titanic/carry/fruit.h" @@ -45,6 +45,7 @@ #include "titanic/carry/note.h" #include "titanic/carry/parcel.h" #include "titanic/carry/phonograph_cylinder.h" +#include "titanic/carry/phonograph_ear.h" #include "titanic/carry/photograph.h" #include "titanic/carry/plug_in.h" #include "titanic/carry/sweets.h" @@ -68,6 +69,7 @@ #include "titanic/core/view_item.h" #include "titanic/game/announce.h" +#include "titanic/game/bowl_unlocker.h" #include "titanic/game/cdrom.h" #include "titanic/game/cdrom_computer.h" #include "titanic/game/cdrom_tray.h" @@ -78,8 +80,12 @@ #include "titanic/game/desk_click_responder.h" #include "titanic/game/doorbot_home_handler.h" #include "titanic/game/drawer.h" +#include "titanic/game/ear_sweet_bowl.h" +#include "titanic/game/empty_nut_bowl.h" #include "titanic/game/hammer_dispensor_button.h" +#include "titanic/game/no_nut_bowl.h" #include "titanic/game/null_port_hole.h" +#include "titanic/game/nut_replacer.h" #include "titanic/game/pet_position.h" #include "titanic/game/port_hole.h" #include "titanic/game/room_item.h" @@ -175,11 +181,13 @@ Common::HashMap * #define ADDFN(T) (*_classList)[#T] = Function##T DEFFN(CArm); +DEFFN(CBowlEar); DEFFN(CBrain); DEFFN(CBridgePiece); DEFFN(CCarryParrot); DEFFN(CChicken); DEFFN(CCrushedTV); +DEFFN(CEar); DEFFN(CFeathers); DEFFN(CFruit); DEFFN(CGlass); @@ -194,6 +202,7 @@ DEFFN(CNapkin); DEFFN(CNote); DEFFN(CParcel); DEFFN(CPhonographCylinder); +DEFFN(CPhonographEar); DEFFN(CPhotograph); DEFFN(CPlugIn); DEFFN(CSweets); @@ -216,6 +225,7 @@ DEFFN(CTreeItem); DEFFN(CViewItem); DEFFN(CAnnounce); +DEFFN(CBowlUnlocker); DEFFN(CCDROM); DEFFN(CCDROMComputer); DEFFN(CCDROMTray); @@ -225,8 +235,12 @@ DEFFN(CCreditsButton); DEFFN(CDeadArea); DEFFN(CDeskClickResponder); DEFFN(CDoorbotHomeHandler); +DEFFN(CEarSweetBowl); +DEFFN(CEmptyNutBowl); DEFFN(CHammerDispensorButton); +DEFFN(CNoNutBowl); DEFFN(CNullPortHole); +DEFFN(CNutReplacer); DEFFN(CPETPosition); DEFFN(CPortHole); DEFFN(CRoomItem); @@ -486,11 +500,13 @@ DEFFN(CAutoMusicPlayer); void CSaveableObject::initClassList() { _classList = new Common::HashMap(); ADDFN(CArm); + ADDFN(CBowlEar); ADDFN(CBrain); ADDFN(CBridgePiece); ADDFN(CCarryParrot); ADDFN(CChicken); ADDFN(CCrushedTV); + ADDFN(CEar); ADDFN(CFeathers); ADDFN(CFruit); ADDFN(CGlass); @@ -505,6 +521,7 @@ void CSaveableObject::initClassList() { ADDFN(CNote); ADDFN(CParcel); ADDFN(CPhonographCylinder); + ADDFN(CPhonographEar); ADDFN(CPhotograph); ADDFN(CPlugIn); ADDFN(CSweets); @@ -527,6 +544,7 @@ void CSaveableObject::initClassList() { ADDFN(CViewItem); ADDFN(CAnnounce); + ADDFN(CBowlUnlocker); ADDFN(CCDROM); ADDFN(CCDROMComputer); ADDFN(CCDROMTray); @@ -537,8 +555,12 @@ void CSaveableObject::initClassList() { ADDFN(CDeskClickResponder); ADDFN(CDoorbotHomeHandler); ADDFN(CDropTarget); + ADDFN(CEarSweetBowl); + ADDFN(CEmptyNutBowl); ADDFN(CHammerDispensorButton); + ADDFN(CNoNutBowl); ADDFN(CNullPortHole); + ADDFN(CNutReplacer); ADDFN(CPETPosition); ADDFN(CPortHole); ADDFN(CRoomItem); diff --git a/engines/titanic/game/bowl_unlocker.cpp b/engines/titanic/game/bowl_unlocker.cpp new file mode 100644 index 0000000000..83ae9e35d5 --- /dev/null +++ b/engines/titanic/game/bowl_unlocker.cpp @@ -0,0 +1,39 @@ +/* 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/bowl_unlocker.h" + +namespace Titanic { + +void CBowlUnlocker::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeNumberLine(_value, indent); + CGameObject::save(file, indent); +} + +void CBowlUnlocker::load(SimpleFile *file) { + file->readNumber(); + _value = file->readNumber(); + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/bowl_unlocker.h b/engines/titanic/game/bowl_unlocker.h new file mode 100644 index 0000000000..455b0a7fd8 --- /dev/null +++ b/engines/titanic/game/bowl_unlocker.h @@ -0,0 +1,54 @@ +/* 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_BOWL_UNLOCKER_H +#define TITANIC_BOWL_UNLOCKER_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CBowlUnlocker : public CGameObject { +public: + int _value; +public: + CBowlUnlocker() : CGameObject(), _value(0) {} + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CBowlUnlocker"; } + + /** + * 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_BOWL_UNLOCKER_H */ diff --git a/engines/titanic/game/ear_sweet_bowl.cpp b/engines/titanic/game/ear_sweet_bowl.cpp new file mode 100644 index 0000000000..dc4ca7af08 --- /dev/null +++ b/engines/titanic/game/ear_sweet_bowl.cpp @@ -0,0 +1,37 @@ +/* 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/ear_sweet_bowl.h" + +namespace Titanic { + +void CEarSweetBowl::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CSweetBowl::save(file, indent); +} + +void CEarSweetBowl::load(SimpleFile *file) { + file->readNumber(); + CSweetBowl::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/ear_sweet_bowl.h b/engines/titanic/game/ear_sweet_bowl.h new file mode 100644 index 0000000000..3e27516a60 --- /dev/null +++ b/engines/titanic/game/ear_sweet_bowl.h @@ -0,0 +1,50 @@ +/* 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_EAR_SWEET_BOWL_H +#define TITANIC_EAR_SWEET_BOWL_H + +#include "titanic/game/sweet_bowl.h" + +namespace Titanic { + +class CEarSweetBowl : public CSweetBowl { +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CEarSweetBowl"; } + + /** + * 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_EAR_SWEET_BOWL_H */ diff --git a/engines/titanic/game/empty_nut_bowl.cpp b/engines/titanic/game/empty_nut_bowl.cpp new file mode 100644 index 0000000000..217029be19 --- /dev/null +++ b/engines/titanic/game/empty_nut_bowl.cpp @@ -0,0 +1,39 @@ +/* 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/empty_nut_bowl.h" + +namespace Titanic { + +void CEmptyNutBowl::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + file->writeNumberLine(_value, indent); + CGameObject::save(file, indent); +} + +void CEmptyNutBowl::load(SimpleFile *file) { + file->readNumber(); + _value = file->readNumber(); + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/empty_nut_bowl.h b/engines/titanic/game/empty_nut_bowl.h new file mode 100644 index 0000000000..c1c553a697 --- /dev/null +++ b/engines/titanic/game/empty_nut_bowl.h @@ -0,0 +1,54 @@ +/* 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_EMPTY_NUT_BOWL_H +#define TITANIC_EMPTY_NUT_BOWL_H + +#include "titanic/core/background.h" + +namespace Titanic { + +class CEmptyNutBowl : public CGameObject { +public: + int _value; +public: + CEmptyNutBowl() : CGameObject(), _value(1) {} + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CEmptyNutBowl"; } + + /** + * 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_NO_NUT_BOWL_H */ diff --git a/engines/titanic/game/no_nut_bowl.cpp b/engines/titanic/game/no_nut_bowl.cpp new file mode 100644 index 0000000000..354dea3cd8 --- /dev/null +++ b/engines/titanic/game/no_nut_bowl.cpp @@ -0,0 +1,37 @@ +/* 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/no_nut_bowl.h" + +namespace Titanic { + +void CNoNutBowl::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CBackground::save(file, indent); +} + +void CNoNutBowl::load(SimpleFile *file) { + file->readNumber(); + CBackground::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/no_nut_bowl.h b/engines/titanic/game/no_nut_bowl.h new file mode 100644 index 0000000000..40e8fd15f1 --- /dev/null +++ b/engines/titanic/game/no_nut_bowl.h @@ -0,0 +1,50 @@ +/* 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_NO_NUT_BOWL_H +#define TITANIC_NO_NUT_BOWL_H + +#include "titanic/core/background.h" + +namespace Titanic { + +class CNoNutBowl : public CBackground { +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CNoNutBowl"; } + + /** + * 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_NO_NUT_BOWL_H */ diff --git a/engines/titanic/game/nut_replacer.cpp b/engines/titanic/game/nut_replacer.cpp new file mode 100644 index 0000000000..36c0510b20 --- /dev/null +++ b/engines/titanic/game/nut_replacer.cpp @@ -0,0 +1,37 @@ +/* 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/nut_replacer.h" + +namespace Titanic { + +void CNutReplacer::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CGameObject::save(file, indent); +} + +void CNutReplacer::load(SimpleFile *file) { + file->readNumber(); + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/nut_replacer.h b/engines/titanic/game/nut_replacer.h new file mode 100644 index 0000000000..ef800c71a6 --- /dev/null +++ b/engines/titanic/game/nut_replacer.h @@ -0,0 +1,50 @@ +/* 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_NUT_REPLACER_H +#define TITANIC_NUT_REPLACER_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CNutReplacer : public CGameObject { +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CNutReplacer"; } + + /** + * 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_NUT_REPLACER_H */ diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index f2265bfafb..0b43dbbbc1 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -16,6 +16,7 @@ MODULE_OBJS := \ titanic.o \ video_surface.o \ carry/arm.o \ + carry/bowl_ear.o \ carry/brain.o \ carry/bridge_piece.o \ carry/carry.o \ @@ -40,6 +41,7 @@ MODULE_OBJS := \ carry/note.o \ carry/parcel.o \ carry/phonograph_cylinder.o \ + carry/phonograph_ear.o \ carry/photograph.o \ carry/plug_in.o \ carry/sweets.o \ @@ -65,6 +67,7 @@ MODULE_OBJS := \ core/tree_item.o \ core/view_item.o \ game/announce.o \ + game/bowl_unlocker.o \ game/cdrom.o \ game/cdrom_computer.o \ game/cdrom_tray.o \ @@ -75,10 +78,14 @@ MODULE_OBJS := \ game/desk_click_responder.o \ game/doorbot_home_handler.o \ game/drawer.o \ + game/ear_sweet_bowl.o \ + game/empty_nut_bowl.o \ game/hammer_dispensor_button.o \ + game/no_nut_bowl.o \ game/pet_position.o \ game/port_hole.o \ game/null_port_hole.o \ + game/nut_replacer.o \ game/room_item.o \ game/service_elevator_door.o \ game/sgt_state_room.o \ -- cgit v1.2.3