Merged lp:pingus

ChangeLog

@@ -1,3 +1,14 @@
+2011-02-06 22:49 gabriel
+
+	* data/*:
+	  - add levelset from 0.7.3.3
+	  - rename for disable pacman e xmas not ready levelset
+	* src/pingus/pingus_main.cpp,
+	  src/util/system.cpp:
+	  - forcing read LANG for start with correct locale
+	* src/pingus/screens/pingus_menu.cpp:
+	  - add music in main menu
+
 2007-10-31 05:39  grumbel
 
 	* data/levels/halloween/halloween2-grumbel.pingus,

INSTALL.unix

@@ -48,6 +48,12 @@ Compilation:
 ------------
 Once all libraries are in place, you can compile Pingus with just:
 
+ % make
+
+or
+
+ % mkdir -p build
+ % scons src
  % scons
 
 If you need to change the compiler or other build variables you can do
@@ -66,6 +72,7 @@ Running:
 Once the compilation is successful you can run Pingus directly from
 the top level directory of the source tree via:
 
+ % cd build
  % ./pingus
 
 There is no need to install Pingus.

Makefile

@@ -20,6 +20,8 @@ DATADIR = $(PREFIX)/share/pingus
 BINDIR  = $(PREFIX)/bin
 
 build/pingus:
+	mkdir -p build
+	scons src
 	scons
 
 clean:

data/data/core.res

@@ -14,6 +14,15 @@
                    (sprite
                     (name "desert")
                     (image-file "../images/levelsets/desert.png"))
+                   (sprite
+                    (name "mysteryIsland")
+                    (image-file "../images/levelsets/mysteryIsland.png"))
+                   (sprite
+                    (name "alien")
+                    (image-file "../images/levelsets/alien.png"))
+                   (sprite
+                    (name "factory")
+                    (image-file "../images/levelsets/factory.png"))
            )
 
  (section (name "core")

data/data/hotspots.res

@@ -160,7 +160,11 @@
     (section (name "space")
       (sprite
         (name "engine")
-        (image-file "../images/hotspots/space/engine.png"))
+        (image-file "../images/hotspots/space/engine.png")
+        (image-array 4 1)
+        (image-size 108 166)
+        (image-pos 0 0))
+
      )
    )
  )

data/levels/playable/aliens1-phil.pingus → data/levels/alien/aliens1-phil.pingus

@@ -1,51 +1,53 @@
-;; generated by xml2sexpr.rb from file 'branches/pingus_0_6/data/levels/playable/aliens1-phil.pingus'
+;; -*- scheme -*-
+;; Generated by Pingus Editor 0.7.3.5
+;; License: GPLv3 or later
 (pingus-level 
   (version 2)
   (head 
     (levelname "Escape from Aliens")
-    (description "Aliens invade our starship blocking intrance to the teleporter. Your crew "
-                 "is well trained, like you they don't panic.")
+    (description "Aliens invade our starship blocking intrance to the teleporter. Your crew is well trained, like you they don't panic.")
     (author "Philippe Descamps <[email protected]>")
     (number-of-pingus 100)
     (number-to-save 50)
     (time 9000)
     (difficulty 5)
-    (playable 0)
-    (comment )
+    (playable 1)
+    (comment "none")
+    (music "03-Haunted.ogg")
     (actions 
       (basher 10)
       (bridger 10)
       (climber 1)
       (floater 1))
-    (music "none")
     (levelsize 800 600))
   (objects 
     (surface-background 
       (surface 
         (image "textures/stars")
         (modifier "ROT0"))
+      (position 0 0 -150)
       (color 0 0 0 0.2)
-      (scroll-x 0.0)
-      (scroll-y 5.0)
-      (para-x 0.5)
-      (para-y 0.5)
       (stretch-x #f)
       (stretch-y #f)
-      (position 0 0 -150))
+      (keep-aspect #f)
+      (scroll-x 0)
+      (scroll-y 1)
+      (para-x 0.5)
+      (para-y 0.5))
     (liquid 
       (surface 
-        (image "liquids/water3")
+        (image "liquids/water4")
         (modifier "ROT0"))
       (position -1 546 -100)
-      (repeat 13)
-      (speed 50))
+      (speed 50)
+      (repeat 13))
     (liquid 
       (surface 
-        (image "liquids/water3")
+        (image "liquids/water4")
         (modifier "ROT0"))
-      (position 383 343 -100)
-      (repeat 3)
-      (speed 50))
+      (position 363 343 -100)
+      (speed 50)
+      (repeat 3))
     (groundpiece 
       (type "ground")
       (surface 
@@ -869,17 +871,16 @@
         (modifier "ROT0"))
       (position 1 212 0))
     (entrance 
-      (position 694 144 0)
       (type "generic")
+      (position 694 144 0)
+      (owner-id 0)
       (direction "right")
-      (release-rate 40)
-      (owner-id 0))
+      (release-rate 40))
     (exit 
-      (owner-id 0)
-      (position 79 213 0)
       (surface 
         (image "exits/space")
         (modifier "ROT0"))
+      (position 79 213 0)
       (owner-id 0))
     (hotspot 
       (surface 
@@ -901,5 +902,20 @@
         (modifier "ROT0"))
       (position 38 269 0)
       (speed 1)
+      (parallax 1))
+    (hotspot 
+      (surface 
+        (image "hotspots/space/engine")
+        (modifier "ROT0"))
+      (position 220 268 0)
+      (speed 1)
+      (parallax 1))
+    (hotspot 
+      (surface 
+        (image "hotspots/space/engine")
+        (modifier "ROT0"))
+      (position 320 266 0)
+      (speed 1)
       (parallax 1))))
+
 ;; EOF ;;

data/levels/playable/aliens2-phil.pingus → data/levels/alien/aliens2-phil.pingus

@@ -1,4 +1,6 @@
-;; generated by xml2sexpr.rb from file 'branches/pingus_0_6/data/levels/playable/aliens2-phil.pingus'
+;; -*- scheme -*-
+;; Generated by Pingus Editor 0.7.3.5
+;; License: GPLv3 or later
 (pingus-level 
   (version 2)
   (head 
@@ -9,42 +11,43 @@
     (number-to-save 50)
     (time 9000)
     (difficulty 5)
-    (playable 0)
-    (comment )
+    (playable 1)
+    (comment "none")
+    (music "06-Ozric Echo.ogg")
     (actions 
       (basher 10)
       (bridger 10)
       (climber 1)
       (floater 1))
-    (music "none")
     (levelsize 800 600))
   (objects 
     (surface-background 
       (surface 
         (image "textures/stars")
         (modifier "ROT0"))
+      (position 0 0 -150)
       (color 0 0 0 0.2)
-      (scroll-x 0.0)
-      (scroll-y 5.0)
-      (para-x 0.5)
-      (para-y 0.5)
       (stretch-x #f)
       (stretch-y #f)
-      (position 0 0 -150))
+      (keep-aspect #f)
+      (scroll-x 0)
+      (scroll-y 2)
+      (para-x 0.5)
+      (para-y 0.5))
     (liquid 
       (surface 
-        (image "liquids/water3")
+        (image "liquids/water4")
         (modifier "ROT0"))
       (position -1 546 -100)
-      (repeat 13)
-      (speed 50))
+      (speed 50)
+      (repeat 13))
     (liquid 
       (surface 
-        (image "liquids/water3")
+        (image "liquids/water4")
         (modifier "ROT0"))
-      (position 383 343 -100)
-      (repeat 3)
-      (speed 50))
+      (position 363 343 -100)
+      (speed 50)
+      (repeat 3))
     (groundpiece 
       (type "ground")
       (surface 
@@ -874,17 +877,16 @@
         (modifier "ROT0"))
       (position 1 212 0))
     (entrance 
-      (position 694 144 0)
       (type "generic")
+      (position 694 144 0)
+      (owner-id 0)
       (direction "right")
-      (release-rate 28)
-      (owner-id 0))
+      (release-rate 28))
     (exit 
-      (owner-id 0)
-      (position 79 213 0)
       (surface 
         (image "exits/space")
         (modifier "ROT0"))
+      (position 79 213 0)
       (owner-id 0))
     (hotspot 
       (surface 
@@ -906,5 +908,20 @@
         (modifier "ROT0"))
       (position 38 269 0)
       (speed 1)
+      (parallax 1))
+    (hotspot 
+      (surface 
+        (image "hotspots/space/engine")
+        (modifier "ROT0"))
+      (position 222 266 0)
+      (speed 1)
+      (parallax 1))
+    (hotspot 
+      (surface 
+        (image "hotspots/space/engine")
+        (modifier "ROT0"))
+      (position 314 262 0)
+      (speed 1)
       (parallax 1))))
+
 ;; EOF ;;

data/levels/playable/aliens4-phil.pingus → data/levels/alien/aliens4-phil.pingus

@@ -2,7 +2,7 @@
 (pingus-level 
   (version 2)
   (head 
-    (levelname "Aliens4")
+    (levelname "Alien's nest")
     (description "Pingus invade the nest. Take care of jaws What's the matrix above ?")
     (author "Philippe Descamps <[email protected]>")
     (number-of-pingus 50)
@@ -19,7 +19,7 @@
       (digger 20)
       (floater 20)
       (jumper 20))
-    (music "none")
+    (music "01-42nd Street Slide.ogg")
     (levelsize 832 608))
   (objects 
     (surface-background 

data/levels/playable/aliens5-phil.pingus → data/levels/alien/aliens5-phil.pingus

@@ -2,7 +2,7 @@
 (pingus-level 
   (version 2)
   (head 
-    (levelname "Aliens5")
+    (levelname "Matrix of the death")
     (description "Take a piece of paper. Now pingus have to enter the matrix of the death. "
                  "This is a maze, bad ways are protect by jaws.")
     (author )
@@ -20,7 +20,7 @@
       (digger 20)
       (floater 20)
       (jumper 20))
-    (music "none")
+    (music "02-Smoke and Mirrors.ogg")
     (levelsize 832 608))
   (objects 
     (surface-background