[Scummvm-git-logs] scummvm master -> 137a775ea0eb0719260c04ae1eaf487175901841

[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:
137a775ea0 TINSEL: Fix GCC Compiler Warnings


Commit: 137a775ea0eb0719260c04ae1eaf487175901841
    https://github.com/scummvm/scummvm/commit/137a775ea0eb0719260c04ae1eaf487175901841
Author: D G Turner (digitall at scummvm.org)
Date: 2022-05-08T16:57:48+01:00

Commit Message:
TINSEL: Fix GCC Compiler Warnings

Changed paths:
    engines/tinsel/handle.cpp
    engines/tinsel/noir/notebook.cpp


diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index c8c22c904f0..524c86569c7 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -426,7 +426,7 @@ const ACTORDATA *Handle::GetActorData(SCNHANDLE offset, uint32 count) {
 
 	ACTORDATA *actorData = new ACTORDATA[count];
 
-	for (int i = 0; i < count; i++) {
+	for (uint32 i = 0; i < count; i++) {
 		if (TinselVersion <= 1) {
 			actorData[i].masking = stream->readSint32();
 			actorData[i].hActorId = stream->readUint32();
@@ -461,7 +461,7 @@ const PROCESS_STRUC *Handle::GetProcessData(SCNHANDLE offset, uint32 count) {
 
 	PROCESS_STRUC *processData = new PROCESS_STRUC[count];
 
-	for (int i = 0; i < count; i++) {
+	for (uint32 i = 0; i < count; i++) {
 		processData[i].processId = stream->readUint32();
 		processData[i].hProcessCode = stream->readUint32();
 	}
diff --git a/engines/tinsel/noir/notebook.cpp b/engines/tinsel/noir/notebook.cpp
index 22329e22be0..8a0d5879c85 100644
--- a/engines/tinsel/noir/notebook.cpp
+++ b/engines/tinsel/noir/notebook.cpp
@@ -26,18 +26,16 @@
 namespace Tinsel {
 
 void Notebook::AddHyperlink(int32 id1, int32 id2) {
+#if 0
 	INV_OBJECT *invObject = _vm->_dialogs->GetInvObject(id1);
 
-#if 0
 	if (invObject->title != 0) {
 		error("A clue can only be hyperlinked if it only has one title!");
 		return;
 	}
-#endif
 
 	invObject = _vm->_dialogs->GetInvObject(id2);
 
-#if 0
 	if (invObject->title != 0) {
 		error("A clue can only be hyperlinked if it only has one title!");
 		return;