[Scummvm-git-logs] scummvm master -> 6355af94f4ade8cc01d3263ad449198f612b1e04

[sev-]

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:
942d9233e4 CHEWY: Remove no-effect type modifier
6355af94f4 CHEWY: Fix warning


Commit: 942d9233e475dc52c4129912e239f7ffffd99f66
    https://github.com/scummvm/scummvm/commit/942d9233e475dc52c4129912e239f7ffffd99f66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-04-16T12:21:40+02:00

Commit Message:
CHEWY: Remove no-effect type modifier

Changed paths:
    engines/chewy/text.h


diff --git a/engines/chewy/text.h b/engines/chewy/text.h
index bff7056e272..ae8f6363f72 100644
--- a/engines/chewy/text.h
+++ b/engines/chewy/text.h
@@ -89,7 +89,7 @@ public:
 	TextEntry *getText(uint chunk, uint entry, int type, int subEntry = -1);
 	Common::StringArray getTextArray(uint chunk, uint entry, int type, int subEntry = -1);
 	Common::String getTextEntry(uint chunk, uint entry, int type, int subEntry = -1);
-	const int16 getLastSpeechId() { return _lastSpeechId; }
+	int16 getLastSpeechId() { return _lastSpeechId; }
 
 	const char *strPos(const char *txtAdr, int16 pos);
 


Commit: 6355af94f4ade8cc01d3263ad449198f612b1e04
    https://github.com/scummvm/scummvm/commit/6355af94f4ade8cc01d3263ad449198f612b1e04
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-04-16T12:22:45+02:00

Commit Message:
CHEWY: Fix warning

Changed paths:
    engines/chewy/atds.cpp


diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index c35d1c5e062..142c3de0fdd 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -114,7 +114,7 @@ Atdsys::~Atdsys() {
 	for (int16 i = 0; i < MAX_HANDLE; i++) {
 		if (_atdsMem[i])
 			free(_atdsMem[i]);
-		_atdsMem[i] = nullptr;	
+		_atdsMem[i] = nullptr;
 	}
 
 	delete _dialogResource;
@@ -153,7 +153,7 @@ void Atdsys::initItemUseWith() {
 		objB = f.readSint16LE();
 		txtNum = f.readSint16LE();
 
-		assert(objA <= 255 && objB <= 65535);
+		assert(objA <= 255);
 
 		const uint32 key = (objA & 0xff) << 16 | objB;
 		_itemUseWithDesc[key] = txtNum;
@@ -1016,7 +1016,7 @@ int16 Atdsys::calc_inv_no_use(int16 curInv, int16 testNr) {
 	if (curInv != -1)
 		_invBlockNr = curInv + 1;
 
-	assert(curInv <= 255 && testNr <= 65535);
+	assert(curInv <= 255);
 
 	const uint32 key = (curInv & 0xff) << 16 | testNr;
 	return (_itemUseWithDesc.contains(key)) ? _itemUseWithDesc[key] : -1;