[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3202 - in trunk/pingus: . data/levels/playable src
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3202 - in trunk/pingus: . data/levels/playable src |
Date: |
Fri, 21 Sep 2007 17:54:56 +0200 |
Author: grumbel
Date: 2007-09-21 17:54:56 +0200 (Fri, 21 Sep 2007)
New Revision: 3202
Modified:
trunk/pingus/TODO
trunk/pingus/data/levels/playable/stone13-grumbel.pingus
trunk/pingus/src/collision_mask.hpp
trunk/pingus/src/string_util.hpp
Log:
- fixed bug in StringUtils::to
- added some water to level
Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO 2007-09-21 14:37:23 UTC (rev 3201)
+++ trunk/pingus/TODO 2007-09-21 15:54:56 UTC (rev 3202)
@@ -93,21 +93,22 @@
- create verdana11 for latin2 and latin9
-- miner remove graphics looks wrong (cmap instead of gfx?)
+- miner remove graphics looks wrong (cmap instead of gfx?), others too (digger)
### Loading font file: system://data/images/fonts/courier_small-iso-8859-9.font
Font: datadir://images/fonts/courier_small-iso-8859-9.png
Error: glyphs found: 188, expected 189
Format: bpp: 32
+
+Less Important:
+===============
+
- bridging gets more complicated has graphical error (background?!)
surface background doesn't handle larger res due to the Playfield
being offsetted (might be solveable with new DrawingContext that
features Rect)
-Less Important:
-===============
-
- menu crashes when you click a little wildely
- rewrite Config file support, make game automatically write a default
Modified: trunk/pingus/data/levels/playable/stone13-grumbel.pingus
===================================================================
--- trunk/pingus/data/levels/playable/stone13-grumbel.pingus 2007-09-21
14:37:23 UTC (rev 3201)
+++ trunk/pingus/data/levels/playable/stone13-grumbel.pingus 2007-09-21
15:54:56 UTC (rev 3202)
@@ -1,5 +1,5 @@
;; -*- scheme -*-
-;; Generated by Pingus Editor 0.7.0
+;; Generated by Pingus Editor 0.7.1
(pingus-level
(version 2)
(head
@@ -485,6 +485,20 @@
(modifier "ROT0"))
(position 264 486 150)
(speed 0)
- (parallax 0))))
+ (parallax 0))
+ (liquid
+ (surface
+ (image "liquids/water2")
+ (modifier "ROT0"))
+ (position -41 937 -100)
+ (speed 0)
+ (repeat 25))
+ (liquid
+ (surface
+ (image "liquids/water2")
+ (modifier "ROT0"))
+ (position -7 946 100)
+ (speed 0)
+ (repeat 25))))
;; EOF ;;
Modified: trunk/pingus/src/collision_mask.hpp
===================================================================
--- trunk/pingus/src/collision_mask.hpp 2007-09-21 14:37:23 UTC (rev 3201)
+++ trunk/pingus/src/collision_mask.hpp 2007-09-21 15:54:56 UTC (rev 3202)
@@ -42,7 +42,7 @@
int get_width() const;
int get_height() const;
- Surface get_surface() const;
+ Surface get_surface() const;
uint8_t* get_data() const;
private:
Modified: trunk/pingus/src/string_util.hpp
===================================================================
--- trunk/pingus/src/string_util.hpp 2007-09-21 14:37:23 UTC (rev 3201)
+++ trunk/pingus/src/string_util.hpp 2007-09-21 15:54:56 UTC (rev 3202)
@@ -31,9 +31,9 @@
static std::string to_upper(const std::string &str);
template<class T>
- static T to(const std::string& s)
+ static T to(const std::string& s, const T& val = T())
{
- T tmp;
+ T tmp = val;
std::istringstream str(s);
str >> tmp;
return tmp;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3202 - in trunk/pingus: . data/levels/playable src,
grumbel at BerliOS <=