Merge branch 'DragonRuby:master' into masterHEADmaster

1 files changed, 9 insertions, 2 deletions

diff --git a/samples/04_physics_and_collisions/07_jump_physics/app/main.rb b/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
index da01e91..8db98be 100644
--- a/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
+++ b/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
@@ -9,6 +9,7 @@
 
  - args.outputs.solids: An array. The values generate a solid.
    The parameters for a solid are [X, Y, WIDTH, HEIGHT, RED, GREEN, BLUE]
+   For more information about solids, go to mygame/documentation/03-solids-and-borders.md.
 
  - num1.greater(num2): Returns the greater value.
 
@@ -44,8 +45,7 @@ class VerticalPlatformer
     input
   end
 
-  # Sets default values
-  def defaults
+  def init_game
     s.platforms ||= [ # initializes platforms collection with two platforms using hashes
       new_platform(x: 0, y: 0, w: 700, h: 32, dx: 1, speed: 0, rect: nil),
       new_platform(x: 0, y: 300, w: 700, h: 32, dx: 1, speed: 0, rect: nil), # 300 pixels higher
@@ -68,6 +68,11 @@ class VerticalPlatformer
     s.camera ||= { y: -100 } # shows view on screen (as the player moves upward, the camera does too)
   end
 
+  # Sets default values
+  def defaults
+    init_game
+  end
+
   # Outputs objects onto the screen
   def render
     outputs.solids << s.platforms.map do |p| # outputs platforms onto screen
@@ -155,7 +160,9 @@ class VerticalPlatformer
                                     rect: nil)
       end
     else
+      # game over
       s.as_hash.clear # otherwise clear the hash (no new platform is necessary)
+      init_game
     end
   end