[Scummvm-cvs-logs] SF.net SVN: scummvm: [31842] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat May 3 21:32:46 CEST 2008
Revision: 31842
http://scummvm.svn.sourceforge.net/scummvm/?rev=31842&view=rev
Author: lordhoto
Date: 2008-05-03 12:32:45 -0700 (Sat, 03 May 2008)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_hof.h
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/sequences_v2.cpp
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-05-03 19:32:45 UTC (rev 31842)
@@ -40,19 +40,19 @@
namespace Kyra {
-namespace {
-const KyraEngine_v2::EngineDesc hofEngineDesc = {
+const KyraEngine_v2::EngineDesc KyraEngine_HoF::_hofEngineDesc = {
+ // Generic shape related
64,
+ KyraEngine_HoF::_characterFrameTable,
+ // Scene script
8,
+ // Animation script specific
33
};
-} // end of anonymous namespace
-KyraEngine_HoF::KyraEngine_HoF(OSystem *system, const GameFlags &flags) : KyraEngine_v2(system, flags, hofEngineDesc), _updateFunctor(this, &KyraEngine_HoF::update) {
- KyraEngine_v2::_characterFrameTable = _characterFrameTable;
-
+KyraEngine_HoF::KyraEngine_HoF(OSystem *system, const GameFlags &flags) : KyraEngine_v2(system, flags, _hofEngineDesc), _updateFunctor(this, &KyraEngine_HoF::update) {
_mouseSHPBuf = 0;
_debugger = 0;
_screen = 0;
Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/kyra_hof.h 2008-05-03 19:32:45 UTC (rev 31842)
@@ -204,6 +204,8 @@
virtual TextDisplayer *text() { return _text; }
int language() const { return _lang; }
protected:
+ static const EngineDesc _hofEngineDesc;
+
// intro/outro
void seq_playSequences(int startSeq, int endSeq = -1);
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-03 19:32:45 UTC (rev 31842)
@@ -41,19 +41,19 @@
namespace Kyra {
-namespace {
-const KyraEngine_v2::EngineDesc mrEngineDesc = {
+const KyraEngine_v2::EngineDesc KyraEngine_MR::_mrEngineDesc = {
+ // Generic shape related
248,
+ KyraEngine_MR::_characterFrameTable,
+ // Scene script
9,
+ // Animation script specific
9
};
-} // end of anonymous namespace
-KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngine_v2(system, flags, mrEngineDesc) {
- KyraEngine_v2::_characterFrameTable = _characterFrameTable;
-
+KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngine_v2(system, flags, _mrEngineDesc) {
_soundDigital = 0;
_musicSoundChannel = -1;
_menuAudioFile = "TITLE1.AUD";
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-03 19:32:45 UTC (rev 31842)
@@ -62,6 +62,8 @@
void playVQA(const char *name);
protected:
+ static const EngineDesc _mrEngineDesc;
+
// --
Screen_MR *_screen;
SoundDigital *_soundDigital;
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-03 19:32:45 UTC (rev 31842)
@@ -43,6 +43,7 @@
struct EngineDesc {
// Generic shape related
const int itemShapeStart;
+ const uint8 *characterFrameTable;
// Scene script
const int firstAnimSceneScript;
@@ -157,8 +158,6 @@
virtual int getScale(int x, int y) = 0;
- const uint8 *_characterFrameTable;
-
// Scene
struct SceneDesc {
char filename1[10];
Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp 2008-05-03 19:23:45 UTC (rev 31841)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp 2008-05-03 19:32:45 UTC (rev 31842)
@@ -125,7 +125,7 @@
update();
}
- _mainCharacter.animFrame = _characterFrameTable[_mainCharacter.facing];
+ _mainCharacter.animFrame = _desc.characterFrameTable[_mainCharacter.facing];
updateCharacterAnim(0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list