[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.170,1.171
Joost Peters
joostp at users.sourceforge.net
Sun Jan 11 16:35:00 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm midiparser_eup.cpp,1.12,1.13 midiparser_ro.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.24,1.25 dimuse.h,1.14,1.15 dimuse_tables.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv15857/queen
Modified Files:
logic.cpp
Log Message:
fixes compilation for our *cough* favourite *cough**cough* compiler: MSVC!
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- logic.cpp 11 Jan 2004 17:20:29 -0000 1.170
+++ logic.cpp 12 Jan 2004 00:34:27 -0000 1.171
@@ -2299,53 +2299,53 @@
/* 00 */
0,
0,
- &Logic::asmMakeJoeUseDress,
- &Logic::asmMakeJoeUseNormalClothes,
+ &LogicGame::asmMakeJoeUseDress,
+ &LogicGame::asmMakeJoeUseNormalClothes,
/* 04 */
- &Logic::asmMakeJoeUseUnderwear,
- &Logic::asmSwitchToDressPalette,
- &Logic::asmSwitchToNormalPalette,
- &Logic::asmStartCarAnimation, // room 74
+ &LogicGame::asmMakeJoeUseUnderwear,
+ &LogicGame::asmSwitchToDressPalette,
+ &LogicGame::asmSwitchToNormalPalette,
+ &LogicGame::asmStartCarAnimation, // room 74
/* 08 */
- &Logic::asmStopCarAnimation, // room 74
- &Logic::asmStartFightAnimation, // room 69
- &Logic::asmWaitForFrankPosition, // c69e.cut
- &Logic::asmMakeFrankGrowing, // c69z.cut
+ &LogicGame::asmStopCarAnimation, // room 74
+ &LogicGame::asmStartFightAnimation, // room 69
+ &LogicGame::asmWaitForFrankPosition, // c69e.cut
+ &LogicGame::asmMakeFrankGrowing, // c69z.cut
/* 12 */
- &Logic::asmMakeRobotGrowing, // c69z.cut
- &Logic::asmShrinkRobot,
- &Logic::asmEndGame,
- &Logic::asmPutCameraOnDino,
+ &LogicGame::asmMakeRobotGrowing, // c69z.cut
+ &LogicGame::asmShrinkRobot,
+ &LogicGame::asmEndGame,
+ &LogicGame::asmPutCameraOnDino,
/* 16 */
- &Logic::asmPutCameraOnJoe,
- &Logic::asmAltIntroPanRight, // cintr.cut
- &Logic::asmAltIntroPanLeft, // cintr.cut
- &Logic::asmSetAzuraInLove,
+ &LogicGame::asmPutCameraOnJoe,
+ &LogicGame::asmAltIntroPanRight, // cintr.cut
+ &LogicGame::asmAltIntroPanLeft, // cintr.cut
+ &LogicGame::asmSetAzuraInLove,
/* 20 */
- &Logic::asmPanRightFromJoe,
- &Logic::asmSetLightsOff,
- &Logic::asmSetLightsOn,
- &Logic::asmSetManequinAreaOn,
+ &LogicGame::asmPanRightFromJoe,
+ &LogicGame::asmSetLightsOff,
+ &LogicGame::asmSetLightsOn,
+ &LogicGame::asmSetManequinAreaOn,
/* 24 */
- &Logic::asmPanToJoe,
- &Logic::asmTurnGuardOn,
- &Logic::asmPanLeft320To144,
- &Logic::asmSmooch,
+ &LogicGame::asmPanToJoe,
+ &LogicGame::asmTurnGuardOn,
+ &LogicGame::asmPanLeft320To144,
+ &LogicGame::asmSmooch,
/* 28 */
- &Logic::asmMakeLightningHitPlane,
- &Logic::asmScaleBlimp,
- &Logic::asmScaleEnding,
- &Logic::asmWaitForCarPosition,
+ &LogicGame::asmMakeLightningHitPlane,
+ &LogicGame::asmScaleBlimp,
+ &LogicGame::asmScaleEnding,
+ &LogicGame::asmWaitForCarPosition,
/* 32 */
- &Logic::asmShakeScreen,
- &Logic::asmAttemptPuzzle,
- &Logic::asmScaleTitle,
+ &LogicGame::asmShakeScreen,
+ &LogicGame::asmAttemptPuzzle,
+ &LogicGame::asmScaleTitle,
0,
/* 36 */
- &Logic::asmPanRightToHugh,
- &Logic::asmMakeWhiteFlash,
- &Logic::asmPanRightToJoeAndRita,
- &Logic::asmPanLeftToBomb // cdint.cut
+ &LogicGame::asmPanRightToHugh,
+ &LogicGame::asmMakeWhiteFlash,
+ &LogicGame::asmPanRightToJoeAndRita,
+ &LogicGame::asmPanLeftToBomb // cdint.cut
};
if (sm >= ARRAYSIZE(asmTable) || asmTable[sm] == 0)
return false;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm midiparser_eup.cpp,1.12,1.13 midiparser_ro.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.24,1.25 dimuse.h,1.14,1.15 dimuse_tables.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list