[Scummvm-git-logs] scummvm master -> 6e4a4ea2d366d3502df90acefea46c63d9356354
sev-
noreply at scummvm.org
Wed Sep 3 11:45:14 UTC 2025
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:
952619165d ACCESS: Fix warning
f7b6164f37 ALCACHOFA: Comment out unused variable
641f42f4ca MACVENTURE: Remove unused variable
6e4a4ea2d3 ZVISION: Remove unused class variables
Commit: 952619165d93ff0f4e86c03ccc167fdfa63efb2c
https://github.com/scummvm/scummvm/commit/952619165d93ff0f4e86c03ccc167fdfa63efb2c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-03T13:41:33+02:00
Commit Message:
ACCESS: Fix warning
Changed paths:
engines/access/scripts.cpp
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 6936157f84d..d4c59dc62a8 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -136,7 +136,7 @@ void Scripts::setOpcodes_v2() {
}
void Scripts::setScript(Resource *res, bool restartFlag) {
- debugC(1, kDebugScripts, "setScript(res=%p (%s), restartFlag=%d)", res, res->getFileName(), restartFlag);
+ debugC(1, kDebugScripts, "setScript(res=%p (%s), restartFlag=%d)", (void *)res, res->getFileName(), restartFlag);
_resource = res;
_data = res->_stream;
_endFlag = restartFlag;
Commit: f7b6164f379a8fa03721963c0fec72c90ae7b811
https://github.com/scummvm/scummvm/commit/f7b6164f379a8fa03721963c0fec72c90ae7b811
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-03T13:41:50+02:00
Commit Message:
ALCACHOFA: Comment out unused variable
Changed paths:
engines/alcachofa/graphics-opengl-shaders.cpp
diff --git a/engines/alcachofa/graphics-opengl-shaders.cpp b/engines/alcachofa/graphics-opengl-shaders.cpp
index ecec9016e4d..5151737c0f7 100644
--- a/engines/alcachofa/graphics-opengl-shaders.cpp
+++ b/engines/alcachofa/graphics-opengl-shaders.cpp
@@ -196,7 +196,7 @@ private:
Array<VBO> _vbos;
Array<Vertex> _vertices;
uint _curVBO = 0;
- uint _usedTextureUnits = 0;
+// uint _usedTextureUnits = 0;
bool _needsNewBatch = false;
OpenGLTexture *_batchTexture = nullptr;
ScopedPtr<OpenGLTexture> _whiteTexture;
Commit: 641f42f4ca8f4be936d0639c428f8b3a898a4b23
https://github.com/scummvm/scummvm/commit/641f42f4ca8f4be936d0639c428f8b3a898a4b23
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-03T13:42:47+02:00
Commit Message:
MACVENTURE: Remove unused variable
Changed paths:
engines/macventure/dialog.h
diff --git a/engines/macventure/dialog.h b/engines/macventure/dialog.h
index a1b4e9538c2..9a88982b8fa 100644
--- a/engines/macventure/dialog.h
+++ b/engines/macventure/dialog.h
@@ -75,7 +75,6 @@ private:
private:
Gui *_gui;
- Graphics::MacWindowManager *_wm;
Common::String _userInput;
Common::Array<DialogElement*> _elements;
Commit: 6e4a4ea2d366d3502df90acefea46c63d9356354
https://github.com/scummvm/scummvm/commit/6e4a4ea2d366d3502df90acefea46c63d9356354
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-03T13:44:52+02:00
Commit Message:
ZVISION: Remove unused class variables
Changed paths:
engines/zvision/sound/volume_manager.cpp
engines/zvision/sound/volume_manager.h
engines/zvision/text/string_manager.cpp
engines/zvision/text/string_manager.h
diff --git a/engines/zvision/sound/volume_manager.cpp b/engines/zvision/sound/volume_manager.cpp
index 341daded96f..0cf54855ebe 100644
--- a/engines/zvision/sound/volume_manager.cpp
+++ b/engines/zvision/sound/volume_manager.cpp
@@ -28,7 +28,7 @@ namespace ZVision {
// Power law with exponent 1.5.
static constexpr uint8 powerLaw[256] = {
- 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4,
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4,
4, 4, 5, 5, 6, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11,
11, 12, 12, 13, 14, 14, 15, 15, 16, 16, 17, 18, 18, 19, 20, 20,
21, 21, 22, 23, 23, 24, 25, 26, 26, 27, 28, 28, 29, 30, 31, 31,
@@ -54,7 +54,7 @@ static constexpr uint8 logPower[256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3,
@@ -67,19 +67,19 @@ static constexpr uint8 logPower[256] = {
// */
static constexpr uint8 logAmplitude[256] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5,
- 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8,
- 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 12, 12,
- 2, 13, 13, 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, 18, 18, 19,
- 19, 20, 20, 21, 21, 22, 23, 23, 24, 24, 25, 26, 27, 27, 28, 29,
- 30, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45,
- 46, 47, 48, 50, 51, 52, 54, 55, 57, 58, 60, 62, 63, 65, 67, 69,
+ 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5,
+ 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8,
+ 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 12, 12,
+ 2, 13, 13, 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, 18, 18, 19,
+ 19, 20, 20, 21, 21, 22, 23, 23, 24, 24, 25, 26, 27, 27, 28, 29,
+ 30, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45,
+ 46, 47, 48, 50, 51, 52, 54, 55, 57, 58, 60, 62, 63, 65, 67, 69,
71, 73, 75, 77, 79, 81, 83, 86, 88, 90, 93, 96, 98,101,104,107,
110,113,116,119,122,126,129,133,136,140,144,148,152,156,160,165,
169,174,179,184,189,194,200,205,211,217,222,229,235,241,248,255
@@ -133,7 +133,6 @@ static constexpr uint8 directionalAmplitude[181] = {
};
VolumeManager::VolumeManager(ZVision *engine, volumeScaling mode) :
- _engine(engine),
_mode(mode) {
}
diff --git a/engines/zvision/sound/volume_manager.h b/engines/zvision/sound/volume_manager.h
index 4c587a910b2..76950dc679d 100644
--- a/engines/zvision/sound/volume_manager.h
+++ b/engines/zvision/sound/volume_manager.h
@@ -55,9 +55,8 @@ public:
#if defined(USE_MPEG2) && defined(USE_A52)
double getVobAmplification(Common::String fileName) const;
#endif
-
+
private:
- ZVision *_engine;
uint _scriptScale = 100; // Z-Vision scripts internally use a volume scale of 0-100; ScummVM uses a scale of 0-255.
volumeScaling _mode = kVolumeLinear;
};
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index c83f4d09074..4e5a2583d1a 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -30,8 +30,7 @@
namespace ZVision {
-StringManager::StringManager(ZVision *engine)
- : _engine(engine) {
+StringManager::StringManager(ZVision *engine) {
}
StringManager::~StringManager() {
diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h
index 286adf62e8d..b1f6170342c 100644
--- a/engines/zvision/text/string_manager.h
+++ b/engines/zvision/text/string_manager.h
@@ -51,7 +51,6 @@ private:
};
private:
- ZVision *_engine;
Common::String _lines[NUM_TEXT_LINES];
public:
More information about the Scummvm-git-logs
mailing list