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

3
sword1/logic.h
View file

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