[Scummvm-cvs-logs] SF.net SVN: scummvm:[50491] scummvm/trunk/engines/m4

[dreammaster at users.sourceforge.net]

Revision: 50491
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50491&view=rev
Author:   dreammaster
Date:     2010-06-29 11:15:21 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
Removed the old hardcoded calls to loadDSRFile

Modified Paths:
--------------
    scummvm/trunk/engines/m4/m4.cpp
    scummvm/trunk/engines/m4/mads_menus.cpp

Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp	2010-06-29 11:09:33 UTC (rev 50490)
+++ scummvm/trunk/engines/m4/m4.cpp	2010-06-29 11:15:21 UTC (rev 50491)
@@ -568,15 +568,6 @@
 	_viewManager->systemHotkeys().add(Common::KEYCODE_ESCAPE, &escapeHotkeyHandler);
 	_viewManager->systemHotkeys().add(Common::KEYCODE_KP_MULTIPLY, &textviewHotkeyHandler);
 
-	// Load the general game SFX/voices
-	if (getGameType() == GType_RexNebular) {
-		_sound->loadDSRFile("rex009.dsr");
-	} else if (getGameType() == GType_Phantom) {
-		_sound->loadDSRFile("phan009.dsr");
-	} else if (getGameType() == GType_DragonSphere) {
-		_sound->loadDSRFile("drag009.dsr");
-	}
-
 	uint32 nextFrame = g_system->getMillis();
 	while (!_events->quitFlag) {
 		eventHandler();

Modified: scummvm/trunk/engines/m4/mads_menus.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_menus.cpp	2010-06-29 11:09:33 UTC (rev 50490)
+++ scummvm/trunk/engines/m4/mads_menus.cpp	2010-06-29 11:15:21 UTC (rev 50491)
@@ -309,7 +309,6 @@
 		return;
 
 	case SHOW_INTRO:
-		vm->_sound->loadDSRFile("act002.dsr");
 		vm->_viewManager->showAnimView("@rexopen");
 		break;
 


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