[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.12,1.13 bumper
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.12,1.13 bumper.hxx,1.7,1.8 conveyor_belt.cxx,1.22,1.23 conveyor_belt.hxx,1.16,1.17 entrance.cxx,1.12,1.13 entrance.hxx,1.4,1.5 exit.hxx,1.3,1.4 fake_exit.cxx,1.13,1.14 fake_exit.hxx,1.7,1.8 groundpiece.hxx,1.6,1.7 guillotine.cxx,1.8,1.9 hammer.cxx,1.12,1.13 hammer.hxx,1.8,1.9 hotspot.cxx,1.6,1.7 hotspot.hxx,1.5,1.6 ice_block.cxx,1.21,1.22 ice_block.hxx,1.15,1.16 info_box.cxx,1.19,1.20 info_box.hxx,1.15,1.16 laser_exit.cxx,1.11,1.12 laser_exit.hxx,1.6,1.7 liquid.cxx,1.8,1.9 liquid.hxx,1.5,1.6 rain_generator.cxx,1.9,1.10 rain_generator.hxx,1.6,1.7 smasher.cxx,1.18,1.19 smasher.hxx,1.7,1.8 snow_generator.cxx,1.7,1.8 snow_generator.hxx,1.6,1.7 solid_color_background.hxx,1.5,1.6 spike.cxx,1.9,1.10 starfield_background.cxx,1.4,1.5 starfield_background.hxx,1.6,1.7 starfield_background_stars.cxx,1.6,1.7 starfield_background_stars.hxx,1.4,1.5 surface_background.cxx,1.8,1.9 surface_background.hxx,1.5,1.6 switch_door.cxx,1.23,1.24 switch_door.hxx,1.18,1.19 teleporter.cxx,1.16,1.17 teleporter.hxx,1.17,1.18 thunderstorm_background.hxx,1.6,1.7 |
|
Date: |
19 Apr 2003 10:23:22 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv20737/worldobjs
Modified Files:
bumper.cxx bumper.hxx conveyor_belt.cxx conveyor_belt.hxx
entrance.cxx entrance.hxx exit.hxx fake_exit.cxx fake_exit.hxx
groundpiece.hxx guillotine.cxx hammer.cxx hammer.hxx
hotspot.cxx hotspot.hxx ice_block.cxx ice_block.hxx
info_box.cxx info_box.hxx laser_exit.cxx laser_exit.hxx
liquid.cxx liquid.hxx rain_generator.cxx rain_generator.hxx
smasher.cxx smasher.hxx snow_generator.cxx snow_generator.hxx
solid_color_background.hxx spike.cxx starfield_background.cxx
starfield_background.hxx starfield_background_stars.cxx
starfield_background_stars.hxx surface_background.cxx
surface_background.hxx switch_door.cxx switch_door.hxx
teleporter.cxx teleporter.hxx thunderstorm_background.hxx
Log Message:
removed trailing whitespace
Index: bumper.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bumper.cxx 25 Mar 2003 00:37:44 -0000 1.12
+++ bumper.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -30,7 +30,7 @@
namespace WorldObjs {
-Bumper::Bumper (const WorldObjsData::BumperData& data_)
+Bumper::Bumper (const WorldObjsData::BumperData& data_)
: data(new WorldObjsData::BumperData(data_)),
upwards(false),
count(0)
@@ -56,7 +56,7 @@
catch_pingu(*pingu);
}
- if (upwards)
+ if (upwards)
{
++count;
if (count >= static_cast<int>(data->surface.get_num_frames()) )
@@ -76,26 +76,26 @@
world->get_colmap()->put(prov, static_cast<int>(data->pos.x),
static_cast<int>(data->pos.y), Groundtype::GP_SOLID);
}
-void
+void
Bumper::draw (GraphicContext& gc)
{
gc.draw(data->surface, data->pos, count);
}
-void
+void
Bumper::catch_pingu (Pingu* pingu)
{
if ( pingu->get_y() > data->pos.y + 60
&& pingu->get_y() < data->pos.y + 100)
{
- if ( pingu->get_x() > data->pos.x + 28
+ if ( pingu->get_x() > data->pos.x + 28
&& pingu->get_x() < data->pos.x + 32)
{
if (!upwards)
upwards = true;
}
- if ( upwards
+ if ( upwards
&& pingu->get_x() > data->pos.x + 0
&& pingu->get_x() < data->pos.x + 60)
{
Index: bumper.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/bumper.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bumper.hxx 1 Oct 2002 19:53:45 -0000 1.7
+++ bumper.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -36,18 +36,18 @@
WorldObjsData::BumperData* const data;
bool upwards;
int count;
-
+
public:
Bumper (const WorldObjsData::BumperData& data_);
~Bumper ();
float get_z_pos () const;
-
+
void draw (GraphicContext& gc);
void on_startup();
void update ();
-private:
+private:
void catch_pingu (Pingu* pingu);
Bumper (const Bumper&);
Index: conveyor_belt.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- conveyor_belt.cxx 4 Mar 2003 10:25:32 -0000 1.22
+++ conveyor_belt.cxx 19 Apr 2003 10:23:19 -0000 1.23
@@ -41,11 +41,11 @@
{
gc.draw(left_sur, data->pos, static_cast<int>(data->counter));
for (int i=0; i < data->width; ++i)
- gc.draw(middle_sur,
+ gc.draw(middle_sur,
static_cast<int>(data->pos.x + left_sur.get_width() + i *
middle_sur.get_width()),
- static_cast<int>(data->pos.y),
+ static_cast<int>(data->pos.y),
static_cast<int>(data->counter));
-
+
gc.draw(right_sur,
static_cast<int>(data->pos.x + left_sur.get_width() + data->width *
middle_sur.get_width()),
static_cast<int>(data->pos.y),
@@ -63,7 +63,7 @@
Groundtype::GP_SOLID);
}
-void
+void
ConveyorBelt::update ()
{
data->counter += data->speed * 0.025f;
Index: conveyor_belt.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/conveyor_belt.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- conveyor_belt.hxx 1 Oct 2002 19:53:46 -0000 1.16
+++ conveyor_belt.hxx 19 Apr 2003 10:23:19 -0000 1.17
@@ -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.
@@ -39,15 +39,15 @@
CL_Surface left_sur;
CL_Surface right_sur;
CL_Surface middle_sur;
-
+
public:
ConveyorBelt (const WorldObjsData::ConveyorBeltData& data_);
-
+
void draw (GraphicContext& gc);
void on_startup ();
void update ();
float get_z_pos () const;
-
+
private:
ConveyorBelt (const ConveyorBelt&);
ConveyorBelt& operator= (const ConveyorBelt&);
Index: entrance.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrance.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- entrance.cxx 21 Mar 2003 22:08:06 -0000 1.12
+++ entrance.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -70,9 +70,9 @@
Pingu* pingu = world->get_pingus()->create_pingu(data->pos, data->owner_id);
- if (pingu) // still pingus in the pool
+ if (pingu) // still pingus in the pool
{
- switch (data->direction)
+ switch (data->direction)
{
case WorldObjsData::EntranceData::LEFT:
d.left();
@@ -80,11 +80,11 @@
break;
case WorldObjsData::EntranceData::MISC:
- if (last_direction)
+ if (last_direction)
{
d.left();
last_direction = 0;
- }
+ }
else
{
d.right();
@@ -92,12 +92,12 @@
}
pingu->set_direction(d);
break;
-
- case WorldObjsData::EntranceData::RIGHT:
+
+ case WorldObjsData::EntranceData::RIGHT:
d.right();
pingu->set_direction(d);
break;
-
+
default:
std::cout << "Entrance:: Warning direction is wrong: " <<
data->direction << std::endl;
d.right();
@@ -125,7 +125,7 @@
void
Entrance::draw (GraphicContext& gc)
{
- if (!surface)
+ if (!surface)
{
// Entrances have only a surface for historical reasons
//std::cout << "Entrance::draw (GraphicContext& gc): entrance without a
surface?!" << std::endl;
Index: entrance.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/entrance.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entrance.hxx 10 Oct 2002 12:25:54 -0000 1.4
+++ entrance.hxx 19 Apr 2003 10:23:19 -0000 1.5
@@ -39,25 +39,25 @@
protected:
WorldObjsData::EntranceData* const data;
- Sprite smallmap_symbol;
+ Sprite smallmap_symbol;
CL_Surface surface;
int last_release;
-
+
public:
Entrance (const WorldObjsData::EntranceData& data_);
~Entrance ();
float get_z_pos () const;
-
+
virtual bool pingu_ready ();
virtual void create_pingu ();
-
+
virtual void update ();
-
+
virtual void draw (GraphicContext& gc);
void draw_smallmap(SmallMap* smallmap);
-
+
private:
Entrance (const Entrance&);
Entrance& operator= (const Entrance&);
Index: exit.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/exit.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exit.hxx 10 Oct 2002 12:25:54 -0000 1.3
+++ exit.hxx 19 Apr 2003 10:23:19 -0000 1.4
@@ -40,16 +40,16 @@
public:
Exit (const WorldObjsData::ExitData& data_);
~Exit ();
-
+
void on_startup ();
void draw (GraphicContext& gc);
void draw_smallmap(SmallMap* smallmap);
-
+
void update ();
-
+
float get_z_pos () const;
-
+
private:
Exit (const Exit&);
Exit& operator= (const Exit&);
Index: fake_exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/fake_exit.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fake_exit.cxx 19 Feb 2003 09:50:36 -0000 1.13
+++ fake_exit.cxx 19 Apr 2003 10:23:19 -0000 1.14
@@ -27,7 +27,7 @@
namespace WorldObjs {
-FakeExit::FakeExit (const WorldObjsData::FakeExitData& data_)
+FakeExit::FakeExit (const WorldObjsData::FakeExitData& data_)
: data (new WorldObjsData::FakeExitData(data_)),
smashing(false),
smallmap_symbol("misc/smallmap_exit", "core")
@@ -53,7 +53,7 @@
return data->pos.z;
}
-void
+void
FakeExit::draw (GraphicContext& gc)
{
gc.draw (data->surface, data->pos, data->counter.value());
@@ -80,13 +80,13 @@
}
if ( pingu->get_x() > data->pos.x + 31 && pingu->get_x() < data->pos.x +
31 + 15
- && pingu->get_y() > data->pos.y + 56 && pingu->get_y() < data->pos.y +
56 + 56)
+ && pingu->get_y() > data->pos.y + 56 && pingu->get_y() < data->pos.y +
56 + 56)
{
if (pingu->get_action() != Actions::Splashed)
{
if (!smashing) {
data->counter = 0;
- smashing = true;
+ smashing = true;
}
if (data->counter >= 3 && data->counter <= 5) {
Index: fake_exit.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/fake_exit.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fake_exit.hxx 20 Oct 2002 18:28:49 -0000 1.7
+++ fake_exit.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -40,13 +40,13 @@
WorldObjsData::FakeExitData* const data;
bool smashing;
Sprite smallmap_symbol;
-
+
public:
FakeExit (const WorldObjsData::FakeExitData& data_);
~FakeExit ();
float get_z_pos () const;
-
+
void draw (GraphicContext& gc);
void update ();
@@ -56,7 +56,7 @@
private:
void catch_pingu (Pingu*);
-
+
FakeExit (const FakeExit&);
FakeExit& operator= (const FakeExit&);
};
Index: groundpiece.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/groundpiece.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- groundpiece.hxx 28 Sep 2002 11:52:26 -0000 1.6
+++ groundpiece.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -1,5 +1,5 @@
// $Id$
-//
+//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 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.
Index: guillotine.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/guillotine.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- guillotine.cxx 19 Feb 2003 09:50:36 -0000 1.8
+++ guillotine.cxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -26,7 +26,7 @@
namespace WorldObjs {
-Guillotine::Guillotine (const WorldObjsData::GuillotineData& data_)
+Guillotine::Guillotine (const WorldObjsData::GuillotineData& data_)
: data(new WorldObjsData::GuillotineData(data_)),
killing(false)
{
@@ -56,10 +56,10 @@
gc.draw (data->surface, data->pos, data->counter + 12);
} else {
gc.draw (data->idle_surf, data->pos, data->idle_counter);
- }
+ }
}
-
-
+
+
float
Guillotine::get_z_pos () const
{
@@ -88,7 +88,7 @@
void
Guillotine::catch_pingu (Pingu* pingu)
{
- if (!killing)
+ if (!killing)
{
if (pingu->is_inside (static_cast<int>(data->pos.x + 38),
static_cast<int>(data->pos.y + 90),
static_cast<int>(data->pos.x + 42),
static_cast<int>(data->pos.y + 98)))
Index: hammer.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hammer.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hammer.cxx 19 Feb 2003 09:50:36 -0000 1.12
+++ hammer.cxx 19 Apr 2003 10:23:19 -0000 1.13
@@ -26,7 +26,7 @@
namespace WorldObjs {
-Hammer::Hammer (const WorldObjsData::HammerData& data_)
+Hammer::Hammer (const WorldObjsData::HammerData& data_)
: data(new WorldObjsData::HammerData(data_))
{
sprite = Sprite("Traps/hammer", "traps");
@@ -43,7 +43,7 @@
return data->pos.z;
}
-void
+void
Hammer::draw (GraphicContext& gc)
{
gc.draw (sprite, data->pos);
@@ -58,7 +58,7 @@
{
PinguHolder* holder = world->get_pingus();
- for (PinguIter pingu_it = holder->begin (); pingu_it != holder->end ();
++pingu_it)
+ for (PinguIter pingu_it = holder->begin (); pingu_it != holder->end ();
++pingu_it)
{
Pingu* pingu = *pingu_it;
if (pingu->get_action() != Actions::Splashed)
Index: hammer.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hammer.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- hammer.hxx 1 Oct 2002 23:40:19 -0000 1.8
+++ hammer.hxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -36,7 +36,7 @@
private:
WorldObjsData::HammerData* const data;
Sprite sprite;
-
+
public:
Hammer (const WorldObjsData::HammerData& data_);
~Hammer ();
Index: hotspot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hotspot.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hotspot.cxx 19 Feb 2003 09:50:36 -0000 1.6
+++ hotspot.cxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -44,7 +44,7 @@
sprite.update();
}
-void
+void
Hotspot::draw (GraphicContext& gc)
{
// FIXME: para support doesnn't work correctly
Index: hotspot.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/hotspot.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hotspot.hxx 2 Oct 2002 19:20:19 -0000 1.5
+++ hotspot.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -38,11 +38,11 @@
public:
Hotspot (const WorldObjsData::HotspotData& data_);
~Hotspot ();
-
+
void draw (GraphicContext& gc);
void update();
float get_z_pos () const;
-
+
private:
Hotspot (const Hotspot&);
Hotspot& operator= (const Hotspot&);
Index: ice_block.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ice_block.cxx 19 Feb 2003 09:50:36 -0000 1.21
+++ ice_block.cxx 19 Apr 2003 10:23:19 -0000 1.22
@@ -30,8 +30,8 @@
namespace WorldObjs {
-IceBlock::IceBlock (const WorldObjsData::IceBlockData& data_)
- : data(new WorldObjsData::IceBlockData(data_)),
+IceBlock::IceBlock (const WorldObjsData::IceBlockData& data_)
+ : data(new WorldObjsData::IceBlockData(data_)),
thickness(1.0),
is_finished(false),
last_contact(0),
@@ -55,7 +55,7 @@
Groundtype::GP_GROUND);
}
-void
+void
IceBlock::draw (GraphicContext& gc)
{
if (is_finished)
@@ -66,7 +66,7 @@
static_cast<int>((1.0 - thickness) * (block_sur.get_num_frames() -
1)));
}
-void
+void
IceBlock::update()
{
if (is_finished)
Index: ice_block.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/ice_block.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ice_block.hxx 1 Oct 2002 19:53:46 -0000 1.15
+++ ice_block.hxx 19 Apr 2003 10:23:19 -0000 1.16
@@ -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.
@@ -38,7 +38,7 @@
bool is_finished;
int last_contact;
CL_Surface block_sur;
-
+
public:
IceBlock (const WorldObjsData::IceBlockData& data_);
~IceBlock ();
@@ -47,7 +47,7 @@
void on_startup ();
void draw (GraphicContext& gc);
void update ();
-
+
private:
IceBlock (const IceBlock&);
IceBlock& operator= (const IceBlock&);
Index: info_box.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- info_box.cxx 19 Feb 2003 09:50:36 -0000 1.19
+++ info_box.cxx 19 Apr 2003 10:23:19 -0000 1.20
@@ -62,7 +62,7 @@
x_pos + width/2 + border,
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());
+ gc.print_center(Fonts::pingus_small, x_pos, y_pos,
data->info_text.c_str());
}
else
{
Index: info_box.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/info_box.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- info_box.hxx 1 Oct 2002 19:53:46 -0000 1.15
+++ info_box.hxx 19 Apr 2003 10:23:19 -0000 1.16
@@ -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.
@@ -43,7 +43,7 @@
void draw (GraphicContext& gc);
void update ();
float get_z_pos () const;
-
+
private:
InfoBox (const InfoBox&);
InfoBox& operator= (const InfoBox&);
Index: laser_exit.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/laser_exit.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- laser_exit.cxx 19 Feb 2003 09:50:37 -0000 1.11
+++ laser_exit.cxx 19 Apr 2003 10:23:19 -0000 1.12
@@ -46,7 +46,7 @@
return data->pos.z;
}
-void
+void
LaserExit::draw (GraphicContext& gc)
{
gc.draw (data->surface, data->pos,
@@ -75,12 +75,12 @@
void
LaserExit::catch_pingu (Pingu* pingu)
{
- if (!killing)
+ if (!killing)
{
- if ( pingu->get_x () < data->pos.x + 34 + 10 && pingu->get_x () >
data->pos.x + 34
- && pingu->get_y () < data->pos.y + 43 + 20 && pingu->get_y () >
data->pos.y + 43)
+ if ( pingu->get_x () < data->pos.x + 34 + 10 && pingu->get_x () >
data->pos.x + 34
+ && pingu->get_y () < data->pos.y + 43 + 20 && pingu->get_y () >
data->pos.y + 43)
{
- if (pingu->get_action() != Actions::Laserkill)
+ if (pingu->get_action() != Actions::Laserkill)
{
killing = true;
pingu->set_action(Actions::Laserkill);
Index: laser_exit.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/laser_exit.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- laser_exit.hxx 1 Oct 2002 19:53:46 -0000 1.6
+++ laser_exit.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -35,7 +35,7 @@
private:
WorldObjsData::LaserExitData* const data;
bool killing;
-
+
public:
LaserExit (const WorldObjsData::LaserExitData& data_);
~LaserExit ();
@@ -51,7 +51,7 @@
private:
LaserExit (const LaserExit&);
LaserExit& operator= (const LaserExit&);
-};
+};
} // namespace WorldObjs
Index: liquid.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/liquid.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- liquid.cxx 3 Mar 2003 20:32:18 -0000 1.8
+++ liquid.cxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -40,7 +40,7 @@
delete data;
}
-float
+float
Liquid::get_z_pos () const
{
return data->pos.z;
Index: liquid.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/liquid.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- liquid.hxx 18 Feb 2003 17:04:13 -0000 1.5
+++ liquid.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -34,7 +34,7 @@
private:
WorldObjsData::LiquidData* const data;
Sprite sur;
-
+
public:
CL_Surface colmap_sur;
@@ -45,7 +45,7 @@
void on_startup();
void draw (GraphicContext& gc);
void update();
-
+
private:
Liquid (const Liquid&);
Liquid& operator= (const Liquid&);
Index: rain_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rain_generator.cxx 19 Feb 2003 09:50:37 -0000 1.9
+++ rain_generator.cxx 19 Apr 2003 10:23:19 -0000 1.10
@@ -37,7 +37,7 @@
{
}
-void
+void
RainGenerator::draw (GraphicContext& gc)
{
if (do_thunder)
@@ -64,7 +64,7 @@
waiter_count = 1.0f;
PingusSound::play_sound ("sounds/thunder.wav");
}
-
+
if (do_thunder)
thunder_count -= 10.0f * 0.025f;
Index: rain_generator.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/rain_generator.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rain_generator.hxx 1 Oct 2002 19:53:46 -0000 1.6
+++ rain_generator.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -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.
Index: smasher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- smasher.cxx 19 Feb 2003 09:50:37 -0000 1.18
+++ smasher.cxx 19 Apr 2003 10:23:19 -0000 1.19
@@ -58,18 +58,18 @@
PinguHolder* holder = world->get_pingus();
for (PinguIter pingu = holder->begin (); pingu != holder->end (); ++pingu)
catch_pingu(*pingu);
-
- if (smashing)
+
+ if (smashing)
{
- if (downwards)
+ if (downwards)
{
- if (count >= 5)
+ if (count >= 5)
{
// SMASH!!! The thing hitten earth and kills the pingus
downwards = false;
- --count;
+ --count;
PingusSound::play_sound("sounds/tenton.wav", 0.7f);
-
+
for(int i=0; i < 20; ++i)
{
world->get_smoke_particle_holder()->
@@ -90,12 +90,12 @@
}
}
}
- else
+ else
{
++count;
}
- }
- else
+ }
+ else
{
if (count <= 0)
{
@@ -118,31 +118,31 @@
Groundtype::GP_SOLID);
}
-void
+void
Smasher::draw (GraphicContext& gc)
{
gc.draw (data->surface, data->pos, count);
}
-void
+void
Smasher::catch_pingu (Pingu* pingu)
{
// Activate the smasher if a Pingu is under it
- if (( pingu->direction.is_left()
+ if (( pingu->direction.is_left()
&& pingu->get_x() > data->pos.x + 65
&& pingu->get_x() < data->pos.x + 85)
- ||
+ ||
( pingu->direction.is_right()
&& pingu->get_x() > data->pos.x + 190
&& pingu->get_x() < data->pos.x + 210))
{
if (pingu->get_action() != Actions::Splashed)
{
- if (!smashing)
+ if (!smashing)
{
count = 0;
downwards = true;
- smashing = true;
+ smashing = true;
}
}
}
Index: smasher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/smasher.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smasher.hxx 1 Oct 2002 19:53:46 -0000 1.7
+++ smasher.hxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -43,7 +43,7 @@
~Smasher ();
float get_z_pos () const;
-
+
void draw (GraphicContext& gc);
void on_startup ();
void update ();
Index: snow_generator.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/snow_generator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snow_generator.cxx 4 Mar 2003 12:53:47 -0000 1.7
+++ snow_generator.cxx 19 Apr 2003 10:23:19 -0000 1.8
@@ -36,7 +36,7 @@
{
}
-void
+void
SnowGenerator::update()
{
for(int i = 0; i < floor(intensity); ++i)
@@ -60,12 +60,12 @@
SnowGenerator::on_startup()
{
// FIXME: if snow should be available from start, this needs to get fixed to
have the right amount of snow
-#if 0
+#if 0
for (int i = 0; i < 500; ++i) // FIXME: 500 is a random value, doesn't work
very often
{
world->get_snow_particle_holder()->add_particle(rand() %
world->get_width(), rand() % world->get_height());
world->get_snow_particle_holder()->add_particle(rand() %
world->get_width(), rand() % world->get_height());
- world->get_snow_particle_holder()->add_particle(rand() %
world->get_width(), rand() % world->get_height(), true);
+ world->get_snow_particle_holder()->add_particle(rand() %
world->get_width(), rand() % world->get_height(), true);
}
#endif
}
Index: snow_generator.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/snow_generator.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snow_generator.hxx 19 Feb 2003 17:17:01 -0000 1.6
+++ snow_generator.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -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.
Index: solid_color_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/solid_color_background.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- solid_color_background.hxx 27 Nov 2002 20:05:42 -0000 1.5
+++ solid_color_background.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -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,17 +32,17 @@
{
private:
WorldObjsData::SolidColorBackgroundData* data;
-
+
public:
SolidColorBackground (const WorldObjsData::SolidColorBackgroundData& data_);
~SolidColorBackground ();
// FIXME: Make z_position editable
- float get_z_pos () const { return -10; }
+ float get_z_pos () const { return -10; }
void update () {}
-
+
void draw (GraphicContext& gc);
-
+
private:
SolidColorBackground (const SolidColorBackground&);
SolidColorBackground& operator= (const SolidColorBackground&);
Index: spike.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/spike.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- spike.cxx 19 Feb 2003 09:50:37 -0000 1.9
+++ spike.cxx 19 Apr 2003 10:23:19 -0000 1.10
@@ -26,7 +26,7 @@
namespace WorldObjs {
-Spike::Spike (const WorldObjsData::SpikeData& data_)
+Spike::Spike (const WorldObjsData::SpikeData& data_)
: data(new WorldObjsData::SpikeData(data_)),
killing(false)
{
@@ -79,19 +79,19 @@
{
if (!killing) {
if ( pingu->get_x () > data->pos.x + 16 - 5 && pingu->get_x () <
data->pos.x + 16 + 5
- && pingu->get_y () > data->pos.y && pingu->get_y () <
data->pos.y + 32)
+ && pingu->get_y () > data->pos.y && pingu->get_y () <
data->pos.y + 32)
{
data->counter = 0;
killing = true;
}
} else {
- if ( data->counter == 3
+ if ( data->counter == 3
&& pingu->get_x () > data->pos.x +16 - 12 && pingu->get_x () <
data->pos.x + 16 + 12
- && pingu->get_y () > data->pos.y && pingu->get_y () <
data->pos.y + 32)
+ && pingu->get_y () > data->pos.y && pingu->get_y () <
data->pos.y + 32)
{
pingu->set_status(PS_DEAD);
}
- }
+ }
}
} // namespace WorldObjs
Index: starfield_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starfield_background.cxx 1 Oct 2002 19:53:46 -0000 1.4
+++ starfield_background.cxx 19 Apr 2003 10:23:19 -0000 1.5
@@ -47,7 +47,7 @@
}
-void
+void
StarfieldBackground::update ()
{
for (std::vector<StarfieldBackgroundStars*>::iterator i = stars.begin();
@@ -57,7 +57,7 @@
}
}
-void
+void
StarfieldBackground::draw (GraphicContext& gc)
{
for (std::vector<StarfieldBackgroundStars*>::iterator i = stars.begin();
Index: starfield_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background.hxx 1 Oct 2002 19:53:46 -0000 1.6
+++ starfield_background.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -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.
@@ -46,7 +46,7 @@
void update ();
void draw (GraphicContext& gc);
-
+
private:
StarfieldBackground (const StarfieldBackground&);
StarfieldBackground& operator= (const StarfieldBackground&);
Index: starfield_background_stars.cxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background_stars.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- starfield_background_stars.cxx 19 Feb 2003 09:50:37 -0000 1.6
+++ starfield_background_stars.cxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -22,7 +22,7 @@
#include "../pingus_resource.hxx"
#include "starfield_background_stars.hxx"
-namespace WorldObjs {
+namespace WorldObjs {
CL_Surface StarfieldBackgroundStars::small_star;
CL_Surface StarfieldBackgroundStars::middle_star;
@@ -32,7 +32,7 @@
StarfieldBackgroundStars::StarfieldBackgroundStars (Type type)
{
init ();
-
+
switch (type)
{
case SMALL_STAR:
@@ -45,10 +45,10 @@
sur = large_star;
break;
}
-
+
x_pos = rand() % world->get_width();
y_pos = rand() % world->get_height();
-
+
x_add = rand() % 5 + 1.0f;
y_add = 0.0f;
}
@@ -70,7 +70,7 @@
{
x_pos += x_add;
y_pos += y_add;
-
+
if (x_pos > world->get_width())
{
x_pos = -32;
Index: starfield_background_stars.hxx
===================================================================
RCS file:
/var/lib/cvs/Games/Pingus/src/worldobjs/starfield_background_stars.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starfield_background_stars.hxx 1 Oct 2002 19:53:46 -0000 1.4
+++ starfield_background_stars.hxx 19 Apr 2003 10:23:19 -0000 1.5
@@ -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.
@@ -46,7 +46,7 @@
StarfieldBackgroundStars () {}
StarfieldBackgroundStars (Type type);
-
+
// Never used
float get_z_pos () const { return -100; }
Index: surface_background.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/surface_background.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_background.cxx 10 Apr 2003 18:28:30 -0000 1.8
+++ surface_background.cxx 19 Apr 2003 10:23:19 -0000 1.9
@@ -39,11 +39,11 @@
{
Timer timer("Background creation");
- if (data->color.alpha > 1.0)
+ if (data->color.alpha > 1.0)
std::cout << "Background: Warning dim larger than 1.0 are no longer
supported" << std::endl;
-
+
CL_Surface source_surface = PingusResource::load_surface(data->desc);
-
+
CL_Canvas* canvas;
// Scaling Code
@@ -56,8 +56,8 @@
if (data->keep_aspect)
{
float aspect =
source_surface.get_height()/float(source_surface.get_width());
- canvas = Blitter::scale_surface_to_canvas(source_surface,
- world->get_width(),
+ canvas = Blitter::scale_surface_to_canvas(source_surface,
+ world->get_width(),
int(world->get_width()*aspect));
}
else
@@ -89,16 +89,16 @@
FIXME: not tested with RGBA images
FIXME: the bug might be in create_canvas() and not in fill_rect()
*/
-
+
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
- canvas->fill_rect(0, 0,
+ canvas->fill_rect(0, 0,
canvas->get_width(), canvas->get_height(),
- data->color.red, data->color.green, data->color.blue,
+ data->color.red, data->color.green, data->color.blue,
data->color.alpha);
}
-
+
bg_surface = CL_Surface(canvas, true);
//bg_surface = CAImageManipulation::changeHSV(bg_surface, 150, 100, 0);
@@ -126,21 +126,21 @@
scroll_ox += data->scroll_x;
scroll_oy += data->scroll_y;
-
- if (scroll_ox > bg_surface.get_width())
+
+ if (scroll_ox > bg_surface.get_width())
{
scroll_ox -= bg_surface.get_width();
- }
- else if (-scroll_ox > bg_surface.get_width())
+ }
+ else if (-scroll_ox > bg_surface.get_width())
{
scroll_ox += bg_surface.get_width();
}
-
- if (scroll_oy > bg_surface.get_height())
+
+ if (scroll_oy > bg_surface.get_height())
{
scroll_oy -= bg_surface.get_height();
- }
- else if (-scroll_oy > bg_surface.get_height())
+ }
+ else if (-scroll_oy > bg_surface.get_height())
{
scroll_oy += bg_surface.get_height();
}
@@ -149,35 +149,35 @@
void
SurfaceBackground::draw (GraphicContext& gc)
{
- if (fast_mode)
+ if (fast_mode)
{
CL_Display::clear_display();
- }
- else
+ }
+ else
{
int x_of = static_cast<int>(gc.get_x_offset () + (gc.get_width ()/2));
int y_of = static_cast<int>(gc.get_y_offset () + (gc.get_height ()/2));
int start_x;
int start_y;
-
+
start_x = static_cast<int>((x_of * data->para_x) + scroll_ox);
start_y = static_cast<int>((y_of * data->para_y) + scroll_oy);
-
+
if (start_x >= 0)
start_x = start_x - bg_surface.get_width();
-
- if (start_y >= 0)
+
+ if (start_y >= 0)
start_y -= bg_surface.get_height();
else if (start_y < 0 - static_cast<int>(bg_surface.get_height()))
start_y += bg_surface.get_height();
-
- for(int y = start_y;
- y < CL_Display::get_height();
- y += bg_surface.get_height())
+
+ for(int y = start_y;
+ y < CL_Display::get_height();
+ y += bg_surface.get_height())
{
for(int x = start_x;
- x < CL_Display::get_width();
+ x < CL_Display::get_width();
x += bg_surface.get_width())
{
bg_surface.put_screen(x, y, counter); // FIXME: should use gc
Index: surface_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/surface_background.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- surface_background.hxx 1 Oct 2002 19:53:46 -0000 1.5
+++ surface_background.hxx 19 Apr 2003 10:23:19 -0000 1.6
@@ -36,7 +36,7 @@
GameCounter counter;
CL_Surface bg_surface;
-
+
/** The horizontal scrolling speed in pixels per tick */
float scroll_ox;
@@ -44,7 +44,7 @@
float scroll_oy;
WorldObjsData::SurfaceBackgroundData* const data;
-
+
public:
SurfaceBackground (const WorldObjsData::SurfaceBackgroundData& data_);
~SurfaceBackground ();
@@ -53,7 +53,7 @@
void update ();
void draw (GraphicContext& gc);
-
+
private:
SurfaceBackground (const SurfaceBackground&);
SurfaceBackground& operator= (const SurfaceBackground&);
Index: switch_door.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- switch_door.cxx 19 Feb 2003 09:50:37 -0000 1.23
+++ switch_door.cxx 19 Apr 2003 10:23:19 -0000 1.24
@@ -28,7 +28,7 @@
namespace WorldObjs {
-SwitchDoor::SwitchDoor (const WorldObjsData::SwitchDoorData& data_)
+SwitchDoor::SwitchDoor (const WorldObjsData::SwitchDoorData& data_)
: data(new WorldObjsData::SwitchDoorData(data_)),
door_box (PingusResource::load_surface("switchdoor_box" ,
"worldobjs")),
door_tile (PingusResource::load_surface("switchdoor_tile" ,
"worldobjs")),
@@ -44,18 +44,18 @@
delete data;
}
-void
+void
SwitchDoor::on_startup ()
{
world->get_colmap()->put(door_box,
static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y),
Groundtype::GP_SOLID);
-
+
for (int i=0; i < data->door_height; ++i)
world->get_colmap()->put(door_tile_cmap,
- static_cast<int>(data->door_pos.x),
- static_cast<int>(data->door_pos.y)
+ static_cast<int>(data->door_pos.x),
+ static_cast<int>(data->door_pos.y)
+ i * door_tile.get_height()
+ door_box.get_height(),
Groundtype::GP_SOLID);
@@ -66,9 +66,9 @@
{
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)
+ 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());
@@ -84,7 +84,7 @@
{
// Check if a pingu is passing the switch
PinguHolder* holder = world->get_pingus();
-
+
for (PinguIter pingu = holder->begin (); pingu != holder->end ();
++pingu)
{
if ( (*pingu)->get_x() > data->switch_pos.x
@@ -111,7 +111,7 @@
Groundtype::GP_NOTHING);
for (int i=0; i < data->door_height; ++i)
world->get_colmap()->put(door_tile_cmap,
- static_cast<int>(data->door_pos.x),
+ static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y) + i
* door_tile.get_height()
+
door_box.get_height(),
Groundtype::GP_NOTHING);
Index: switch_door.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/switch_door.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- switch_door.hxx 1 Oct 2002 19:53:46 -0000 1.18
+++ switch_door.hxx 19 Apr 2003 10:23:19 -0000 1.19
@@ -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.
@@ -35,7 +35,7 @@
{
private:
WorldObjsData::SwitchDoorData* const data;
-
+
CL_Surface door_box;
CL_Surface door_tile;
CL_Surface door_tile_cmap;
@@ -51,14 +51,14 @@
public:
SwitchDoor (const WorldObjsData::SwitchDoorData& data_);
~SwitchDoor ();
-
+
void on_startup();
void draw (GraphicContext& gc);
void update ();
-
+
/// The switch and the door should stay above the pingus
float get_z_pos() const { return 100; }
-
+
private:
SwitchDoor (const SwitchDoor&);
SwitchDoor& operator= (const SwitchDoor&);
Index: teleporter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/teleporter.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- teleporter.cxx 19 Feb 2003 09:50:37 -0000 1.16
+++ teleporter.cxx 19 Apr 2003 10:23:19 -0000 1.17
@@ -31,7 +31,7 @@
: data(new WorldObjsData::TeleporterData(data_)),
sprite("teleporter", "worldobjs", 20.0f, Sprite::NONE, Sprite::ONCE),
target_sprite("teleportertarget", "worldobjs", 15.0f, Sprite::NONE,
Sprite::ONCE)
-{
+{
sprite.set_align_center_bottom();
target_sprite.set_align_center();
@@ -51,14 +51,14 @@
return data->pos.z;
}
-void
+void
Teleporter::draw (GraphicContext& gc)
{
gc.draw(sprite, data->pos);
gc.draw(target_sprite, data->target_pos);
}
-void
+void
Teleporter::update ()
{
sprite.update();
Index: teleporter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/teleporter.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- teleporter.hxx 7 Oct 2002 23:04:06 -0000 1.17
+++ teleporter.hxx 19 Apr 2003 10:23:19 -0000 1.18
@@ -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.
@@ -40,11 +40,11 @@
~Teleporter ();
int get_z_pos () { return 0; }
-
+
void draw (GraphicContext& gc);
void update ();
float get_z_pos () const;
-
+
private:
Teleporter (const Teleporter&);
Teleporter& operator= (const Teleporter&);
Index: thunderstorm_background.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldobjs/thunderstorm_background.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- thunderstorm_background.hxx 27 Nov 2002 20:05:42 -0000 1.6
+++ thunderstorm_background.hxx 19 Apr 2003 10:23:19 -0000 1.7
@@ -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.
@@ -42,10 +42,10 @@
~ThunderstormBackground ();
float get_z_pos () const;
-
+
void update ();
void draw (GraphicContext& gc);
-
+
private:
ThunderstormBackground (const ThunderstormBackground&);
ThunderstormBackground& operator= (const ThunderstormBackground&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.12,1.13 bumper.hxx,1.7,1.8 conveyor_belt.cxx,1.22,1.23 conveyor_belt.hxx,1.16,1.17 entrance.cxx,1.12,1.13 entrance.hxx,1.4,1.5 exit.hxx,1.3,1.4 fake_exit.cxx,1.13,1.14 fake_exit.hxx,1.7,1.8 groundpiece.hxx,1.6,1.7 guillotine.cxx,1.8,1.9 hammer.cxx,1.12,1.13 hammer.hxx,1.8,1.9 hotspot.cxx,1.6,1.7 hotspot.hxx,1.5,1.6 ice_block.cxx,1.21,1.22 ice_block.hxx,1.15,1.16 info_box.cxx,1.19,1.20 info_box.hxx,1.15,1.16 laser_exit.cxx,1.11,1.12 laser_exit.hxx,1.6,1.7 liquid.cxx,1.8,1.9 liquid.hxx,1.5,1.6 rain_generator.cxx,1.9,1.10 rain_generator.hxx,1.6,1.7 smasher.cxx,1.18,1.19 smasher.hxx,1.7,1.8 snow_generator.cxx,1.7,1.8 snow_generator.hxx,1.6,1.7 solid_color_background.hxx,1.5,1.6 spike.cxx,1.9,1.10 starfield_background.cxx,1.4,1.5 starfield_background.hxx,1.6,1.7 starfield_background_stars.cxx,1.6,1.7 starfield_background_stars.hxx,1.4,1.5 surface_background.cxx,1.8,1.9 surface_background.hxx,1.5,1.6 switch_door.cxx,1.23,1.24 switch_door.hxx,1.18,1.19 teleporter.cxx,1.16,1.17 teleporter.hxx,1.17,1.18 thunderstorm_background.hxx,1.6,1.7,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/po sv.po,NONE,1.1 cs.po,1.19,1.20 de.po,1.56,1.57 fr.po,1.9,1.10 it.po,1.18,1.19 sr.po,1.16,1.17 tr.po,1.38,1.39 se.pot,1.1,NONE
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances cloud.cxx,1.1,1.2 cloud.hxx,1.1,1.2 woodthing.cxx,1.6,1.7 woodthing.hxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/po sv.po,NONE,1.1 cs.po,1.19,1.20 de.po,1.56,1.57 fr.po,1.9,1.10 it.po,1.18,1.19 sr.po,1.16,1.17 tr.po,1.38,1.39 se.pot,1.1,NONE
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs/entrances cloud.cxx,1.1,1.2 cloud.hxx,1.1,1.2 woodthing.cxx,1.6,1.7 woodthing.hxx,1.2,1.3
- Index(es):