thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert last change, doesn't seem to work either

Browse source 
svn-id: r19486
This commit is contained in:
Chris Apers 2005-11-06 12:58:19 +00:00
parent c23723a9fe
commit f123080d63
2 changed files with 104 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

210
sword1/logic.cpp
View file

@ -62,8 +62,6 @@ Logic::Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse,
_eventMan = NULL;
_system = system;
_mixer = mixer;
setupMcodeTable();
}
Logic::~Logic(void) {
@ -683,112 +681,108 @@ int Logic::interpretScript(Object *compact, int id, Header *scriptModule, int sc
}
}
void Logic::setupMcodeTable() {
static const BSMcodeTable mcodeTable[100] = {
&Logic::fnBackground,
&Logic::fnForeground,
&Logic::fnSort,
&Logic::fnNoSprite,
&Logic::fnMegaSet,
&Logic::fnAnim,
&Logic::fnSetFrame,
&Logic::fnFullAnim,
&Logic::fnFullSetFrame,
&Logic::fnFadeDown,
&Logic::fnFadeUp,
&Logic::fnCheckFade,
&Logic::fnSetSpritePalette,
&Logic::fnSetWholePalette,
&Logic::fnSetFadeTargetPalette,
&Logic::fnSetPaletteToFade,
&Logic::fnSetPaletteToCut,
&Logic::fnPlaySequence,
&Logic::fnIdle,
&Logic::fnPause,
&Logic::fnPauseSeconds,
&Logic::fnQuit,
&Logic::fnKillId,
&Logic::fnSuicide,
&Logic::fnNewScript,
&Logic::fnSubScript,
&Logic::fnRestartScript,
&Logic::fnSetBookmark,
&Logic::fnGotoBookmark,
&Logic::fnSendSync,
&Logic::fnWaitSync,
&Logic::cfnClickInteract,
&Logic::cfnSetScript,
&Logic::cfnPresetScript,
&Logic::fnInteract,
&Logic::fnIssueEvent,
&Logic::fnCheckForEvent,
&Logic::fnWipeHands,
&Logic::fnISpeak,
&Logic::fnTheyDo,
&Logic::fnTheyDoWeWait,
&Logic::fnWeWait,
&Logic::fnChangeSpeechText,
&Logic::fnTalkError,
&Logic::fnStartTalk,
&Logic::fnCheckForTextLine,
&Logic::fnAddTalkWaitStatusBit,
&Logic::fnRemoveTalkWaitStatusBit,
&Logic::fnNoHuman,
&Logic::fnAddHuman,
&Logic::fnBlankMouse,
&Logic::fnNormalMouse,
&Logic::fnLockMouse,
&Logic::fnUnlockMouse,
&Logic::fnSetMousePointer,
&Logic::fnSetMouseLuggage,
&Logic::fnMouseOn,
&Logic::fnMouseOff,
&Logic::fnChooser,
&Logic::fnEndChooser,
&Logic::fnStartMenu,
&Logic::fnEndMenu,
&Logic::cfnReleaseMenu,
&Logic::fnAddSubject,
&Logic::fnAddObject,
&Logic::fnRemoveObject,
&Logic::fnEnterSection,
&Logic::fnLeaveSection,
&Logic::fnChangeFloor,
&Logic::fnWalk,
&Logic::fnTurn,
&Logic::fnStand,
&Logic::fnStandAt,
&Logic::fnFace,
&Logic::fnFaceXy,
&Logic::fnIsFacing,
&Logic::fnGetTo,
&Logic::fnGetToError,
&Logic::fnGetPos,
&Logic::fnGetGamepadXy,
&Logic::fnPlayFx,
&Logic::fnStopFx,
&Logic::fnPlayMusic,
&Logic::fnStopMusic,
&Logic::fnInnerSpace,
&Logic::fnRandom,
&Logic::fnSetScreen,
&Logic::fnPreload,
&Logic::fnCheckCD,
&Logic::fnRestartGame,
&Logic::fnQuitGame,
&Logic::fnDeathScreen,
&Logic::fnSetParallax,
&Logic::fnTdebug,
&Logic::fnRedFlash,
&Logic::fnBlueFlash,
&Logic::fnYellow,
&Logic::fnGreen,
&Logic::fnPurple,
&Logic::fnBlack
};
_mcodeTable = mcodeTable;
}
const BSMcodeTable Logic::_mcodeTable[100] = {
&Logic::fnBackground,
&Logic::fnForeground,
&Logic::fnSort,
&Logic::fnNoSprite,
&Logic::fnMegaSet,
&Logic::fnAnim,
&Logic::fnSetFrame,
&Logic::fnFullAnim,
&Logic::fnFullSetFrame,
&Logic::fnFadeDown,
&Logic::fnFadeUp,
&Logic::fnCheckFade,
&Logic::fnSetSpritePalette,
&Logic::fnSetWholePalette,
&Logic::fnSetFadeTargetPalette,
&Logic::fnSetPaletteToFade,
&Logic::fnSetPaletteToCut,
&Logic::fnPlaySequence,
&Logic::fnIdle,
&Logic::fnPause,
&Logic::fnPauseSeconds,
&Logic::fnQuit,
&Logic::fnKillId,
&Logic::fnSuicide,
&Logic::fnNewScript,
&Logic::fnSubScript,
&Logic::fnRestartScript,
&Logic::fnSetBookmark,
&Logic::fnGotoBookmark,
&Logic::fnSendSync,
&Logic::fnWaitSync,
&Logic::cfnClickInteract,
&Logic::cfnSetScript,
&Logic::cfnPresetScript,
&Logic::fnInteract,
&Logic::fnIssueEvent,
&Logic::fnCheckForEvent,
&Logic::fnWipeHands,
&Logic::fnISpeak,
&Logic::fnTheyDo,
&Logic::fnTheyDoWeWait,
&Logic::fnWeWait,
&Logic::fnChangeSpeechText,
&Logic::fnTalkError,
&Logic::fnStartTalk,
&Logic::fnCheckForTextLine,
&Logic::fnAddTalkWaitStatusBit,
&Logic::fnRemoveTalkWaitStatusBit,
&Logic::fnNoHuman,
&Logic::fnAddHuman,
&Logic::fnBlankMouse,
&Logic::fnNormalMouse,
&Logic::fnLockMouse,
&Logic::fnUnlockMouse,
&Logic::fnSetMousePointer,
&Logic::fnSetMouseLuggage,
&Logic::fnMouseOn,
&Logic::fnMouseOff,
&Logic::fnChooser,
&Logic::fnEndChooser,
&Logic::fnStartMenu,
&Logic::fnEndMenu,
&Logic::cfnReleaseMenu,
&Logic::fnAddSubject,
&Logic::fnAddObject,
&Logic::fnRemoveObject,
&Logic::fnEnterSection,
&Logic::fnLeaveSection,
&Logic::fnChangeFloor,
&Logic::fnWalk,
&Logic::fnTurn,
&Logic::fnStand,
&Logic::fnStandAt,
&Logic::fnFace,
&Logic::fnFaceXy,
&Logic::fnIsFacing,
&Logic::fnGetTo,
&Logic::fnGetToError,
&Logic::fnGetPos,
&Logic::fnGetGamepadXy,
&Logic::fnPlayFx,
&Logic::fnStopFx,
&Logic::fnPlayMusic,
&Logic::fnStopMusic,
&Logic::fnInnerSpace,
&Logic::fnRandom,
&Logic::fnSetScreen,
&Logic::fnPreload,
&Logic::fnCheckCD,
&Logic::fnRestartGame,
&Logic::fnQuitGame,
&Logic::fnDeathScreen,
&Logic::fnSetParallax,
&Logic::fnTdebug,
&Logic::fnRedFlash,
&Logic::fnBlueFlash,
&Logic::fnYellow,
&Logic::fnGreen,
&Logic::fnPurple,
&Logic::fnBlack
};
int Logic::fnBackground(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {

5
sword1/logic.h
View file

@ -88,9 +88,8 @@ private:
int fullAnimDriver(Object *compact);
int animDriver(Object *compact);
void setupMcodeTable();
const BSMcodeTable *_mcodeTable;
static BSMcodeTable _mcodeTable[100];
uint16 inRange(uint16 a, uint16 b, uint16 c);
//- mcodeTable: