[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.9, 1.10 info_bo
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.9, 1.10 info_box.cxx, 1.23, 1.24 rain_generator.cxx, 1.12, 1.13 smasher.cxx, 1.21, 1.22 surface_background.cxx, 1.13, 1.14 switch_door.cxx, 1.27, 1.28 |
Date: |
Tue, 21 Oct 2003 13:01:55 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv31821/worldobjs
Modified Files:
exit.cxx info_box.cxx rain_generator.cxx smasher.cxx
surface_background.cxx switch_door.cxx
Log Message:
- bunch of misc changes
Index: exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/exit.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exit.cxx 18 Oct 2003 23:17:28 -0000 1.9
+++ exit.cxx 21 Oct 2003 11:01:52 -0000 1.10
@@ -61,9 +61,11 @@
void
Exit::on_startup ()
{
+#ifdef CLANLIB_0_6
world->get_colmap()->remove(sprite.get_surface(),
static_cast<int>(data->pos.x) -
sprite.get_width()/2,
static_cast<int>(data->pos.y) -
sprite.get_height());
+#endif
}
void
Index: info_box.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- info_box.cxx 20 Oct 2003 13:11:09 -0000 1.23
+++ info_box.cxx 21 Oct 2003 11:01:52 -0000 1.24
@@ -46,6 +46,7 @@
void
InfoBox::draw (GraphicContext& gc)
{
+#ifdef CLANLIB_0_6
int x = static_cast<int>(gc.get_x_offset() + (gc.get_width ()/2));
int y = static_cast<int>(gc.get_y_offset() + (gc.get_height()/2));
@@ -54,7 +55,6 @@
if (is_open)
{
-#ifdef CLANLIB_0_6
int width = Fonts::pingus_small.get_text_width(data->info_text.c_str());
int border = 6;
gc.draw_line(data->pos, data->pos + Vector(0, 0 - 100), 0.0f, 1.0f,
0.0f, 1.0f);
@@ -65,12 +65,12 @@
y_pos + Fonts::pingus_small->get_height() + border,
0.0, 0.0, 0.0, 1.0);
gc.print_center(Fonts::pingus_small, x_pos, y_pos,
data->info_text.c_str());
-#endif
}
else
{
gc.draw(data->sprite, data->pos);
}
+#endif
}
void
Index: rain_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rain_generator.cxx 19 Oct 2003 12:25:47 -0000 1.12
+++ rain_generator.cxx 21 Oct 2003 11:01:52 -0000 1.13
@@ -63,7 +63,7 @@
do_thunder = true;
thunder_count = 1.0f;
waiter_count = 1.0f;
- PingusSound::play_sound ("sounds/thunder.wav");
+ Sound::PingusSound::play_sound ("sounds/thunder.wav");
}
if (do_thunder)
Index: smasher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- smasher.cxx 20 Oct 2003 13:11:09 -0000 1.21
+++ smasher.cxx 21 Oct 2003 11:01:52 -0000 1.22
@@ -69,7 +69,7 @@
// SMASH!!! The thing hitten earth and kills the pingus
downwards = false;
--count;
- PingusSound::play_sound("sounds/tenton.wav", 0.7f);
+ Sound::PingusSound::play_sound("sounds/tenton.wav", 0.7f);
for(int i=0; i < 20; ++i)
{
Index: surface_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- surface_background.cxx 20 Oct 2003 13:11:09 -0000 1.13
+++ surface_background.cxx 21 Oct 2003 11:01:52 -0000 1.14
@@ -91,6 +91,7 @@
FIXME: the bug might be in create_canvas() and not in fill_rect()
*/
+#ifdef CLANLIB_0_6
if (data->color.alpha != 0.0 && data->color != Color(0, 0, 0, 1.0f))
{ // Workaround for a bug which caused all levels to have the
// wrong background color
@@ -99,12 +100,15 @@
data->color.red, data->color.green, data->color.blue,
data->color.alpha);
}
+#endif
bg_surface = CL_Surface(canvas, true);
+#ifdef CLANLIB_0_6
//bg_surface = CAImageManipulation::changeHSV(bg_surface, 150, 100, 0);
counter.set_size(bg_surface.get_frame_count());
counter.set_speed(1.0);
+#endif
timer.stop();
}
@@ -189,7 +193,9 @@
x < CL_Display::get_width();
x += bg_surface.get_width())
{
+#ifdef CLANLIB_0_6
bg_surface.put_screen(x, y, counter); // FIXME: should use gc
+#endif
}
}
}
Index: switch_door.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- switch_door.cxx 20 Oct 2003 19:28:55 -0000 1.27
+++ switch_door.cxx 21 Oct 2003 11:01:52 -0000 1.28
@@ -70,10 +70,10 @@
gc.draw (door_box, data->door_pos);
for (int i=0; i < current_door_height; ++i)
gc.draw(door_tile,
- static_cast<int>(data->door_pos.x),
- static_cast<int>(data->door_pos.y)
- + i * door_tile.get_height()
- + door_box.get_height());
+ Vector(static_cast<int>(data->door_pos.x),
+ static_cast<int>(data->door_pos.y)
+ + i * door_tile.get_height()
+ + door_box.get_height()));
gc.draw(switch_sur, data->switch_pos);
}
@@ -108,6 +108,7 @@
// it, we remove the door from the colmap
if (current_door_height + 10 < data->door_height)
{
+#ifdef CLANLIB_0_6
world->get_colmap()->put(door_box,
static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y),
@@ -118,6 +119,7 @@
static_cast<int>(data->door_pos.y) + i
* door_tile.get_height()
+
door_box.get_height(),
Groundtype::GP_NOTHING);
+#endif
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx, 1.9, 1.10 info_box.cxx, 1.23, 1.24 rain_generator.cxx, 1.12, 1.13 smasher.cxx, 1.21, 1.22 surface_background.cxx, 1.13, 1.14 switch_door.cxx, 1.27, 1.28,
Ingo Ruhnke <=