aboutsummaryrefslogtreecommitdiff
path: root/engines/cryomni3d
diff options
context:
space:
mode:
authorLe Philousophe2019-08-31 19:38:48 +0200
committerLe Philousophe2019-08-31 19:40:33 +0200
commitb45197642ee5f81b997428eca527b046ba39cd30 (patch)
treee56c052547d57a1734e45dcf4ceb8ce8c90701ba /engines/cryomni3d
parent85fbb3ad08c81eb2bd142ef2683f6de439025a22 (diff)
downloadscummvm-rg350-b45197642ee5f81b997428eca527b046ba39cd30.tar.gz
scummvm-rg350-b45197642ee5f81b997428eca527b046ba39cd30.tar.bz2
scummvm-rg350-b45197642ee5f81b997428eca527b046ba39cd30.zip
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.
Diffstat (limited to 'engines/cryomni3d')
-rw-r--r--engines/cryomni3d/versailles/dialogs_manager.cpp5
-rw-r--r--engines/cryomni3d/versailles/dialogs_manager.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/cryomni3d/versailles/dialogs_manager.cpp b/engines/cryomni3d/versailles/dialogs_manager.cpp
index d7290c9049..bb3630ed50 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 55d45ace36..e790a4bbd7 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: