From 52a89174abc27a8f6256d401e5dde6ea904a4afd Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sun, 5 Jun 2011 13:38:05 +0400 Subject: DREAMWEB: added autogenerated source --- engines/dreamweb/dreamweb.h | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 engines/dreamweb/dreamweb.h (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h new file mode 100644 index 0000000000..2bff384f18 --- /dev/null +++ b/engines/dreamweb/dreamweb.h @@ -0,0 +1,83 @@ +/* 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. + * + * $URL: https://svn.scummvm.org:4444/svn/dreamweb/dreamweb.h $ + * $Id: dreamweb.h 77 2011-05-18 14:26:43Z digitall $ + * + */ + +#ifndef DREAMWEB_H +#define DREAMWEB_H + +#include "common/scummsys.h" +#include "common/random.h" +#include "common/rect.h" +#include "common/error.h" + +#include "engines/engine.h" +#include "dreamweb/console.h" + +namespace Graphics { + class Surface; +} + +namespace DreamWeb { + +// Engine Debug Flags +enum { + kDebugAnimation = (1 << 0), + kDebugSaveLoad = (1 << 1) +}; + +struct DreamWebGameDescription; + +class DreamWebEngine : public Engine { +private: + DreamWebConsole *_console; + bool _vSyncInterrupt; + +protected: + // Engine APIs + virtual Common::Error run(); + virtual bool hasFeature(EngineFeature f) const; + +public: + DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc); + virtual ~DreamWebEngine(); + + void setVSyncInterrupt(bool flag); + void waitForVSync(); + + Common::Error loadGameState(int slot); + Common::Error saveGameState(int slot, const char *desc); + + bool canLoadGameStateCurrently(); + bool canSaveGameStateCurrently(); + + const DreamWebGameDescription *_gameDescription; + + Common::RandomSource *_rnd; + + Common::Point _mouse; +}; + +} // End of namespace DreamWeb + +#endif -- cgit v1.2.3 From d4d5c0527e4fa42cb83e58b03190e92eb2c2ddbb Mon Sep 17 00:00:00 2001 From: Vladimir Date: Tue, 7 Jun 2011 03:00:53 +0400 Subject: DREAMWEB: implemented some of the stubs --- engines/dreamweb/dreamweb.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 2bff384f18..96aa61ab50 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -50,8 +50,9 @@ struct DreamWebGameDescription; class DreamWebEngine : public Engine { private: - DreamWebConsole *_console; - bool _vSyncInterrupt; + DreamWebConsole *_console; + bool _vSyncInterrupt; + static DreamWebEngine *_instance; protected: // Engine APIs @@ -61,6 +62,7 @@ protected: public: DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc); virtual ~DreamWebEngine(); + static DreamWebEngine* instance() { return _instance; } void setVSyncInterrupt(bool flag); void waitForVSync(); @@ -71,10 +73,12 @@ public: bool canLoadGameStateCurrently(); bool canSaveGameStateCurrently(); - const DreamWebGameDescription *_gameDescription; +//dreamgen public api: + uint8 randomNumber() { return _rnd.getRandomNumber(255); } - Common::RandomSource *_rnd; - +private: + const DreamWebGameDescription *_gameDescription; + Common::RandomSource _rnd; Common::Point _mouse; }; -- cgit v1.2.3 From 9a1575b9d560ff7ffa5056081072e3b049c0c2c5 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 01:25:26 +0400 Subject: DREAMWEB: implemented openfile --- engines/dreamweb/dreamweb.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 96aa61ab50..8669aad5fe 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -26,10 +26,11 @@ #ifndef DREAMWEB_H #define DREAMWEB_H -#include "common/scummsys.h" +#include "common/error.h" +#include "common/file.h" #include "common/random.h" #include "common/rect.h" -#include "common/error.h" +#include "common/scummsys.h" #include "engines/engine.h" #include "dreamweb/console.h" @@ -76,10 +77,14 @@ public: //dreamgen public api: uint8 randomNumber() { return _rnd.getRandomNumber(255); } + void openFile(const Common::String &name); + private: const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; Common::Point _mouse; + + Common::File _file; }; } // End of namespace DreamWeb -- cgit v1.2.3 From 858a898aa7aef678c9c486c8c18788ade47f8aea Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 01:38:12 +0400 Subject: DREAMWEB: added readfile --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 8669aad5fe..cba1b00051 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -78,6 +78,7 @@ public: uint8 randomNumber() { return _rnd.getRandomNumber(255); } void openFile(const Common::String &name); + void readFromFile(uint8 *dst, unsigned size); private: const DreamWebGameDescription *_gameDescription; -- cgit v1.2.3 From 6a33ce30f2041743624bcc115c4d74be6c57b033 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 01:51:01 +0400 Subject: DREAMWEB: added close file --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index cba1b00051..03db193b23 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -79,6 +79,7 @@ public: void openFile(const Common::String &name); void readFromFile(uint8 *dst, unsigned size); + void closeFile(); private: const DreamWebGameDescription *_gameDescription; -- cgit v1.2.3 From 221a3575a35c7848937f575179b4ccdc4ae86ddb Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 02:57:56 +0400 Subject: DREAMWEB: added mousecall stub --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 03db193b23..245f4967bb 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -81,6 +81,7 @@ public: void readFromFile(uint8 *dst, unsigned size); void closeFile(); + Common::Point mousePos() const { return _mouse; } private: const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; -- cgit v1.2.3 From a07ec818c7d3b498a3967a6a09c517647a9ae392 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 11:14:12 +0400 Subject: DREAMWEB: added processEvents, added mouse support --- engines/dreamweb/dreamweb.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 245f4967bb..0548df69dc 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -33,6 +33,7 @@ #include "common/scummsys.h" #include "engines/engine.h" +#include "dreamweb/dreamgen.h" #include "dreamweb/console.h" namespace Graphics { @@ -81,13 +82,18 @@ public: void readFromFile(uint8 *dst, unsigned size); void closeFile(); - Common::Point mousePos() const { return _mouse; } + void mouseCall(); //fill mouse pos and button state + void processEvents(); + private: - const DreamWebGameDescription *_gameDescription; - Common::RandomSource _rnd; - Common::Point _mouse; + const DreamWebGameDescription *_gameDescription; + Common::RandomSource _rnd; + Common::Point _mouse; + unsigned _mouseState; Common::File _file; + + dreamgen::Context _context; }; } // End of namespace DreamWeb -- cgit v1.2.3 From af4f0e6b1e40971c23331ed677d0fa70a8607eb2 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 8 Jun 2011 11:26:46 +0400 Subject: DREAMWEB: added graphics mode initialization --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 0548df69dc..1c2d1f6688 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -84,6 +84,7 @@ public: void mouseCall(); //fill mouse pos and button state void processEvents(); + void setGraphicsMode(); private: const DreamWebGameDescription *_gameDescription; -- cgit v1.2.3 From 3bd7cb1902b7a01d622cc8ccdfc54bc5b50f164c Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 9 Jun 2011 02:00:41 +0400 Subject: DREAMWEB: fixed loadfromfile --- engines/dreamweb/dreamweb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 1c2d1f6688..d2fc447fee 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -79,7 +79,7 @@ public: uint8 randomNumber() { return _rnd.getRandomNumber(255); } void openFile(const Common::String &name); - void readFromFile(uint8 *dst, unsigned size); + uint32 readFromFile(uint8 *dst, unsigned size); void closeFile(); void mouseCall(); //fill mouse pos and button state -- cgit v1.2.3 From 25a937e1566974a0c920be8ab411c488201b8e53 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Fri, 10 Jun 2011 02:18:57 +0400 Subject: DREAMWEB: added fadedos --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index d2fc447fee..ed4359f645 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -85,6 +85,7 @@ public: void mouseCall(); //fill mouse pos and button state void processEvents(); void setGraphicsMode(); + void fadeDos(); private: const DreamWebGameDescription *_gameDescription; -- cgit v1.2.3 From 8a72645c16a76937eaa5faf824fe5ae2eef8bebe Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Fri, 10 Jun 2011 10:43:13 +0400 Subject: DREAMWEB: added setPalette instead of showgroup + framenm --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index ed4359f645..1e9ace932b 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -85,6 +85,7 @@ public: void mouseCall(); //fill mouse pos and button state void processEvents(); void setGraphicsMode(); + void setPalette(); void fadeDos(); private: -- cgit v1.2.3 From e535e6e2953ed91e3b66ee74d88af1a715a97f3d Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Fri, 10 Jun 2011 11:30:11 +0400 Subject: DREAMWEB: added keyboard handling --- engines/dreamweb/dreamweb.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 1e9ace932b..5d2b71b23a 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -89,6 +89,9 @@ public: void fadeDos(); private: + + void keyPressed(uint16 ascii); + const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; Common::Point _mouse; -- cgit v1.2.3 From 9034191796702956e84067fd6cdfbc2bae1bf768 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sat, 11 Jun 2011 16:08:30 +0400 Subject: DREAMWEB: removed dummy video segment, blacklisted video-related functions. --- engines/dreamweb/dreamweb.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 5d2b71b23a..3038de3652 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -87,6 +87,8 @@ public: void setGraphicsMode(); void setPalette(); void fadeDos(); + void blit(uint8 *src, int pitch, int x, int y, int w, int h); + void cls(); private: -- cgit v1.2.3 From d0404f4b617730024d28d56632821ea403bf8cb0 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sat, 11 Jun 2011 17:20:00 +0400 Subject: DREAMWEB: moved palette fixes into set/getPalette --- engines/dreamweb/dreamweb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 3038de3652..0666bb8518 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -87,8 +87,11 @@ public: void setGraphicsMode(); void setPalette(); void fadeDos(); - void blit(uint8 *src, int pitch, int x, int y, int w, int h); + void blit(const uint8 *src, int pitch, int x, int y, int w, int h); void cls(); + + void getPalette(uint8 *data, uint start, uint count); + void setPalette(const uint8 *data, uint start, uint count); private: -- cgit v1.2.3 From 7eb8e0bbe7151a09bec7e3a4afb4f4e6ffd8b335 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 13:06:27 +0400 Subject: DREAMWEB: unstubbed dontloadseg --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 0666bb8518..78c8960b79 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -80,6 +80,7 @@ public: void openFile(const Common::String &name); uint32 readFromFile(uint8 *dst, unsigned size); + uint32 skipBytes(uint32 bytes); void closeFile(); void mouseCall(); //fill mouse pos and button state -- cgit v1.2.3 From 8ddbbc0c504893dad7fbde6a48b6edb668b249f9 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 17:11:51 +0400 Subject: DREAMWEB: moved out file write/read from sources --- engines/dreamweb/dreamweb.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 78c8960b79..633d5075e0 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -36,10 +36,6 @@ #include "dreamweb/dreamgen.h" #include "dreamweb/console.h" -namespace Graphics { - class Surface; -} - namespace DreamWeb { // Engine Debug Flags @@ -79,7 +75,7 @@ public: uint8 randomNumber() { return _rnd.getRandomNumber(255); } void openFile(const Common::String &name); - uint32 readFromFile(uint8 *dst, unsigned size); + uint32 readFromFile(uint8 *data, unsigned size); uint32 skipBytes(uint32 bytes); void closeFile(); -- cgit v1.2.3 From c5ab591b791d96783d9fdb7796a162cbe246b08b Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 17:39:15 +0400 Subject: DREAMWEB: unstabbed save --- engines/dreamweb/dreamweb.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 633d5075e0..7e99bf5e78 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -30,6 +30,7 @@ #include "common/file.h" #include "common/random.h" #include "common/rect.h" +#include "common/savefile.h" #include "common/scummsys.h" #include "engines/engine.h" @@ -89,6 +90,9 @@ public: void getPalette(uint8 *data, uint start, uint count); void setPalette(const uint8 *data, uint start, uint count); + + void openSaveFile(const Common::String &name); + uint writeToSaveFile(const uint8 *data, uint size); private: @@ -100,6 +104,7 @@ private: unsigned _mouseState; Common::File _file; + Common::OutSaveFile *_saveFile; dreamgen::Context _context; }; -- cgit v1.2.3 From b673130bf4cf0c77a106770e32c5125dbb7fccf1 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 17:56:48 +0400 Subject: DREAMWEB: implemented somewhat hackish read from currently open file --- engines/dreamweb/dreamweb.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 7e99bf5e78..440a27bba5 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -91,9 +91,12 @@ public: void getPalette(uint8 *data, uint start, uint count); void setPalette(const uint8 *data, uint start, uint count); - void openSaveFile(const Common::String &name); + void openSaveFileForWriting(const Common::String &name); uint writeToSaveFile(const uint8 *data, uint size); + bool openSaveFileForReading(const Common::String &name); + uint readFromSaveFile(uint8 *data, uint size); + private: void keyPressed(uint16 ascii); @@ -104,7 +107,8 @@ private: unsigned _mouseState; Common::File _file; - Common::OutSaveFile *_saveFile; + Common::OutSaveFile *_outSaveFile; + Common::InSaveFile *_inSaveFile; dreamgen::Context _context; }; -- cgit v1.2.3 From bd285645944861771f7a9f1b2ddc4778a60c50f7 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 18:15:06 +0400 Subject: DREAMWEB: removed ugly static engine --- engines/dreamweb/dreamweb.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 440a27bba5..c0bd9d9d63 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -51,7 +51,6 @@ class DreamWebEngine : public Engine { private: DreamWebConsole *_console; bool _vSyncInterrupt; - static DreamWebEngine *_instance; protected: // Engine APIs @@ -61,7 +60,6 @@ protected: public: DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc); virtual ~DreamWebEngine(); - static DreamWebEngine* instance() { return _instance; } void setVSyncInterrupt(bool flag); void waitForVSync(); -- cgit v1.2.3 From 04ee3aefae8ced07e69f42490859b3408d2c8cd8 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 18:42:51 +0400 Subject: DREAMWEB: implemented doshake --- engines/dreamweb/dreamweb.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index c0bd9d9d63..8cd489cc7e 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -85,16 +85,18 @@ public: void fadeDos(); void blit(const uint8 *src, int pitch, int x, int y, int w, int h); void cls(); - + void getPalette(uint8 *data, uint start, uint count); void setPalette(const uint8 *data, uint start, uint count); - + void openSaveFileForWriting(const Common::String &name); uint writeToSaveFile(const uint8 *data, uint size); bool openSaveFileForReading(const Common::String &name); uint readFromSaveFile(uint8 *data, uint size); + void setShakePos(int pos) { _system->setShakePos(pos); } + private: void keyPressed(uint16 ascii); @@ -103,11 +105,11 @@ private: Common::RandomSource _rnd; Common::Point _mouse; unsigned _mouseState; - + Common::File _file; Common::OutSaveFile *_outSaveFile; Common::InSaveFile *_inSaveFile; - + dreamgen::Context _context; }; -- cgit v1.2.3 From 4ba74f73e1315430de0d86e3712a8ad2298f16f8 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 18:58:00 +0400 Subject: DREAMWEB: moved quit() into engine's method --- engines/dreamweb/dreamweb.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 8cd489cc7e..455791d2c3 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -97,6 +97,8 @@ public: void setShakePos(int pos) { _system->setShakePos(pos); } + void quit(); + private: void keyPressed(uint16 ascii); -- cgit v1.2.3 From de65cf35c10e7b3dcd5eba64c5a922428518f626 Mon Sep 17 00:00:00 2001 From: eriktorbjorn Date: Sun, 12 Jun 2011 20:41:30 +0200 Subject: DREAMWEB: Simplify the tracking of the mouse position and buttons The event manager keeps track of the mouse position and button state, so using that should be both simpler and more reliable than tracking it ourselves. This loses the support for middle-clicking, but it's not clear that this is needed anyway. (If necessary, it could be added to the event manager.) --- engines/dreamweb/dreamweb.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 455791d2c3..f459d8bcf9 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -105,8 +105,6 @@ private: const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; - Common::Point _mouse; - unsigned _mouseState; Common::File _file; Common::OutSaveFile *_outSaveFile; -- cgit v1.2.3 From edf7d9b42bb4f88b8681e0d3732b4e2daad377c9 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Sun, 12 Jun 2011 23:50:19 +0400 Subject: DREAMWEB: unstubbed printundermon --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index f459d8bcf9..33a88e0408 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -96,6 +96,7 @@ public: uint readFromSaveFile(uint8 *data, uint size); void setShakePos(int pos) { _system->setShakePos(pos); } + void printUnderMonitor(); void quit(); -- cgit v1.2.3 From 308fcf0953ab4974d997710debdaa72b0b44ed3e Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 11:35:58 +0400 Subject: DREAMWEB: added setSpeed, CTRL-F shortcut and removed erik's comment because it's good idea :) --- engines/dreamweb/dreamweb.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 33a88e0408..50d2779327 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -104,6 +104,8 @@ private: void keyPressed(uint16 ascii); + void setSpeed(uint speed); + const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; @@ -111,6 +113,8 @@ private: Common::OutSaveFile *_outSaveFile; Common::InSaveFile *_inSaveFile; + uint _speed; + dreamgen::Context _context; }; -- cgit v1.2.3 From 93cf9993eaeb26f2dcb8f60a7c74559007f7a014 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 13:30:02 +0400 Subject: DREAMWEB: report click only once, this fixes phantom clicks after loading or between screens. --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 50d2779327..f61c113e30 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -114,6 +114,7 @@ private: Common::InSaveFile *_inSaveFile; uint _speed; + uint _oldMouseState; dreamgen::Context _context; }; -- cgit v1.2.3 From 09346f01d7caa18dbfeed94f4913686e5f00169d Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 17:33:44 +0400 Subject: DREAMWEB: added sound handling stub --- engines/dreamweb/dreamweb.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index f61c113e30..507a3a906a 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -100,11 +100,12 @@ public: void quit(); -private: + void loadSounds(uint bank, const Common::String &file); +private: void keyPressed(uint16 ascii); - void setSpeed(uint speed); + void soundHandler(); const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; @@ -115,6 +116,7 @@ private: uint _speed; uint _oldMouseState; + Common::Array _samples[2]; dreamgen::Context _context; }; -- cgit v1.2.3 From 5a8b1dbfff587fe0eb689d81eed60fe879fb8f36 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 19:05:59 +0400 Subject: DREAMWEB: catch the sample changing, more stubs --- engines/dreamweb/dreamweb.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 507a3a906a..7dabbc80c5 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -33,6 +33,9 @@ #include "common/savefile.h" #include "common/scummsys.h" +#include "audio/audiostream.h" +#include "audio/mixer.h" + #include "engines/engine.h" #include "dreamweb/dreamgen.h" #include "dreamweb/console.h" @@ -117,6 +120,8 @@ private: uint _speed; uint _oldMouseState; Common::Array _samples[2]; + Audio::SoundHandle _musicHandle, _soundHandle; + uint _channel0, _channel1; dreamgen::Context _context; }; -- cgit v1.2.3 From 74dfc349373e04d4243f3449c3f4939f8027c54f Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 20:19:27 +0400 Subject: DREAMWEB: added sounds loading --- engines/dreamweb/dreamweb.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 7dabbc80c5..eff955c990 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -119,7 +119,19 @@ private: uint _speed; uint _oldMouseState; - Common::Array _samples[2]; + + struct Sample { + uint offset; + uint size; + }; + + struct SoundData { + Common::Array samples; + Common::Array data; + }; + + SoundData _soundData[2]; + Audio::SoundHandle _musicHandle, _soundHandle; uint _channel0, _channel1; -- cgit v1.2.3 From 1955df129fc1dc17181b1ec18c3fa7c98a18f79f Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Mon, 13 Jun 2011 20:50:21 +0400 Subject: DREAMWEB: added sound support --- engines/dreamweb/dreamweb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index eff955c990..447aff931f 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -109,6 +109,7 @@ private: void keyPressed(uint16 ascii); void setSpeed(uint speed); void soundHandler(); + void playSound(uint8 channel, uint8 id, uint8 loops); const DreamWebGameDescription *_gameDescription; Common::RandomSource _rnd; @@ -129,11 +130,10 @@ private: Common::Array samples; Common::Array data; }; - SoundData _soundData[2]; - Audio::SoundHandle _musicHandle, _soundHandle; - uint _channel0, _channel1; + Audio::SoundHandle _channelHandle[2]; + uint8 _channel0, _channel1; dreamgen::Context _context; }; -- cgit v1.2.3 From 932abf8c3bf023d635e8903ae7132c7c2b388762 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Tue, 14 Jun 2011 00:53:14 +0400 Subject: DREAMWEB: regenerated sources with CD option on --- engines/dreamweb/dreamweb.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 447aff931f..0645fbaa9f 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -104,6 +104,7 @@ public: void quit(); void loadSounds(uint bank, const Common::String &file); + bool playSpeech(const Common::String &filename); private: void keyPressed(uint16 ascii); @@ -124,6 +125,7 @@ private: struct Sample { uint offset; uint size; + Sample(): offset(), size() {} }; struct SoundData { @@ -131,6 +133,7 @@ private: Common::Array data; }; SoundData _soundData[2]; + Common::Array _speechData; Audio::SoundHandle _channelHandle[2]; uint8 _channel0, _channel1; -- cgit v1.2.3 From 074436985f8c706915c567e31362f0dbb4026008 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Tue, 14 Jun 2011 00:57:41 +0400 Subject: DREAMWEB: renamed playSpeech to loadSpeech --- engines/dreamweb/dreamweb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index 0645fbaa9f..f683fca4d5 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -104,7 +104,7 @@ public: void quit(); void loadSounds(uint bank, const Common::String &file); - bool playSpeech(const Common::String &filename); + bool loadSpeech(const Common::String &filename); private: void keyPressed(uint16 ascii); -- cgit v1.2.3 From cf942d930884be0c71f654403a15065385d61eb3 Mon Sep 17 00:00:00 2001 From: Vladimir Menshakov Date: Tue, 14 Jun 2011 12:07:59 +0400 Subject: DREAMWEB: cleanup keys handling, added turbo shortcut --- engines/dreamweb/dreamweb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/dreamweb/dreamweb.h') diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index f683fca4d5..0f5e5bdc98 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -120,6 +120,7 @@ private: Common::InSaveFile *_inSaveFile; uint _speed; + bool _turbo; uint _oldMouseState; struct Sample { -- cgit v1.2.3