[Scummvm-git-logs] scummvm master -> ea91bb50c3c775288617e6a8356712045dc51bc6
dreammaster
noreply at scummvm.org
Sun Aug 16 07:22:42 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e85206ee66 MADS: NEBULAR: Fix warnings. PVS-Studio V1037, V1048, V1037, V519
1203c2142e MADS: NEBULAR: Fix warnings. PVS-Studio V560, V519, V547, V1048
9183998cee MADS: NEBULAR: Fix warnings. PVS-Studio V519, V0137, V1048
ea91bb50c3 MADS: NEBULAR: Don't make ASound::command0 virtual. PVS-Studio V1053
Commit: e85206ee660f2874de95d9c19ce6dad4b1005924
https://github.com/scummvm/scummvm/commit/e85206ee660f2874de95d9c19ce6dad4b1005924
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T17:22:32+10:00
Commit Message:
MADS: NEBULAR: Fix warnings. PVS-Studio V1037, V1048, V1037, V519
Changed paths:
engines/mads/nebular/rooms/room319.cpp
engines/mads/nebular/rooms/room351.cpp
engines/mads/nebular/rooms/room402.cpp
engines/mads/nebular/rooms/room501.cpp
diff --git a/engines/mads/nebular/rooms/room319.cpp b/engines/mads/nebular/rooms/room319.cpp
index b9d9642dd3d..4479a2b9208 100644
--- a/engines/mads/nebular/rooms/room319.cpp
+++ b/engines/mads/nebular/rooms/room319.cpp
@@ -186,6 +186,7 @@ static void room_319_daemon() {
break;
case 29:
+ case 115:
local._slacheReady = true;
break;
@@ -214,10 +215,6 @@ static void room_319_daemon() {
}
break;
- case 115:
- local._slacheReady = true;
- break;
-
case 129:
if (local._nextAction1 == 3) {
nextFrame = 115;
diff --git a/engines/mads/nebular/rooms/room351.cpp b/engines/mads/nebular/rooms/room351.cpp
index 2ca11ee6748..e4e87130bd8 100644
--- a/engines/mads/nebular/rooms/room351.cpp
+++ b/engines/mads/nebular/rooms/room351.cpp
@@ -70,7 +70,7 @@ static void room_351_init() {
case 1:
suffixNum = 0;
trigger = 60;
- global[kTeleporterCommand] = true;
+ global[kTeleporterUnderstood] = true;
break;
case 2:
@@ -83,7 +83,6 @@ static void room_351_init() {
player.walker_visible = true;
player.commands_allowed = true;
player.turn_to_facing = FACING_SOUTH;
- suffixNum = -1;
break;
default:
diff --git a/engines/mads/nebular/rooms/room402.cpp b/engines/mads/nebular/rooms/room402.cpp
index 9ea94ae380d..069e5287802 100644
--- a/engines/mads/nebular/rooms/room402.cpp
+++ b/engines/mads/nebular/rooms/room402.cpp
@@ -1488,7 +1488,7 @@ static void room_402_daemon() {
break;
case 62:
- {
+ case 72: {
int seqIdx = g_sequence_ids[13];
g_sequence_ids[13] = kernel_seq_stamp(g_sprite_ids[13], false, 2);
kernel_seq_timeout(seqIdx, g_sequence_ids[13]);
@@ -1586,15 +1586,6 @@ static void room_402_daemon() {
local._activeArrows = true;
break;
- case 72:
- {
- int seqIdx = g_sequence_ids[13];
- g_sequence_ids[13] = kernel_seq_stamp(g_sprite_ids[13], false, 2);
- kernel_seq_timeout(seqIdx, g_sequence_ids[13]);
- kernel_seq_depth(g_sequence_ids[13], 8);
- }
- break;
-
case 73:
kernel_message_purge();
kernel_message_add(quote_string(kernel.quotes, 0x207), 177, 33, 0xFBFA, 150, 0, 0);
diff --git a/engines/mads/nebular/rooms/room501.cpp b/engines/mads/nebular/rooms/room501.cpp
index 74006dddf37..830b54d0907 100644
--- a/engines/mads/nebular/rooms/room501.cpp
+++ b/engines/mads/nebular/rooms/room501.cpp
@@ -108,7 +108,6 @@ static void room_501_init() {
local._rexPunched = true;
if (previous_room == 504) {
- player.commands_allowed = false;
player.x = 74;
player.y = 121;
player.facing = FACING_NORTHWEST;
Commit: 1203c2142e5a8d8bff64d04820e68403bc9cbed5
https://github.com/scummvm/scummvm/commit/1203c2142e5a8d8bff64d04820e68403bc9cbed5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T17:22:32+10:00
Commit Message:
MADS: NEBULAR: Fix warnings. PVS-Studio V560, V519, V547, V1048
Changed paths:
engines/mads/nebular/rooms/room511.cpp
engines/mads/nebular/rooms/room607.cpp
engines/mads/nebular/rooms/room608.cpp
diff --git a/engines/mads/nebular/rooms/room511.cpp b/engines/mads/nebular/rooms/room511.cpp
index c99972623fb..1c80b1bd944 100644
--- a/engines/mads/nebular/rooms/room511.cpp
+++ b/engines/mads/nebular/rooms/room511.cpp
@@ -276,7 +276,7 @@ static void room_511_parser() {
text_show(51131);
else if (global[kLineStatus] == 1)
text_show(51130);
- else if (!global[kBoatRaised] && local._handingLine) {
+ else if (local._handingLine) {
if (global[kLineStatus] != 3) {
if (kernel.trigger == 0) {
player.commands_allowed = false;
diff --git a/engines/mads/nebular/rooms/room607.cpp b/engines/mads/nebular/rooms/room607.cpp
index 49736a929b5..9eaa61b65ba 100644
--- a/engines/mads/nebular/rooms/room607.cpp
+++ b/engines/mads/nebular/rooms/room607.cpp
@@ -256,7 +256,7 @@ static void room_607_daemon() {
break;
case 64:
- if (local._dogEatsRex && (local._animationActive == 1)) {
+ if (local._animationActive == 1) {
g_engine->_soundManager->command(12, 0);
kernel_timing_trigger(10, 64);
}
diff --git a/engines/mads/nebular/rooms/room608.cpp b/engines/mads/nebular/rooms/room608.cpp
index c1edf5b1434..a156b721c8b 100644
--- a/engines/mads/nebular/rooms/room608.cpp
+++ b/engines/mads/nebular/rooms/room608.cpp
@@ -391,7 +391,6 @@ static void room_608_daemon() {
}
if (local._dogRunTimer >= 480 && !local._checkFl && !local._buttonPressedonTimeFl && !local._dogFirstEncounter && local._dogUnderCar && local._dogActiveFl) {
- local._checkFl = true;
local._dogSquashFl = false;
local._dogSafeFl = true;
local._checkFl = false;
@@ -828,7 +827,6 @@ static void room_608_parser() {
else if (local._dogDeathMode == 2) {
global[kCarStatus] = CAR_SQUASHES_DOG_AGAIN;
local._carMode = 3;
- local._dogDeathMode = 2;
}
kernel_delete_dynamic(local._carHotspotId);
int idx = kernel_add_dynamic(words_car, words_walkto, 0, -1, 99, 69, 82, 25);
@@ -868,15 +866,12 @@ static void room_608_parser() {
|| player_said_3(throw, bones, danger_zone) || player_said_3(throw, bone, danger_zone)) {
player.commands_allowed = true;
if ((global[kCarStatus] == CAR_UP) && local._dogActiveFl) {
- if (local._dogActiveFl) {
- if (kernel.trigger == 0) {
- kernel_message_purge();
- kernel_message_add(quote_string(kernel.quotes, 0x301), 0, 0, 0x1110, 120, 0, 34);
- }
- local._throwMode = 6;
- handleThrowingBone();
- } else
- text_show(60841);
+ if (kernel.trigger == 0) {
+ kernel_message_purge();
+ kernel_message_add(quote_string(kernel.quotes, 0x301), 0, 0, 0x1110, 120, 0, 34);
+ }
+ local._throwMode = 6;
+ handleThrowingBone();
} else
text_show(60842);
} else if (player_said_2(take, polycement) && (kernel.trigger || !player_has(OBJ_POLYCEMENT))) {
Commit: 9183998ceea0a763071a76a6cc70e159ebb50159
https://github.com/scummvm/scummvm/commit/9183998ceea0a763071a76a6cc70e159ebb50159
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T17:22:32+10:00
Commit Message:
MADS: NEBULAR: Fix warnings. PVS-Studio V519, V0137, V1048
Changed paths:
engines/mads/nebular/rooms/room610.cpp
engines/mads/nebular/rooms/room704.cpp
engines/mads/nebular/rooms/room751.cpp
engines/mads/nebular/rooms/teleporter.cpp
diff --git a/engines/mads/nebular/rooms/room610.cpp b/engines/mads/nebular/rooms/room610.cpp
index 8127c7863f1..dfb5911debf 100644
--- a/engines/mads/nebular/rooms/room610.cpp
+++ b/engines/mads/nebular/rooms/room610.cpp
@@ -87,12 +87,9 @@ static void room_610_daemon() {
local._lastFrameTimer = kernel.clock;
}
- // CHECKME: local._checkVal is always false, could be removed
- if ((local._cellChargingTimer >= 60) && !local._checkVal) {
- local._checkVal = true;
+ if (local._cellChargingTimer >= 3600) {
global[kHandsetCellStatus] = 1;
local._cellCharging = false;
- local._checkVal = false;
local._cellChargingTimer = 0;
}
}
diff --git a/engines/mads/nebular/rooms/room704.cpp b/engines/mads/nebular/rooms/room704.cpp
index 212318987ab..836a5d5516c 100644
--- a/engines/mads/nebular/rooms/room704.cpp
+++ b/engines/mads/nebular/rooms/room704.cpp
@@ -248,6 +248,7 @@ static void room_704_daemon() {
break;
case 90:
+ case 98:
if (local._takeBottleFl) {
kernel_seq_delete(g_sequence_ids[1]);
kernel_delete_dynamic(local._bottleHotspotId);
@@ -265,16 +266,6 @@ static void room_704_daemon() {
}
break;
- case 98:
- if (local._takeBottleFl) {
- kernel_seq_delete(g_sequence_ids[1]);
- kernel_delete_dynamic(local._bottleHotspotId);
- inter_give_to_player(OBJ_BOTTLE);
- g_engine->_soundManager->command(15, 0);
- object_examine(OBJ_BOTTLE, 70415, 0);
- }
- break;
-
case 101:
nextFrame = 8;
if (!player.commands_allowed && !local._takeBottleFl) {
diff --git a/engines/mads/nebular/rooms/room751.cpp b/engines/mads/nebular/rooms/room751.cpp
index 860053ff92e..a262840939e 100644
--- a/engines/mads/nebular/rooms/room751.cpp
+++ b/engines/mads/nebular/rooms/room751.cpp
@@ -77,7 +77,6 @@ static void room_751_init() {
player.commands_allowed = false;
kernel_timing_trigger(60, 60);
} else if (local._rexHandingLine) {
- player.walker_visible = false;
player.x = 268;
player.y = 140;
player.facing = FACING_NORTHWEST;
diff --git a/engines/mads/nebular/rooms/teleporter.cpp b/engines/mads/nebular/rooms/teleporter.cpp
index 88638c0179e..64c48b09d3e 100644
--- a/engines/mads/nebular/rooms/teleporter.cpp
+++ b/engines/mads/nebular/rooms/teleporter.cpp
@@ -44,11 +44,9 @@ static char _msgText2[256];
void teleporter_init() {
_buttonTyped = -1;
- _curCode = -1;
_digitCount = -1;
_curMessageId = -1;
_handSequenceId = -1;
- _finishedCodeCounter = -1;
_meteorologistNextPlace = -1;
_meteorologistCurPlace = -1;
_teleporterSceneId = -1;
@@ -60,7 +58,6 @@ void teleporter_init() {
_curCode = 0;
_digitCount = 0;
_finishedCodeCounter = 0;
- _curMessageId = -1;
Common::strcpy_s(_msgText2, "_");
if (previous_room == KERNEL_RESTORING_GAME)
Commit: ea91bb50c3c775288617e6a8356712045dc51bc6
https://github.com/scummvm/scummvm/commit/ea91bb50c3c775288617e6a8356712045dc51bc6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-16T17:22:32+10:00
Commit Message:
MADS: NEBULAR: Don't make ASound::command0 virtual. PVS-Studio V1053
Changed paths:
engines/mads/nebular/sound/asound.h
engines/mads/nebular/sound/asound_nebular.h
diff --git a/engines/mads/nebular/sound/asound.h b/engines/mads/nebular/sound/asound.h
index 83f2a3b25f5..f72c040aadc 100644
--- a/engines/mads/nebular/sound/asound.h
+++ b/engines/mads/nebular/sound/asound.h
@@ -284,7 +284,7 @@ protected:
*/
byte *getDataPtr(int nearPtr);
- virtual int command0();
+ int command0();
int command1();
int command2();
int command3();
diff --git a/engines/mads/nebular/sound/asound_nebular.h b/engines/mads/nebular/sound/asound_nebular.h
index 907d586be79..3378fc00493 100644
--- a/engines/mads/nebular/sound/asound_nebular.h
+++ b/engines/mads/nebular/sound/asound_nebular.h
@@ -130,7 +130,7 @@ private:
typedef int (ASound2:: *CommandPtr)();
static const CommandPtr _commandList[44];
- int command0() override;
+ int command0();
int command9();
int command10();
int command11();
More information about the Scummvm-git-logs
mailing list