[Scummvm-git-logs] scummvm master -> 7170223f83e985e865c1a76465a83ea32393cbf6
bluegr
noreply at scummvm.org
Mon Mar 10 16:53:52 UTC 2025
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d8eb52a2cb DGDS: Clean up includes
88cedb80c7 DGDS: Remove dead/unimplemented code
169cdf4458 DGDS: Add missing default cases to switch statements
3f1323de73 DGDS: Simplify usage of strcmp()
8514b4b647 DGDS: Fix initializers
7170223f83 DGDS: Remove unused/superfluous code
Commit: d8eb52a2cb03ce066146114f9addfa7357133611
https://github.com/scummvm/scummvm/commit/d8eb52a2cb03ce066146114f9addfa7357133611
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:20+02:00
Commit Message:
DGDS: Clean up includes
Changed paths:
engines/dgds/clock.h
engines/dgds/console.cpp
engines/dgds/dgds.cpp
engines/dgds/dgds.h
engines/dgds/dialog.cpp
engines/dgds/dialog.h
engines/dgds/head.cpp
engines/dgds/image.cpp
engines/dgds/image.h
engines/dgds/menu.cpp
engines/dgds/menu.h
engines/dgds/metaengine.cpp
engines/dgds/minigames/china_train.cpp
engines/dgds/minigames/dragon_arcade.cpp
engines/dgds/minigames/dragon_arcade_ttm.h
engines/dgds/parser.cpp
engines/dgds/parser.h
engines/dgds/request.h
engines/dgds/resource.cpp
engines/dgds/resource.h
engines/dgds/scene.cpp
engines/dgds/scene.h
engines/dgds/scene_condition.h
engines/dgds/sound.cpp
engines/dgds/sound/drivers/amigamac1.cpp
engines/dgds/sound/drivers/map-mt32-to-gm.h
engines/dgds/sound/drivers/midi.cpp
engines/dgds/sound/drivers/mididriver.h
engines/dgds/sound/drivers/midipatch.cpp
engines/dgds/sound/midiparser_sci.cpp
engines/dgds/sound/music.cpp
engines/dgds/sound/music.h
engines/dgds/sound/resource/resource_audio.cpp
engines/dgds/sound/resource/sci_resource.cpp
engines/dgds/sound/resource/sci_resource.h
engines/dgds/sound/scispan.h
diff --git a/engines/dgds/clock.h b/engines/dgds/clock.h
index 625806088c8..f2a8df47bf5 100644
--- a/engines/dgds/clock.h
+++ b/engines/dgds/clock.h
@@ -22,7 +22,6 @@
#ifndef DGDS_CLOCK_H
#define DGDS_CLOCK_H
-#include "common/types.h"
#include "common/rect.h"
#include "common/error.h"
#include "common/serializer.h"
diff --git a/engines/dgds/console.cpp b/engines/dgds/console.cpp
index 0bdafb919ba..a4597e2e736 100644
--- a/engines/dgds/console.cpp
+++ b/engines/dgds/console.cpp
@@ -29,7 +29,6 @@
#include "dgds/ads.h"
#include "dgds/console.h"
-#include "dgds/decompress.h"
#include "dgds/dgds.h"
#include "dgds/globals.h"
#include "dgds/includes.h"
diff --git a/engines/dgds/dgds.cpp b/engines/dgds/dgds.cpp
index dbb3fe4ba66..83090a25b2a 100644
--- a/engines/dgds/dgds.cpp
+++ b/engines/dgds/dgds.cpp
@@ -27,8 +27,6 @@
#include "common/file.h"
#include "common/memstream.h"
#include "common/platform.h"
-#include "common/str-array.h"
-#include "common/stream.h"
#include "common/substream.h"
#include "common/system.h"
@@ -36,10 +34,7 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
-#include "graphics/fontman.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
-#include "graphics/surface.h"
#include "engines/advancedDetector.h"
#include "engines/util.h"
@@ -59,7 +54,6 @@
#include "dgds/parser.h"
#include "dgds/request.h"
#include "dgds/resource.h"
-#include "dgds/scripts.h"
#include "dgds/sound.h"
#include "dgds/game_palettes.h"
#include "dgds/minigames/dragon_arcade.h"
diff --git a/engines/dgds/dgds.h b/engines/dgds/dgds.h
index 559baa23613..0291b7c08d6 100644
--- a/engines/dgds/dgds.h
+++ b/engines/dgds/dgds.h
@@ -28,14 +28,11 @@
#include "common/random.h"
#include "common/serializer.h"
-#include "graphics/surface.h"
#include "graphics/managed_surface.h"
#include "engines/advancedDetector.h"
#include "engines/engine.h"
-#include "gui/debugger.h"
-
#include "dgds/resource.h"
#include "dgds/clock.h"
#include "dgds/menu.h"
diff --git a/engines/dgds/dialog.cpp b/engines/dgds/dialog.cpp
index 585723b0af0..4dea77728d5 100644
--- a/engines/dgds/dialog.cpp
+++ b/engines/dgds/dialog.cpp
@@ -22,16 +22,11 @@
#include "dgds/dialog.h"
#include "common/debug.h"
-#include "common/endian.h"
#include "common/rect.h"
#include "common/system.h"
-#include "graphics/surface.h"
-
#include "dgds/dgds.h"
-#include "dgds/includes.h"
#include "dgds/request.h"
-#include "dgds/scripts.h"
#include "dgds/scene.h"
#include "dgds/font.h"
#include "dgds/drawing.h"
diff --git a/engines/dgds/dialog.h b/engines/dgds/dialog.h
index e0352af0749..a8a299b4515 100644
--- a/engines/dgds/dialog.h
+++ b/engines/dgds/dialog.h
@@ -25,7 +25,6 @@
#include "common/stream.h"
#include "common/array.h"
#include "common/error.h"
-#include "common/rect.h"
#include "common/serializer.h"
#include "dgds/dgds_rect.h"
diff --git a/engines/dgds/head.cpp b/engines/dgds/head.cpp
index 64e5930a324..54b643cfcef 100644
--- a/engines/dgds/head.cpp
+++ b/engines/dgds/head.cpp
@@ -24,7 +24,6 @@
#include "dgds/image.h"
#include "dgds/includes.h"
#include "dgds/sound_raw.h"
-#include "dgds/drawing.h"
#include "dgds/scene.h"
#include "dgds/dialog.h"
#include "dgds/ads.h"
diff --git a/engines/dgds/image.cpp b/engines/dgds/image.cpp
index 1735f0749b6..dd26758798b 100644
--- a/engines/dgds/image.cpp
+++ b/engines/dgds/image.cpp
@@ -28,13 +28,10 @@
#include "common/system.h"
#include "common/platform.h"
#include "graphics/managed_surface.h"
-#include "graphics/surface.h"
#include "dgds/dgds.h"
-#include "dgds/font.h"
#include "dgds/includes.h"
#include "dgds/image.h"
#include "dgds/resource.h"
-#include "dgds/parser.h"
namespace Dgds {
diff --git a/engines/dgds/image.h b/engines/dgds/image.h
index b26d3eb8562..4897ecaa9ea 100644
--- a/engines/dgds/image.h
+++ b/engines/dgds/image.h
@@ -22,10 +22,9 @@
#ifndef DGDS_IMAGE_H
#define DGDS_IMAGE_H
-#include <common/ptr.h>
-#include <common/rect.h>
-#include <graphics/palette.h>
-#include <dgds/resource.h>
+#include "common/ptr.h"
+#include "common/rect.h"
+#include "dgds/resource.h"
namespace Common {
class SeekableReadStream;
diff --git a/engines/dgds/menu.cpp b/engines/dgds/menu.cpp
index eda6fe50060..66d12bd86c1 100644
--- a/engines/dgds/menu.cpp
+++ b/engines/dgds/menu.cpp
@@ -26,7 +26,6 @@
#include "graphics/font.h"
#include "graphics/fontman.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "dgds/includes.h"
diff --git a/engines/dgds/menu.h b/engines/dgds/menu.h
index fdccd0acba8..abceb9360bd 100644
--- a/engines/dgds/menu.h
+++ b/engines/dgds/menu.h
@@ -22,19 +22,7 @@
#ifndef DGDS_MENU_H
#define DGDS_MENU_H
-#include "common/error.h"
-#include "common/events.h"
-#include "common/platform.h"
-
#include "graphics/surface.h"
-#include "graphics/managed_surface.h"
-
-#include "engines/advancedDetector.h"
-#include "engines/engine.h"
-
-#include "gui/debugger.h"
-
-#include "dgds/resource.h"
#include "dgds/request.h"
namespace Dgds {
diff --git a/engines/dgds/metaengine.cpp b/engines/dgds/metaengine.cpp
index c4a2d1dae5f..3d9499c75c5 100644
--- a/engines/dgds/metaengine.cpp
+++ b/engines/dgds/metaengine.cpp
@@ -27,7 +27,6 @@
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymapper.h"
-#include "backends/keymapper/standard-actions.h"
#include "dgds/dgds.h"
diff --git a/engines/dgds/minigames/china_train.cpp b/engines/dgds/minigames/china_train.cpp
index e0770557556..85e8703c95f 100644
--- a/engines/dgds/minigames/china_train.cpp
+++ b/engines/dgds/minigames/china_train.cpp
@@ -22,7 +22,6 @@
#include "common/system.h"
#include "dgds/dgds.h"
-#include "dgds/drawing.h"
#include "dgds/globals.h"
#include "dgds/game_palettes.h"
#include "dgds/image.h"
diff --git a/engines/dgds/minigames/dragon_arcade.cpp b/engines/dgds/minigames/dragon_arcade.cpp
index e28d911dfb6..0e77ecf1426 100644
--- a/engines/dgds/minigames/dragon_arcade.cpp
+++ b/engines/dgds/minigames/dragon_arcade.cpp
@@ -33,7 +33,6 @@
#include "dgds/globals.h"
#include "dgds/game_palettes.h"
#include "dgds/menu.h"
-#include "dgds/font.h"
namespace Dgds {
diff --git a/engines/dgds/minigames/dragon_arcade_ttm.h b/engines/dgds/minigames/dragon_arcade_ttm.h
index 5c36080d644..f254b896a03 100644
--- a/engines/dgds/minigames/dragon_arcade_ttm.h
+++ b/engines/dgds/minigames/dragon_arcade_ttm.h
@@ -22,7 +22,6 @@
#ifndef DGDS_MINIGAMES_DRAGON_ARCADE_TTM_H
#define DGDS_MINIGAMES_DRAGON_ARCADE_TTM_H
-#include "common/types.h"
#include "common/ptr.h"
#include "dgds/image.h"
diff --git a/engines/dgds/parser.cpp b/engines/dgds/parser.cpp
index 850f4d6328f..c536574386b 100644
--- a/engines/dgds/parser.cpp
+++ b/engines/dgds/parser.cpp
@@ -23,7 +23,6 @@
#include "common/textconsole.h"
#include "common/str.h"
#include "common/stream.h"
-#include "common/platform.h"
#include "dgds/includes.h"
#include "dgds/resource.h"
#include "dgds/parser.h"
diff --git a/engines/dgds/parser.h b/engines/dgds/parser.h
index dc68e77103f..9e211a50dc8 100644
--- a/engines/dgds/parser.h
+++ b/engines/dgds/parser.h
@@ -22,7 +22,6 @@
#ifndef DGDS_PARSER_H
#define DGDS_PARSER_H
-#include "common/types.h"
#include "common/hashmap.h"
#include "common/str.h"
#include "common/stream.h"
diff --git a/engines/dgds/request.h b/engines/dgds/request.h
index ef7679aab2e..1aec745cb0e 100644
--- a/engines/dgds/request.h
+++ b/engines/dgds/request.h
@@ -22,7 +22,6 @@
#ifndef DGDS_REQUEST_H
#define DGDS_REQUEST_H
-#include "common/stream.h"
#include "common/array.h"
#include "dgds/parser.h"
diff --git a/engines/dgds/resource.cpp b/engines/dgds/resource.cpp
index b92b9405e9d..49481a76e16 100644
--- a/engines/dgds/resource.cpp
+++ b/engines/dgds/resource.cpp
@@ -23,7 +23,6 @@
#include "common/debug.h"
#include "common/file.h"
#include "common/memstream.h"
-#include "common/platform.h"
#include "common/str.h"
#include "common/stream.h"
#include "common/substream.h"
diff --git a/engines/dgds/resource.h b/engines/dgds/resource.h
index b0f35778b7a..867999a4e0c 100644
--- a/engines/dgds/resource.h
+++ b/engines/dgds/resource.h
@@ -25,7 +25,6 @@
#include "common/file.h"
#include "common/hashmap.h"
#include "common/platform.h"
-#include "common/stream.h"
namespace Dgds {
diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index bb4c8f61d2c..82388d1bb2a 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -26,14 +26,11 @@
#include "common/system.h"
#include "common/util.h"
-#include "graphics/surface.h"
-
#include "dgds/dgds.h"
#include "dgds/includes.h"
#include "dgds/resource.h"
#include "dgds/scene.h"
#include "dgds/ads.h"
-#include "dgds/menu.h"
#include "dgds/globals.h"
#include "dgds/inventory.h"
#include "dgds/debug_util.h"
diff --git a/engines/dgds/scene.h b/engines/dgds/scene.h
index 07279706bc9..d6913051b50 100644
--- a/engines/dgds/scene.h
+++ b/engines/dgds/scene.h
@@ -22,7 +22,6 @@
#ifndef DGDS_SCENE_H
#define DGDS_SCENE_H
-#include "common/stream.h"
#include "common/array.h"
#include "common/serializer.h"
diff --git a/engines/dgds/scene_condition.h b/engines/dgds/scene_condition.h
index 303d69a0530..af887998020 100644
--- a/engines/dgds/scene_condition.h
+++ b/engines/dgds/scene_condition.h
@@ -22,7 +22,6 @@
#ifndef DGDS_SCENE_CONDITION_H
#define DGDS_SCENE_CONDITION_H
-#include "common/types.h"
#include "common/str.h"
#include "common/array.h"
diff --git a/engines/dgds/sound.cpp b/engines/dgds/sound.cpp
index 1c71224d1f9..b93734dffd8 100644
--- a/engines/dgds/sound.cpp
+++ b/engines/dgds/sound.cpp
@@ -30,16 +30,13 @@
#include "audio/mixer.h"
#include "dgds/decompress.h"
+#include "dgds/dgds.h"
#include "dgds/includes.h"
-#include "dgds/parser.h"
#include "dgds/resource.h"
#include "dgds/sound.h"
#include "dgds/sound/music.h"
#include "dgds/sound/resource/sci_resource.h"
-#include "common/debug.h"
-
-
namespace Dgds {
static const uint16 SIGNAL_OFFSET = 0xffff;
diff --git a/engines/dgds/sound/drivers/amigamac1.cpp b/engines/dgds/sound/drivers/amigamac1.cpp
index 40813744325..7c5155c049b 100644
--- a/engines/dgds/sound/drivers/amigamac1.cpp
+++ b/engines/dgds/sound/drivers/amigamac1.cpp
@@ -27,12 +27,10 @@
#include "audio/mixer.h"
#include "audio/mods/paula.h"
#include "common/array.h"
-#include "common/debug-channels.h"
#include "common/hashmap.h"
#include "common/memstream.h"
#include "common/mutex.h"
#include "common/stream.h"
-#include "common/util.h"
namespace Dgds {
diff --git a/engines/dgds/sound/drivers/map-mt32-to-gm.h b/engines/dgds/sound/drivers/map-mt32-to-gm.h
index 0cff0c6ae59..415ff25ecd1 100644
--- a/engines/dgds/sound/drivers/map-mt32-to-gm.h
+++ b/engines/dgds/sound/drivers/map-mt32-to-gm.h
@@ -24,8 +24,6 @@
namespace Dgds {
-#include "common/list.h"
-
// Patch not mapped
#define MIDI_UNMAPPED 0xff
// Patch mapped to rhythm key
diff --git a/engines/dgds/sound/drivers/midi.cpp b/engines/dgds/sound/drivers/midi.cpp
index 56f09a34f9d..3cb4dadd637 100644
--- a/engines/dgds/sound/drivers/midi.cpp
+++ b/engines/dgds/sound/drivers/midi.cpp
@@ -20,6 +20,7 @@
*/
#include "common/config-manager.h"
+#include "common/debug.h"
#include "common/file.h"
#include "common/memstream.h"
#include "common/system.h"
diff --git a/engines/dgds/sound/drivers/mididriver.h b/engines/dgds/sound/drivers/mididriver.h
index 13f51c83956..9ea7be25b7c 100644
--- a/engines/dgds/sound/drivers/mididriver.h
+++ b/engines/dgds/sound/drivers/mididriver.h
@@ -22,10 +22,7 @@
#ifndef DGDS_SOUND_DRIVERS_MIDIDRIVER_H
#define DGDS_SOUND_DRIVERS_MIDIDRIVER_H
-#include "dgds/sound/scispan.h"
-#include "dgds/dgds.h"
#include "audio/mididrv.h"
-#include "common/error.h"
#include "common/platform.h"
namespace Dgds {
diff --git a/engines/dgds/sound/drivers/midipatch.cpp b/engines/dgds/sound/drivers/midipatch.cpp
index db50e9db0c0..5b44628aa2f 100644
--- a/engines/dgds/sound/drivers/midipatch.cpp
+++ b/engines/dgds/sound/drivers/midipatch.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/memstream.h"
-#include "common/system.h"
#include "dgds/sound/resource/sci_resource.h"
#include "dgds/dgds.h"
diff --git a/engines/dgds/sound/midiparser_sci.cpp b/engines/dgds/sound/midiparser_sci.cpp
index 40d280e4bfc..6db7bace45e 100644
--- a/engines/dgds/sound/midiparser_sci.cpp
+++ b/engines/dgds/sound/midiparser_sci.cpp
@@ -21,6 +21,7 @@
// This file was mostly copied from SCI with light modifications.
+#include "dgds/dgds.h"
#include "dgds/sound/midiparser_sci.h"
#include "dgds/sound/drivers/mididriver.h"
diff --git a/engines/dgds/sound/music.cpp b/engines/dgds/sound/music.cpp
index af7d8d7ca1c..31be9e9fae9 100644
--- a/engines/dgds/sound/music.cpp
+++ b/engines/dgds/sound/music.cpp
@@ -23,6 +23,7 @@
#include "audio/decoders/raw.h"
#include "common/config-manager.h"
+#include "dgds/dgds.h"
#include "dgds/sound/resource/sci_resource.h"
#include "dgds/sound/midiparser_sci.h"
#include "dgds/sound/music.h"
diff --git a/engines/dgds/sound/music.h b/engines/dgds/sound/music.h
index 32dfaa46da0..0b953f1b8a8 100644
--- a/engines/dgds/sound/music.h
+++ b/engines/dgds/sound/music.h
@@ -32,11 +32,11 @@
#ifndef DGDS_SOUND_MUSIC_H
#define DGDS_SOUND_MUSIC_H
-#include "common/serializer.h"
#include "common/mutex.h"
#include "audio/mixer.h"
+#include "dgds/console.h"
#include "dgds/sound/drivers/mididriver.h"
#include "dgds/sound/resource/sci_resource.h"
diff --git a/engines/dgds/sound/resource/resource_audio.cpp b/engines/dgds/sound/resource/resource_audio.cpp
index d81b4f549ae..cf008b12e92 100644
--- a/engines/dgds/sound/resource/resource_audio.cpp
+++ b/engines/dgds/sound/resource/resource_audio.cpp
@@ -24,7 +24,6 @@
#include "common/archive.h"
#include "common/file.h"
#include "common/textconsole.h"
-#include "common/memstream.h"
#include "dgds/sound/resource/sci_resource.h"
#include "dgds/sound/scispan.h"
diff --git a/engines/dgds/sound/resource/sci_resource.cpp b/engines/dgds/sound/resource/sci_resource.cpp
index 496d88f2260..f33beae21ed 100644
--- a/engines/dgds/sound/resource/sci_resource.cpp
+++ b/engines/dgds/sound/resource/sci_resource.cpp
@@ -22,7 +22,6 @@
// Resource library
#include "common/file.h"
-#include "common/fs.h"
#include "dgds/sound/resource/sci_resource.h"
#include "dgds/sound/scispan.h"
diff --git a/engines/dgds/sound/resource/sci_resource.h b/engines/dgds/sound/resource/sci_resource.h
index e6e31fd2bda..6cb34951b17 100644
--- a/engines/dgds/sound/resource/sci_resource.h
+++ b/engines/dgds/sound/resource/sci_resource.h
@@ -22,11 +22,6 @@
#ifndef DGDS_SOUND_RESOURCE_SCI_RESOURCE_H
#define DGDS_SOUND_RESOURCE_SCI_RESOURCE_H
-#include "common/str.h"
-#include "common/list.h"
-#include "common/hashmap.h"
-
-#include "dgds/dgds.h"
#include "dgds/sound/scispan.h"
namespace Common {
diff --git a/engines/dgds/sound/scispan.h b/engines/dgds/sound/scispan.h
index 0642f3ac16c..5c4211c4d9c 100644
--- a/engines/dgds/sound/scispan.h
+++ b/engines/dgds/sound/scispan.h
@@ -28,7 +28,6 @@
#include "common/memstream.h"
#include "common/scummsys.h"
#include "common/str.h"
-#include "common/textconsole.h"
namespace Dgds {
Commit: 88cedb80c7bced9d138efc05d9038bf887b651f2
https://github.com/scummvm/scummvm/commit/88cedb80c7bced9d138efc05d9038bf887b651f2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:21+02:00
Commit Message:
DGDS: Remove dead/unimplemented code
Changed paths:
engines/dgds/clock.h
engines/dgds/dgds.cpp
engines/dgds/request.h
diff --git a/engines/dgds/clock.h b/engines/dgds/clock.h
index f2a8df47bf5..b13c02e2d6d 100644
--- a/engines/dgds/clock.h
+++ b/engines/dgds/clock.h
@@ -40,8 +40,6 @@ public:
Clock();
void addGameTime(int mins);
- void setTime(int16 month, int16 day, int16 hour, int16 minute);
-
Common::String getTimeStr() const;
void draw(Graphics::ManagedSurface &surf);
void toggleVisibleUser() { _visibleUser = !_visibleUser; }
diff --git a/engines/dgds/dgds.cpp b/engines/dgds/dgds.cpp
index 83090a25b2a..0f8aa72329a 100644
--- a/engines/dgds/dgds.cpp
+++ b/engines/dgds/dgds.cpp
@@ -593,9 +593,7 @@ void DgdsEngine::pumpMessages() {
}
void DgdsEngine::dimPalForWillyDialog(bool force) {
- WillyGlobals *globals = static_cast<WillyGlobals *>(_gameGlobals);
- int16 fade = globals->getPalFade();
- fade = CLIP(fade, (int16)0, (int16)255);
+ int16 fade;
// TODO: Same constants are in globals.cpp
static const int FADE_STARTCOL = 0x40;
diff --git a/engines/dgds/request.h b/engines/dgds/request.h
index 1aec745cb0e..f62f9560dfb 100644
--- a/engines/dgds/request.h
+++ b/engines/dgds/request.h
@@ -162,8 +162,6 @@ public:
///
int16 onClick(const Common::Point &mousePt);
- // Returns true if the mouse is over the handle and a drag operation should start
- bool onMouseDown(const Common::Point &mousePt);
void onDrag(const Common::Point &mousePt);
// returns the new value
int16 onDragFinish(const Common::Point &mousePt);
Commit: 169cdf4458d41c2f6ee7461c0dc3a8796cb19b36
https://github.com/scummvm/scummvm/commit/169cdf4458d41c2f6ee7461c0dc3a8796cb19b36
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:22+02:00
Commit Message:
DGDS: Add missing default cases to switch statements
Changed paths:
engines/dgds/image.cpp
engines/dgds/sound/drivers/amigamac1.cpp
diff --git a/engines/dgds/image.cpp b/engines/dgds/image.cpp
index dd26758798b..3b001c52547 100644
--- a/engines/dgds/image.cpp
+++ b/engines/dgds/image.cpp
@@ -649,6 +649,8 @@ bool Image::loadSCN(Graphics::ManagedSurface *surf, Common::SeekableReadStream *
x += val;
break;
}
+ default:
+ break;
}
lastcmd = cmd;
if (x > tw)
diff --git a/engines/dgds/sound/drivers/amigamac1.cpp b/engines/dgds/sound/drivers/amigamac1.cpp
index 7c5155c049b..24526eebd27 100644
--- a/engines/dgds/sound/drivers/amigamac1.cpp
+++ b/engines/dgds/sound/drivers/amigamac1.cpp
@@ -875,6 +875,8 @@ void MidiPlayer_AmigaMac1::send(uint32 b) {
if (v->_channel == channel && v->_note != -1)
v->noteOff();
}
+ default:
+ break;
}
break;
case 0xc0:
@@ -883,6 +885,8 @@ void MidiPlayer_AmigaMac1::send(uint32 b) {
case 0xe0:
channel->setPitchWheel((op2 << 7) | op1);
break;
+ default:
+ break;
}
}
Commit: 3f1323de73621786bfd23eb51e6e6e8e2d62f6d5
https://github.com/scummvm/scummvm/commit/3f1323de73621786bfd23eb51e6e6e8e2d62f6d5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:23+02:00
Commit Message:
DGDS: Simplify usage of strcmp()
Changed paths:
engines/dgds/resource.cpp
diff --git a/engines/dgds/resource.cpp b/engines/dgds/resource.cpp
index 49481a76e16..39411ba4aa3 100644
--- a/engines/dgds/resource.cpp
+++ b/engines/dgds/resource.cpp
@@ -208,59 +208,57 @@ bool DgdsChunkReader::isPacked() const {
packed = !strcmp(_idStr, "DDS:");
break;
case EX_OVL:
- if (0) {
- } else if (strcmp(_idStr, "ADL:") == 0)
+ if (!strcmp(_idStr, "ADL:"))
packed = true;
- else if (strcmp(_idStr, "ADS:") == 0)
+ else if (!strcmp(_idStr, "ADS:"))
packed = true;
- else if (strcmp(_idStr, "APA:") == 0)
+ else if (!strcmp(_idStr, "APA:"))
packed = true;
- else if (strcmp(_idStr, "ASB:") == 0)
+ else if (!strcmp(_idStr, "ASB:"))
packed = true;
- else if (strcmp(_idStr, "GMD:") == 0)
+ else if (!strcmp(_idStr, "GMD:"))
packed = true;
- else if (strcmp(_idStr, "M32:") == 0)
+ else if (!strcmp(_idStr, "M32:"))
packed = true;
- else if (strcmp(_idStr, "NLD:") == 0)
+ else if (!strcmp(_idStr, "NLD:"))
packed = true;
- else if (strcmp(_idStr, "PRO:") == 0)
+ else if (!strcmp(_idStr, "PRO:"))
packed = true;
- else if (strcmp(_idStr, "PS1:") == 0)
+ else if (!strcmp(_idStr, "PS1:"))
packed = true;
- else if (strcmp(_idStr, "SBL:") == 0)
+ else if (!strcmp(_idStr, "SBL:"))
packed = true;
- else if (strcmp(_idStr, "SBP:") == 0)
+ else if (!strcmp(_idStr, "SBP:"))
packed = true;
- else if (strcmp(_idStr, "STD:") == 0)
+ else if (!strcmp(_idStr, "STD:"))
packed = true;
- else if (strcmp(_idStr, "TAN:") == 0)
+ else if (!strcmp(_idStr, "TAN:"))
packed = true;
- else if (strcmp(_idStr, "T3V:") == 0)
+ else if (!strcmp(_idStr, "T3V:"))
packed = true;
- else if (strcmp(_idStr, "001:") == 0)
+ else if (!strcmp(_idStr, "001:"))
packed = true;
- else if (strcmp(_idStr, "003:") == 0)
+ else if (!strcmp(_idStr, "003:"))
packed = true;
- else if (strcmp(_idStr, "004:") == 0)
+ else if (!strcmp(_idStr, "004:"))
packed = true;
- else if (strcmp(_idStr, "005:") == 0)
+ else if (!strcmp(_idStr, "005:"))
packed = true;
- else if (strcmp(_idStr, "007:") == 0)
+ else if (!strcmp(_idStr, "007:"))
packed = true;
- else if (strcmp(_idStr, "009:") == 0)
+ else if (!strcmp(_idStr, "009:"))
packed = true;
- else if (strcmp(_idStr, "101:") == 0)
+ else if (!strcmp(_idStr, "101:"))
packed = true;
- else if (strcmp(_idStr, "VGA:") == 0)
+ else if (!strcmp(_idStr, "VGA:"))
packed = true;
- else if (strcmp(_idStr, "EGA:") == 0)
+ else if (!strcmp(_idStr, "EGA:"))
packed = true;
- else if (strcmp(_idStr, "HCG:") == 0)
+ else if (!strcmp(_idStr, "HCG:"))
packed = true;
break;
case EX_TDS:
- if (0) {
- } else if (strcmp(_idStr, "TDS:") == 0)
+ if (!strcmp(_idStr, "TDS:"))
packed = true; /* ? */
break;
default:
Commit: 8514b4b647da7bfe9636dda99bcc02f67a59a9a8
https://github.com/scummvm/scummvm/commit/8514b4b647da7bfe9636dda99bcc02f67a59a9a8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:24+02:00
Commit Message:
DGDS: Fix initializers
Changed paths:
engines/dgds/sound/drivers/mididriver.h
engines/dgds/sound/drivers/midipatch.cpp
diff --git a/engines/dgds/sound/drivers/mididriver.h b/engines/dgds/sound/drivers/mididriver.h
index 9ea7be25b7c..724acab08ef 100644
--- a/engines/dgds/sound/drivers/mididriver.h
+++ b/engines/dgds/sound/drivers/mididriver.h
@@ -77,7 +77,7 @@ protected:
int8 _reverb;
public:
- MidiPlayer() : _driver(0), _reverb(-1) {}
+ MidiPlayer() : _driver(nullptr), _reverb(-1) {}
virtual int open() { return _driver->open(); }
virtual void close() { _driver->close(); }
diff --git a/engines/dgds/sound/drivers/midipatch.cpp b/engines/dgds/sound/drivers/midipatch.cpp
index 5b44628aa2f..645fd530351 100644
--- a/engines/dgds/sound/drivers/midipatch.cpp
+++ b/engines/dgds/sound/drivers/midipatch.cpp
@@ -49,7 +49,7 @@ SciResource *getMidiPatchData(int num) {
ResourceManager *resource = engine->getResourceManager();
Decompressor *decomp = engine->getDecompressor();
ResourceManager *fddMgr = nullptr;
- Common::SeekableReadStream *ovlStream;
+ Common::SeekableReadStream *ovlStream = nullptr;
int resNum = 0;
for (; resNum < ARRAYSIZE(PATCH_RESOURCES); resNum++) {
Commit: 7170223f83e985e865c1a76465a83ea32393cbf6
https://github.com/scummvm/scummvm/commit/7170223f83e985e865c1a76465a83ea32393cbf6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-10T18:53:25+02:00
Commit Message:
DGDS: Remove unused/superfluous code
Changed paths:
engines/dgds/menu.cpp
diff --git a/engines/dgds/menu.cpp b/engines/dgds/menu.cpp
index 66d12bd86c1..7976e346631 100644
--- a/engines/dgds/menu.cpp
+++ b/engines/dgds/menu.cpp
@@ -490,6 +490,8 @@ void Menu::onMouseLUp(const Common::Point &mouse) {
case kMenuSliderControlsDetailLevel:
engine->setDetailLevel(static_cast<DgdsDetailLevel>(setting));
break;
+ default:
+ break;
}
drawMenu(_curMenu);
_dragGadget = nullptr;
@@ -507,7 +509,7 @@ void Menu::onMouseLUp(const Common::Point &mouse) {
if (dynamic_cast<ButtonGadget *>(gadget) && !_vcrHelpMode) {
gadget->toggle(false);
if (_curMenu == kMenuOptions)
- isToggle = updateOptionsGadget(gadget);
+ /*isToggle = */updateOptionsGadget(gadget);
drawMenu(_curMenu, false);
g_system->delayMillis(300);
gadget->toggle(true);
@@ -614,8 +616,6 @@ bool Menu::handleClick(const Common::Point &mouse) {
break;
//case kMenuCalibrateVCR: // NOTE: same ID as kMenuIntroPlay
case kMenuIntroPlay:
- drawMenu(kMenuMain);
- break;
case kMenuControlsVCR:
case kMenuOptionsVCR:
//case kMenuCalibrateVCRHoC:
More information about the Scummvm-git-logs
mailing list