Damn

VVillli · Sep 23, 2015 · 26cd4c6 · 26cd4c6
1 parent 3ed76e1
commit 26cd4c6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 21 deletions.
diff --git a/bin/gameObjects/Bullet.class b/bin/gameObjects/Bullet.class
diff --git a/bin/gameObjects/Player.class b/bin/gameObjects/Player.class
diff --git a/bin/gameStates/lol.class b/bin/gameStates/lol.class
diff --git a/bin/gameWindow/GamePanel.class b/bin/gameWindow/GamePanel.class
diff --git a/src/gameObjects/Bullet.java b/src/gameObjects/Bullet.java
@@ -76,24 +76,6 @@ public boolean update(){
 	public void draw(Graphics2D g){
 		AffineTransform backup = g.getTransform();
 		AffineTransform trans = new AffineTransform();
-
-		double tempAngle = angle;
-
-		if(angle > -90 && angle < 0){
-			tempAngle -= 90;
-		}
-
-		double transX = Math.sin(Math.toRadians(tempAngle))*18.5;
-		double transY = Math.cos(Math.toRadians(tempAngle))*12;
-
-		System.out.println(angle);
-
-		if(angle > -90 && angle < 0){
-			transX = -Math.sin(Math.toRadians(tempAngle))*20;
-			transY = -Math.cos(Math.toRadians(tempAngle))*30;
-		}
-
-		trans.translate(transX, transY);
 		trans.rotate(Math.toRadians(angle), x, y); 
 		g.setTransform(trans);
 		g.drawImage(images[currentImage], x, y, 43, 14, null);

diff --git a/src/gameObjects/Player.java b/src/gameObjects/Player.java
@@ -95,7 +95,7 @@ public void update(int mouseX, int mouseY){
 			long elapsed = (System.nanoTime() - firingTimer)/1000000;
 			if(elapsed > firingDelay){
 				firingTimer = System.nanoTime();
-				GamePanel.b.add(new Bullet(x, y, angle));
+				GamePanel.b.add(new Bullet(x - (int)(Math.cos(Math.toRadians(angle))*18), y - (int)(Math.sin(Math.toRadians(angle))*6), angle));
 			}
 		}
 	}

diff --git a/src/gameStates/lol.java b/src/gameStates/lol.java
@@ -0,0 +1,5 @@
+package gameStates;
+
+public class lol {
+
+}
diff --git a/src/gameWindow/GamePanel.java b/src/gameWindow/GamePanel.java
@@ -128,7 +128,7 @@ public void gameUpdate(){
 			}
 		}
 
-		for(int i = 0; i < t.size(); i++){
+		/*for(int i = 0; i < t.size(); i++){
 			boolean remove = false;
 			
 			for(int j = 0; j < b.size(); j++){
@@ -145,7 +145,7 @@ public void gameUpdate(){
 				t.remove(i);
 				i--;
 			}
-		}
+		}*/
 	}
 
 	public void gameRender(){