From 921f602ab8631a9d10e0a173b6b331dbafda564a Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Wed, 15 Feb 2012 00:06:13 -0600 Subject: JANITORIAL: Fix whitespace in pointer template arg --- engines/agi/agi.h | 2 +- engines/agi/menu.h | 4 ++-- engines/agi/sprite.h | 2 +- engines/agi/words.cpp | 2 +- engines/cruise/cruise.h | 2 +- engines/cruise/cruise_main.cpp | 2 +- engines/draci/sprite.cpp | 2 +- engines/kyra/eobcommon.h | 2 +- engines/kyra/kyra_hof.cpp | 2 +- engines/kyra/kyra_hof.h | 2 +- engines/kyra/kyra_mr.cpp | 2 +- engines/kyra/kyra_mr.h | 2 +- engines/kyra/kyra_v1.h | 2 +- engines/kyra/kyra_v2.h | 4 ++-- engines/kyra/lol.h | 10 +++++----- engines/kyra/screen.h | 2 +- engines/kyra/script.cpp | 2 +- engines/kyra/script.h | 4 ++-- engines/kyra/script_eob.h | 2 +- engines/kyra/script_hof.cpp | 2 +- engines/kyra/script_mr.cpp | 2 +- engines/kyra/script_tim.cpp | 2 +- engines/kyra/script_tim.h | 4 ++-- engines/made/database.h | 4 ++-- engines/made/resource.h | 4 ++-- engines/made/scriptfuncs.h | 2 +- engines/mohawk/graphics.cpp | 4 ++-- engines/mohawk/graphics.h | 6 +++--- engines/mohawk/myst.h | 2 +- engines/mohawk/myst_areas.h | 2 +- engines/mohawk/myst_scripts.h | 2 +- engines/mohawk/riven_external.h | 2 +- engines/mohawk/riven_scripts.h | 2 +- engines/parallaction/debug.cpp | 6 +++--- engines/parallaction/exec.h | 4 ++-- engines/parallaction/graphics.h | 6 +++--- engines/parallaction/gui.h | 2 +- engines/parallaction/objects.cpp | 2 +- engines/parallaction/parser.h | 10 +++++----- engines/parallaction/parser_br.cpp | 4 ++-- engines/parallaction/parser_ns.cpp | 4 ++-- engines/parallaction/sound_ns.cpp | 2 +- engines/saga/resource.h | 2 +- engines/tinsel/detection.cpp | 2 +- engines/toltecs/resource.h | 2 +- engines/toltecs/script.h | 2 +- 46 files changed, 70 insertions(+), 70 deletions(-) (limited to 'engines') diff --git a/engines/agi/agi.h b/engines/agi/agi.h index e9923aba2e..ea3afa5ca3 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -631,7 +631,7 @@ struct AgiGame { AgiLogic *_curLogic; // words - Common::Array words[26]; + Common::Array words[26]; // view table VtEntry viewTable[MAX_VIEWTABLE]; diff --git a/engines/agi/menu.h b/engines/agi/menu.h index e659c71fab..1d5828d78a 100644 --- a/engines/agi/menu.h +++ b/engines/agi/menu.h @@ -33,8 +33,8 @@ namespace Agi { struct AgiMenu; struct AgiMenuOption; -typedef Common::List MenuList; -typedef Common::List MenuOptionList; +typedef Common::List MenuList; +typedef Common::List MenuOptionList; class GfxMgr; class PictureMgr; diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h index 68f0e32b86..851c2438fb 100644 --- a/engines/agi/sprite.h +++ b/engines/agi/sprite.h @@ -27,7 +27,7 @@ namespace Agi { struct Sprite; -typedef Common::List SpriteList; +typedef Common::List SpriteList; class AgiEngine; class GfxMgr; diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp index 1001c66b20..4400112247 100644 --- a/engines/agi/words.cpp +++ b/engines/agi/words.cpp @@ -130,7 +130,7 @@ int AgiEngine::findWord(const char *word, int *flen) { return -1; *flen = 0; - Common::Array &a = _game.words[c]; + Common::Array &a = _game.words[c]; for (int i = 0; i < (int)a.size(); i++) { int wlen = strlen(a[i]->word); diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index 94f8759d01..9782df8f09 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -116,7 +116,7 @@ public: static uint32 const cookie = 0x41424344; }; - Common::List _memList; + Common::List _memList; typedef Common::List RectList; diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index a1337aefa7..7ce9b4ec78 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -45,7 +45,7 @@ typedef CruiseEngine::MemInfo MemInfo; void MemoryList() { if (!_vm->_memList.empty()) { debug("Current list of un-freed memory blocks:"); - Common::List::iterator i; + Common::List::iterator i; for (i = _vm->_memList.begin(); i != _vm->_memList.end(); ++i) { MemInfo const *const v = *i; debug("%s - %d", v->fname, v->lineNum); diff --git a/engines/draci/sprite.cpp b/engines/draci/sprite.cpp index 92ce7d31d9..965cdabf3e 100644 --- a/engines/draci/sprite.cpp +++ b/engines/draci/sprite.cpp @@ -318,7 +318,7 @@ void Text::repeatedlySplitLongLines(uint maxWidth) { } void Text::splitLinesLongerThan(uint maxWidth) { - char *start = const_cast (_text.c_str()); // hacky + char *start = const_cast (_text.c_str()); // hacky while (1) { char *end = strchr(start, '|'); if (end) { diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h index e3ea533c63..4e2e1c5298 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/eobcommon.h @@ -623,7 +623,7 @@ protected: uint32 _envAudioTimer; uint16 _teleporterPulse; - Common::Array _dscWallMapping; + Common::Array _dscWallMapping; const int16 *_dscShapeCoords; const uint8 *_dscItemPosIndex; diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index fd2c1870a8..0ba173d9d0 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -171,7 +171,7 @@ KyraEngine_HoF::~KyraEngine_HoF() { delete[] _conversationState[i]; delete[] _conversationState; - for (Common::Array::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i) + for (Common::Array::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i) delete *i; _timOpcodes.clear(); } diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index 320f930b56..182854cdf1 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -656,7 +656,7 @@ protected: int t2_resetChat(const TIM *tim, const uint16 *param); int t2_playSoundEffect(const TIM *tim, const uint16 *param); - Common::Array _timOpcodes; + Common::Array _timOpcodes; // sound int _oldTalkFile; diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 4e07c8f343..39ed0d038a 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -183,7 +183,7 @@ KyraEngine_MR::~KyraEngine_MR() { delete[] _sceneStrings; delete[] _talkObjectList; - for (Common::Array::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i) + for (Common::Array::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i) delete *i; _opcodesDialog.clear(); diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h index 7c022534a2..004236ca04 100644 --- a/engines/kyra/kyra_mr.h +++ b/engines/kyra/kyra_mr.h @@ -463,7 +463,7 @@ private: void npcChatSequence(const char *str, int object, int vocHigh, int vocLow); - Common::Array _opcodesDialog; + Common::Array _opcodesDialog; int o3d_updateAnim(EMCState *script); int o3d_delay(EMCState *script); diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 67332eccdb..04bfab2cb8 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -326,7 +326,7 @@ protected: // opcode virtual void setupOpcodeTable() = 0; - Common::Array _opcodes; + Common::Array _opcodes; int o1_queryGameFlag(EMCState *script); int o1_setGameFlag(EMCState *script); diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 72d743710d..563416bf1e 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -224,7 +224,7 @@ protected: // Sequences EMCData _animationScriptData; EMCState _animationScriptState; - Common::Array _opcodesAnimation; + Common::Array _opcodesAnimation; void runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload); @@ -252,7 +252,7 @@ protected: virtual void uninitAnimationShapes(int count, uint8 *filedata) = 0; // Shapes - typedef Common::HashMap ShapeMap; + typedef Common::HashMap ShapeMap; ShapeMap _gameShapes; uint8 *getShapePtr(int index) const; diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index bb8f24eb66..dbd461267f 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -447,7 +447,7 @@ private: uint16 _envSfxQueuedBlocks[10]; int _nextSpeechId; int _nextSpeaker; - typedef Common::List SpeechList; + typedef Common::List SpeechList; SpeechList _speechList; int _curTlkFile; @@ -762,14 +762,14 @@ private: // tim opcode void setupOpcodeTable(); - Common::Array _timIntroOpcodes; + Common::Array _timIntroOpcodes; int tlol_setupPaletteFade(const TIM *tim, const uint16 *param); int tlol_loadPalette(const TIM *tim, const uint16 *param); int tlol_setupPaletteFadeEx(const TIM *tim, const uint16 *param); int tlol_processWsaFrame(const TIM *tim, const uint16 *param); int tlol_displayText(const TIM *tim, const uint16 *param); - Common::Array _timOutroOpcodes; + Common::Array _timOutroOpcodes; int tlol_fadeInScene(const TIM *tim, const uint16 *param); int tlol_unusedResourceFunc(const TIM *tim, const uint16 *param); int tlol_fadeInPalette(const TIM *tim, const uint16 *param); @@ -778,7 +778,7 @@ private: int tlol_delayForChat(const TIM *tim, const uint16 *param); int tlol_fadeOutSound(const TIM *tim, const uint16 *param); - Common::Array _timIngameOpcodes; + Common::Array _timIngameOpcodes; int tlol_initSceneWindowDialogue(const TIM *tim, const uint16 *param); int tlol_restoreAfterSceneWindowDialogue(const TIM *tim, const uint16 *param); int tlol_giveItem(const TIM *tim, const uint16 *param); @@ -1156,7 +1156,7 @@ private: // spells typedef Common::Functor1Mem SpellProc; - Common::Array _spellProcs; + Common::Array _spellProcs; typedef void (LoLEngine::*SpellProcCallback)(WSAMovie_v2 *, int, int); int castSpell(int charNum, int spellType, int spellLevel); diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h index dd74692a5d..62ea35af9e 100644 --- a/engines/kyra/screen.h +++ b/engines/kyra/screen.h @@ -554,7 +554,7 @@ protected: uint8 _sjisInvisibleColor; Palette *_screenPalette; - Common::Array _palettes; + Common::Array _palettes; Palette *_internFadePalette; Font *_fonts[FID_NUM]; diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 1981341063..303cbb45aa 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -95,7 +95,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { return false; } -bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array *opcodes) { +bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array *opcodes) { Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename); if (!stream) { error("Couldn't open script file '%s'", filename); diff --git a/engines/kyra/script.h b/engines/kyra/script.h index dffb4e27f5..ccbe733e4d 100644 --- a/engines/kyra/script.h +++ b/engines/kyra/script.h @@ -41,7 +41,7 @@ struct EMCData { uint16 *ordr; uint16 dataSize; - const Common::Array *sysFuncs; + const Common::Array *sysFuncs; }; struct EMCState { @@ -109,7 +109,7 @@ class EMCInterpreter { public: EMCInterpreter(KyraEngine_v1 *vm); - bool load(const char *filename, EMCData *data, const Common::Array *opcodes); + bool load(const char *filename, EMCData *data, const Common::Array *opcodes); void unload(EMCData *data); void init(EMCState *scriptState, const EMCData *data); diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h index 391791522a..fc8b4cfc31 100644 --- a/engines/kyra/script_eob.h +++ b/engines/kyra/script_eob.h @@ -99,7 +99,7 @@ private: InfProc *proc; Common::String desc; }; - Common::Array _opcodes; + Common::Array _opcodes; int8 *_scriptData; uint16 _scriptSize; diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index 73b6915c89..b80b8105a1 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -1480,7 +1480,7 @@ typedef Common::Functor2Mem TI #define OpcodeTimUnImpl() _timOpcodes.push_back(new TIMOpcodeV2(this, 0)) void KyraEngine_HoF::setupOpcodeTable() { - Common::Array *table = 0; + Common::Array *table = 0; _opcodes.reserve(176); SetOpcodeTable(_opcodes); diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index 56b2a48b89..afe11aba02 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -1129,7 +1129,7 @@ typedef Common::Functor1Mem OpcodeV3; #define Opcode(x) table->push_back(new OpcodeV3(this, &KyraEngine_MR::x)) #define OpcodeUnImpl() table->push_back(new OpcodeV3(this, 0)) void KyraEngine_MR::setupOpcodeTable() { - Common::Array *table = 0; + Common::Array *table = 0; _opcodes.reserve(176); SetOpcodeTable(_opcodes); diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 7995ad21f1..177d7993a0 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -135,7 +135,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) { return false; } -TIM *TIMInterpreter::load(const char *filename, const Common::Array *opcodes) { +TIM *TIMInterpreter::load(const char *filename, const Common::Array *opcodes) { if (!_vm->resource()->exists(filename)) return 0; diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index e132ed78c5..aa512daae8 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -146,7 +146,7 @@ struct TIM { uint16 *avtl; uint8 *text; - const Common::Array *opcodes; + const Common::Array *opcodes; // TODO: Get rid of this ugly HACK to allow the // Lands of Lore outro to be working properly. @@ -159,7 +159,7 @@ public: TIMInterpreter(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system); virtual ~TIMInterpreter(); - TIM *load(const char *filename, const Common::Array *opcodes); + TIM *load(const char *filename, const Common::Array *opcodes); void unload(TIM *&tim) const; bool callback(Common::IFFChunk &chunk); diff --git a/engines/made/database.h b/engines/made/database.h index 63f0557196..89b4b45357 100644 --- a/engines/made/database.h +++ b/engines/made/database.h @@ -151,9 +151,9 @@ public: void dumpObject(int16 index); protected: - typedef Common::HashMap ObjectPropertyCacheMap; + typedef Common::HashMap ObjectPropertyCacheMap; MadeEngine *_vm; - Common::Array _objects; + Common::Array _objects; ObjectPropertyCacheMap _objectPropertyCache; byte *_gameState; uint32 _gameStateSize; diff --git a/engines/made/resource.h b/engines/made/resource.h index 537801bdc8..da227a39a0 100644 --- a/engines/made/resource.h +++ b/engines/made/resource.h @@ -111,7 +111,7 @@ public: int16 getWidth() const { return _width; } int16 getHeight() const { return _height; } protected: - Common::Array _frames; + Common::Array _frames; uint16 _flags; int16 _width, _height; }; @@ -210,7 +210,7 @@ protected: bool _isV1; typedef Common::Array ResourceSlots; - typedef Common::HashMap ResMap; + typedef Common::HashMap ResMap; void openResourceBlock(const char *filename, Common::File *blockFile, uint32 resType); ResMap _resSlots; diff --git a/engines/made/scriptfuncs.h b/engines/made/scriptfuncs.h index 6b3301755d..03d29c4592 100644 --- a/engines/made/scriptfuncs.h +++ b/engines/made/scriptfuncs.h @@ -68,7 +68,7 @@ protected: Audio::SoundHandle _pcSpeakerHandle1, _pcSpeakerHandle2; Audio::PCSpeaker *_pcSpeaker1, *_pcSpeaker2; - Common::Array _externalFuncs; + Common::Array _externalFuncs; Common::Array _externalFuncNames; GenericResource *_musicRes; 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::iterator it = _cache.begin(); it != _cache.end(); it++) + for (Common::HashMap::iterator it = _cache.begin(); it != _cache.end(); it++) delete it->_value; - for (Common::HashMap >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) { + for (Common::HashMap >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) { Common::Array &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 _cache; - Common::HashMap > _subImageCache; + Common::HashMap _cache; + Common::HashMap > _subImageCache; }; #ifdef ENABLE_MYST @@ -222,7 +222,7 @@ private: uint16 frameCount; Common::Rect rect; uint16 speed; - Common::Array frameScripts; + Common::Array 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 _resources; + Common::Array _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 _subResources; + Common::Array _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 _opcodes; + Common::Array _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 _externalCommands; + Common::Array _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 RivenScriptList; +typedef Common::Array RivenScriptList; class RivenScriptManager { public: diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index 72f26cb6b9..0cb329e0f0 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -69,14 +69,14 @@ bool Debugger::Cmd_Location(int argc, const char **argv) { switch (argc) { case 3: - character = const_cast(argv[2]); - location = const_cast(argv[1]); + character = const_cast(argv[2]); + location = const_cast(argv[1]); sprintf(tmp, "%s.%s", location, character); _vm->scheduleLocationSwitch(tmp); break; case 2: - location = const_cast(argv[1]); + location = const_cast(argv[1]); _vm->scheduleLocationSwitch(location); break; diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h index b7b8a571f4..b966d677cd 100644 --- a/engines/parallaction/exec.h +++ b/engines/parallaction/exec.h @@ -55,7 +55,7 @@ struct CommandContext { // in Parallaction_XX }; typedef Common::Functor1 CommandOpcode; -typedef Common::Array CommandOpcodeSet; +typedef Common::Array CommandOpcodeSet; #define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op(CommandContext &) struct ProgramContext { @@ -67,7 +67,7 @@ struct ProgramContext { bool _suspend; }; typedef Common::Functor1 ProgramOpcode; -typedef Common::Array ProgramOpcodeSet; +typedef Common::Array ProgramOpcodeSet; #define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op(ProgramContext &) diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index dacf7715ae..99bc811763 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -341,12 +341,12 @@ public: */ struct BackgroundInfo { protected: - typedef Common::Array MaskPatches; + typedef Common::Array MaskPatches; MaskPatches _maskPatches; MaskBuffer _maskBackup; void clearMaskData(); - typedef Common::Array PathPatches; + typedef Common::Array PathPatches; PathPatches _pathPatches; PathBuffer _pathBackup; void clearPathData(); @@ -415,7 +415,7 @@ public: }; -typedef Common::Array GfxObjArray; +typedef Common::Array GfxObjArray; #define SCENE_DRAWLIST_SIZE 100 class Gfx { diff --git a/engines/parallaction/gui.h b/engines/parallaction/gui.h index 95c5653220..a6eed240c4 100644 --- a/engines/parallaction/gui.h +++ b/engines/parallaction/gui.h @@ -36,7 +36,7 @@ namespace Parallaction { class MenuInputState; class MenuInputHelper { - typedef Common::HashMap StateMap; + typedef Common::HashMap StateMap; StateMap _map; MenuInputState *_state; diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index fe21732f03..222a0a9552 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -390,7 +390,7 @@ Table::Table(uint32 size) : _size(size), _used(0), _disposeMemory(true) { } Table::Table(uint32 size, const char **data) : _size(size), _used(size), _disposeMemory(false) { - _data = const_cast(data); + _data = const_cast(data); } Table::~Table() { diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h index 1cf8e2f7ff..3e2604eda2 100644 --- a/engines/parallaction/parser.h +++ b/engines/parallaction/parser.h @@ -57,7 +57,7 @@ public: typedef Common::Functor0 Opcode; -typedef Common::Array OpcodeSet; +typedef Common::Array OpcodeSet; @@ -69,8 +69,8 @@ public: uint _lookup; - Common::Stack _opcodes; - Common::Stack _statements; + Common::Stack _opcodes; + Common::Stack _statements; OpcodeSet *_currentOpcodes; Table *_currentStatements; @@ -199,7 +199,7 @@ protected: void addCommand(); void clearSet(OpcodeSet &opcodes) { - for (Common::Array::iterator i = opcodes.begin(); i != opcodes.end(); ++i) + for (Common::Array::iterator i = opcodes.begin(); i != opcodes.end(); ++i) delete *i; opcodes.clear(); } @@ -357,7 +357,7 @@ protected: virtual void parseRValue(ScriptVar &var, const char *str); void clearSet(OpcodeSet &opcodes) { - for (Common::Array::iterator i = opcodes.begin(); i != opcodes.end(); ++i) + for (Common::Array::iterator i = opcodes.begin(); i != opcodes.end(); ++i) delete *i; opcodes.clear(); } diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp index df53ecca3f..4aabf17e6e 100644 --- a/engines/parallaction/parser_br.cpp +++ b/engines/parallaction/parser_br.cpp @@ -1131,7 +1131,7 @@ void LocationParser_br::init() { _locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_br), _locationZoneStmtRes_br); _locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_br), _locationAnimStmtRes_br); - Common::Array *table = 0; + Common::Array *table = 0; SetOpcodeTable(_commandParsers); WARNING_PARSER(unexpected); @@ -1234,7 +1234,7 @@ void ProgramParser_br::init() { _instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_br), _instructionNamesRes_br); - Common::Array *table = 0; + Common::Array *table = 0; SetOpcodeTable(_instructionParsers); INSTRUCTION_PARSER(defLocal); // invalid opcode -> local definition diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index a73f1558e8..e4bdcc7f68 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -1107,7 +1107,7 @@ void LocationParser_ns::init() { _locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_ns), _locationZoneStmtRes_ns); _locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_ns), _locationAnimStmtRes_ns); - Common::Array *table = 0; + Common::Array *table = 0; SetOpcodeTable(_commandParsers); WARNING_PARSER(unexpected); @@ -1177,7 +1177,7 @@ void ProgramParser_ns::init() { _instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_ns), _instructionNamesRes_ns); - Common::Array *table = 0; + Common::Array *table = 0; SetOpcodeTable(_instructionParsers); INSTRUCTION_PARSER(defLocal); // invalid opcode -> local definition INSTRUCTION_PARSER(animation); // on diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp index b5d4c72ea4..3cc25b36b0 100644 --- a/engines/parallaction/sound_ns.cpp +++ b/engines/parallaction/sound_ns.cpp @@ -165,7 +165,7 @@ void DosSoundMan_ns::playCharacterMusic(const char *character) { return; } - char *name = const_cast(character); + char *name = const_cast(character); const char *newMusicFile = 0; if (!scumm_stricmp(name, _dinoName)) { diff --git a/engines/saga/resource.h b/engines/saga/resource.h index 2124f3e29f..a8e2e92361 100644 --- a/engines/saga/resource.h +++ b/engines/saga/resource.h @@ -157,7 +157,7 @@ protected: virtual void processPatches(Resource *resource, const GamePatchDescription *patchFiles) { } }; -typedef Common::List ResourceContextList; +typedef Common::List ResourceContextList; struct MetaResource { int16 sceneIndex; diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 1fce032633..0f662e22bd 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -169,7 +169,7 @@ struct SizeMD5 { }; typedef Common::HashMap SizeMD5Map; typedef Common::HashMap FileMap; -typedef Common::Array ADGameDescList; +typedef Common::Array ADGameDescList; /** * Fallback detection scans the list of Discworld 2 targets to see if it can detect an installation diff --git a/engines/toltecs/resource.h b/engines/toltecs/resource.h index 7f4694f0f6..3fed2e11ca 100644 --- a/engines/toltecs/resource.h +++ b/engines/toltecs/resource.h @@ -71,7 +71,7 @@ public: void purgeCache(); protected: - typedef Common::HashMap ResourceMap; + typedef Common::HashMap ResourceMap; ToltecsEngine *_vm; diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h index 1a5a9c90ad..0c1898c525 100644 --- a/engines/toltecs/script.h +++ b/engines/toltecs/script.h @@ -77,7 +77,7 @@ protected: }; ToltecsEngine *_vm; - Common::Array _scriptFuncs; + Common::Array _scriptFuncs; Common::Array _scriptFuncNames; byte *_stack; -- cgit v1.2.3