[Scummvm-cvs-logs] scummvm master -> 2eb80dd811aa2b8d4b99da604b4ce6403073dbf8

[eriktorbjorn]

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

Summary:
ab01020e11 MADS: Silence GCC warning about non-virtual destructor
2eb80dd811 MADS: Remove unused variable


Commit: ab01020e11d7e496ba7cc043395981b2a64085b8
    https://github.com/scummvm/scummvm/commit/ab01020e11d7e496ba7cc043395981b2a64085b8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-06-07T12:24:44+02:00

Commit Message:
MADS: Silence GCC warning about non-virtual destructor

Changed paths:
    engines/mads/nebular/dialogs_nebular.h



diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h
index 3470758..881c76a 100644
--- a/engines/mads/nebular/dialogs_nebular.h
+++ b/engines/mads/nebular/dialogs_nebular.h
@@ -181,6 +181,11 @@ public:
 	ScreenDialog(MADSEngine *vm);
 
 	/**
+	 * Destructor
+	 */
+	virtual ~ScreenDialog() {}
+
+	/**
 	 * Show the dialog
 	 */
 	virtual void show();


Commit: 2eb80dd811aa2b8d4b99da604b4ce6403073dbf8
    https://github.com/scummvm/scummvm/commit/2eb80dd811aa2b8d4b99da604b4ce6403073dbf8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-06-07T12:24:44+02:00

Commit Message:
MADS: Remove unused variable

Changed paths:
    engines/mads/game.cpp



diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index fe4dae8..b631c8e 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -108,7 +108,6 @@ void Game::run() {
 	}
 
 	_statusFlag = true;
-	int startResult = -1;
 
 	if (_loadGameSlot == -1) {
 		startGame();