[Scummvm-git-logs] scummvm master -> 7e7683db44ce6f9abc553724bab3fb5541915f63

sev- noreply at scummvm.org
Fri Mar 17 15:59:32 UTC 2023 

This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
405efda3d8 CHAMBER: Fix warning
b81fc038bd MM: MM1: Add missing override keyword
0295bbccd3 MM: MM1: Comment out unused variables
5895d34272 MTROPOLIS: Comment out unused variables
83ecd17b8c NANCY: Comment out unused variable
15859d2988 VCRUISE: Comment out unused variables
a542d6cad7 COMMON: Comment out unused variable
7e7683db44 AUDIO: MT32: sprintf -> snprintf


Commit: 405efda3d829c98c8d4b9ab8260b535ceb25b816
    https://github.com/scummvm/scummvm/commit/405efda3d829c98c8d4b9ab8260b535ceb25b816
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:43+01:00

Commit Message:
CHAMBER: Fix warning

Changed paths:
    engines/chamber/savegame.cpp


diff --git a/engines/chamber/savegame.cpp b/engines/chamber/savegame.cpp
index 41ec3855b8c..4dcd9390f09 100644
--- a/engines/chamber/savegame.cpp
+++ b/engines/chamber/savegame.cpp
@@ -31,6 +31,7 @@
 
 namespace Chamber {
 
+#if 0
 static const char restart_name[] = "CLEARx.BIN";
 
 #ifdef VERSION_USA
@@ -38,6 +39,7 @@ static const char savegame_name[] = "SCENACx.BIN";
 #else
 static const char savegame_name[] = "SCENAx.BIN";
 #endif
+#endif
 
 #ifdef VERSION_USA
 


Commit: b81fc038bdfe035c54d01a183adf41fad1f12244
    https://github.com/scummvm/scummvm/commit/b81fc038bdfe035c54d01a183adf41fad1f12244
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:43+01:00

Commit Message:
MM: MM1: Add missing override keyword

Changed paths:
    engines/mm/mm1/views_enh/select_number.h


diff --git a/engines/mm/mm1/views_enh/select_number.h b/engines/mm/mm1/views_enh/select_number.h
index 5a663bffbac..80299c87a09 100644
--- a/engines/mm/mm1/views_enh/select_number.h
+++ b/engines/mm/mm1/views_enh/select_number.h
@@ -42,7 +42,7 @@ public:
 	virtual ~SelectNumberSubview() {}
 
 	void open(int maxNum, SelectNumberProc callback);
-	void close();
+	void close() override;
 
 	void draw() override;
 	bool msgMouseDown(const MouseDownMessage &msg) override;


Commit: 0295bbccd3c4d8c74c7e51331455a7cc5bcd2d06
    https://github.com/scummvm/scummvm/commit/0295bbccd3c4d8c74c7e51331455a7cc5bcd2d06
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:43+01:00

Commit Message:
MM: MM1: Comment out unused variables

Changed paths:
    engines/mm/mm1/views_enh/create_characters.h
    engines/mm/mm1/views_enh/game_party.cpp


diff --git a/engines/mm/mm1/views_enh/create_characters.h b/engines/mm/mm1/views_enh/create_characters.h
index a7faf5c1158..3518249f336 100644
--- a/engines/mm/mm1/views_enh/create_characters.h
+++ b/engines/mm/mm1/views_enh/create_characters.h
@@ -68,7 +68,7 @@ private:
 	Shared::Xeen::SpriteResource _icons;
 	State _state = SELECT_CLASS;
 	NewCharacter _newChar;
-	int _portraitNum = 0;
+	//int _portraitNum = 0;
 
 	/**
 	 * Displays the new character attributes
diff --git a/engines/mm/mm1/views_enh/game_party.cpp b/engines/mm/mm1/views_enh/game_party.cpp
index 6cc9e9e84f3..89b4868853d 100644
--- a/engines/mm/mm1/views_enh/game_party.cpp
+++ b/engines/mm/mm1/views_enh/game_party.cpp
@@ -27,9 +27,11 @@ namespace MM {
 namespace MM1 {
 namespace ViewsEnh {
 
+#if 0
 static const byte CONDITION_COLORS[17] = {
 	9, 9, 9, 9, 9, 9, 9, 9, 32, 32, 32, 32, 6, 6, 6, 6, 15
 };
+#endif
 
 static const byte FACE_CONDITION_FRAMES[17] = {
 	2, 2, 2, 1, 1, 4, 4, 4, 3, 2, 4, 3, 3, 5, 6, 7, 0


Commit: 5895d34272cee386465e0c59d9762bba718702fc
    https://github.com/scummvm/scummvm/commit/5895d34272cee386465e0c59d9762bba718702fc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:43+01:00

Commit Message:
MTROPOLIS: Comment out unused variables

Changed paths:
    engines/mtropolis/modifiers.cpp
    engines/mtropolis/modifiers.h
    engines/mtropolis/runtime.cpp
    engines/mtropolis/runtime.h


diff --git a/engines/mtropolis/modifiers.cpp b/engines/mtropolis/modifiers.cpp
index d370b8145dd..b21f90c056e 100644
--- a/engines/mtropolis/modifiers.cpp
+++ b/engines/mtropolis/modifiers.cpp
@@ -1153,7 +1153,7 @@ const char *PathMotionModifier::getDefaultName() const {
 	return "Path Motion Modifier";
 }
 
-SimpleMotionModifier::SimpleMotionModifier() : _motionType(kMotionTypeIntoScene), _directionFlags(0), _steps(0), _delayMSecTimes4800(0) {
+SimpleMotionModifier::SimpleMotionModifier() : _motionType(kMotionTypeIntoScene), _directionFlags(0), _steps(0)/*, _delayMSecTimes4800(0)*/ {
 }
 
 bool SimpleMotionModifier::load(ModifierLoaderContext &context, const Data::SimpleMotionModifier &data) {
diff --git a/engines/mtropolis/modifiers.h b/engines/mtropolis/modifiers.h
index ab1f6cd24c0..a989a7e9e49 100644
--- a/engines/mtropolis/modifiers.h
+++ b/engines/mtropolis/modifiers.h
@@ -510,7 +510,7 @@ private:
 	MotionType _motionType;
 	uint16 _directionFlags;
 	uint16 _steps;
-	uint32 _delayMSecTimes4800;
+	//uint32 _delayMSecTimes4800;
 };
 
 class DragMotionModifier : public Modifier {
diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 4b9769855c8..3ef6f211fe6 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -4236,7 +4236,7 @@ Runtime::Runtime(OSystem *system, Audio::Mixer *mixer, ISaveUIProvider *saveProv
 	  _lastFrameCursor(nullptr), _lastFrameMouseVisible(false), _defaultCursor(new DefaultCursorGraphic()), _platform(kProjectPlatformUnknown),
 	  _cachedMousePosition(Common::Point(0, 0)), _realMousePosition(Common::Point(0, 0)), _trackedMouseOutside(false),
 	  _forceCursorRefreshOnce(true), _autoResetCursor(false), _haveModifierOverrideCursor(false), _haveCursorElement(false), _sceneGraphChanged(false), _isQuitting(false),
-	  _collisionCheckTime(0), _elementCursorUpdateTime(0), _defaultVolumeState(true), _activeSceneTransitionEffect(nullptr), _sceneTransitionStartTime(0), _sceneTransitionEndTime(0),
+	  _collisionCheckTime(0), /*_elementCursorUpdateTime(0), */_defaultVolumeState(true), _activeSceneTransitionEffect(nullptr), _sceneTransitionStartTime(0), _sceneTransitionEndTime(0),
 	  _sharedSceneWasSetExplicitly(false), _modifierOverrideCursorID(0), _subtitleRenderer(subRenderer), _multiClickStartTime(0), _multiClickInterval(500), _multiClickCount(0)
 {
 	_random.reset(new Common::RandomSource("mtropolis"));
diff --git a/engines/mtropolis/runtime.h b/engines/mtropolis/runtime.h
index 1e492ec6468..04a4660f0d2 100644
--- a/engines/mtropolis/runtime.h
+++ b/engines/mtropolis/runtime.h
@@ -1958,7 +1958,7 @@ private:
 	uint32 _collisionCheckTime;
 
 	Common::WeakPtr<VisualElement> _elementTrackedToCursor;
-	uint32 _elementCursorUpdateTime;
+	//uint32 _elementCursorUpdateTime;
 
 	Common::Array<IPostEffect *> _postEffects;
 


Commit: 83ecd17b8cebb71f037e5396457ffc57030b057e
    https://github.com/scummvm/scummvm/commit/83ecd17b8cebb71f037e5396457ffc57030b057e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:44+01:00

Commit Message:
NANCY: Comment out unused variable

Changed paths:
    engines/nancy/state/map.cpp
    engines/nancy/state/map.h


diff --git a/engines/nancy/state/map.cpp b/engines/nancy/state/map.cpp
index cd0ad958004..71038c19e5d 100644
--- a/engines/nancy/state/map.cpp
+++ b/engines/nancy/state/map.cpp
@@ -395,7 +395,7 @@ void TVDMap::MapGlobe::onTrigger() {
 	}
 }
 
-Nancy1Map::Nancy1Map() : _button(nullptr), _mapButtonClicked(false) {}
+Nancy1Map::Nancy1Map() : _button(nullptr)/*, _mapButtonClicked(false)*/ {}
 
 Nancy1Map::~Nancy1Map() {
 	delete _button;
diff --git a/engines/nancy/state/map.h b/engines/nancy/state/map.h
index 810ac1d9dfb..b0b6a1ff76e 100644
--- a/engines/nancy/state/map.h
+++ b/engines/nancy/state/map.h
@@ -50,7 +50,7 @@ public:
 
 	void process() override;
 	void onStateExit() override;
-	
+
 	const SoundDescription &getSound() { return _mapSounds[_mapID]; }
 
 protected:
@@ -105,7 +105,7 @@ protected:
 
 class TVDMap : public Map {
 	friend class MapGlobe;
-	
+
 public:
 	TVDMap();
 	virtual ~TVDMap() = default;
@@ -130,7 +130,7 @@ private:
 	void load() override;
 	void run() override;
 	void registerGraphics() override;
-	
+
 	void onStateExit() override;
 
 	MapGlobe _globe;
@@ -153,7 +153,7 @@ private:
 	void onStateExit() override;
 
 	UI::Button *_button;
-	bool _mapButtonClicked;
+	//bool _mapButtonClicked;
 };
 
 #define NancyMapState Nancy::State::Map::instance()


Commit: 15859d29882551118db4d02b73f4f3e51acf7981
    https://github.com/scummvm/scummvm/commit/15859d29882551118db4d02b73f4f3e51acf7981
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:44+01:00

Commit Message:
VCRUISE: Comment out unused variables

Changed paths:
    engines/vcruise/audio_player.h
    engines/vcruise/runtime.cpp
    engines/vcruise/runtime.h


diff --git a/engines/vcruise/audio_player.h b/engines/vcruise/audio_player.h
index ed919b6a761..feac26907e1 100644
--- a/engines/vcruise/audio_player.h
+++ b/engines/vcruise/audio_player.h
@@ -53,7 +53,7 @@ private:
 	Common::Mutex _mutex;
 
 	Audio::SoundHandle _handle;
-	bool _isLooping;
+	//bool _isLooping;
 	bool _isPlaying;
 	bool _exhausted;
 	Audio::Mixer *_mixer;
diff --git a/engines/vcruise/runtime.cpp b/engines/vcruise/runtime.cpp
index 386aa691f6f..b3044432301 100644
--- a/engines/vcruise/runtime.cpp
+++ b/engines/vcruise/runtime.cpp
@@ -354,7 +354,7 @@ Runtime::Runtime(OSystem *system, Audio::Mixer *mixer, const Common::FSNode &roo
 	  _loadedAnimation(0), _animPendingDecodeFrame(0), _animDisplayingFrame(0), _animFirstFrame(0), _animLastFrame(0), _animStopFrame(0),
 	  _animFrameRateLock(0), _animStartTime(0), _animFramesDecoded(0), _animDecoderState(kAnimDecoderStateStopped),
 	  _animPlayWhileIdle(false), _idleIsOnInteraction(false), _idleHaveClickInteraction(false), _idleHaveDragInteraction(false), _idleInteractionID(0), _haveIdleStaticAnimation(false),
-	  _loadedArea(0), _lmbDown(false), _lmbDragging(false), _lmbReleaseWasClick(false), _lmbDownTime(0),
+	  /*_loadedArea(0), */_lmbDown(false), _lmbDragging(false), _lmbReleaseWasClick(false), _lmbDownTime(0),
 	  _panoramaState(kPanoramaStateInactive),
 	  _listenerX(0), _listenerY(0), _listenerAngle(0) {
 
diff --git a/engines/vcruise/runtime.h b/engines/vcruise/runtime.h
index a165a8ca580..9c2256104f9 100644
--- a/engines/vcruise/runtime.h
+++ b/engines/vcruise/runtime.h
@@ -647,7 +647,7 @@ private:
 	uint _roomNumber;	// Room number can be changed independently of the loaded room, the screen doesn't change until a command changes it
 	uint _screenNumber;
 	uint _direction;
-	uint _highPrecisionDirection;
+	//uint _highPrecisionDirection;
 
 	GyroState _gyros;
 
@@ -713,7 +713,7 @@ private:
 
 	Common::Array<FrameData> _frameData;
 	Common::Array<FrameData2> _frameData2;
-	uint32 _loadedArea;
+	//uint32 _loadedArea;
 
 	Common::Array<Common::String> _animDefNames;
 	Common::HashMap<Common::String, uint> _animDefNameToIndex;


Commit: a542d6cad7f2333a1dc0daa8429691e1327ff1a4
    https://github.com/scummvm/scummvm/commit/a542d6cad7f2333a1dc0daa8429691e1327ff1a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:44+01:00

Commit Message:
COMMON: Comment out unused variable

Changed paths:
    common/compression/clickteam.h


diff --git a/common/compression/clickteam.h b/common/compression/clickteam.h
index bd5ef41091b..20f6979fdf4 100644
--- a/common/compression/clickteam.h
+++ b/common/compression/clickteam.h
@@ -87,7 +87,7 @@ private:
 		bool _isPatchFile;
 		bool _crcIsXorred;
 		bool _isReferenceMissing;
-		uint16 _field1c;
+		//uint16 _field1c;
 		Common::Array<ClickteamPatchDescriptor> _patchEntries;
 
 		ClickteamFileDescriptor(const ClickteamTag& contentsTag, uint32 off);


Commit: 7e7683db44ce6f9abc553724bab3fb5541915f63
    https://github.com/scummvm/scummvm/commit/7e7683db44ce6f9abc553724bab3fb5541915f63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-17T16:58:44+01:00

Commit Message:
AUDIO: MT32: sprintf -> snprintf

Changed paths:
    audio/softsynth/mt32/MidiStreamParser.cpp
    audio/softsynth/mt32/Part.cpp


diff --git a/audio/softsynth/mt32/MidiStreamParser.cpp b/audio/softsynth/mt32/MidiStreamParser.cpp
index 7b64f97f9f9..0191c208190 100644
--- a/audio/softsynth/mt32/MidiStreamParser.cpp
+++ b/audio/softsynth/mt32/MidiStreamParser.cpp
@@ -191,7 +191,7 @@ Bit32u MidiStreamParserImpl::parseShortMessageDataBytes(const Bit8u stream[], Bi
 		} else if (dataByte < 0xF8) {
 			// Discard invalid bytes and start over
 			char s[128];
-			sprintf(s, "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize);
+			snprintf(s, 128, "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize);
 			midiReporter.printDebug(s);
 			streamBufferSize = 0; // Clear streamBuffer
 			return parsedLength;
diff --git a/audio/softsynth/mt32/Part.cpp b/audio/softsynth/mt32/Part.cpp
index 5888b97b2d5..558a15fdda5 100644
--- a/audio/softsynth/mt32/Part.cpp
+++ b/audio/softsynth/mt32/Part.cpp
@@ -54,7 +54,7 @@ Part::Part(Synth *useSynth, unsigned int usePartNum) {
 		// Nasty hack for rhythm
 		timbreTemp = NULL;
 	} else {
-		sprintf(name, "Part %d", partNum + 1);
+		snprintf(name, 8, "Part %d", partNum + 1);
 		timbreTemp = &synth->mt32ram.timbreTemp[partNum];
 	}
 	currentInstr[0] = 0;

More information about the Scummvm-git-logs mailing list