[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/traps bumper.cxx,1.2,1.3 fake_exit.cx
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/traps bumper.cxx,1.2,1.3 fake_exit.cxx,1.1,1.2 guillotine.cxx,1.1,1.2 smasher.cxx,1.2,1.3 spike.cxx,1.1,1.2 |
Date: |
19 Jun 2002 15:19:29 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/traps
In directory dark:/tmp/cvs-serv18271/traps
Modified Files:
bumper.cxx fake_exit.cxx guillotine.cxx smasher.cxx spike.cxx
Log Message:
- Initialized some unitialized members
- moved some initializations from body to initlist
This fixes the bug that the level end is not recognized and maybe some bugs
in the actions too
Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/bumper.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bumper.cxx 13 Jun 2002 14:25:13 -0000 1.2
+++ bumper.cxx 19 Jun 2002 15:19:26 -0000 1.3
@@ -25,7 +25,7 @@
#include "bumper.hxx"
#include "../pingu.hxx"
-Bumper::Bumper(const TrapData& data) : count(0)
+Bumper::Bumper(const TrapData& data) : upwards(false), count(0)
{
pos = data.pos;
surface = PingusResource::load_surface("Traps/bumper", "traps");
Index: fake_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/fake_exit.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fake_exit.cxx 12 Jun 2002 19:11:32 -0000 1.1
+++ fake_exit.cxx 19 Jun 2002 15:19:26 -0000 1.2
@@ -25,7 +25,7 @@
#include "fake_exit.hxx"
-FakeExit::FakeExit(const TrapData& data)
+FakeExit::FakeExit(const TrapData& data) : smashing(false)
{
surface = PingusResource::load_surface("Traps/fake_exit", "traps");
pos = data.pos;
@@ -34,7 +34,6 @@
counter.set_type(GameCounter::once);
counter.set_speed(2.5);
counter = surface.get_num_frames() - 1;
- smashing = false;
}
FakeExit::~FakeExit()
Index: guillotine.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/guillotine.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guillotine.cxx 12 Jun 2002 19:11:32 -0000 1.1
+++ guillotine.cxx 19 Jun 2002 15:19:26 -0000 1.2
@@ -23,13 +23,12 @@
#include "../world.hxx"
#include "../pingu.hxx"
-Guillotine::Guillotine(const TrapData& data)
+Guillotine::Guillotine(const TrapData& data) : killing(false),
+
idle_surf(PingusResource::load_surface("Traps/guillotineidle", "traps"))
{
- killing = false;
pos = data.pos;
surface = PingusResource::load_surface("Traps/guillotinekill", "traps");
- idle_surf = PingusResource::load_surface("Traps/guillotineidle", "traps");
counter.set_size(surface.get_num_frames()/2);
counter.set_type(GameCounter::once);
Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/smasher.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smasher.cxx 13 Jun 2002 14:25:13 -0000 1.2
+++ smasher.cxx 19 Jun 2002 15:19:26 -0000 1.3
@@ -29,12 +29,10 @@
#include "../pingu_action_factory.hxx"
#include "../pingu.hxx"
-Smasher::Smasher(const TrapData& data)
+Smasher::Smasher(const TrapData& data) : smashing(false), downwards(false),
count(0)
{
- smashing = false;
pos = data.pos;
surface = PingusResource::load_surface("Traps/smasher", "traps");
- count = 0;
}
Smasher::~Smasher()
Index: spike.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/spike.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- spike.cxx 12 Jun 2002 19:11:32 -0000 1.1
+++ spike.cxx 19 Jun 2002 15:19:26 -0000 1.2
@@ -24,9 +24,8 @@
#include "spike.hxx"
-Spike::Spike(const TrapData& data)
+Spike::Spike(const TrapData& data) : killing(false)
{
- killing = false;
pos = data.pos;
surface = PingusResource::load_surface("Traps/spike", "traps");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/traps bumper.cxx,1.2,1.3 fake_exit.cxx,1.1,1.2 guillotine.cxx,1.1,1.2 smasher.cxx,1.2,1.3 spike.cxx,1.1,1.2,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.3,1.4 editorobj_group.hxx,1.2,1.3
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src alpha_button.cxx,1.1,1.2 button_panel.cxx,1.3,1.4 client.cxx,1.2,1.3 col_map.cxx,1.2,1.3 console.hxx,1.1,1.2 counter.cxx,1.2,1.3 credits.cxx,1.1,1.2 debug_gui.cxx,1.1,1.2 demo_player.hxx,1.1,1.2 demo_recorder.cxx,1.2,1.3 direction.cxx,1.1,1.2 display.cxx,1.2,1.3 world.cxx,1.5,1.6
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.3,1.4 editorobj_group.hxx,1.2,1.3
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src alpha_button.cxx,1.1,1.2 button_panel.cxx,1.3,1.4 client.cxx,1.2,1.3 col_map.cxx,1.2,1.3 console.hxx,1.1,1.2 counter.cxx,1.2,1.3 credits.cxx,1.1,1.2 debug_gui.cxx,1.1,1.2 demo_player.hxx,1.1,1.2 demo_recorder.cxx,1.2,1.3 direction.cxx,1.1,1.2 display.cxx,1.2,1.3 world.cxx,1.5,1.6
- Index(es):