[Scummvm-cvs-logs] SF.net SVN: scummvm: [24445] scummvm/trunk/engines/agos

[fingolfin at users.sourceforge.net]

Revision: 24445
          http://svn.sourceforge.net/scummvm/?rev=24445&view=rev
Author:   fingolfin
Date:     2006-10-22 09:04:14 -0700 (Sun, 22 Oct 2006)

Log Message:
-----------
Only instantiate ProtrackerPlayer if it is actually needed

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/res_snd.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-22 15:47:57 UTC (rev 24444)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-22 16:04:14 UTC (rev 24445)
@@ -524,10 +524,14 @@
 	setupGame();
 
 	_debugger = new Debugger(this);
-	_modPlayer = new Modules::ProtrackerPlayer();
 	_sound = new Sound(this, gss, _mixer);
 
-	_modPlayer->init(_system);
+	if (getPlatform() == Common::kPlatformAmiga) {
+		_modPlayer = new Modules::ProtrackerPlayer();
+		_modPlayer->init(_system);
+	} else {
+		_modPlayer = 0;
+	}
 	_moviePlay = new MoviePlayer(this, _mixer);
 
 	if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) {

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2006-10-22 15:47:57 UTC (rev 24444)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2006-10-22 16:04:14 UTC (rev 24445)
@@ -118,6 +118,7 @@
 	if (getPlatform() == Common::kPlatformAtariST) {
 		// TODO: Add support for music format used by Elvira 2
 	} else if (getPlatform() == Common::kPlatformAmiga) {
+		assert(_modPlayer);
 		_modPlayer->stop();
 
 		char filename[15];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.