Oops it should never be renamed to c1_* but to o1_* changing this now.

svn-id: r23613

1 files changed, 158 insertions, 158 deletions

diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index 70182400eb..f1eb7818d0 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -70,7 +70,7 @@ enum {
 // TODO: this is just the start of makeing the debug output of the kyra engine a bit more useable
 // in the future we maybe merge some flags  and/or create new ones
 enum kDebugLevels {
-	kDebugLevelScriptFuncs = 1 << 0,		// prints debug output of c1_* functions
+	kDebugLevelScriptFuncs = 1 << 0,		// prints debug output of o1_* functions
 	kDebugLevelScript = 1 << 1,				// prints debug output of "ScriptHelper" functions
 	kDebugLevelSprites = 1 << 2,			// prints debug output of "Sprites" functions
 	kDebugLevelScreen = 1 << 3,				// prints debug output of "Screen" functions
@@ -332,163 +332,163 @@ public:
 	
 	virtual int runOpcode(ScriptState *script, uint8 opcode);
 protected:
-	int c1_magicInMouseItem(ScriptState *script);
-	int c1_characterSays(ScriptState *script);
-	int c1_pauseTicks(ScriptState *script);
-	int c1_drawSceneAnimShape(ScriptState *script);
-	int c1_queryGameFlag(ScriptState *script);
-	int c1_setGameFlag(ScriptState *script);
-	int c1_resetGameFlag(ScriptState *script);
-	int c1_runNPCScript(ScriptState *script);
-	int c1_setSpecialExitList(ScriptState *script);
-	int c1_blockInWalkableRegion(ScriptState *script);
-	int c1_blockOutWalkableRegion(ScriptState *script);
-	int c1_walkPlayerToPoint(ScriptState *script);
-	int c1_dropItemInScene(ScriptState *script);
-	int c1_drawAnimShapeIntoScene(ScriptState *script);
-	int c1_createMouseItem(ScriptState *script);
-	int c1_savePageToDisk(ScriptState *script);
-	int c1_sceneAnimOn(ScriptState *script);
-	int c1_sceneAnimOff(ScriptState *script);
-	int c1_getElapsedSeconds(ScriptState *script);
-	int c1_mouseIsPointer(ScriptState *script);
-	int c1_destroyMouseItem(ScriptState *script);
-	int c1_runSceneAnimUntilDone(ScriptState *script);
-	int c1_fadeSpecialPalette(ScriptState *script);
-	int c1_playAdlibSound(ScriptState *script);
-	int c1_playAdlibScore(ScriptState *script);
-	int c1_phaseInSameScene(ScriptState *script);
-	int c1_setScenePhasingFlag(ScriptState *script);
-	int c1_resetScenePhasingFlag(ScriptState *script);
-	int c1_queryScenePhasingFlag(ScriptState *script);
-	int c1_sceneToDirection(ScriptState *script);
-	int c1_setBirthstoneGem(ScriptState *script);
-	int c1_placeItemInGenericMapScene(ScriptState *script);
-	int c1_setBrandonStatusBit(ScriptState *script);
-	int c1_pauseSeconds(ScriptState *script);
-	int c1_getCharactersLocation(ScriptState *script);
-	int c1_runNPCSubscript(ScriptState *script);
-	int c1_magicOutMouseItem(ScriptState *script);
-	int c1_internalAnimOn(ScriptState *script);
-	int c1_forceBrandonToNormal(ScriptState *script);
-	int c1_poisonDeathNow(ScriptState *script);
-	int c1_setScaleMode(ScriptState *script);
-	int c1_openWSAFile(ScriptState *script);
-	int c1_closeWSAFile(ScriptState *script);
-	int c1_runWSAFromBeginningToEnd(ScriptState *script);
-	int c1_displayWSAFrame(ScriptState *script);
-	int c1_enterNewScene(ScriptState *script);
-	int c1_setSpecialEnterXAndY(ScriptState *script);
-	int c1_runWSAFrames(ScriptState *script);
-	int c1_popBrandonIntoScene(ScriptState *script);
-	int c1_restoreAllObjectBackgrounds(ScriptState *script);
-	int c1_setCustomPaletteRange(ScriptState *script);
-	int c1_loadPageFromDisk(ScriptState *script);
-	int c1_customPrintTalkString(ScriptState *script);
-	int c1_restoreCustomPrintBackground(ScriptState *script);
-	int c1_hideMouse(ScriptState *script);
-	int c1_showMouse(ScriptState *script);
-	int c1_getCharacterX(ScriptState *script);
-	int c1_getCharacterY(ScriptState *script);
-	int c1_changeCharactersFacing(ScriptState *script);
-	int c1_copyWSARegion(ScriptState *script);
-	int c1_printText(ScriptState *script);
-	int c1_random(ScriptState *script);
-	int c1_loadSoundFile(ScriptState *script);
-	int c1_displayWSAFrameOnHidPage(ScriptState *script);
-	int c1_displayWSASequentialFrames(ScriptState *script);
-	int c1_drawCharacterStanding(ScriptState *script);
-	int c1_internalAnimOff(ScriptState *script);
-	int c1_changeCharactersXAndY(ScriptState *script);
-	int c1_clearSceneAnimatorBeacon(ScriptState *script);
-	int c1_querySceneAnimatorBeacon(ScriptState *script);
-	int c1_refreshSceneAnimator(ScriptState *script);
-	int c1_placeItemInOffScene(ScriptState *script);
-	int c1_wipeDownMouseItem(ScriptState *script);
-	int c1_placeCharacterInOtherScene(ScriptState *script);
-	int c1_getKey(ScriptState *script);
-	int c1_specificItemInInventory(ScriptState *script);
-	int c1_popMobileNPCIntoScene(ScriptState *script);
-	int c1_mobileCharacterInScene(ScriptState *script);
-	int c1_hideMobileCharacter(ScriptState *script);
-	int c1_unhideMobileCharacter(ScriptState *script);
-	int c1_setCharactersLocation(ScriptState *script);
-	int c1_walkCharacterToPoint(ScriptState *script);
-	int c1_specialEventDisplayBrynnsNote(ScriptState *script);
-	int c1_specialEventRemoveBrynnsNote(ScriptState *script);
-	int c1_setLogicPage(ScriptState *script);
-	int c1_fatPrint(ScriptState *script);
-	int c1_preserveAllObjectBackgrounds(ScriptState *script);
-	int c1_updateSceneAnimations(ScriptState *script);
-	int c1_sceneAnimationActive(ScriptState *script);
-	int c1_setCharactersMovementDelay(ScriptState *script);
-	int c1_getCharactersFacing(ScriptState *script);
-	int c1_bkgdScrollSceneAndMasksRight(ScriptState *script);
-	int c1_dispelMagicAnimation(ScriptState *script);
-	int c1_findBrightestFireberry(ScriptState *script);
-	int c1_setFireberryGlowPalette(ScriptState *script);
-	int c1_setDeathHandlerFlag(ScriptState *script);
-	int c1_drinkPotionAnimation(ScriptState *script);
-	int c1_makeAmuletAppear(ScriptState *script);
-	int c1_drawItemShapeIntoScene(ScriptState *script);
-	int c1_setCharactersCurrentFrame(ScriptState *script);
-	int c1_waitForConfirmationMouseClick(ScriptState *script);
-	int c1_pageFlip(ScriptState *script);
-	int c1_setSceneFile(ScriptState *script);
-	int c1_getItemInMarbleVase(ScriptState *script);
-	int c1_setItemInMarbleVase(ScriptState *script);
-	int c1_addItemToInventory(ScriptState *script);
-	int c1_intPrint(ScriptState *script);
-	int c1_shakeScreen(ScriptState *script);
-	int c1_createAmuletJewel(ScriptState *script);
-	int c1_setSceneAnimCurrXY(ScriptState *script);
-	int c1_poisonBrandonAndRemaps(ScriptState *script);
-	int c1_fillFlaskWithWater(ScriptState *script);
-	int c1_getCharactersMovementDelay(ScriptState *script);
-	int c1_getBirthstoneGem(ScriptState *script);
-	int c1_queryBrandonStatusBit(ScriptState *script);
-	int c1_playFluteAnimation(ScriptState *script);
-	int c1_playWinterScrollSequence(ScriptState *script);
-	int c1_getIdolGem(ScriptState *script);
-	int c1_setIdolGem(ScriptState *script);
-	int c1_totalItemsInScene(ScriptState *script);
-	int c1_restoreBrandonsMovementDelay(ScriptState *script);
-	int c1_setMousePos(ScriptState *script);
-	int c1_getMouseState(ScriptState *script);
-	int c1_setEntranceMouseCursorTrack(ScriptState *script);
-	int c1_itemAppearsOnGround(ScriptState *script);
-	int c1_setNoDrawShapesFlag(ScriptState *script);
-	int c1_fadeEntirePalette(ScriptState *script);
-	int c1_itemOnGroundHere(ScriptState *script);
-	int c1_queryCauldronState(ScriptState *script);
-	int c1_setCauldronState(ScriptState *script);
-	int c1_queryCrystalState(ScriptState *script);
-	int c1_setCrystalState(ScriptState *script);
-	int c1_setPaletteRange(ScriptState *script);
-	int c1_shrinkBrandonDown(ScriptState *script);
-	int c1_growBrandonUp(ScriptState *script);
-	int c1_setBrandonScaleXAndY(ScriptState *script);
-	int c1_resetScaleMode(ScriptState *script);
-	int c1_getScaleDepthTableValue(ScriptState *script);
-	int c1_setScaleDepthTableValue(ScriptState *script);
-	int c1_message(ScriptState *script);
-	int c1_checkClickOnNPC(ScriptState *script);
-	int c1_getFoyerItem(ScriptState *script);
-	int c1_setFoyerItem(ScriptState *script);
-	int c1_setNoItemDropRegion(ScriptState *script);
-	int c1_walkMalcolmOn(ScriptState *script);
-	int c1_passiveProtection(ScriptState *script);
-	int c1_setPlayingLoop(ScriptState *script);
-	int c1_brandonToStoneSequence(ScriptState *script);
-	int c1_brandonHealingSequence(ScriptState *script);
-	int c1_protectCommandLine(ScriptState *script);
-	int c1_pauseMusicSeconds(ScriptState *script);
-	int c1_resetMaskRegion(ScriptState *script);
-	int c1_setPaletteChangeFlag(ScriptState *script);
-	int c1_fillRect(ScriptState *script);
-	int c1_dummy(ScriptState *script);
-	int c1_vocUnload(ScriptState *script);
-	int c1_vocLoad(ScriptState *script);
+	int o1_magicInMouseItem(ScriptState *script);
+	int o1_characterSays(ScriptState *script);
+	int o1_pauseTicks(ScriptState *script);
+	int o1_drawSceneAnimShape(ScriptState *script);
+	int o1_queryGameFlag(ScriptState *script);
+	int o1_setGameFlag(ScriptState *script);
+	int o1_resetGameFlag(ScriptState *script);
+	int o1_runNPCScript(ScriptState *script);
+	int o1_setSpecialExitList(ScriptState *script);
+	int o1_blockInWalkableRegion(ScriptState *script);
+	int o1_blockOutWalkableRegion(ScriptState *script);
+	int o1_walkPlayerToPoint(ScriptState *script);
+	int o1_dropItemInScene(ScriptState *script);
+	int o1_drawAnimShapeIntoScene(ScriptState *script);
+	int o1_createMouseItem(ScriptState *script);
+	int o1_savePageToDisk(ScriptState *script);
+	int o1_sceneAnimOn(ScriptState *script);
+	int o1_sceneAnimOff(ScriptState *script);
+	int o1_getElapsedSeconds(ScriptState *script);
+	int o1_mouseIsPointer(ScriptState *script);
+	int o1_destroyMouseItem(ScriptState *script);
+	int o1_runSceneAnimUntilDone(ScriptState *script);
+	int o1_fadeSpecialPalette(ScriptState *script);
+	int o1_playAdlibSound(ScriptState *script);
+	int o1_playAdlibScore(ScriptState *script);
+	int o1_phaseInSameScene(ScriptState *script);
+	int o1_setScenePhasingFlag(ScriptState *script);
+	int o1_resetScenePhasingFlag(ScriptState *script);
+	int o1_queryScenePhasingFlag(ScriptState *script);
+	int o1_sceneToDirection(ScriptState *script);
+	int o1_setBirthstoneGem(ScriptState *script);
+	int o1_placeItemInGenericMapScene(ScriptState *script);
+	int o1_setBrandonStatusBit(ScriptState *script);
+	int o1_pauseSeconds(ScriptState *script);
+	int o1_getCharactersLocation(ScriptState *script);
+	int o1_runNPCSubscript(ScriptState *script);
+	int o1_magicOutMouseItem(ScriptState *script);
+	int o1_internalAnimOn(ScriptState *script);
+	int o1_forceBrandonToNormal(ScriptState *script);
+	int o1_poisonDeathNow(ScriptState *script);
+	int o1_setScaleMode(ScriptState *script);
+	int o1_openWSAFile(ScriptState *script);
+	int o1_closeWSAFile(ScriptState *script);
+	int o1_runWSAFromBeginningToEnd(ScriptState *script);
+	int o1_displayWSAFrame(ScriptState *script);
+	int o1_enterNewScene(ScriptState *script);
+	int o1_setSpecialEnterXAndY(ScriptState *script);
+	int o1_runWSAFrames(ScriptState *script);
+	int o1_popBrandonIntoScene(ScriptState *script);
+	int o1_restoreAllObjectBackgrounds(ScriptState *script);
+	int o1_setCustomPaletteRange(ScriptState *script);
+	int o1_loadPageFromDisk(ScriptState *script);
+	int o1_customPrintTalkString(ScriptState *script);
+	int o1_restoreCustomPrintBackground(ScriptState *script);
+	int o1_hideMouse(ScriptState *script);
+	int o1_showMouse(ScriptState *script);
+	int o1_getCharacterX(ScriptState *script);
+	int o1_getCharacterY(ScriptState *script);
+	int o1_changeCharactersFacing(ScriptState *script);
+	int o1_copyWSARegion(ScriptState *script);
+	int o1_printText(ScriptState *script);
+	int o1_random(ScriptState *script);
+	int o1_loadSoundFile(ScriptState *script);
+	int o1_displayWSAFrameOnHidPage(ScriptState *script);
+	int o1_displayWSASequentialFrames(ScriptState *script);
+	int o1_drawCharacterStanding(ScriptState *script);
+	int o1_internalAnimOff(ScriptState *script);
+	int o1_changeCharactersXAndY(ScriptState *script);
+	int o1_clearSceneAnimatorBeacon(ScriptState *script);
+	int o1_querySceneAnimatorBeacon(ScriptState *script);
+	int o1_refreshSceneAnimator(ScriptState *script);
+	int o1_placeItemInOffScene(ScriptState *script);
+	int o1_wipeDownMouseItem(ScriptState *script);
+	int o1_placeCharacterInOtherScene(ScriptState *script);
+	int o1_getKey(ScriptState *script);
+	int o1_specificItemInInventory(ScriptState *script);
+	int o1_popMobileNPCIntoScene(ScriptState *script);
+	int o1_mobileCharacterInScene(ScriptState *script);
+	int o1_hideMobileCharacter(ScriptState *script);
+	int o1_unhideMobileCharacter(ScriptState *script);
+	int o1_setCharactersLocation(ScriptState *script);
+	int o1_walkCharacterToPoint(ScriptState *script);
+	int o1_specialEventDisplayBrynnsNote(ScriptState *script);
+	int o1_specialEventRemoveBrynnsNote(ScriptState *script);
+	int o1_setLogicPage(ScriptState *script);
+	int o1_fatPrint(ScriptState *script);
+	int o1_preserveAllObjectBackgrounds(ScriptState *script);
+	int o1_updateSceneAnimations(ScriptState *script);
+	int o1_sceneAnimationActive(ScriptState *script);
+	int o1_setCharactersMovementDelay(ScriptState *script);
+	int o1_getCharactersFacing(ScriptState *script);
+	int o1_bkgdScrollSceneAndMasksRight(ScriptState *script);
+	int o1_dispelMagicAnimation(ScriptState *script);
+	int o1_findBrightestFireberry(ScriptState *script);
+	int o1_setFireberryGlowPalette(ScriptState *script);
+	int o1_setDeathHandlerFlag(ScriptState *script);
+	int o1_drinkPotionAnimation(ScriptState *script);
+	int o1_makeAmuletAppear(ScriptState *script);
+	int o1_drawItemShapeIntoScene(ScriptState *script);
+	int o1_setCharactersCurrentFrame(ScriptState *script);
+	int o1_waitForConfirmationMouseClick(ScriptState *script);
+	int o1_pageFlip(ScriptState *script);
+	int o1_setSceneFile(ScriptState *script);
+	int o1_getItemInMarbleVase(ScriptState *script);
+	int o1_setItemInMarbleVase(ScriptState *script);
+	int o1_addItemToInventory(ScriptState *script);
+	int o1_intPrint(ScriptState *script);
+	int o1_shakeScreen(ScriptState *script);
+	int o1_createAmuletJewel(ScriptState *script);
+	int o1_setSceneAnimCurrXY(ScriptState *script);
+	int o1_poisonBrandonAndRemaps(ScriptState *script);
+	int o1_fillFlaskWithWater(ScriptState *script);
+	int o1_getCharactersMovementDelay(ScriptState *script);
+	int o1_getBirthstoneGem(ScriptState *script);
+	int o1_queryBrandonStatusBit(ScriptState *script);
+	int o1_playFluteAnimation(ScriptState *script);
+	int o1_playWinterScrollSequence(ScriptState *script);
+	int o1_getIdolGem(ScriptState *script);
+	int o1_setIdolGem(ScriptState *script);
+	int o1_totalItemsInScene(ScriptState *script);
+	int o1_restoreBrandonsMovementDelay(ScriptState *script);
+	int o1_setMousePos(ScriptState *script);
+	int o1_getMouseState(ScriptState *script);
+	int o1_setEntranceMouseCursorTrack(ScriptState *script);
+	int o1_itemAppearsOnGround(ScriptState *script);
+	int o1_setNoDrawShapesFlag(ScriptState *script);
+	int o1_fadeEntirePalette(ScriptState *script);
+	int o1_itemOnGroundHere(ScriptState *script);
+	int o1_queryCauldronState(ScriptState *script);
+	int o1_setCauldronState(ScriptState *script);
+	int o1_queryCrystalState(ScriptState *script);
+	int o1_setCrystalState(ScriptState *script);
+	int o1_setPaletteRange(ScriptState *script);
+	int o1_shrinkBrandonDown(ScriptState *script);
+	int o1_growBrandonUp(ScriptState *script);
+	int o1_setBrandonScaleXAndY(ScriptState *script);
+	int o1_resetScaleMode(ScriptState *script);
+	int o1_getScaleDepthTableValue(ScriptState *script);
+	int o1_setScaleDepthTableValue(ScriptState *script);
+	int o1_message(ScriptState *script);
+	int o1_checkClickOnNPC(ScriptState *script);
+	int o1_getFoyerItem(ScriptState *script);
+	int o1_setFoyerItem(ScriptState *script);
+	int o1_setNoItemDropRegion(ScriptState *script);
+	int o1_walkMalcolmOn(ScriptState *script);
+	int o1_passiveProtection(ScriptState *script);
+	int o1_setPlayingLoop(ScriptState *script);
+	int o1_brandonToStoneSequence(ScriptState *script);
+	int o1_brandonHealingSequence(ScriptState *script);
+	int o1_protectCommandLine(ScriptState *script);
+	int o1_pauseMusicSeconds(ScriptState *script);
+	int o1_resetMaskRegion(ScriptState *script);
+	int o1_setPaletteChangeFlag(ScriptState *script);
+	int o1_fillRect(ScriptState *script);
+	int o1_dummy(ScriptState *script);
+	int o1_vocUnload(ScriptState *script);
+	int o1_vocLoad(ScriptState *script);
 
 protected: