Permalink
Browse files

Merge branch 'master' into gosu_lessons

  • Loading branch information...
2 parents ba9f702 + 79a3ae2 commit 034a2db92ae8cea8eee2dd57c82289d9af78301c @deadprogram deadprogram committed Mar 1, 2012
@@ -1,6 +1,6 @@
def initialize(game_window)
@game_window = game_window
- @icon = Gosu::Image.new(@game_window, "images/ball.png", true)
+ @icon = Gosu::Image.new(@game_window, "gosu/asteroid.png", true)
@x = 50
@y = 150
end
@@ -96,7 +96,7 @@ def hit_by?(ball)
class Ball
def initialize(game_window)
@game_window = game_window
- @icon = Gosu::Image.new(@game_window, "Images/ball.png", true)
+ @icon = Gosu::Image.new(@game_window, "gosu/asteroid.png", true)
@x = rand(@game_window.width)
@y = 0
end
@@ -1,8 +1,9 @@
class Ball
def initialize(game_window)
@game_window = game_window
- @icon = Gosu::Image.new(@game_window, “images/ball.png)
+ @icon = Gosu::Image.new(@game_window, "gosu/asteroid.png")
reset!
+ end
end
def update
@@ -12,4 +13,3 @@ def update
@y = @y + 10
end
end
-
@@ -1,6 +1,6 @@
def initialize(game_window)
@game_window = game_window
- @icon = Gosu::Image.new(@game_window, "images/player1.png")
+ @icon = Gosu::Image.new(@game_window, "gosu/player1.png")
@x = 50
@y = 330
end

0 comments on commit 034a2db

Please sign in to comment.