From 42206332d0d7474dfead288c643ef4980c739773 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 18 Apr 2016 17:25:58 -0400 Subject: TITANIC: Adding new class stubs for PET Real Life btns & elements --- engines/titanic/module.mk | 8 +- engines/titanic/pet_control/pet_control.cpp | 14 +-- engines/titanic/pet_control/pet_control.h | 4 +- engines/titanic/pet_control/pet_frame.cpp | 2 +- engines/titanic/pet_control/pet_load.cpp | 28 ++++++ engines/titanic/pet_control/pet_load.h | 35 +++++++ engines/titanic/pet_control/pet_load_save.cpp | 28 ++++++ engines/titanic/pet_control/pet_load_save.h | 39 ++++++++ engines/titanic/pet_control/pet_quit.cpp | 28 ++++++ engines/titanic/pet_control/pet_quit.h | 41 ++++++++ engines/titanic/pet_control/pet_real_life.cpp | 57 +++++++++++ engines/titanic/pet_control/pet_real_life.h | 135 ++++++++++++++++++++++++++ engines/titanic/pet_control/pet_save.cpp | 27 ++++++ engines/titanic/pet_control/pet_save.h | 35 +++++++ engines/titanic/pet_control/pet_saves.cpp | 32 ------ engines/titanic/pet_control/pet_saves.h | 48 --------- engines/titanic/pet_control/pet_section.h | 2 +- engines/titanic/pet_control/pet_slider.cpp | 89 +++++++++++++++++ engines/titanic/pet_control/pet_slider.h | 85 ++++++++++++++++ engines/titanic/pet_control/pet_sound.cpp | 29 ++++++ engines/titanic/pet_control/pet_sound.h | 41 ++++++++ 21 files changed, 715 insertions(+), 92 deletions(-) create mode 100644 engines/titanic/pet_control/pet_load.cpp create mode 100644 engines/titanic/pet_control/pet_load.h create mode 100644 engines/titanic/pet_control/pet_load_save.cpp create mode 100644 engines/titanic/pet_control/pet_load_save.h create mode 100644 engines/titanic/pet_control/pet_quit.cpp create mode 100644 engines/titanic/pet_control/pet_quit.h create mode 100644 engines/titanic/pet_control/pet_real_life.cpp create mode 100644 engines/titanic/pet_control/pet_real_life.h create mode 100644 engines/titanic/pet_control/pet_save.cpp create mode 100644 engines/titanic/pet_control/pet_save.h delete mode 100644 engines/titanic/pet_control/pet_saves.cpp delete mode 100644 engines/titanic/pet_control/pet_saves.h create mode 100644 engines/titanic/pet_control/pet_slider.cpp create mode 100644 engines/titanic/pet_control/pet_slider.h create mode 100644 engines/titanic/pet_control/pet_sound.cpp create mode 100644 engines/titanic/pet_control/pet_sound.h (limited to 'engines/titanic') diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index da642f9a3a..fc2b4ef7fc 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -365,7 +365,7 @@ MODULE_OBJS := \ pet_control/pet_inventory_glyphs.o \ pet_control/pet_rooms.o \ pet_control/pet_remote.o \ - pet_control/pet_saves.o \ + pet_control/pet_real_life.o \ pet_control/pet_section.o \ pet_control/pet_control_sub5.o \ pet_control/pet_control_sub7.o \ @@ -376,12 +376,18 @@ MODULE_OBJS := \ pet_control/pet_graphic.o \ pet_control/pet_glyphs.o \ pet_control/pet_leaf.o \ + pet_control/pet_load.o \ + pet_control/pet_load_save.o \ pet_control/pet_mode_off.o \ pet_control/pet_mode_on.o \ pet_control/pet_mode_panel.o \ pet_control/pet_pannel1.o \ pet_control/pet_pannel2.o \ pet_control/pet_pannel3.o \ + pet_control/pet_quit.o \ + pet_control/pet_save.o \ + pet_control/pet_slider.o \ + pet_control/pet_sound.o \ sound/auto_music_player.o \ sound/auto_music_player_base.o \ sound/auto_sound_player.o \ diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index fed17d5b4b..0bba2c2330 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -51,7 +51,7 @@ CPetControl::CPetControl() : CGameObject(), _sections[PET_CONVERSATION] = &_conversations; _sections[PET_REMOTE] = &_remote; _sections[PET_ROOMS] = &_rooms; - _sections[PET_SAVE] = &_saves; + _sections[PET_REAL_LIFE] = &_realLife; _sections[PET_5] = &_sub5; _sections[PET_6] = &_sub7; } @@ -87,7 +87,7 @@ void CPetControl::setup() { _remote.setup(this); _inventory.setup(this); _sub5.setup(this); - _saves.setup(this); + _realLife.setup(this); _sub7.setup(this); _frame.setup(this); } @@ -98,7 +98,7 @@ bool CPetControl::isValid() { _remote.isValid(this) && _inventory.isValid(this) && _sub5.isValid(this) && - _saves.isValid(this) && + _realLife.isValid(this) && _sub7.isValid(this) && _frame.isValid(this); } @@ -109,7 +109,7 @@ void CPetControl::loadAreas(SimpleFile *file, int param) { _remote.load(file, param); _inventory.load(file, param); _sub5.load(file, param); - _saves.load(file, param); + _realLife.load(file, param); _sub7.load(file, param); _frame.load(file, param); } @@ -120,7 +120,7 @@ void CPetControl::saveAreas(SimpleFile *file, int indent) const { _remote.save(file, indent); _inventory.save(file, indent); _sub5.save(file, indent); - _saves.save(file, indent); + _realLife.save(file, indent); _sub7.save(file, indent); _frame.save(file, indent); } @@ -165,7 +165,7 @@ void CPetControl::loaded() { _remote.postLoad(); _inventory.postLoad(); _sub5.postLoad(); - _saves.postLoad(); + _realLife.postLoad(); _sub7.postLoad(); _frame.postLoad(); } @@ -330,7 +330,7 @@ bool CPetControl::VirtualKeyCharMsg(CVirtualKeyCharMsg *msg) { break; case Common::KEYCODE_F5: result = true; - setArea(PET_SAVE); + setArea(PET_REAL_LIFE); break; default: break; diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 3726fc355f..e7ec993ba9 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -31,9 +31,9 @@ #include "titanic/pet_control/pet_conversations.h" #include "titanic/pet_control/pet_frame.h" #include "titanic/pet_control/pet_inventory.h" +#include "titanic/pet_control/pet_real_life.h" #include "titanic/pet_control/pet_remote.h" #include "titanic/pet_control/pet_rooms.h" -#include "titanic/pet_control/pet_saves.h" #include "titanic/pet_control/pet_control_sub5.h" #include "titanic/pet_control/pet_control_sub7.h" @@ -50,7 +50,7 @@ private: CPetInventory _inventory; CPetRemote _remote; CPetRoomsSection _rooms; - CPetSaves _saves; + CPetRealLife _realLife; CPetControlSub5 _sub5; CPetControlSub7 _sub7; CPetFrame _frame; diff --git a/engines/titanic/pet_control/pet_frame.cpp b/engines/titanic/pet_control/pet_frame.cpp index f243054bfb..a9f45fa746 100644 --- a/engines/titanic/pet_control/pet_frame.cpp +++ b/engines/titanic/pet_control/pet_frame.cpp @@ -27,7 +27,7 @@ namespace Titanic { static const PetArea PET_AREAS[6] = { PET_CONVERSATION, PET_INVENTORY, PET_REMOTE, - PET_ROOMS, PET_SAVE, PET_5 + PET_ROOMS, PET_REAL_LIFE, PET_5 }; CPetFrame::CPetFrame() : CPetSection() { diff --git a/engines/titanic/pet_control/pet_load.cpp b/engines/titanic/pet_control/pet_load.cpp new file mode 100644 index 0000000000..1008425604 --- /dev/null +++ b/engines/titanic/pet_control/pet_load.cpp @@ -0,0 +1,28 @@ +/* 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/pet_control/pet_load.h" + +namespace Titanic { + + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_load.h b/engines/titanic/pet_control/pet_load.h new file mode 100644 index 0000000000..297cb97c54 --- /dev/null +++ b/engines/titanic/pet_control/pet_load.h @@ -0,0 +1,35 @@ +/* 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_PET_LOAD_H +#define TITANIC_PET_LOAD_H + +#include "titanic/pet_control/pet_load_save.h" + +namespace Titanic { + +class CPetLoad : public CPetLoadSave { +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_LOAD_H */ diff --git a/engines/titanic/pet_control/pet_load_save.cpp b/engines/titanic/pet_control/pet_load_save.cpp new file mode 100644 index 0000000000..7660b717c6 --- /dev/null +++ b/engines/titanic/pet_control/pet_load_save.cpp @@ -0,0 +1,28 @@ +/* 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/pet_control/pet_load_save.h" + +namespace Titanic { + + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_load_save.h b/engines/titanic/pet_control/pet_load_save.h new file mode 100644 index 0000000000..780fd75af0 --- /dev/null +++ b/engines/titanic/pet_control/pet_load_save.h @@ -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. + * + */ + +#ifndef TITANIC_PET_LOAD_SAVE_H +#define TITANIC_PET_LOAD_SAVE_H + +#include "titanic/pet_control/pet_glyphs.h" + +namespace Titanic { + +class CPetLoadSave : public CPetGlyph { +protected: + CPetGfxElement _element1; + CPetGfxElement _element2; +public: +}; + +} // End of namespace Titanic + +#endif diff --git a/engines/titanic/pet_control/pet_quit.cpp b/engines/titanic/pet_control/pet_quit.cpp new file mode 100644 index 0000000000..da757f5ba4 --- /dev/null +++ b/engines/titanic/pet_control/pet_quit.cpp @@ -0,0 +1,28 @@ +/* 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/pet_control/pet_quit.h" + +namespace Titanic { + + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_quit.h b/engines/titanic/pet_control/pet_quit.h new file mode 100644 index 0000000000..28b4b87c43 --- /dev/null +++ b/engines/titanic/pet_control/pet_quit.h @@ -0,0 +1,41 @@ +/* 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_PET_QUIT_H +#define TITANIC_PET_QUIT_H + +#include "titanic/pet_control/pet_gfx_element.h" +#include "titanic/pet_control/pet_glyphs.h" +#include "titanic/pet_control/pet_control_sub12.h" + +namespace Titanic { + +class CPetQuit : public CPetGlyph { +private: + CPetControlSub12 _sub12; + CPetGfxElement _element; +public: +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_QUIT_H */ diff --git a/engines/titanic/pet_control/pet_real_life.cpp b/engines/titanic/pet_control/pet_real_life.cpp new file mode 100644 index 0000000000..3ec3317bb8 --- /dev/null +++ b/engines/titanic/pet_control/pet_real_life.cpp @@ -0,0 +1,57 @@ +/* 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/pet_control/pet_real_life.h" +#include "titanic/pet_control/pet_control.h" + +namespace Titanic { + +bool CPetRealLife::setup(CPetControl *petControl) { + if (petControl && setupControl(petControl)) + return reset(); + return false; +} + +bool CPetRealLife::reset() { + return true; +} + +void CPetRealLife::draw(CScreenManager *screenManager) { + _petControl->drawSquares(screenManager, 4); + _glyphs.draw(screenManager); + _sub12.draw(screenManager); +} + +bool CPetRealLife::setupControl(CPetControl *petControl) { + if (petControl) { + + } + + return true; +} + +bool CPetRealLife::isValid(CPetControl *petControl) { + setupControl(petControl); + return true; +} + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_real_life.h b/engines/titanic/pet_control/pet_real_life.h new file mode 100644 index 0000000000..57d0b317ba --- /dev/null +++ b/engines/titanic/pet_control/pet_real_life.h @@ -0,0 +1,135 @@ +/* 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_PET_REAL_LIFE_H +#define TITANIC_PET_REAL_LIFE_H + +#include "titanic/pet_control/pet_section.h" +#include "titanic/pet_control/pet_glyphs.h" +#include "titanic/pet_control/pet_control_sub12.h" + +namespace Titanic { + +class CPetSaveGlyphs : public CPetGlyphs { +}; + +class CPetRealLife : public CPetSection { +private: + CPetGlyphs _glyphs; + CPetSaveGlyphs _sub12; +private: + /** + * Does setup + */ + bool setupControl(CPetControl *petControl); +public: + virtual ~CPetRealLife() {} + + /** + * Sets up the section + */ + virtual bool setup(CPetControl *petControl); + + /** + * Reset the section + */ + virtual bool reset(); + + /** + * Draw the section + */ + virtual void draw(CScreenManager *screenManager); + + /** + * Get the bounds for the section + */ + virtual Rect getBounds() { return Rect(); } + + virtual void proc5(int val) {} + + /** + * Following are handlers for the various messages that the PET can + * pass onto the currently active section/area + */ + virtual bool MouseButtonDownMsg(CMouseButtonDownMsg *msg) { return false; } + virtual bool MouseDragStartMsg(CMouseDragStartMsg *msg) { return false; } + virtual bool MouseDragMoveMsg(CMouseDragMoveMsg *msg) { return false; } + virtual bool MouseDragEndMsg(CMouseDragEndMsg *msg) { return false; } + virtual bool MouseButtonUpMsg(CMouseButtonUpMsg *msg) { return false; } + virtual bool MouseDoubleClickMsg(CMouseDoubleClickMsg *msg) { return false; } + virtual bool KeyCharMsg(CKeyCharMsg *msg) { return false; } + virtual bool VirtualKeyCharMsg(CVirtualKeyCharMsg *msg) { return false; } + + virtual int proc14() { return 0; } + + /** + * Returns item a drag-drop operation has dropped on, if any + */ + virtual CGameObject *dragEnd(const Point &pt) const { return nullptr; } + + /** + * Display a message + */ + virtual void displayMessage(const CString &msg) {} + + /** + * Returns true if the object is in a valid state + */ + virtual bool isValid(CPetControl *petControl); + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file, int param) {} + + /** + * Called after a game has been loaded + */ + virtual void postLoad() {} + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const {} + + /** + * Called when a section is switched to + */ + virtual void enter(PetArea oldArea) {} + + /** + * Called when a section is being left, to switch to another area + */ + virtual void leave() {} + + virtual void proc23() {} + + /** + * Called when a new room is entered + */ + virtual void enterRoom(CRoomItem *room) {} + +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_REAL_LIFE_H */ diff --git a/engines/titanic/pet_control/pet_save.cpp b/engines/titanic/pet_control/pet_save.cpp new file mode 100644 index 0000000000..d8835e1920 --- /dev/null +++ b/engines/titanic/pet_control/pet_save.cpp @@ -0,0 +1,27 @@ +/* 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/pet_control/pet_save.h" + +namespace Titanic { + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_save.h b/engines/titanic/pet_control/pet_save.h new file mode 100644 index 0000000000..21e59cbf96 --- /dev/null +++ b/engines/titanic/pet_control/pet_save.h @@ -0,0 +1,35 @@ +/* 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_PET_SAVE_H +#define TITANIC_PET_SAVE_H + +#include "titanic/pet_control/pet_load_save.h" + +namespace Titanic { + +class CPetSave : public CPetLoadSave { +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_SAVE_H */ diff --git a/engines/titanic/pet_control/pet_saves.cpp b/engines/titanic/pet_control/pet_saves.cpp deleted file mode 100644 index 0a90cc257d..0000000000 --- a/engines/titanic/pet_control/pet_saves.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* 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/pet_control/pet_saves.h" - -namespace Titanic { - -bool CPetSaves::isValid(CPetControl *petControl) { - // TODO - return true; -} - -} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_saves.h b/engines/titanic/pet_control/pet_saves.h deleted file mode 100644 index 8366ab6dda..0000000000 --- a/engines/titanic/pet_control/pet_saves.h +++ /dev/null @@ -1,48 +0,0 @@ -/* 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_PET_SAVES_H -#define TITANIC_PET_SAVES_H - -#include "titanic/pet_control/pet_section.h" -#include "titanic/pet_control/pet_glyphs.h" -#include "titanic/pet_control/pet_control_sub12.h" - -namespace Titanic { - -class CPetSaveGlyphs : public CPetGlyphs { -}; - -class CPetSaves : public CPetSection { -private: - CPetSaveGlyphs _sub10; - CPetSaveGlyphs _sub12; -public: - /** - * Returns true if the object is in a valid state - */ - virtual bool isValid(CPetControl *petControl); -}; - -} // End of namespace Titanic - -#endif /* TITANIC_PET_SAVES_H */ diff --git a/engines/titanic/pet_control/pet_section.h b/engines/titanic/pet_control/pet_section.h index 07b935a318..728fb49467 100644 --- a/engines/titanic/pet_control/pet_section.h +++ b/engines/titanic/pet_control/pet_section.h @@ -30,7 +30,7 @@ namespace Titanic { enum PetArea { PET_INVENTORY = 0, PET_CONVERSATION = 1, PET_REMOTE = 2, - PET_ROOMS = 3, PET_SAVE = 4, PET_5 = 5, PET_6 = 6 + PET_ROOMS = 3, PET_REAL_LIFE = 4, PET_5 = 5, PET_6 = 6 }; class CPetControl; diff --git a/engines/titanic/pet_control/pet_slider.cpp b/engines/titanic/pet_control/pet_slider.cpp new file mode 100644 index 0000000000..dad78d6a1e --- /dev/null +++ b/engines/titanic/pet_control/pet_slider.cpp @@ -0,0 +1,89 @@ +/* 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/pet_control/pet_slider.h" + +namespace Titanic { + +CPetSlider::CPetSlider() { + _field4 = 0; + _field8 = 0; + _field1C = 0; + _field20 = 0; + _field24 = 0; + _field28 = 0; + _field2C = 0; + _field30 = 0; + _field34 = 0; +} + +void CPetSlider::initBounds(Rect *rect) { + if (rect) + *rect = _bounds2; + _bounds2.clear(); +} + +void CPetSlider::proc8() { + +} + +void CPetSlider::proc9() { + +} + +void CPetSlider::proc10() { + +} + +void CPetSlider::proc11() { + +} + +void CPetSlider::proc12() { + +} + +void CPetSlider::proc13() { + +} + +void CPetSlider::proc14() { + +} + +void CPetSlider::proc15() { + +} + +void CPetSlider::proc16() { + +} + +void CPetSlider::proc17() { + +} + +void CPetSlider::proc18() { + +} + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_slider.h b/engines/titanic/pet_control/pet_slider.h new file mode 100644 index 0000000000..acad55c4ae --- /dev/null +++ b/engines/titanic/pet_control/pet_slider.h @@ -0,0 +1,85 @@ +/* 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_PET_SLIDER_H +#define TITANIC_PET_SLIDER_H + +#include "titanic/support/rect.h" + +namespace Titanic { + +class CPetSlider { +private: + int _field4; + int _field8; + Rect _bounds; + int _field1C; + int _field20; + int _field24; + int _field28; + int _field2C; + int _field30; + int _field34; + Rect _bounds2; +public: + CPetSlider(); + + virtual void proc1() {} + virtual void proc2() {} + virtual void proc3() {} + virtual void proc4() {} + virtual void proc5() {} + virtual void proc6() {} + + /** + * Reset the bounds of the slider + */ + virtual void initBounds(Rect *rect); + + virtual void proc8(); + virtual void proc9(); + virtual void proc10(); + virtual void proc11(); + virtual void proc12(); + virtual void proc13(); + virtual void proc14(); + virtual void proc15(); + virtual void proc16(); + virtual void proc17(); + virtual void proc18(); + + /** + * Returns true if the passed point falls within the slider's bounds + */ + bool contains(const Point &pt) const { return _bounds.contains(pt); } +}; + +class CPetSoundSlider : public CPetSlider { +public: + +public: + +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_SLIDER_H */ diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp new file mode 100644 index 0000000000..b236b1ab3d --- /dev/null +++ b/engines/titanic/pet_control/pet_sound.cpp @@ -0,0 +1,29 @@ +/* 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/pet_control/pet_real_life.h" +#include "titanic/pet_control/pet_control.h" + +namespace Titanic { + + +} // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_sound.h b/engines/titanic/pet_control/pet_sound.h new file mode 100644 index 0000000000..7607f95c62 --- /dev/null +++ b/engines/titanic/pet_control/pet_sound.h @@ -0,0 +1,41 @@ +/* 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_PET_SOUND_H +#define TITANIC_PET_SOUND_H + +#include "titanic/pet_control/pet_glyphs.h" +#include "titanic/pet_control/pet_gfx_element.h" +#include "titanic/pet_control/pet_control_sub12.h" + +namespace Titanic { + +class CPetQuit : public CPetGlyph { +private: + CPetControlSub12 _sub12; + CPetGfxElement _element; +public: +}; + +} // End of namespace Titanic + +#endif /* TITANIC_PET_SOUND_H */ -- cgit v1.2.3