diff src/adplug/core/sa2.cxx @ 952:87666f9bf6d0 trunk

[svn] Upstream commit "Vastly enhanced generic Protracker player and modified loaders accordingly. Copl now supports a getchip() method. A2M loader enhanced for OPL3 features." manually applied by decoding the actual changes from an ocean of whitespace damage. It compiles, but do test it.
author chainsaw
date Fri, 13 Apr 2007 09:09:50 -0700
parents cae46214b8bf
children 4709ce4e209e
line wrap: on
line diff
--- a/src/adplug/core/sa2.cxx	Fri Apr 13 08:07:32 2007 -0700
+++ b/src/adplug/core/sa2.cxx	Fri Apr 13 09:09:50 2007 -0700
@@ -1,6 +1,6 @@
 /*
  * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -155,9 +155,7 @@
 	}
 
 	if(sat_type & HAS_ACTIVECHANNELS)
-	        activechan = f->readInt(2);		// active channels
-	else
-		activechan = 0xffff;
+	        activechan = f->readInt(2) << 16;	// active channels
 
         AdPlug_LogWrite("Csa2Loader::load(\"%s\"): sat_type = %x, nop = %d, "
 		 "length = %d, restartpos = %d, activechan = %x, bpm = %d\n",