[gcompris: 49/111] landing platform added in land_safe

[Bruno Coudoin <bcoudoin src gnome org>]

commit d3976480d2a01ff721d7d1a7bf5b15f0e6bcdc12
Author: serah <serah4291 gmail com>
Date:   Mon Jul 2 22:40:43 2012 +0530

    landing platform added in land_safe

 src/land_safe-activity/land_safe.py                |   19 +++++++++----------
 .../resources/land_safe/Makefile.am                |    7 ++++---
 .../resources/land_safe/landing_area.png           |  Bin 0 -> 5297 bytes
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/land_safe-activity/land_safe.py b/src/land_safe-activity/land_safe.py
index 62977ad..735b423 100644
--- a/src/land_safe-activity/land_safe.py
+++ b/src/land_safe-activity/land_safe.py
@@ -201,14 +201,12 @@ class Spaceship:
 
     # Load landing area
     self.land_x = random.randrange(100, 400)
-    landing_area = goocanvas.Rect(
-      parent = land_rootitem,
-      x=self.land_x,
-      y=440,
-      width=100,
-      height=6,
-      fill_color="green",
-      stroke_color="green")
+    landing = goocanvas.Image(
+      parent = rootitem,
+      pixbuf = gcompris.utils.load_pixmap("land_safe/landing_area.png"),
+      x = self.land_x,
+      y = 365)
+    landing.lower(self.flame_rootitem)
 
     # Load spaceship
     pixbuf = gcompris.utils.load_pixmap("land_safe/rocket.png")
@@ -343,8 +341,9 @@ class Spaceship:
       self.zoom_out = False
 
   def check_landing(self):
-    x = self.spaceship_image.get_bounds().x1
-    if self.land_x < x < self.land_x + 100 and self.y < 0.8:
+    bounds = self.spaceship_image.get_bounds()
+    x = (bounds.x1 + bounds.x2)/2
+    if self.land_x < x < self.land_x + 130 and self.y < 0.8:
       self.game.win()
     else:
       self.crash_image()
diff --git a/src/land_safe-activity/resources/land_safe/Makefile.am b/src/land_safe-activity/resources/land_safe/Makefile.am
index 08e0299..d16bc9c 100644
--- a/src/land_safe-activity/resources/land_safe/Makefile.am
+++ b/src/land_safe-activity/resources/land_safe/Makefile.am
@@ -2,15 +2,16 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/land_safe
 img_DATA = \
 	background1.png \
 	background2.png \
-	land1.png \
-	land2.png \
 	crash.png \
 	flame1.png \
 	flame2.png \
 	flame3.png \
 	flame_left.png \
 	flame_right.png \
-	rocket.png
+	land1.png \
+	land2.png \
+	landing_area.png \
+	rocket.png 
 
 EXTRA_DIST = $(img_DATA)
 
diff --git a/src/land_safe-activity/resources/land_safe/landing_area.png b/src/land_safe-activity/resources/land_safe/landing_area.png
new file mode 100644
index 0000000..b4d1fba
Binary files /dev/null and b/src/land_safe-activity/resources/land_safe/landing_area.png differ