[Scummvm-git-logs] scummvm master -> 046ad258b12dfe5bea15df3492348758bcbeaa79
dreammaster
noreply at scummvm.org
Wed Jul 29 06:52:36 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4972a2c446 MADS: NEBULAR: Fix Coverity warnings
046ad258b1 MADS: PHANTOM: Dead code removal
Commit: 4972a2c4469d2f1ae39f950d0317e15c91e6c29b
https://github.com/scummvm/scummvm/commit/4972a2c4469d2f1ae39f950d0317e15c91e6c29b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T16:46:02+10:00
Commit Message:
MADS: NEBULAR: Fix Coverity warnings
Changed paths:
engines/mads/nebular/console.cpp
engines/mads/nebular/rooms/room511.cpp
engines/mads/nebular/sound/asound.cpp
diff --git a/engines/mads/nebular/console.cpp b/engines/mads/nebular/console.cpp
index 9a221a68399..d3526753ea8 100644
--- a/engines/mads/nebular/console.cpp
+++ b/engines/mads/nebular/console.cpp
@@ -64,7 +64,7 @@ bool Console::cmdLoad(int argc, const char **argv) {
// Skip the remainder of the header
(void)sf->readString();
Graphics::Surface *dummy;
- Graphics::loadThumbnail(*sf, dummy, true);
+ (void)Graphics::loadThumbnail(*sf, dummy, true);
sf->skip(14);
// Read the actual savegame content
diff --git a/engines/mads/nebular/rooms/room511.cpp b/engines/mads/nebular/rooms/room511.cpp
index e8b2958abc2..c99972623fb 100644
--- a/engines/mads/nebular/rooms/room511.cpp
+++ b/engines/mads/nebular/rooms/room511.cpp
@@ -245,30 +245,28 @@ static void room_511_parser() {
} else if (player_said_2(take, fishing_line)) {
if (!global[kBoatRaised]) {
if (global[kLineStatus] == 2) {
- if (global[kLineStatus] != 3) {
- if (kernel.trigger == 0) {
- player.commands_allowed = false;
- player.walker_visible = false;
- player_set_image();
- local._lineAnimationMode = 1;
- local._lineAnimationPosition = 1;
- local._lineMoving = true;
- kernel_run_animation(kernel_name('R', -1), 0);
+ if (kernel.trigger == 0) {
+ player.commands_allowed = false;
+ player.walker_visible = false;
+ player_set_image();
+ local._lineAnimationMode = 1;
+ local._lineAnimationPosition = 1;
+ local._lineMoving = true;
+ kernel_run_animation(kernel_name('R', -1), 0);
+ kernel_timing_trigger(1, 1);
+ } else if (kernel.trigger == 1) {
+ if (local._lineMoving) {
kernel_timing_trigger(1, 1);
- } else if (kernel.trigger == 1) {
- if (local._lineMoving) {
- kernel_timing_trigger(1, 1);
- } else {
- inter_give_to_player(OBJ_FISHING_LINE);
- local._lineMoving = true;
- local._handingLine = true;
- player.commands_allowed = true;
- }
+ } else {
+ inter_give_to_player(OBJ_FISHING_LINE);
+ local._lineMoving = true;
+ local._handingLine = true;
+ player.commands_allowed = true;
}
- } else
- text_show(51129);
- } else
+ }
+ } else {
return;
+ }
} else {
text_show(51130);
}
diff --git a/engines/mads/nebular/sound/asound.cpp b/engines/mads/nebular/sound/asound.cpp
index d29c8c04206..3cc01ab520f 100644
--- a/engines/mads/nebular/sound/asound.cpp
+++ b/engines/mads/nebular/sound/asound.cpp
@@ -124,6 +124,7 @@ ASound::ASound(Audio::Mixer *mixer, const Common::Path &filename, int dataOffset
_activeChannelPtr = nullptr;
_samplePtr = nullptr;
_frameCounter = 0;
+ _chanCommandCount = 15;
_isDisabled = false;
_masterVolume = 255;
_noiseTicks1 = 0;
Commit: 046ad258b12dfe5bea15df3492348758bcbeaa79
https://github.com/scummvm/scummvm/commit/046ad258b12dfe5bea15df3492348758bcbeaa79
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-29T16:52:28+10:00
Commit Message:
MADS: PHANTOM: Dead code removal
Changed paths:
engines/mads/phantom/rooms/room103.cpp
engines/mads/phantom/rooms/room310.cpp
diff --git a/engines/mads/phantom/rooms/room103.cpp b/engines/mads/phantom/rooms/room103.cpp
index 222db8d9fbe..ecfb87bee63 100644
--- a/engines/mads/phantom/rooms/room103.cpp
+++ b/engines/mads/phantom/rooms/room103.cpp
@@ -469,11 +469,8 @@ static void climb_stairs_right() {
}
static void decend_stairs_right() {
- int stairs_reset_frame;
-
if (kernel_anim[aa[4]].frame != local->stairs_frame) {
local->stairs_frame = kernel_anim[aa[4]].frame;
- stairs_reset_frame = -1;
if (local->stairs_frame == 2) {
kernel_seq_delete(seq[fx_steps]);
@@ -481,11 +478,6 @@ static void decend_stairs_right() {
kernel_seq_depth(seq[fx_steps], 4);
kernel_seq_loc(seq[fx_steps], PROMPT_RIGHT_X, PROMPT_RIGHT_Y);
}
-
- if (stairs_reset_frame >= 0) {
- kernel_reset_animation(aa[4], stairs_reset_frame);
- local->stairs_frame = stairs_reset_frame;
- }
}
}
@@ -517,11 +509,8 @@ static void climb_stairs_left() {
}
static void decend_stairs_left() {
- int stairs_reset_frame;
-
if (kernel_anim[aa[6]].frame != local->stairs_frame) {
local->stairs_frame = kernel_anim[aa[6]].frame;
- stairs_reset_frame = -1;
if (local->stairs_frame == 2) {
kernel_seq_delete(seq[fx_steps]);
@@ -529,11 +518,6 @@ static void decend_stairs_left() {
kernel_seq_depth(seq[fx_steps], 4);
kernel_seq_loc(seq[fx_steps], PROMPT_LEFT_X, PROMPT_LEFT_Y);
}
-
- if (stairs_reset_frame >= 0) {
- kernel_reset_animation(aa[6], stairs_reset_frame);
- local->stairs_frame = stairs_reset_frame;
- }
}
}
diff --git a/engines/mads/phantom/rooms/room310.cpp b/engines/mads/phantom/rooms/room310.cpp
index 5b0f8abd442..83419323f07 100644
--- a/engines/mads/phantom/rooms/room310.cpp
+++ b/engines/mads/phantom/rooms/room310.cpp
@@ -123,12 +123,10 @@ void set_multiplane_positions_310(int x_new) {
}
static void handle_animation_lake() {
- int lake_reset_frame;
int id;
if (kernel_anim[aa[0]].frame != local->lake_frame) {
local->lake_frame = kernel_anim[aa[0]].frame;
- lake_reset_frame = -1;
switch (local->lake_frame) {
case 60:
@@ -218,11 +216,6 @@ static void handle_animation_lake() {
kernel_message_purge();
break;
}
-
- if (lake_reset_frame >= 0) {
- kernel_reset_animation(aa[0], lake_reset_frame);
- local->lake_frame = lake_reset_frame;
- }
}
}
More information about the Scummvm-git-logs
mailing list