[Scummvm-git-logs] scummvm master -> 61de98d39235f301ba24ea762bd6f137415bb831

[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:
61de98d392 WINTERMUTE: WME3D: Janitorial, restore original code


Commit: 61de98d39235f301ba24ea762bd6f137415bb831
    https://github.com/scummvm/scummvm/commit/61de98d39235f301ba24ea762bd6f137415bb831
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-02T22:51:59+02:00

Commit Message:
WINTERMUTE: WME3D: Janitorial, restore original code

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


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index f0e33adee1d..680096445ca 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -722,7 +722,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 
 	int ar, ag, ab, aa;
 	char camera[MAX_PATH_LENGTH] = "";
-	/* float waypointHeight = -1.0f; */
+	float waypointHeight = -1.0f;
 
 	while ((cmd = parser.getCommand(&buffer, commands, &params)) > 0) {
 		switch (cmd) {
@@ -964,7 +964,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 			break;
 
 		case TOKEN_WAYPOINT_HEIGHT:
-			parser.scanStr(params, "%f", &_waypointHeight);
+			parser.scanStr(params, "%f", &waypointHeight);
 			break;
 
 		case TOKEN_NEAR_CLIPPING_PLANE:
@@ -1018,8 +1018,8 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
 
 #ifdef ENABLE_WME3D
 	if (_sceneGeometry) {
-		if (_waypointHeight >= 0.0f) {
-			_sceneGeometry->_waypointHeight = _waypointHeight;
+		if (waypointHeight >= 0.0f) {
+			_sceneGeometry->_waypointHeight = waypointHeight;
 			_sceneGeometry->dropWaypoints();
 		}
 
@@ -2744,7 +2744,7 @@ bool AdScene::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 		if (_ambientLightColor != 0x00000000)
 			buffer->putTextIndent(indent + 2, "AMBIENT_LIGHT_COLOR { %d,%d,%d }\n", RGBCOLGetR(_ambientLightColor), RGBCOLGetG(_ambientLightColor), RGBCOLGetB(_ambientLightColor));
 
-		buffer->putTextIndent(indent + 2, "WAYPOINT_HEIGHT=%f\n", _waypointHeight);
+		buffer->putTextIndent(indent + 2, "WAYPOINT_HEIGHT=%f\n", _sceneGeometry->_waypointHeight);
 
 		buffer->putTextIndent(indent + 2, "\n");
 	}
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 894cbfea5d0..5e3366ec7bd 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -61,7 +61,6 @@ public:
 	void setMaxShadowType(TShadowType shadowType);
 
 	bool _2DPathfinding;
-	float _waypointHeight;
 
 	float _fov;
 	float _nearPlane;