[Jake2-commits] jake2/src/jake2/sound WaveLoader.java,1.3,1.4

[Carsten W. <ca...@us...>]

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

Modified Files:
	WaveLoader.java 
Log Message:
code clean up

Index: WaveLoader.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/WaveLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WaveLoader.java	3 Nov 2004 20:15:02 -0000	1.3
--- WaveLoader.java	26 Apr 2005 22:16:34 -0000	1.4
***************
*** 57,77 ****
  	*/
  	public static sfxcache_t LoadSound(sfx_t s) {
- 		String namebuffer;
- 		byte[] data;
- 		wavinfo_t info;
- 		int len;
- 		float stepscale;
- 		sfxcache_t sc = null;
- 		int size;
- 		String name;
- 
  		if (s.name.charAt(0) == '*')
  			return null;
  
  		// see if still in memory
! 		sc = s.cache;
  		if (sc != null)
  			return sc;
  
  		// load it in
  		if (s.truename != null)
--- 57,69 ----
  	*/
  	public static sfxcache_t LoadSound(sfx_t s) {
  		if (s.name.charAt(0) == '*')
  			return null;
  
  		// see if still in memory
! 		sfxcache_t sc = s.cache;
  		if (sc != null)
  			return sc;
  
+ 		String name;
  		// load it in
  		if (s.truename != null)
***************
*** 80,90 ****
  			name = s.name;
  
  		if (name.charAt(0) == '#')
  			namebuffer = name.substring(1);
- 
  		else
  			namebuffer = "sound/" + name;
  
! 		data = FS.LoadFile(namebuffer);
  
  		if (data == null) {
--- 72,82 ----
  			name = s.name;
  
+ 		String namebuffer;
  		if (name.charAt(0) == '#')
  			namebuffer = name.substring(1);
  		else
  			namebuffer = "sound/" + name;
  
! 		byte[] data = FS.LoadFile(namebuffer);
  
  		if (data == null) {
***************
*** 92,98 ****
  			return null;
  		}
! 		size = data.length;
  
! 		info = GetWavinfo(s.name, data, size);
  		
  		AudioInputStream in = null;
--- 84,90 ----
  			return null;
  		}
! 		int size = data.length;
  
! 		wavinfo_t info = GetWavinfo(s.name, data, size);
  		
  		AudioInputStream in = null;