[Scummvm-cvs-logs] scummvm master -> 5a8fc96ed6e1007555a56cace02b17119b462dae

[dreammaster]

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:
5a8fc96ed6 MADS: Implement more conversation script opcodes


Commit: 5a8fc96ed6e1007555a56cace02b17119b462dae
    https://github.com/scummvm/scummvm/commit/5a8fc96ed6e1007555a56cace02b17119b462dae
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-15T20:04:18-05:00

Commit Message:
MADS: Implement more conversation script opcodes

Changed paths:
    engines/mads/conversations.cpp
    engines/mads/conversations.h



diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index f065ac2..d90f0af 100644
--- a/engines/mads/conversations.cpp
+++ b/engines/mads/conversations.cpp
@@ -442,18 +442,50 @@ int GameConversations::executeEntry(int index) {
 	_nextStartNode->_val = var0._val;
 
 	bool flag = true;
-	for (uint scriptIdx = 0; scriptIdx < dlg._script.size(); ++scriptIdx) {
-		DialogCommand cmd = dlg._script[scriptIdx]._command;
-		
-		switch (cmd) {
+	for (uint scriptIdx = 0; scriptIdx < dlg._script.size(); ) {
+		ScriptEntry &scrEntry = dlg._script[scriptIdx];
+		if (scrEntry._command == CMD_END)
+			break;
+
+		switch (scrEntry._command) {
 		case CMD_1:
 		case CMD_HIDE:
 		case CMD_UNHIDE:
+			for (uint idx = 0; scrEntry._params.size(); ++idx)
+				flagEntry(scrEntry._command, scrEntry._params[idx]);
+			break;
+
+		case CMD_MESSAGE:
+		case CMD_5:
+			break;
+
+		case CMD_ERROR:
+			error("Conversation script generated error");
+			break;
+
+		case CMD_GOTO: {
+			bool gotoFlag = scrEntry._conditionals[0].evaluate();
+			if (gotoFlag) {
+				scriptIdx = scrEntry._params[0];
+				continue;
+			}
+			break;
+		}
+
+		case CMD_ASSIGN: {
+			bool setFlag = scrEntry._conditionals[0].evaluate();
+			if (setFlag) {
+				int *ptr = _runningConv->_cnd._vars[scrEntry._params[0]].getValue();
+				*ptr = scrEntry._conditionals[1].evaluate();
+			}
 			break;
+		}
 
 		default:
 			error("Unknown script opcode");
 		}
+
+		++scriptIdx;
 	}
 
 	if (flag) {
@@ -722,7 +754,7 @@ void ScriptEntry::load(Common::SeekableReadStream &s) {
 	// Get the command byte
 	_command = (DialogCommand)s.readByte();
 
-	if (!(_command == CMD_DIALOG_END || (_command >= CMD_NODE_END && _command <= CMD_ASSIGN))) {
+	if (!(_command == CMD_DIALOG_END || (_command >= CMD_END && _command <= CMD_ASSIGN))) {
 		warning("unknown opcode - %d", _command);
 		s.seek(0, SEEK_END);
 		return;
@@ -793,7 +825,7 @@ Common::Array<ConversationVar> *ScriptEntry::Conditional::_vars = nullptr;
 void ScriptEntry::Conditional::load(Common::SeekableReadStream &s) {
 	_operation = (ConditionalOperation)s.readUint16LE();
 
-	if (_operation == CNVOP_ABORT) {
+	if (_operation == CONDOP_ABORT) {
 		_param1._isVariable = false;
 		_param1._val = 0;
 		_param2._isVariable = false;
@@ -807,40 +839,40 @@ void ScriptEntry::Conditional::load(Common::SeekableReadStream &s) {
 }
 
 int ScriptEntry::Conditional::evaluate() const {
-	if (_operation == CNVOP_NONE)
+	if (_operation == CONDOP_NONE)
 		return -1;
 
 	int param1 = get(0);
-	if (_operation == CNVOP_VALUE)
+	if (_operation == CONDOP_VALUE)
 		return param1;
 	int param2 = get(1);
 
 	switch (_operation) {
-	case CNVOP_ADD:
+	case CONDOP_ADD:
 		return param1 + param2;
-	case CNVOP_SUBTRACT:
+	case CONDOP_SUBTRACT:
 		return param1 - param2;
-	case CNVOP_MULTIPLY:
+	case CONDOP_MULTIPLY:
 		return param1 * param2;
-	case CNVOP_DIVIDE:
+	case CONDOP_DIVIDE:
 		return param1 / param2;
-	case CNVOP_MODULUS:
+	case CONDOP_MODULUS:
 		return param1 % param2;
-	case CNVOP_LTEQ:
+	case CONDOP_LTEQ:
 		return (param1 <= param2) ? 1 : 0;
-	case CNVOP_GTEQ:
+	case CONDOP_GTEQ:
 		return (param1 < param2) ? 1 : 0;
-	case CNVOP_LT:
+	case CONDOP_LT:
 		return (param1 < param2) ? 1 : 0;
-	case CNVOP_GT:
+	case CONDOP_GT:
 		return (param1 > param2) ? 1 : 0;
-	case CNVOP_NEQ:
+	case CONDOP_NEQ:
 		return (param1 != param2) ? 1 : 0;
-	case CNVOP_EQ:
+	case CONDOP_EQ:
 		return (param1 == param2) ? 1 : 0;
-	case CNVOP_AND:
+	case CONDOP_AND:
 		return (param1 || param2) ? 1 : 0;
-	case CNVOP_OR:
+	case CONDOP_OR:
 		return (param1 && param2) ? 1 : 0;
 	default:
 		error("Unknown conditional operation");
diff --git a/engines/mads/conversations.h b/engines/mads/conversations.h
index 688fac7..b047847 100644
--- a/engines/mads/conversations.h
+++ b/engines/mads/conversations.h
@@ -49,7 +49,7 @@ enum ConversationMode {
 };
 
 enum DialogCommand {
-	CMD_NODE_END = 0,
+	CMD_END = 0,
 	CMD_1 = 1,
 	CMD_HIDE = 2,
 	CMD_UNHIDE = 3,
@@ -69,22 +69,22 @@ enum ConvEntryFlag {
 };
 
 enum ConditionalOperation {
-	CNVOP_NONE = 0xff,
-	CNVOP_VALUE = 0,
-	CNVOP_ADD = 1,
-	CNVOP_SUBTRACT = 2,
-	CNVOP_MULTIPLY = 3,
-	CNVOP_DIVIDE = 4,
-	CNVOP_MODULUS = 5,
-	CNVOP_LTEQ = 6,
-	CNVOP_GTEQ = 7,
-	CNVOP_LT = 8,
-	CNVOP_GT = 9,
-	CNVOP_NEQ = 10,
-	CNVOP_EQ = 11,
-	CNVOP_AND = 12,
-	CNVOP_OR = 13,
-	CNVOP_ABORT = 0xff
+	CONDOP_NONE = 0xff,
+	CONDOP_VALUE = 0,
+	CONDOP_ADD = 1,
+	CONDOP_SUBTRACT = 2,
+	CONDOP_MULTIPLY = 3,
+	CONDOP_DIVIDE = 4,
+	CONDOP_MODULUS = 5,
+	CONDOP_LTEQ = 6,
+	CONDOP_GTEQ = 7,
+	CONDOP_LT = 8,
+	CONDOP_GT = 9,
+	CONDOP_NEQ = 10,
+	CONDOP_EQ = 11,
+	CONDOP_AND = 12,
+	CONDOP_OR = 13,
+	CONDOP_ABORT = 0xff
 };
 
 
@@ -144,7 +144,7 @@ struct ScriptEntry {
 		/**
 		 * Constructor
 		 */
-		Conditional() : _operation(CNVOP_NONE) {}
+		Conditional() : _operation(CONDOP_NONE) {}
 
 		/**
 		 * Loads data from a passed stream into the parameters structure
@@ -169,7 +169,7 @@ struct ScriptEntry {
 	/**
 	 * Constructor
 	 */
-	ScriptEntry() : _command(CMD_NODE_END) {}
+	ScriptEntry() : _command(CMD_END) {}
 
 	/**
 	 * Loads data from a passed stream into the parameters structure