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

lephilousophe lephilousophe at users.noreply.github.com
Sat Aug 31 19:41:15 CEST 2019


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:
b45197642e BUILD/CRYOMNI3D: Reduce the number of bogus GCC warnings


Commit: b45197642ee5f81b997428eca527b046ba39cd30
    https://github.com/scummvm/scummvm/commit/b45197642ee5f81b997428eca527b046ba39cd30
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-08-31T19:40:33+02:00

Commit Message:
BUILD/CRYOMNI3D: Reduce the number of bogus GCC warnings

As the warning is emitted on parsing the class constructor, just move it
out of the class definition.

Changed paths:
    engines/cryomni3d/versailles/dialogs_manager.cpp
    engines/cryomni3d/versailles/dialogs_manager.h


diff --git a/engines/cryomni3d/versailles/dialogs_manager.cpp b/engines/cryomni3d/versailles/dialogs_manager.cpp
index d7290c9..bb3630e 100644
--- a/engines/cryomni3d/versailles/dialogs_manager.cpp
+++ b/engines/cryomni3d/versailles/dialogs_manager.cpp
@@ -32,6 +32,11 @@
 namespace CryOmni3D {
 namespace Versailles {
 
+Versailles_DialogsManager::Versailles_DialogsManager(CryOmni3DEngine_Versailles *engine,
+        bool padAudioFileName) :
+	_engine(engine), _padAudioFileName(padAudioFileName) {
+}
+
 bool Versailles_DialogsManager::play(const Common::String &sequence) {
 	// Prepare with specific Versailles stuff
 	if (!_engine->preprocessDialog(sequence)) {
diff --git a/engines/cryomni3d/versailles/dialogs_manager.h b/engines/cryomni3d/versailles/dialogs_manager.h
index 55d45ac..e790a4b 100644
--- a/engines/cryomni3d/versailles/dialogs_manager.h
+++ b/engines/cryomni3d/versailles/dialogs_manager.h
@@ -34,17 +34,15 @@ namespace CryOmni3D {
 namespace Versailles {
 
 class CryOmni3DEngine_Versailles;
+typedef void (CryOmni3DEngine_Versailles::*ShowCallback)();
 
 class Versailles_DialogsManager : public DialogsManager {
 public:
-	Versailles_DialogsManager(CryOmni3DEngine_Versailles *engine,
-	                          bool padAudioFileName) : _engine(engine),
-		_padAudioFileName(padAudioFileName) { }
+	Versailles_DialogsManager(CryOmni3DEngine_Versailles *engine, bool padAudioFileName);
 
 	// This overload will hide the base one and this is what we want
 	bool play(const Common::String &sequence);
 
-	typedef void (CryOmni3DEngine_Versailles::*ShowCallback)();
 	void registerShowCallback(const Common::String &showName, ShowCallback callback) { _shows[showName] = callback; }
 
 protected:





More information about the Scummvm-git-logs mailing list