diff options
author | Tarek Soliman | 2012-02-15 00:06:13 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-02-15 10:07:08 -0600 |
commit | 921f602ab8631a9d10e0a173b6b331dbafda564a (patch) | |
tree | bc80e4591e080719e16ac359c15bf5da87291c19 /engines/parallaction | |
parent | dbcd177606818f3b50a4b4700d9789bd0dea862c (diff) | |
download | scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.tar.gz scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.tar.bz2 scummvm-rg350-921f602ab8631a9d10e0a173b6b331dbafda564a.zip |
JANITORIAL: Fix whitespace in pointer template arg
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/debug.cpp | 6 | ||||
-rw-r--r-- | engines/parallaction/exec.h | 4 | ||||
-rw-r--r-- | engines/parallaction/graphics.h | 6 | ||||
-rw-r--r-- | engines/parallaction/gui.h | 2 | ||||
-rw-r--r-- | engines/parallaction/objects.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/parser.h | 10 | ||||
-rw-r--r-- | engines/parallaction/parser_br.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/parser_ns.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/sound_ns.cpp | 2 |
9 files changed, 20 insertions, 20 deletions
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<char*>(argv[2]); - location = const_cast<char*>(argv[1]); + character = const_cast<char *>(argv[2]); + location = const_cast<char *>(argv[1]); sprintf(tmp, "%s.%s", location, character); _vm->scheduleLocationSwitch(tmp); break; case 2: - location = const_cast<char*>(argv[1]); + location = const_cast<char *>(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<CommandContext&, void> CommandOpcode; -typedef Common::Array<const CommandOpcode*> CommandOpcodeSet; +typedef Common::Array<const CommandOpcode *> CommandOpcodeSet; #define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op(CommandContext &) struct ProgramContext { @@ -67,7 +67,7 @@ struct ProgramContext { bool _suspend; }; typedef Common::Functor1<ProgramContext&, void> ProgramOpcode; -typedef Common::Array<const ProgramOpcode*> ProgramOpcodeSet; +typedef Common::Array<const ProgramOpcode *> 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<MaskBuffer*> MaskPatches; + typedef Common::Array<MaskBuffer *> MaskPatches; MaskPatches _maskPatches; MaskBuffer _maskBackup; void clearMaskData(); - typedef Common::Array<PathBuffer*> PathPatches; + typedef Common::Array<PathBuffer *> PathPatches; PathPatches _pathPatches; PathBuffer _pathBackup; void clearPathData(); @@ -415,7 +415,7 @@ public: }; -typedef Common::Array<GfxObj*> GfxObjArray; +typedef Common::Array<GfxObj *> 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<Common::String, MenuInputState*> StateMap; + typedef Common::HashMap<Common::String, MenuInputState *> 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<char**>(data); + _data = const_cast<char **>(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<void> Opcode; -typedef Common::Array<const Opcode*> OpcodeSet; +typedef Common::Array<const Opcode *> OpcodeSet; @@ -69,8 +69,8 @@ public: uint _lookup; - Common::Stack<OpcodeSet*> _opcodes; - Common::Stack<Table*> _statements; + Common::Stack<OpcodeSet *> _opcodes; + Common::Stack<Table *> _statements; OpcodeSet *_currentOpcodes; Table *_currentStatements; @@ -199,7 +199,7 @@ protected: void addCommand(); void clearSet(OpcodeSet &opcodes) { - for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i) + for (Common::Array<const Opcode *>::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<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i) + for (Common::Array<const Opcode *>::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<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<char*>(character); + char *name = const_cast<char *>(character); const char *newMusicFile = 0; if (!scumm_stricmp(name, _dinoName)) { |