[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.18, 1.19 angel.h
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx, 1.18, 1.19 angel.hxx, 1.15, 1.16 basher.cxx, 1.29, 1.30 basher.hxx, 1.17, 1.18 blocker.cxx, 1.20, 1.21 blocker.hxx, 1.15, 1.16 boarder.cxx, 1.15, 1.16 boarder.hxx, 1.14, 1.15 bomber.cxx, 1.34, 1.35 bomber.hxx, 1.20, 1.21 bridger.cxx, 1.30, 1.31 bridger.hxx, 1.18, 1.19 climber.cxx, 1.22, 1.23 climber.hxx, 1.15, 1.16 digger.cxx, 1.24, 1.25 digger.hxx, 1.15, 1.16 drown.cxx, 1.14, 1.15 drown.hxx, 1.13, 1.14 exiter.cxx, 1.18, 1.19 exiter.hxx, 1.14, 1.15 faller.cxx, 1.40, 1.41 faller.hxx, 1.20, 1.21 floater.cxx, 1.24, 1.25 floater.hxx, 1.15, 1.16 jumper.cxx, 1.20, 1.21 jumper.hxx, 1.13, 1.14 laser_kill.cxx, 1.15, 1.16 laser_kill.hxx, 1.14, 1.15 miner.cxx, 1.23, 1.24 miner.hxx, 1.14, 1.15 rocket_launcher.cxx, 1.15, 1.16 rocket_launcher.hxx, 1.13, 1.14 slider.cxx, 1.18, 1.19 slider.hxx, 1.13, 1.14 smashed.cxx, 1.14, 1.15 smashed.hxx, 1.15, 1.16 splashed.cxx, 1.15, 1.16 splashed.hxx, 1.15, 1.16 superman.cxx, 1.12, 1.13 superman.hxx, 1.14, 1.15 teleported.cxx, 1.13, 1.14 teleported.hxx, 1.14, 1.15 waiter.cxx, 1.16, 1.17 waiter.hxx, 1.14, 1.15 walker.cxx, 1.33, 1.34 walker.hxx, 1.14, 1.15 |
Date: |
Sun, 19 Oct 2003 01:17:30 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv4053/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:
- bunch of little fixes for CL0.7, some parts are compilable, but still a bit
more todo
Index: angel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/angel.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- angel.cxx 19 Apr 2003 10:23:18 -0000 1.18
+++ angel.cxx 18 Oct 2003 23:17:27 -0000 1.19
@@ -25,6 +25,7 @@
#include "../globals.hxx"
#include "angel.hxx"
+namespace Pingus {
namespace Actions {
Angel::Angel (Pingu* p)
@@ -56,5 +57,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: angel.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/angel.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- angel.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ angel.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,7 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
-
+namespace Pingus {
namespace Actions {
class Angel : public PinguAction
@@ -47,6 +47,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: basher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- basher.cxx 19 Apr 2003 10:23:18 -0000 1.29
+++ basher.cxx 18 Oct 2003 23:17:27 -0000 1.30
@@ -27,6 +27,7 @@
#include "../world.hxx"
#include "basher.hxx"
+namespace Pingus {
namespace Actions {
Basher::Basher (Pingu* p)
@@ -171,5 +172,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: basher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- basher.hxx 19 Apr 2003 10:23:18 -0000 1.17
+++ basher.hxx 18 Oct 2003 23:17:27 -0000 1.18
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Basher : public PinguAction
@@ -74,6 +75,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: blocker.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/blocker.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- blocker.cxx 16 Aug 2003 18:37:43 -0000 1.20
+++ blocker.cxx 18 Oct 2003 23:17:27 -0000 1.21
@@ -17,6 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <ClanLib/Core/Math/origin.h>
+
#include "../col_map.hxx"
#include "../gui/graphic_context.hxx"
#include "../pingu.hxx"
@@ -26,13 +28,14 @@
#include "../world.hxx"
#include "blocker.hxx"
+namespace Pingus {
namespace Actions {
Blocker::Blocker(Pingu* p)
: PinguAction(p),
- sprite(PingusResource::load_surface("Pingus/blocker" +
to_string(pingu->get_owner()), "pingus"), 6.0f)
+ sprite(PingusResource::load_sprite("Pingus/blocker" +
to_string(pingu->get_owner()), "pingus")) // 6.0f)
{
- sprite.set_align_center_bottom();
+ sprite.set_alignment(origin_bottom_center);
if ( rel_getpixel(0,-1) == Groundtype::GP_NOTHING
&& rel_getpixel(0, -2) == Groundtype::GP_GROUND)
@@ -61,7 +64,7 @@
for(PinguIter i = pingus->begin(); i != pingus->end(); ++i)
{
catch_pingu(*i);
- }
+ }
}
sprite.update();
}
@@ -105,5 +108,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: blocker.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/blocker.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- blocker.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ blocker.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -20,15 +20,16 @@
#ifndef HEADER_PINGUS_ACTIONS_BLOCKER_HXX
#define HEADER_PINGUS_ACTIONS_BLOCKER_HXX
-#include "../sprite.hxx"
+#include <ClanLib/Display/sprite.h>
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Blocker : public PinguAction
{
private:
- Sprite sprite;
+ CL_Sprite sprite;
public:
Blocker (Pingu* p);
@@ -49,6 +50,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: boarder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/boarder.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- boarder.cxx 19 Apr 2003 10:23:18 -0000 1.15
+++ boarder.cxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -24,6 +24,7 @@
#include "../string_converter.hxx"
#include "boarder.hxx"
+namespace Pingus {
namespace Actions {
Boarder::Boarder (Pingu* p)
@@ -92,5 +93,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: boarder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/boarder.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- boarder.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ boarder.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../pingu_action.hxx"
#include "../sprite.hxx"
+namespace Pingus {
namespace Actions {
/** The Boarder action causes a pingu to use a skateboard to move
@@ -50,6 +51,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: bomber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- bomber.cxx 19 Apr 2003 10:23:18 -0000 1.34
+++ bomber.cxx 18 Oct 2003 23:17:27 -0000 1.35
@@ -33,6 +33,7 @@
#include "../movers/linear_mover.hxx"
#include "bomber.hxx"
+namespace Pingus {
namespace Actions {
bool Bomber::static_surface_loaded = false;
@@ -141,5 +142,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: bomber.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.hxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- bomber.hxx 19 Apr 2003 10:23:18 -0000 1.20
+++ bomber.hxx 18 Oct 2003 23:17:27 -0000 1.21
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
/** An action with lets the Pingu explode. After the explosion the the
@@ -60,6 +61,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: bridger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bridger.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- bridger.cxx 19 Apr 2003 10:23:18 -0000 1.30
+++ bridger.cxx 18 Oct 2003 23:17:27 -0000 1.31
@@ -28,6 +28,7 @@
#include "../world.hxx"
#include "bridger.hxx"
+namespace Pingus {
namespace Actions {
// Initialise class static
@@ -268,5 +269,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: bridger.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bridger.hxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bridger.hxx 19 Apr 2003 10:23:18 -0000 1.18
+++ bridger.hxx 18 Oct 2003 23:17:27 -0000 1.19
@@ -25,6 +25,7 @@
#include "../pingu_action.hxx"
#include "../sprite.hxx"
+namespace Pingus {
namespace Actions {
class Bridger : public PinguAction
@@ -74,6 +75,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: climber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/climber.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- climber.cxx 19 Apr 2003 10:23:18 -0000 1.22
+++ climber.cxx 18 Oct 2003 23:17:27 -0000 1.23
@@ -22,6 +22,7 @@
#include "../pingu.hxx"
#include "climber.hxx"
+namespace Pingus {
namespace Actions {
Climber::Climber (Pingu* p)
@@ -110,5 +111,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: climber.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/climber.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- climber.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ climber.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Climber : public PinguAction
@@ -51,6 +52,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: digger.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/digger.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- digger.cxx 19 Apr 2003 10:23:18 -0000 1.24
+++ digger.cxx 18 Oct 2003 23:17:27 -0000 1.25
@@ -28,6 +28,7 @@
#include "../pingu.hxx"
#include "digger.hxx"
+namespace Pingus {
namespace Actions {
Digger::Digger (Pingu* p)
@@ -115,5 +116,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: digger.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/digger.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- digger.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ digger.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,6 +23,7 @@
#include "../pingu_action.hxx"
#include "../sprite.hxx"
+namespace Pingus {
namespace Actions {
class Digger : public PinguAction
@@ -62,6 +63,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: drown.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/drown.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- drown.cxx 19 Apr 2003 10:23:18 -0000 1.14
+++ drown.cxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -22,6 +22,7 @@
#include "../pingu.hxx"
#include "drown.hxx"
+namespace Pingus {
namespace Actions {
Drown::Drown (Pingu* p)
@@ -54,5 +55,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: drown.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/drown.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- drown.hxx 19 Apr 2003 10:23:18 -0000 1.13
+++ drown.hxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Drown : public PinguAction
@@ -46,6 +47,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: exiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- exiter.cxx 19 Apr 2003 10:23:18 -0000 1.18
+++ exiter.cxx 18 Oct 2003 23:17:27 -0000 1.19
@@ -23,6 +23,7 @@
#include "../sound/sound.hxx"
#include "exiter.hxx"
+namespace Pingus {
namespace Actions {
Exiter::Exiter (Pingu* p)
@@ -65,5 +66,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: exiter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/exiter.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- exiter.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ exiter.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Exiter : public PinguAction
@@ -45,6 +46,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: faller.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- faller.cxx 19 Apr 2003 10:23:18 -0000 1.40
+++ faller.cxx 18 Oct 2003 23:17:27 -0000 1.41
@@ -30,6 +30,7 @@
#include "../worldobj.hxx"
#include "faller.hxx"
+namespace Pingus {
namespace Actions {
Faller::Faller (Pingu* p)
@@ -168,5 +169,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: faller.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/faller.hxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- faller.hxx 19 Apr 2003 10:23:18 -0000 1.20
+++ faller.hxx 18 Oct 2003 23:17:27 -0000 1.21
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Faller : public PinguAction
@@ -51,6 +52,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: floater.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/floater.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- floater.cxx 19 Apr 2003 10:23:18 -0000 1.24
+++ floater.cxx 18 Oct 2003 23:17:27 -0000 1.25
@@ -22,6 +22,7 @@
#include "../groundtype.hxx"
#include "floater.hxx"
+namespace Pingus {
namespace Actions {
Floater::Floater(Pingu* p)
@@ -68,5 +69,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: floater.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/floater.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- floater.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ floater.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Floater : public PinguAction
@@ -51,6 +52,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: jumper.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/jumper.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- jumper.cxx 19 Apr 2003 10:23:18 -0000 1.20
+++ jumper.cxx 18 Oct 2003 23:17:27 -0000 1.21
@@ -23,6 +23,7 @@
#include "../string_converter.hxx"
#include "jumper.hxx"
+namespace Pingus {
namespace Actions {
Jumper::Jumper (Pingu* p)
@@ -54,5 +55,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: jumper.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/jumper.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jumper.hxx 19 Apr 2003 10:23:18 -0000 1.13
+++ jumper.hxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Jumper : public PinguAction
@@ -43,6 +44,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: laser_kill.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/laser_kill.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- laser_kill.cxx 19 Apr 2003 10:23:18 -0000 1.15
+++ laser_kill.cxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -22,6 +22,7 @@
#include "../pingu.hxx"
#include "laser_kill.hxx"
+namespace Pingus {
namespace Actions {
LaserKill::LaserKill(Pingu* p)
@@ -52,5 +53,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: laser_kill.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/laser_kill.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- laser_kill.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ laser_kill.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
/** This action is triggered by the LaserExit trap and causes the
@@ -49,6 +50,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: miner.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/miner.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- miner.cxx 17 Aug 2003 11:48:39 -0000 1.23
+++ miner.cxx 18 Oct 2003 23:17:27 -0000 1.24
@@ -26,12 +26,13 @@
#include "../pingu.hxx"
#include "miner.hxx"
+namespace Pingus {
namespace Actions {
Miner::Miner (Pingu* p)
: PinguAction(p),
- miner_radius(PingusResource::load_surface("Other/bash_radius", "pingus")),
- miner_radius_gfx(PingusResource::load_surface("Other/bash_radius_gfx",
"pingus")),
+ miner_radius(PingusResource::load_surface_provider("Other/bash_radius",
"pingus")),
+
miner_radius_gfx(PingusResource::load_surface_provider("Other/bash_radius_gfx",
"pingus")),
sprite(Sprite("Pingus/miner0", "pingus", 20.0f)),
slow_count(0)
{
@@ -56,10 +57,10 @@
{
if (!(slow_count % 3))
{
-
WorldObj::get_world()->get_colmap()->remove(miner_radius.get_provider(),
+ 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 + 1) );
-
WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx.get_provider(),
+ WorldObj::get_world()->get_gfx_map()->remove(miner_radius_gfx,
static_cast<int>(pingu->get_x() - (miner_radius_gfx_width / 2) +
pingu->direction),
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1) );
}
@@ -88,7 +89,7 @@
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),
-
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1) );
+
static_cast<int>(pingu->get_y() - miner_radius_gfx_width + 1));
pingu->set_action(Actions::Walker);
// Stop Pingu walking further into the solid.
@@ -103,5 +104,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: miner.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/miner.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- miner.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ miner.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -20,16 +20,18 @@
#ifndef HEADER_PINGUS_ACTIONS_MINER_HXX
#define HEADER_PINGUS_ACTIONS_MINER_HXX
+#include <ClanLib/display.h>
#include "../pingu_action.hxx"
#include "../sprite.hxx"
+namespace Pingus {
namespace Actions {
class Miner : public PinguAction
{
private:
- CL_Surface miner_radius;
- CL_Surface miner_radius_gfx;
+ CL_PixelBuffer miner_radius;
+ CL_PixelBuffer miner_radius_gfx;
Sprite sprite;
int slow_count;
@@ -54,6 +56,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: rocket_launcher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rocket_launcher.cxx 19 Apr 2003 10:23:18 -0000 1.15
+++ rocket_launcher.cxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -27,6 +27,7 @@
#include "../worldobj.hxx"
#include "rocket_launcher.hxx"
+namespace Pingus {
namespace Actions {
RocketLauncher::RocketLauncher (Pingu* p)
@@ -67,5 +68,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: rocket_launcher.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/rocket_launcher.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rocket_launcher.hxx 19 Apr 2003 10:23:18 -0000 1.13
+++ rocket_launcher.hxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class RocketLauncher : public PinguAction
@@ -45,6 +46,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: slider.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/slider.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- slider.cxx 19 Apr 2003 10:23:18 -0000 1.18
+++ slider.cxx 18 Oct 2003 23:17:27 -0000 1.19
@@ -23,6 +23,7 @@
#include "../pingu.hxx"
#include "slider.hxx"
+namespace Pingus {
namespace Actions {
Slider::Slider (Pingu* p)
@@ -77,5 +78,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: slider.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/slider.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- slider.hxx 19 Apr 2003 10:23:18 -0000 1.13
+++ slider.hxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Slider : public PinguAction
@@ -44,6 +45,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: smashed.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/smashed.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- smashed.cxx 19 Apr 2003 10:23:18 -0000 1.14
+++ smashed.cxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -22,6 +22,7 @@
#include "../pingu.hxx"
#include "smashed.hxx"
+namespace Pingus {
namespace Actions {
Smashed::Smashed (Pingu* p)
@@ -48,5 +49,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: smashed.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/smashed.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- smashed.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ smashed.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
/** FIXME: this action doesn't have a purpose, its pretty much equal
@@ -49,6 +50,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: splashed.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/splashed.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- splashed.cxx 19 Apr 2003 10:23:18 -0000 1.15
+++ splashed.cxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -24,6 +24,7 @@
#include "../worldobj.hxx"
#include "splashed.hxx"
+namespace Pingus {
namespace Actions {
Splashed::Splashed (Pingu* p)
@@ -59,5 +60,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: splashed.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/splashed.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- splashed.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ splashed.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Splashed : public PinguAction
@@ -48,6 +49,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: superman.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/superman.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- superman.cxx 19 Apr 2003 10:23:18 -0000 1.12
+++ superman.cxx 18 Oct 2003 23:17:27 -0000 1.13
@@ -23,6 +23,7 @@
#include "../string_converter.hxx"
#include "superman.hxx"
+namespace Pingus {
namespace Actions {
Superman::Superman (Pingu* p)
@@ -52,5 +53,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: superman.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/superman.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- superman.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ superman.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Superman : public PinguAction
@@ -46,6 +47,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: teleported.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/teleported.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- teleported.cxx 19 Apr 2003 10:23:18 -0000 1.13
+++ teleported.cxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -21,6 +21,7 @@
#include "../pingu.hxx"
#include "teleported.hxx"
+namespace Pingus {
namespace Actions {
Teleported::Teleported(Pingu* p)
@@ -47,5 +48,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: teleported.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/teleported.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- teleported.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ teleported.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -21,6 +21,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
class Teleported : public PinguAction
@@ -46,7 +47,8 @@
Teleported& operator= (const Teleported&);
};
-}
+} // namespace Actions
+} // namespace Pingus
#endif
Index: waiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/waiter.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- waiter.cxx 15 Aug 2003 17:37:36 -0000 1.16
+++ waiter.cxx 18 Oct 2003 23:17:27 -0000 1.17
@@ -23,6 +23,7 @@
#include "../pingus_resource.hxx"
#include "waiter.hxx"
+namespace Pingus {
namespace Actions {
Waiter::Waiter (Pingu* p)
@@ -51,5 +52,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: waiter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/waiter.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- waiter.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ waiter.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../sprite.hxx"
#include "../pingu_action.hxx"
+namespace Pingus {
namespace Actions {
/** A Waiting action for the bridger, it gets activated when the
@@ -48,6 +49,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
Index: walker.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- walker.cxx 19 Apr 2003 10:23:18 -0000 1.33
+++ walker.cxx 18 Oct 2003 23:17:27 -0000 1.34
@@ -25,6 +25,7 @@
#include "../debug.hxx"
#include "walker.hxx"
+namespace Pingus {
namespace Actions {
Walker::Walker (Pingu* p)
@@ -224,5 +225,6 @@
}
} // namespace Actions
+} // namespace Pingus
/* EOF */
Index: walker.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/walker.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- walker.hxx 19 Apr 2003 10:23:18 -0000 1.14
+++ walker.hxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -23,6 +23,7 @@
#include "../pingu_action.hxx"
#include "../sprite.hxx"
+namespace Pingus {
namespace Actions {
class Walker : public PinguAction
@@ -47,6 +48,7 @@
};
} // namespace Actions
+} // namespace Pingus
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx, 1.18, 1.19 angel.hxx, 1.15, 1.16 basher.cxx, 1.29, 1.30 basher.hxx, 1.17, 1.18 blocker.cxx, 1.20, 1.21 blocker.hxx, 1.15, 1.16 boarder.cxx, 1.15, 1.16 boarder.hxx, 1.14, 1.15 bomber.cxx, 1.34, 1.35 bomber.hxx, 1.20, 1.21 bridger.cxx, 1.30, 1.31 bridger.hxx, 1.18, 1.19 climber.cxx, 1.22, 1.23 climber.hxx, 1.15, 1.16 digger.cxx, 1.24, 1.25 digger.hxx, 1.15, 1.16 drown.cxx, 1.14, 1.15 drown.hxx, 1.13, 1.14 exiter.cxx, 1.18, 1.19 exiter.hxx, 1.14, 1.15 faller.cxx, 1.40, 1.41 faller.hxx, 1.20, 1.21 floater.cxx, 1.24, 1.25 floater.hxx, 1.15, 1.16 jumper.cxx, 1.20, 1.21 jumper.hxx, 1.13, 1.14 laser_kill.cxx, 1.15, 1.16 laser_kill.hxx, 1.14, 1.15 miner.cxx, 1.23, 1.24 miner.hxx, 1.14, 1.15 rocket_launcher.cxx, 1.15, 1.16 rocket_launcher.hxx, 1.13, 1.14 slider.cxx, 1.18, 1.19 slider.hxx, 1.13, 1.14 smashed.cxx, 1.14, 1.15 smashed.hxx, 1.15, 1.16 splashed.cxx, 1.15, 1.16 splashed.hxx, 1.15, 1.16 superman.cxx, 1.12, 1.13 superman.hxx, 1.14, 1.15 teleported.cxx, 1.13, 1.14 teleported.hxx, 1.14, 1.15 waiter.cxx, 1.16, 1.17 waiter.hxx, 1.14, 1.15 walker.cxx, 1.33, 1.34 walker.hxx, 1.14, 1.15,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/gui buffer_graphic_context.cxx, 1.2, 1.3 buffer_graphic_context.hxx, 1.3, 1.4 button.hxx, 1.5, 1.6 component.hxx, 1.14, 1.15 cursor.cxx, 1.3, 1.4 cursor.hxx, 1.2, 1.3 display.cxx, 1.4, 1.5 display.hxx, 1.4, 1.5 display_graphic_context.cxx, 1.7, 1.8 display_graphic_context.hxx, 1.5, 1.6 game_delta.hxx, 1.2, 1.3 graphic_context.cxx, 1.1, 1.2 graphic_context.hxx, 1.5, 1.6 gui_manager.cxx, 1.21, 1.22 gui_screen.hxx, 1.2, 1.3 root_gui_manager.hxx, 1.6, 1.7 screen_manager.cxx, 1.10, 1.11 screen_manager.hxx, 1.6, 1.7 screen_ptr.cxx, 1.3, 1.4 screen_ptr.hxx, 1.2, 1.3 surface_button.cxx, 1.8, 1.9 surface_button.hxx, 1.8, 1.9
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.hxx, 1.5, 1.6 rain_particle_holder.hxx, 1.5, 1.6 smoke_particle_holder.hxx, 1.3, 1.4 snow_particle_holder.hxx, 1.4, 1.5
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/gui buffer_graphic_context.cxx, 1.2, 1.3 buffer_graphic_context.hxx, 1.3, 1.4 button.hxx, 1.5, 1.6 component.hxx, 1.14, 1.15 cursor.cxx, 1.3, 1.4 cursor.hxx, 1.2, 1.3 display.cxx, 1.4, 1.5 display.hxx, 1.4, 1.5 display_graphic_context.cxx, 1.7, 1.8 display_graphic_context.hxx, 1.5, 1.6 game_delta.hxx, 1.2, 1.3 graphic_context.cxx, 1.1, 1.2 graphic_context.hxx, 1.5, 1.6 gui_manager.cxx, 1.21, 1.22 gui_screen.hxx, 1.2, 1.3 root_gui_manager.hxx, 1.6, 1.7 screen_manager.cxx, 1.10, 1.11 screen_manager.hxx, 1.6, 1.7 screen_ptr.cxx, 1.3, 1.4 screen_ptr.hxx, 1.2, 1.3 surface_button.cxx, 1.8, 1.9 surface_button.hxx, 1.8, 1.9
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.hxx, 1.5, 1.6 rain_particle_holder.hxx, 1.5, 1.6 smoke_particle_holder.hxx, 1.3, 1.4 snow_particle_holder.hxx, 1.4, 1.5
- Index(es):