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

[dwatteau]

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

Summary:
9ab0e5a039 LILLIPUT: Don't trigger -Wmisleading-indentation warning
c5d52c877f BACKENDS: ENET: Fix MSVC C4245 signed/unsigned mismatch warning


Commit: 9ab0e5a039e8e5395df49c5665274c20c4335719
    https://github.com/scummvm/scummvm/commit/9ab0e5a039e8e5395df49c5665274c20c4335719
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-11T12:53:29+02:00

Commit Message:
LILLIPUT: Don't trigger -Wmisleading-indentation warning

Changed paths:
    engines/lilliput/script.cpp


diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp
index 4ed7d22e303..5ec909296c9 100644
--- a/engines/lilliput/script.cpp
+++ b/engines/lilliput/script.cpp
@@ -1231,10 +1231,10 @@ void LilliputScript::listAllTexts() {
 					++it;
 				} while (_vm->_packedStrings[index + variantCount + it] != 0x5B);
 			}
-		} else {*/
+		} else */ if (true) {
 			decodePackedText(&_vm->_packedStrings[index + variantCount]);
 			debugC(1, kDebugScript, "Text 0x%x variant 0 : %s", i, _vm->_displayStringBuf);
-		/* }*/
+		}
 	}
 }
 


Commit: c5d52c877f61ad325afd55cd7ae32cae11d38365
    https://github.com/scummvm/scummvm/commit/c5d52c877f61ad325afd55cd7ae32cae11d38365
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-11T12:57:51+02:00

Commit Message:
BACKENDS: ENET: Fix MSVC C4245 signed/unsigned mismatch warning

Missed in previous commit 73d61b34386a4354b1335797d320c66e74c4e59f.

Changed paths:
    backends/networking/enet/source/compress.cpp


diff --git a/backends/networking/enet/source/compress.cpp b/backends/networking/enet/source/compress.cpp
index 27cc2f5968c..b70ff6e596d 100644
--- a/backends/networking/enet/source/compress.cpp
+++ b/backends/networking/enet/source/compress.cpp
@@ -249,7 +249,7 @@ enet_range_coder_compress (void * context, const ENetBuffer * inBuffers, size_t
     ENetRangeCoder * rangeCoder = (ENetRangeCoder *) context;
     enet_uint8 * outStart = outData, * outEnd = & outData [outLimit];
     const enet_uint8 * inData, * inEnd;
-    enet_uint32 encodeLow = 0, encodeRange = ~0;
+    enet_uint32 encodeLow = 0, encodeRange = ~0U;
     ENetSymbol * root;
     enet_uint16 predicted = 0;
     size_t order = 0, nextSymbol = 0;
@@ -501,7 +501,7 @@ enet_range_coder_decompress (void * context, const enet_uint8 * inData, size_t i
     ENetRangeCoder * rangeCoder = (ENetRangeCoder *) context;
     enet_uint8 * outStart = outData, * outEnd = & outData [outLimit];
     const enet_uint8 * inEnd = & inData [inLimit];
-    enet_uint32 decodeLow = 0, decodeCode = 0, decodeRange = ~0;
+    enet_uint32 decodeLow = 0, decodeCode = 0, decodeRange = ~0U;
     ENetSymbol * root;
     enet_uint16 predicted = 0;
     size_t order = 0, nextSymbol = 0;