[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-10-14 17:28 GMT

[pingus]

2 new revisions:

Revision: 8c53fffa4945
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 14 10:27:38 2011
Log:      When paused don't go directly into fast-forward, instead unlock  
pause ...
http://code.google.com/p/pingus/source/detail?r=8c53fffa4945

Revision: a042a19be3a1
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 14 10:27:48 2011
Log:      Made halloween11 playable
http://code.google.com/p/pingus/source/detail?r=a042a19be3a1

==============================================================================
Revision: 8c53fffa4945
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 14 10:27:38 2011
Log:      When paused don't go directly into fast-forward, instead unlock  
pause first and require a second press for fast-forward

http://code.google.com/p/pingus/source/detail?r=8c53fffa4945

Modified:
 /src/pingus/screens/game_session.cpp

=======================================
--- /src/pingus/screens/game_session.cpp        Tue Oct 11 07:00:51 2011
+++ /src/pingus/screens/game_session.cpp        Fri Oct 14 10:27:38 2011
@@ -306,7 +306,14 @@
 void
 GameSession::on_fast_forward_press ()
 {
-  set_fast_forward(true);
+  if (get_pause())
+  {
+    set_pause(false);
+  }
+  else
+  {
+    set_fast_forward(true);
+  }
 }

 void

==============================================================================
Revision: a042a19be3a1
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 14 10:27:48 2011
Log:      Made halloween11 playable

http://code.google.com/p/pingus/source/detail?r=a042a19be3a1

Modified:
 /data/levels/halloween2011/halloween11-grumbel.pingus

=======================================
--- /data/levels/halloween2011/halloween11-grumbel.pingus	Fri Oct 14  
08:04:27 2011
+++ /data/levels/halloween2011/halloween11-grumbel.pingus	Fri Oct 14  
10:27:48 2011
@@ -6,15 +6,15 @@
     (description "")
     (author "Ingo Ruhnke <address@hidden>")
     (number-of-pingus 50)
-    (number-to-save 20)
+    (number-to-save 45)
     (time -1)
     (music "")
     (actions
-      (basher 20)
-      (bomber 20)
-      (bridger 20)
-      (climber 20)
-      (jumper 20)
+      (basher 2)
+      (bomber 3)
+      (bridger 12)
+      (climber 5)
+      (jumper 30)
       (miner 2))
     (levelsize 3400 1600))
   (objects
@@ -55,6 +55,42 @@
     (groundpiece
       (type "ground")
       (surface
+        (image "groundpieces/ground/halloween/tree1")
+        (modifier "ROT0"))
+      (position 1690 199 0))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground4")
+        (modifier "ROT180FLIP"))
+      (position 719 414 0))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground4")
+        (modifier "ROT180FLIP"))
+      (position 669 415 0))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground4")
+        (modifier "ROT180FLIP"))
+      (position 565 406 0))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground4")
+        (modifier "ROT0"))
+      (position 2688 785 0))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 2684 828 0))
+    (groundpiece
+      (type "ground")
+      (surface
         (image "groundpieces/ground/halloween/ground4")
         (modifier "ROT180FLIP"))
       (position 1120 838 0))
@@ -361,12 +397,6 @@
     (groundpiece
       (type "ground")
       (surface
-        (image "groundpieces/ground/halloween/ground5")
-        (modifier "ROT0"))
-      (position 2710 793 0))
-    (groundpiece
-      (type "ground")
-      (surface
         (image "groundpieces/ground/halloween/ground5")
         (modifier "ROT0"))
       (position 2096 721 0))
@@ -385,12 +415,6 @@
     (groundpiece
       (type "ground")
       (surface
-        (image "groundpieces/ground/halloween/tree3")
-        (modifier "ROT0"))
-      (position 1707 206 0))
-    (groundpiece
-      (type "ground")
-      (surface
         (image "groundpieces/ground/halloween/ground4")
         (modifier "ROT180"))
       (position 2242 441 0))
