[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2820 - in branches/pingus_sdl: . src/worldobjs
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r2820 - in branches/pingus_sdl: . src/worldobjs |
Date: |
Tue, 7 Aug 2007 00:22:41 +0200 |
Author: grumbel
Date: 2007-08-07 00:22:41 +0200 (Tue, 07 Aug 2007)
New Revision: 2820
Modified:
branches/pingus_sdl/TODO
branches/pingus_sdl/src/worldobjs/liquid.cpp
Log:
- fixed liquid width issue
Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO 2007-08-06 22:10:37 UTC (rev 2819)
+++ branches/pingus_sdl/TODO 2007-08-06 22:22:41 UTC (rev 2820)
@@ -3,6 +3,10 @@
- add VCR like effect for fast forward
+- add slow motion button
+
+- proper waiter animation
+
- repaint pause and fast-forward button
- use transparent action buttons unless fast-mode is used
@@ -24,10 +28,10 @@
Roadmap for Pingus 0.7.0
~~~~~~~~~~~~~~~~~~~~~~~~
+- liquid's old-width-handling isn't handled by sexpr, but might be needed for
some levels
+
- snow doesn't land on the ground
-- some levels have issues with liquids, maybe all
-
- completly broken: data/levels/playable/bombing.scm (z ordering?)
- hotspot offset gets ignored/mishandled
Modified: branches/pingus_sdl/src/worldobjs/liquid.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/liquid.cpp 2007-08-06 22:10:37 UTC
(rev 2819)
+++ branches/pingus_sdl/src/worldobjs/liquid.cpp 2007-08-06 22:22:41 UTC
(rev 2820)
@@ -27,14 +27,14 @@
namespace WorldObjs {
Liquid::Liquid(const FileReader& reader)
- : old_width_handling(true),
+ : old_width_handling(false),
width(0)
{
/*
- if (XMLhelper::get_prop(cur, "use-old-width-handling", old_width_handling))
+ if (XMLhelper::get_prop(cur, "use-old-width-handling", old_width_handling))
{
- if (old_width_handling)
- std::cout << "XMLPLF: Using Old Width Handling: " << std::endl;
+ if (old_width_handling)
+ std::cout << "XMLPLF: Using Old Width Handling: " << std::endl;
}
*/
ResDescriptor desc;
@@ -43,10 +43,10 @@
reader.read_desc ("surface", desc);
reader.read_int ("width", width);
+ sur = Resource::load_sprite(desc);
+
if (!old_width_handling)
- width *= sur.get_width();
-
- sur = Resource::load_sprite(desc);
+ width = width * sur.get_width();
}
float
@@ -62,9 +62,9 @@
for(int i=0; i < width; ++i)
world->get_colmap()->put(mask,
- static_cast<int>(pos.x + i),
- static_cast<int>(pos.y),
- Groundtype::GP_WATER);
+ static_cast<int>(pos.x + i),
+ static_cast<int>(pos.y),
+ Groundtype::GP_WATER);
}
void
@@ -73,7 +73,9 @@
for(int x = static_cast<int>(pos.x);
x < pos.x + width;
x += sur.get_width())
- gc.color().draw(sur, Vector3f((float)x, pos.y));
+ {
+ gc.color().draw(sur, Vector3f((float)x, pos.y));
+ }
}
void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2820 - in branches/pingus_sdl: . src/worldobjs,
grumbel at BerliOS <=