[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2708 - branches/pingus_sdl/src/actions
From: |
jsalmon3 |
Subject: |
[Pingus-CVS] r2708 - branches/pingus_sdl/src/actions |
Date: |
Wed, 11 Jul 2007 05:21:59 +0200 |
Author: jsalmon3
Date: 2007-07-11 05:21:54 +0200 (Wed, 11 Jul 2007)
New Revision: 2708
Modified:
branches/pingus_sdl/src/actions/bomber.cpp
branches/pingus_sdl/src/actions/bridger.cpp
Log:
Moved CollisionMask initialization to initializer list
Modified: branches/pingus_sdl/src/actions/bomber.cpp
===================================================================
--- branches/pingus_sdl/src/actions/bomber.cpp 2007-07-11 02:25:50 UTC (rev
2707)
+++ branches/pingus_sdl/src/actions/bomber.cpp 2007-07-11 03:21:54 UTC (rev
2708)
@@ -40,12 +40,11 @@
sound_played(false),
gfx_exploded(false),
colmap_exploded(false),
+ bomber_radius(Resource::load_collision_mask("other/bomber_radius")),
explo_surf(Resource::load_sprite("pingus/player" + pingu->get_owner_str()
+ "/explo"))
{
sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
"/bomber/left");
sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
"/bomber/right");
-
- bomber_radius = Resource::load_collision_mask("other/bomber_radius");
}
void
Modified: branches/pingus_sdl/src/actions/bridger.cpp
===================================================================
--- branches/pingus_sdl/src/actions/bridger.cpp 2007-07-11 02:25:50 UTC (rev
2707)
+++ branches/pingus_sdl/src/actions/bridger.cpp 2007-07-11 03:21:54 UTC (rev
2708)
@@ -35,6 +35,8 @@
Bridger::Bridger (Pingu* p)
: PinguAction(p),
mode(B_BUILDING),
+ brick_l(Resource::load_collision_mask("other/brick_left")),
+ brick_r(Resource::load_collision_mask("other/brick_right")),
bricks(MAX_BRICKS),
block_build(false),
name(_("Bridger") + std::string(" (" + StringUtil::to_string(bricks) +
")"))
@@ -48,9 +50,6 @@
pingu->get_owner_str() + "/bridger/left"));
build_sprite.load (Direction::RIGHT, Resource::load_sprite("pingus/player" +
pingu->get_owner_str() + "/bridger/right"));
-
- brick_l = Resource::load_collision_mask("other/brick_left");
- brick_r = Resource::load_collision_mask("other/brick_right");
}
void
@@ -127,7 +126,7 @@
void
Bridger::update_build ()
{
- build_sprite[pingu->direction].update (0.033);
+ build_sprite[pingu->direction].update (0.033f);
if (build_sprite[pingu->direction].get_current_frame () >= 7 && !block_build)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2708 - branches/pingus_sdl/src/actions,
jsalmon3 <=