From 7aa2c7fe5cca8eaa9c68c471cef4595b99021206 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 23 Aug 2014 12:09:27 -0400 Subject: ACCESS: Beginnings of character/converse manager --- engines/access/char.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 engines/access/char.h (limited to 'engines/access/char.h') diff --git a/engines/access/char.h b/engines/access/char.h new file mode 100644 index 0000000000..8d6c49d47a --- /dev/null +++ b/engines/access/char.h @@ -0,0 +1,58 @@ +/* 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 ACCESS_CHAR_H +#define ACCESS_CHAR_H + +#include "common/scummsys.h" +#include "common/array.h" +#include "access/data.h" + +namespace Access { + +class CharEntry { +public: + int _charFlag; + int _estabFlag; + FileIdent _screenFile; + FileIdent _paletteFile; + int _startColor, _numColors; + Common::Array _cells; + FileIdent _animFile; + FileIdent _scriptFile; + Common::Array _extraCells; +public: + CharEntry(const byte *data); + + CharEntry(); +}; + +class CharManager: public Manager { +public: + Common::Array _charTable; +public: + CharManager(AccessEngine *vm); +}; + +} // End of namespace Access + +#endif /* ACCESS_CHAR_H */ -- cgit v1.2.3 From 31c8a524a35c19291bbd7bed3d117791a90c7401 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 23 Aug 2014 13:13:56 -0400 Subject: ACCESS: More implementation of CharManager --- engines/access/char.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'engines/access/char.h') diff --git a/engines/access/char.h b/engines/access/char.h index 8d6c49d47a..4bd38d7c6d 100644 --- a/engines/access/char.h +++ b/engines/access/char.h @@ -32,7 +32,7 @@ namespace Access { class CharEntry { public: int _charFlag; - int _estabFlag; + int _estabIndex; FileIdent _screenFile; FileIdent _paletteFile; int _startColor, _numColors; @@ -47,10 +47,19 @@ public: }; class CharManager: public Manager { +private: + void charMenu(); public: Common::Array _charTable; + int _converseMode; + int _charFlag; + + // Fields that are included in savegames + int _conversation; public: CharManager(AccessEngine *vm); + + void loadChar(int charId); }; } // End of namespace Access -- cgit v1.2.3 From 492d974550924522774181cbcfa559c4b7e7b3a1 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 17 Dec 2014 18:27:47 +0100 Subject: ACCESS: Some more polishing in the file headers --- engines/access/char.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/access/char.h') diff --git a/engines/access/char.h b/engines/access/char.h index 4bd38d7c6d..882e7077a3 100644 --- a/engines/access/char.h +++ b/engines/access/char.h @@ -8,12 +8,12 @@ * 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. -- cgit v1.2.3 From fe627c5ce19482bdb111df7d5018dfcc94030115 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 17 Dec 2014 21:31:26 +0100 Subject: ACCESS: Fix spacing around semicolumn in class definitions --- engines/access/char.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/char.h') diff --git a/engines/access/char.h b/engines/access/char.h index 882e7077a3..e89cdae49f 100644 --- a/engines/access/char.h +++ b/engines/access/char.h @@ -46,7 +46,7 @@ public: CharEntry(); }; -class CharManager: public Manager { +class CharManager : public Manager { private: void charMenu(); public: -- cgit v1.2.3 From 04bc635dc702606911b8777a443b9e1f6322a6bf Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 22 Dec 2014 19:05:56 +0100 Subject: ACCESS: Remove a couple of unused variables in CharManager --- engines/access/char.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'engines/access/char.h') diff --git a/engines/access/char.h b/engines/access/char.h index e89cdae49f..6fb4934978 100644 --- a/engines/access/char.h +++ b/engines/access/char.h @@ -51,11 +51,8 @@ private: void charMenu(); public: Common::Array _charTable; - int _converseMode; int _charFlag; - // Fields that are included in savegames - int _conversation; public: CharManager(AccessEngine *vm); -- cgit v1.2.3