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

sev- noreply at scummvm.org
Sat Apr 29 18:28:35 UTC 2023


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

Summary:
bb8eda6341 SCUMM: Remove unused variables
8e76e6c55f SCUMM: MOONBASE: Comment out unused variables
d66d996b21 AGS: COmment out unused variable
03460f9469 AGS: Fix bitwise operations
20475e8b56 AGS: Comment out unused variables
e69be11647 CGE2: Remove unused variable
f9ff40fb55 CRUISE: Comment out unused variables
3372244970 CRYOMNI3D: Comment out unused variable
7a45dfe6be EFH: Comment out unused variable
0084e7f80b GLK: ALAN3: Fix warning
ea6f82f385 GLK: COMPREHEND: Remove unused variable
7d447fd079 GLK: SCOTT: Comment out unused variables
d4393704f9 GLK: LEVEL9: Fix unused variable warning
ede4a26d4a GNAP: Remove unused vairables


Commit: bb8eda6341e03ad07303339fcde1bd9ab43539ac
    https://github.com/scummvm/scummvm/commit/bb8eda6341e03ad07303339fcde1bd9ab43539ac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:19+02:00

Commit Message:
SCUMM: Remove unused variables

Changed paths:
    engines/scumm/resource.cpp
    engines/scumm/resource_v4.cpp


diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 90bdaa4d09d..303532215b0 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -241,7 +241,6 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
 
 void ScummEngine::readIndexFile() {
 	uint32 blocktype, itemsize;
-	int numblock = 0;
 
 	debugC(DEBUG_GENERAL, "readIndexFile()");
 
@@ -302,7 +301,6 @@ void ScummEngine::readIndexFile() {
 		if (_fileHandle->eos() || _fileHandle->err())
 			break;
 
-		numblock++;
 		debug(2, "Reading index block of type '%s', size %d", tag2str(blocktype), itemsize);
 		readIndexBlock(blocktype, itemsize);
 	}
diff --git a/engines/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp
index 4713358fdd4..32c0260b7ce 100644
--- a/engines/scumm/resource_v4.cpp
+++ b/engines/scumm/resource_v4.cpp
@@ -53,7 +53,6 @@ int ScummEngine_v4::readResTypeList(ResType type) {
 void ScummEngine_v4::readIndexFile() {
 	uint16 blocktype;
 	uint32 itemsize;
-	int numblock = 0;
 
 	debug(9, "readIndexFile()");
 
@@ -109,8 +108,6 @@ void ScummEngine_v4::readIndexFile() {
 
 		blocktype = _fileHandle->readUint16LE();
 
-		numblock++;
-
 		switch (blocktype) {
 
 		case 0x4E52:	// 'NR'


Commit: 8e76e6c55f517f108f452836c279ccf2d4df1cf6
    https://github.com/scummvm/scummvm/commit/8e76e6c55f517f108f452836c279ccf2d4df1cf6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:19+02:00

Commit Message:
SCUMM: MOONBASE: Comment out unused variables

Changed paths:
    engines/scumm/he/moonbase/ai_targetacquisition.cpp
    engines/scumm/he/moonbase/ai_traveller.cpp


diff --git a/engines/scumm/he/moonbase/ai_targetacquisition.cpp b/engines/scumm/he/moonbase/ai_targetacquisition.cpp
index 582c1935477..1ac7e4791c0 100644
--- a/engines/scumm/he/moonbase/ai_targetacquisition.cpp
+++ b/engines/scumm/he/moonbase/ai_targetacquisition.cpp
@@ -111,7 +111,7 @@ int Sortie::numChildrenToGen() {
 IContainedObject *Sortie::createChildObj(int index, int &completionFlag) {
 	float thisDamage;
 	Sortie *retSortie = new Sortie(_ai);
-	int activeDefenses = 0;
+//	int activeDefenses = 0;
 
 	Common::Array<DefenseUnit *> thisEnemyDefenses;
 
@@ -172,7 +172,7 @@ IContainedObject *Sortie::createChildObj(int index, int &completionFlag) {
 
 		// Check to see if we're within an active defense's radius
 		if ((distance < (*i)->getRadius()) && ((*i)->getState() == DUS_ON)) {
-			activeDefenses++;
+			//activeDefenses++;
 
 			// Turn off this anti-air and drop the coverage count
 			if (((*i)->getType() == DUT_ANTI_AIR)) {
diff --git a/engines/scumm/he/moonbase/ai_traveller.cpp b/engines/scumm/he/moonbase/ai_traveller.cpp
index 5d7e0a25bfe..85866254175 100644
--- a/engines/scumm/he/moonbase/ai_traveller.cpp
+++ b/engines/scumm/he/moonbase/ai_traveller.cpp
@@ -107,12 +107,12 @@ int Traveller::numChildrenToGen() {
 }
 
 IContainedObject *Traveller::createChildObj(int index, int &completionFlag) {
-	static int nodeCount = 0;
+	//static int nodeCount = 0;
 	static int completionState = 1;
 
-	if (!index) nodeCount = 0;
+	//if (!index) nodeCount = 0;
 
-	nodeCount++;
+	//nodeCount++;
 
 	Traveller *retTraveller = new Traveller(_ai);
 


Commit: d66d996b214bbba2f7f596c7c1a6d42a14bab601
    https://github.com/scummvm/scummvm/commit/d66d996b214bbba2f7f596c7c1a6d42a14bab601
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
AGS: COmment out unused variable

Changed paths:
    engines/ags/shared/game/main_game_file.cpp


diff --git a/engines/ags/shared/game/main_game_file.cpp b/engines/ags/shared/game/main_game_file.cpp
index 101d6c918fb..d933390479d 100644
--- a/engines/ags/shared/game/main_game_file.cpp
+++ b/engines/ags/shared/game/main_game_file.cpp
@@ -315,7 +315,7 @@ void ReadDialogs(std::vector<DialogTopic> &dialog,
 	            fgetstring(stringbuffer, iii);
 	    }
 	*/
-	int i = 0;
+	//int i = 0;
 	char buffer[1000];
 	if (data_ver <= kGameVersion_260) {
 		// Plain text on <= 2.60
@@ -342,7 +342,7 @@ void ReadDialogs(std::vector<DialogTopic> &dialog,
 				break;
 
 			old_speech_lines.push_back(buffer);
-			i++;
+			//i++;
 		}
 	} else {
 		// Encrypted text on > 2.60
@@ -358,7 +358,7 @@ void ReadDialogs(std::vector<DialogTopic> &dialog,
 			decrypt_text(buffer, newlen);
 			buffer[newlen] = 0;
 			old_speech_lines.push_back(buffer);
-			i++;
+			//i++;
 		}
 	}
 }


Commit: 03460f94699b131c4e7ce555c492280aebcdeaaa
    https://github.com/scummvm/scummvm/commit/03460f94699b131c4e7ce555c492280aebcdeaaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
AGS: Fix bitwise operations

Changed paths:
    engines/ags/engine/ac/game.cpp
    engines/ags/engine/ac/global_object.cpp
    engines/ags/engine/ac/route_finder_impl_legacy.cpp


diff --git a/engines/ags/engine/ac/game.cpp b/engines/ags/engine/ac/game.cpp
index fba3ca0aaec..5becad2f4cb 100644
--- a/engines/ags/engine/ac/game.cpp
+++ b/engines/ags/engine/ac/game.cpp
@@ -1262,7 +1262,7 @@ void replace_tokens(const char *srcmes, char *destm, int maxlen) {
 	while (srcmes[indxsrc] != 0) {
 		srcp = &srcmes[indxsrc];
 		destp = &destm[indxdest];
-		if ((strncmp(srcp, "@IN", 3) == 0) | (strncmp(srcp, "@GI", 3) == 0)) {
+		if ((strncmp(srcp, "@IN", 3) == 0) || (strncmp(srcp, "@GI", 3) == 0)) {
 			int tokentype = 0;
 			if (srcp[1] == 'I') tokentype = 1;
 			else tokentype = 2;
diff --git a/engines/ags/engine/ac/global_object.cpp b/engines/ags/engine/ac/global_object.cpp
index f9ddc037e66..c55b1757806 100644
--- a/engines/ags/engine/ac/global_object.cpp
+++ b/engines/ags/engine/ac/global_object.cpp
@@ -457,7 +457,7 @@ void RunObjectInteraction(int aa, int mood) {
 }
 
 int AreObjectsColliding(int obj1, int obj2) {
-	if ((!is_valid_object(obj1)) | (!is_valid_object(obj2)))
+	if ((!is_valid_object(obj1)) || (!is_valid_object(obj2)))
 		quit("!AreObjectsColliding: invalid object specified");
 
 	return (AreThingsOverlapping(obj1 + OVERLAPPING_OBJECT, obj2 + OVERLAPPING_OBJECT)) ? 1 : 0;
diff --git a/engines/ags/engine/ac/route_finder_impl_legacy.cpp b/engines/ags/engine/ac/route_finder_impl_legacy.cpp
index 02348565d4f..bbd4ca54d96 100644
--- a/engines/ags/engine/ac/route_finder_impl_legacy.cpp
+++ b/engines/ags/engine/ac/route_finder_impl_legacy.cpp
@@ -318,7 +318,7 @@ try_again:
 		return 0;
 	}
 
-	if (((nextx < 0) | (nextx >= _G(wallscreen)->GetWidth()) | (nexty < 0) | (nexty >= _G(wallscreen)->GetHeight())) ||
+	if (((nextx < 0) || (nextx >= _G(wallscreen)->GetWidth()) || (nexty < 0) || (nexty >= _G(wallscreen)->GetHeight())) ||
 	        (_G(wallscreen)->GetPixel(nextx, nexty) == 0) || ((beenhere[srcy][srcx] & (1 << trydir)) != 0)) {
 
 		if (leftorright == 0) {


Commit: 20475e8b56278dda49669c50d0d185997861e700
    https://github.com/scummvm/scummvm/commit/20475e8b56278dda49669c50d0d185997861e700
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
AGS: Comment out unused variables

Changed paths:
    engines/ags/plugins/ags_waves/sound.cpp
    engines/ags/plugins/ags_waves/weather.cpp


diff --git a/engines/ags/plugins/ags_waves/sound.cpp b/engines/ags/plugins/ags_waves/sound.cpp
index b379075fcd8..4f66de6813a 100644
--- a/engines/ags/plugins/ags_waves/sound.cpp
+++ b/engines/ags/plugins/ags_waves/sound.cpp
@@ -30,7 +30,7 @@ namespace AGS3 {
 namespace Plugins {
 namespace AGSWaves {
 
-const float PI = 3.14159265f;
+//const float PI = 3.14159265f;
 
 void AGSWaves::SFX_Play(ScriptMethodParams &params) {
 	PARAMS2(int, sfxNum, int, repeat);
@@ -104,7 +104,7 @@ void AGSWaves::SFX_SetPosition(ScriptMethodParams &params) {
 
 	SoundEffect &effect = SFX[sfxNum];
 
-	if (_mixer->isSoundHandleActive(effect._soundHandle)) { 
+	if (_mixer->isSoundHandleActive(effect._soundHandle)) {
 		int angle = 0;
 		int dist = 0;
 
diff --git a/engines/ags/plugins/ags_waves/weather.cpp b/engines/ags/plugins/ags_waves/weather.cpp
index b39c0b16933..2660d490fad 100644
--- a/engines/ags/plugins/ags_waves/weather.cpp
+++ b/engines/ags/plugins/ags_waves/weather.cpp
@@ -742,7 +742,7 @@ void AGSWaves::DrawLineCustom(int x1, int y1, int x2, int y2, int graphic, int s
 			ALine++;
 		}
 
-		int i = 0;
+		//int i = 0;
 		while (x < xe) {
 			x = x + 1;
 			if (px < 0) {
@@ -777,7 +777,7 @@ void AGSWaves::DrawLineCustom(int x1, int y1, int x2, int y2, int graphic, int s
 				ALine++;
 			}
 
-			i++;
+			//i++;
 		}
 	} else {
 		if (dy >= 0) {
@@ -815,7 +815,7 @@ void AGSWaves::DrawLineCustom(int x1, int y1, int x2, int y2, int graphic, int s
 			ALine++;
 		}
 
-		int i = 0;
+		//int i = 0;
 		while (y < ye) {
 			y = y + 1;
 			if (py <= 0) {
@@ -847,7 +847,7 @@ void AGSWaves::DrawLineCustom(int x1, int y1, int x2, int y2, int graphic, int s
 				sprite_pixels[(yy * src_width) + xx] = SetColorRGBA(setR, setG, setB, setA + (ALine * TranDif));
 				ALine++;
 			}
-			i++;
+			//i++;
 		}
 	}
 


Commit: e69be1164738d452173c49c2644ed37f0f26a5a0
    https://github.com/scummvm/scummvm/commit/e69be1164738d452173c49c2644ed37f0f26a5a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
CGE2: Remove unused variable

Changed paths:
    engines/cge2/cge2_main.cpp


diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index f1ca02fcf6f..aad6f380978 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -316,7 +316,6 @@ void CGE2Engine::loadScript(const char *fname, bool onlyToolbar) {
 		return;
 
 	bool ok = true;
-	int lcnt = 0;
 
 	char tmpStr[kLineMax + 1];
 	Common::String line;
@@ -325,7 +324,6 @@ void CGE2Engine::loadScript(const char *fname, bool onlyToolbar) {
 		if (line.empty())
 			continue;
 
-		lcnt++;
 		Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
 
 		ok = false; // not OK if break


Commit: f9ff40fb55ab52b0123b8033312a3abcb4f69f86
    https://github.com/scummvm/scummvm/commit/f9ff40fb55ab52b0123b8033312a3abcb4f69f86
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
CRUISE: Comment out unused variables

Changed paths:
    engines/cruise/mainDraw.cpp


diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index a4c78cb508f..c77148d13ca 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -833,7 +833,7 @@ void buildPolyModel(int positionX, int positionY, int scale, char *pMask, char *
 
 	// position of the dataPointer is m_coordCount * 2
 
-	int polygonCount = 0;
+	//int polygonCount = 0;
 
 	do {
 		int linesToDraw = *dataPointer++;
@@ -868,7 +868,7 @@ void buildPolyModel(int positionX, int positionY, int scale, char *pMask, char *
 			dataPointer += 4;
 		}
 
-		polygonCount ++;
+		//polygonCount++;
 	} while (*dataPointer != 0xFF);
 }
 
@@ -991,7 +991,7 @@ bool findPoly(char* dataPtr, int positionX, int positionY, int scale, int mouseX
 
 	// position of the dataPointer is m_coordCount * 2
 
-	int polygonCount = 0;
+	//int polygonCount = 0;
 
 	do {
 		int linesToDraw = *dataPointer++;
@@ -1031,7 +1031,7 @@ bool findPoly(char* dataPtr, int positionX, int positionY, int scale, int mouseX
 			dataPointer += 4;
 		}
 
-		polygonCount ++;
+		//polygonCount++;
 	} while (*dataPointer != 0xFF);
 
 	return false;


Commit: 337224497058132b10cf1056a836ddd2e579b1a4
    https://github.com/scummvm/scummvm/commit/337224497058132b10cf1056a836ddd2e579b1a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
CRYOMNI3D: Comment out unused variable

Changed paths:
    engines/cryomni3d/versailles/engine.cpp


diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp
index dcea51f0167..772b81c2b56 100644
--- a/engines/cryomni3d/versailles/engine.cpp
+++ b/engines/cryomni3d/versailles/engine.cpp
@@ -700,7 +700,7 @@ void CryOmni3DEngine_Versailles::calculateTransparentMapping() {
 	}
 
 	uint newColorsNextId = _transparentNewStart;
-	uint newColorsCount = 0;
+	//uint newColorsCount = 0;
 	for (uint i = _transparentDstStart; i < _transparentDstStop; i++) {
 		byte transparentRed = ((uint)_mainPalette[3 * i + 0]) * 60 / 128;
 		byte transparentGreen = ((uint)_mainPalette[3 * i + 1]) * 50 / 128;
@@ -729,7 +729,7 @@ void CryOmni3DEngine_Versailles::calculateTransparentMapping() {
 				_mainPalette[3 * newColorsNextId + 2] = transparentBlue;
 				nearestId = newColorsNextId;
 
-				newColorsCount++;
+				//newColorsCount++;
 				newColorsNextId++;
 			}
 		}


Commit: 7a45dfe6bec933872065d9adea1fac8c8acb3097
    https://github.com/scummvm/scummvm/commit/7a45dfe6bec933872065d9adea1fac8c8acb3097
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
EFH: Comment out unused variable

Changed paths:
    engines/efh/efh.cpp


diff --git a/engines/efh/efh.cpp b/engines/efh/efh.cpp
index e7f17c4d12f..ae24b38558c 100644
--- a/engines/efh/efh.cpp
+++ b/engines/efh/efh.cpp
@@ -992,7 +992,7 @@ int16 EfhEngine::handleCharacterJoining() {
 void EfhEngine::drawText(uint8 *srcPtr, int16 posX, int16 posY, int16 maxX, int16 maxY, bool flag) {
 	debugC(7, kDebugEngine, "drawText %d-%d %d-%d %s", posX, posY, maxX, maxY, flag ? "True" : "False");
 
-	uint16 stringIdx = 0;
+	//uint16 stringIdx = 0;
 	uint8 *impPtr = srcPtr;
 	_messageToBePrinted = "";
 
@@ -1004,13 +1004,13 @@ void EfhEngine::drawText(uint8 *srcPtr, int16 posX, int16 posY, int16 maxX, int1
 
 		if (curChar == 0x0D) {
 			_messageToBePrinted += " ";
-			stringIdx++;
+			//stringIdx++;
 			++impPtr;
 		} else if (curChar == 0x0A) {
 			++impPtr;
 		} else {
 			_messageToBePrinted += curChar;
-			stringIdx++;
+			//stringIdx++;
 			++impPtr;
 		}
 	}


Commit: 0084e7f80bc5e859f4a90481fdf086f7976fe868
    https://github.com/scummvm/scummvm/commit/0084e7f80bc5e859f4a90481fdf086f7976fe868
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
GLK: ALAN3: Fix warning

Changed paths:
    engines/glk/alan3/debug.cpp


diff --git a/engines/glk/alan3/debug.cpp b/engines/glk/alan3/debug.cpp
index a13fee780a0..127c4aa1b7c 100644
--- a/engines/glk/alan3/debug.cpp
+++ b/engines/glk/alan3/debug.cpp
@@ -54,18 +54,15 @@ Breakpoint breakpoint[BREAKPOINTMAX];
 /*----------------------------------------------------------------------*/
 static void showAttributes(AttributeEntry *attrib) {
 	AttributeEntry *at;
-	int i;
 	char str[80];
 
 	if (attrib == nullptr)
 		return;
 
-	i = 1;
 	for (at = attrib; !isEndOfArray(at); at++) {
 		Common::sprintf_s(str, "$i$t%s[%d] = %d", (char *) pointerTo(at->id), at->code, (int)at->value);
 
 		output(str);
-		i++;
 	}
 }
 


Commit: ea6f82f3853b04b59971e3501d039436c95fad77
    https://github.com/scummvm/scummvm/commit/ea6f82f3853b04b59971e3501d039436c95fad77
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:20+02:00

Commit Message:
GLK: COMPREHEND: Remove unused variable

Changed paths:
    engines/glk/comprehend/game_data.cpp


diff --git a/engines/glk/comprehend/game_data.cpp b/engines/glk/comprehend/game_data.cpp
index 0af29e05c22..69e2b3b3f49 100644
--- a/engines/glk/comprehend/game_data.cpp
+++ b/engines/glk/comprehend/game_data.cpp
@@ -515,7 +515,6 @@ void GameData::parse_flags(FileBuffer *fb) {
 void GameData::parse_replace_words(FileBuffer *fb) {
 	size_t len;
 	bool eof;
-	int i;
 
 	/* FIXME - Rename addr_strings_end */
 	fb->seek(_header.addr_strings_end);
@@ -523,7 +522,7 @@ void GameData::parse_replace_words(FileBuffer *fb) {
 	/* FIXME - what is this for */
 	fb->skip(2);
 
-	for (i = 0;; i++) {
+	for (;;) {
 		len = fb->strlen(&eof);
 		if (len == 0)
 			break;


Commit: 7d447fd079df39bbb506b260465cb3908a35c752
    https://github.com/scummvm/scummvm/commit/7d447fd079df39bbb506b260465cb3908a35c752
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:21+02:00

Commit Message:
GLK: SCOTT: Comment out unused variables

Changed paths:
    engines/glk/scott/robin_of_sherwood.cpp


diff --git a/engines/glk/scott/robin_of_sherwood.cpp b/engines/glk/scott/robin_of_sherwood.cpp
index bb725bb354a..090bc464bd4 100644
--- a/engines/glk/scott/robin_of_sherwood.cpp
+++ b/engines/glk/scott/robin_of_sherwood.cpp
@@ -285,7 +285,7 @@ GameIDType loadExtraSherwoodData(void) {
 	ct = 0;
 	rp = &_G(_rooms)[0];
 
-	int actual_room_number = 0;
+	//int actual_room_number = 0;
 
 	ptr = seekToPos(_G(_entireFile), 0x5b7e + _G(_fileBaselineOffset));
 	if (ptr == 0)
@@ -295,12 +295,12 @@ GameIDType loadExtraSherwoodData(void) {
 		rp->_text = decompressText(ptr, ct);
 		rp->_text.toLowercase();
 		ct++;
-		actual_room_number++;
+		//actual_room_number++;
 		if (ct == 11) {
 			for (int i = 0; i < 61; i++) {
 				rp++;
 				rp->_text = "in Sherwood Forest";
-				actual_room_number++;
+				//actual_room_number++;
 			}
 		}
 		rp++;
@@ -366,7 +366,7 @@ GameIDType loadExtraSherwoodData64(void) {
 	ct = 0;
 	rp = &_G(_rooms)[0];
 
-	int actual_room_number = 0;
+	//int actual_room_number = 0;
 
 	offset = 0x402e + _G(_fileBaselineOffset);
 
@@ -378,12 +378,12 @@ GameIDType loadExtraSherwoodData64(void) {
 		rp->_text = decompressText(ptr, ct);
 		rp->_text.toLowercase();
 		ct++;
-		actual_room_number++;
+		//actual_room_number++;
 		if (ct == 11) {
 			for (int i = 0; i < 61; i++) {
 				rp++;
 				rp->_text = "in Sherwood Forest";
-				actual_room_number++;
+				//actual_room_number++;
 			}
 		}
 		rp++;


Commit: d4393704f9b96b0e9c6b95aaaeaaf71078e55f49
    https://github.com/scummvm/scummvm/commit/d4393704f9b96b0e9c6b95aaaeaaf71078e55f49
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:21+02:00

Commit Message:
GLK: LEVEL9: Fix unused variable warning

Changed paths:
    engines/glk/level9/detection.cpp


diff --git a/engines/glk/level9/detection.cpp b/engines/glk/level9/detection.cpp
index c38c24a947a..e621ad041bd 100644
--- a/engines/glk/level9/detection.cpp
+++ b/engines/glk/level9/detection.cpp
@@ -416,6 +416,7 @@ bool Scanner::ValidateSequence(byte *Base, byte *Image, uint32 iPos, uint32 acod
 			Strange++;
 	} while (Valid && !Finished && Pos < size); /* && Strange==0); */
 	(*Size) += Pos - iPos;
+	(void)Strange;
 	return Valid; /* && Strange==0; */
 }
 


Commit: ede4a26d4ae6b9e340117715ab0d3dcf4f98fec1
    https://github.com/scummvm/scummvm/commit/ede4a26d4ae6b9e340117715ab0d3dcf4f98fec1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T20:28:21+02:00

Commit Message:
GNAP: Remove unused vairables

Changed paths:
    engines/gnap/gamesys.cpp


diff --git a/engines/gnap/gamesys.cpp b/engines/gnap/gamesys.cpp
index 303f36b1e9d..8bec06a9ca6 100644
--- a/engines/gnap/gamesys.cpp
+++ b/engines/gnap/gamesys.cpp
@@ -806,7 +806,7 @@ void GameSys::drawSprites() {
 
 	// Restore dirty background and collect rects to be redrawn for all sprites
 	// which aren't marked to be redrawn yet
-	Common::Rect intersectingRect;
+	//Common::Rect intersectingRect;
 	for (uint i = 0; i < _dirtyRects.size(); ++i) {
 		restoreBackgroundRect(_dirtyRects[i]);
 		for (int j = 0; j < _gfxItemsCount; ++j)
@@ -910,7 +910,7 @@ void GameSys::updateScreen() {
 		_gameSysClock = 0;
 	}
 
-	Common::Rect dstRect, srcRect, rcSrc2;
+	Common::Rect srcRect, rcSrc2;
 
 	for (int j = 0; j < _gfxItemsCount; ++j) {
 




More information about the Scummvm-git-logs mailing list