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

[bluegr]

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:
2f104415bf Revert "GOB: fix code overloads in map_v1.cpp"
ac9ff4b607 Revert "GOB: fix overload in hotspots.cpp"


Commit: 2f104415bf60ee6dc9c47aa2479aa5c03633bd8d
    https://github.com/scummvm/scummvm/commit/2f104415bf60ee6dc9c47aa2479aa5c03633bd8d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-03T01:18:27+03:00

Commit Message:
Revert "GOB: fix code overloads in map_v1.cpp"

This reverts commit b3061e0bc622897ce7f9fa208179b5a0706002bb.
The original change was a result of a false positive.
Check the discussion in PR #5889 for more information.

Changed paths:
    engines/gob/map_v1.cpp


diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp
index bb6c74bc0e6..1e98a3711b6 100644
--- a/engines/gob/map_v1.cpp
+++ b/engines/gob/map_v1.cpp
@@ -72,7 +72,7 @@ void Map_v1::loadMapObjects(const char *avjFile) {
 	uint32 objsPos;
 
 	Common::strcpy_s(avoName, sizeof(avoName) - 4, _sourceFile);
-	Common::strcat_s(avoName, sizeof(avoName), ".avo");
+	Common::strcat_s(avoName, ".avo");
 
 	int32 size;
 	dataBuf = _vm->_dataIO->getFile(avoName, size);
@@ -157,8 +157,8 @@ void Map_v1::loadSounds(Common::SeekableReadStream &data) {
 	for (int i = 0; i < count; i++) {
 		data.read(buf, 14);
 		buf[14] = 0;
-		Common::strcat_s(buf, sizeof(buf), ".SND");
-		Common::strcpy_s(sndNames[i], sizeof(sndNames[i]), buf);
+		Common::strcat_s(buf, ".SND");
+		Common::strcpy_s(sndNames[i], buf);
 	}
 
 	_vm->_sound->sampleLoad(&_vm->_goblin->_soundData[14], SOUND_SND, "diamant1.snd");


Commit: ac9ff4b60715982421d8fe88d136ebca76841496
    https://github.com/scummvm/scummvm/commit/ac9ff4b60715982421d8fe88d136ebca76841496
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-07-03T01:18:48+03:00

Commit Message:
Revert "GOB: fix overload in hotspots.cpp"

This reverts commit e1f2a52fe67a11213bee54fbec236c376f7b50e9.
The original change was a result of a false positive.
Check the discussion in PR #5889 for more information.

Changed paths:
    engines/gob/hotspots.cpp


diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index 7fb18685b46..6c7b050bab8 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -934,7 +934,7 @@ uint16 Hotspots::updateInput(uint16 xPos, uint16 yPos, uint16 width, uint16 heig
 	while (1) {
 		// If we the edit field has enough space, add a space for the new character
 		Common::strlcpy(tempStr, str, 255);
-    	Common::strcat_s(tempStr, sizeof(tempStr), " ");
+		Common::strcat_s(tempStr, " ");
 		if ((editSize != 0) && strlen(tempStr) > editSize)
 			Common::strlcpy(tempStr, str, 256);