[Scummvm-cvs-logs] SF.net SVN: scummvm: [32055] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon May 12 14:57:43 CEST 2008
Revision: 32055
http://scummvm.svn.sourceforge.net/scummvm/?rev=32055&view=rev
Author: lordhoto
Date: 2008-05-12 05:57:42 -0700 (Mon, 12 May 2008)
Log Message:
-----------
- Yet more opcodes moved to KyraEngine_v1
- Renamed some opcodes inside KyraEngine_LoK
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_lok.h
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/kyra/kyra_v2.h
scummvm/trunk/engines/kyra/script_hof.cpp
scummvm/trunk/engines/kyra/script_lok.cpp
scummvm/trunk/engines/kyra/script_mr.cpp
scummvm/trunk/engines/kyra/script_v1.cpp
scummvm/trunk/engines/kyra/script_v2.cpp
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -423,7 +423,7 @@
*/
setGUILabels();
- if (_vm->_currentCharacter->sceneId == 210 && _vm->_deathHandler == 0xFF) {
+ if (_vm->_currentCharacter->sceneId == 210 && _vm->_deathHandler == -1) {
_vm->snd_playSoundEffect(0x36);
return 0;
}
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -229,7 +229,6 @@
_brandonStatusBit = 0;
_brandonStatusBit0x02Flag = _brandonStatusBit0x20Flag = 10;
_brandonPosX = _brandonPosY = -1;
- _deathHandler = 0xFF;
_poisonDeathCounter = 0;
memset(_itemTable, 0, sizeof(_itemTable));
@@ -409,7 +408,7 @@
break;
}
- if (_deathHandler != 0xFF) {
+ if (_deathHandler != -1) {
snd_playWanderScoreViaMap(0, 1);
snd_playSoundEffect(49);
_screen->hideMouse();
@@ -417,7 +416,7 @@
removeHandItem();
_screen->showMouse();
_gui->buttonMenuCallback(0);
- _deathHandler = 0xFF;
+ _deathHandler = -1;
}
if ((_brandonStatusBit & 2) && _brandonStatusBit0x02Flag)
Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/kyra_lok.h 2008-05-12 12:57:42 UTC (rev 32055)
@@ -435,7 +435,6 @@
uint8 _brandonStatusBit0x02Flag;
uint8 _brandonStatusBit0x20Flag;
uint8 _brandonPoisonFlagsGFX[256];
- uint8 _deathHandler;
int16 _brandonInvFlag;
uint8 _poisonDeathCounter;
int _brandonPosX;
@@ -671,8 +670,7 @@
int o1_mouseIsPointer(EMCState *script);
int o1_runSceneAnimUntilDone(EMCState *script);
int o1_fadeSpecialPalette(EMCState *script);
- int o1_playAdlibSound(EMCState *script);
- int o1_playAdlibScore(EMCState *script);
+ int o1_playSoundEffect(EMCState *script);
int o1_phaseInSameScene(EMCState *script);
int o1_setScenePhasingFlag(EMCState *script);
int o1_resetScenePhasingFlag(EMCState *script);
@@ -682,7 +680,7 @@
int o1_placeItemInGenericMapScene(EMCState *script);
int o1_setBrandonStatusBit(EMCState *script);
int o1_pauseSeconds(EMCState *script);
- int o1_getCharactersLocation(EMCState *script);
+ int o1_getCharacterScene(EMCState *script);
int o1_runNPCSubscript(EMCState *script);
int o1_magicOutMouseItem(EMCState *script);
int o1_internalAnimOn(EMCState *script);
@@ -704,13 +702,13 @@
int o1_restoreCustomPrintBackground(EMCState *script);
int o1_getCharacterX(EMCState *script);
int o1_getCharacterY(EMCState *script);
- int o1_changeCharactersFacing(EMCState *script);
+ int o1_setCharacterFacing(EMCState *script);
int o1_copyWSARegion(EMCState *script);
int o1_printText(EMCState *script);
int o1_loadSoundFile(EMCState *script);
int o1_displayWSAFrameOnHidPage(EMCState *script);
int o1_displayWSASequentialFrames(EMCState *script);
- int o1_drawCharacterStanding(EMCState *script);
+ int o1_refreshCharacter(EMCState *script);
int o1_internalAnimOff(EMCState *script);
int o1_changeCharactersXAndY(EMCState *script);
int o1_clearSceneAnimatorBeacon(EMCState *script);
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -63,6 +63,7 @@
_gameToLoad = -1;
_mouseState = -1;
+ _deathHandler = -1;
memset(_flagsTable, 0, sizeof(_flagsTable));
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2008-05-12 12:57:42 UTC (rev 32055)
@@ -199,6 +199,9 @@
uint16 _tickLength;
uint16 _gameSpeed;
+ // run
+ int8 _deathHandler;
+
// timer
virtual void setupTimers() = 0;
@@ -222,6 +225,8 @@
int o1_setHandItem(EMCState *script);
int o1_removeHandItem(EMCState *script);
int o1_getMouseState(EMCState *script);
+ int o1_setDeathHandler(EMCState *script);
+ int o1_playWanderScoreViaMap(EMCState *script);
// items
int _mouseState;
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-05-12 12:57:42 UTC (rev 32055)
@@ -87,7 +87,6 @@
// run
bool _runFlag;
bool _showOutro;
- int8 _deathHandler;
virtual void update() = 0;
virtual void updateWithText() = 0;
@@ -396,8 +395,6 @@
int o2_delay(EMCState *script);
int o2_update(EMCState *script);
int o2_getShapeFlag1(EMCState *script);
- int o2_playWanderScoreViaMap(EMCState *script);
- int o2_setDeathHandler(EMCState *script);
int o2_waitForConfirmationClick(EMCState *script);
int o2_randomSceneChat(EMCState *script);
int o2_setDlgIndex(EMCState *script);
Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/script_hof.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -1622,7 +1622,7 @@
Opcode(o2_setZanthiaPos);
Opcode(o2_loadMusicTrack);
// 0x58
- Opcode(o2_playWanderScoreViaMap);
+ Opcode(o1_playWanderScoreViaMap);
Opcode(o2_playSoundEffect);
Opcode(o2_setSceneAnimPos);
Opcode(o2_blockInRegion);
@@ -1634,7 +1634,7 @@
// 0x60
Opcode(o1_getRand);
Opcode(o2_isAnySoundPlaying);
- Opcode(o2_setDeathHandler);
+ Opcode(o1_setDeathHandler);
Opcode(o2_setDrawNoShapeFlag);
// 0x64
Opcode(o2_setRunFlag);
Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/script_lok.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -256,18 +256,12 @@
return 0;
}
-int KyraEngine_LoK::o1_playAdlibSound(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_playSoundEffect(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
snd_playSoundEffect(stackPos(0));
return 0;
}
-int KyraEngine_LoK::o1_playAdlibScore(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
- snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
- return 0;
-}
-
int KyraEngine_LoK::o1_phaseInSameScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
transcendScenes(stackPos(0), stackPos(1));
@@ -351,8 +345,8 @@
return 0;
}
-int KyraEngine_LoK::o1_getCharactersLocation(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharacterScene(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterScene(%p) (%d)", (const void *)script, stackPos(0));
return _characterList[stackPos(0)].sceneId;
}
@@ -648,8 +642,8 @@
return _characterList[stackPos(0)].y1;
}
-int KyraEngine_LoK::o1_changeCharactersFacing(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_setCharacterFacing(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
int character = stackPos(0);
int facing = stackPos(1);
int newAnimFrame = stackPos(2);
@@ -799,8 +793,8 @@
return 0;
}
-int KyraEngine_LoK::o1_drawCharacterStanding(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_refreshCharacter(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_refreshCharacter(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
int character = stackPos(0);
int animFrame = stackPos(1);
int newFacing = stackPos(2);
@@ -1230,12 +1224,6 @@
return 0;
}
-int KyraEngine_LoK::o1_setDeathHandlerFlag(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
- _deathHandler = stackPos(0);
- return 0;
-}
-
int KyraEngine_LoK::o1_drinkPotionAnimation(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
seq_playDrinkPotionAnim(stackPos(0), stackPos(1), stackPos(2));
@@ -1800,9 +1788,9 @@
Opcode(o1_removeHandItem);
Opcode(o1_runSceneAnimUntilDone);
Opcode(o1_fadeSpecialPalette);
- Opcode(o1_playAdlibSound);
+ Opcode(o1_playSoundEffect);
// 0x18
- Opcode(o1_playAdlibScore);
+ Opcode(o1_playWanderScoreViaMap);
Opcode(o1_phaseInSameScene);
Opcode(o1_setScenePhasingFlag);
Opcode(o1_resetScenePhasingFlag);
@@ -1814,7 +1802,7 @@
// 0x20
Opcode(o1_setBrandonStatusBit);
Opcode(o1_pauseSeconds);
- Opcode(o1_getCharactersLocation);
+ Opcode(o1_getCharacterScene);
Opcode(o1_runNPCSubscript);
// 0x24
Opcode(o1_magicOutMouseItem);
@@ -1844,7 +1832,7 @@
// 0x38
Opcode(o1_getCharacterX);
Opcode(o1_getCharacterY);
- Opcode(o1_changeCharactersFacing);
+ Opcode(o1_setCharacterFacing);
Opcode(o1_copyWSARegion);
// 0x3c
Opcode(o1_printText);
@@ -1853,7 +1841,7 @@
Opcode(o1_displayWSAFrameOnHidPage);
// 0x40
Opcode(o1_displayWSASequentialFrames);
- Opcode(o1_drawCharacterStanding);
+ Opcode(o1_refreshCharacter);
Opcode(o1_internalAnimOff);
Opcode(o1_changeCharactersXAndY);
// 0x44
@@ -1890,7 +1878,7 @@
Opcode(o1_dispelMagicAnimation);
Opcode(o1_findBrightestFireberry);
Opcode(o1_setFireberryGlowPalette);
- Opcode(o1_setDeathHandlerFlag);
+ Opcode(o1_setDeathHandler);
// 0x60
Opcode(o1_drinkPotionAnimation);
Opcode(o1_makeAmuletAppear);
Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/script_mr.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -1261,7 +1261,7 @@
Opcode(o3_setMalcolmPos);
Opcode(o3_stopMusic);
// 0x58
- Opcode(o2_playWanderScoreViaMap);
+ Opcode(o1_playWanderScoreViaMap);
Opcode(o3_playSoundEffect);
Opcode(o3_getScore);
Opcode(o3_daggerWarning);
@@ -1273,7 +1273,7 @@
// 0x60
Opcode(o1_getRand);
Opcode(o3_dummy);
- Opcode(o2_setDeathHandler);
+ Opcode(o1_setDeathHandler);
Opcode(o3_showGoodConscience);
// 0x64
Opcode(o3_goodConscienceChat);
Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/script_v1.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -84,5 +84,17 @@
return _mouseState;
}
+int KyraEngine_v1::o1_setDeathHandler(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setDeathHandler(%p) (%d)", (const void *)script, stackPos(0));
+ _deathHandler = stackPos(0);
+ return 0;
+}
+
+int KyraEngine_v1::o1_playWanderScoreViaMap(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+ snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
+ return 0;
+}
+
} // end of namespace Kyra
Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp 2008-05-12 12:43:52 UTC (rev 32054)
+++ scummvm/trunk/engines/kyra/script_v2.cpp 2008-05-12 12:57:42 UTC (rev 32055)
@@ -156,18 +156,6 @@
return screen()->getShapeFlag1(stackPos(0), stackPos(1));
}
-int KyraEngine_v2::o2_playWanderScoreViaMap(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
- snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
- return 0;
-}
-
-int KyraEngine_v2::o2_setDeathHandler(EMCState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDeathHandler(%p) (%d)", (const void *)script, stackPos(0));
- _deathHandler = stackPos(0);
- return 0;
-}
-
int KyraEngine_v2::o2_waitForConfirmationClick(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_waitForConfirmationClick(%p) (%d)", (const void *)script, stackPos(0));
resetSkipFlag();
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