fixed laser again

TurtleP · Jun 30, 2016 · 6cd4dad · 6cd4dad
1 parent 811cdc4
commit 6cd4dad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/classes/player.lua b/classes/player.lua
@@ -227,7 +227,7 @@ end
 
 function player:shoot()
 	if self.shootingTimer == 0 then
-		if self.powerup == "nobullets" or self.powerup == "freeze" then
+		if self.powerup == "nobullets" or self.powerup == "freeze" or megaCannonSound:isPlaying() then
 			return
 		end
 
@@ -243,10 +243,8 @@ function player:shoot()
 			if self:isValidBullet(self.powerup) then
 				bulletType = self.powerup
 			elseif self.powerup == "mega" then
-				if not megaCannonSound:isPlaying() then
-					table.insert(objects["bullet"], megacannon:new(self))
-					self:setPowerup("none")
-				end
+				table.insert(objects["bullet"], megacannon:new(self))
+				self:setPowerup("none")
 				return
 			end
 

diff --git a/main.lua b/main.lua
@@ -217,7 +217,7 @@ function love.load()
 
 	love.graphics.set3D(true)
 	
-	versionString = "1.0.1"
+	versionString = "1.0.2"
 
 	loadSettings()