[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.57,1.58 logic.h,1.18,1.19

Chris Apers chrilith at users.sourceforge.net
Sun Nov 6 04:58:31 CET 2005


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17967

Modified Files:
	logic.cpp logic.h 
Log Message:
Revert last change, doesn't seem to work either

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- logic.cpp	5 Nov 2005 19:42:50 -0000	1.57
+++ logic.cpp	6 Nov 2005 12:58:19 -0000	1.58
@@ -62,8 +62,6 @@
 	_eventMan = NULL;
 	_system = system;
 	_mixer = mixer;
-	
-	setupMcodeTable();
 }
 
 Logic::~Logic(void) {
@@ -683,112 +681,108 @@
 	}
 }
 
-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) {
 

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- logic.h	5 Nov 2005 19:42:50 -0000	1.18
+++ logic.h	6 Nov 2005 12:58:19 -0000	1.19
@@ -88,9 +88,8 @@
 	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:





More information about the Scummvm-git-logs mailing list