[Scummvm-git-logs] scummvm master -> 9681cddedb4254d124e332c2885a1c49700863db

[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:
9681cddedb WINTERMUTE: WME3D: Remove duplicate code, matching original


Commit: 9681cddedb4254d124e332c2885a1c49700863db
    https://github.com/scummvm/scummvm/commit/9681cddedb4254d124e332c2885a1c49700863db
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:24:11+02:00

Commit Message:
WINTERMUTE: WME3D: Remove duplicate code, matching original

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


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 58947af8625..84cddad504c 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -2116,31 +2116,6 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 
 		return STATUS_OK;
 	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// EnableFog
-	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(name, "EnableFog") == 0) {
-		stack->correctParams(3);
-		_fogParameters._enabled = true;
-		_fogParameters._color = stack->pop()->getInt();
-		_fogParameters._start = stack->pop()->getFloat();
-		_fogParameters._end = stack->pop()->getFloat();
-
-		stack->pushNULL();
-		return STATUS_OK;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// DisableFog
-	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(name, "DisableFog") == 0) {
-		stack->correctParams(0);
-		_fogParameters._enabled = false;
-
-		stack->pushNULL();
-		return STATUS_OK;
-	}
 #endif
 
 	//////////////////////////////////////////////////////////////////////////
@@ -2275,6 +2250,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "EnableFog") == 0) {
 		stack->correctParams(3);
+		_fogParameters._enabled = true;
+		_fogParameters._color = stack->pop()->getInt();
+		_fogParameters._start = stack->pop()->getFloat();
+		_fogParameters._end = stack->pop()->getFloat();
+
 		stack->pushNULL();
 		return STATUS_OK;
 	}
@@ -2284,6 +2264,8 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "DisableFog") == 0) {
 		stack->correctParams(0);
+		_fogParameters._enabled = false;
+
 		stack->pushNULL();
 		return STATUS_OK;
 	}