[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4008 - in trunk/pingus/src: actions colliders components d
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4008 - in trunk/pingus/src: actions colliders components display editor gui input input_old movers particles screen sound worldmap worldobjs |
|
Date: |
Wed, 4 Nov 2009 02:42:25 +0100 |
Author: grumbel
Date: 2009-11-04 02:42:17 +0100 (Wed, 04 Nov 2009)
New Revision: 4008
Modified:
trunk/pingus/src/actions/angel.cpp
trunk/pingus/src/actions/angel.hpp
trunk/pingus/src/actions/basher.cpp
trunk/pingus/src/actions/basher.hpp
trunk/pingus/src/actions/blocker.cpp
trunk/pingus/src/actions/blocker.hpp
trunk/pingus/src/actions/boarder.cpp
trunk/pingus/src/actions/boarder.hpp
trunk/pingus/src/actions/bomber.cpp
trunk/pingus/src/actions/bomber.hpp
trunk/pingus/src/actions/bridger.cpp
trunk/pingus/src/actions/bridger.hpp
trunk/pingus/src/actions/climber.cpp
trunk/pingus/src/actions/climber.hpp
trunk/pingus/src/actions/digger.cpp
trunk/pingus/src/actions/digger.hpp
trunk/pingus/src/actions/drown.cpp
trunk/pingus/src/actions/drown.hpp
trunk/pingus/src/actions/exiter.cpp
trunk/pingus/src/actions/exiter.hpp
trunk/pingus/src/actions/faller.cpp
trunk/pingus/src/actions/faller.hpp
trunk/pingus/src/actions/floater.cpp
trunk/pingus/src/actions/floater.hpp
trunk/pingus/src/actions/jumper.cpp
trunk/pingus/src/actions/jumper.hpp
trunk/pingus/src/actions/laser_kill.cpp
trunk/pingus/src/actions/laser_kill.hpp
trunk/pingus/src/actions/miner.cpp
trunk/pingus/src/actions/miner.hpp
trunk/pingus/src/actions/rocket_launcher.cpp
trunk/pingus/src/actions/rocket_launcher.hpp
trunk/pingus/src/actions/slider.cpp
trunk/pingus/src/actions/slider.hpp
trunk/pingus/src/actions/smashed.cpp
trunk/pingus/src/actions/smashed.hpp
trunk/pingus/src/actions/splashed.cpp
trunk/pingus/src/actions/splashed.hpp
trunk/pingus/src/actions/superman.cpp
trunk/pingus/src/actions/superman.hpp
trunk/pingus/src/actions/waiter.cpp
trunk/pingus/src/actions/waiter.hpp
trunk/pingus/src/actions/walker.cpp
trunk/pingus/src/actions/walker.hpp
trunk/pingus/src/colliders/pingu_collider.cpp
trunk/pingus/src/colliders/pingu_collider.hpp
trunk/pingus/src/components/action_button.cpp
trunk/pingus/src/components/action_button.hpp
trunk/pingus/src/components/button_panel.cpp
trunk/pingus/src/components/button_panel.hpp
trunk/pingus/src/components/menu_button.cpp
trunk/pingus/src/components/menu_button.hpp
trunk/pingus/src/components/pingus_counter.cpp
trunk/pingus/src/components/pingus_counter.hpp
trunk/pingus/src/components/playfield.cpp
trunk/pingus/src/components/playfield.hpp
trunk/pingus/src/components/smallmap.cpp
trunk/pingus/src/components/smallmap.hpp
trunk/pingus/src/components/time_display.cpp
trunk/pingus/src/components/time_display.hpp
trunk/pingus/src/display/delta_framebuffer.hpp
trunk/pingus/src/display/display.cpp
trunk/pingus/src/display/display.hpp
trunk/pingus/src/display/drawing_context.cpp
trunk/pingus/src/display/drawing_context.hpp
trunk/pingus/src/display/rect_merger.cpp
trunk/pingus/src/display/rect_merger.hpp
trunk/pingus/src/display/sdl_framebuffer.cpp
trunk/pingus/src/editor/editor_level.cpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/editor/level_objs.cpp
trunk/pingus/src/editor/level_objs.hpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/editor/viewport.hpp
trunk/pingus/src/gui/button.hpp
trunk/pingus/src/gui/component.hpp
trunk/pingus/src/gui/gui_manager.cpp
trunk/pingus/src/gui/gui_manager.hpp
trunk/pingus/src/gui/surface_button.cpp
trunk/pingus/src/gui/surface_button.hpp
trunk/pingus/src/input/core_driver.cpp
trunk/pingus/src/input/event.hpp
trunk/pingus/src/input/usbmouse_driver.cpp
trunk/pingus/src/input_old/axis.hpp
trunk/pingus/src/input_old/axis_factory.cpp
trunk/pingus/src/input_old/axis_factory.hpp
trunk/pingus/src/input_old/button.hpp
trunk/pingus/src/input_old/button_factory.cpp
trunk/pingus/src/input_old/button_factory.hpp
trunk/pingus/src/input_old/controller.cpp
trunk/pingus/src/input_old/controller.hpp
trunk/pingus/src/input_old/event.hpp
trunk/pingus/src/input_old/pointer.hpp
trunk/pingus/src/input_old/pointer_factory.cpp
trunk/pingus/src/input_old/pointer_factory.hpp
trunk/pingus/src/input_old/scroller.hpp
trunk/pingus/src/input_old/scroller_factory.cpp
trunk/pingus/src/input_old/scroller_factory.hpp
trunk/pingus/src/movers/linear_mover.cpp
trunk/pingus/src/movers/linear_mover.hpp
trunk/pingus/src/particles/explosive_particle.cpp
trunk/pingus/src/particles/explosive_particle.hpp
trunk/pingus/src/particles/pingu_particle_holder.cpp
trunk/pingus/src/particles/pingu_particle_holder.hpp
trunk/pingus/src/particles/rain_particle_holder.cpp
trunk/pingus/src/particles/rain_particle_holder.hpp
trunk/pingus/src/particles/smoke_particle_holder.cpp
trunk/pingus/src/particles/smoke_particle_holder.hpp
trunk/pingus/src/particles/snow_particle_holder.cpp
trunk/pingus/src/particles/snow_particle_holder.hpp
trunk/pingus/src/screen/gui_screen.cpp
trunk/pingus/src/screen/screen.hpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/screen/screen_manager.hpp
trunk/pingus/src/sound/sound.cpp
trunk/pingus/src/sound/sound_dummy.cpp
trunk/pingus/src/sound/sound_impl.hpp
trunk/pingus/src/sound/sound_real.cpp
trunk/pingus/src/sound/sound_res_mgr.cpp
trunk/pingus/src/worldmap/dot.hpp
trunk/pingus/src/worldmap/dot_factory.cpp
trunk/pingus/src/worldmap/drawable.hpp
trunk/pingus/src/worldmap/level_dot.cpp
trunk/pingus/src/worldmap/level_dot.hpp
trunk/pingus/src/worldmap/path.hpp
trunk/pingus/src/worldmap/path_drawable.cpp
trunk/pingus/src/worldmap/path_graph.cpp
trunk/pingus/src/worldmap/path_graph.hpp
trunk/pingus/src/worldmap/pingus.hpp
trunk/pingus/src/worldmap/pingus_worldmap.cpp
trunk/pingus/src/worldmap/sprite_drawable.cpp
trunk/pingus/src/worldmap/sprite_drawable.hpp
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap.hpp
trunk/pingus/src/worldmap/worldmap_component.cpp
trunk/pingus/src/worldmap/worldmap_component.hpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
trunk/pingus/src/worldmap/worldmap_screen.hpp
trunk/pingus/src/worldmap/worldmap_story.cpp
trunk/pingus/src/worldmap/worldmap_story.hpp
trunk/pingus/src/worldobjs/conveyor_belt.cpp
trunk/pingus/src/worldobjs/conveyor_belt.hpp
trunk/pingus/src/worldobjs/entrance.cpp
trunk/pingus/src/worldobjs/entrance.hpp
trunk/pingus/src/worldobjs/exit.cpp
trunk/pingus/src/worldobjs/exit.hpp
trunk/pingus/src/worldobjs/fake_exit.cpp
trunk/pingus/src/worldobjs/fake_exit.hpp
trunk/pingus/src/worldobjs/groundpiece.cpp
trunk/pingus/src/worldobjs/groundpiece.hpp
trunk/pingus/src/worldobjs/guillotine.cpp
trunk/pingus/src/worldobjs/guillotine.hpp
trunk/pingus/src/worldobjs/hammer.cpp
trunk/pingus/src/worldobjs/hammer.hpp
trunk/pingus/src/worldobjs/hotspot.cpp
trunk/pingus/src/worldobjs/hotspot.hpp
trunk/pingus/src/worldobjs/ice_block.cpp
trunk/pingus/src/worldobjs/ice_block.hpp
trunk/pingus/src/worldobjs/laser_exit.cpp
trunk/pingus/src/worldobjs/laser_exit.hpp
trunk/pingus/src/worldobjs/liquid.cpp
trunk/pingus/src/worldobjs/liquid.hpp
trunk/pingus/src/worldobjs/rain_generator.cpp
trunk/pingus/src/worldobjs/rain_generator.hpp
trunk/pingus/src/worldobjs/smasher.cpp
trunk/pingus/src/worldobjs/smasher.hpp
trunk/pingus/src/worldobjs/snow_generator.cpp
trunk/pingus/src/worldobjs/snow_generator.hpp
trunk/pingus/src/worldobjs/solid_color_background.cpp
trunk/pingus/src/worldobjs/solid_color_background.hpp
trunk/pingus/src/worldobjs/spike.cpp
trunk/pingus/src/worldobjs/spike.hpp
trunk/pingus/src/worldobjs/starfield_background.hpp
trunk/pingus/src/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/worldobjs/starfield_background_stars.hpp
trunk/pingus/src/worldobjs/surface_background.cpp
trunk/pingus/src/worldobjs/surface_background.hpp
trunk/pingus/src/worldobjs/switch_door.cpp
trunk/pingus/src/worldobjs/switch_door.hpp
trunk/pingus/src/worldobjs/teleporter.cpp
trunk/pingus/src/worldobjs/teleporter.hpp
trunk/pingus/src/worldobjs/teleporter_target.cpp
trunk/pingus/src/worldobjs/teleporter_target.hpp
trunk/pingus/src/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/worldobjs/thunderstorm_background.hpp
trunk/pingus/src/worldobjs/woodthing.cpp
Log:
Cleaned up some include paths
Modified: trunk/pingus/src/actions/angel.cpp
===================================================================
--- trunk/pingus/src/actions/angel.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/angel.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,10 +14,10 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "math/math.hpp"
-#include "../globals.hpp"
+#include "globals.hpp"
#include "actions/angel.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/angel.hpp
===================================================================
--- trunk/pingus/src/actions/angel.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/angel.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_ANGEL_HPP
#define HEADER_PINGUS_ACTIONS_ANGEL_HPP
-#include "../pingu_action.hpp"
-#include "../sprite.hpp"
+#include "pingu_action.hpp"
+#include "sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/basher.cpp
===================================================================
--- trunk/pingus/src/actions/basher.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/basher.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,15 +14,15 @@
// 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 "../sound/sound.hpp"
-#include "../collision_map.hpp"
-#include "../debug.hpp"
-#include "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../ground_map.hpp"
-#include "../pingu.hpp"
-#include "../world.hpp"
-#include "../worldobj.hpp"
+#include "sound/sound.hpp"
+#include "collision_map.hpp"
+#include "debug.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "ground_map.hpp"
+#include "pingu.hpp"
+#include "world.hpp"
+#include "worldobj.hpp"
#include "actions/basher.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/basher.hpp
===================================================================
--- trunk/pingus/src/actions/basher.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/basher.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_BASHER_HPP
#define HEADER_PINGUS_ACTIONS_BASHER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/blocker.cpp
===================================================================
--- trunk/pingus/src/actions/blocker.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/blocker.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,10 +14,10 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
#include "actions/blocker.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/blocker.hpp
===================================================================
--- trunk/pingus/src/actions/blocker.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/blocker.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_BLOCKER_HPP
#define HEADER_PINGUS_ACTIONS_BLOCKER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/actions/boarder.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/boarder.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "actions/boarder.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/boarder.hpp
===================================================================
--- trunk/pingus/src/actions/boarder.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/boarder.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_BOARDER_HPP
#define HEADER_PINGUS_ACTIONS_BOARDER_HPP
-#include "../pingu_action.hpp"
-#include "../state_sprite.hpp"
+#include "pingu_action.hpp"
+#include "state_sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/actions/bomber.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/bomber.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,16 +14,16 @@
// 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 "../debug.hpp"
-#include "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_enums.hpp"
-#include "../ground_map.hpp"
-#include "../world.hpp"
-#include "../particles/pingu_particle_holder.hpp"
-#include "../colliders/pingu_collider.hpp"
-#include "../movers/linear_mover.hpp"
+#include "debug.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_enums.hpp"
+#include "ground_map.hpp"
+#include "world.hpp"
+#include "particles/pingu_particle_holder.hpp"
+#include "colliders/pingu_collider.hpp"
+#include "movers/linear_mover.hpp"
#include "actions/bomber.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/bomber.hpp
===================================================================
--- trunk/pingus/src/actions/bomber.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/bomber.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_BOMBER_HPP
#define HEADER_PINGUS_ACTIONS_BOMBER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/actions/bridger.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/bridger.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,13 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <cassert>
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../ground_map.hpp"
-#include "../sound/sound.hpp"
-#include "../world.hpp"
-#include "../worldobj.hpp"
-#include "../gettext.h"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "ground_map.hpp"
+#include "sound/sound.hpp"
+#include "world.hpp"
+#include "worldobj.hpp"
+#include "gettext.h"
#include "util/string_util.hpp"
#include "actions/bridger.hpp"
Modified: trunk/pingus/src/actions/bridger.hpp
===================================================================
--- trunk/pingus/src/actions/bridger.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/bridger.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_ACTIONS_BRIDGER_HPP
#define HEADER_PINGUS_ACTIONS_BRIDGER_HPP
-#include "../math/vector3f.hpp"
-#include "../pingu_action.hpp"
-#include "../state_sprite.hpp"
+#include "math/vector3f.hpp"
+#include "pingu_action.hpp"
+#include "state_sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/climber.cpp
===================================================================
--- trunk/pingus/src/actions/climber.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/climber.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../display/scene_context.hpp"
-#include "../groundtype.hpp"
-#include "../pingu.hpp"
+#include "display/scene_context.hpp"
+#include "groundtype.hpp"
+#include "pingu.hpp"
#include "actions/climber.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/climber.hpp
===================================================================
--- trunk/pingus/src/actions/climber.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/climber.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_CLIMBER_HPP
#define HEADER_PINGUS_ACTIONS_CLIMBER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/digger.cpp
===================================================================
--- trunk/pingus/src/actions/digger.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/digger.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -15,12 +15,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <cstdio>
-#include "../display/scene_context.hpp"
-#include "../ground_map.hpp"
-#include "../world.hpp"
-#include "../worldobj.hpp"
-#include "../sound/sound.hpp"
-#include "../pingu.hpp"
+#include "display/scene_context.hpp"
+#include "ground_map.hpp"
+#include "world.hpp"
+#include "worldobj.hpp"
+#include "sound/sound.hpp"
+#include "pingu.hpp"
#include "actions/digger.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/digger.hpp
===================================================================
--- trunk/pingus/src/actions/digger.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/digger.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ACTIONS_DIGGER_HPP
#define HEADER_PINGUS_ACTIONS_DIGGER_HPP
-#include "../pingu_action.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/drown.cpp
===================================================================
--- trunk/pingus/src/actions/drown.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/drown.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "actions/drown.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/drown.hpp
===================================================================
--- trunk/pingus/src/actions/drown.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/drown.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_DROWN_HPP
#define HEADER_PINGUS_ACTIONS_DROWN_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/actions/exiter.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/exiter.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,10 +14,10 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../sound/sound.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "sound/sound.hpp"
#include "actions/exiter.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/exiter.hpp
===================================================================
--- trunk/pingus/src/actions/exiter.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/exiter.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_EXITER_HPP
#define HEADER_PINGUS_ACTIONS_EXITER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/faller.cpp
===================================================================
--- trunk/pingus/src/actions/faller.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/faller.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -15,14 +15,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "math/math.hpp"
-#include "../colliders/pingu_collider.hpp"
-#include "../debug.hpp"
-#include "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../movers/linear_mover.hpp"
-#include "../pingu.hpp"
-#include "../world.hpp"
-#include "../worldobj.hpp"
+#include "colliders/pingu_collider.hpp"
+#include "debug.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "movers/linear_mover.hpp"
+#include "pingu.hpp"
+#include "world.hpp"
+#include "worldobj.hpp"
#include "actions/faller.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/faller.hpp
===================================================================
--- trunk/pingus/src/actions/faller.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/faller.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_FALLER_HPP
#define HEADER_PINGUS_ACTIONS_FALLER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/floater.cpp
===================================================================
--- trunk/pingus/src/actions/floater.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/floater.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../pingu.hpp"
-#include "../display/scene_context.hpp"
-#include "../groundtype.hpp"
+#include "pingu.hpp"
+#include "display/scene_context.hpp"
+#include "groundtype.hpp"
#include "actions/floater.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/floater.hpp
===================================================================
--- trunk/pingus/src/actions/floater.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/floater.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_FLOATER_HPP
#define HEADER_PINGUS_ACTIONS_FLOATER_HPP
-#include "../pingu_action.hpp"
-#include "../sprite.hpp"
+#include "pingu_action.hpp"
+#include "sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/actions/jumper.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/jumper.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "actions/jumper.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/jumper.hpp
===================================================================
--- trunk/pingus/src/actions/jumper.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/jumper.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_JUMPER_HPP
#define HEADER_PINGUS_ACTIONS_JUMPER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/actions/laser_kill.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/laser_kill.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "actions/laser_kill.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/laser_kill.hpp
===================================================================
--- trunk/pingus/src/actions/laser_kill.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/laser_kill.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_LASER_KILL_HPP
#define HEADER_PINGUS_ACTIONS_LASER_KILL_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/miner.cpp
===================================================================
--- trunk/pingus/src/actions/miner.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/miner.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -15,12 +15,12 @@
// 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 "../ground_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../sound/sound.hpp"
-#include "../pingu.hpp"
-#include "../worldobj.hpp"
+#include "ground_map.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "sound/sound.hpp"
+#include "pingu.hpp"
+#include "worldobj.hpp"
#include "actions/miner.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/miner.hpp
===================================================================
--- trunk/pingus/src/actions/miner.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/miner.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_MINER_HPP
#define HEADER_PINGUS_ACTIONS_MINER_HPP
-#include "../pingu_action.hpp"
-#include "../state_sprite.hpp"
+#include "pingu_action.hpp"
+#include "state_sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/actions/rocket_launcher.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/actions/rocket_launcher.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,12 +14,12 @@
// 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 "../display/scene_context.hpp"
-//#include "../particles/particle_holder.hpp"
-//#include "../particles/explosive_particle.hpp"
-#include "../world.hpp"
-#include "../pingu.hpp"
-#include "../worldobj.hpp"
+#include "display/scene_context.hpp"
+//#include "particles/particle_holder.hpp"
+//#include "particles/explosive_particle.hpp"
+#include "world.hpp"
+#include "pingu.hpp"
+#include "worldobj.hpp"
#include "actions/rocket_launcher.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/rocket_launcher.hpp
===================================================================
--- trunk/pingus/src/actions/rocket_launcher.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/actions/rocket_launcher.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
#define HEADER_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/slider.cpp
===================================================================
--- trunk/pingus/src/actions/slider.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/slider.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../groundtype.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "groundtype.hpp"
#include "actions/slider.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/slider.hpp
===================================================================
--- trunk/pingus/src/actions/slider.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/slider.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_SLIDER_HPP
#define HEADER_PINGUS_ACTIONS_SLIDER_HPP
-#include "../state_sprite.hpp"
-#include "../pingu_action.hpp"
+#include "state_sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/actions/smashed.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/smashed.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,10 +14,10 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../sprite.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "sprite.hpp"
#include "actions/smashed.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/smashed.hpp
===================================================================
--- trunk/pingus/src/actions/smashed.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/smashed.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ACTIONS_SMASHED_HPP
#define HEADER_PINGUS_ACTIONS_SMASHED_HPP
-#include "../pingu_action.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/actions/splashed.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/splashed.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,11 +14,11 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../pingu.hpp"
-#include "../worldobj.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "pingu.hpp"
+#include "worldobj.hpp"
#include "actions/splashed.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/splashed.hpp
===================================================================
--- trunk/pingus/src/actions/splashed.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/splashed.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ACTIONS_SPLASHED_HPP
#define HEADER_PINGUS_ACTIONS_SPLASHED_HPP
-#include "../pingu_action.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/superman.cpp
===================================================================
--- trunk/pingus/src/actions/superman.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/superman.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../sprite.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "sprite.hpp"
#include "actions/superman.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/superman.hpp
===================================================================
--- trunk/pingus/src/actions/superman.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/actions/superman.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
#define HEADER_PINGUS_ACTIONS_SUPERMAN_HPP
-#include "../sprite.hpp"
-#include "../pingu_action.hpp"
+#include "sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/actions/waiter.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/waiter.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../math/vector3f.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
+#include "math/vector3f.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
#include "actions/waiter.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/waiter.hpp
===================================================================
--- trunk/pingus/src/actions/waiter.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/waiter.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_WAITER_HPP
#define HEADER_PINGUS_ACTIONS_WAITER_HPP
-#include "../sprite.hpp"
-#include "../pingu_action.hpp"
+#include "sprite.hpp"
+#include "pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/walker.cpp
===================================================================
--- trunk/pingus/src/actions/walker.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/walker.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -14,11 +14,11 @@
// 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 "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../debug.hpp"
-#include "../groundtype.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "debug.hpp"
+#include "groundtype.hpp"
#include "actions/walker.hpp"
namespace Actions {
Modified: trunk/pingus/src/actions/walker.hpp
===================================================================
--- trunk/pingus/src/actions/walker.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/actions/walker.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ACTIONS_WALKER_HPP
#define HEADER_PINGUS_ACTIONS_WALKER_HPP
-#include "../pingu_action.hpp"
-#include "../state_sprite.hpp"
+#include "pingu_action.hpp"
+#include "state_sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/colliders/pingu_collider.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,9 +14,9 @@
// 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 "../pingu_action.hpp"
-#include "../groundtype.hpp"
-#include "../math/vector3f.hpp"
+#include "pingu_action.hpp"
+#include "groundtype.hpp"
+#include "math/vector3f.hpp"
#include "colliders/pingu_collider.hpp"
namespace Colliders {
Modified: trunk/pingus/src/colliders/pingu_collider.hpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/colliders/pingu_collider.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_UPRIGHT_PINGU_COLLIDER_HPP
#define HEADER_PINGUS_UPRIGHT_PINGU_COLLIDER_HPP
-#include "../collider.hpp"
+#include "collider.hpp"
namespace Colliders {
Modified: trunk/pingus/src/components/action_button.cpp
===================================================================
--- trunk/pingus/src/components/action_button.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/action_button.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,15 +14,15 @@
// 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 "../globals.hpp"
+#include "globals.hpp"
#include "components/action_button.hpp"
-#include "../server.hpp"
-#include "../game_session.hpp"
-#include "../world.hpp"
-#include "../display/drawing_context.hpp"
-#include "../fonts.hpp"
+#include "server.hpp"
+#include "game_session.hpp"
+#include "world.hpp"
+#include "display/drawing_context.hpp"
+#include "fonts.hpp"
#include "util/string_util.hpp"
-#include "../math/vector3f.hpp"
+#include "math/vector3f.hpp"
using namespace Actions;
Modified: trunk/pingus/src/components/action_button.hpp
===================================================================
--- trunk/pingus/src/components/action_button.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/action_button.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,11 +18,11 @@
#define HEADER_PINGUS_ACTION_BUTTON_HPP
#include <string>
-#include "../font.hpp"
-#include "../pingu_enums.hpp"
-#include "../state_sprite.hpp"
-#include "../gui/component.hpp"
-#include "../gui/rect_component.hpp"
+#include "font.hpp"
+#include "pingu_enums.hpp"
+#include "state_sprite.hpp"
+#include "gui/component.hpp"
+#include "gui/rect_component.hpp"
class Server;
class GameSession;
Modified: trunk/pingus/src/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/components/button_panel.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/button_panel.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,12 +18,12 @@
#include <algorithm>
#include "math/math.hpp"
-#include "../fonts.hpp"
+#include "fonts.hpp"
#include "util/string_util.hpp"
-#include "../globals.hpp"
-#include "../server.hpp"
-#include "../game_session.hpp"
-#include "../display/drawing_context.hpp"
+#include "globals.hpp"
+#include "server.hpp"
+#include "game_session.hpp"
+#include "display/drawing_context.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:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/button_panel.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_BUTTON_PANEL_HPP
#include <vector>
-#include "../sprite.hpp"
+#include "sprite.hpp"
#include "gui/rect_component.hpp"
#include "components/action_button.hpp"
Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/menu_button.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,13 +14,13 @@
// 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 "../globals.hpp"
-#include "../debug.hpp"
-#include "../fonts.hpp"
-#include "../sound/sound.hpp"
-#include "../resource.hpp"
-#include "../gettext.h"
-#include "../pingus_menu.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
+#include "fonts.hpp"
+#include "sound/sound.hpp"
+#include "resource.hpp"
+#include "gettext.h"
+#include "pingus_menu.hpp"
#include "components/menu_button.hpp"
Modified: trunk/pingus/src/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/components/menu_button.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/menu_button.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -21,7 +21,7 @@
#include "sprite.hpp"
#include "font.hpp"
#include "math/vector2i.hpp"
-#include "../gui/component.hpp"
+#include "gui/component.hpp"
class PingusMenu;
Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/pingus_counter.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,13 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdio.h>
-#include "../gettext.h"
-#include "../resource.hpp"
-#include "../world.hpp"
-#include "../pingu_holder.hpp"
-#include "../server.hpp"
-#include "../globals.hpp"
-#include "../fonts.hpp"
+#include "gettext.h"
+#include "resource.hpp"
+#include "world.hpp"
+#include "pingu_holder.hpp"
+#include "server.hpp"
+#include "globals.hpp"
+#include "fonts.hpp"
#include "components/pingus_counter.hpp"
Modified: trunk/pingus/src/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/pingus_counter.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_COUNTER_HPP
#define HEADER_PINGUS_PINGUS_COUNTER_HPP
-#include "../gui/component.hpp"
-#include "../font.hpp"
-#include "../sprite.hpp"
+#include "gui/component.hpp"
+#include "font.hpp"
+#include "sprite.hpp"
class DrawingContext;
class World;
Modified: trunk/pingus/src/components/playfield.cpp
===================================================================
--- trunk/pingus/src/components/playfield.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/playfield.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -16,15 +16,15 @@
#include <stdio.h>
#include <iostream>
-#include "../globals.hpp"
-#include "../pingu_holder.hpp"
-#include "../display/drawing_context.hpp"
-#include "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../server.hpp"
-#include "../pingu.hpp"
-#include "../display/display.hpp"
-#include "../game_session.hpp"
+#include "globals.hpp"
+#include "pingu_holder.hpp"
+#include "display/drawing_context.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "server.hpp"
+#include "pingu.hpp"
+#include "display/display.hpp"
+#include "game_session.hpp"
#include "components/playfield.hpp"
Playfield::Playfield(Server* server_, GameSession* session_, const Rect& rect_)
Modified: trunk/pingus/src/components/playfield.hpp
===================================================================
--- trunk/pingus/src/components/playfield.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/playfield.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_PLAYFIELD_HPP
#include <memory>
-#include "../graphic_context_state.hpp"
-#include "../gui/rect_component.hpp"
-#include "../capture_rectangle.hpp"
+#include "graphic_context_state.hpp"
+#include "gui/rect_component.hpp"
+#include "capture_rectangle.hpp"
class Pingu;
class World;
Modified: trunk/pingus/src/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/smallmap.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,18 +14,18 @@
// 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 "../game_session.hpp"
-#include "../pingu_holder.hpp"
-#include "../display/display.hpp"
-#include "../display/drawing_context.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
-#include "../server.hpp"
-#include "../smallmap_image.hpp"
-#include "../pingu.hpp"
+#include "game_session.hpp"
+#include "pingu_holder.hpp"
+#include "display/display.hpp"
+#include "display/drawing_context.hpp"
+#include "world.hpp"
+#include "resource.hpp"
+#include "server.hpp"
+#include "smallmap_image.hpp"
+#include "pingu.hpp"
#include "math/math.hpp"
-#include "../math/vector3f.hpp"
-#include "../globals.hpp"
+#include "math/vector3f.hpp"
+#include "globals.hpp"
#include "components/playfield.hpp"
#include "components/smallmap.hpp"
Modified: trunk/pingus/src/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/components/smallmap.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/components/smallmap.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_SMALLMAP_HPP
#define HEADER_PINGUS_SMALLMAP_HPP
-#include "../sprite.hpp"
-#include "../gui/rect_component.hpp"
+#include "sprite.hpp"
+#include "gui/rect_component.hpp"
class Playfield;
class Server;
Modified: trunk/pingus/src/components/time_display.cpp
===================================================================
--- trunk/pingus/src/components/time_display.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/time_display.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,15 +17,15 @@
#include <assert.h>
#include <stdio.h>
-#include "../display/display.hpp"
-#include "../globals.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
-#include "../server.hpp"
-#include "../game_session.hpp"
-#include "../game_time.hpp"
+#include "display/display.hpp"
+#include "globals.hpp"
+#include "resource.hpp"
+#include "world.hpp"
+#include "server.hpp"
+#include "game_session.hpp"
+#include "game_time.hpp"
#include "util/string_util.hpp"
-#include "../fonts.hpp"
+#include "fonts.hpp"
#include "components/time_display.hpp"
Modified: trunk/pingus/src/components/time_display.hpp
===================================================================
--- trunk/pingus/src/components/time_display.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/components/time_display.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_TIME_DISPLAY_HPP
#define HEADER_PINGUS_TIME_DISPLAY_HPP
-#include "../gui/component.hpp"
+#include "gui/component.hpp"
class Font;
class Server;
Modified: trunk/pingus/src/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -19,7 +19,7 @@
#include <memory>
#include <map>
-#include "../math/vector2i.hpp"
+#include "math/vector2i.hpp"
#include "display/framebuffer.hpp"
class SDLFramebuffer;
Modified: trunk/pingus/src/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/display/display.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -19,13 +19,13 @@
#include <stdio.h>
#include <iostream>
-#include "../../config.h"
-#include "../globals.hpp"
-#include "../math/vector2i.hpp"
-#include "../math/rect.hpp"
-#include "../math/color.hpp"
+#include "../config.h"
+#include "globals.hpp"
+#include "math/vector2i.hpp"
+#include "math/rect.hpp"
+#include "math/color.hpp"
#include "math/math.hpp"
-#include "../screen/screen_manager.hpp"
+#include "screen/screen_manager.hpp"
#include "display/sdl_framebuffer.hpp"
#ifdef HAVE_OPENGL
# include "opengl_framebuffer.hpp"
Modified: trunk/pingus/src/display/display.hpp
===================================================================
--- trunk/pingus/src/display/display.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/display/display.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -20,7 +20,7 @@
#include <memory>
#include <list>
#include <vector>
-#include "../math/size.hpp"
+#include "math/size.hpp"
class Vector2i;
class Rect;
Modified: trunk/pingus/src/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/display/drawing_context.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -21,9 +21,9 @@
#include "math/math.hpp"
#include "display/framebuffer.hpp"
#include "display/display.hpp"
-#include "../sprite.hpp"
-#include "../font.hpp"
-#include "../math/origin.hpp"
+#include "sprite.hpp"
+#include "font.hpp"
+#include "math/origin.hpp"
struct DrawingRequestsSorter
{
Modified: trunk/pingus/src/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/display/drawing_context.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/display/drawing_context.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -20,9 +20,9 @@
#include "SDL.h"
#include <vector>
#include "display/drawing_request.hpp"
-#include "../math/vector3f.hpp"
-#include "../math/rect.hpp"
-#include "../math/color.hpp"
+#include "math/vector3f.hpp"
+#include "math/rect.hpp"
+#include "math/color.hpp"
class Framebuffer;
class Font;
Modified: trunk/pingus/src/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/display/rect_merger.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/display/rect_merger.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,8 +18,8 @@
#include <algorithm>
#include <assert.h>
#include <iostream>
-#include "../math/vector2i.hpp"
-#include "../math/size.hpp"
+#include "math/vector2i.hpp"
+#include "math/size.hpp"
#include "display/rect_merger.hpp"
struct Mark {
Modified: trunk/pingus/src/display/rect_merger.hpp
===================================================================
--- trunk/pingus/src/display/rect_merger.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/display/rect_merger.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,7 +18,7 @@
#define HEADER_RECT_MERGER_HPP
#include <vector>
-#include "../math/rect.hpp"
+#include "math/rect.hpp"
void merge_rectangles(const std::vector<Rect>& rects_in, std::vector<Rect>&
rects_out);
Modified: trunk/pingus/src/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -16,7 +16,7 @@
#include <iostream>
#include "math/math.hpp"
-#include "../surface.hpp"
+#include "surface.hpp"
#include "display/display.hpp"
#include "display/sdl_framebuffer.hpp"
#include "display/sdl_framebuffer_surface_impl.hpp"
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -20,7 +20,7 @@
#include <string>
#include <fstream>
-#include "../pingus_level.hpp"
+#include "pingus_level.hpp"
#include "editor/editor_level.hpp"
#include "editor/level_impl.hpp"
#include "editor/level_objs.hpp"
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,18 +18,18 @@
#include <iostream>
#include <boost/bind.hpp>
-#include "../display/display.hpp"
+#include "display/display.hpp"
#include "util/system.hpp"
-#include "../sound/sound.hpp"
-#include "../gui/gui_manager.hpp"
-#include "../screen/screen_manager.hpp"
-#include "../display/drawing_context.hpp"
-#include "../res_descriptor.hpp"
-#include "../resource.hpp"
-#include "../fonts.hpp"
+#include "sound/sound.hpp"
+#include "gui/gui_manager.hpp"
+#include "screen/screen_manager.hpp"
+#include "display/drawing_context.hpp"
+#include "res_descriptor.hpp"
+#include "resource.hpp"
+#include "fonts.hpp"
#include "gettext.h"
#include "editor/file_dialog.hpp"
-#include "../path_manager.hpp"
+#include "path_manager.hpp"
#include "util/pathname.hpp"
#include "game_session.hpp"
#include "editor/editor_level.hpp"
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,7 +18,7 @@
#ifndef HEADER_PINGUS_EDITOR_SCREEN_HPP
#define HEADER_PINGUS_EDITOR_SCREEN_HPP
-#include "../screen/gui_screen.hpp"
+#include "screen/gui_screen.hpp"
#include "util/pathname.hpp"
#include "editor/file_dialog.hpp"
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -19,11 +19,11 @@
#include <iostream>
#include "editor/level_objs.hpp"
#include "editor/level_impl.hpp"
-#include "../blitter.hpp"
-#include "../resource.hpp"
-#include "../res_descriptor.hpp"
-#include "../display/display.hpp"
-#include "../display/drawing_context.hpp"
+#include "blitter.hpp"
+#include "resource.hpp"
+#include "res_descriptor.hpp"
+#include "display/display.hpp"
+#include "display/drawing_context.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_objs.hpp
===================================================================
--- trunk/pingus/src/editor/level_objs.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/level_objs.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,12 +17,12 @@
#ifndef HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
#define HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
-#include "../sprite.hpp"
-#include "../math/color.hpp"
-#include "../math/origin.hpp"
-#include "../math/rect.hpp"
-#include "../math/vector3f.hpp"
-#include "../res_descriptor.hpp"
+#include "sprite.hpp"
+#include "math/color.hpp"
+#include "math/origin.hpp"
+#include "math/rect.hpp"
+#include "math/vector3f.hpp"
+#include "res_descriptor.hpp"
#include "util/file_writer.hpp"
#include <string>
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,11 +18,11 @@
#include <vector>
#include <string>
#include <iostream>
-#include "../gui/gui_manager.hpp"
-#include "../display/display.hpp"
-#include "../display/drawing_context.hpp"
-#include "../math/vector3f.hpp"
-#include "../graphic_context_state.hpp"
+#include "gui/gui_manager.hpp"
+#include "display/display.hpp"
+#include "display/drawing_context.hpp"
+#include "math/vector3f.hpp"
+#include "graphic_context_state.hpp"
#include "editor/editor_level.hpp"
#include "editor/editor_screen.hpp"
#include "editor/viewport.hpp"
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,8 +18,8 @@
#ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
#define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
-#include "../gui/rect_component.hpp"
-#include "../graphic_context_state.hpp"
+#include "gui/rect_component.hpp"
+#include "graphic_context_state.hpp"
#include <boost/signal.hpp>
#include <vector>
#include <string>
Modified: trunk/pingus/src/gui/button.hpp
===================================================================
--- trunk/pingus/src/gui/button.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/gui/button.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_GUI_BUTTON_HPP
#define HEADER_PINGUS_GUI_BUTTON_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace GUI {
class Button
Modified: trunk/pingus/src/gui/component.hpp
===================================================================
--- trunk/pingus/src/gui/component.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/gui/component.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_GUI_COMPONENT_HPP
#define HEADER_PINGUS_GUI_COMPONENT_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
class DrawingContext;
Modified: trunk/pingus/src/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/gui/gui_manager.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,9 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <algorithm>
-#include "../debug.hpp"
-#include "../globals.hpp"
-#include "../input/event.hpp"
+#include "debug.hpp"
+#include "globals.hpp"
+#include "input/event.hpp"
#include "display/display.hpp"
#include "gui/gui_manager.hpp"
Modified: trunk/pingus/src/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/gui/gui_manager.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_GUI_MANAGER_HPP
#include <vector>
-#include "../input/event.hpp"
+#include "input/event.hpp"
#include "gui/group_component.hpp"
class DrawingContext;
Modified: trunk/pingus/src/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/gui/surface_button.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/gui/surface_button.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../resource.hpp"
-#include "../math/vector3f.hpp"
-#include "../display/drawing_context.hpp"
+#include "resource.hpp"
+#include "math/vector3f.hpp"
+#include "display/drawing_context.hpp"
#include "gui/surface_button.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/surface_button.hpp
===================================================================
--- trunk/pingus/src/gui/surface_button.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/gui/surface_button.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
#define HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
-#include "../sprite.hpp"
+#include "sprite.hpp"
#include "gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input/core_driver.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#include "math/math.hpp"
#include "input/manager.hpp"
#include "input/core_driver.hpp"
-#include "../display/display.hpp"
+#include "display/display.hpp"
#include "globals.hpp"
namespace Input {
Modified: trunk/pingus/src/input/event.hpp
===================================================================
--- trunk/pingus/src/input/event.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/input/event.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -19,7 +19,7 @@
#include <vector>
#include <string>
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/input/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -26,7 +26,7 @@
#include "globals.hpp"
#include "math/vector2i.hpp"
#include "input/usbmouse_driver.hpp"
-#include "../display/display.hpp"
+#include "display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/axis.hpp
===================================================================
--- trunk/pingus/src/input_old/axis.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/input_old/axis.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_AXIS_HPP
#define HEADER_PINGUS_INPUT_AXIS_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/axis_factory.cpp
===================================================================
--- trunk/pingus/src/input_old/axis_factory.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/axis_factory.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -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 "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "axis_factory.hpp"
#include "button.hpp"
#include "button_factory.hpp"
@@ -22,7 +22,7 @@
#include "axes/inverted_axis.hpp"
#include "axes/joystick_axis.hpp"
#include "axes/multiple_axis.hpp"
-#include "../debug.hpp"
+#include "debug.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/axis_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/axis_factory.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/axis_factory.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_AXIS_FACTORY_HPP
#define HEADER_PINGUS_INPUT_AXIS_FACTORY_HPP
-#include "../file_reader.hpp"
+#include "file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/button.hpp
===================================================================
--- trunk/pingus/src/input_old/button.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/button.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_BUTTON_HPP
#define HEADER_PINGUS_INPUT_BUTTON_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
#include "controller.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/button_factory.cpp
===================================================================
--- trunk/pingus/src/input_old/button_factory.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/button_factory.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../file_reader.hpp"
-#include "../pingus_error.hpp"
+#include "file_reader.hpp"
+#include "pingus_error.hpp"
#include "button_factory.hpp"
#include "buttons/double_button.hpp"
#include "buttons/joystick_button.hpp"
Modified: trunk/pingus/src/input_old/button_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/button_factory.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/button_factory.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_BUTTON_FACTORY_HPP
#define HEADER_PINGUS_INPUT_BUTTON_FACTORY_HPP
-#include "../file_reader.hpp"
+#include "file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/controller.cpp
===================================================================
--- trunk/pingus/src/input_old/controller.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/controller.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "SDL.h"
-#include "../screen/screen_manager.hpp"
+#include "screen/screen_manager.hpp"
-#include "../debug.hpp"
-#include "../pingus_error.hpp"
+#include "debug.hpp"
+#include "pingus_error.hpp"
#include "path_manager.hpp"
#include "controller.hpp"
@@ -32,7 +32,7 @@
#include "buttons/key_button.hpp"
#include "buttons/mouse_button.hpp"
#include "scrollers/axis_scroller.hpp"
-#include "../global_event.hpp"
+#include "global_event.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/input_old/controller.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/controller.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
#include "SDL.h"
-#include "../file_reader.hpp"
+#include "file_reader.hpp"
#include "event.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/event.hpp
===================================================================
--- trunk/pingus/src/input_old/event.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/event.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -19,7 +19,7 @@
#include <vector>
#include <string>
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/pointer.hpp
===================================================================
--- trunk/pingus/src/input_old/pointer.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/pointer.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_POINTER_HPP
#define HEADER_PINGUS_INPUT_POINTER_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/pointer_factory.cpp
===================================================================
--- trunk/pingus/src/input_old/pointer_factory.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/pointer_factory.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "axis_factory.hpp"
#include "pointers/axis_pointer.hpp"
#include "pointers/mouse_pointer.hpp"
Modified: trunk/pingus/src/input_old/pointer_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/pointer_factory.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/pointer_factory.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_POINTER_FACTORY_HPP
#define HEADER_PINGUS_INPUT_POINTER_FACTORY_HPP
-#include "../file_reader.hpp"
+#include "file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/scroller.hpp
===================================================================
--- trunk/pingus/src/input_old/scroller.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/input_old/scroller.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_SCROLLER_HPP
#define HEADER_PINGUS_INPUT_SCROLLER_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/input_old/scroller_factory.cpp
===================================================================
--- trunk/pingus/src/input_old/scroller_factory.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/scroller_factory.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdlib.h>
-#include "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "axis.hpp"
#include "axis_factory.hpp"
#include "button.hpp"
Modified: trunk/pingus/src/input_old/scroller_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/scroller_factory.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/input_old/scroller_factory.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_SCROLLER_FACTORY_HPP
#define HEADER_PINGUS_INPUT_SCROLLER_FACTORY_HPP
-#include "../file_reader.hpp"
+#include "file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/movers/linear_mover.cpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/movers/linear_mover.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "movers/linear_mover.hpp"
-#include "../collider.hpp"
+#include "collider.hpp"
namespace Movers {
Modified: trunk/pingus/src/movers/linear_mover.hpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/movers/linear_mover.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_LINEAR_MOVER_HPP
#define HEADER_PINGUS_LINEAR_MOVER_HPP
-#include "../mover.hpp"
+#include "mover.hpp"
class Collider;
Modified: trunk/pingus/src/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/explosive_particle.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,11 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#if 0
-#include "../collision_map.hpp"
-#include "../pingu_map.hpp"
-#include "../world.hpp"
-#include "../particles/particle_holder.hpp"
-#include "../resource.hpp"
+#include "collision_map.hpp"
+#include "pingu_map.hpp"
+#include "world.hpp"
+#include "particles/particle_holder.hpp"
+#include "resource.hpp"
#include "particles/explosive_particle.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
Modified: trunk/pingus/src/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/explosive_particle.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
#define HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-#include "../sprite.hpp"
+#include "sprite.hpp"
#include "particles/particle.hpp"
class ExplosiveParticle
Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -14,11 +14,11 @@
// 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 "../display/scene_context.hpp"
+#include "display/scene_context.hpp"
#include "math/math.hpp"
-#include "../collision_map.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "particles/pingu_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/pingu_particle_holder.hpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.hpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/particles/pingu_particle_holder.hpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
#include <vector>
-#include "../sprite.hpp"
-#include "../math/vector3f.hpp"
-#include "../worldobj.hpp"
+#include "sprite.hpp"
+#include "math/vector3f.hpp"
+#include "worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,12 +14,12 @@
// 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 "../display/scene_context.hpp"
+#include "display/scene_context.hpp"
#include "math/math.hpp"
-#include "../collision_map.hpp"
-#include "../globals.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "globals.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "particles/rain_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/rain_particle_holder.hpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/rain_particle_holder.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
#include <vector>
-#include "../sprite.hpp"
-#include "../math/vector3f.hpp"
-#include "../worldobj.hpp"
+#include "sprite.hpp"
+#include "math/vector3f.hpp"
+#include "worldobj.hpp"
class GraphicContext;
Modified: trunk/pingus/src/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../resource.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "resource.hpp"
#include "particles/smoke_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/smoke_particle_holder.hpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.hpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/particles/smoke_particle_holder.hpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
#include <vector>
-#include "../sprite.hpp"
-#include "../math/vector3f.hpp"
-#include "../worldobj.hpp"
+#include "sprite.hpp"
+#include "math/vector3f.hpp"
+#include "worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,11 +17,11 @@
#include <assert.h>
#include "math/math.hpp"
-#include "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../ground_map.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "ground_map.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "particles/snow_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/snow_particle_holder.hpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/particles/snow_particle_holder.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
#include <vector>
-#include "../sprite.hpp"
-#include "../math/vector3f.hpp"
-#include "../worldobj.hpp"
+#include "sprite.hpp"
+#include "math/vector3f.hpp"
+#include "worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/screen/gui_screen.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../globals.hpp"
-#include "../debug.hpp"
-#include "../display/display.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
+#include "display/display.hpp"
#include "gui/gui_manager.hpp"
#include "screen/gui_screen.hpp"
Modified: trunk/pingus/src/screen/screen.hpp
===================================================================
--- trunk/pingus/src/screen/screen.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/screen/screen.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_SCREEN_HPP
#include "SDL.h"
-#include "../math/size.hpp"
+#include "math/size.hpp"
namespace Input {
struct Event;
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,18 +18,18 @@
#include <iostream>
#include <fstream>
-#include "../globals.hpp"
+#include "globals.hpp"
#include "math/size.hpp"
#include "util/pathname.hpp"
#include "display/display.hpp"
#include "display/framebuffer.hpp"
#include "screen/screen_manager.hpp"
-#include "../path_manager.hpp"
+#include "path_manager.hpp"
#include "screen/screen.hpp"
#include "fps_counter.hpp"
-#include "../display/drawing_context.hpp"
-#include "../input/controller.hpp"
-#include "../input/manager.hpp"
+#include "display/drawing_context.hpp"
+#include "input/controller.hpp"
+#include "input/manager.hpp"
template<class C>
void write(std::ostream& out, C value)
Modified: trunk/pingus/src/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/screen/screen_manager.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_SCREEN_MANAGER_HPP
#define HEADER_PINGUS_SCREEN_MANAGER_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
#include <memory>
#include <boost/smart_ptr.hpp>
#include <vector>
Modified: trunk/pingus/src/sound/sound.cpp
===================================================================
--- trunk/pingus/src/sound/sound.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/sound/sound.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -16,8 +16,8 @@
#include <iostream>
#include <assert.h>
-#include "../path_manager.hpp"
-#include "../globals.hpp"
+#include "path_manager.hpp"
+#include "globals.hpp"
#include "sound/sound_dummy.hpp"
#include "sound/sound_real.hpp"
#include "sound/sound.hpp"
Modified: trunk/pingus/src/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/sound/sound_dummy.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,8 +14,8 @@
// 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 "../globals.hpp"
-#include "../debug.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
#include "sound/sound_dummy.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_impl.hpp
===================================================================
--- trunk/pingus/src/sound/sound_impl.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/sound/sound_impl.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_SOUND_IMPL_HPP
#define HEADER_PINGUS_SOUND_IMPL_HPP
-#include "../pingus.hpp"
+#include "pingus.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/sound/sound_real.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/sound/sound_real.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#include <stdexcept>
#include "SDL.h"
#include "SDL_mixer.h"
-#include "../globals.hpp"
-#include "../debug.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
#include "sound/sound_res_mgr.hpp"
#include "sound/sound_real.hpp"
Modified: trunk/pingus/src/sound/sound_res_mgr.cpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,9 +14,9 @@
// 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 "../path_manager.hpp"
-#include "../globals.hpp"
-#include "../debug.hpp"
+#include "path_manager.hpp"
+#include "globals.hpp"
+#include "debug.hpp"
#include "sound/sound_res_mgr.hpp"
Modified: trunk/pingus/src/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldmap/dot.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_DOT_HPP
#include <string>
-#include "../math/vector3f.hpp"
+#include "math/vector3f.hpp"
#include "worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -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 "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "worldmap/level_dot.hpp"
#include "worldmap/dot_factory.hpp"
Modified: trunk/pingus/src/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_DRAWABLE_HPP
#define HEADER_PINGUS_DRAWABLE_HPP
-#include "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "util/file_reader.hpp"
class DrawingContext;
Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/level_dot.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,18 +15,18 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../font.hpp"
-#include "../gettext.h"
-#include "../globals.hpp"
+#include "font.hpp"
+#include "gettext.h"
+#include "globals.hpp"
#include "util/system.hpp"
-#include "../fonts.hpp"
-#include "../display/drawing_context.hpp"
-#include "../screen/screen_manager.hpp"
-#include "../resource.hpp"
-#include "../path_manager.hpp"
-#include "../start_screen.hpp"
-#include "../plf_res_mgr.hpp"
-#include "../savegame_manager.hpp"
+#include "fonts.hpp"
+#include "display/drawing_context.hpp"
+#include "screen/screen_manager.hpp"
+#include "resource.hpp"
+#include "path_manager.hpp"
+#include "start_screen.hpp"
+#include "plf_res_mgr.hpp"
+#include "savegame_manager.hpp"
#include "util/file_reader.hpp"
#include "input/controller.hpp"
#include "input/control.hpp"
Modified: trunk/pingus/src/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/level_dot.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDMAP_LEVEL_DOT_HPP
#define HEADER_PINGUS_WORLDMAP_LEVEL_DOT_HPP
-#include "../sprite.hpp"
-#include "../pingus_level.hpp"
+#include "sprite.hpp"
+#include "pingus_level.hpp"
#include "worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path.hpp
===================================================================
--- trunk/pingus/src/worldmap/path.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldmap/path.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -19,7 +19,7 @@
#include <algorithm>
#include <vector>
-#include "../math/vector3f.hpp"
+#include "math/vector3f.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math/color.hpp"
-#include "../display/drawing_context.hpp"
+#include "math/color.hpp"
+#include "display/drawing_context.hpp"
#include "worldmap/path_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,14 +18,14 @@
#include "math/math.hpp"
#include "util/file_reader.hpp"
-#include "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "worldmap/dot.hpp"
#include "worldmap/dot_factory.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/pathfinder.hpp"
#include "worldmap/path_graph.hpp"
#include "worldmap/path_drawable.hpp"
-#include "../globals.hpp"
+#include "globals.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -19,7 +19,7 @@
#include <map>
#include <vector>
-#include "../math/vector3f.hpp"
+#include "math/vector3f.hpp"
#include "worldmap/path.hpp"
#include "worldmap/pathfinder.hpp"
#include "worldmap/graph.hpp"
Modified: trunk/pingus/src/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/pingus.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDMAP_PINGUS_HPP
#define HEADER_PINGUS_WORLDMAP_PINGUS_HPP
-#include "../state_sprite.hpp"
+#include "state_sprite.hpp"
#include "worldmap/drawable.hpp"
#include "worldmap/path_graph.hpp"
Modified: trunk/pingus/src/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string>
-#include "../pingus_error.hpp"
+#include "pingus_error.hpp"
#include "util/file_reader.hpp"
#include "worldmap/drawable_factory.hpp"
#include "worldmap/pingus_worldmap.hpp"
Modified: trunk/pingus/src/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -16,8 +16,8 @@
#include <iostream>
-#include "../resource.hpp"
-#include "../display/drawing_context.hpp"
+#include "resource.hpp"
+#include "display/drawing_context.hpp"
#include "worldmap/worldmap_screen.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/pingus.hpp"
Modified: trunk/pingus/src/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_SURFACE_DRAWABLE_HPP
#define HEADER_SURFACE_DRAWABLE_HPP
-#include "../sprite.hpp"
-#include "../math/vector3f.hpp"
+#include "sprite.hpp"
+#include "math/vector3f.hpp"
#include "worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -16,22 +16,22 @@
#include <assert.h>
#include <iostream>
-#include "../display/display.hpp"
-#include "../fonts.hpp"
-#include "../path_manager.hpp"
-#include "../stat_manager.hpp"
-#include "../savegame_manager.hpp"
+#include "display/display.hpp"
+#include "fonts.hpp"
+#include "path_manager.hpp"
+#include "stat_manager.hpp"
+#include "savegame_manager.hpp"
#include "util/system.hpp"
-#include "../resource.hpp"
-#include "../globals.hpp"
-#include "../sound/sound.hpp"
-#include "../pingus_error.hpp"
-#include "../gettext.h"
-#include "../globals.hpp"
+#include "resource.hpp"
+#include "globals.hpp"
+#include "sound/sound.hpp"
+#include "pingus_error.hpp"
+#include "gettext.h"
+#include "globals.hpp"
#include "util/sexpr_file_reader.hpp"
-#include "../debug.hpp"
-#include "../lisp/parser.hpp"
-#include "../lisp/lisp.hpp"
+#include "debug.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/worldmap_story.hpp"
#include "worldmap/worldmap_screen.hpp"
@@ -42,10 +42,10 @@
#include "worldmap/level_dot.hpp"
#include "worldmap/path_graph.hpp"
#include "math/math.hpp"
-#include "../stat_manager.hpp"
+#include "stat_manager.hpp"
-#include "../story_screen.hpp"
-#include "../screen/screen_manager.hpp"
+#include "story_screen.hpp"
+#include "screen/screen_manager.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -18,10 +18,10 @@
#define HEADER_PINGUS_WORLDMAP_WORLDMAP_HPP
#include <vector>
-#include "../sprite.hpp"
+#include "sprite.hpp"
#include "util/file_reader.hpp"
-#include "../display/drawing_context.hpp"
-#include "../graphic_context_state.hpp"
+#include "display/drawing_context.hpp"
+#include "graphic_context_state.hpp"
#include "worldmap/pingus_worldmap.hpp"
class Font;
Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,8 +14,8 @@
// 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 "../display/display.hpp"
-#include "../display/scene_context.hpp"
+#include "display/display.hpp"
+#include "display/scene_context.hpp"
#include "worldmap/worldmap_screen.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/worldmap_component.hpp"
Modified: trunk/pingus/src/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_component.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -19,7 +19,7 @@
#include <string>
#include <memory>
-#include "../gui/gui_manager.hpp"
+#include "gui/gui_manager.hpp"
class SceneContext;
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,23 +15,23 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../gettext.h"
-#include "../fonts.hpp"
-#include "../display/display.hpp"
-#include "../screen/screen_manager.hpp"
-#include "../gui/surface_button.hpp"
-#include "../path_manager.hpp"
-#include "../res_descriptor.hpp"
-#include "../sound/sound.hpp"
-#include "../stat_manager.hpp"
-#include "../display/scene_context.hpp"
+#include "gettext.h"
+#include "fonts.hpp"
+#include "display/display.hpp"
+#include "screen/screen_manager.hpp"
+#include "gui/surface_button.hpp"
+#include "path_manager.hpp"
+#include "res_descriptor.hpp"
+#include "sound/sound.hpp"
+#include "stat_manager.hpp"
+#include "display/scene_context.hpp"
#include "math/math.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/worldmap_component.hpp"
#include "resource.hpp"
#include "worldmap/worldmap_story.hpp"
#include "worldmap/pingus.hpp"
-#include "../story_screen.hpp"
+#include "story_screen.hpp"
#include "worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -19,9 +19,9 @@
#include <string>
#include <memory>
-#include "../sprite.hpp"
-#include "../gui/gui_manager.hpp"
-#include "../screen/gui_screen.hpp"
+#include "sprite.hpp"
+#include "gui/gui_manager.hpp"
+#include "screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,13 +17,13 @@
#include <algorithm>
#include <vector>
#include "worldmap/worldmap_story.hpp"
-#include "../story_screen.hpp"
+#include "story_screen.hpp"
#include "util/file_reader.hpp"
-#include "../res_descriptor.hpp"
-#include "../pingus_error.hpp"
-#include "../string_format.hpp"
-#include "../fonts.hpp"
-#include "../gettext.h"
+#include "res_descriptor.hpp"
+#include "pingus_error.hpp"
+#include "string_format.hpp"
+#include "fonts.hpp"
+#include "gettext.h"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -19,7 +19,7 @@
#include <vector>
#include <string>
-#include "../res_descriptor.hpp"
+#include "res_descriptor.hpp"
class FileReader;
Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -14,12 +14,12 @@
// 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 "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "worldobjs/conveyor_belt.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/conveyor_belt.hpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/conveyor_belt.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
#define HEADER_PINGUS_WORLDOBJS_CONVEYOR_BELT_HPP
-#include "../math/vector3f.hpp"
-#include "../worldobj.hpp"
+#include "math/vector3f.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class ConveyorBeltData;
Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,13 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../pingu_holder.hpp"
-#include "../globals.hpp"
-#include "../pingu.hpp"
-#include "../resource.hpp"
-#include "../components/smallmap.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "pingu_holder.hpp"
+#include "globals.hpp"
+#include "pingu.hpp"
+#include "resource.hpp"
+#include "components/smallmap.hpp"
#include "worldobjs/entrance.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_ENTRANCE_HPP
#define HEADER_PINGUS_ENTRANCE_HPP
-#include "../math/vector3f.hpp"
-#include "../res_descriptor.hpp"
-#include "../worldobj.hpp"
+#include "math/vector3f.hpp"
+#include "res_descriptor.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -15,14 +15,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../display/scene_context.hpp"
-#include "../collision_map.hpp"
-#include "../world.hpp"
-#include "../globals.hpp"
-#include "../pingu_holder.hpp"
-#include "../pingu.hpp"
-#include "../components/smallmap.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "collision_map.hpp"
+#include "world.hpp"
+#include "globals.hpp"
+#include "pingu_holder.hpp"
+#include "pingu.hpp"
+#include "components/smallmap.hpp"
+#include "resource.hpp"
#include "util/string_util.hpp"
#include "worldobjs/exit.hpp"
Modified: trunk/pingus/src/worldobjs/exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.hpp 2009-11-04 01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/exit.hpp 2009-11-04 01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_EXIT_HPP
#define HEADER_PINGUS_WORLDOBJS_EXIT_HPP
-#include "../res_descriptor.hpp"
-#include "../worldobj.hpp"
+#include "res_descriptor.hpp"
+#include "worldobj.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,12 +14,12 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../components/smallmap.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "components/smallmap.hpp"
+#include "resource.hpp"
#include "worldobjs/fake_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_TRAPS_FAKE_EXIT_HPP
#define HEADER_PINGUS_TRAPS_FAKE_EXIT_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
class Pingu;
Modified: trunk/pingus/src/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../world.hpp"
-#include "../ground_map.hpp"
-#include "../collision_map.hpp"
-#include "../resource.hpp"
+#include "world.hpp"
+#include "ground_map.hpp"
+#include "collision_map.hpp"
+#include "resource.hpp"
#include "worldobjs/groundpiece.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/groundpiece.hpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/groundpiece.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
#define HEADER_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
-#include "../res_descriptor.hpp"
-#include "../groundtype.hpp"
-#include "../worldobj.hpp"
-#include "../math/vector3f.hpp"
+#include "res_descriptor.hpp"
+#include "groundtype.hpp"
+#include "worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,11 +14,11 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/guillotine.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/guillotine.hpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_GUILLOTINE_HPP
#define HEADER_PINGUS_WORLDOBJS_GUILLOTINE_HPP
-#include "../direction.hpp"
-#include "../worldobj.hpp"
+#include "direction.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,11 +14,11 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/hammer.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hammer.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/hammer.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_HAMMER_HPP
#define HEADER_PINGUS_WORLDOBJS_HAMMER_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,9 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../resource.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "resource.hpp"
#include "worldobjs/hotspot.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hotspot.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_HOTSPOT_HPP
#define HEADER_PINGUS_WORLDOBJS_HOTSPOT_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class HotspotData;
Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,13 +14,13 @@
// 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 "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../ground_map.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "ground_map.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "worldobjs/ice_block.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/ice_block.hpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/ice_block.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
#define HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class IceBlockData;
Modified: trunk/pingus/src/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,10 +14,10 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
#include "worldobjs/laser_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/laser_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/laser_exit.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_LASER_EXIT_HPP
#define HEADER_PINGUS_WORLDOBJS_LASER_EXIT_HPP
-#include "../worldobj.hpp"
-#include "../sprite.hpp"
+#include "worldobj.hpp"
+#include "sprite.hpp"
namespace WorldObjsData {
class LaserExitData;
Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "worldobjs/liquid.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/liquid.hpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/liquid.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_LIQUID_HPP
#define HEADER_PINGUS_WORLDOBJS_LIQUID_HPP
-#include "../res_descriptor.hpp"
-#include "../worldobj.hpp"
+#include "res_descriptor.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class LiquidData;
Modified: trunk/pingus/src/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../particles/rain_particle_holder.hpp"
-#include "../sound/sound.hpp"
-#include "../world.hpp"
-#include "../display/scene_context.hpp"
+#include "particles/rain_particle_holder.hpp"
+#include "sound/sound.hpp"
+#include "world.hpp"
+#include "display/scene_context.hpp"
#include "worldobjs/rain_generator.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/rain_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PARTICLES_RAIN_GENERATOR_HPP
#define HEADER_PINGUS_PARTICLES_RAIN_GENERATOR_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,14 +17,14 @@
#include <iostream>
#include "math/math.hpp"
-#include "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../particles/smoke_particle_holder.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../resource.hpp"
-#include "../sound/sound.hpp"
-#include "../world.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "particles/smoke_particle_holder.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "resource.hpp"
+#include "sound/sound.hpp"
+#include "world.hpp"
#include "worldobjs/smasher.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/smasher.hpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/smasher.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_SMASHER_HPP
#define HEADER_PINGUS_WORLDOBJS_SMASHER_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,8 +17,8 @@
#include <iostream>
#include "math/math.hpp"
-#include "../world.hpp"
-#include "../particles/snow_particle_holder.hpp"
+#include "world.hpp"
+#include "particles/snow_particle_holder.hpp"
#include "worldobjs/snow_generator.hpp"
#include "globals.hpp"
Modified: trunk/pingus/src/worldobjs/snow_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PARTICLES_SNOW_GENERATOR_HPP
#define HEADER_PINGUS_PARTICLES_SNOW_GENERATOR_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -14,8 +14,8 @@
// 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 "../display/display.hpp"
-#include "../display/scene_context.hpp"
+#include "display/display.hpp"
+#include "display/scene_context.hpp"
#include "worldobjs/solid_color_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/solid_color_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.hpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/solid_color_background.hpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
#define HEADER_PINGUS_WORLDOBJS_SOLID_COLOR_BACKGROUND_HPP
-#include "../math/color.hpp"
-#include "../worldobj.hpp"
+#include "math/color.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class SolidColorBackgroundData;
Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,11 +14,11 @@
// 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 "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/spike.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_TRAPS_SPIKE_HPP
#define HEADER_PINGUS_TRAPS_SPIKE_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/starfield_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/starfield_background.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
#include <vector>
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -14,9 +14,9 @@
// 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 "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/starfield_background_stars.hpp"
#include "globals.hpp"
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.hpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.hpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.hpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
#define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
-#include "../worldobj.hpp"
-#include "../sprite.hpp"
+#include "worldobj.hpp"
+#include "sprite.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,13 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../globals.hpp"
-#include "../display/scene_context.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
-#include "../globals.hpp"
-#include "../blitter.hpp"
-#include "../display/display.hpp"
+#include "globals.hpp"
+#include "display/scene_context.hpp"
+#include "world.hpp"
+#include "resource.hpp"
+#include "globals.hpp"
+#include "blitter.hpp"
+#include "display/display.hpp"
#include "worldobjs/surface_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/surface_background.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
#define HEADER_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
-#include "../res_descriptor.hpp"
-#include "../worldobj.hpp"
+#include "res_descriptor.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class SurfaceBackgroundData;
Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -14,12 +14,12 @@
// 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 "../collision_map.hpp"
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "collision_map.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/switch_door.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/switch_door.hpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/switch_door.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
#define HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class SwitchDoorData;
Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,11 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/teleporter_target.hpp"
#include "worldobjs/teleporter.hpp"
Modified: trunk/pingus/src/worldobjs/teleporter.hpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.hpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/teleporter.hpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_TELEPORTER_HPP
#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -15,11 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../display/scene_context.hpp"
-#include "../pingu.hpp"
-#include "../pingu_holder.hpp"
-#include "../world.hpp"
-#include "../resource.hpp"
+#include "display/scene_context.hpp"
+#include "pingu.hpp"
+#include "pingu_holder.hpp"
+#include "world.hpp"
+#include "resource.hpp"
#include "worldobjs/teleporter_target.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter_target.hpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
+++ trunk/pingus/src/worldobjs/teleporter_target.hpp 2009-11-04 01:42:17 UTC
(rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -14,8 +14,8 @@
// 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 "../resource.hpp"
-#include "../display/scene_context.hpp"
+#include "resource.hpp"
+#include "display/scene_context.hpp"
#include "worldobjs/thunderstorm_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.hpp 2009-11-04
01:39:16 UTC (rev 4007)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.hpp 2009-11-04
01:42:17 UTC (rev 4008)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
#define HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
-#include "../worldobj.hpp"
+#include "worldobj.hpp"
namespace WorldObjsData {
class ThunderstormBackgroundData;
Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 01:39:16 UTC (rev
4007)
+++ trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 01:42:17 UTC (rev
4008)
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "math/math.hpp"
-#include "../display/scene_context.hpp"
-#include "../particles/smoke_particle_holder.hpp"
-#include "../resource.hpp"
-#include "../world.hpp"
+#include "display/scene_context.hpp"
+#include "particles/smoke_particle_holder.hpp"
+#include "resource.hpp"
+#include "world.hpp"
#include "worldobjs/woodthing.hpp"
namespace WorldObjs {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4008 - in trunk/pingus/src: actions colliders components display editor gui input input_old movers particles screen sound worldmap worldobjs,
grumbel at BerliOS <=