[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4006 - in trunk/pingus/src: actions components movers
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r4006 - in trunk/pingus/src: actions components movers |
Date: |
Wed, 4 Nov 2009 02:27:13 +0100 |
Author: grumbel
Date: 2009-11-04 02:27:10 +0100 (Wed, 04 Nov 2009)
New Revision: 4006
Modified:
trunk/pingus/src/actions/angel.cpp
trunk/pingus/src/actions/basher.cpp
trunk/pingus/src/actions/blocker.cpp
trunk/pingus/src/actions/boarder.cpp
trunk/pingus/src/actions/bomber.cpp
trunk/pingus/src/actions/bridger.cpp
trunk/pingus/src/actions/climber.cpp
trunk/pingus/src/actions/digger.cpp
trunk/pingus/src/actions/drown.cpp
trunk/pingus/src/actions/exiter.cpp
trunk/pingus/src/actions/faller.cpp
trunk/pingus/src/actions/floater.cpp
trunk/pingus/src/actions/jumper.cpp
trunk/pingus/src/actions/laser_kill.cpp
trunk/pingus/src/actions/miner.cpp
trunk/pingus/src/actions/rocket_launcher.cpp
trunk/pingus/src/actions/slider.cpp
trunk/pingus/src/actions/smashed.cpp
trunk/pingus/src/actions/splashed.cpp
trunk/pingus/src/actions/superman.cpp
trunk/pingus/src/actions/waiter.cpp
trunk/pingus/src/actions/walker.cpp
trunk/pingus/src/components/action_button.cpp
trunk/pingus/src/components/button_panel.cpp
trunk/pingus/src/components/button_panel.hpp
trunk/pingus/src/components/check_box.cpp
trunk/pingus/src/components/choice_box.cpp
trunk/pingus/src/components/label.cpp
trunk/pingus/src/components/menu_button.cpp
trunk/pingus/src/components/pingus_counter.cpp
trunk/pingus/src/components/playfield.cpp
trunk/pingus/src/components/slider_box.cpp
trunk/pingus/src/components/smallmap.cpp
trunk/pingus/src/components/time_display.cpp
trunk/pingus/src/movers/linear_mover.cpp
Log:
cleaned up some includes
Modified: trunk/pingus/src/actions/angel.cpp
===================================================================
--- trunk/pingus/src/actions/angel.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/angel.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -18,7 +18,7 @@
#include "../pingu.hpp"
#include "math/math.hpp"
#include "../globals.hpp"
-#include "angel.hpp"
+#include "actions/angel.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/basher.cpp
===================================================================
--- trunk/pingus/src/actions/basher.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/basher.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -23,7 +23,7 @@
#include "../pingu.hpp"
#include "../world.hpp"
#include "../worldobj.hpp"
-#include "basher.hpp"
+#include "actions/basher.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/blocker.cpp
===================================================================
--- trunk/pingus/src/actions/blocker.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/blocker.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -18,7 +18,7 @@
#include "../pingu.hpp"
#include "../pingu_holder.hpp"
#include "../world.hpp"
-#include "blocker.hpp"
+#include "actions/blocker.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/actions/boarder.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/boarder.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "../math/vector3f.hpp"
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "boarder.hpp"
+#include "actions/boarder.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/actions/bomber.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/bomber.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -24,7 +24,7 @@
#include "../particles/pingu_particle_holder.hpp"
#include "../colliders/pingu_collider.hpp"
#include "../movers/linear_mover.hpp"
-#include "bomber.hpp"
+#include "actions/bomber.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/actions/bridger.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/bridger.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -23,7 +23,7 @@
#include "../worldobj.hpp"
#include "../gettext.h"
#include "util/string_util.hpp"
-#include "bridger.hpp"
+#include "actions/bridger.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/climber.cpp
===================================================================
--- trunk/pingus/src/actions/climber.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/climber.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "../display/scene_context.hpp"
#include "../groundtype.hpp"
#include "../pingu.hpp"
-#include "climber.hpp"
+#include "actions/climber.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/digger.cpp
===================================================================
--- trunk/pingus/src/actions/digger.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/digger.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -21,7 +21,7 @@
#include "../worldobj.hpp"
#include "../sound/sound.hpp"
#include "../pingu.hpp"
-#include "digger.hpp"
+#include "actions/digger.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/drown.cpp
===================================================================
--- trunk/pingus/src/actions/drown.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/drown.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -17,7 +17,7 @@
#include "../math/vector3f.hpp"
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "drown.hpp"
+#include "actions/drown.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/actions/exiter.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/exiter.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -18,7 +18,7 @@
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
#include "../sound/sound.hpp"
-#include "exiter.hpp"
+#include "actions/exiter.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/faller.cpp
===================================================================
--- trunk/pingus/src/actions/faller.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/faller.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -23,7 +23,7 @@
#include "../pingu.hpp"
#include "../world.hpp"
#include "../worldobj.hpp"
-#include "faller.hpp"
+#include "actions/faller.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/floater.cpp
===================================================================
--- trunk/pingus/src/actions/floater.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/floater.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "../pingu.hpp"
#include "../display/scene_context.hpp"
#include "../groundtype.hpp"
-#include "floater.hpp"
+#include "actions/floater.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/actions/jumper.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/jumper.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -17,7 +17,7 @@
#include "../math/vector3f.hpp"
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "jumper.hpp"
+#include "actions/jumper.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/actions/laser_kill.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/laser_kill.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "../math/vector3f.hpp"
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "laser_kill.hpp"
+#include "actions/laser_kill.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/miner.cpp
===================================================================
--- trunk/pingus/src/actions/miner.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/miner.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -21,7 +21,7 @@
#include "../sound/sound.hpp"
#include "../pingu.hpp"
#include "../worldobj.hpp"
-#include "miner.hpp"
+#include "actions/miner.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/actions/rocket_launcher.cpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/actions/rocket_launcher.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -20,7 +20,7 @@
#include "../world.hpp"
#include "../pingu.hpp"
#include "../worldobj.hpp"
-#include "rocket_launcher.hpp"
+#include "actions/rocket_launcher.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/slider.cpp
===================================================================
--- trunk/pingus/src/actions/slider.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/slider.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -17,7 +17,7 @@
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
#include "../groundtype.hpp"
-#include "slider.hpp"
+#include "actions/slider.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/actions/smashed.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/smashed.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -18,7 +18,7 @@
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
#include "../sprite.hpp"
-#include "smashed.hpp"
+#include "actions/smashed.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/actions/splashed.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/splashed.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -19,7 +19,7 @@
#include "../world.hpp"
#include "../pingu.hpp"
#include "../worldobj.hpp"
-#include "splashed.hpp"
+#include "actions/splashed.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/superman.cpp
===================================================================
--- trunk/pingus/src/actions/superman.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/actions/superman.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
#include "../sprite.hpp"
-#include "superman.hpp"
+#include "actions/superman.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/actions/waiter.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/waiter.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -17,7 +17,7 @@
#include "../math/vector3f.hpp"
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "waiter.hpp"
+#include "actions/waiter.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/walker.cpp
===================================================================
--- trunk/pingus/src/actions/walker.cpp 2009-11-04 01:04:18 UTC (rev 4005)
+++ trunk/pingus/src/actions/walker.cpp 2009-11-04 01:27:10 UTC (rev 4006)
@@ -19,7 +19,7 @@
#include "../pingu.hpp"
#include "../debug.hpp"
#include "../groundtype.hpp"
-#include "walker.hpp"
+#include "actions/walker.hpp"
namespace Actions {
Modified: trunk/pingus/src/components/action_button.cpp
===================================================================
--- trunk/pingus/src/components/action_button.cpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/components/action_button.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../globals.hpp"
-#include "action_button.hpp"
+#include "components/action_button.hpp"
#include "../server.hpp"
#include "../game_session.hpp"
#include "../world.hpp"
Modified: trunk/pingus/src/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/components/button_panel.cpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/components/button_panel.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -24,7 +24,7 @@
#include "../server.hpp"
#include "../game_session.hpp"
#include "../display/drawing_context.hpp"
-#include "button_panel.hpp"
+#include "components/button_panel.hpp"
using namespace Actions;
Modified: trunk/pingus/src/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/components/button_panel.hpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/components/button_panel.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -20,7 +20,7 @@
#include <vector>
#include "../sprite.hpp"
#include "gui/rect_component.hpp"
-#include "action_button.hpp"
+#include "components/action_button.hpp"
class GameSession;
Modified: trunk/pingus/src/components/check_box.cpp
===================================================================
--- trunk/pingus/src/components/check_box.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/check_box.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "globals.hpp"
#include "fonts.hpp"
#include "display/drawing_context.hpp"
-#include "check_box.hpp"
+#include "components/check_box.hpp"
CheckBox::CheckBox(const Rect& rect)
: RectComponent(rect),
Modified: trunk/pingus/src/components/choice_box.cpp
===================================================================
--- trunk/pingus/src/components/choice_box.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/choice_box.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "globals.hpp"
#include "fonts.hpp"
#include "display/drawing_context.hpp"
-#include "choice_box.hpp"
+#include "components/choice_box.hpp"
ChoiceBox::ChoiceBox(const Rect& rect)
: RectComponent(rect)
Modified: trunk/pingus/src/components/label.cpp
===================================================================
--- trunk/pingus/src/components/label.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/label.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -17,7 +17,7 @@
#include "globals.hpp"
#include "fonts.hpp"
#include "display/drawing_context.hpp"
-#include "label.hpp"
+#include "components/label.hpp"
Label::Label(const std::string& label, const Rect& rect)
: RectComponent(rect),
Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/menu_button.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -22,7 +22,7 @@
#include "../gettext.h"
#include "../pingus_menu.hpp"
-#include "menu_button.hpp"
+#include "components/menu_button.hpp"
MenuButton::MenuButton(PingusMenu* menu_,
const Vector2i& pos_,
Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/components/pingus_counter.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -22,7 +22,7 @@
#include "../server.hpp"
#include "../globals.hpp"
#include "../fonts.hpp"
-#include "pingus_counter.hpp"
+#include "components/pingus_counter.hpp"
PingusCounter::PingusCounter(Server* s)
Modified: trunk/pingus/src/components/playfield.cpp
===================================================================
--- trunk/pingus/src/components/playfield.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/playfield.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -25,7 +25,7 @@
#include "../pingu.hpp"
#include "../display/display.hpp"
#include "../game_session.hpp"
-#include "playfield.hpp"
+#include "components/playfield.hpp"
Playfield::Playfield(Server* server_, GameSession* session_, const Rect& rect_)
: RectComponent(rect_),
Modified: trunk/pingus/src/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/components/slider_box.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/slider_box.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -18,7 +18,7 @@
#include "globals.hpp"
#include "fonts.hpp"
#include "display/drawing_context.hpp"
-#include "slider_box.hpp"
+#include "components/slider_box.hpp"
SliderBox::SliderBox(const Rect& rect)
: RectComponent(rect),
Modified: trunk/pingus/src/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/components/smallmap.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -26,8 +26,8 @@
#include "math/math.hpp"
#include "../math/vector3f.hpp"
#include "../globals.hpp"
-#include "playfield.hpp"
-#include "smallmap.hpp"
+#include "components/playfield.hpp"
+#include "components/smallmap.hpp"
SmallMap::SmallMap(Server* server_, Playfield* playfield_, const Rect& rect)
: RectComponent(rect),
Modified: trunk/pingus/src/components/time_display.cpp
===================================================================
--- trunk/pingus/src/components/time_display.cpp 2009-11-04 01:04:18 UTC
(rev 4005)
+++ trunk/pingus/src/components/time_display.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
@@ -27,7 +27,7 @@
#include "util/string_util.hpp"
#include "../fonts.hpp"
-#include "time_display.hpp"
+#include "components/time_display.hpp"
TimeDisplay::TimeDisplay (GameSession* c)
: server(c->get_server()),
Modified: trunk/pingus/src/movers/linear_mover.cpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.cpp 2009-11-04 01:04:18 UTC (rev
4005)
+++ trunk/pingus/src/movers/linear_mover.cpp 2009-11-04 01:27:10 UTC (rev
4006)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "linear_mover.hpp"
+#include "movers/linear_mover.hpp"
#include "../collider.hpp"
namespace Movers {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4006 - in trunk/pingus/src: actions components movers,
grumbel at BerliOS <=