[Scummvm-git-logs] scummvm master -> 42342141cc37ed1729fdf2e0f3d7d0412e1afb7e

[eriktorbjorn]

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

Summary:
6d2ef598b0 AWE: Silence GCC warning
d2b39b3a87 AWE: Silence GCC warning
42342141cc AWE: Silence GCC warning


Commit: 6d2ef598b0895e936ed0bb0834e6e1817bc39e1c
    https://github.com/scummvm/scummvm/commit/6d2ef598b0895e936ed0bb0834e6e1817bc39e1c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-07-21T14:23:37+02:00

Commit Message:
AWE: Silence GCC warning

Changed paths:
    engines/awe/resource_nth.cpp


diff --git a/engines/awe/resource_nth.cpp b/engines/awe/resource_nth.cpp
index 131b6a16921..87580b8c521 100644
--- a/engines/awe/resource_nth.cpp
+++ b/engines/awe/resource_nth.cpp
@@ -43,18 +43,14 @@ static char *loadTextFile(Common::File &f, const int size) {
 
 struct Resource15th : ResourceNth {
 	Pak _pak;
-	char _dataPath[MAXPATHLEN];
-	char _menuPath[MAXPATHLEN];
+	const char *_dataPath = "Data";
+	const char *_menuPath = "Menu";
 	char *_textBuf;
 	const char *_stringsTable[157];
 	bool _hasRemasteredMusic;
 
 	Resource15th() {
-		Common::strcpy_s(_dataPath, "Music/AW/RmSnd");
-
-		_hasRemasteredMusic = Common::FSNode(_dataPath).isDirectory();
-		Common::strcpy_s(_dataPath, "Data");
-		Common::strcpy_s(_menuPath, "Menu");
+		_hasRemasteredMusic = Common::FSNode("Music/AW/RmSnd").isDirectory();
 		_textBuf = nullptr;
 		memset(_stringsTable, 0, sizeof(_stringsTable));
 	}


Commit: d2b39b3a87eda08d2dbb49e55ab0832b3c057101
    https://github.com/scummvm/scummvm/commit/d2b39b3a87eda08d2dbb49e55ab0832b3c057101
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-07-21T14:23:37+02:00

Commit Message:
AWE: Silence GCC warning

Changed paths:
    engines/awe/graphics_soft.cpp


diff --git a/engines/awe/graphics_soft.cpp b/engines/awe/graphics_soft.cpp
index b61a59619f2..09b8e4fe94d 100644
--- a/engines/awe/graphics_soft.cpp
+++ b/engines/awe/graphics_soft.cpp
@@ -364,7 +364,11 @@ void GraphicsSoft::setFont(const uint8 *src, int w, int h) {
 
 void GraphicsSoft::setPalette(const Color *colors, int count) {
 	count = MIN(count, 16);
-	memcpy(_pal, colors, sizeof(Color) * count);
+	for (int i = 0; i < count; i++) {
+		_pal[i].r = colors[i].r;
+		_pal[i].g = colors[i].g;
+		_pal[i].b = colors[i].b;
+	}
 	_palChanged = true;
 }
 


Commit: 42342141cc37ed1729fdf2e0f3d7d0412e1afb7e
    https://github.com/scummvm/scummvm/commit/42342141cc37ed1729fdf2e0f3d7d0412e1afb7e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-07-21T14:23:37+02:00

Commit Message:
AWE: Silence GCC warning

Changed paths:
    engines/awe/sfx_player.cpp


diff --git a/engines/awe/sfx_player.cpp b/engines/awe/sfx_player.cpp
index 8af163c4b9d..ee16c77677b 100644
--- a/engines/awe/sfx_player.cpp
+++ b/engines/awe/sfx_player.cpp
@@ -103,7 +103,16 @@ void SfxPlayer::play(int rate) {
 	_playing = true;
 	_rate = rate;
 	_samplesLeft = 0;
-	memset(_channels, 0, sizeof(_channels));
+
+	for (int i = 0; i < NUM_CHANNELS; i++) {
+		_channels[i].sampleData = nullptr;
+		_channels[i].sampleLen = 0;
+		_channels[i].sampleLoopPos = 0;
+		_channels[i].sampleLoopLen = 0;
+		_channels[i].volume = 0;
+		_channels[i].pos.inc = 0;
+		_channels[i].pos.offset = 0;
+	}
 }
 
 static int16 toS16(int a) {
@@ -201,7 +210,6 @@ void SfxPlayer::handleEvents() {
 
 void SfxPlayer::handlePattern(uint8 channel, const uint8 *data) {
 	SfxPattern pat;
-	memset(&pat, 0, sizeof(SfxPattern));
 	pat.note_1 = READ_BE_UINT16(data + 0);
 	pat.note_2 = READ_BE_UINT16(data + 2);
 	if (pat.note_1 != 0xFFFD) {