[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3180 - in trunk/pingus: . data/levels/playable src/editor
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3180 - in trunk/pingus: . data/levels/playable src/editor |
Date: |
Tue, 18 Sep 2007 18:52:32 +0200 |
Author: grumbel
Date: 2007-09-18 18:52:31 +0200 (Tue, 18 Sep 2007)
New Revision: 3180
Added:
trunk/pingus/data/levels/playable/desert8-grumbel.pingus
Modified:
trunk/pingus/TODO
trunk/pingus/src/editor/inputbox.cpp
trunk/pingus/src/editor/level_objs.cpp
Log:
- created a simple test level with the new editor
- fixed little bug in the inputbox
Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO 2007-09-18 16:12:13 UTC (rev 3179)
+++ trunk/pingus/TODO 2007-09-18 16:52:31 UTC (rev 3180)
@@ -178,6 +178,8 @@
Important:
==========
+- music property missing
+
- add object duplication
- ObjectSelector need to support more object types, missing types:
Added: trunk/pingus/data/levels/playable/desert8-grumbel.pingus
===================================================================
--- trunk/pingus/data/levels/playable/desert8-grumbel.pingus 2007-09-18
16:12:13 UTC (rev 3179)
+++ trunk/pingus/data/levels/playable/desert8-grumbel.pingus 2007-09-18
16:52:31 UTC (rev 3180)
@@ -0,0 +1,466 @@
+;; -*- scheme -*-
+;; Generated by Pingus Editor 0.7.0
+(pingus-level
+ (version 2)
+ (head
+ (levelname "Tunnel Time")
+ (description "Dig a tunnel and you might make it to the exit. Digger and
miners and stuff have to work together.")
+ (author "Ingo Ruhnke <address@hidden>")
+ (number-of-pingus 50)
+ (number-to-save 40)
+ (time -1)
+ (difficulty 40)
+ (playable 1)
+ (comment "")
+ (music "none")
+ (actions
+ (basher 5)
+ (blocker 5)
+ (bomber 5)
+ (climber 5)
+ (miner 20))
+ (levelsize 1600 1000))
+ (objects
+ (surface-background
+ (surface
+ (image "textures/desert_room")
+ (modifier "ROT0"))
+ (position 792 161 -1000)
+ (color 0 0 0 0)
+ (stretch-x #f)
+ (stretch-y #f)
+ (keep-aspect #f)
+ (scroll-x 0)
+ (scroll-y 0)
+ (para-x 0.5)
+ (para-y 0.5))
+ (hotspot
+ (surface
+ (image "entrances/wood_bottom")
+ (modifier "ROT0"))
+ (position 180 199 -100)
+ (speed 0)
+ (parallax 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/middleprickpiece")
+ (modifier "ROT0"))
+ (position 867 311 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 781 734 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 775 596 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 565 666 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position -27 569 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 271 681 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 272 532 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/leftsmallbrick")
+ (modifier "ROT180"))
+ (position 499 534 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/leftsmallbrick")
+ (modifier "ROT180FLIP"))
+ (position 869 605 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/leftsmallbrick")
+ (modifier "ROT180FLIP"))
+ (position 503 349 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/middleprickpiece")
+ (modifier "ROT0"))
+ (position 575 313 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT90FLIP"))
+ (position 724 159 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position 571 533 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigdune1")
+ (modifier "ROT90"))
+ (position 1004 550 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/middleprickpiece")
+ (modifier "ROT0"))
+ (position 721 459 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position 871 459 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/middleprickpiece")
+ (modifier "ROT0"))
+ (position 869 386 0))
+ (exit
+ (surface
+ (image "exits/desert")
+ (modifier "ROT0"))
+ (position 1203 312 0)
+ (owner-id 0))
+ (entrance
+ (type "generic")
+ (position 231 235 0)
+ (owner-id 0)
+ (direction "right")
+ (release-rate 150))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position 128 385 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/leftsmallbrick")
+ (modifier "ROT0FLIP"))
+ (position 429 349 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/rightsmallbrick")
+ (modifier "ROT0"))
+ (position 500 313 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position -170 283 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position -151 432 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/middleprickpiece")
+ (modifier "ROT0"))
+ (position 127 535 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/rightsmallbrick")
+ (modifier "ROT0"))
+ (position 501 350 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position 425 385 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_large")
+ (modifier "ROT0"))
+ (position 770 364 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_vert")
+ (modifier "ROT0"))
+ (position 810 320 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_vert")
+ (modifier "ROT0"))
+ (position 781 265 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_small")
+ (modifier "ROT0"))
+ (position 793 310 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_large")
+ (modifier "ROT0"))
+ (position 779 197 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_small")
+ (modifier "ROT0"))
+ (position 795 249 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_vert")
+ (modifier "ROT0"))
+ (position 770 231 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position -28 712 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position -31 861 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 262 823 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 258 971 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 547 810 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 550 918 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigsand")
+ (modifier "ROT0"))
+ (position 778 871 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigdune1")
+ (modifier "ROT90FLIP"))
+ (position 1024 732 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/flatdune")
+ (modifier "ROT0"))
+ (position 816 749 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/flatdune")
+ (modifier "ROT0"))
+ (position 594 905 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigdune1")
+ (modifier "ROT0"))
+ (position 268 770 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/peakdune")
+ (modifier "ROT0"))
+ (position 792 920 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/flatdune")
+ (modifier "ROT0"))
+ (position 371 692 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigdune1")
+ (modifier "ROT0"))
+ (position -99 866 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/flatdune")
+ (modifier "ROT0"))
+ (position 298 942 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/peakdune")
+ (modifier "ROT0"))
+ (position 46 727 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 281 588 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 137 659 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 670 813 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 550 721 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 909 862 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/sluggydu")
+ (modifier "ROT0"))
+ (position 794 686 0))
+ (groundpiece
+ (type "ground")
+ (surface
+ (image "groundpieces/ground/desert/bigprickpiece")
+ (modifier "ROT0"))
+ (position 1016 310 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/desert/middlebrickpiece")
+ (modifier "ROT90FLIP"))
+ (position 59 233 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/desert/middlebrickpiece")
+ (modifier "ROT0"))
+ (position -90 211 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/desert/middlebrickpiece")
+ (modifier "ROT0"))
+ (position 59 383 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/desert/middlebrickpiece")
+ (modifier "ROT90FLIP"))
+ (position 134 459 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/desert/middlebrickpiece")
+ (modifier "ROT90FLIP"))
+ (position 101 528 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT0"))
+ (position 672 200 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT0"))
+ (position 673 87 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT0"))
+ (position 871 144 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT0"))
+ (position 870 196 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT90"))
+ (position 718 108 0))
+ (groundpiece
+ (type "remove")
+ (surface
+ (image "groundpieces/remove/misc/column1")
+ (modifier "ROT90"))
+ (position 799 108 0))
+ (groundpiece
+ (type "solid")
+ (surface
+ (image "groundpieces/solid/misc/metalplate_vert")
+ (modifier "ROT0"))
+ (position 800 159 0))
+ (hotspot
+ (surface
+ (image "entrances/wood_top")
+ (modifier "ROT0"))
+ (position 179 200 100)
+ (speed 0)
+ (parallax 0))))
+
+;; EOF ;;
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2007-09-18 16:12:13 UTC (rev
3179)
+++ trunk/pingus/src/editor/inputbox.cpp 2007-09-18 16:52:31 UTC (rev
3180)
@@ -49,8 +49,12 @@
void
Inputbox::on_key_pressed(const unsigned short c)
{
- if (c == 8) // backspace
+ if (c == 0)
{
+ // ignore
+ }
+ else if (c == 8) // backspace
+ {
if (!text.empty())
{
text = text.substr(0, text.size()-1);
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2007-09-18 16:12:13 UTC (rev
3179)
+++ trunk/pingus/src/editor/level_objs.cpp 2007-09-18 16:52:31 UTC (rev
3180)
@@ -117,8 +117,8 @@
Rect r(Vector2i((int)pos.x, (int)pos.y) - sprite.get_offset(),
Size(sprite.get_width(), sprite.get_height()));
- gc.draw_fillrect(r, Color(255,0,0,50));
- gc.draw_rect(r, Color(255,0,0));
+ gc.draw_fillrect(r, Color(255,0,0,50), pos.z);
+ gc.draw_rect(r, Color(255,0,0), pos.z);
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3180 - in trunk/pingus: . data/levels/playable src/editor,
grumbel at BerliOS <=