[Scummvm-cvs-logs] SF.net SVN: scummvm: [31823] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri May 2 17:48:30 CEST 2008
Revision: 31823
http://scummvm.svn.sourceforge.net/scummvm/?rev=31823&view=rev
Author: lordhoto
Date: 2008-05-02 08:48:30 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Moved runSceneScript6 to KyraEngine_v2.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/scene_hof.cpp
scummvm/trunk/engines/kyra/scene_mr.cpp
scummvm/trunk/engines/kyra/scene_v2.cpp
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -108,7 +108,6 @@
_inventorySaved = false;
_unkBuf200kByte = 0;
memset(&_sceneShapeTable, 0, sizeof(_sceneShapeTable));
- memset(&_sceneScriptData, 0, sizeof(_sceneScriptData));
_talkObjectList = 0;
_shapeDescTable = 0;
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -69,8 +69,6 @@
_text = 0;
_commandLineY = 189;
_inventoryState = false;
- memset(&_sceneScriptState, 0, sizeof(_sceneScriptState));
- memset(&_sceneScriptData, 0, sizeof(_sceneScriptData));
memset(_characterAnimTable, 0, sizeof(_characterAnimTable));
_overwriteSceneFacing = false;
_maskPageMinY = _maskPageMaxY = 0;
@@ -168,8 +166,6 @@
}
_gameShapes.clear();
- _emc->unload(&_sceneScriptData);
-
delete [] _sceneStrings;
delete [] _talkObjectList;
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-02 15:48:30 UTC (rev 31823)
@@ -339,15 +339,11 @@
int runSceneScript2();
bool _noStartupChat;
void runSceneScript4(int unk1);
- void runSceneScript6();
void runSceneScript8();
int _sceneMinX, _sceneMaxX;
int _maskPageMinY, _maskPageMaxY;
- EMCState _sceneScriptState;
- EMCData _sceneScriptData;
-
int trySceneChange(int *moveTable, int unk1, int unk2);
int checkSceneChange();
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -41,6 +41,9 @@
_characterShapeFile = -1;
_updateCharPosNextUpdate = 0;
+
+ memset(&_sceneScriptState, 0, sizeof(_sceneScriptState));
+ memset(&_sceneScriptData, 0, sizeof(_sceneScriptData));
}
KyraEngine_v2::~KyraEngine_v2() {
@@ -51,6 +54,8 @@
_gameShapes.clear();
delete [] _itemList;
+
+ _emc->unload(&_sceneScriptData);
}
void KyraEngine_v2::updateInput() {
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-02 15:48:30 UTC (rev 31823)
@@ -151,6 +151,13 @@
virtual void enterNewScene(uint16 newScene, int facing, int unk1, int unk2, int unk3) = 0;
+ void runSceneScript6();
+
+ EMCData _sceneScriptData;
+ EMCState _sceneScriptState;
+
+ virtual int trySceneChange(int *moveTable, int unk1, int unk2) = 0;
+
// Animation
virtual void restorePage3() = 0;
Modified: scummvm/trunk/engines/kyra/scene_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_hof.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/scene_hof.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -501,20 +501,6 @@
_emc->run(&_sceneScriptState);
}
-void KyraEngine_HoF::runSceneScript6() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::runSceneScript6()");
- _emc->init(&_sceneScriptState, &_sceneScriptData);
-
- _sceneScriptState.regs[0] = _mainCharacter.sceneId;
- _sceneScriptState.regs[1] = _mouseX;
- _sceneScriptState.regs[2] = _mouseY;
- _sceneScriptState.regs[4] = _itemInHand;
-
- _emc->start(&_sceneScriptState, 6);
- while (_emc->isValid(&_sceneScriptState))
- _emc->run(&_sceneScriptState);
-}
-
void KyraEngine_HoF::runSceneScript7() {
debugC(9, kDebugLevelMain, "KyraEngine_HoF::runSceneScript7()");
int oldPage = _screen->_curPage;
Modified: scummvm/trunk/engines/kyra/scene_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_mr.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/scene_mr.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -803,20 +803,6 @@
_noStartupChat = true;
}
-void KyraEngine_MR::runSceneScript6() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript6()");
- _emc->init(&_sceneScriptState, &_sceneScriptData);
-
- _sceneScriptState.regs[0] = _mainCharacter.sceneId;
- _sceneScriptState.regs[1] = _mouseX;
- _sceneScriptState.regs[2] = _mouseY;
- _sceneScriptState.regs[3] = _itemInHand;
-
- _emc->start(&_sceneScriptState, 6);
- while (_emc->isValid(&_sceneScriptState))
- _emc->run(&_sceneScriptState);
-}
-
void KyraEngine_MR::runSceneScript8() {
debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript8()");
_emc->start(&_sceneScriptState, 8);
Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp 2008-05-02 15:39:51 UTC (rev 31822)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp 2008-05-02 15:48:30 UTC (rev 31823)
@@ -70,6 +70,22 @@
}
}
+void KyraEngine_v2::runSceneScript6() {
+ debugC(9, kDebugLevelMain, "KyraEngine_v2::runSceneScript6()");
+ _emc->init(&_sceneScriptState, &_sceneScriptData);
+
+ _sceneScriptState.regs[0] = _mainCharacter.sceneId;
+ _sceneScriptState.regs[1] = _mouseX;
+ _sceneScriptState.regs[2] = _mouseY;
+ _sceneScriptState.regs[3] = _itemInHand;
+
+ _emc->start(&_sceneScriptState, 6);
+ while (_emc->isValid(&_sceneScriptState))
+ _emc->run(&_sceneScriptState);
+}
+
+#pragma mark - pathfinder
+
int KyraEngine_v2::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
debugC(9, kDebugLevelMain, "KyraEngine_v2::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
x &= ~3; toX &= ~3;
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