[Scummvm-cvs-logs] SF.net SVN: scummvm: [31825] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri May 2 17:59:57 CEST 2008
Revision: 31825
http://scummvm.svn.sourceforge.net/scummvm/?rev=31825&view=rev
Author: lordhoto
Date: 2008-05-02 08:59:57 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Started to move opcodes used in both kyra2 and kyra3 to KyraEngine_v2.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/module.mk
scummvm/trunk/engines/kyra/script_hof.cpp
scummvm/trunk/engines/kyra/script_mr.cpp
Added Paths:
-----------
scummvm/trunk/engines/kyra/script_v2.cpp
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-02 15:59:23 UTC (rev 31824)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2008-05-02 15:59:57 UTC (rev 31825)
@@ -84,7 +84,6 @@
void runLoop();
void handleInput(int x, int y);
- bool _unkHandleSceneChangeFlag;
int inputSceneChange(int x, int y, int unk1, int unk2);
void update();
@@ -363,8 +362,6 @@
int getScale(int x, int y);
int _scaleTable[15];
- bool _unkSceneScreenFlag1;
-
// character
int getCharacterWalkspeed() const;
void updateCharAnimFrame(int character, int *table);
@@ -522,8 +519,6 @@
static const uint8 _chapterLowestScene[];
- int _unk3, _unk4, _unk5;
-
void loadCostPal();
void loadShadowShape();
void loadExtrasShapes();
@@ -554,15 +549,9 @@
int o3_setCharacterPos(EMCState *script);
int o3_defineObject(EMCState *script);
int o3_refreshCharacter(EMCState *script);
- int o3_getCharacterX(EMCState *script);
- int o3_getCharacterY(EMCState *script);
- int o3_getCharacterFacing(EMCState *script);
- int o3_getCharacterScene(EMCState *script);
int o3_getMalcolmsMood(EMCState *script);
int o3_getCharacterFrameFromFacing(EMCState *script);
int o3_setCharacterFacingOverwrite(EMCState *script);
- int o3_trySceneChange(EMCState *script);
- int o3_moveCharacter(EMCState *script);
int o3_setCharacterFacing(EMCState *script);
int o3_showSceneFileMessage(EMCState *script);
int o3_setCharacterAnimFrameFromFacing(EMCState *script);
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-02 15:59:23 UTC (rev 31824)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-02 15:59:57 UTC (rev 31825)
@@ -54,6 +54,7 @@
// Input
virtual int checkInput(Button *buttonList, bool mainLoop = false) = 0;
+ virtual int inputSceneChange(int x, int y, int unk1, int unk2) = 0;
void updateInput();
void removeInputTop();
@@ -274,6 +275,19 @@
virtual int getCharacterWalkspeed() const = 0;
virtual void updateCharAnimFrame(int num, int *table) = 0;
+
+ // unknown
+ int _unk3, _unk4, _unk5;
+ bool _unkSceneScreenFlag1;
+ bool _unkHandleSceneChangeFlag;
+
+ // opcodes
+ int o2_getCharacterX(EMCState *script);
+ int o2_getCharacterY(EMCState *script);
+ int o2_getCharacterFacing(EMCState *script);
+ int o2_getCharacterScene(EMCState *script);
+ int o2_trySceneChange(EMCState *script);
+ int o2_moveCharacter(EMCState *script);
};
} // end of namespace Kyra
Modified: scummvm/trunk/engines/kyra/module.mk
===================================================================
--- scummvm/trunk/engines/kyra/module.mk 2008-05-02 15:59:23 UTC (rev 31824)
+++ scummvm/trunk/engines/kyra/module.mk 2008-05-02 15:59:57 UTC (rev 31825)
@@ -36,6 +36,7 @@
screen_hof.o \
screen_mr.o \
script_v1.o \
+ script_v2.o \
script_hof.o \
script_mr.o \
script.o \
Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-02 15:59:23 UTC (rev 31824)
+++ scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-02 15:59:57 UTC (rev 31825)
@@ -89,26 +89,6 @@
return 0;
}
-int KyraEngine_HoF::o2_getCharacterX(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterX(%p) ()", (const void *)script);
- return _mainCharacter.x1;
-}
-
-int KyraEngine_HoF::o2_getCharacterY(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterY(%p) ()", (const void *)script);
- return _mainCharacter.y1;
-}
-
-int KyraEngine_HoF::o2_getCharacterFacing(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterFacing(%p) ()", (const void *)script);
- return _mainCharacter.facing;
-}
-
-int KyraEngine_HoF::o2_getCharacterScene(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_getCharacterScene(%p) ()", (const void *)script);
- return _mainCharacter.sceneId;
-}
-
int KyraEngine_HoF::o2_setSceneComment(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_setSceneComment(%p) ('%s')", (const void *)script, stackPosString(0));
_sceneCommentString = stackPosString(0);
@@ -134,31 +114,6 @@
return 0;
}
-int KyraEngine_HoF::o2_trySceneChange(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
- stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-
- _unkHandleSceneChangeFlag = 1;
- int success = inputSceneChange(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
- _unkHandleSceneChangeFlag = 0;
-
- if (success) {
- _emc->init(script, script->dataPtr);
- _unk4 = 0;
- _unk3 = -1;
- _unk5 = 1;
- return 0;
- } else {
- return (_unk4 != 0) ? 1 : 0;
- }
-}
-
-int KyraEngine_HoF::o2_moveCharacter(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_moveCharacter(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
- moveCharacter(stackPos(0), stackPos(1), stackPos(2));
- return 0;
-}
-
int KyraEngine_HoF::o2_customCharacterChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_HoF::o2_customCharacterChat(%p) ('%s', %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
playVoice(_vocHigh, stackPos(4));
Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp 2008-05-02 15:59:23 UTC (rev 31824)
+++ scummvm/trunk/engines/kyra/script_mr.cpp 2008-05-02 15:59:57 UTC (rev 31825)
@@ -91,26 +91,6 @@
return 0;
}
-int KyraEngine_MR::o3_getCharacterX(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getCharacterX(%p) ()", (const void *)script);
- return _mainCharacter.x1;
-}
-
-int KyraEngine_MR::o3_getCharacterY(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getCharacterY(%p) ()", (const void *)script);
- return _mainCharacter.y1;
-}
-
-int KyraEngine_MR::o3_getCharacterFacing(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getCharacterFacing(%p) ()", (const void *)script);
- return _mainCharacter.facing;
-}
-
-int KyraEngine_MR::o3_getCharacterScene(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getCharacterScene(%p) ()", (const void *)script);
- return _mainCharacter.sceneId;
-}
-
int KyraEngine_MR::o3_getMalcolmsMood(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getMalcolmsMood(%p) ()", (const void *)script);
return _malcolmsMood;
@@ -128,31 +108,6 @@
return 0;
}
-int KyraEngine_MR::o3_trySceneChange(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
- stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-
- _unkHandleSceneChangeFlag = 1;
- int success = inputSceneChange(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
- _unkHandleSceneChangeFlag = 0;
-
- if (success) {
- _emc->init(script, script->dataPtr);
- _unk4 = 0;
- _unk3 = -1;
- _unk5 = 1;
- return 0;
- } else {
- return (_unk4 != 0) ? 1 : 0;
- }
-}
-
-int KyraEngine_MR::o3_moveCharacter(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_moveCharacter(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
- moveCharacter(stackPos(0), stackPos(1), stackPos(2));
- return 0;
-}
-
int KyraEngine_MR::o3_setCharacterFacing(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_setCharacterFacing(%p) (%d)", (const void *)script, stackPos(0));
_mainCharacter.facing = stackPos(0);
@@ -1446,10 +1401,10 @@
Opcode(o3_defineObject);
Opcode(o3_refreshCharacter);
// 0x04
- Opcode(o3_getCharacterX);
- Opcode(o3_getCharacterY);
- Opcode(o3_getCharacterFacing);
- Opcode(o3_getCharacterScene);
+ Opcode(o2_getCharacterX);
+ Opcode(o2_getCharacterY);
+ Opcode(o2_getCharacterFacing);
+ Opcode(o2_getCharacterScene);
// 0x08
Opcode(o3_getMalcolmsMood);
Opcode(o3_dummy);
@@ -1457,8 +1412,8 @@
Opcode(o3_getCharacterFrameFromFacing);
// 0x0c
Opcode(o3_setCharacterFacingOverwrite);
- Opcode(o3_trySceneChange);
- Opcode(o3_moveCharacter);
+ Opcode(o2_trySceneChange);
+ Opcode(o2_moveCharacter);
Opcode(o3_setCharacterFacing);
// 0x10
OpcodeUnImpl();
Added: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp (rev 0)
+++ scummvm/trunk/engines/kyra/script_v2.cpp 2008-05-02 15:59:57 UTC (rev 31825)
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "kyra/kyra_v2.h"
+
+namespace Kyra {
+
+int KyraEngine_v2::o2_getCharacterX(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterX(%p) ()", (const void *)script);
+ return _mainCharacter.x1;
+}
+
+int KyraEngine_v2::o2_getCharacterY(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterY(%p) ()", (const void *)script);
+ return _mainCharacter.y1;
+}
+
+int KyraEngine_v2::o2_getCharacterFacing(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterFacing(%p) ()", (const void *)script);
+ return _mainCharacter.facing;
+}
+
+int KyraEngine_v2::o2_getCharacterScene(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterScene(%p) ()", (const void *)script);
+ return _mainCharacter.sceneId;
+}
+
+int KyraEngine_v2::o2_trySceneChange(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
+ stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+
+ _unkHandleSceneChangeFlag = 1;
+ int success = inputSceneChange(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+ _unkHandleSceneChangeFlag = 0;
+
+ if (success) {
+ _emc->init(script, script->dataPtr);
+ _unk4 = 0;
+ _unk3 = -1;
+ _unk5 = 1;
+ return 0;
+ } else {
+ return (_unk4 != 0) ? 1 : 0;
+ }
+}
+
+int KyraEngine_v2::o2_moveCharacter(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_moveCharacter(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+ moveCharacter(stackPos(0), stackPos(1), stackPos(2));
+ return 0;
+}
+
+} // end of namespace Kyra
+
Property changes on: scummvm/trunk/engines/kyra/script_v2.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Rev Author URL Id
Name: svn:eol-style
+ native
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