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

[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:
a3f1211f42 ASYLUM: Fix Various GCC Compiler Warnings


Commit: a3f1211f4217e93d71cb19d67889b052340083c9
    https://github.com/scummvm/scummvm/commit/a3f1211f4217e93d71cb19d67889b052340083c9
Author: D G Turner (digitall at scummvm.org)
Date: 2021-06-05T01:51:24+01:00

Commit Message:
ASYLUM: Fix Various GCC Compiler Warnings

Changed paths:
    engines/asylum/resources/inventory.cpp
    engines/asylum/resources/script.cpp


diff --git a/engines/asylum/resources/inventory.cpp b/engines/asylum/resources/inventory.cpp
index 3fb23f0e49..e2ede71825 100644
--- a/engines/asylum/resources/inventory.cpp
+++ b/engines/asylum/resources/inventory.cpp
@@ -64,7 +64,7 @@ static const int inventoryDescriptionIndices[12][11] = {
 
 Inventory::Inventory(AsylumEngine *vm, int32 &multiple) : _vm(vm), _selectedItem(0), _multiple(multiple) {
 	memset(_items, 0, sizeof(_items));
-};
+}
 
 void Inventory::load(Common::SeekableReadStream *stream) {
 	for (int i = 0; i < 8; i++)
@@ -112,7 +112,7 @@ void Inventory::remove(uint item, uint multipleDecr) {
 	if (item > 16)
 		return;
 
-	_multiple = _multiple >= multipleDecr ? _multiple - multipleDecr : 0;
+	_multiple = (_multiple >= (int32)multipleDecr) ? _multiple - multipleDecr : 0;
 
 	if (!multipleDecr || !_multiple) {
 		int i = find(item);
@@ -137,7 +137,7 @@ bool Inventory::contains(uint item, uint multiple) const {
 		return false;
 
 	if (multiple)
-		return _multiple >= multiple;
+		return (_multiple >= (int32)multiple);
 
 	return true;
 }
diff --git a/engines/asylum/resources/script.cpp b/engines/asylum/resources/script.cpp
index 953d07ade5..b9dd8e9e70 100644
--- a/engines/asylum/resources/script.cpp
+++ b/engines/asylum/resources/script.cpp
@@ -927,7 +927,7 @@ END_OPCODE
 IMPLEMENT_OPCODE(JumpIfInventoryItemNotSelected)
 	Actor *actor = getScene()->getActor(cmd->param1);
 
-	if (actor->inventory.getSelectedItem() != cmd->param2)
+	if ((int32)actor->inventory.getSelectedItem() != cmd->param2)
 		_currentQueueEntry->currentLine = cmd->param3;
 END_OPCODE