[Scummvm-cvs-logs] SF.net SVN: scummvm:[55864] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Feb 10 02:19:48 CET 2011
Revision: 55864
http://scummvm.svn.sourceforge.net/scummvm/?rev=55864&view=rev
Author: lordhoto
Date: 2011-02-10 01:19:48 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
KYRA: Rename KyraEngine_MR::runDialog to doDialog to avoid name clashes with Engine::runDialog.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/script_mr.cpp
scummvm/trunk/engines/kyra/text_mr.cpp
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2011-02-10 01:19:24 UTC (rev 55863)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2011-02-10 01:19:48 UTC (rev 55864)
@@ -473,7 +473,7 @@
int o3d_delay(EMCState *script);
void randomSceneChat();
- void runDialog(int dlgIndex, int funcNum);
+ void doDialog(int dlgIndex, int funcNum);
// conscience
bool _badConscienceShown;
@@ -644,7 +644,7 @@
int o3_defineSceneAnim(EMCState *script);
int o3_updateSceneAnim(EMCState *script);
int o3_runActorScript(EMCState *script);
- int o3_runDialog(EMCState *script);
+ int o3_doDialog(EMCState *script);
int o3_setConversationState(EMCState *script);
int o3_getConversationState(EMCState *script);
int o3_changeChapter(EMCState *script);
Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp 2011-02-10 01:19:24 UTC (rev 55863)
+++ scummvm/trunk/engines/kyra/script_mr.cpp 2011-02-10 01:19:48 UTC (rev 55864)
@@ -946,9 +946,9 @@
return 0;
}
-int KyraEngine_MR::o3_runDialog(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_runDialog(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
- runDialog(stackPos(0), stackPos(1));
+int KyraEngine_MR::o3_doDialog(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_doDialog(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+ doDialog(stackPos(0), stackPos(1));
return 0;
}
@@ -1293,7 +1293,7 @@
Opcode(o3_dummy);
// 0x74
Opcode(o3_runActorScript);
- Opcode(o3_runDialog);
+ Opcode(o3_doDialog);
Opcode(o2_randomSceneChat);
Opcode(o2_setDlgIndex);
// 0x78
Modified: scummvm/trunk/engines/kyra/text_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_mr.cpp 2011-02-10 01:19:24 UTC (rev 55863)
+++ scummvm/trunk/engines/kyra/text_mr.cpp 2011-02-10 01:19:48 UTC (rev 55864)
@@ -860,7 +860,7 @@
processDialog(vocHighIndex, vocHighBase, 0);
}
-void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) {
+void KyraEngine_MR::doDialog(int dlgIndex, int funcNum) {
switch (_currentChapter-2) {
case 0:
dlgIndex -= 34;
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