[Jake2-commits] jake2/src/jake2/sound WaveLoader.java,1.1.2.1,1.1.2.2 sfx_t.java,1.1,1.1.2.1

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2637/src/jake2/sound

Modified Files:
      Tag: r_0_9
	WaveLoader.java sfx_t.java 
Log Message:
merge changes for 0.9.3

Index: sfx_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/sfx_t.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** sfx_t.java	8 Jul 2004 20:56:49 -0000	1.1
--- sfx_t.java	6 Sep 2004 19:39:16 -0000	1.1.2.1
***************
*** 29,41 ****
  package jake2.sound;
  
- 
  public class sfx_t {
! 	public String name; //mem
  	public int registration_sequence;
! 	public sfxcache_t cache; //ptr
! 	public String truename; //ptr
  	
! 	// cwei
! 	public int id = -1;
  	
  	public void clear() {
--- 29,40 ----
  package jake2.sound;
  
  public class sfx_t {
! 	public String name;
  	public int registration_sequence;
! 	public sfxcache_t cache;
! 	public String truename;
  	
! 	// is used for AL buffers
! 	public int bufferId = -1;
  	
  	public void clear() {
***************
*** 43,49 ****
  		cache = null;
  		registration_sequence = 0;
! 		
! 		// cwei
! 		id = -1; 
  	}
  }
--- 42,46 ----
  		cache = null;
  		registration_sequence = 0;
! 		bufferId = -1; 
  	}
  }