[Scummvm-cvs-logs] scummvm master -> 35f53bb522ded62d0de3198da9eace5299869b73

bluegr bluegr at gmail.com
Wed Dec 23 22:08:20 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
35f53bb522 LAB: Error out on unused opcodes


Commit: 35f53bb522ded62d0de3198da9eace5299869b73
    https://github.com/scummvm/scummvm/commit/35f53bb522ded62d0de3198da9eace5299869b73
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-23T23:07:40+02:00

Commit Message:
LAB: Error out on unused opcodes

This also fixes a warning

Changed paths:
    engines/lab/processroom.cpp
    engines/lab/processroom.h



diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 7f0c472..312f153 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -267,6 +267,12 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
 				_graphics->loadPict(actionList->_messages[0]);
 
 			break;
+		
+		case kActionLoadBitmap:
+			error("Unused opcode kActionLoadBitmap has been called");
+
+		case kActionShowBitmap:
+			error("Unused opcode kActionShowBitmap has been called");
 
 		case kActionTransition:
 			_graphics->doTransition((TransitionType)actionList->_param1, closePtrList, actionList->_messages[0].c_str());
@@ -426,9 +432,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) {
 			break;
 
 		case kActionLostGame:
-			// This seems to be unused?
-			error("Unused opcode LOSTGAME has been called");
-			break;
+			error("Unused opcode kActionLostGame has been called");
 
 		case kActionResetBuffer:
 			_graphics->freePict();
diff --git a/engines/lab/processroom.h b/engines/lab/processroom.h
index 66111b3..31a8f28 100644
--- a/engines/lab/processroom.h
+++ b/engines/lab/processroom.h
@@ -39,8 +39,8 @@ enum ActionType {
 	kActionShowDiff = 3,
 	kActionShowDiffLooping = 4,
 	kActionLoadDiff = 5,
-	kActionLoadBitmap = 6,	// unused?
-	kActionShowBitmap = 7,	// unused?
+	kActionLoadBitmap = 6,	// unused
+	kActionShowBitmap = 7,	// unused
 	kActionTransition = 8,
 	kActionNoUpdate = 9,
 	kActionForceUpdate = 10,
@@ -65,7 +65,7 @@ enum ActionType {
 	kActionClearSound = 29,
 	kActionWinMusic = 30,
 	kActionWinGame = 31,
-	kActionLostGame = 32,
+	kActionLostGame = 32,	// unused
 	kActionResetBuffer = 33,
 	kActionSpecialCmd = 34,
 	kActionCShowMessage = 35,






More information about the Scummvm-git-logs mailing list