Alpha Version (Working with music now)

has music finally.
UTD-CSLLC · Feb 23, 2014 · 6bb3e19 · 6bb3e19
1 parent ea7c8c6
commit 6bb3e19
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/Map.java b/src/Map.java
@@ -1,5 +1,4 @@
 import java.awt.Font;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import org.lwjgl.input.Mouse;
@@ -186,13 +185,13 @@ public void init(GameContainer gc, StateBasedGame sbg)
 		}	
 
 		try {
-	        shoot = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/fire.ogg"));
+	        shoot = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/fire.ogg"));
         } catch (IOException e) {e.printStackTrace();}
 		try {
-	        shoot2 = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/fire.ogg"));
+	        shoot2 = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/fire.ogg"));
         } catch (IOException e) {e.printStackTrace();}
 		try {
-	        hit = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/hit.ogg"));
+	        hit = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/hit.ogg"));
         } catch (IOException e) {e.printStackTrace();}
 	}
 
@@ -262,19 +261,19 @@ public void update(GameContainer gc, StateBasedGame sbg, int delta)
 			try {
 
 				if(mapControl==0)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/magic.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/magic.ogg"));
 				else if(mapControl==1)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/icu.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/icu.ogg"));
 				else if(mapControl==2)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/castle.ogg"));
+					music = AudioLoader.getAudio("OGG",ResourceLoader.getResourceAsStream("resources/music/castle.ogg"));
 				else if(mapControl==3)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/attraction.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/attraction.ogg"));
 				else if(mapControl==4)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/hendl.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/hendl.ogg"));
 				else
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/castle.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/castle.ogg"));
 				if(dogepossible)
-					music = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/wowsong.ogg"));
+					music = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/wowsong.ogg"));
 		        } catch (IOException e) {
 		        e.printStackTrace();
 		    }
@@ -439,7 +438,7 @@ else if(mapControl==4)
 							win1y=gc.getHeight()/18*13;
 							if(dogepossible){
 								try {
-							        wow = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/wow.ogg"));
+							        wow = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/wow.ogg"));
 							        } catch (IOException e) {
 							        e.printStackTrace();
 							    }

diff --git a/src/MenuCommands.java b/src/MenuCommands.java
@@ -44,7 +44,7 @@ public void initMain() throws SlickException{
 		}
 
 		try {
-	        theme = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/menu.ogg"));
+	        theme = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/menu.ogg"));
 	     } catch (IOException e){
 	        e.printStackTrace();
 	    }	

diff --git a/src/Velocity.java b/src/Velocity.java
@@ -1,8 +1,8 @@
-import java.io.FileInputStream;
 import java.io.IOException;
 import org.newdawn.slick.*;
 import org.newdawn.slick.openal.Audio;
 import org.newdawn.slick.openal.AudioLoader;
+import org.newdawn.slick.util.ResourceLoader;
 
 public class Velocity {
 	int posX;
@@ -58,7 +58,7 @@ public void CalcPosPlay1(GameContainer gc){
 			VelY=20;
 
 			try {
-		        jump = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/jump1.ogg"));
+		        jump = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/jump1.ogg"));
 		        } catch (IOException e) {
 		        e.printStackTrace();
 		    }
@@ -136,7 +136,7 @@ public void CalcPosPlay2(GameContainer gc){
 			VelY=20;
 
 			try {
-		        jump = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/jump2.ogg"));
+		        jump = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/jump2.ogg"));
 		        } catch (IOException e) {
 		        e.printStackTrace();
 		    }

diff --git a/src/VelocityAI.java b/src/VelocityAI.java
@@ -1,10 +1,9 @@
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Random;
-
 import org.newdawn.slick.GameContainer;
 import org.newdawn.slick.openal.Audio;
 import org.newdawn.slick.openal.AudioLoader;
+import org.newdawn.slick.util.ResourceLoader;
 
 public class VelocityAI {
 	int posX;
@@ -103,7 +102,7 @@ public void CalcPosAI(GameContainer gc){
 			VelY=20;
 
 			try {
-		        jump = AudioLoader.getAudio("OGG", new FileInputStream("resources/music/jump2.ogg"));
+		        jump = AudioLoader.getAudio("OGG", ResourceLoader.getResourceAsStream("resources/music/jump2.ogg"));
 		        } catch (IOException e) {
 		        e.printStackTrace();
 		    }