[Scummvm-git-logs] scummvm master -> f6f64fc313f6a7a7e892c57c46c0461969337033

neuromancer noreply at scummvm.org
Wed Jan 26 11:47:23 UTC 2022


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

Summary:
f6f64fc313 HYPNO: initialize all the required fields and removed some unused code


Commit: f6f64fc313f6a7a7e892c57c46c0461969337033
    https://github.com/scummvm/scummvm/commit/f6f64fc313f6a7a7e892c57c46c0461969337033
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-01-26T12:47:16+01:00

Commit Message:
HYPNO: initialize all the required fields and removed some unused code

Changed paths:
    engines/hypno/hypno.cpp
    engines/hypno/hypno.h


diff --git a/engines/hypno/hypno.cpp b/engines/hypno/hypno.cpp
index 4ee220cddd2..a1b8c2956e1 100644
--- a/engines/hypno/hypno.cpp
+++ b/engines/hypno/hypno.cpp
@@ -50,6 +50,11 @@ HypnoEngine::HypnoEngine(OSystem *syst, const ADGameDescription *gd)
 	: Engine(syst), _gameDescription(gd), _image(nullptr),
 	  _compositeSurface(nullptr), _transparentColor(0),
 	  _nextHotsToAdd(nullptr), _nextHotsToRemove(nullptr), _font(nullptr),
+	  _levelId(0), _skipLevel(false), _health(0), _maxHealth(0), 
+	  _playerFrameIdx(0), _playerFrameSep(0), _refreshConversation(false),
+	  _countdown(0), _timerStarted(false),  _score(0),
+	  _defaultCursor(""), _checkpoint(""),
+	  _currentPlayerPosition(PlayerLeft), _lastPlayerPosition(PlayerLeft), 
 	  _screenW(640), _screenH(480) {
 	_rnd = new Common::RandomSource("hypno");
 
@@ -59,9 +64,6 @@ HypnoEngine::HypnoEngine(OSystem *syst, const ADGameDescription *gd)
 		_variant = "FullGame";
 	g_hypno = this;
 	g_parsedArc = new ArcadeShooting();
-	_defaultCursor = "";
-	_checkpoint = "";
-
 	_language = Common::parseLanguage(ConfMan.get("language"));
 	_platform = Common::parsePlatform(ConfMan.get("platform"));
 	if (!Common::parseBool(ConfMan.get("cheats"), _cheatsEnabled))
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 59f18feecdc..3f6b5976794 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -211,8 +211,6 @@ public:
 	Filename _music;
 	void playSound(const Filename &filename, uint32);
 	void stopSound();
-	bool isSoundActive();
-	bool _noStopSounds;
 
 	// Arcade
 	Common::String _arcadeMode;




More information about the Scummvm-git-logs mailing list