[Scummvm-git-logs] scummvm master -> f26e249aa45d559cd93b1fa1d5e7f8e7206080ca

[scemino]

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:
f26e249aa4 TWP: Fix some warnings with gcc


Commit: f26e249aa45d559cd93b1fa1d5e7f8e7206080ca
    https://github.com/scummvm/scummvm/commit/f26e249aa45d559cd93b1fa1d5e7f8e7206080ca
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-07T22:05:09+02:00

Commit Message:
TWP: Fix some warnings with gcc

Changed paths:
    engines/twp/clipper/clipper.cpp
    engines/twp/object.cpp
    engines/twp/squtil.cpp
    engines/twp/syslib.cpp


diff --git a/engines/twp/clipper/clipper.cpp b/engines/twp/clipper/clipper.cpp
index d90f62d1af3..93c195e181c 100644
--- a/engines/twp/clipper/clipper.cpp
+++ b/engines/twp/clipper/clipper.cpp
@@ -631,7 +631,19 @@ void DisposeOutPts(OutPt *&pp) {
 //------------------------------------------------------------------------------
 
 inline void InitEdge(TEdge *e, TEdge *eNext, TEdge *ePrev, const IntPoint &Pt) {
-	memset(e, 0, sizeof(TEdge));
+	e->Bot = IntPoint();
+	e->Top = IntPoint();
+	e->Dx = 0.0;
+	e->PolyTyp = ptSubject;
+	e->Side = esLeft; // side only refers to current side of solution poly
+	e->WindDelta = 0; // 1 or -1 depending on winding direction
+	e->WindCnt = 0;
+	e->WindCnt2 = 0; // winding count of the opposite polytype
+	e->NextInLML = nullptr;
+	e->NextInAEL = nullptr;
+	e->PrevInAEL = nullptr;
+	e->NextInSEL = nullptr;
+	e->PrevInSEL = nullptr;
 	e->Next = eNext;
 	e->Prev = ePrev;
 	e->Curr = Pt;
diff --git a/engines/twp/object.cpp b/engines/twp/object.cpp
index 52903530321..fc1347e07b4 100644
--- a/engines/twp/object.cpp
+++ b/engines/twp/object.cpp
@@ -476,7 +476,7 @@ void Object::stopObjectMotors() {
 
 void Object::setFacing(Facing facing) {
 	if (_facing != facing) {
-		debugC(kDebugGame, "set facing: %d", facing);
+		debugC(kDebugGame, "set facing: %d", (int)facing);
 		bool update = !(((_facing == Facing::FACE_LEFT) && (facing == Facing::FACE_RIGHT)) || ((_facing == Facing::FACE_RIGHT) && (facing == Facing::FACE_LEFT)));
 		_facing = facing;
 		if (update && _nodeAnim)
diff --git a/engines/twp/squtil.cpp b/engines/twp/squtil.cpp
index a72b7ad9837..bca220907c5 100644
--- a/engines/twp/squtil.cpp
+++ b/engines/twp/squtil.cpp
@@ -125,7 +125,7 @@ SQInteger sqpush(HSQUIRRELVM v, Rectf value) {
 }
 
 template<>
-HSQOBJECT sqtoobj(HSQUIRRELVM v, int value) {
+HSQOBJECT sqtoobj(HSQUIRRELVM v, SQInteger value) {
 	SQObject o;
 	o._type = OT_INTEGER;
 	o._unVal.nInteger = value;
diff --git a/engines/twp/syslib.cpp b/engines/twp/syslib.cpp
index 2507bfc1410..5d79294c10c 100644
--- a/engines/twp/syslib.cpp
+++ b/engines/twp/syslib.cpp
@@ -858,7 +858,7 @@ void sqgame_register_syslib(HSQUIRRELVM v) {
 	regFunc(v, threadpauseable, _SC("threadpauseable"));
 }
 
-static void regConst(HSQUIRRELVM v, const char *name, int value) {
+static void regConst(HSQUIRRELVM v, const char *name, SQInteger value) {
 	SQObject obj = sqtoobj(v, value);
 	_table(v->_roottable)->NewSlot(sqtoobj(v, name), SQObjectPtr(obj));
 }