[Scummvm-git-logs] scummvm master -> 7c1ca40152888e5aeff60ca515f9d0ea3411d300
sev-
noreply at scummvm.org
Thu May 14 09:13:53 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
7c1ca40152 MADS: PHANTOM: Fix warnings
Commit: 7c1ca40152888e5aeff60ca515f9d0ea3411d300
https://github.com/scummvm/scummvm/commit/7c1ca40152888e5aeff60ca515f9d0ea3411d300
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-05-14T11:13:30+02:00
Commit Message:
MADS: PHANTOM: Fix warnings
Changed paths:
engines/mads/madsv2/animview/animview.cpp
engines/mads/madsv2/core/asound.h
engines/mads/madsv2/dragonsphere/rooms/room116.cpp
engines/mads/madsv2/phantom/rooms/section1.cpp
diff --git a/engines/mads/madsv2/animview/animview.cpp b/engines/mads/madsv2/animview/animview.cpp
index 85688379b51..9f47fc0c4d2 100644
--- a/engines/mads/madsv2/animview/animview.cpp
+++ b/engines/mads/madsv2/animview/animview.cpp
@@ -228,7 +228,7 @@ static void run_animation(int animIndex) {
// Main animation loop
while (currentFrame < maxFrame && !current_error_code) {
if (speechNum) {
- if (!(current_anim->load_flags && AA_LOAD_SPEECH)) {
+ if (!(current_anim->load_flags & AA_LOAD_SPEECH)) {
char speechName[80];
MADS_FORMAT(speechName, current_anim->speech_file);
diff --git a/engines/mads/madsv2/core/asound.h b/engines/mads/madsv2/core/asound.h
index 23194d6fb88..aaae8503b6d 100644
--- a/engines/mads/madsv2/core/asound.h
+++ b/engines/mads/madsv2/core/asound.h
@@ -450,7 +450,7 @@ public:
/**
* Stop all currently playing sounds
*/
- virtual int stop();
+ virtual int stop() override;
/**
* Main poll method to allow sounds to progress
diff --git a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
index 3cdddb2e487..327aaf10368 100644
--- a/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
+++ b/engines/mads/madsv2/dragonsphere/rooms/room116.cpp
@@ -43,7 +43,7 @@ namespace Rooms {
struct Scratch {
int16 sprite[15]; /* Sprite series handles */
int16 sequence[15]; /* Sequence handles */
- int16 animation[4]; /* Animation handles */
+ int16 animation[9]; /* Animation handles */
int16 temp; /* for synching sprites */
int16 kingsicle_id; /* hotspot id for frozen king */
diff --git a/engines/mads/madsv2/phantom/rooms/section1.cpp b/engines/mads/madsv2/phantom/rooms/section1.cpp
index 6af0363659d..430397bcc1e 100644
--- a/engines/mads/madsv2/phantom/rooms/section1.cpp
+++ b/engines/mads/madsv2/phantom/rooms/section1.cpp
@@ -126,7 +126,7 @@ void section_1_music() {
break;
case 103:
- if ((global[jacques_status] == JACQUES_IS_DEAD_RICH_GONE)) {
+ if (global[jacques_status] == JACQUES_IS_DEAD_RICH_GONE) {
sound_play(N_JacquesDeadMus);
global[jacques_status] = JAC_DEAD_RICH_GONE_SEEN_BODY;
More information about the Scummvm-git-logs
mailing list