aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Boutonné2010-02-14 18:30:12 +0000
committerArnaud Boutonné2010-02-14 18:30:12 +0000
commitbf17ff87dbdd6e4e79785bff153dd96682601d98 (patch)
treee0bb9f328696067fee59aa5471a6625ca463bed7
parentf034b8bd5f2407cfa4a83e3907cc76325a364385 (diff)
downloadscummvm-rg350-bf17ff87dbdd6e4e79785bff153dd96682601d98.tar.gz
scummvm-rg350-bf17ff87dbdd6e4e79785bff153dd96682601d98.tar.bz2
scummvm-rg350-bf17ff87dbdd6e4e79785bff153dd96682601d98.zip
Fascination - Put correct protracker functions as Paula now accept sample size > 32k. MOD is now playing in Amiga and Atari versions.
svn-id: r48061
-rw-r--r--engines/gob/inter.h2
-rw-r--r--engines/gob/inter_fascin.cpp17
2 files changed, 5 insertions, 14 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 9eeea29b2a..8dabe12637 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -448,8 +448,6 @@ protected:
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();
diff --git a/engines/gob/inter_fascin.cpp b/engines/gob/inter_fascin.cpp
index 8df9c6dff2..0e94ac7a65 100644
--- a/engines/gob/inter_fascin.cpp
+++ b/engines/gob/inter_fascin.cpp
@@ -106,8 +106,8 @@ void Inter_Fascination::setupOpcodesGob() {
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,16 +196,9 @@ void Inter_Fascination::oFascin_loadBatt3(OpGobParams &params) {
}
void Inter_Fascination::oFascin_loadMod(OpGobParams &params) {
- // Fascination GE Function 1000 - Load MOD music
- // Useless as it's included in playMod
-}
-
-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");
+ // 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_setWinSize() {