Merge branch 'master' of https://github.com/oneseedfruit/LD41_Gamkedo_JS

oneseedfruit · Apr 23, 2018 · 365225a · 365225a
2 parents 5227bfe + 1e2f4ba
commit 365225a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/images/pan.png b/images/pan.png
diff --git a/js/Main/ImageLoading.js b/js/Main/ImageLoading.js
@@ -1,6 +1,9 @@
+// still images
 var hippoCarPic = document.createElement("img");
 var particlePic = document.createElement("img");
+var panPaddle = document.createElement("img");
 
+//sprites
 var hippoCarPicTailwag = document.createElement("img");
 var hippoCarPicTailwagSprite;
 
@@ -85,6 +88,7 @@ function loadImages() {
 	var imageList = [
 	{varName: hippoCarPic, theFile: "foodTruck.png"},
 	{varName: particlePic, theFile: "particle.png"},
+    {varName: panPaddle, theFile: "pan.png"},
 
 	{TrackType:TRACK_ROAD, theFile: "track_road.png"},
 	{TrackType:TRACK_WALL, theFile: "track_wall.png"},

diff --git a/js/PongScene/Kitchen.js b/js/PongScene/Kitchen.js
@@ -10,7 +10,8 @@ function kitchenStuff() {
     colorRect(0, 0, canvas.width, canvas.height, "lightgrey");
 
     //paddle 1
-    colorRect(paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");
+    //colorRect(paddle1X, paddle1Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");
+    canvasContext.drawImage(panPaddle, paddle1X, paddle1Y)
 
     //paddle 2
     colorRect(paddle2X, paddle2Y, PADDLE_THICKNESS, PADDLE_HEIGHT, "white");