peterama
diff --git a/‎assets/images/back.png
2.71 KB b/‎assets/images/back.png
2.71 KB
diff --git a/‎assets/images/backHover.png
2.6 KB b/‎assets/images/backHover.png
2.6 KB
diff --git a/‎assets/images/loadGameScreen/scroll.png
-530 KB b/‎assets/images/loadGameScreen/scroll.png
-530 KB
diff --git a/‎assets/images/pauseScreen/backToGame.png
2.53 KB b/‎assets/images/pauseScreen/backToGame.png
2.53 KB
diff --git a/‎assets/images/pauseScreen/backToGameHover.png
2.71 KB b/‎assets/images/pauseScreen/backToGameHover.png
2.71 KB
diff --git a/‎assets/images/pauseScreen/quitGame.png
2.88 KB b/‎assets/images/pauseScreen/quitGame.png
2.88 KB
diff --git a/‎assets/images/pauseScreen/quitGameHover.png
2.99 KB b/‎assets/images/pauseScreen/quitGameHover.png
2.99 KB
diff --git a/‎assets/images/pauseScreen/saveGame.png
1.85 KB b/‎assets/images/pauseScreen/saveGame.png
1.85 KB
diff --git a/‎assets/images/pauseScreen/saveGameHover.png
1.94 KB b/‎assets/images/pauseScreen/saveGameHover.png
1.94 KB
diff --git a/‎assets/images/pauseScreen/settings.png
2.11 KB b/‎assets/images/pauseScreen/settings.png
2.11 KB
diff --git a/‎assets/images/pauseScreen/settingsHover.png
2.2 KB b/‎assets/images/pauseScreen/settingsHover.png
2.2 KB
diff --git a/‎assets/images/scroll.png
843 KB b/‎assets/images/scroll.png
843 KB
diff --git a/‎assets/images/settingsScreen/backToGame.png
-3.58 KB b/‎assets/images/settingsScreen/backToGame.png
-3.58 KB
diff --git a/‎assets/images/settingsScreen/backToGameSelect.png
-3.34 KB b/‎assets/images/settingsScreen/backToGameSelect.png
-3.34 KB
diff --git a/‎assets/images/titleScreen/mute.png renamed to ‎assets/images/settingsScreen/mute.png b/‎assets/images/titleScreen/mute.png renamed to ‎assets/images/settingsScreen/mute.png
diff --git a/‎assets/images/titleScreen/unmute.png renamed to ‎assets/images/settingsScreen/unmute.png b/‎assets/images/titleScreen/unmute.png renamed to ‎assets/images/settingsScreen/unmute.png
diff --git a/‎index.html
+1-1 b/‎index.html
+1-1
diff --git a/‎src/components.js
+9-6 b/‎src/components.js
+9-6
@@ -3,8 +3,8 @@
 <head>
 	<link rel="shortcut icon" href="assets/images/knife.ico">
   	<script type="text/javascript" src="src/crafty 0.5.4.js"></script>
-  	<script type="text/javascript" src="src/components.js"></script>
   	<script type="text/javascript" src="src/scenes.js"></script>
+  	<script type="text/javascript" src="src/components.js"></script>
   	<script type="text/javascript" src="src/main.js"></script>
   	<script>
     	window.addEventListener('load', Game.start);
 
@@ -13,13 +13,16 @@ var setUpComponents = function(){
 		            	volume.music_vol = 1.0
 		            	object.tween({w: 200}, 20);
 		            } else if (this._x + 5 > e.realX){
-		            	volume.music_vol = 1.0
+		            	volume.music_vol = 0
 		            	object.tween({w: 0}, 20);
 		            } else {
-		                volume.music_vol = (e.realX-(this._x+10))/200
+		                volume.music_vol = (e.realX-(this._x+5))/200
 		                object.tween({w: e.realX - (this._x + 5)}, 20);
 		            }
-		            Crafty.audio.play("background", -1, change, true)
+		            if (volume.music_vol == 0)
+		            	Crafty.audio.stop()
+		            else
+		            	Crafty.audio.play("background", -1, volume.music_vol, true)
 	            }
 	            else {
 	            	if (this._w + this._x - 5 < e.realX){
@@ -29,7 +32,7 @@ var setUpComponents = function(){
 		            	volume.sound_vol = 1.0
 		            	object.tween({w: 0}, 20);
 		            } else {
-		                volume.sound_vol = (e.realX-(this._x+10))/200
+		                volume.sound_vol = (e.realX-(this._x+5))/200
 		                object.tween({w: e.realX - (this._x + 5)}, 20);
 		            }
 	            }
@@ -92,7 +95,7 @@ var setUpComponents = function(){
 			.fourway(3)
 			.stopOnSolids()
 			.exitOnDoors()
-			.attr({z: 3})
+			.attr({z: 2})
 			.animate('PlayerMovingUp', 3, 3, 5)
 			.animate('PlayerMovingRight', 9, 3, 11)
 			.animate('PlayerMovingDown', 0, 3, 2)
@@ -140,7 +143,7 @@ var setUpComponents = function(){
 			this.onHit('Door', function(ent){
 				var door = ent[0].obj;
 				if (door.contains(this._x+(this._w/2)-5, this._y+(this._h/2)-5, 10, 10)){
-					Crafty.audio.play("doorSound");
+					Crafty.audio.play("doorSound", 1, volume.sound_vol, false);
 					exitLoc = door.at();
 					load_scene(door.ID, 40);
 				}