@@ -663,13 +687,13 @@
       (surface
         (image "groundpieces/ground/halloween/ground5")
         (modifier "ROT0"))
-      (position 1436 1375 0))
+      (position 1436 1380 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground5")
         (modifier "ROT0"))
-      (position 1297 1377 0))
+      (position 1297 1382 0))
     (groundpiece
       (type "ground")
       (surface
@@ -681,43 +705,43 @@
       (surface
         (image "groundpieces/ground/halloween/ground2")
         (modifier "ROT0"))
-      (position 1185 1351 0))
+      (position 1185 1356 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground2")
         (modifier "ROT0"))
-      (position 1453 1353 0))
+      (position 1453 1358 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0"))
-      (position 1384 1357 0))
+      (position 1384 1362 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0"))
-      (position 1335 1411 0))
+      (position 1335 1416 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground5")
         (modifier "ROT0"))
-      (position 1431 1485 0))
+      (position 1431 1490 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0"))
-      (position 1331 1534 0))
+      (position 1331 1539 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground5")
         (modifier "ROT0"))
-      (position 1297 1497 0))
+      (position 1297 1502 0))
     (groundpiece
       (type "ground")
       (surface
@@ -765,25 +789,25 @@
       (surface
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0FLIP"))
-      (position 1253 1367 0))
+      (position 1253 1372 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground2")
         (modifier "ROT0"))
-      (position 1313 1351 0))
+      (position 1313 1356 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground3")
         (modifier "ROT0"))
-      (position 1341 1481 0))
+      (position 1341 1486 0))
     (groundpiece
       (type "ground")
       (surface
         (image "groundpieces/ground/halloween/ground3")
         (modifier "ROT0"))
-      (position 1387 1474 0))
+      (position 1387 1479 0))
     (prefab
       (name "prefabs/liquids/slime")
       (position -4 1600 0)
@@ -1227,7 +1251,7 @@
       (name "prefabs/entrances/halloween")
       (position 634 307 0)
       (overrides
-        (release-rate 50)
+        (release-rate 150)
         (direction "right")
         (owner-id 0)))
     (groundpiece
@@ -1295,12 +1319,6 @@
     (groundpiece
       (type "ground")
       (surface
-        (image "groundpieces/ground/halloween/ground4")
-        (modifier "ROT0"))
-      (position 567 400 0))
-    (groundpiece
-      (type "ground")
-      (surface
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0FLIP"))
       (position 726 1267 0))
@@ -1375,7 +1393,7 @@
       (surface
         (image "groundpieces/ground/halloween/ground2")
         (modifier "ROT0"))
-      (position 2171 709 0))
+      (position 2166 709 0))
     (groundpiece
       (type "ground")
       (surface
@@ -1393,7 +1411,7 @@
       (surface
         (image "groundpieces/solid/misc/metalplate_large")
         (modifier "ROT0"))
-      (position 2232 652 0))
+      (position 2245 652 0))
     (groundpiece
       (type "solid")
       (surface
@@ -1718,20 +1736,17 @@
         (image "groundpieces/ground/halloween/ground6")
         (modifier "ROT0"))
       (position 895 1327 0))
-    (entrance
-      (position 2532 964 110)
-      (owner-id 0)
-      (direction "misc")
-      (release-rate 150))
-    (entrance
-      (position 1835 213 110)
-      (owner-id 0)
-      (direction "misc")
-      (release-rate 150))
-    (entrance
-      (position 1391 1242 110)
-      (owner-id 0)
-      (direction "misc")
-      (release-rate 150))))
+    (groundpiece
+      (type "ground")
+      (surface
+        (image "groundpieces/ground/halloween/ground2")
+        (modifier "ROT0"))
+      (position 711 403 0))
+    (groundpiece
+      (type "solid")
+      (surface
+        (image "groundpieces/solid/misc/metalplate_large")
+        (modifier "ROT0"))
+      (position 902 571 0))))

 ;; EOF ;;