diff options
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/eobcommon.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_hof.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_hof.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_mr.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_mr.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_v2.h | 4 | ||||
-rw-r--r-- | engines/kyra/lol.h | 10 | ||||
-rw-r--r-- | engines/kyra/screen.h | 2 | ||||
-rw-r--r-- | engines/kyra/script.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script.h | 4 | ||||
-rw-r--r-- | engines/kyra/script_eob.h | 2 | ||||
-rw-r--r-- | engines/kyra/script_hof.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script_mr.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script_tim.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script_tim.h | 4 |
16 files changed, 23 insertions, 23 deletions
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<const int16*> _dscWallMapping; + Common::Array<const int16 *> _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<const TIMOpcode*>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i) + for (Common::Array<const TIMOpcode *>::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<const TIMOpcode*> _timOpcodes; + Common::Array<const TIMOpcode *> _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<const Opcode*>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i) + for (Common::Array<const Opcode *>::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<const Opcode*> _opcodesDialog; + Common::Array<const Opcode *> _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<const Opcode*> _opcodes; + Common::Array<const Opcode *> _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<const Opcode*> _opcodesAnimation; + Common::Array<const Opcode *> _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<int, uint8*> ShapeMap; + typedef Common::HashMap<int, uint8 *> 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<Audio::SeekableAudioStream*> SpeechList; + typedef Common::List<Audio::SeekableAudioStream *> SpeechList; SpeechList _speechList; int _curTlkFile; @@ -762,14 +762,14 @@ private: // tim opcode void setupOpcodeTable(); - Common::Array<const TIMOpcode*> _timIntroOpcodes; + Common::Array<const TIMOpcode *> _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<const TIMOpcode*> _timOutroOpcodes; + Common::Array<const TIMOpcode *> _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<const TIMOpcode*> _timIngameOpcodes; + Common::Array<const TIMOpcode *> _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<ActiveSpell *, int, LoLEngine> SpellProc; - Common::Array<const SpellProc*> _spellProcs; + Common::Array<const SpellProc *> _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<Palette*> _palettes; + Common::Array<Palette *> _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<const Opcode*> *opcodes) { +bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode *> *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<const Opcode*> *sysFuncs; + const Common::Array<const Opcode *> *sysFuncs; }; struct EMCState { @@ -109,7 +109,7 @@ class EMCInterpreter { public: EMCInterpreter(KyraEngine_v1 *vm); - bool load(const char *filename, EMCData *data, const Common::Array<const Opcode*> *opcodes); + bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *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<const InfOpcode*> _opcodes; + Common::Array<const InfOpcode *> _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<const TIM *, const uint16 *, int, KyraEngine_HoF> TI #define OpcodeTimUnImpl() _timOpcodes.push_back(new TIMOpcodeV2(this, 0)) void KyraEngine_HoF::setupOpcodeTable() { - Common::Array<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<EMCState *, int, KyraEngine_MR> 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<const Opcode*> *table = 0; + Common::Array<const Opcode *> *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<const TIMOpcode*> *opcodes) { +TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode *> *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<const TIMOpcode*> *opcodes; + const Common::Array<const TIMOpcode *> *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<const TIMOpcode*> *opcodes); + TIM *load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes); void unload(TIM *&tim) const; bool callback(Common::IFFChunk &chunk); |