[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.17,1.18 angel.hxx
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.17,1.18 angel.hxx,1.14,1.15 basher.cxx,1.28,1.29 basher.hxx,1.16,1.17 blocker.cxx,1.18,1.19 blocker.hxx,1.14,1.15 boarder.cxx,1.14,1.15 boarder.hxx,1.13,1.14 bomber.cxx,1.33,1.34 bomber.hxx,1.19,1.20 bridger.cxx,1.29,1.30 bridger.hxx,1.17,1.18 climber.cxx,1.21,1.22 climber.hxx,1.14,1.15 digger.cxx,1.23,1.24 digger.hxx,1.14,1.15 drown.cxx,1.13,1.14 drown.hxx,1.12,1.13 exiter.cxx,1.17,1.18 exiter.hxx,1.13,1.14 faller.cxx,1.39,1.40 faller.hxx,1.19,1.20 floater.cxx,1.23,1.24 floater.hxx,1.14,1.15 jumper.cxx,1.19,1.20 jumper.hxx,1.12,1.13 laser_kill.cxx,1.14,1.15 laser_kill.hxx,1.13,1.14 miner.cxx,1.21,1.22 miner.hxx,1.13,1.14 rocket_launcher.cxx,1.14,1.15 rocket_launcher.hxx,1.12,1.13 slider.cxx,1.17,1.18 slider.hxx,1.12,1.13 smashed.cxx,1.13,1.14 smashed.hxx,1.14,1.15 splashed.cxx,1.14,1.15 splashed.hxx,1.14,1.15 superman.cxx,1.11,1.12 superman.hxx,1.13,1.14 teleported.cxx,1.12,1.13 teleported.hxx,1.13,1.14 waiter.cxx,1.13,1.14 waiter.hxx,1.13,1.14 walker.cxx,1.32,1.33 walker.hxx,1.13,1.14 |
|
Date: |
19 Apr 2003 10:23:20 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv20737/actions
Modified Files:
angel.cxx angel.hxx basher.cxx basher.hxx blocker.cxx
blocker.hxx boarder.cxx boarder.hxx bomber.cxx bomber.hxx
bridger.cxx bridger.hxx climber.cxx climber.hxx digger.cxx
digger.hxx drown.cxx drown.hxx exiter.cxx exiter.hxx
faller.cxx faller.hxx floater.cxx floater.hxx jumper.cxx
jumper.hxx laser_kill.cxx laser_kill.hxx miner.cxx miner.hxx
rocket_launcher.cxx rocket_launcher.hxx slider.cxx slider.hxx
smashed.cxx smashed.hxx splashed.cxx splashed.hxx superman.cxx
superman.hxx teleported.cxx teleported.hxx waiter.cxx
waiter.hxx walker.cxx walker.hxx
Log Message:
removed trailing whitespace
Index: angel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/angel.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- angel.cxx 16 Apr 2003 10:09:40 -0000 1.17
+++ angel.cxx 19 Apr 2003 10:23:18 -0000 1.18
@@ -27,16 +27,16 @@
namespace Actions {
-Angel::Angel (Pingu* p)
+Angel::Angel (Pingu* p)
: PinguAction(p),
- counter(0.0),
+ counter(0.0),
x_pos(pingu->get_x()),
sprite(PingusResource::load_surface("Pingus/angel" +
to_string(pingu->get_owner()), "pingus"))
{
- sprite.set_align_center_bottom();
+ sprite.set_align_center_bottom();
}
-void
+void
Angel::update ()
{
sprite.update ();
@@ -49,7 +49,7 @@
pingu->set_status (PS_DEAD);
}
-void
+void
Angel::draw (GraphicContext& gc)
{
gc.draw (sprite, pingu->get_pos ());
Index: angel.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/angel.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- angel.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ angel.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -32,12 +32,12 @@
double counter;
double x_pos;
Sprite sprite;
-
+
public:
Angel (Pingu* p);
ActionName get_type () const { return Actions::Angel; }
-
+
void update ();
void draw (GraphicContext& gc);
Index: basher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- basher.cxx 28 Mar 2003 16:16:00 -0000 1.28
+++ basher.cxx 19 Apr 2003 10:23:18 -0000 1.29
@@ -29,12 +29,12 @@
namespace Actions {
-Basher::Basher (Pingu* p)
+Basher::Basher (Pingu* p)
: PinguAction(p),
sprite(PingusResource::load_surface("Pingus/basher0", "pingus")),
bash_radius(PingusResource::load_surface("Other/bash_radius", "pingus")),
bash_radius_gfx(PingusResource::load_surface("Other/bash_radius_gfx",
"pingus")),
- basher_c(0),
+ basher_c(0),
first_bash(true)
{
sprite.set_align_center_bottom();
@@ -98,7 +98,7 @@
if (basher_c % 2 == 0)
bash();
}
- else if (sprite.get_progress () > 0.6f) // FIXME: EVIL!
+ else if (sprite.get_progress () > 0.6f) // FIXME: EVIL!
{
pingu->set_action(Actions::Walker);
}
Index: basher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- basher.hxx 18 Apr 2003 17:08:56 -0000 1.16
+++ basher.hxx 19 Apr 2003 10:23:18 -0000 1.17
@@ -43,7 +43,7 @@
/** The no. of pixels ahead that a Basher checks for something bashable.
This is initialised using the size of the bash_radius surface. */
int bash_reach;
-
+
/** Defines the minimum "wall" height needed for a bash to happen. */
enum { min_bash_height = 5 };
@@ -55,19 +55,19 @@
/** Defines the maximum no. of steps down a Basher can go down before it
stops being a Basher and turns into a Faller. */
enum { max_steps_down = 3 };
-
+
public:
Basher (Pingu* p);
-
+
ActionName get_type () const { return Actions::Basher; }
-
+
void draw (GraphicContext& gc);
void update ();
-
+
bool have_something_to_dig ();
void walk_forward ();
void bash ();
-
+
private:
Basher (const Basher&);
Basher& operator= (const Basher&);
Index: blocker.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/blocker.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- blocker.cxx 28 Mar 2003 16:16:00 -0000 1.18
+++ blocker.cxx 19 Apr 2003 10:23:18 -0000 1.19
@@ -38,7 +38,7 @@
&& rel_getpixel(0, -2) == Groundtype::GP_GROUND)
{
pingu->set_x(pingu->get_x() + 1);
- }
+ }
else if ( rel_getpixel(0,-1) == Groundtype::GP_NOTHING
&& rel_getpixel(0,-2) == Groundtype::GP_NOTHING
&& rel_getpixel(0,-3) == Groundtype::GP_GROUND)
@@ -82,11 +82,11 @@
{
if (target != pingu) // avoid 'self' catch
{
- if (target->get_x () > pingu->get_x () - 16
+ if (target->get_x () > pingu->get_x () - 16
&& target->get_x () < pingu->get_x () + 16
&& target->get_y () > pingu->get_y () - 32
&& target->get_y () < pingu->get_y () + 5
- )
+ )
{
if (target->get_x () > pingu->get_x ()) {
target->direction.right();
Index: blocker.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/blocker.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- blocker.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ blocker.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -29,14 +29,14 @@
{
private:
Sprite sprite;
-
+
public:
Blocker (Pingu* p);
int y_offset ();
-
+
ActionName get_type() const { return Actions::Blocker; }
-
+
void draw (GraphicContext& gc);
void update();
Index: boarder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/boarder.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- boarder.cxx 19 Feb 2003 09:50:36 -0000 1.14
+++ boarder.cxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -26,22 +26,22 @@
namespace Actions {
-Boarder::Boarder (Pingu* p)
+Boarder::Boarder (Pingu* p)
: PinguAction(p),
x_pos(pingu->get_x()),
speed(0.0),
sprite(PingusResource::load_surface("Pingus/boarder" +
to_string(pingu->get_owner ()), "pingus"))
{
- sprite.set_align_center_bottom();
+ sprite.set_align_center_bottom();
}
-void
+void
Boarder::update ()
{
if (pingu->direction.is_left())
- sprite.set_direction(Sprite::LEFT);
+ sprite.set_direction(Sprite::LEFT);
else
- sprite.set_direction(Sprite::RIGHT);
+ sprite.set_direction(Sprite::RIGHT);
sprite.update();
if (on_ground())
@@ -51,14 +51,14 @@
else {
speed = 15.0;
}
-
+
// Incremental update so that we don't skip pixels
double new_x_pos = pingu->get_pos().x + pingu->direction * speed;
while (new_x_pos != pingu->get_x())
{
double old_pos = pingu->get_pos().x;
pingu->set_x(old_pos + (pingu->get_x() < new_x_pos) ? 1 : -1);
-
+
if (pingu->rel_getpixel (1, 0))
{
// Hit a wall
@@ -79,7 +79,7 @@
}
}
-void
+void
Boarder::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos ());
Index: boarder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/boarder.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- boarder.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ boarder.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -36,17 +36,17 @@
Sprite sprite;
public:
Boarder (Pingu* p);
-
+
ActionName get_type () const { return Actions::Boarder; }
-
+
void draw (GraphicContext& gc);
void update ();
-
+
private:
bool on_ground ();
-
- Boarder (const Boarder&);
- Boarder& operator= (const Boarder&);
+
+ Boarder (const Boarder&);
+ Boarder& operator= (const Boarder&);
};
} // namespace Actions
Index: bomber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- bomber.cxx 28 Mar 2003 16:16:00 -0000 1.33
+++ bomber.cxx 19 Apr 2003 10:23:18 -0000 1.34
@@ -39,17 +39,17 @@
CL_Surface Bomber::bomber_radius;
CL_Surface Bomber::bomber_radius_gfx;
-Bomber::Bomber (Pingu* p)
+Bomber::Bomber (Pingu* p)
: PinguAction(p),
particle_thrown(false),
- sound_played(false),
+ sound_played(false),
gfx_exploded(false),
colmap_exploded(false),
sprite(PingusResource::load_surface("Pingus/bomber" +
to_string(pingu->get_owner()), "pingus"), 17.0f, Sprite::NONE, Sprite::ONCE),
explo_surf(PingusResource::load_surface("Other/explo" +
to_string(pingu->get_owner()), "pingus"))
{
// Only load the surface again if no static_surface is available
- if (!static_surface_loaded)
+ if (!static_surface_loaded)
{
static_surface_loaded = true;
bomber_radius = PingusResource::load_surface ("Other/bomber_radius",
"pingus");
@@ -67,7 +67,7 @@
void
Bomber::draw (GraphicContext& gc)
{
- if (sprite.get_frame () >= 13 && !gfx_exploded)
+ if (sprite.get_frame () >= 13 && !gfx_exploded)
{
gc.draw (explo_surf, Vector(pingu->get_x () - 32, pingu->get_y () - 48));
gfx_exploded = true;
@@ -92,7 +92,7 @@
// If the Bomber hasn't 'exploded' yet and it has hit Water or Lava
if (sprite.get_frame () <= 9 && (rel_getpixel(0, -1) == Groundtype::GP_WATER
- || rel_getpixel(0, -1) == Groundtype::GP_LAVA))
+ || rel_getpixel(0, -1) == Groundtype::GP_LAVA))
{
pingu->set_action(Actions::Drown);
return;
@@ -112,7 +112,7 @@
}
// Throwing particles
- if (sprite.get_frame () > 12 && !particle_thrown)
+ if (sprite.get_frame () > 12 && !particle_thrown)
{
particle_thrown = true;
WorldObj::get_world()->get_pingu_particle_holder()->add_particle(static_cast<int>(pingu->get_x()),
@@ -127,7 +127,7 @@
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,
+ 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)));
}
Index: bomber.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bomber.hxx 18 Apr 2003 17:08:56 -0000 1.19
+++ bomber.hxx 19 Apr 2003 10:23:18 -0000 1.20
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -32,8 +32,8 @@
private:
bool particle_thrown;
bool sound_played;
- bool gfx_exploded;
- bool colmap_exploded;
+ bool gfx_exploded;
+ bool colmap_exploded;
static bool static_surface_loaded;
static CL_Surface bomber_radius;
@@ -53,7 +53,7 @@
int activation_time() { return 150; }
void on_successfull_apply ();
-
+
private:
Bomber (const Bomber&);
Bomber& operator= (const Bomber&);
Index: bridger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bridger.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- bridger.cxx 4 Mar 2003 13:59:44 -0000 1.29
+++ bridger.cxx 19 Apr 2003 10:23:18 -0000 1.30
@@ -36,7 +36,7 @@
CL_Surface Bridger::brick_r;
CL_Surface Bridger::static_surface;
-Bridger::Bridger (Pingu* p)
+Bridger::Bridger (Pingu* p)
: PinguAction(p),
mode(B_BUILDING),
walk_sprite(Sprite("Pingus/bridger_walk" + to_string(pingu->get_owner()),
"pingus", 15.0f, Sprite::NONE, Sprite::ONCE)),
@@ -65,7 +65,7 @@
if (bricks == MAX_BRICKS) {
x_offset = -4;
y_offset = 0;
-
+
} else if (bricks == MAX_BRICKS - 1) {
x_offset = 0;
y_offset = 1;
@@ -81,11 +81,11 @@
build_sprite.set_direction (Sprite::LEFT);
else
build_sprite.set_direction (Sprite::RIGHT);
-
+
gc.draw(build_sprite, Vector(pingu->get_x () - (x_offset *
pingu->direction),
pingu->get_y () + y_offset));
break;
-
+
case B_WALKING:
if (pingu->direction.is_left ())
walk_sprite.set_direction (Sprite::LEFT);
@@ -161,7 +161,7 @@
{
pingu->set_action(Actions::Waiter);
return;
- }
+ }
}
if (build_sprite.finished ())
@@ -231,10 +231,10 @@
if (bricks < 4)
PingusSound::play_sound("ting");
-
+
if (pingu->direction.is_right())
{
- WorldObj::get_world()->get_colmap()->put(brick_r,
+ WorldObj::get_world()->get_colmap()->put(brick_r,
static_cast<int>(pingu->get_x()
+ 10 - brick_r.get_width()),
static_cast<int>(pingu->get_y()),
Groundtype::GP_BRIDGE);
@@ -244,7 +244,7 @@
}
else
{
- WorldObj::get_world()->get_colmap()->put(brick_r,
+ WorldObj::get_world()->get_colmap()->put(brick_r,
static_cast<int>(pingu->get_x()
- 10),
static_cast<int>(pingu->get_y()),
Groundtype::GP_BRIDGE);
@@ -263,7 +263,7 @@
std::string
Bridger::get_name () const
-{
+{
return name;
}
Index: bridger.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bridger.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- bridger.hxx 13 Oct 2002 20:25:00 -0000 1.17
+++ bridger.hxx 19 Apr 2003 10:23:18 -0000 1.18
@@ -56,21 +56,21 @@
std::string get_name () const;
ActionName get_type () const { return Actions::Bridger; }
-
+
void update ();
void update_build ();
void update_walk ();
-
+
void draw (GraphicContext& gc);
-
+
bool way_is_free ();
bool brick_placement_allowed (void);
void place_a_brick ();
void walk_one_step_up ();
-
+
private:
Bridger (const Bridger&);
- Bridger& operator= (const Bridger&);
+ Bridger& operator= (const Bridger&);
};
} // namespace Actions
Index: climber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/climber.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- climber.cxx 19 Feb 2003 09:50:36 -0000 1.21
+++ climber.cxx 19 Apr 2003 10:23:18 -0000 1.22
@@ -41,7 +41,7 @@
printf("%3d %3d %3d\n", rel_getpixel(1,1), rel_getpixel(0,1),
rel_getpixel(-1,1));
printf("%3d %3d %3d\n", rel_getpixel(1,0), rel_getpixel(0,0),
rel_getpixel(-1,0));
printf("%3d %3d %3d\n", rel_getpixel(1,-1),
rel_getpixel(0,-1),rel_getpixel(-1, -1));
- */
+ */
sprite.update();
@@ -50,13 +50,13 @@
|| rel_getpixel(0, 1) == Groundtype::GP_BRIDGE)
{
// and there is still ground to walk on
- if (rel_getpixel(1, 1) != Groundtype::GP_NOTHING)
+ if (rel_getpixel(1, 1) != Groundtype::GP_NOTHING)
{
- pingu->set_pos(pingu->get_x(),
+ pingu->set_pos(pingu->get_x(),
pingu->get_y() - 1);
return;
}
- else if (rel_getpixel(1, 1) == Groundtype::GP_NOTHING)
+ else if (rel_getpixel(1, 1) == Groundtype::GP_NOTHING)
{
// std::cout << "Climber failed, no more wall" << std::endl;
@@ -64,7 +64,7 @@
if (!head_collision_on_walk(pingu->direction, 1))
{
// Get ready to walk
- pingu->set_pos(pingu->get_x() + pingu->direction,
+ pingu->set_pos(pingu->get_x() + pingu->direction,
pingu->get_y() - 1);
}
else
@@ -77,7 +77,7 @@
pingu->set_action(Actions::Walker);
}
}
- else
+ else
{
// std::cout << "Climber failed, falling down" << std::endl;
pingu->direction.change();
@@ -89,12 +89,12 @@
Climber::draw (GraphicContext& gc)
{
// This is necessary to prevent climber walking inside a wall.
- if (pingu->direction.is_left())
+ if (pingu->direction.is_left())
{
sprite.set_align(0, -sprite_height/2);
- sprite.set_direction(Sprite::LEFT);
- }
- else
+ sprite.set_direction(Sprite::LEFT);
+ }
+ else
{
sprite.set_align(-sprite_width, -sprite_height/2);
sprite.set_direction(Sprite::RIGHT);
Index: climber.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/climber.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- climber.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ climber.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -34,14 +34,14 @@
public:
Climber (Pingu*);
-
+
ActionName get_type () const { return Actions::Climber; }
ActionType get_activation_mode () const { return WALL_TRIGGERED; }
-
+
void draw (GraphicContext& gc);
-
+
void update ();
-
+
char get_persistent_char () { return 'c'; }
bool change_allowed(ActionName new_action);
Index: digger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/digger.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- digger.cxx 9 Mar 2003 20:41:30 -0000 1.23
+++ digger.cxx 19 Apr 2003 10:23:18 -0000 1.24
@@ -43,10 +43,10 @@
"pingus", PropertyMgr::instance()->get_int
("actions/digger/sprite-fps", 20));
#endif
sprite.set_align_center_bottom();
-
+
digger_radius_width = digger_radius.get_width();
digger_radius_height = digger_radius.get_height();
-
+
digger_radius_gfx_width = digger_radius_gfx.get_width();
digger_radius_gfx_height = digger_radius_gfx.get_height();
}
@@ -70,13 +70,13 @@
}
if (!have_something_to_dig())
- {
+ {
dig ();
pingu->set_action(Actions::Walker);
}
}
-bool
+bool
Digger::have_something_to_dig ()
{
if (rel_getpixel(0, -1) != Groundtype::GP_NOTHING)
@@ -84,7 +84,7 @@
if (rel_getpixel(0, -1) == Groundtype::GP_SOLID)
{
PingusSound::play_sound("chink");
- return false;
+ return false;
}
else
return true;
@@ -98,17 +98,17 @@
void
Digger::dig ()
{
- WorldObj::get_world()->get_colmap()->remove(digger_radius,
+ 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));
-
+
pingu->set_y(pingu->get_y() + 1);
}
-void
+void
Digger::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos ());
Index: digger.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/digger.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- digger.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ digger.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -47,12 +47,12 @@
public:
Digger(Pingu*);
-
+
ActionName get_type () const { return Actions::Digger; }
-
+
bool have_something_to_dig ();
void dig ();
-
+
void draw (GraphicContext& gc);
void update ();
Index: drown.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/drown.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- drown.cxx 19 Feb 2003 09:50:36 -0000 1.13
+++ drown.cxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -31,7 +31,7 @@
sprite.set_align_center_bottom();
}
-void
+void
Drown::draw (GraphicContext& gc)
{
// FIXME: Direction handling is ugly
@@ -43,7 +43,7 @@
gc.draw(sprite, pingu->get_pos ());
}
-void
+void
Drown::update ()
{
sprite.update();
Index: drown.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/drown.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- drown.hxx 18 Apr 2003 17:08:56 -0000 1.12
+++ drown.hxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -29,17 +29,17 @@
{
private:
Sprite sprite;
-
+
public:
Drown (Pingu* p);
-
+
ActionName get_type () const { return Actions::Drown; }
-
+
void draw (GraphicContext& gc);
- void update ();
-
+ void update ();
+
bool catchable () { return false; }
-
+
private:
Drown (const Drown&);
Drown& operator= (const Drown&);
Index: exiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exiter.cxx 5 Mar 2003 17:31:29 -0000 1.17
+++ exiter.cxx 19 Apr 2003 10:23:18 -0000 1.18
@@ -48,19 +48,19 @@
{
if (pingu->get_status() != PS_EXITED)
{
- pingu->set_status(PS_EXITED);
+ pingu->set_status(PS_EXITED);
}
}
}
-void
+void
Exiter::draw (GraphicContext& gc)
{
if (pingu->direction.is_left())
sprite.set_direction(Sprite::LEFT);
else
sprite.set_direction(Sprite::RIGHT);
-
+
gc.draw(sprite, pingu->get_pos ());
}
Index: exiter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/exiter.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exiter.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ exiter.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -30,7 +30,7 @@
private:
Sprite sprite;
bool sound_played;
-
+
public:
Exiter(Pingu*);
void init(void);
@@ -38,7 +38,7 @@
void draw (GraphicContext& gc);
void update();
-
+
private:
Exiter (const Exiter&);
Exiter& operator= (const Exiter&);
Index: faller.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- faller.cxx 25 Mar 2003 00:56:33 -0000 1.39
+++ faller.cxx 19 Apr 2003 10:23:18 -0000 1.40
@@ -38,7 +38,7 @@
// FIXME: we can save some cpu cycles & memory if we do this when it
// is necessary
tumbler(Sprite("Pingus/tumble" + to_string(pingu->get_owner()), "pingus"))
-{
+{
faller .set_align_center_bottom();
tumbler.set_align_center_bottom();
}
@@ -53,7 +53,7 @@
// Pingu stands on ground
if (rel_getpixel(0, -1) != Groundtype::GP_NOTHING)
- {
+ {
pingu->set_action(Actions::Walker);
return;
}
@@ -100,7 +100,7 @@
pingu->set_action(Actions::Drown);
}
// Did we stop too fast?
- else if (fabs(pingu->get_velocity().y) > deadly_velocity)
+ else if (fabs(pingu->get_velocity().y) > deadly_velocity)
{
pingu->set_action(Actions::Splashed);
}
@@ -143,7 +143,7 @@
while (collided);
}
-void
+void
Faller::draw (GraphicContext& gc)
{
if (is_tumbling()) {
Index: faller.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/faller.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- faller.hxx 18 Apr 2003 17:08:56 -0000 1.19
+++ faller.hxx 19 Apr 2003 10:23:18 -0000 1.20
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -36,15 +36,15 @@
public:
Faller(Pingu*);
virtual ~Faller();
-
+
void draw (GraphicContext& gc);
void update();
bool change_allowed (Actions::ActionName new_action);
-
+
ActionName get_type() const { return Actions::Faller; }
bool is_tumbling () const;
-
+
private:
Faller (const Faller&);
Faller& operator= (const Faller&);
Index: floater.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/floater.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- floater.cxx 19 Feb 2003 09:50:36 -0000 1.23
+++ floater.cxx 19 Apr 2003 10:23:18 -0000 1.24
@@ -24,7 +24,7 @@
namespace Actions {
-Floater::Floater(Pingu* p)
+Floater::Floater(Pingu* p)
: PinguAction(p),
falling_depth(0),
step(0),
@@ -39,23 +39,23 @@
sprite.update ();
pingu->set_velocity(Vector(0.0f, 1.0f));
-
- if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
+
+ if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
{
++step;
- if (step > 0)
+ if (step > 0)
{
pingu->set_y(pingu->get_y() + 1);
step = 0;
}
- }
- else
+ }
+ else
{
pingu->set_action (Actions::Walker);
}
}
-void
+void
Floater::draw (GraphicContext& gc)
{
gc.draw (sprite, pingu->get_pos());
Index: floater.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/floater.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- floater.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ floater.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -36,7 +36,7 @@
ActionName get_type() const { return Actions::Floater; }
ActionType get_activation_mode() const { return FALL_TRIGGERED; }
-
+
void init(void);
void draw (GraphicContext& gc);
@@ -44,7 +44,7 @@
char get_persistent_char () { return 'f'; }
bool change_allowed (ActionName new_action);
-
+
private:
Floater (const Floater&);
Floater& operator= (const Floater&);
Index: jumper.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/jumper.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- jumper.cxx 25 Mar 2003 23:15:23 -0000 1.19
+++ jumper.cxx 19 Apr 2003 10:23:18 -0000 1.20
@@ -32,7 +32,7 @@
sprite.set_align_center_bottom();
}
-void
+void
Jumper::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos());
Index: jumper.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/jumper.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jumper.hxx 18 Apr 2003 17:08:56 -0000 1.12
+++ jumper.hxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -36,7 +36,7 @@
void draw (GraphicContext& gc);
void update();
-
+
private:
Jumper (const Jumper&);
Jumper& operator= (const Jumper&);
Index: laser_kill.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/laser_kill.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- laser_kill.cxx 19 Feb 2003 09:50:36 -0000 1.14
+++ laser_kill.cxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -31,7 +31,7 @@
sprite.set_align_center_bottom();
}
-void
+void
LaserKill::draw (GraphicContext& gc)
{
if (pingu->direction.is_left())
Index: laser_kill.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/laser_kill.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- laser_kill.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ laser_kill.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -31,7 +31,7 @@
{
private:
Sprite sprite;
-
+
public:
LaserKill (Pingu*);
@@ -42,7 +42,7 @@
void update ();
bool catchable () { return false; }
-
+
private:
LaserKill (const LaserKill&);
LaserKill& operator= (const LaserKill&);
Index: miner.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/miner.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- miner.cxx 4 Mar 2003 13:59:44 -0000 1.21
+++ miner.cxx 19 Apr 2003 10:23:18 -0000 1.22
@@ -57,10 +57,10 @@
{
if (!(slow_count % 3))
{
-
WorldObj::get_world()->get_colmap()->remove(miner_radius.get_provider(),
-
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
+
WorldObj::get_world()->get_colmap()->remove(miner_radius.get_provider(),
+
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_width + 1) );
-
WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx.get_provider(),
+
WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx.get_provider(),
static_cast<int>(pingu->get_x() - (miner_radius_gfx_width / 2) +
pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1) );
}
@@ -70,11 +70,11 @@
if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
{
- WorldObj::get_world()->get_colmap()->remove(miner_radius,
-
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
+ WorldObj::get_world()->get_colmap()->remove(miner_radius,
+
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_width + 3) );
WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
-
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
+
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_width + 3) );
pingu->set_action(Actions::Walker);
}
@@ -85,7 +85,7 @@
PingusSound::play_sound("chink");
WorldObj::get_world()->get_colmap ()->remove(miner_radius,
-
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
+
static_cast<int>(pingu->get_x() - (miner_radius_width / 2) + pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_width + 1) );
WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
static_cast<int>(pingu->get_x() - (miner_radius_gfx_width / 2) +
pingu->direction),
@@ -97,7 +97,7 @@
}
}
-void
+void
Miner::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos());
Index: miner.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/miner.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- miner.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ miner.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -27,7 +27,7 @@
class Miner : public PinguAction
{
-private:
+private:
CL_Surface miner_radius;
CL_Surface miner_radius_gfx;
Sprite sprite;
@@ -47,10 +47,10 @@
void draw (GraphicContext& gc);
void update ();
-
+
private:
Miner (const Miner&);
- Miner& operator= (const Miner&);
+ Miner& operator= (const Miner&);
};
} // namespace Actions
Index: rocket_launcher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rocket_launcher.cxx 19 Feb 2003 09:50:36 -0000 1.14
+++ rocket_launcher.cxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -36,9 +36,9 @@
{
sprite.set_align_center_bottom();
/* Explosive Particles not supported right now
- WorldObj::get_world()->get_particle_holder()->add_particle
+ WorldObj::get_world()->get_particle_holder()->add_particle
(new ExplosiveParticle (static_cast<int>(pingu->get_x()),
- static_cast<int>(pingu->get_y()) - 12,
+ static_cast<int>(pingu->get_y()) - 12,
pingu->direction.is_left() ? -400.0f : 400.0f,
0.0f));
*/
@@ -62,7 +62,7 @@
sprite.set_direction(Sprite::LEFT);
else
sprite.set_direction(Sprite::RIGHT);
-
+
gc.draw (sprite, pingu->get_pos());
}
Index: rocket_launcher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/rocket_launcher.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rocket_launcher.hxx 18 Apr 2003 17:08:56 -0000 1.12
+++ rocket_launcher.hxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -33,12 +33,12 @@
public:
RocketLauncher(Pingu*);
~RocketLauncher() {}
-
+
ActionName get_type () const { return Actions::Rocketlauncher; }
-
+
void draw (GraphicContext& gc);
void update ();
-
+
private:
RocketLauncher (const RocketLauncher&);
RocketLauncher& operator= (const RocketLauncher&);
Index: slider.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/slider.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- slider.cxx 19 Feb 2003 09:50:36 -0000 1.17
+++ slider.cxx 19 Apr 2003 10:23:18 -0000 1.18
@@ -46,7 +46,7 @@
for (int i = 0; i < speed; ++i)
{
pingu->set_x(pingu->get_x() + pingu->direction);
-
+
if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
{
speed = (speed > 5) ? 5 : speed;
Index: slider.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/slider.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- slider.hxx 18 Apr 2003 17:08:56 -0000 1.12
+++ slider.hxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -37,7 +37,7 @@
void draw (GraphicContext& gc);
void update();
-
+
private:
Slider (const Slider&);
Slider& operator= (const Slider&);
Index: smashed.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/smashed.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- smashed.cxx 19 Feb 2003 09:50:36 -0000 1.13
+++ smashed.cxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -32,7 +32,7 @@
sprite.set_align_center_bottom();
}
-void
+void
Smashed::draw (GraphicContext& gc)
{
gc.draw (sprite, pingu->get_pos ());
Index: smashed.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/smashed.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- smashed.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ smashed.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -32,7 +32,7 @@
private:
bool sound_played;
Sprite sprite;
-
+
public:
Smashed (Pingu*);
@@ -42,7 +42,7 @@
void update ();
bool catchable () { return false; }
-
+
private:
Smashed (const Smashed&);
Smashed& operator= (const Smashed&);
Index: splashed.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/splashed.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- splashed.cxx 3 Mar 2003 20:32:18 -0000 1.14
+++ splashed.cxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -52,7 +52,7 @@
}
}
-void
+void
Splashed::draw (GraphicContext& gc)
{
gc.draw (sprite, pingu->get_pos ());
Index: splashed.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/splashed.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- splashed.hxx 18 Apr 2003 17:08:56 -0000 1.14
+++ splashed.hxx 19 Apr 2003 10:23:18 -0000 1.15
@@ -7,7 +7,7 @@
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -33,15 +33,15 @@
Sprite sprite;
public:
Splashed (Pingu*);
-
+
ActionName get_type () const { return Actions::Splashed; }
-
+
void draw (GraphicContext& gc);
void update ();
bool catchable () { return false; }
bool change_allowed (Actions::ActionName) { return false; }
-
+
private:
Splashed (const Splashed&);
Splashed& operator= (const Splashed&);
Index: superman.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/superman.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- superman.cxx 19 Feb 2003 09:50:36 -0000 1.11
+++ superman.cxx 19 Apr 2003 10:23:18 -0000 1.12
@@ -31,10 +31,10 @@
x_pos(pingu->get_x()),
sprite(PingusResource::load_surface("Pingus/superman" +
to_string(pingu->get_owner()), "pingus"))
{
- sprite.set_align_center_bottom();
+ sprite.set_align_center_bottom();
}
-void
+void
Superman::update ()
{
sprite.update();
@@ -45,7 +45,7 @@
pingu->set_status(PS_DEAD);
}
-void
+void
Superman::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos ());
Index: superman.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/superman.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- superman.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ superman.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -31,12 +31,12 @@
double counter;
double x_pos;
Sprite sprite;
-
+
public:
Superman (Pingu*);
ActionName get_type () const { return Actions::Superman; }
-
+
void draw (GraphicContext& gc);
void update ();
Index: teleported.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/teleported.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- teleported.cxx 19 Feb 2003 09:50:36 -0000 1.12
+++ teleported.cxx 19 Apr 2003 10:23:18 -0000 1.13
@@ -23,7 +23,7 @@
namespace Actions {
-Teleported::Teleported(Pingu* p)
+Teleported::Teleported(Pingu* p)
: PinguAction(p),
sound_played(false),
sprite("Pingus/bomber0", "pingus")
@@ -31,7 +31,7 @@
}
-void
+void
Teleported::draw (GraphicContext& gc)
{
gc.draw(sprite, pingu->get_pos ());
Index: teleported.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/teleported.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- teleported.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ teleported.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -40,7 +40,7 @@
bool catchable () { return false; }
int x_target, y_target; // <- FIXME: Ugly!
-
+
private:
Teleported (const Teleported&);
Teleported& operator= (const Teleported&);
Index: waiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/waiter.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- waiter.cxx 19 Feb 2003 09:50:36 -0000 1.13
+++ waiter.cxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -37,10 +37,10 @@
Waiter::update ()
{
sprite.update();
-
+
if (countdown < 0)
pingu->set_action(Actions::Walker);
-
+
countdown -= 0.025f;
}
Index: waiter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/waiter.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- waiter.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ waiter.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -33,15 +33,15 @@
private:
float countdown;
Sprite sprite;
-
+
public:
Waiter (Pingu*);
-
+
ActionName get_type () const { return Actions::Waiter; }
-
+
void draw (GraphicContext& gc);
void update ();
-
+
private:
Waiter (const Waiter&);
Waiter& operator= (const Waiter&);
Index: walker.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- walker.cxx 4 Mar 2003 11:26:18 -0000 1.32
+++ walker.cxx 19 Apr 2003 10:23:18 -0000 1.33
@@ -49,19 +49,19 @@
Vector last_pos = pingu->get_pos();
/* How should this code work?
-
+
1) Check that the Pingu stands still on ground, if not turn it into
a faller or drown. The reason we do so, is that we catch situations
where a digger or a similar action removed the ground under the
walker.
-
+
2) If pingu is still on ground, we can preprare the next step
3) Check if up-hill or down-hill is required
-
+
4)
-
+
*/
if (rel_getpixel(0, -1) == Groundtype::GP_WATER)
@@ -73,7 +73,7 @@
// The Pingu stands no longer on ground, the cause for this could be
// a digger, miner or a bomber
if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING)
- {
+ {
// We search for the nearest ground below the pingu, if we can't
// find anything within a few pixels, we will turn into a faller
bool found_ground = false;
@@ -86,7 +86,7 @@
break;
}
}
-
+
if (found_ground)
{
pingu->set_y(pingu->get_y() - i);
@@ -98,7 +98,7 @@
}
}
-
+
// FIXME: here we could/should scan more pixels
if (rel_getpixel(1, 0) == Groundtype::GP_BRIDGE
&& !head_collision_on_walk(1, 1)) // bridge
@@ -108,8 +108,8 @@
pingu->set_pos(pingu->get_x() + pingu->direction,
pingu->get_y() - 1); // pingus 'float' through bridges
}
- else
- {
+ else
+ {
// Non of the trivial moves worked, so we do up-hill or down-hill walking
// FIXME: currently the pingu takes multiple steps at once when
// FIXME: working uphill, this looks kind of ugly
@@ -118,8 +118,8 @@
// FIXME: rel_getpixel works on the current pos, so modifing pos
// FIXME: is evil, a backup copy might help
- // if infront is a pixel
- // Pingu is walking up the mountain
+ // if infront is a pixel
+ // Pingu is walking up the mountain
// we can continue walking up. search for the correct y_pos
int y_inc = 0;
int possible_y_step = 0;
@@ -136,11 +136,11 @@
//break;
}
}
-
+
if (found_next_step)
{
// pos.y has a reversed co-system to rel_getpixel()?
- pingu->set_pos(pingu->get_x() + pingu->direction,
+ pingu->set_pos(pingu->get_x() + pingu->direction,
pingu->get_y() - possible_y_step);
}
else
@@ -148,15 +148,15 @@
if (rel_getpixel(1, 0) != Groundtype::GP_NOTHING)
{
// We reached a wall
- if (pingu->request_wall_action())
+ if (pingu->request_wall_action())
{
- pout(PINGUS_DEBUG_ACTIONS)
+ pout(PINGUS_DEBUG_ACTIONS)
<< "Pingu: We are in front of a wall, setting persistant
action" << std::endl;
return;
}
-
+
// No persitent action found, so change the direction
- pingu->direction.change();
+ pingu->direction.change();
}
else
{
@@ -183,15 +183,15 @@
pingu->set_pos(last_pos);
return;
}
-
+
/*
- for(int y_inc=1; y_inc <= max_steps; ++y_inc)
+ for(int y_inc=1; y_inc <= max_steps; ++y_inc)
{
- if (rel_getpixel(1, -y_inc) == ColMap::WATER)
+ if (rel_getpixel(1, -y_inc) == ColMap::WATER)
{
pingu->set_paction ("drown");
return;
- }
+ }
else if(rel_getpixel(1, -y_inc) != ColMap::NOTHING)
{ // there is land
pingu->pos.y += y_inc - 1;
@@ -201,7 +201,7 @@
*/
}
-void
+void
Walker::draw (GraphicContext& gc)
{
if (pingu->direction.is_left())
Index: walker.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/walker.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- walker.hxx 18 Apr 2003 17:08:56 -0000 1.13
+++ walker.hxx 19 Apr 2003 10:23:18 -0000 1.14
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
@@ -12,7 +12,7 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -28,8 +28,8 @@
class Walker : public PinguAction
{
private:
- Sprite walker;
- Sprite floaterlayer;
+ Sprite walker;
+ Sprite floaterlayer;
enum { max_steps = 5 }; // max nr. of pixels that pingu can walk up/down
@@ -40,7 +40,7 @@
void update ();
ActionName get_type () const { return Actions::Walker; }
-
+
private:
Walker (const Walker&);
Walker& operator= (const Walker&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.17,1.18 angel.hxx,1.14,1.15 basher.cxx,1.28,1.29 basher.hxx,1.16,1.17 blocker.cxx,1.18,1.19 blocker.hxx,1.14,1.15 boarder.cxx,1.14,1.15 boarder.hxx,1.13,1.14 bomber.cxx,1.33,1.34 bomber.hxx,1.19,1.20 bridger.cxx,1.29,1.30 bridger.hxx,1.17,1.18 climber.cxx,1.21,1.22 climber.hxx,1.14,1.15 digger.cxx,1.23,1.24 digger.hxx,1.14,1.15 drown.cxx,1.13,1.14 drown.hxx,1.12,1.13 exiter.cxx,1.17,1.18 exiter.hxx,1.13,1.14 faller.cxx,1.39,1.40 faller.hxx,1.19,1.20 floater.cxx,1.23,1.24 floater.hxx,1.14,1.15 jumper.cxx,1.19,1.20 jumper.hxx,1.12,1.13 laser_kill.cxx,1.14,1.15 laser_kill.hxx,1.13,1.14 miner.cxx,1.21,1.22 miner.hxx,1.13,1.14 rocket_launcher.cxx,1.14,1.15 rocket_launcher.hxx,1.12,1.13 slider.cxx,1.17,1.18 slider.hxx,1.12,1.13 smashed.cxx,1.13,1.14 smashed.hxx,1.14,1.15 splashed.cxx,1.14,1.15 splashed.hxx,1.14,1.15 superman.cxx,1.11,1.12 superman.hxx,1.13,1.14 teleported.cxx,1.12,1.13 teleported.hxx,1.13,1.14 waiter.cxx,1.13,1.14 waiter.hxx,1.13,1.14 walker.cxx,1.32,1.33 walker.hxx,1.13,1.14,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.11,1.12 bumper_data.hxx,1.7,1.8 conveyor_belt_data.cxx,1.11,1.12 conveyor_belt_data.hxx,1.8,1.9 entrance_data.cxx,1.8,1.9 entrance_data.hxx,1.5,1.6 exit_data.cxx,1.9,1.10 exit_data.hxx,1.5,1.6 fake_exit_data.hxx,1.7,1.8 groundpiece_data.cxx,1.17,1.18 groundpiece_data.hxx,1.7,1.8 guillotine_data.cxx,1.11,1.12 guillotine_data.hxx,1.7,1.8 hammer_data.cxx,1.12,1.13 hammer_data.hxx,1.8,1.9 hotspot_data.cxx,1.7,1.8 hotspot_data.hxx,1.7,1.8 ice_block_data.cxx,1.10,1.11 ice_block_data.hxx,1.7,1.8 info_box_data.cxx,1.12,1.13 info_box_data.hxx,1.7,1.8 laser_exit_data.hxx,1.7,1.8 liquid_data.cxx,1.13,1.14 liquid_data.hxx,1.7,1.8 prefab_obj_data.cxx,1.11,1.12 prefab_obj_data.hxx,1.8,1.9 rain_generator_data.hxx,1.6,1.7 smasher_data.hxx,1.7,1.8 snow_generator_data.hxx,1.9,1.10 solid_color_background_data.hxx,1.6,1.7 spike_data.hxx,1.8,1.9 starfield_background_data.cxx,1.9,1.10 starfield_background_data.hxx,1.5,1.6surface_background_data.cxx,1.11,1.12 surface_background_data.hxx,1.7,1.8 switch_door_data.cxx,1.11,1.12 switch_door_data.hxx,1.7,1.8 teleporter_data.cxx,1.12,1.13 teleporter_data.hxx,1.7,1.8thunderstorm_background_data.hxx,1.6,1.7 worldobj_group_data.cxx,1.11,1.12 worldobj_group_data.hxx,1.7,1.8
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/sound slot_manager.cxx,1.1,1.2 slot_manager.hxx,1.1,1.2 sound.cxx,1.4,1.5 sound.hxx,1.2,1.3 sound_dummy.cxx,1.1,1.2 sound_dummy.hxx,1.1,1.2 sound_real.cxx,1.7,1.8 sound_real.hxx,1.2,1.3 sound_res_mgr.cxx,1.1,1.2 sound_res_mgr.hxx,1.1,1.2sounds.hxx,1.1,1.2
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata bumper_data.cxx,1.11,1.12 bumper_data.hxx,1.7,1.8 conveyor_belt_data.cxx,1.11,1.12 conveyor_belt_data.hxx,1.8,1.9 entrance_data.cxx,1.8,1.9 entrance_data.hxx,1.5,1.6 exit_data.cxx,1.9,1.10 exit_data.hxx,1.5,1.6 fake_exit_data.hxx,1.7,1.8 groundpiece_data.cxx,1.17,1.18 groundpiece_data.hxx,1.7,1.8 guillotine_data.cxx,1.11,1.12 guillotine_data.hxx,1.7,1.8 hammer_data.cxx,1.12,1.13 hammer_data.hxx,1.8,1.9 hotspot_data.cxx,1.7,1.8 hotspot_data.hxx,1.7,1.8 ice_block_data.cxx,1.10,1.11 ice_block_data.hxx,1.7,1.8 info_box_data.cxx,1.12,1.13 info_box_data.hxx,1.7,1.8 laser_exit_data.hxx,1.7,1.8 liquid_data.cxx,1.13,1.14 liquid_data.hxx,1.7,1.8 prefab_obj_data.cxx,1.11,1.12 prefab_obj_data.hxx,1.8,1.9 rain_generator_data.hxx,1.6,1.7 smasher_data.hxx,1.7,1.8 snow_generator_data.hxx,1.9,1.10 solid_color_background_data.hxx,1.6,1.7 spike_data.hxx,1.8,1.9 starfield_background_data.cxx,1.9,1.10 starfield_background_data.hxx,1.5,1.6surface_background_data.cxx,1.11,1.12 surface_background_data.hxx,1.7,1.8 switch_door_data.cxx,1.11,1.12 switch_door_data.hxx,1.7,1.8 teleporter_data.cxx,1.12,1.13 teleporter_data.hxx,1.7,1.8thunderstorm_background_data.hxx,1.6,1.7 worldobj_group_data.cxx,1.11,1.12 worldobj_group_data.hxx,1.7,1.8
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/sound slot_manager.cxx,1.1,1.2 slot_manager.hxx,1.1,1.2 sound.cxx,1.4,1.5 sound.hxx,1.2,1.3 sound_dummy.cxx,1.1,1.2 sound_dummy.hxx,1.1,1.2 sound_real.cxx,1.7,1.8 sound_real.hxx,1.2,1.3 sound_res_mgr.cxx,1.1,1.2 sound_res_mgr.hxx,1.1,1.2sounds.hxx,1.1,1.2
- Index(es):