[Scummvm-git-logs] scummvm master -> 4ba6db34290fa2f137b0cb8955c0aaadf04ee20d

[digitall]

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:
4ba6db3429 WATCHMAKER: Fix Another Likely Incorrect Code Causing GCC Compiler Warning


Commit: 4ba6db34290fa2f137b0cb8955c0aaadf04ee20d
    https://github.com/scummvm/scummvm/commit/4ba6db34290fa2f137b0cb8955c0aaadf04ee20d
Author: D G Turner (digitall at scummvm.org)
Date: 2023-05-02T21:43:18+01:00

Commit Message:
WATCHMAKER: Fix Another Likely Incorrect Code Causing GCC Compiler Warning

The previous commit errorneously included all my pending minor GCC warning
fixes, but these are not problematic as they don't really change behaviour.

However, as the previous commit message was referring to, this commit and
the previous change in ll_mesh.cpp do change the previous behaviour and
should be reviewed for correctness.

Changed paths:
    engines/watchmaker/ll/ll_mesh.cpp


diff --git a/engines/watchmaker/ll/ll_mesh.cpp b/engines/watchmaker/ll/ll_mesh.cpp
index 464a887a8d7..5009d4f2d29 100644
--- a/engines/watchmaker/ll/ll_mesh.cpp
+++ b/engines/watchmaker/ll/ll_mesh.cpp
@@ -194,7 +194,8 @@ void t3dLightRoom(Init &init, t3dBODY *b, t3dV3F *p, t3dF32 NearRange, t3dF32 Fa
 			cg = 0;
 			cb = 0;
 		}
-		gv = m->VBptr = m->VBptr = m->VertexBuffer;
+		gv = m->VBptr;
+		m->VBptr = m->VertexBuffer;
 		for (i = 0; i < m->NumVerts; i++, gv++) {
 			rr = cr + *sbl++;
 			gg = cg + *sbl++;