[Scummvm-git-logs] scummvm master -> a71d0c93dc0994dbf004d5e9be5d7fff76006c76
bluegr
noreply at scummvm.org
Sat Aug 17 06:25:02 UTC 2024
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
52b297c406 ACCESS: Fix -Wunused-private-field warning
6624f0b641 MM: Fix -Wunused-private-field warning
12b7c5b3e8 VCRUISE: Fix -Wunused-private-field warnings
579a272211 GRIM: Fix -Wunused-private-field warning when there's no GL_ARB_fragment_program
63afc9507b MORTEVIELLE: Fix -Wunused-but-set-variable warning
eae4bfa4b3 PRINCE: Fix -Wunused-but-set-variable warning
79559c1ae1 SHERLOCK: Fix -Wunused-but-set-variable warning
847aaf383f TOON: Fix -Wunused-but-set-variable warning
c5d9f564cd TOUCHE: Fix -Wunused-but-set-variable warning
62e17d5dc2 ICB: Fix -Wunused-but-set-variable warning
a71d0c93dc STARTREK: Fix -Wunused-but-set-variable warning
Commit: 52b297c406d6a259ba1a4902bf4ec0104df0caf5
https://github.com/scummvm/scummvm/commit/52b297c406d6a259ba1a4902bf4ec0104df0caf5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
ACCESS: Fix -Wunused-private-field warning
(Probably committed by mistake in the current keymapper integration tasks)
Changed paths:
engines/access/events.h
diff --git a/engines/access/events.h b/engines/access/events.h
index 76e204313a8..75551de7fcd 100644
--- a/engines/access/events.h
+++ b/engines/access/events.h
@@ -48,7 +48,6 @@ private:
uint32 _priorFrameTime;
uint32 _priorTimerTime;
Common::KeyCode _keyCode;
- Common::CustomEventType _customAction;
Graphics::Surface _invCursor;
bool checkForNextFrameCounter();
Commit: 6624f0b641773ebfd677494084fd1ddaeba5bd9e
https://github.com/scummvm/scummvm/commit/6624f0b641773ebfd677494084fd1ddaeba5bd9e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
MM: Fix -Wunused-private-field warning
Changed paths:
engines/mm/shared/xeen/sound_driver_mt32.h
diff --git a/engines/mm/shared/xeen/sound_driver_mt32.h b/engines/mm/shared/xeen/sound_driver_mt32.h
index 280f42f9b94..b9efef9db38 100644
--- a/engines/mm/shared/xeen/sound_driver_mt32.h
+++ b/engines/mm/shared/xeen/sound_driver_mt32.h
@@ -44,7 +44,6 @@ public:
private:
static const uint8 MIDI_NOTE_MAP[24];
private:
- MidiChannel *_midiChannels[CHANNEL_COUNT];
Common::Queue<MidiValue> _queue;
Common::Mutex _driverMutex;
const byte *_musInstrumentPtrs[16];
Commit: 12b7c5b3e805edd9529d1927c6422937d992531a
https://github.com/scummvm/scummvm/commit/12b7c5b3e805edd9529d1927c6422937d992531a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
VCRUISE: Fix -Wunused-private-field warnings
Changed paths:
engines/vcruise/midi_player.cpp
engines/vcruise/midi_player.h
engines/vcruise/script.cpp
diff --git a/engines/vcruise/midi_player.cpp b/engines/vcruise/midi_player.cpp
index 4d104719770..941c9aa9234 100644
--- a/engines/vcruise/midi_player.cpp
+++ b/engines/vcruise/midi_player.cpp
@@ -27,7 +27,7 @@
namespace VCruise {
MidiPlayer::MidiPlayer(MidiDriver *midiDrv, Common::Array<byte> &&musicData, int volume)
- : _midiDrv(midiDrv), _data(Common::move(musicData)), _volume(-1) {
+ : _midiDrv(midiDrv), _data(Common::move(musicData)) {
_parser.reset(MidiParser::createParser_SMF());
if (_data.size() > 0u && _parser->loadMusic(&_data[0], _data.size())) {
diff --git a/engines/vcruise/midi_player.h b/engines/vcruise/midi_player.h
index 67db4ce251f..08e9821b263 100644
--- a/engines/vcruise/midi_player.h
+++ b/engines/vcruise/midi_player.h
@@ -49,7 +49,6 @@ private:
MidiDriver *_midiDrv;
Common::SharedPtr<MidiParser> _parser;
Common::Array<byte> _data;
- int _volume;
};
} // End of namespace VCruise
diff --git a/engines/vcruise/script.cpp b/engines/vcruise/script.cpp
index af21395dbe3..8334a6f1de8 100644
--- a/engines/vcruise/script.cpp
+++ b/engines/vcruise/script.cpp
@@ -184,7 +184,6 @@ private:
ScriptDialect _dialect;
uint _loadAsRoom;
- uint _fileRoom;
const char *_scrToken;
const char *_eroomToken;
@@ -228,7 +227,7 @@ private:
};
ScriptCompiler::ScriptCompiler(TextParser &parser, const Common::Path &blamePath, ScriptDialect dialect, uint loadAsRoom, uint fileRoom, IScriptCompilerGlobalState *gs)
- : _numberParsingMode(kNumberParsingHex), _parser(parser), _blamePath(blamePath), _dialect(dialect), _loadAsRoom(loadAsRoom), _fileRoom(fileRoom), _gs(gs),
+ : _numberParsingMode(kNumberParsingHex), _parser(parser), _blamePath(blamePath), _dialect(dialect), _loadAsRoom(loadAsRoom), _gs(gs),
_scrToken(nullptr), _eroomToken(nullptr) {
}
Commit: 579a27221155f70abe8b8726177387a9d3d1da63
https://github.com/scummvm/scummvm/commit/579a27221155f70abe8b8726177387a9d3d1da63
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
GRIM: Fix -Wunused-private-field warning when there's no GL_ARB_fragment_program
Changed paths:
engines/grim/gfx_opengl.cpp
engines/grim/gfx_opengl.h
diff --git a/engines/grim/gfx_opengl.cpp b/engines/grim/gfx_opengl.cpp
index fe763d79fbf..42f23abbe67 100644
--- a/engines/grim/gfx_opengl.cpp
+++ b/engines/grim/gfx_opengl.cpp
@@ -79,8 +79,11 @@ static char dimFragSrc[] =
GfxOpenGL::GfxOpenGL() : _smushNumTex(0),
_smushTexIds(nullptr), _smushWidth(0), _smushHeight(0),
- _useDepthShader(false), _fragmentProgram(0), _useDimShader(0),
- _dimFragProgram(0), _maxLights(0), _storedDisplay(nullptr),
+ _useDepthShader(false), _useDimShader(0),
+ _maxLights(0), _storedDisplay(nullptr),
+#ifdef GL_ARB_fragment_program
+ _fragmentProgram(0), _dimFragProgram(0),
+#endif
_emergFont(0), _alpha(1.f) {
type = Graphics::RendererType::kRendererTypeOpenGL;
// GL_LEQUAL as glDepthFunc ensures that subsequent drawing attempts for
diff --git a/engines/grim/gfx_opengl.h b/engines/grim/gfx_opengl.h
index eadb6ec2ece..bfea65cf2ca 100644
--- a/engines/grim/gfx_opengl.h
+++ b/engines/grim/gfx_opengl.h
@@ -137,9 +137,11 @@ private:
int _smushHeight;
byte *_storedDisplay;
bool _useDepthShader;
+#ifdef GL_ARB_fragment_program
GLuint _fragmentProgram;
- bool _useDimShader;
GLuint _dimFragProgram;
+#endif
+ bool _useDimShader;
GLint _maxLights;
float _alpha;
const Actor *_currentActor;
Commit: 63afc9507bd69cd7a08a52ce6ce30a0098bae85c
https://github.com/scummvm/scummvm/commit/63afc9507bd69cd7a08a52ce6ce30a0098bae85c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
MORTEVIELLE: Fix -Wunused-but-set-variable warning
Changed paths:
engines/mortevielle/utils.cpp
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index c5c0e5eca8e..a0b7733c5a4 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -1871,13 +1871,11 @@ Common::String MortevielleEngine::getString(int num) {
} else {
int hint = _dialogHintArray[num]._hintId;
byte point = _dialogHintArray[num]._point;
- int length = 0;
bool endFl = false;
char let;
do {
endFl = decryptNextChar(let, hint, point);
wrkStr += let;
- ++length;
} while (!endFl);
}
Commit: eae4bfa4b30f2c5b0e20ebfa4d620fdeb8237e30
https://github.com/scummvm/scummvm/commit/eae4bfa4b30f2c5b0e20ebfa4d620fdeb8237e30
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
PRINCE: Fix -Wunused-but-set-variable warning
Changed paths:
engines/prince/hero.cpp
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index 286f64719e4..e702bcbb9f9 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -264,7 +264,6 @@ void Hero::showHeroShadow(Graphics::Surface *screen, DrawNode *drawNode) {
int shadWallBitAddr = 0;
int shadWallBitMask = 0;
byte *shadWallDestAddr = nullptr;
- int shadWallPosY = 0;
int shadWallSkipX = 0;
int shadWallModulo = 0;
@@ -408,7 +407,6 @@ void Hero::showHeroShadow(Graphics::Surface *screen, DrawNode *drawNode) {
shadWallBitAddr = shadBitAddr;
shadWallDestAddr = (byte *)screen->getBasePtr(shadDrawX + diffX, shadDrawY + diffY);
shadWallBitMask = shadBitMask;
- shadWallPosY = shadPosY;
shadWallSkipX = shadSkipX;
shadWallModulo = sprModulo;
}
@@ -455,7 +453,6 @@ void Hero::showHeroShadow(Graphics::Surface *screen, DrawNode *drawNode) {
//krap2
shadWallDestAddr -= PrinceEngine::kNormalWidth;
shadWallBitAddr -= PrinceEngine::kMaxPicWidth / 8;
- shadWallPosY--;
}
}
}
Commit: 79559c1ae13586bc889ea308a12d5581b0c1ea12
https://github.com/scummvm/scummvm/commit/79559c1ae13586bc889ea308a12d5581b0c1ea12
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
SHERLOCK: Fix -Wunused-but-set-variable warning
Changed paths:
engines/sherlock/fonts.cpp
diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 0b794342d47..e12fabcd333 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -120,11 +120,9 @@ void Fonts::setFont(int fontNum) {
byte *frameExclMarkPixels = (byte *)frameExclamationMark._frame.getPixels();
byte *frameRevExclMarkPixels = (byte *)frameRevExclamationMark._frame.getPixels();
- uint16 revExclMarkY = frameExclamationMark._height - 1;
frameRevExclMarkPixels += frameExclamationMark._width * (frameExclamationMark._height - 1);
for (uint16 exclMarkY = 0; exclMarkY < frameExclamationMark._height; exclMarkY++) {
memcpy(frameRevExclMarkPixels, frameExclMarkPixels, frameExclamationMark._width);
- revExclMarkY--;
frameRevExclMarkPixels -= frameExclamationMark._width;
frameExclMarkPixels += frameExclamationMark._width;
}
Commit: 847aaf383f051086f6bcce3cb5e07ab2dff9ff00
https://github.com/scummvm/scummvm/commit/847aaf383f051086f6bcce3cb5e07ab2dff9ff00
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
TOON: Fix -Wunused-but-set-variable warning
Changed paths:
engines/toon/toon.cpp
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 1ed03692d0b..3b9c93312ff 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -1839,8 +1839,6 @@ void ToonEngine::fixPaletteEntries(uint8 *palette, int num) {
// adapted from KyraEngine
void ToonEngine::updateAnimationSceneScripts(int32 timeElapsed) {
- static int32 numReentrant = 0;
- ++numReentrant;
const int startScript = _lastProcessedSceneScript;
_updatingSceneScriptRunFlag = true;
@@ -1878,7 +1876,6 @@ void ToonEngine::updateAnimationSceneScripts(int32 timeElapsed) {
} while (_lastProcessedSceneScript != startScript && !_shouldQuit);
_updatingSceneScriptRunFlag = false;
- --numReentrant;
}
void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) {
Commit: c5d9f564cd764d0591b0bc84722a2dd5889d987e
https://github.com/scummvm/scummvm/commit/c5d9f564cd764d0591b0bc84722a2dd5889d987e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
TOUCHE: Fix -Wunused-but-set-variable warning
Changed paths:
engines/touche/touche.cpp
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 411a154a73f..35adc995b1c 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -2210,7 +2210,7 @@ void ToucheEngine::drawAmountOfMoneyInInventory() {
void ToucheEngine::packInventoryItems(int index) {
int16 *p = _inventoryStateTable[index].itemsList;
- for (int i = 0; *p != -1; ++i, ++p) {
+ for (; *p != -1; ++p) {
if (p[0] == 0 && p[1] != -1) {
p[0] = p[1];
p[1] = 0;
@@ -2241,7 +2241,7 @@ void ToucheEngine::addItemToInventory(int inventory, int16 item) {
appendItemToInventoryList(inventory);
assert(inventory >= 0 && inventory < 3);
int16 *p = _inventoryStateTable[inventory].itemsList;
- for (int i = 0; *p != -1; ++i, ++p) {
+ for (; *p != -1; ++p) {
if (*p == 0) {
*p = item;
_inventoryItemsInfoTable[item] = inventory | 0x10;
@@ -2260,7 +2260,7 @@ void ToucheEngine::removeItemFromInventory(int inventory, int16 item) {
} else {
assert(inventory >= 0 && inventory < 3);
int16 *p = _inventoryStateTable[inventory].itemsList;
- for (int i = 0; *p != -1; ++i, ++p) {
+ for (; *p != -1; ++p) {
if (*p == item) {
*p = 0;
packInventoryItems(0);
Commit: 62e17d5dc281a9a78be8b36d56172b2994be3dfc
https://github.com/scummvm/scummvm/commit/62e17d5dc281a9a78be8b36d56172b2994be3dfc
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
ICB: Fix -Wunused-but-set-variable warning
Changed paths:
engines/icb/options_manager_pc.cpp
diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 600bff58c32..98f0e9c63a2 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -6531,7 +6531,7 @@ linesDone:
uint32 pitch = surface_manager->Get_pitch(working_buffer_id);
// Draw the credit lines all nicely formatted
- for (uint32 count = 0; TRUE8; count++) {
+ while (TRUE8) {
// Is this the end of the file
if (m_cursor >= (uint32)m_numberOfBytes) {
if (m_logoAttached) {
Commit: a71d0c93dc0994dbf004d5e9be5d7fff76006c76
https://github.com/scummvm/scummvm/commit/a71d0c93dc0994dbf004d5e9be5d7fff76006c76
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-17T09:24:54+03:00
Commit Message:
STARTREK: Fix -Wunused-but-set-variable warning
Changed paths:
engines/startrek/actors.cpp
diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index 9b70cbd70e7..83c9ecf5639 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -1414,7 +1414,6 @@ void StarTrekEngine::scaleBitmapRow(byte *src, byte *dest, uint16 origWidth, uin
uint16 var4 = scaledWidth << 1;
uint16 var6 = (scaledWidth - origWidth) << 1;
uint16 varE = 0;
- uint16 varA = 0;
uint16 var8 = origWidth;
uint16 di = 0;
@@ -1437,13 +1436,11 @@ void StarTrekEngine::scaleBitmapRow(byte *src, byte *dest, uint16 origWidth, uin
}
di++;
- varA++;
}
} else {
int16 var2 = ((origWidth - 1) << 1) - (scaledWidth - 1);
uint16 var4 = (origWidth - 1) << 1;
uint16 var6 = ((origWidth - 1) - (scaledWidth - 1)) << 1;
- uint16 varA = 0;
uint16 var8 = scaledWidth;
uint16 di = 0;
@@ -1460,8 +1457,6 @@ void StarTrekEngine::scaleBitmapRow(byte *src, byte *dest, uint16 origWidth, uin
var2 += var6;
di++;
}
-
- varA++;
}
}
}
More information about the Scummvm-git-logs
mailing list