diff options
Diffstat (limited to 'engines/mohawk')
-rw-r--r-- | engines/mohawk/graphics.cpp | 4 | ||||
-rw-r--r-- | engines/mohawk/graphics.h | 6 | ||||
-rw-r--r-- | engines/mohawk/myst.h | 2 | ||||
-rw-r--r-- | engines/mohawk/myst_areas.h | 2 | ||||
-rw-r--r-- | engines/mohawk/myst_scripts.h | 2 | ||||
-rw-r--r-- | engines/mohawk/riven_external.h | 2 | ||||
-rw-r--r-- | engines/mohawk/riven_scripts.h | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index dcb0c7940d..2ffabf1e8c 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -108,9 +108,9 @@ GraphicsManager::~GraphicsManager() { } void GraphicsManager::clearCache() { - for (Common::HashMap<uint16, MohawkSurface*>::iterator it = _cache.begin(); it != _cache.end(); it++) + for (Common::HashMap<uint16, MohawkSurface *>::iterator it = _cache.begin(); it != _cache.end(); it++) delete it->_value; - for (Common::HashMap<uint16, Common::Array<MohawkSurface*> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) { + for (Common::HashMap<uint16, Common::Array<MohawkSurface *> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) { Common::Array<MohawkSurface *> &array = it->_value; for (uint i = 0; i < array.size(); i++) delete array[i]; diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 463608a2aa..8fa5d5f895 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -99,8 +99,8 @@ protected: private: // An image cache that stores images until clearCache() is called - Common::HashMap<uint16, MohawkSurface*> _cache; - Common::HashMap<uint16, Common::Array<MohawkSurface*> > _subImageCache; + Common::HashMap<uint16, MohawkSurface *> _cache; + Common::HashMap<uint16, Common::Array<MohawkSurface *> > _subImageCache; }; #ifdef ENABLE_MYST @@ -222,7 +222,7 @@ private: uint16 frameCount; Common::Rect rect; uint16 speed; - Common::Array<Common::SeekableReadStream*> frameScripts; + Common::Array<Common::SeekableReadStream *> frameScripts; // Cur frame uint16 curFrame; diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h index 02f0a46e3f..30770f7ec9 100644 --- a/engines/mohawk/myst.h +++ b/engines/mohawk/myst.h @@ -173,7 +173,7 @@ public: MystGraphics *_gfx; MystGameState *_gameState; MystScriptParser *_scriptParser; - Common::Array<MystResource*> _resources; + Common::Array<MystResource *> _resources; MystResource *_dragResource; Common::RandomSource *_rnd; diff --git a/engines/mohawk/myst_areas.h b/engines/mohawk/myst_areas.h index 136356ea4f..297a7cc92b 100644 --- a/engines/mohawk/myst_areas.h +++ b/engines/mohawk/myst_areas.h @@ -137,7 +137,7 @@ public: protected: uint16 _var7; uint16 _numSubResources; - Common::Array<MystResource*> _subResources; + Common::Array<MystResource *> _subResources; }; class MystResourceType8 : public MystResourceType7 { diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h index 18f5b27a6d..ccb76e0dc8 100644 --- a/engines/mohawk/myst_scripts.h +++ b/engines/mohawk/myst_scripts.h @@ -143,7 +143,7 @@ protected: const char *desc; }; - Common::Array<MystOpcode*> _opcodes; + Common::Array<MystOpcode *> _opcodes; MystResource *_invokingResource; diff --git a/engines/mohawk/riven_external.h b/engines/mohawk/riven_external.h index 5f5d0cb0b2..9f076325a2 100644 --- a/engines/mohawk/riven_external.h +++ b/engines/mohawk/riven_external.h @@ -53,7 +53,7 @@ private: ExternalCmd proc; }; - Common::Array<RivenExternalCmd*> _externalCommands; + Common::Array<RivenExternalCmd *> _externalCommands; void setupCommands(); // Supplementary Functions diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index 2932ba5939..a871f0afa0 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -125,7 +125,7 @@ private: DECLARE_OPCODE(activateMLST); }; -typedef Common::Array<RivenScript*> RivenScriptList; +typedef Common::Array<RivenScript *> RivenScriptList; class RivenScriptManager { public: |