[Scummvm-git-logs] scummvm master -> 06e65a2a5666ae454a753f2a2d397e4574d8b6d4

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
06e65a2a56 NANCY: BOX2D: Fix remaining unused variable and global constructor warnings


Commit: 06e65a2a5666ae454a753f2a2d397e4574d8b6d4
    https://github.com/scummvm/scummvm/commit/06e65a2a5666ae454a753f2a2d397e4574d8b6d4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-10-24T22:49:29+03:00

Commit Message:
NANCY: BOX2D: Fix remaining unused variable and global constructor warnings

Changed paths:
    engines/nancy/box2d/Collision/b2CollidePoly.cpp
    engines/nancy/box2d/Common/b2Math.cpp
    engines/nancy/box2d/Dynamics/b2World.cpp
    engines/nancy/box2d/Dynamics/b2World.h
    engines/nancy/box2d/Dynamics/b2WorldCallbacks.cpp
    engines/nancy/box2d/Dynamics/b2WorldCallbacks.h


diff --git a/engines/nancy/box2d/Collision/b2CollidePoly.cpp b/engines/nancy/box2d/Collision/b2CollidePoly.cpp
index 708ce219c99..de5d973c1f7 100644
--- a/engines/nancy/box2d/Collision/b2CollidePoly.cpp
+++ b/engines/nancy/box2d/Collision/b2CollidePoly.cpp
@@ -320,7 +320,6 @@ void b2CollidePolygons(b2Manifold* manifold,
 	b2Vec2 v11 = vertices1[edge1];
 	b2Vec2 v12 = edge1 + 1 < count1 ? vertices1[edge1+1] : vertices1[0];
 
-	b2Vec2 dv = v12 - v11;
 	b2Vec2 sideNormal = b2Mul(xf1.R, v12 - v11);
 	sideNormal.Normalize();
 	b2Vec2 frontNormal = b2Cross(sideNormal, 1.0f);
diff --git a/engines/nancy/box2d/Common/b2Math.cpp b/engines/nancy/box2d/Common/b2Math.cpp
index 2ec23197dc2..57f3b7e994a 100644
--- a/engines/nancy/box2d/Common/b2Math.cpp
+++ b/engines/nancy/box2d/Common/b2Math.cpp
@@ -41,7 +41,7 @@
 
 const b2Vec2 b2Vec2_zero(0.0f, 0.0f);
 const b2Mat22 b2Mat22_identity(1.0f, 0.0f, 0.0f, 1.0f);
-const b2XForm b2XForm_identity(b2Vec2_zero, b2Mat22_identity);
+const b2XForm b2XForm_identity(b2Vec2(0.0f, 0.0f), b2Mat22(1.0f, 0.0f, 0.0f, 1.0f));
 
 void b2Sweep::GetXForm(b2XForm* xf, float32 t) const
 {
diff --git a/engines/nancy/box2d/Dynamics/b2World.cpp b/engines/nancy/box2d/Dynamics/b2World.cpp
index 4faf5c058ad..ee5851c3476 100644
--- a/engines/nancy/box2d/Dynamics/b2World.cpp
+++ b/engines/nancy/box2d/Dynamics/b2World.cpp
@@ -55,7 +55,7 @@ b2World::b2World(const b2AABB& worldAABB, const b2Vec2& gravity, bool doSleep)
 {
 	m_destructionListener = NULL;
 	m_boundaryListener = NULL;
-	m_contactFilter = &b2_defaultFilter;
+	m_contactFilter = &m_defaultFilter;
 	m_contactListener = NULL;
 	m_debugDraw = NULL;
 
diff --git a/engines/nancy/box2d/Dynamics/b2World.h b/engines/nancy/box2d/Dynamics/b2World.h
index b87462d4667..d19cdae08be 100644
--- a/engines/nancy/box2d/Dynamics/b2World.h
+++ b/engines/nancy/box2d/Dynamics/b2World.h
@@ -88,7 +88,7 @@ public:
 	void SetBoundaryListener(b2BoundaryListener* listener);
 
 	/// Register a contact filter to provide specific control over collision.
-	/// Otherwise the default filter is used (b2_defaultFilter).
+	/// Otherwise the default filter is used.
 	void SetContactFilter(b2ContactFilter* filter);
 
 	/// Register a contact event listener
@@ -218,6 +218,7 @@ private:
 
 	b2DestructionListener* m_destructionListener;
 	b2BoundaryListener* m_boundaryListener;
+	b2ContactFilter m_defaultFilter;
 	b2ContactFilter* m_contactFilter;
 	b2ContactListener* m_contactListener;
 	b2DebugDraw* m_debugDraw;
diff --git a/engines/nancy/box2d/Dynamics/b2WorldCallbacks.cpp b/engines/nancy/box2d/Dynamics/b2WorldCallbacks.cpp
index 83e90c26611..26bbdd8f02d 100644
--- a/engines/nancy/box2d/Dynamics/b2WorldCallbacks.cpp
+++ b/engines/nancy/box2d/Dynamics/b2WorldCallbacks.cpp
@@ -40,8 +40,6 @@
 #include "b2WorldCallbacks.h"
 #include "../Collision/Shapes/b2Shape.h"
 
-b2ContactFilter b2_defaultFilter;
-
 // Return true if contact calculations should be performed between these two shapes.
 // If you implement your own collision filter you may want to build from this implementation.
 bool b2ContactFilter::ShouldCollide(b2Shape* shape1, b2Shape* shape2)
diff --git a/engines/nancy/box2d/Dynamics/b2WorldCallbacks.h b/engines/nancy/box2d/Dynamics/b2WorldCallbacks.h
index f9812014d3d..3263c58706c 100644
--- a/engines/nancy/box2d/Dynamics/b2WorldCallbacks.h
+++ b/engines/nancy/box2d/Dynamics/b2WorldCallbacks.h
@@ -93,9 +93,6 @@ public:
 	virtual bool ShouldCollide(b2Shape* shape1, b2Shape* shape2);
 };
 
-/// The default contact filter.
-extern b2ContactFilter b2_defaultFilter;
-
 /// Implement this class to get collision results. You can use these results for
 /// things like sounds and game logic. You can also get contact results by
 /// traversing the contact lists after the time step. However, you might miss