[Scummvm-git-logs] scummvm master -> 2225c1eb0c5f0ffad93ea7ca5614d2f98988d603

[aquadran]

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:
2225c1eb0c WINTERMUTE: WME3D: More aligned opcode stubs with original code


Commit: 2225c1eb0c5f0ffad93ea7ca5614d2f98988d603
    https://github.com/scummvm/scummvm/commit/2225c1eb0c5f0ffad93ea7ca5614d2f98988d603
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:29:04+02:00

Commit Message:
WINTERMUTE: WME3D: More aligned opcode stubs with original code

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 6ac1864cfa8..d3251ce8977 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -1829,12 +1829,15 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetEffect") == 0) {
 		stack->correctParams(2);
-//		const char *materialName = stack->pop()->getString();
-//		const char *effectFilename = stack->pop()->getString();
+		/*const char *materialName =*/ stack->pop()->getString();
+		/*const char *effectFilename =*/ stack->pop()->getString();
 
 		warning("AdActor3DX::scCallMethod D3DX effects are not supported");
-
-		stack->pushBool(false);
+		if (_modelX) {
+			stack->pushBool(true);
+		} else {
+			stack->pushBool(false);
+		}
 		return true;
 	}
 
@@ -1843,13 +1846,15 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "RemoveEffect") == 0) {
 		stack->correctParams(1);
-//		const char *materialName = stack->pop()->getString();
+		/*const char *materialName =*/ stack->pop()->getString();
 		stack->pop();
 
 		warning("AdActor3DX::scCallMethod D3DX effects are not supported");
-
-		stack->pushBool(false);
-
+		if (_modelX) {
+			stack->pushBool(true);
+		} else {
+			stack->pushBool(false);
+		}
 		return true;
 	}
 
@@ -1858,16 +1863,16 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetEffectParam") == 0) {
 		stack->correctParams(3);
-//		const char *materialName = stack->pop()->getString();
-//		const char *paramName = stack->pop()->getString();
-//		ScValue *val = stack->pop();
-		stack->pop();
-		stack->pop();
-		stack->pop();
+		/*const char *materialName =*/ stack->pop()->getString();
+		/*const char *paramName =*/ stack->pop()->getString();
+		/*ScValue *val =*/ stack->pop();
 
 		warning("AdActor3DX::scCallMethod D3DX effects are not supported");
-
-		stack->pushBool(false);
+		if (_modelX) {
+			stack->pushBool(true);
+		} else {
+			stack->pushBool(false);
+		}
 		return true;
 	}
 
@@ -1876,22 +1881,19 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetEffectParamVector") == 0) {
 		stack->correctParams(6);
-//		const char *materialName = stack->pop()->getString();
-//		const char *paramName = stack->pop()->getString();
-//		float x = stack->pop()->getFloat();
-//		float y = stack->pop()->getFloat();
-//		float z = stack->pop()->getFloat();
-//		float w = stack->pop()->getFloat();
-		stack->pop();
-		stack->pop();
-		stack->pop();
-		stack->pop();
-		stack->pop();
-		stack->pop();
+		/*const char *materialName =*/ stack->pop()->getString();
+		/*const char *paramName =*/ stack->pop()->getString();
+		/*float x =*/ stack->pop()->getFloat();
+		/*float y =*/ stack->pop()->getFloat();
+		/*float z =*/ stack->pop()->getFloat();
+		/*float w =*/ stack->pop()->getFloat();
 
 		warning("AdActor3DX::scCallMethod D3DX effects are not supported");
-
-		stack->pushBool(false);
+		if (_modelX) {
+			stack->pushBool(true);
+		} else {
+			stack->pushBool(false);
+		}
 		return true;
 	}
 
@@ -1900,12 +1902,9 @@ bool AdActor3DX::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetEffectParamColor") == 0) {
 		stack->correctParams(3);
-//		const char *materialName = stack->pop()->getString();
-//		const char *paramName = stack->pop()->getString();
-//		uint32 color = stack->pop()->getInt();
-		stack->pop();
-		stack->pop();
-		stack->pop();
+		/*const char *materialName =*/ stack->pop()->getString();
+		/*const char *paramName =*/ stack->pop()->getString();
+		/*uint32 color =*/ stack->pop()->getInt();
 
 		warning("AdActor3DX::scCallMethod D3DX effects are not supported");
 		if (_modelX) {