[Scummvm-cvs-logs] SF.net SVN: scummvm:[48061] scummvm/trunk/engines/gob

[strangerke at users.sourceforge.net]

Revision: 48061
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48061&view=rev
Author:   strangerke
Date:     2010-02-14 18:30:12 +0000 (Sun, 14 Feb 2010)

Log Message:
-----------
Fascination - Put correct protracker functions as Paula now accept sample size > 32k. MOD is now playing in Amiga and Atari versions.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter.h
    scummvm/trunk/engines/gob/inter_fascin.cpp

Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h	2010-02-14 12:32:25 UTC (rev 48060)
+++ scummvm/trunk/engines/gob/inter.h	2010-02-14 18:30:12 UTC (rev 48061)
@@ -448,8 +448,6 @@
 	void oFascin_loadBatt2(OpGobParams &params);
 	void oFascin_loadBatt3(OpGobParams &params);
 	void oFascin_loadMod(OpGobParams &params);
-	void oFascin_playMod(OpGobParams &params);
-	void oFascin_geUnknown1002(OpGobParams &params);
 	void oFascin_setWinSize();
 	void oFascin_closeWin();
 	void oFascin_activeWin();

Modified: scummvm/trunk/engines/gob/inter_fascin.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_fascin.cpp	2010-02-14 12:32:25 UTC (rev 48060)
+++ scummvm/trunk/engines/gob/inter_fascin.cpp	2010-02-14 18:30:12 UTC (rev 48061)
@@ -106,8 +106,8 @@
 	OPCODEGOB(  12, oFascin_loadBatt3);
 
 	OPCODEGOB(1000, oFascin_loadMod);
-	OPCODEGOB(1001, oFascin_playMod); //protrackerPlay doesn't play correctly "mod.extasy"
-	OPCODEGOB(1002, oFascin_geUnknown1002); //to be replaced by o2_stopProtracker when protrackerPlay is fixed
+	OPCODEGOB(1001, oFascin_playProtracker);
+	OPCODEGOB(1002, o2_stopProtracker);
 }
 
 
@@ -196,18 +196,11 @@
 }
 
 void Inter_Fascination::oFascin_loadMod(OpGobParams &params) {
-	// Fascination GE Function 1000 - Load MOD music
-	// Useless as it's included in playMod
+	// Fascination GE Function 1000 - Load MOD music.
+	// Only used by Amiga and Atari versions.
+	// Useless as it's included in Paula's playProTracker
 }
 
-void Inter_Fascination::oFascin_playMod(OpGobParams &params) {
-	warning("Fascination oFascin_playProtracker - MOD not compatible (sample > 32768), To Be Fixed");
-}
-
-void Inter_Fascination::oFascin_geUnknown1002(OpGobParams &params) {
-	warning("Fascination o2_stopProtracker - Commented out");
-}
-
 void Inter_Fascination::oFascin_setWinSize() {
 	_vm->_draw->_winMaxWidth  = _vm->_game->_script->readUint16();
 	_vm->_draw->_winMaxHeight = _vm->_game->_script->readUint16();


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