From f1309a7b0b7e98256b45e9977c62f040452d54c4 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 5 Aug 2014 20:59:44 -0400 Subject: ACCESS: Remainder of Amazon game initialization added --- engines/access/data.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 engines/access/data.h (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h new file mode 100644 index 0000000000..069d543cb8 --- /dev/null +++ b/engines/access/data.h @@ -0,0 +1,72 @@ +/* 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_DATA_H +#define ACCESS_DATA_H + +#include "common/scummsys.h" +#include "common/rect.h" + +namespace Access { + +struct TimerEntry { + int _initTm; + int _timer; + bool _flag; + + TimerEntry() { + _initTm = _timer = 0; + _flag = false; + } +}; + +#define PLAYER_DATA_COUNT 8 + +class Player { +public: + int _field0; + byte *_monData; + int _walkOffRight[PLAYER_DATA_COUNT]; + int _walkOffLeft[PLAYER_DATA_COUNT]; + int _walkOffUp[PLAYER_DATA_COUNT]; + int _walkOffDown[PLAYER_DATA_COUNT]; + Common::Point _walkOffUR[PLAYER_DATA_COUNT]; + Common::Point _walkOffDR[PLAYER_DATA_COUNT]; + Common::Point _walkOffUL[PLAYER_DATA_COUNT]; + Common::Point _walkOffDL[PLAYER_DATA_COUNT]; + int _rawTempL; + int _rawXTemp; + int _rawYTempL; + int _rawYTemp; + Common::Point _playerOffset; + int _playerXLow; + int _playerX; + int _playerYLow; + int _playerY; + int _frame; +public: + Player(); +}; + +} // End of namespace Access + +#endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 7d605ce57316c86a247cf978e6b123b23045659c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 5 Aug 2014 22:17:30 -0400 Subject: ACCESS: Implement outer room handler --- engines/access/data.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 069d543cb8..7e10e992d9 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -39,34 +39,6 @@ struct TimerEntry { } }; -#define PLAYER_DATA_COUNT 8 - -class Player { -public: - int _field0; - byte *_monData; - int _walkOffRight[PLAYER_DATA_COUNT]; - int _walkOffLeft[PLAYER_DATA_COUNT]; - int _walkOffUp[PLAYER_DATA_COUNT]; - int _walkOffDown[PLAYER_DATA_COUNT]; - Common::Point _walkOffUR[PLAYER_DATA_COUNT]; - Common::Point _walkOffDR[PLAYER_DATA_COUNT]; - Common::Point _walkOffUL[PLAYER_DATA_COUNT]; - Common::Point _walkOffDL[PLAYER_DATA_COUNT]; - int _rawTempL; - int _rawXTemp; - int _rawYTempL; - int _rawYTemp; - Common::Point _playerOffset; - int _playerXLow; - int _playerX; - int _playerYLow; - int _playerY; - int _frame; -public: - Player(); -}; - } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 031cc32c847bf7387859e273069f8efd3b6d4ed0 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 6 Aug 2014 22:43:40 -0400 Subject: ACCESS: Implemented room data loading --- engines/access/data.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 7e10e992d9..8b77e7c5b3 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -39,6 +39,14 @@ struct TimerEntry { } }; +class ExtraCell { +public: + int _vidTable; + int _vidTable1; + int _vidSTable; + int _vidSTable1; +}; + } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 0c38730f3fd4965fbf1b854f76ff936dddf9f931 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 7 Aug 2014 21:54:22 -0400 Subject: ACCESS: Implement buildScreen --- engines/access/data.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 8b77e7c5b3..cf8394baf9 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -28,6 +28,15 @@ namespace Access { +class AccessEngine; + +class Manager { +protected: + AccessEngine *_vm; +public: + Manager(AccessEngine *vm) : _vm(vm) {} +}; + struct TimerEntry { int _initTm; int _timer; -- cgit v1.2.3 From cce0c2ff97878b2b0b8a87e25395c3ef98bc584e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 10 Aug 2014 11:47:15 -0400 Subject: ACCESS: Adding sprite resources and screen saving --- engines/access/data.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index cf8394baf9..bd1e1563fc 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -24,7 +24,9 @@ #define ACCESS_DATA_H #include "common/scummsys.h" +#include "common/array.h" #include "common/rect.h" +#include "graphics/surface.h" namespace Access { @@ -56,6 +58,27 @@ public: int _vidSTable1; }; +class SpriteFrame : public Graphics::Surface { +public: + uint16 _width, _height; + byte *_data; + uint32 _size; + + ~SpriteFrame(); +}; + +class SpriteResource { +public: + Common::Array _frames; +public: + SpriteResource(AccessEngine *vm, const byte *data, uint32 size); + ~SpriteResource(); + + int getCount() { return _frames.size(); } + + SpriteFrame *getFrame(int idx) { return _frames[idx]; } +}; + } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 0e3f9e983d51759e0d6373e95c71b2130e7f181c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 10 Aug 2014 11:56:14 -0400 Subject: ACCESS: Changed _objectsTable from raw data array to SpriteResource array --- engines/access/data.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index bd1e1563fc..bb5ef90e55 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -26,6 +26,7 @@ #include "common/scummsys.h" #include "common/array.h" #include "common/rect.h" +#include "common/types.h" #include "graphics/surface.h" namespace Access { @@ -71,7 +72,8 @@ class SpriteResource { public: Common::Array _frames; public: - SpriteResource(AccessEngine *vm, const byte *data, uint32 size); + SpriteResource(AccessEngine *vm, const byte *data, uint32 size, + DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO); ~SpriteResource(); int getCount() { return _frames.size(); } -- cgit v1.2.3 From 6801cb0855cef796ea22c969c9c9f25866cdfa72 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 10 Aug 2014 16:55:06 -0400 Subject: ACCESS: Decompress sprite resource frames immediately on creation --- engines/access/data.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index bb5ef90e55..b9da858216 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -59,28 +59,6 @@ public: int _vidSTable1; }; -class SpriteFrame : public Graphics::Surface { -public: - uint16 _width, _height; - byte *_data; - uint32 _size; - - ~SpriteFrame(); -}; - -class SpriteResource { -public: - Common::Array _frames; -public: - SpriteResource(AccessEngine *vm, const byte *data, uint32 size, - DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO); - ~SpriteResource(); - - int getCount() { return _frames.size(); } - - SpriteFrame *getFrame(int idx) { return _frames[idx]; } -}; - } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From dc5500e2464d3457d9dee70993ecd4340963946e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Aug 2014 10:33:03 -0400 Subject: ACCESS: Cleanup of timer flags and some inventory logic --- engines/access/data.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index b9da858216..67b9cfe9fd 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -51,6 +51,25 @@ struct TimerEntry { } }; +class TimerList : public Common::Array { +private: + Common::Array _savedTimers; +public: + bool _timersSavedFlag; +public: + TimerList(); + + /** + * Save a copy of all current timers + */ + void saveTimers(); + + /** + * Resetore the set of previously saved timers + */ + void restoreTimers(); +}; + class ExtraCell { public: int _vidTable; -- cgit v1.2.3 From 8d6c8ed452bc60a963774ea7a26ff92472752d63 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Aug 2014 20:26:17 -0400 Subject: ACCESS: Beginnings of code for text bubble drawing --- engines/access/data.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 67b9cfe9fd..93184563c4 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -78,6 +78,19 @@ public: int _vidSTable1; }; +struct FontVal { +public: + int _lo, _hi; + + FontVal() { _lo = _hi = 0; } +}; + +class Font { +public: + FontVal _charSet; + FontVal _charFor; +}; + } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From f784b4efba7518806195f96d0177ccdc6e2dbaf8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Aug 2014 22:18:53 -0400 Subject: ACCESS: Added data for font2 and font6x6 --- engines/access/data.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 93184563c4..6d783b15dc 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -86,9 +86,40 @@ public: }; class Font { +private: + int _v1; + int _v2; + Common::Array _chars; +public: + Font(); + + /** + * Load the given font data + */ + void load(const int *index, const byte *data); + + /** + * Get the width of a given character + */ + int charWidth(char c); + + /** + * Get the width of a given string + */ + int stringWidth(const Common::String &msg); +}; + +class FontManager { public: FontVal _charSet; FontVal _charFor; + Common::Point _printOrg; + Common::Point _printStart; + int _printMaxX; + Font _font6x6; + Font _font2; +public: + FontManager(); }; } // End of namespace Access -- cgit v1.2.3 From ff01ee6807ccd6e5a71ddc945196d68b87f3aa65 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Aug 2014 23:18:53 -0400 Subject: ACCESS: Added code for bubble box size calculations --- engines/access/data.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 6d783b15dc..910e2523d1 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -107,6 +107,17 @@ public: * Get the width of a given string */ int stringWidth(const Common::String &msg); + + /** + * Get a partial string that will fit in a given width + * @param s Source string. Modified to remove line + * @param maxWidth Maximum width allowed + * @param line Output line + * @param width Calculated width of returned line + * @returns True if last line + */ + bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width); + }; class FontManager { -- cgit v1.2.3 From 9393f6d7559653a28166fe74da9745e95b76f85b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 17 Aug 2014 18:56:05 -0400 Subject: ACCESS: Implemented bubble box drawing code --- engines/access/data.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 910e2523d1..fd3c889ddb 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -87,12 +87,16 @@ public: class Font { private: - int _v1; - int _v2; - Common::Array _chars; + int _bitWidth; + int _height; + Common::Array _chars; +public: + static byte _fontColors[4]; public: Font(); + ~Font(); + /** * Load the given font data */ @@ -118,6 +122,15 @@ public: */ bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width); + /** + * Draw a string on a given surface + */ + void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt); + + /** + * Draw a character on a given surface + */ + int drawChar(Graphics::Surface *s, char c, Common::Point &pt); }; class FontManager { -- cgit v1.2.3 From c576b201f6638fa3702593cdb45cff64057d35ef Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 17 Aug 2014 21:08:58 -0400 Subject: ACCESS: Fix decoding of font data --- engines/access/data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index fd3c889ddb..7ddc5d610e 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -100,7 +100,7 @@ public: /** * Load the given font data */ - void load(const int *index, const byte *data); + void load(const int *fontIndex, const byte *fontData); /** * Get the width of a given character -- cgit v1.2.3 From 38acce33fd95171a5d3a7a00cad57bb4a5711bad Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 17 Aug 2014 22:09:03 -0400 Subject: ACCESS: Add updateTimers so bubble boxes can be removed --- engines/access/data.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 7ddc5d610e..8ba3c58c82 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -68,6 +68,11 @@ public: * Resetore the set of previously saved timers */ void restoreTimers(); + + /** + * Update the timer list + */ + void updateTimers(); }; class ExtraCell { -- cgit v1.2.3 From 992ea95cd796aafeb1a1c61fcf29d57c7ecba8db Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 19 Aug 2014 07:48:00 +0200 Subject: ACCESS: Implement two opcodes --- engines/access/data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 8ba3c58c82..1d1f85966a 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -43,7 +43,7 @@ public: struct TimerEntry { int _initTm; int _timer; - bool _flag; + byte _flag; TimerEntry() { _initTm = _timer = 0; -- cgit v1.2.3 From 70b8efacfbe4c314e73dcb946f16db4c49eab85b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 20 Aug 2014 23:04:04 +0200 Subject: ACCESS: Finish moving timer flag from bool to byte based on the assembly, modify some comments and TODOs --- engines/access/data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 1d1f85966a..e7a6d13fa1 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -47,7 +47,7 @@ struct TimerEntry { TimerEntry() { _initTm = _timer = 0; - _flag = false; + _flag = 0; } }; -- cgit v1.2.3 From afc41c7eecc5c8d6b410534b5c66aa02807d11cb Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 20 Aug 2014 23:36:57 -0400 Subject: ACCESS: Added initial resources and detection entry for Martian Memorandum --- engines/access/data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index e7a6d13fa1..1601c689bf 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -145,7 +145,7 @@ public: Common::Point _printOrg; Common::Point _printStart; int _printMaxX; - Font _font6x6; + Font _font1; Font _font2; public: FontManager(); -- cgit v1.2.3 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/data.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 1601c689bf..c10b2b7f17 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -40,6 +40,20 @@ public: Manager(AccessEngine *vm) : _vm(vm) {} }; +struct FileIdent { + int _fileNum; + int _subfile; + + FileIdent() { + _fileNum = -1; + _subfile = 0; + } +}; + +struct CellIdent : FileIdent { + byte _cell; +}; + struct TimerEntry { int _initTm; int _timer; -- cgit v1.2.3 From 1e2d79eb598a0ed73a59cc540cddbaddf0bc90dd Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 23 Aug 2014 14:13:26 -0400 Subject: ACCESS: Implement more opcodes, stubbed beginning of video player --- engines/access/data.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index c10b2b7f17..3238dafa33 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -28,6 +28,7 @@ #include "common/rect.h" #include "common/types.h" #include "graphics/surface.h" +#include "access/files.h" namespace Access { @@ -40,20 +41,6 @@ public: Manager(AccessEngine *vm) : _vm(vm) {} }; -struct FileIdent { - int _fileNum; - int _subfile; - - FileIdent() { - _fileNum = -1; - _subfile = 0; - } -}; - -struct CellIdent : FileIdent { - byte _cell; -}; - struct TimerEntry { int _initTm; int _timer; @@ -91,10 +78,8 @@ public: class ExtraCell { public: - int _vidTable; - int _vidTable1; - int _vidSTable; - int _vidSTable1; + FileIdent _vid; + FileIdent _vidSound; }; struct FontVal { -- cgit v1.2.3 From 89993e128fe15efd16fdf89696682f0e24cb8593 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 24 Aug 2014 23:59:37 -0400 Subject: ACCESS: Split font code into a separate file --- engines/access/data.h | 68 --------------------------------------------------- 1 file changed, 68 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 3238dafa33..1d64a6ff86 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -82,74 +82,6 @@ public: FileIdent _vidSound; }; -struct FontVal { -public: - int _lo, _hi; - - FontVal() { _lo = _hi = 0; } -}; - -class Font { -private: - int _bitWidth; - int _height; - Common::Array _chars; -public: - static byte _fontColors[4]; -public: - Font(); - - ~Font(); - - /** - * Load the given font data - */ - void load(const int *fontIndex, const byte *fontData); - - /** - * Get the width of a given character - */ - int charWidth(char c); - - /** - * Get the width of a given string - */ - int stringWidth(const Common::String &msg); - - /** - * Get a partial string that will fit in a given width - * @param s Source string. Modified to remove line - * @param maxWidth Maximum width allowed - * @param line Output line - * @param width Calculated width of returned line - * @returns True if last line - */ - bool getLine(Common::String &s, int maxWidth, Common::String &line, int &width); - - /** - * Draw a string on a given surface - */ - void drawString(Graphics::Surface *s, const Common::String &msg, const Common::Point &pt); - - /** - * Draw a character on a given surface - */ - int drawChar(Graphics::Surface *s, char c, Common::Point &pt); -}; - -class FontManager { -public: - FontVal _charSet; - FontVal _charFor; - Common::Point _printOrg; - Common::Point _printStart; - int _printMaxX; - Font _font1; - Font _font2; -public: - FontManager(); -}; - } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 8b9faf7de563b5c3a00cc9935eccb5e60b816632 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 29 Aug 2014 21:03:11 -0400 Subject: ACCESS: Add synchronize method for savegames --- engines/access/data.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 1d64a6ff86..3b3485e459 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -26,6 +26,7 @@ #include "common/scummsys.h" #include "common/array.h" #include "common/rect.h" +#include "common/serializer.h" #include "common/types.h" #include "graphics/surface.h" #include "access/files.h" @@ -74,6 +75,11 @@ public: * Update the timer list */ void updateTimers(); + + /** + * Synchronize savegame data + */ + void synchronize(Common::Serializer &s); }; class ExtraCell { -- cgit v1.2.3 From f869019d30bbef118abb140d73bbd6ebc3a5be56 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 30 Aug 2014 17:17:19 -0400 Subject: ACCESS: Implemented cmdDead --- engines/access/data.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 3b3485e459..08fbb40d68 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -88,6 +88,16 @@ public: FileIdent _vidSound; }; +struct DeathEntry { + int _screenId; + Common::String _msg; +}; + +class DeathList : public Common::Array { +public: + Common::Array _cells; +}; + } // End of namespace Access #endif /* ACCESS_DATA_H */ -- cgit v1.2.3 From 84ba0df9b2ce15d6c1d32a6c61794a1accb3fc99 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 4 Dec 2014 14:17:30 +0100 Subject: ACCESS: Janitorial --- engines/access/data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 08fbb40d68..6b44eddd75 100644 --- a/engines/access/data.h +++ b/engines/access/data.h @@ -77,7 +77,7 @@ public: void updateTimers(); /** - * Synchronize savegame data + * Synchronize savegame data */ void synchronize(Common::Serializer &s); }; -- 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/data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/access/data.h') diff --git a/engines/access/data.h b/engines/access/data.h index 6b44eddd75..19413ecd7e 100644 --- a/engines/access/data.h +++ b/engines/access/data.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