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

LAB: Error out on unused opcodes

Browse source 
This also fixes a warning
This commit is contained in:
Filippos Karapetis 2015-12-23 23:07:40 +02:00
parent 9d7a2f4e7f
commit 35f53bb522
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/lab/processroom.cpp
View file

@ -268,6 +268,12 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
break; break;
case kActionLoadBitmap:
error("Unused opcode kActionLoadBitmap has been called");
case kActionShowBitmap:
error("Unused opcode kActionShowBitmap has been called");
case kActionTransition: case kActionTransition:
_graphics->doTransition((TransitionType)actionList->_param1, closePtrList, actionList->_messages[0].c_str()); _graphics->doTransition((TransitionType)actionList->_param1, closePtrList, actionList->_messages[0].c_str());
break; break;
@ -426,9 +432,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
break; break;
case kActionLostGame: case kActionLostGame:
// This seems to be unused? error("Unused opcode kActionLostGame has been called");
error("Unused opcode LOSTGAME has been called");
break;
case kActionResetBuffer: case kActionResetBuffer:
_graphics->freePict(); _graphics->freePict();

6
engines/lab/processroom.h
View file

@ -39,8 +39,8 @@ enum ActionType {
kActionShowDiff = 3, kActionShowDiff = 3,
kActionShowDiffLooping = 4, kActionShowDiffLooping = 4,
kActionLoadDiff = 5, kActionLoadDiff = 5,
kActionLoadBitmap = 6, // unused? kActionLoadBitmap = 6, // unused
kActionShowBitmap = 7, // unused? kActionShowBitmap = 7, // unused
kActionTransition = 8, kActionTransition = 8,
kActionNoUpdate = 9, kActionNoUpdate = 9,
kActionForceUpdate = 10, kActionForceUpdate = 10,
@ -65,7 +65,7 @@ enum ActionType {
kActionClearSound = 29, kActionClearSound = 29,
kActionWinMusic = 30, kActionWinMusic = 30,
kActionWinGame = 31, kActionWinGame = 31,
kActionLostGame = 32, kActionLostGame = 32, // unused
kActionResetBuffer = 33, kActionResetBuffer = 33,
kActionSpecialCmd = 34, kActionSpecialCmd = 34,
kActionCShowMessage = 35, kActionCShowMessage = 35,