[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4040 - in trunk/pingus: . src src/pingus src/pingus/action
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4040 - in trunk/pingus: . src src/pingus src/pingus/actions src/pingus/colliders src/pingus/components src/pingus/movers src/pingus/particles src/pingus/worldmap src/pingus/worldobjs |
|
Date: |
Thu, 5 Nov 2009 23:37:40 +0100 |
Author: grumbel
Date: 2009-11-05 23:37:35 +0100 (Thu, 05 Nov 2009)
New Revision: 4040
Added:
trunk/pingus/src/pingus/colliders/
trunk/pingus/src/pingus/components/
trunk/pingus/src/pingus/movers/
trunk/pingus/src/pingus/particles/
trunk/pingus/src/pingus/worldmap/
trunk/pingus/src/pingus/worldobjs/
Removed:
trunk/pingus/src/colliders/
trunk/pingus/src/components/
trunk/pingus/src/movers/
trunk/pingus/src/particles/
trunk/pingus/src/worldmap/
trunk/pingus/src/worldobjs/
Modified:
trunk/pingus/SConscript
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/faller.cpp
trunk/pingus/src/pingus/actions/rocket_launcher.cpp
trunk/pingus/src/pingus/colliders/pingu_collider.cpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/components/check_box.cpp
trunk/pingus/src/pingus/components/choice_box.cpp
trunk/pingus/src/pingus/components/label.cpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/pingus_counter.cpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/slider_box.cpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/demo_session.cpp
trunk/pingus/src/pingus/game_session.cpp
trunk/pingus/src/pingus/movers/linear_mover.cpp
trunk/pingus/src/pingus/option_menu.cpp
trunk/pingus/src/pingus/option_menu.hpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/explosive_particle.hpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_menu.cpp
trunk/pingus/src/pingus/story_screen.cpp
trunk/pingus/src/pingus/story_screen.hpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldmap/dot.cpp
trunk/pingus/src/pingus/worldmap/dot.hpp
trunk/pingus/src/pingus/worldmap/dot_factory.cpp
trunk/pingus/src/pingus/worldmap/drawable.cpp
trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
trunk/pingus/src/pingus/worldmap/graph.cpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/level_dot.hpp
trunk/pingus/src/pingus/worldmap/path.cpp
trunk/pingus/src/pingus/worldmap/path_drawable.cpp
trunk/pingus/src/pingus/worldmap/path_drawable.hpp
trunk/pingus/src/pingus/worldmap/path_graph.cpp
trunk/pingus/src/pingus/worldmap/path_graph.hpp
trunk/pingus/src/pingus/worldmap/pathfinder.hpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/pingus.hpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap.hpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
trunk/pingus/src/pingus/worldobj_factory.cpp
trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
trunk/pingus/src/pingus/worldobjs/entrance.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/hotspot.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.cpp
trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
trunk/pingus/src/pingus/worldobjs/liquid.cpp
trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
trunk/pingus/src/pingus/worldobjs/smasher.cpp
trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
trunk/pingus/src/pingus/worldobjs/spike.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/pingus/worldobjs/surface_background.cpp
trunk/pingus/src/pingus/worldobjs/switch_door.cpp
trunk/pingus/src/pingus/worldobjs/teleporter.cpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/pingus/worldobjs/woodthing.cpp
trunk/pingus/src/pingus/worldobjs/woodthing.hpp
Log:
Moved:
colliders -> pingus/colliders/
components -> pingus/components/
movers -> pingus/movers/
particles -> pingus/particles/
worldmap -> pingus/worldmap/
worldobjs -> pingus/worldobjs/
Modified: trunk/pingus/SConscript
===================================================================
--- trunk/pingus/SConscript 2009-11-05 22:29:36 UTC (rev 4039)
+++ trunk/pingus/SConscript 2009-11-05 22:37:35 UTC (rev 4040)
@@ -23,25 +23,25 @@
import SCons.Util
pingus_sources = \
+ Glob('external/binreloc-2.0/*.c') + \
Glob('external/tinygettext/*.cpp') + \
- Glob('external/binreloc-2.0/*.c') + \
- Glob('src/pingus/actions/*.cpp') + \
- Glob('src/colliders/*.cpp') + \
- Glob('src/components/*.cpp') + \
Glob('src/display/*.cpp') + \
Glob('src/editor/*.cpp') + \
Glob('src/gui/*.cpp') + \
Glob('src/input/*.cpp') + \
Glob('src/lisp/*.cpp') + \
Glob('src/math/*.cpp') + \
- Glob('src/movers/*.cpp') + \
- Glob('src/particles/*.cpp') + \
Glob('src/pingus/*.cpp') + \
+ Glob('src/pingus/actions/*.cpp') + \
+ Glob('src/pingus/colliders/*.cpp') + \
+ Glob('src/pingus/components/*.cpp') + \
+ Glob('src/pingus/movers/*.cpp') + \
+ Glob('src/pingus/particles/*.cpp') + \
+ Glob('src/pingus/worldmap/*.cpp') + \
+ Glob('src/pingus/worldobjs/*.cpp') + \
Glob('src/screen/*.cpp') + \
Glob('src/sound/*.cpp') + \
- Glob('src/util/*.cpp') + \
- Glob('src/worldmap/*.cpp') + \
- Glob('src/worldobjs/*.cpp')
+ Glob('src/util/*.cpp')
class _SpaceListOptionClass:
"""An option type for space-separated lists with arbitrary elements."""
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -23,9 +23,9 @@
#include "pingus/pingu_enums.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/world.hpp"
-#include "particles/pingu_particle_holder.hpp"
-#include "colliders/pingu_collider.hpp"
-#include "movers/linear_mover.hpp"
+#include "pingus/particles/pingu_particle_holder.hpp"
+#include "pingus/colliders/pingu_collider.hpp"
+#include "pingus/movers/linear_mover.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/faller.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -17,11 +17,11 @@
#include "pingus/actions/faller.hpp"
#include "math/math.hpp"
-#include "colliders/pingu_collider.hpp"
+#include "pingus/colliders/pingu_collider.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "display/scene_context.hpp"
-#include "movers/linear_mover.hpp"
+#include "pingus/movers/linear_mover.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-05 22:29:36 UTC
(rev 4039)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -17,8 +17,8 @@
#include "pingus/actions/rocket_launcher.hpp"
#include "display/scene_context.hpp"
-//#include "particles/particle_holder.hpp"
-//#include "particles/explosive_particle.hpp"
+//#include "pingus/particles/particle_holder.hpp"
+//#include "pingus/particles/explosive_particle.hpp"
#include "pingus/world.hpp"
#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
Copied: trunk/pingus/src/pingus/colliders (from rev 4037,
trunk/pingus/src/colliders)
Modified: trunk/pingus/src/pingus/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "colliders/pingu_collider.hpp"
+#include "pingus/colliders/pingu_collider.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/groundtype.hpp"
Copied: trunk/pingus/src/pingus/components (from rev 4037,
trunk/pingus/src/components)
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/components/action_button.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "components/action_button.hpp"
+#include "pingus/components/action_button.hpp"
#include "pingus/globals.hpp"
#include "pingus/server.hpp"
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/components/button_panel.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/button_panel.hpp"
+#include "pingus/components/button_panel.hpp"
#include <iostream>
#include <algorithm>
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/components/button_panel.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -20,7 +20,7 @@
#include <vector>
#include "pingus/sprite.hpp"
#include "gui/rect_component.hpp"
-#include "components/action_button.hpp"
+#include "pingus/components/action_button.hpp"
class GameSession;
Modified: trunk/pingus/src/pingus/components/check_box.cpp
===================================================================
--- trunk/pingus/src/components/check_box.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/check_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/check_box.hpp"
+#include "pingus/components/check_box.hpp"
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/pingus/components/choice_box.cpp
===================================================================
--- trunk/pingus/src/components/choice_box.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/choice_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/choice_box.hpp"
+#include "pingus/components/choice_box.hpp"
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/pingus/components/label.cpp
===================================================================
--- trunk/pingus/src/components/label.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/label.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/label.hpp"
+#include "pingus/components/label.hpp"
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/menu_button.hpp"
+#include "pingus/components/menu_button.hpp"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
Modified: trunk/pingus/src/pingus/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "components/pingus_counter.hpp"
+#include "pingus/components/pingus_counter.hpp"
#include <stdio.h>
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/components/playfield.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/playfield.hpp"
+#include "pingus/components/playfield.hpp"
#include <stdio.h>
#include <iostream>
Modified: trunk/pingus/src/pingus/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/components/slider_box.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/slider_box.hpp"
+#include "pingus/components/slider_box.hpp"
#include "math/math.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/smallmap.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/game_session.hpp"
#include "pingus/pingu_holder.hpp"
@@ -28,7 +28,7 @@
#include "math/math.hpp"
#include "math/vector3f.hpp"
#include "pingus/globals.hpp"
-#include "components/playfield.hpp"
+#include "pingus/components/playfield.hpp"
SmallMap::SmallMap(Server* server_, Playfield* playfield_, const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/components/time_display.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "components/time_display.hpp"
+#include "pingus/components/time_display.hpp"
#include <assert.h>
#include <stdio.h>
Modified: trunk/pingus/src/pingus/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -24,13 +24,13 @@
#include "pingus/server.hpp"
#include "util/pathname.hpp"
#include "pingus/world.hpp"
-#include "components/pingus_counter.hpp"
+#include "pingus/components/pingus_counter.hpp"
#include "gui/gui_manager.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingus_demo.hpp"
#include "gui/surface_button.hpp"
-#include "components/playfield.hpp"
-#include "components/smallmap.hpp"
+#include "pingus/components/playfield.hpp"
+#include "pingus/components/smallmap.hpp"
#include "screen/screen_manager.hpp"
#include "display/display.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/game_session.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/game_session.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -22,11 +22,11 @@
#include "gui/gui_manager.hpp"
#include "display/display.hpp"
-#include "components/button_panel.hpp"
-#include "components/pingus_counter.hpp"
-#include "components/time_display.hpp"
-#include "components/smallmap.hpp"
-#include "components/playfield.hpp"
+#include "pingus/components/button_panel.hpp"
+#include "pingus/components/pingus_counter.hpp"
+#include "pingus/components/time_display.hpp"
+#include "pingus/components/smallmap.hpp"
+#include "pingus/components/playfield.hpp"
#include "input/event.hpp"
#include "sound/sound.hpp"
#include "math/math.hpp"
Copied: trunk/pingus/src/pingus/movers (from rev 4037, trunk/pingus/src/movers)
Modified: trunk/pingus/src/pingus/movers/linear_mover.cpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/movers/linear_mover.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "movers/linear_mover.hpp"
+#include "pingus/movers/linear_mover.hpp"
#include "pingus/collider.hpp"
Modified: trunk/pingus/src/pingus/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -29,10 +29,10 @@
#include "pingus/fonts.hpp"
#include "display/display.hpp"
#include "display/drawing_context.hpp"
-#include "components/label.hpp"
-#include "components/check_box.hpp"
-#include "components/slider_box.hpp"
-#include "components/choice_box.hpp"
+#include "pingus/components/label.hpp"
+#include "pingus/components/check_box.hpp"
+#include "pingus/components/slider_box.hpp"
+#include "pingus/components/choice_box.hpp"
#include "gui/gui_manager.hpp"
#include "sound/sound.hpp"
#include "tinygettext/dictionary_manager.hpp"
Modified: trunk/pingus/src/pingus/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.hpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/option_menu.hpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -22,7 +22,7 @@
#include <boost/signals.hpp>
#include "pingus/sprite.hpp"
#include "screen/gui_screen.hpp"
-#include "components/label.hpp"
+#include "pingus/components/label.hpp"
#include "gui/rect_component.hpp"
#include "gui/surface_button.hpp"
#include "tinygettext/language.hpp"
Copied: trunk/pingus/src/pingus/particles (from rev 4037,
trunk/pingus/src/particles)
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "particles/explosive_particle.hpp"
+#include "pingus/particles/explosive_particle.hpp"
#if 0
#include "pingus/collision_map.hpp"
#include "pingus/pingu_map.hpp"
#include "pingus/world.hpp"
-#include "particles/particle_holder.hpp"
+#include "pingus/particles/particle_holder.hpp"
#include "pingus/resource.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
Modified: trunk/pingus/src/pingus/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/particles/explosive_particle.hpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
#include "pingus/sprite.hpp"
-#include "particles/particle.hpp"
+#include "pingus/particles/particle.hpp"
class ExplosiveParticle
: public Particle
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "particles/pingu_particle_holder.hpp"
+#include "pingus/particles/pingu_particle_holder.hpp"
#include "display/scene_context.hpp"
#include "math/math.hpp"
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "particles/rain_particle_holder.hpp"
+#include "pingus/particles/rain_particle_holder.hpp"
#include "display/scene_context.hpp"
#include "math/math.hpp"
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "particles/smoke_particle_holder.hpp"
+#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/globals.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "particles/snow_particle_holder.hpp"
+#include "pingus/particles/snow_particle_holder.hpp"
#include <assert.h>
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -76,9 +76,9 @@
#include "pingus/resource.hpp"
#include "pingus/credits.hpp"
#include "sound/sound.hpp"
-#include "worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/font_test_screen.hpp"
-#include "worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldobj_factory.hpp"
#include "editor/editor_screen.hpp"
Modified: trunk/pingus/src/pingus/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -18,7 +18,7 @@
#include <config.h>
#include "gettext.h"
-#include "components/menu_button.hpp"
+#include "pingus/components/menu_button.hpp"
#include "pingus/resource.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
@@ -27,8 +27,8 @@
#include "pingus/stat_manager.hpp"
#include "pingus/start_screen.hpp"
#include "pingus/story_screen.hpp"
-#include "worldmap/worldmap.hpp"
-#include "worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
#include "screen/screen_manager.hpp"
#include "gui/gui_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
Modified: trunk/pingus/src/pingus/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -28,9 +28,9 @@
#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/res_descriptor.hpp"
-#include "worldmap/worldmap.hpp"
-#include "worldmap/worldmap_screen.hpp"
-#include "worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/worldmap.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
#include "pingus/stat_manager.hpp"
#include "pingus/credits.hpp"
#include "display/display.hpp"
Modified: trunk/pingus/src/pingus/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.hpp 2009-11-05 22:29:36 UTC (rev
4039)
+++ trunk/pingus/src/pingus/story_screen.hpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -21,7 +21,7 @@
#include <memory>
#include "pingus/res_descriptor.hpp"
#include "screen/gui_screen.hpp"
-#include "worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
class StoryScreenComponent;
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-05 22:29:36 UTC (rev 4039)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-05 22:37:35 UTC (rev 4040)
@@ -21,13 +21,13 @@
#include <iostream>
#include <typeinfo>
#include "pingus/pingu_holder.hpp"
-#include "worldobjs/entrance.hpp"
+#include "pingus/worldobjs/entrance.hpp"
#include "sound/sound.hpp"
#include "pingus/ground_map.hpp"
-#include "particles/pingu_particle_holder.hpp"
-#include "particles/rain_particle_holder.hpp"
-#include "particles/smoke_particle_holder.hpp"
-#include "particles/snow_particle_holder.hpp"
+#include "pingus/particles/pingu_particle_holder.hpp"
+#include "pingus/particles/rain_particle_holder.hpp"
+#include "pingus/particles/smoke_particle_holder.hpp"
+#include "pingus/particles/snow_particle_holder.hpp"
#include "display/display.hpp"
#include "pingus/pingu.hpp"
#include "display/scene_context.hpp"
Copied: trunk/pingus/src/pingus/worldmap (from rev 4037,
trunk/pingus/src/worldmap)
Modified: trunk/pingus/src/pingus/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -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 "worldmap/dot.hpp"
+#include "pingus/worldmap/dot.hpp"
#include <iostream>
#include <assert.h>
Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot.hpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -19,7 +19,7 @@
#include <string>
#include "math/vector3f.hpp"
-#include "worldmap/drawable.hpp"
+#include "pingus/worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/dot_factory.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/dot_factory.hpp"
+#include "pingus/worldmap/dot_factory.hpp"
#include "pingus/pingus_error.hpp"
-#include "worldmap/level_dot.hpp"
+#include "pingus/worldmap/level_dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/drawable.hpp"
+#include "pingus/worldmap/drawable.hpp"
Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldmap/drawable_factory.hpp"
+#include "pingus/worldmap/drawable_factory.hpp"
#include <iostream>
-#include "worldmap/sprite_drawable.hpp"
-#include "worldmap/sprite_drawable.hpp"
+#include "pingus/worldmap/sprite_drawable.hpp"
+#include "pingus/worldmap/sprite_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.hpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
#define HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
-#include "worldmap/drawable.hpp"
+#include "pingus/worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/graph.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldmap/graph.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -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 "worldmap/graph.hpp"
+#include "pingus/worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/level_dot.hpp"
+#include "pingus/worldmap/level_dot.hpp"
#include <iostream>
Modified: trunk/pingus/src/pingus/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/level_dot.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -19,7 +19,7 @@
#include "pingus/sprite.hpp"
#include "pingus/pingus_level.hpp"
-#include "worldmap/dot.hpp"
+#include "pingus/worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/worldmap/path.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -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 "worldmap/path.hpp"
+#include "pingus/worldmap/path.hpp"
#include <iostream>
#include <algorithm>
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/path_drawable.hpp"
+#include "pingus/worldmap/path_drawable.hpp"
#include <iostream>
#include "math/color.hpp"
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
#define HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
-#include "worldmap/drawable.hpp"
-#include "worldmap/path_graph.hpp"
+#include "pingus/worldmap/drawable.hpp"
+#include "pingus/worldmap/path_graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/path_graph.hpp"
+#include "pingus/worldmap/path_graph.hpp"
#include <iostream>
#include "math/math.hpp"
#include "util/file_reader.hpp"
#include "pingus/pingus_error.hpp"
-#include "worldmap/dot.hpp"
-#include "worldmap/dot_factory.hpp"
-#include "worldmap/worldmap.hpp"
-#include "worldmap/pathfinder.hpp"
-#include "worldmap/path_drawable.hpp"
+#include "pingus/worldmap/dot.hpp"
+#include "pingus/worldmap/dot_factory.hpp"
+#include "pingus/worldmap/worldmap.hpp"
+#include "pingus/worldmap/pathfinder.hpp"
+#include "pingus/worldmap/path_drawable.hpp"
#include "pingus/globals.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/path_graph.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -22,9 +22,9 @@
#include "util/file_reader.hpp"
#include "math/vector3f.hpp"
-#include "worldmap/path.hpp"
-#include "worldmap/pathfinder.hpp"
-#include "worldmap/graph.hpp"
+#include "pingus/worldmap/path.hpp"
+#include "pingus/worldmap/pathfinder.hpp"
+#include "pingus/worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/worldmap/pathfinder.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/pathfinder.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_WORLDMAP_PATHFINDER_HPP
#include <queue>
-#include "worldmap/graph.hpp"
+#include "pingus/worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -14,14 +14,14 @@
// 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 "worldmap/pingus.hpp"
+#include "pingus/worldmap/pingus.hpp"
#include <iostream>
#include "math/math.hpp"
#include "math/vector3f.hpp"
#include "display/drawing_context.hpp"
-#include "worldmap/dot.hpp"
+#include "pingus/worldmap/dot.hpp"
#include "pingus/direction.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/pingus.hpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDMAP_PINGUS_HPP
#include "pingus/state_sprite.hpp"
-#include "worldmap/drawable.hpp"
-#include "worldmap/path_graph.hpp"
+#include "pingus/worldmap/drawable.hpp"
+#include "pingus/worldmap/path_graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldmap/pingus_worldmap.hpp"
+#include "pingus/worldmap/pingus_worldmap.hpp"
#include <string>
#include "pingus/pingus_error.hpp"
#include "util/file_reader.hpp"
-#include "worldmap/drawable_factory.hpp"
+#include "pingus/worldmap/drawable_factory.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -19,8 +19,8 @@
#include <boost/smart_ptr.hpp>
-#include "worldmap/worldmap_story.hpp"
-#include "worldmap/path_graph.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/path_graph.hpp"
#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldmap/sprite_drawable.hpp"
+#include "pingus/worldmap/sprite_drawable.hpp"
#include <iostream>
#include "pingus/resource.hpp"
#include "display/drawing_context.hpp"
-#include "worldmap/worldmap_screen.hpp"
-#include "worldmap/worldmap.hpp"
-#include "worldmap/pingus.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap.hpp"
+#include "pingus/worldmap/pingus.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -19,7 +19,7 @@
#include "pingus/sprite.hpp"
#include "math/vector3f.hpp"
-#include "worldmap/drawable.hpp"
+#include "pingus/worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/worldmap.hpp"
+#include "pingus/worldmap/worldmap.hpp"
#include <assert.h>
#include <iostream>
@@ -34,14 +34,14 @@
#include "pingus/debug.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
-#include "worldmap/worldmap_story.hpp"
-#include "worldmap/worldmap_screen.hpp"
-#include "worldmap/pingus.hpp"
-#include "worldmap/drawable_factory.hpp"
-#include "worldmap/drawable.hpp"
-#include "worldmap/dot.hpp"
-#include "worldmap/level_dot.hpp"
-#include "worldmap/path_graph.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/pingus.hpp"
+#include "pingus/worldmap/drawable_factory.hpp"
+#include "pingus/worldmap/drawable.hpp"
+#include "pingus/worldmap/dot.hpp"
+#include "pingus/worldmap/level_dot.hpp"
+#include "pingus/worldmap/path_graph.hpp"
#include "math/math.hpp"
#include "pingus/stat_manager.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldmap/worldmap.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -22,7 +22,7 @@
#include "util/file_reader.hpp"
#include "display/drawing_context.hpp"
#include "pingus/graphic_context_state.hpp"
-#include "worldmap/pingus_worldmap.hpp"
+#include "pingus/worldmap/pingus_worldmap.hpp"
class Font;
class DrawingContext;
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldmap/worldmap_component.hpp"
+#include "pingus/worldmap/worldmap_component.hpp"
#include "display/display.hpp"
#include "display/scene_context.hpp"
-#include "worldmap/worldmap_screen.hpp"
-#include "worldmap/worldmap.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
#include <iostream>
@@ -32,10 +32,10 @@
#include "pingus/story_screen.hpp"
#include "screen/screen_manager.hpp"
#include "sound/sound.hpp"
-#include "worldmap/pingus.hpp"
-#include "worldmap/worldmap.hpp"
-#include "worldmap/worldmap_component.hpp"
-#include "worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/pingus.hpp"
+#include "pingus/worldmap/worldmap.hpp"
+#include "pingus/worldmap/worldmap_component.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldmap/worldmap_story.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
#include <algorithm>
#include <vector>
Modified: trunk/pingus/src/pingus/worldobj_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-05 22:29:36 UTC
(rev 4039)
+++ trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -19,29 +19,29 @@
#include <iostream>
#include "pingus/pingus_error.hpp"
-#include "worldobjs/conveyor_belt.hpp"
-#include "worldobjs/entrance.hpp"
-#include "worldobjs/exit.hpp"
-#include "worldobjs/fake_exit.hpp"
-#include "worldobjs/groundpiece.hpp"
-#include "worldobjs/guillotine.hpp"
-#include "worldobjs/hammer.hpp"
-#include "worldobjs/hotspot.hpp"
-#include "worldobjs/ice_block.hpp"
-#include "worldobjs/laser_exit.hpp"
-#include "worldobjs/liquid.hpp"
-#include "worldobjs/rain_generator.hpp"
-#include "worldobjs/smasher.hpp"
-#include "worldobjs/snow_generator.hpp"
-#include "worldobjs/solid_color_background.hpp"
-#include "worldobjs/spike.hpp"
-#include "worldobjs/starfield_background.hpp"
-#include "worldobjs/surface_background.hpp"
-#include "worldobjs/switch_door.hpp"
-#include "worldobjs/teleporter.hpp"
-#include "worldobjs/teleporter_target.hpp"
-#include "worldobjs/thunderstorm_background.hpp"
-#include "worldobjs/woodthing.hpp"
+#include "pingus/worldobjs/conveyor_belt.hpp"
+#include "pingus/worldobjs/entrance.hpp"
+#include "pingus/worldobjs/exit.hpp"
+#include "pingus/worldobjs/fake_exit.hpp"
+#include "pingus/worldobjs/groundpiece.hpp"
+#include "pingus/worldobjs/guillotine.hpp"
+#include "pingus/worldobjs/hammer.hpp"
+#include "pingus/worldobjs/hotspot.hpp"
+#include "pingus/worldobjs/ice_block.hpp"
+#include "pingus/worldobjs/laser_exit.hpp"
+#include "pingus/worldobjs/liquid.hpp"
+#include "pingus/worldobjs/rain_generator.hpp"
+#include "pingus/worldobjs/smasher.hpp"
+#include "pingus/worldobjs/snow_generator.hpp"
+#include "pingus/worldobjs/solid_color_background.hpp"
+#include "pingus/worldobjs/spike.hpp"
+#include "pingus/worldobjs/starfield_background.hpp"
+#include "pingus/worldobjs/surface_background.hpp"
+#include "pingus/worldobjs/switch_door.hpp"
+#include "pingus/worldobjs/teleporter.hpp"
+#include "pingus/worldobjs/teleporter_target.hpp"
+#include "pingus/worldobjs/thunderstorm_background.hpp"
+#include "pingus/worldobjs/woodthing.hpp"
using namespace WorldObjs;
Copied: trunk/pingus/src/pingus/worldobjs (from rev 4037,
trunk/pingus/src/worldobjs)
Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/conveyor_belt.hpp"
+#include "pingus/worldobjs/conveyor_belt.hpp"
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/entrance.hpp"
+#include "pingus/worldobjs/entrance.hpp"
#include <iostream>
#include "display/scene_context.hpp"
@@ -23,7 +23,7 @@
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/resource.hpp"
-#include "components/smallmap.hpp"
+#include "pingus/components/smallmap.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -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 "worldobjs/exit.hpp"
+#include "pingus/worldobjs/exit.hpp"
#include <iostream>
#include "display/scene_context.hpp"
@@ -23,7 +23,7 @@
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/pingu.hpp"
-#include "components/smallmap.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/resource.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/fake_exit.hpp"
+#include "pingus/worldobjs/fake_exit.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
-#include "components/smallmap.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/groundpiece.hpp"
+#include "pingus/worldobjs/groundpiece.hpp"
#include <iostream>
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/guillotine.hpp"
+#include "pingus/worldobjs/guillotine.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/hammer.hpp"
+#include "pingus/worldobjs/hammer.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/hotspot.hpp"
+#include "pingus/worldobjs/hotspot.hpp"
#include <iostream>
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/ice_block.hpp"
+#include "pingus/worldobjs/ice_block.hpp"
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/laser_exit.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/laser_exit.hpp"
+#include "pingus/worldobjs/laser_exit.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/liquid.hpp"
+#include "pingus/worldobjs/liquid.hpp"
#include <iostream>
#include "pingus/collision_map.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/rain_generator.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/rain_generator.hpp"
+#include "pingus/worldobjs/rain_generator.hpp"
#include <iostream>
-#include "particles/rain_particle_holder.hpp"
+#include "pingus/particles/rain_particle_holder.hpp"
#include "sound/sound.hpp"
#include "pingus/world.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -14,14 +14,14 @@
// 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 "worldobjs/smasher.hpp"
+#include "pingus/worldobjs/smasher.hpp"
#include <iostream>
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
-#include "particles/smoke_particle_holder.hpp"
+#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/snow_generator.hpp"
+#include "pingus/worldobjs/snow_generator.hpp"
#include <iostream>
#include "math/math.hpp"
#include "pingus/world.hpp"
-#include "particles/snow_particle_holder.hpp"
+#include "pingus/particles/snow_particle_holder.hpp"
#include "pingus/globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-05 22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/solid_color_background.hpp"
+#include "pingus/worldobjs/solid_color_background.hpp"
#include "display/display.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-05 22:37:35 UTC (rev
4040)
@@ -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 "worldobjs/spike.hpp"
+#include "pingus/worldobjs/spike.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/starfield_background.hpp"
+#include "pingus/worldobjs/starfield_background.hpp"
#include <iostream>
-#include "worldobjs/starfield_background_stars.hpp"
+#include "pingus/worldobjs/starfield_background_stars.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-05 22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/starfield_background_stars.hpp"
+#include "pingus/worldobjs/starfield_background_stars.hpp"
#include "display/scene_context.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/surface_background.hpp"
+#include "pingus/worldobjs/surface_background.hpp"
#include <iostream>
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/switch_door.hpp"
+#include "pingus/worldobjs/switch_door.hpp"
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/teleporter.hpp"
+#include "pingus/worldobjs/teleporter.hpp"
#include <iostream>
#include "display/scene_context.hpp"
@@ -22,7 +22,7 @@
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/teleporter_target.hpp"
+#include "pingus/worldobjs/teleporter_target.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-05
22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/teleporter_target.hpp"
+#include "pingus/worldobjs/teleporter_target.hpp"
#include <iostream>
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-05 22:37:35 UTC (rev 4040)
@@ -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 "worldobjs/thunderstorm_background.hpp"
+#include "pingus/worldobjs/thunderstorm_background.hpp"
#include "pingus/resource.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -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 "worldobjs/woodthing.hpp"
+#include "pingus/worldobjs/woodthing.hpp"
#include "math/math.hpp"
#include "display/scene_context.hpp"
-#include "particles/smoke_particle_holder.hpp"
+#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.hpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
#define HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
-#include "worldobjs/entrance.hpp"
+#include "pingus/worldobjs/entrance.hpp"
namespace WorldObjs {
// FIXME: Re-enable this namespace.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4040 - in trunk/pingus: . src src/pingus src/pingus/actions src/pingus/colliders src/pingus/components src/pingus/movers src/pingus/particles src/pingus/worldmap src/pingus/worldobjs,
grumbel at BerliOS <=