[Scummvm-cvs-logs] SF.net SVN: scummvm: [20613] scummvm/trunk/engines/scumm

[sev at users.sourceforge.net]

Revision: 20613
Author:   sev
Date:     2006-02-12 05:45:57 -0800 (Sun, 12 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20613&view=rev

Log Message:
-----------
Committed old work on Soccer U32. Too far from being finished.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/logic_he.cpp
    scummvm/trunk/engines/scumm/logic_he.h
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h
Modified: scummvm/trunk/engines/scumm/logic_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/logic_he.cpp	2006-02-12 13:40:20 UTC (rev 20612)
+++ scummvm/trunk/engines/scumm/logic_he.cpp	2006-02-12 13:45:57 UTC (rev 20613)
@@ -623,7 +623,7 @@
 
 	default:
 		LogicHE::dispatch(op, numArgs, args);
-		error("Tell me how to reproduce it");
+		error("Tell sev how to reproduce it");
 	}
 
 	return res;
@@ -769,4 +769,68 @@
 }
 
 
+/***********************
+ * Backyard Soccer
+ *
+ */
+
+int LogicHEsoccer::versionID() {
+	return 1;
+}
+
+int32 LogicHEsoccer::dispatch(int op, int numArgs, int32 *args) {
+	int res = 0;
+
+	switch (op) {
+	case 1001:
+		res = op_1001(args);
+		break;
+
+	case 1002:
+		res = op_1002(args);
+		break;
+
+	case 1004:
+		res = op_1004(args);
+		break;
+
+	case 8221968:
+		// Someone had a fun and used his birthday as opcode number
+		res = getFromArray(args[0], args[1], args[2]);
+		break;
+
+	default:
+		// original range is 1001 - 1021
+		LogicHE::dispatch(op, numArgs, args);
+		warning("Tell sev how to reproduce it");
+	}
+
+	return res;
+}
+
+int LogicHEsoccer::op_1001(int32 *args) {
+	return args[0] * sin(args[1]);
+}
+
+int LogicHEsoccer::op_1002(int32 *args) {
+	return _vm->VAR(2) * args[0];
+}
+
+int LogicHEsoccer::op_1004(int32 *args) {
+	double res, a2, a4, a5;
+
+	a5 = ((double)args[4] - (double)args[1]) / ((double)args[5] - (double)args[2]);
+	a4 = ((double)args[3] - (double)args[0]) / ((double)args[5] - (double)args[2]);
+	a2 = (double)args[2] - (double)args[0] * a4 - args[1] * a5;
+
+	res = (double)args[6] * a4 + (double)args[7] * a5 + a2;
+	writeScummVar(108, (int32)res);
+
+	writeScummVar(109, (int32)a2);
+	writeScummVar(110, (int32)a5);
+	writeScummVar(111, (int32)a4);
+
+	return 1;
+}
+
 } // End of namespace Scumm

Modified: scummvm/trunk/engines/scumm/logic_he.h
===================================================================
--- scummvm/trunk/engines/scumm/logic_he.h	2006-02-12 13:40:20 UTC (rev 20612)
+++ scummvm/trunk/engines/scumm/logic_he.h	2006-02-12 13:45:57 UTC (rev 20613)
@@ -106,6 +106,19 @@
 	int op_1024(int32 *args);
 };
 
+class LogicHEsoccer : public LogicHE {
+public:
+	LogicHEsoccer(ScummEngine_v90he *vm) : LogicHE(vm) {}
+
+	int versionID();
+	int32 dispatch(int op, int numArgs, int32 *args);
+
+private:
+	int op_1001(int32 *args);
+	int op_1002(int32 *args);
+	int op_1004(int32 *args);
+};
+
 } // End of namespace Scumm
 
 #endif

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-12 13:40:20 UTC (rev 20612)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-12 13:45:57 UTC (rev 20613)
@@ -298,7 +298,7 @@
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 	{"BluesABCTimeDemo", "Blue's ABC Time (Demo)", GID_HEGAME, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
-	{"soccer", "Backyard Soccer", GID_HEGAME, 6, 98, MDT_NONE,
+	{"soccer", "Backyard Soccer", GID_SOCCER, 6, 98, MDT_NONE,
 	 GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
 
 	// Global scripts increased to 2048
@@ -2144,6 +2144,10 @@
 			_logicHE = new LogicHEfootball(this);
 			break;
 
+		case GID_SOCCER:
+			_logicHE = new LogicHEsoccer(this);
+			break;
+
 		default:
 			_logicHE = new LogicHE(this);
 			break;

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2006-02-12 13:40:20 UTC (rev 20612)
+++ scummvm/trunk/engines/scumm/scumm.h	2006-02-12 13:45:57 UTC (rev 20613)
@@ -213,7 +213,8 @@
 	GID_WATER,
 	GID_PUTTRACE,
 	GID_FUNSHOP,	// Used for all three funshops
-	GID_FOOTBALL
+	GID_FOOTBALL,
+	GID_SOCCER
 };
 
 struct SentenceTab {