[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx, 1.30, 1.31 bomber
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx, 1.30, 1.31 bomber.cxx, 1.35, 1.36 bridger.cxx, 1.32, 1.33 digger.cxx, 1.25, 1.26 exiter.cxx, 1.19, 1.20 miner.cxx, 1.24, 1.25 |
Date: |
Tue, 21 Oct 2003 13:01:54 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv31821/actions
Modified Files:
basher.cxx bomber.cxx bridger.cxx digger.cxx exiter.cxx
miner.cxx
Log Message:
- bunch of misc changes
Index: basher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- basher.cxx 18 Oct 2003 23:17:27 -0000 1.30
+++ basher.cxx 21 Oct 2003 11:01:52 -0000 1.31
@@ -88,7 +88,7 @@
|| rel_getpixel(0, pingu_height) == Groundtype::GP_SOLID)
{
// Change direction and let walk code walk forward/up to get out.
- PingusSound::play_sound("chink");
+ Sound::PingusSound::play_sound("chink");
pingu->direction.change();
pingu->set_action(Actions::Walker);
}
@@ -110,12 +110,14 @@
void
Basher::bash()
{
+#ifdef CLANLIB_0_6
WorldObj::get_world()->get_colmap()->remove(bash_radius,
static_cast<int>(pingu->get_x ()
- (bash_radius_width / 2)),
static_cast<int>(pingu->get_y ()
- bash_radius_width + 1));
WorldObj::get_world()->get_gfx_map()->remove(bash_radius_gfx,
static_cast<int>(pingu->get_x ()
- (bash_radius_gfx_width / 2)),
static_cast<int>(pingu->get_y ()
- bash_radius_gfx_width + 1));
+#endif
}
void
Index: bomber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- bomber.cxx 18 Oct 2003 23:17:27 -0000 1.35
+++ bomber.cxx 21 Oct 2003 11:01:52 -0000 1.36
@@ -124,13 +124,14 @@
if (sprite.get_frame () >= 13 && !colmap_exploded)
{
colmap_exploded = true;
-
+#ifdef CLANLIB_0_6
WorldObj::get_world()->get_colmap()->remove(bomber_radius,
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
WorldObj::get_world()->get_gfx_map()->remove(bomber_radius_gfx,
static_cast<int>(pingu->get_x () - (bomber_radius.get_width()/2)),
static_cast<int>(pingu->get_y () - 16 - (bomber_radius.get_width()/2)));
+#endif
}
Index: bridger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bridger.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- bridger.cxx 20 Oct 2003 19:28:55 -0000 1.32
+++ bridger.cxx 21 Oct 2003 11:01:52 -0000 1.33
@@ -231,7 +231,7 @@
name = "Bridger (" + to_string(bricks) + ")";
if (bricks < 4)
- PingusSound::play_sound("ting");
+ Sound::PingusSound::play_sound("ting");
#ifdef CLANLIB_0_6
Index: digger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/digger.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- digger.cxx 18 Oct 2003 23:17:27 -0000 1.25
+++ digger.cxx 21 Oct 2003 11:01:52 -0000 1.26
@@ -84,7 +84,7 @@
{
if (rel_getpixel(0, -1) == Groundtype::GP_SOLID)
{
- PingusSound::play_sound("chink");
+ Sound::PingusSound::play_sound("chink");
return false;
}
else
@@ -99,13 +99,14 @@
void
Digger::dig ()
{
+#ifdef CLANLIB_0_6
WorldObj::get_world()->get_colmap()->remove(digger_radius,
static_cast<int>(pingu->get_x() -
(digger_radius_width / 2)),
static_cast<int>(pingu->get_y() -
digger_radius_height + 2));
WorldObj::get_world()->get_gfx_map()->remove(digger_radius_gfx,
static_cast<int>(pingu->get_x ()
- (digger_radius_gfx_width / 2)),
static_cast<int>(pingu->get_y()
- digger_radius_gfx_height + 2));
-
+#endif
pingu->set_y(pingu->get_y() + 1);
}
Index: exiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- exiter.cxx 18 Oct 2003 23:17:27 -0000 1.19
+++ exiter.cxx 21 Oct 2003 11:01:52 -0000 1.20
@@ -42,7 +42,7 @@
if (!sound_played)
{
sound_played = true;
- PingusSound::play_sound("yipee");
+ Sound::PingusSound::play_sound("yipee");
}
if (sprite.finished())
Index: miner.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/miner.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- miner.cxx 18 Oct 2003 23:17:27 -0000 1.24
+++ miner.cxx 21 Oct 2003 11:01:52 -0000 1.25
@@ -82,7 +82,7 @@
|| rel_getpixel(0, pingu_height) == Groundtype::GP_SOLID)
{
if (rel_getpixel(0, -1) == Groundtype::GP_SOLID)
- PingusSound::play_sound("chink");
+ Sound::PingusSound::play_sound("chink");
WorldObj::get_world()->get_colmap ()->remove(miner_radius,
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx, 1.30, 1.31 bomber.cxx, 1.35, 1.36 bridger.cxx, 1.32, 1.33 digger.cxx, 1.25, 1.26 exiter.cxx, 1.19, 1.20 miner.cxx, 1.24, 1.25,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.155, 1.156 action_button.cxx, 1.34, 1.35 action_button.hxx, 1.19, 1.20 action_holder.cxx, 1.13, 1.14 alpha_button.cxx, 1.6, 1.7 alpha_button.hxx, 1.7, 1.8 blitter.cxx, 1.32, 1.33 blitter_impl.hxx, 1.14, 1.15 button_panel.cxx, 1.26, 1.27 button_panel.hxx, 1.19, 1.20 capture_rectangle.cxx, 1.15, 1.16 capture_rectangle.hxx, 1.8, 1.9 client.cxx, 1.49, 1.50 client.hxx, 1.29, 1.30 col_map.cxx, 1.21, 1.22 col_map.hxx, 1.13, 1.14 console.cxx, 1.17, 1.18 credits.cxx, 1.40, 1.41 exit_menu.cxx, 1.22, 1.23 fade_out.cxx, 1.10, 1.11 fps_counter.hxx, 1.8, 1.9 global_event.cxx, 1.12, 1.13 globals.cxx, 1.16, 1.17 hurry_up.hxx, 1.9, 1.10 indexed_canvas.hxx, 1.5, 1.6 loading.cxx, 1.8, 1.9 menu_button.cxx, 1.13, 1.14 multiline_text.cxx, 1.8, 1.9 multiline_text.hxx, 1.7, 1.8 pingu.cxx, 1.44, 1.45 pingu_map.cxx, 1.9, 1.10 pingu_map.hxx, 1.7, 1.8 pingus_counter.hxx, 1.12, 1.13 pingus_counter_bar.cxx, 1.9, 1.10 pingus_map_manager.cxx, 1.5, 1.6 pingus_menu_manager.cxx, 1.27, 1.28 pingus_resource.cxx, 1.30, 1.31 pingus_resource.hxx, 1.18, 1.19 playfield.cxx, 1.37, 1.38 playfield_view.cxx, 1.5, 1.6 savegame.hxx, 1.5, 1.6 theme_selector.cxx, 1.14, 1.15 theme_selector.hxx, 1.8, 1.9 time_display.cxx, 1.17, 1.18 time_display.hxx, 1.12, 1.13 world.cxx, 1.46, 1.47
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.56,1.57
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.155, 1.156 action_button.cxx, 1.34, 1.35 action_button.hxx, 1.19, 1.20 action_holder.cxx, 1.13, 1.14 alpha_button.cxx, 1.6, 1.7 alpha_button.hxx, 1.7, 1.8 blitter.cxx, 1.32, 1.33 blitter_impl.hxx, 1.14, 1.15 button_panel.cxx, 1.26, 1.27 button_panel.hxx, 1.19, 1.20 capture_rectangle.cxx, 1.15, 1.16 capture_rectangle.hxx, 1.8, 1.9 client.cxx, 1.49, 1.50 client.hxx, 1.29, 1.30 col_map.cxx, 1.21, 1.22 col_map.hxx, 1.13, 1.14 console.cxx, 1.17, 1.18 credits.cxx, 1.40, 1.41 exit_menu.cxx, 1.22, 1.23 fade_out.cxx, 1.10, 1.11 fps_counter.hxx, 1.8, 1.9 global_event.cxx, 1.12, 1.13 globals.cxx, 1.16, 1.17 hurry_up.hxx, 1.9, 1.10 indexed_canvas.hxx, 1.5, 1.6 loading.cxx, 1.8, 1.9 menu_button.cxx, 1.13, 1.14 multiline_text.cxx, 1.8, 1.9 multiline_text.hxx, 1.7, 1.8 pingu.cxx, 1.44, 1.45 pingu_map.cxx, 1.9, 1.10 pingu_map.hxx, 1.7, 1.8 pingus_counter.hxx, 1.12, 1.13 pingus_counter_bar.cxx, 1.9, 1.10 pingus_map_manager.cxx, 1.5, 1.6 pingus_menu_manager.cxx, 1.27, 1.28 pingus_resource.cxx, 1.30, 1.31 pingus_resource.hxx, 1.18, 1.19 playfield.cxx, 1.37, 1.38 playfield_view.cxx, 1.5, 1.6 savegame.hxx, 1.5, 1.6 theme_selector.cxx, 1.14, 1.15 theme_selector.hxx, 1.8, 1.9 time_display.cxx, 1.17, 1.18 time_display.hxx, 1.12, 1.13 world.cxx, 1.46, 1.47
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.56,1.57
- Index(es):