[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4007 - in trunk/pingus/src: colliders display editor gui i
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4007 - in trunk/pingus/src: colliders display editor gui input particles screen sound util worldmap worldobjs |
|
Date: |
Wed, 4 Nov 2009 02:39:23 +0100 |
Author: grumbel
Date: 2009-11-04 02:39:16 +0100 (Wed, 04 Nov 2009)
New Revision: 4007
Modified:
trunk/pingus/src/colliders/pingu_collider.cpp
trunk/pingus/src/display/delta_framebuffer.cpp
trunk/pingus/src/display/delta_framebuffer.hpp
trunk/pingus/src/display/display.cpp
trunk/pingus/src/display/drawing_context.cpp
trunk/pingus/src/display/drawing_context.hpp
trunk/pingus/src/display/framebuffer.hpp
trunk/pingus/src/display/framebuffer_surface.cpp
trunk/pingus/src/display/framebuffer_surface.hpp
trunk/pingus/src/display/null_framebuffer.cpp
trunk/pingus/src/display/null_framebuffer.hpp
trunk/pingus/src/display/opengl_framebuffer.cpp
trunk/pingus/src/display/opengl_framebuffer.hpp
trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/display/rect_merger.cpp
trunk/pingus/src/display/scene_context.cpp
trunk/pingus/src/display/scene_context.hpp
trunk/pingus/src/display/sdl_framebuffer.cpp
trunk/pingus/src/display/sdl_framebuffer.hpp
trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/editor/action_properties.cpp
trunk/pingus/src/editor/button.cpp
trunk/pingus/src/editor/checkbox.cpp
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/editor_level.cpp
trunk/pingus/src/editor/editor_level.hpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/editor/file_dialog.cpp
trunk/pingus/src/editor/file_dialog.hpp
trunk/pingus/src/editor/file_list.cpp
trunk/pingus/src/editor/file_list.hpp
trunk/pingus/src/editor/gui_style.cpp
trunk/pingus/src/editor/inputbox.cpp
trunk/pingus/src/editor/label.cpp
trunk/pingus/src/editor/level_impl.hpp
trunk/pingus/src/editor/level_objs.cpp
trunk/pingus/src/editor/level_properties.cpp
trunk/pingus/src/editor/minimap.cpp
trunk/pingus/src/editor/object_properties.cpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/object_selector_set.cpp
trunk/pingus/src/editor/object_selector_set.hpp
trunk/pingus/src/editor/panel.cpp
trunk/pingus/src/editor/panel.hpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/gui/component.cpp
trunk/pingus/src/gui/group_component.cpp
trunk/pingus/src/gui/group_component.hpp
trunk/pingus/src/gui/gui_manager.cpp
trunk/pingus/src/gui/gui_manager.hpp
trunk/pingus/src/gui/rect_component.hpp
trunk/pingus/src/gui/surface_button.cpp
trunk/pingus/src/gui/surface_button.hpp
trunk/pingus/src/input/control.hpp
trunk/pingus/src/input/controller.cpp
trunk/pingus/src/input/controller.hpp
trunk/pingus/src/input/controller_description.cpp
trunk/pingus/src/input/controller_description.hpp
trunk/pingus/src/input/core_driver.cpp
trunk/pingus/src/input/core_driver.hpp
trunk/pingus/src/input/driver.hpp
trunk/pingus/src/input/evdev_device.cpp
trunk/pingus/src/input/evdev_device.hpp
trunk/pingus/src/input/evdev_driver.cpp
trunk/pingus/src/input/evdev_driver.hpp
trunk/pingus/src/input/main.cpp
trunk/pingus/src/input/manager.cpp
trunk/pingus/src/input/manager.hpp
trunk/pingus/src/input/sdl_driver.cpp
trunk/pingus/src/input/sdl_driver.hpp
trunk/pingus/src/input/usbmouse_driver.cpp
trunk/pingus/src/input/usbmouse_driver.hpp
trunk/pingus/src/input/wiimote.cpp
trunk/pingus/src/input/wiimote_driver.cpp
trunk/pingus/src/input/wiimote_driver.hpp
trunk/pingus/src/input/xinput_device.cpp
trunk/pingus/src/input/xinput_driver.cpp
trunk/pingus/src/input/xinput_driver.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/rain_particle_holder.cpp
trunk/pingus/src/particles/smoke_particle_holder.cpp
trunk/pingus/src/particles/snow_particle_holder.cpp
trunk/pingus/src/screen/gui_screen.cpp
trunk/pingus/src/screen/gui_screen.hpp
trunk/pingus/src/screen/screen.cpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/screen/screen_manager_impl.hpp
trunk/pingus/src/sound/sound.cpp
trunk/pingus/src/sound/sound.hpp
trunk/pingus/src/sound/sound_dummy.cpp
trunk/pingus/src/sound/sound_dummy.hpp
trunk/pingus/src/sound/sound_real.cpp
trunk/pingus/src/sound/sound_real.hpp
trunk/pingus/src/sound/sound_res_mgr.cpp
trunk/pingus/src/util/command_line.cpp
trunk/pingus/src/util/command_line_generic.cpp
trunk/pingus/src/util/command_line_generic.hpp
trunk/pingus/src/util/debug_stream.cpp
trunk/pingus/src/util/debug_stream.hpp
trunk/pingus/src/util/file_reader.cpp
trunk/pingus/src/util/pathname.cpp
trunk/pingus/src/util/sexpr_file_reader.cpp
trunk/pingus/src/util/sexpr_file_reader.hpp
trunk/pingus/src/util/sexpr_file_writer.cpp
trunk/pingus/src/util/sexpr_file_writer.hpp
trunk/pingus/src/util/string_util.cpp
trunk/pingus/src/util/system.cpp
trunk/pingus/src/util/system.hpp
trunk/pingus/src/worldmap/dot.cpp
trunk/pingus/src/worldmap/dot.hpp
trunk/pingus/src/worldmap/dot_factory.cpp
trunk/pingus/src/worldmap/drawable.cpp
trunk/pingus/src/worldmap/drawable_factory.cpp
trunk/pingus/src/worldmap/drawable_factory.hpp
trunk/pingus/src/worldmap/graph.cpp
trunk/pingus/src/worldmap/level_dot.cpp
trunk/pingus/src/worldmap/level_dot.hpp
trunk/pingus/src/worldmap/path.cpp
trunk/pingus/src/worldmap/path_drawable.cpp
trunk/pingus/src/worldmap/path_drawable.hpp
trunk/pingus/src/worldmap/path_graph.cpp
trunk/pingus/src/worldmap/path_graph.hpp
trunk/pingus/src/worldmap/pathfinder.hpp
trunk/pingus/src/worldmap/pingus.cpp
trunk/pingus/src/worldmap/pingus.hpp
trunk/pingus/src/worldmap/pingus_worldmap.cpp
trunk/pingus/src/worldmap/pingus_worldmap.hpp
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_screen.cpp
trunk/pingus/src/worldmap/worldmap_story.cpp
trunk/pingus/src/worldobjs/conveyor_belt.cpp
trunk/pingus/src/worldobjs/entrance.cpp
trunk/pingus/src/worldobjs/exit.cpp
trunk/pingus/src/worldobjs/fake_exit.cpp
trunk/pingus/src/worldobjs/groundpiece.cpp
trunk/pingus/src/worldobjs/guillotine.cpp
trunk/pingus/src/worldobjs/hammer.cpp
trunk/pingus/src/worldobjs/hotspot.cpp
trunk/pingus/src/worldobjs/ice_block.cpp
trunk/pingus/src/worldobjs/laser_exit.cpp
trunk/pingus/src/worldobjs/liquid.cpp
trunk/pingus/src/worldobjs/rain_generator.cpp
trunk/pingus/src/worldobjs/smasher.cpp
trunk/pingus/src/worldobjs/snow_generator.cpp
trunk/pingus/src/worldobjs/solid_color_background.cpp
trunk/pingus/src/worldobjs/spike.cpp
trunk/pingus/src/worldobjs/starfield_background.cpp
trunk/pingus/src/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/worldobjs/surface_background.cpp
trunk/pingus/src/worldobjs/switch_door.cpp
trunk/pingus/src/worldobjs/teleporter.cpp
trunk/pingus/src/worldobjs/teleporter_target.cpp
trunk/pingus/src/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/worldobjs/woodthing.cpp
trunk/pingus/src/worldobjs/woodthing.hpp
Log:
Cleaned up some include paths
Modified: trunk/pingus/src/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/colliders/pingu_collider.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,7 +17,7 @@
#include "../pingu_action.hpp"
#include "../groundtype.hpp"
#include "../math/vector3f.hpp"
-#include "pingu_collider.hpp"
+#include "colliders/pingu_collider.hpp"
namespace Colliders {
Modified: trunk/pingus/src/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,9 +18,9 @@
#include <iostream>
#include "math/math.hpp"
#include "util/memory_pool.hpp"
-#include "rect_merger.hpp"
-#include "sdl_framebuffer.hpp"
-#include "delta_framebuffer.hpp"
+#include "display/rect_merger.hpp"
+#include "display/sdl_framebuffer.hpp"
+#include "display/delta_framebuffer.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
Modified: trunk/pingus/src/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -20,7 +20,7 @@
#include <memory>
#include <map>
#include "../math/vector2i.hpp"
-#include "framebuffer.hpp"
+#include "display/framebuffer.hpp"
class SDLFramebuffer;
class DrawOpBuffer;
Modified: trunk/pingus/src/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/display/display.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -26,13 +26,13 @@
#include "../math/color.hpp"
#include "math/math.hpp"
#include "../screen/screen_manager.hpp"
-#include "sdl_framebuffer.hpp"
+#include "display/sdl_framebuffer.hpp"
#ifdef HAVE_OPENGL
# include "opengl_framebuffer.hpp"
#endif
-#include "null_framebuffer.hpp"
-#include "delta_framebuffer.hpp"
-#include "display.hpp"
+#include "display/null_framebuffer.hpp"
+#include "display/delta_framebuffer.hpp"
+#include "display/display.hpp"
std::auto_ptr<Framebuffer> Display::framebuffer;
Modified: trunk/pingus/src/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/drawing_context.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,9 +17,9 @@
#include <assert.h>
#include <iostream>
#include <algorithm>
-#include "drawing_context.hpp"
+#include "display/drawing_context.hpp"
#include "math/math.hpp"
-#include "framebuffer.hpp"
+#include "display/framebuffer.hpp"
#include "display/display.hpp"
#include "../sprite.hpp"
#include "../font.hpp"
Modified: trunk/pingus/src/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/display/drawing_context.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/drawing_context.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include "SDL.h"
#include <vector>
-#include "drawing_request.hpp"
+#include "display/drawing_request.hpp"
#include "../math/vector3f.hpp"
#include "../math/rect.hpp"
#include "../math/color.hpp"
Modified: trunk/pingus/src/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/display/framebuffer.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -23,7 +23,7 @@
#include "math/vector2i.hpp"
#include "math/size.hpp"
#include "math/rect.hpp"
-#include "framebuffer_surface.hpp"
+#include "display/framebuffer_surface.hpp"
class Surface;
Modified: trunk/pingus/src/display/framebuffer_surface.cpp
===================================================================
--- trunk/pingus/src/display/framebuffer_surface.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/framebuffer_surface.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -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 "framebuffer_surface.hpp"
+#include "display/framebuffer_surface.hpp"
FramebufferSurface::FramebufferSurface()
{
Modified: trunk/pingus/src/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer_surface.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/framebuffer_surface.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,8 +18,9 @@
#define HEADER_FRAMEBUFFER_SURFACE_HPP
#include <boost/smart_ptr.hpp>
+
#include "surface.hpp"
-#include "../math/size.hpp"
+#include "math/size.hpp"
class FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/display/null_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/null_framebuffer.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "null_framebuffer.hpp"
+#include "display/null_framebuffer.hpp"
class NullFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/display/null_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/null_framebuffer.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_NULL_FRAMEBUFFER_HPP
#define HEADER_NULL_FRAMEBUFFER_HPP
-#include "framebuffer.hpp"
+#include "display/framebuffer.hpp"
/** NullFramebuffer is an empty dummy class for debugging purposes */
class NullFramebuffer : public Framebuffer
Modified: trunk/pingus/src/display/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,10 +18,10 @@
#include <iostream>
#include <stdexcept>
+#include "display/opengl_framebuffer.hpp"
+#include "display/opengl_framebuffer_surface_impl.hpp"
#include "math/math.hpp"
#include "surface.hpp"
-#include "opengl_framebuffer_surface_impl.hpp"
-#include "opengl_framebuffer.hpp"
OpenGLFramebuffer::OpenGLFramebuffer()
{
Modified: trunk/pingus/src/display/opengl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/opengl_framebuffer.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_OPENGL_FRAMEBUFFER_HPP
#define HEADER_OPENGL_FRAMEBUFFER_HPP
-#include "framebuffer.hpp"
+#include "display/framebuffer.hpp"
class OpenGLFramebuffer : public Framebuffer
{
Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.cpp
2009-11-04 01:39:16 UTC (rev 4007)
@@ -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 "opengl_framebuffer_surface_impl.hpp"
+#include "display/opengl_framebuffer_surface_impl.hpp"
namespace {
Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
2009-11-04 01:39:16 UTC (rev 4007)
@@ -31,7 +31,7 @@
#endif
#include "SDL.h"
-#include "framebuffer_surface.hpp"
+#include "display/framebuffer_surface.hpp"
class OpenGLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/display/rect_merger.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/display/rect_merger.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,7 +20,7 @@
#include <iostream>
#include "../math/vector2i.hpp"
#include "../math/size.hpp"
-#include "rect_merger.hpp"
+#include "display/rect_merger.hpp"
struct Mark {
enum Type { START_MARK = 0, END_MARK = 1 } type;
Modified: trunk/pingus/src/display/scene_context.cpp
===================================================================
--- trunk/pingus/src/display/scene_context.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/display/scene_context.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "display/framebuffer.hpp"
-#include "scene_context.hpp"
+#include "display/scene_context.hpp"
#define SCALE_FACTOR 8.0f
Modified: trunk/pingus/src/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/display/scene_context.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/display/scene_context.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_SCENE_CONTEXT_HPP
#include "SDL.h"
-#include "drawing_context.hpp"
+#include "display/drawing_context.hpp"
class SceneContextImpl;
Modified: trunk/pingus/src/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,9 +17,9 @@
#include <iostream>
#include "math/math.hpp"
#include "../surface.hpp"
-#include "display.hpp"
-#include "sdl_framebuffer.hpp"
-#include "sdl_framebuffer_surface_impl.hpp"
+#include "display/display.hpp"
+#include "display/sdl_framebuffer.hpp"
+#include "display/sdl_framebuffer_surface_impl.hpp"
namespace {
Modified: trunk/pingus/src/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/display/sdl_framebuffer.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -22,7 +22,7 @@
#include "math/color.hpp"
#include "math/vector2i.hpp"
#include "math/rect.hpp"
-#include "framebuffer.hpp"
+#include "display/framebuffer.hpp"
class SDLFramebuffer : public Framebuffer
{
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdexcept>
-#include "sdl_framebuffer_surface_impl.hpp"
+#include "display/sdl_framebuffer_surface_impl.hpp"
SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src)
{
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -18,7 +18,7 @@
#define HEADER_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#include "SDL.h"
-#include "framebuffer_surface.hpp"
+#include "display/framebuffer_surface.hpp"
/** */
class SDLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -16,11 +16,11 @@
#include <iostream>
#include <boost/bind.hpp>
-#include "gui_style.hpp"
-#include "checkbox.hpp"
-#include "editor_level.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/checkbox.hpp"
+#include "editor/editor_level.hpp"
#include "pingu_enums.hpp"
-#include "inputbox.hpp"
+#include "editor/inputbox.hpp"
#include "util/string_util.hpp"
#include "action_properties.hpp"
Modified: trunk/pingus/src/editor/button.cpp
===================================================================
--- trunk/pingus/src/editor/button.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/editor/button.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "fonts.hpp"
-#include "gui_style.hpp"
-#include "button.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/button.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/checkbox.cpp
===================================================================
--- trunk/pingus/src/editor/checkbox.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/checkbox.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "fonts.hpp"
-#include "gui_style.hpp"
-#include "checkbox.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/checkbox.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,10 +19,10 @@
#include <string>
#include "resource.hpp"
-#include "combobox.hpp"
+#include "editor/combobox.hpp"
#include "math/math.hpp"
-#include "../fonts.hpp"
-#include "../math/vector2i.hpp"
+#include "fonts.hpp"
+#include "math/vector2i.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -21,12 +21,12 @@
#include <fstream>
#include "../pingus_level.hpp"
-#include "editor_level.hpp"
-#include "level_impl.hpp"
-#include "level_objs.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/level_impl.hpp"
+#include "editor/level_objs.hpp"
#include "util/pathname.hpp"
#include "util/sexpr_file_writer.hpp"
-#include "viewport.hpp"
+#include "editor/viewport.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_level.hpp
===================================================================
--- trunk/pingus/src/editor/editor_level.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/editor_level.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#define HEADER_PINGUS_EDITOR_EDITORLEVEL_HPP
#include <vector>
-#include "level_impl.hpp"
+#include "editor/level_impl.hpp"
class Pathname;
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -28,21 +28,21 @@
#include "../resource.hpp"
#include "../fonts.hpp"
#include "gettext.h"
-#include "file_dialog.hpp"
+#include "editor/file_dialog.hpp"
#include "../path_manager.hpp"
#include "util/pathname.hpp"
#include "game_session.hpp"
-#include "editor_level.hpp"
-#include "panel.hpp"
-#include "panel.hpp"
-#include "minimap.hpp"
-#include "editor_screen.hpp"
-#include "viewport.hpp"
-#include "level_objs.hpp"
-#include "object_selector.hpp"
-#include "object_properties.hpp"
-#include "action_properties.hpp"
-#include "level_properties.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/panel.hpp"
+#include "editor/panel.hpp"
+#include "editor/minimap.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/viewport.hpp"
+#include "editor/level_objs.hpp"
+#include "editor/object_selector.hpp"
+#include "editor/object_properties.hpp"
+#include "editor/action_properties.hpp"
+#include "editor/level_properties.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,7 +20,7 @@
#include "../screen/gui_screen.hpp"
#include "util/pathname.hpp"
-#include "file_dialog.hpp"
+#include "editor/file_dialog.hpp"
class DrawingContext;
class FileDialog;
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,16 +19,16 @@
#include "display/drawing_context.hpp"
#include "gui/gui_manager.hpp"
-#include "editor_screen.hpp"
+#include "editor/editor_screen.hpp"
#include "util/system.hpp"
-#include "gui_style.hpp"
+#include "editor/gui_style.hpp"
#include "fonts.hpp"
#include "gettext.h"
-#include "label.hpp"
-#include "inputbox.hpp"
+#include "editor/label.hpp"
+#include "editor/inputbox.hpp"
#include "util/pathname.hpp"
-#include "button.hpp"
-#include "file_dialog.hpp"
+#include "editor/button.hpp"
+#include "editor/file_dialog.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_dialog.hpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/file_dialog.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_FILE_DIALOG_HPP
#define HEADER_FILE_DIALOG_HPP
-#include "file_list.hpp"
+#include "editor/file_list.hpp"
#include "gui/group_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -16,11 +16,11 @@
#include <iostream>
+#include "editor/file_list.hpp"
+#include "editor/gui_style.hpp"
+#include "fonts.hpp"
#include "math/math.hpp"
-#include "fonts.hpp"
-#include "file_list.hpp"
-#include "gui_style.hpp"
-#include "../math/vector2i.hpp"
+#include "math/vector2i.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_list.hpp
===================================================================
--- trunk/pingus/src/editor/file_list.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/file_list.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,9 +18,10 @@
#define HEADER_FILE_LIST_HPP
#include <boost/signal.hpp>
-#include "util/system.hpp"
+
#include "sprite.hpp"
#include "gui/rect_component.hpp"
+#include "util/system.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/gui_style.cpp
===================================================================
--- trunk/pingus/src/editor/gui_style.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/gui_style.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "gui_style.hpp"
+#include "editor/gui_style.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/inputbox.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,9 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
+
#include "fonts.hpp"
#include "display/drawing_context.hpp"
-#include "inputbox.hpp"
+#include "editor/inputbox.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/label.cpp
===================================================================
--- trunk/pingus/src/editor/label.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/editor/label.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -16,7 +16,7 @@
#include "display/drawing_context.hpp"
#include "fonts.hpp"
-#include "label.hpp"
+#include "editor/label.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_impl.hpp
===================================================================
--- trunk/pingus/src/editor/level_impl.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/level_impl.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -22,8 +22,8 @@
#include <string>
#include <vector>
#include <algorithm>
-#include "editor_screen.hpp"
-#include "level_objs.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/level_objs.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,8 +17,8 @@
#include <string>
#include <iostream>
-#include "level_objs.hpp"
-#include "level_impl.hpp"
+#include "editor/level_objs.hpp"
+#include "editor/level_impl.hpp"
#include "../blitter.hpp"
#include "../resource.hpp"
#include "../res_descriptor.hpp"
Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/level_properties.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,12 +18,12 @@
#include <boost/bind.hpp>
#include "util/string_util.hpp"
-#include "label.hpp"
-#include "inputbox.hpp"
-#include "gui_style.hpp"
-#include "editor_level.hpp"
-#include "viewport.hpp"
-#include "level_properties.hpp"
+#include "editor/label.hpp"
+#include "editor/inputbox.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/viewport.hpp"
+#include "editor/level_properties.hpp"
/*
Level Properties:
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -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 "editor_level.hpp"
-#include "editor_screen.hpp"
-#include "viewport.hpp"
-#include "level_objs.hpp"
-#include "gui_style.hpp"
-#include "minimap.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/viewport.hpp"
+#include "editor/level_objs.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/minimap.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/object_properties.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,18 +18,18 @@
#include <iostream>
#include "util/string_util.hpp"
-#include "button.hpp"
-#include "editor_screen.hpp"
-#include "level_objs.hpp"
+#include "editor/button.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/level_objs.hpp"
#include "fonts.hpp"
-#include "label.hpp"
+#include "editor/label.hpp"
#include "gettext.h"
-#include "gui_style.hpp"
+#include "editor/gui_style.hpp"
#include "groundtype.hpp"
-#include "combobox.hpp"
-#include "inputbox.hpp"
-#include "checkbox.hpp"
-#include "object_properties.hpp"
+#include "editor/combobox.hpp"
+#include "editor/inputbox.hpp"
+#include "editor/checkbox.hpp"
+#include "editor/object_properties.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,22 +18,22 @@
#include <iostream>
#include "display/display.hpp"
-#include "gui_style.hpp"
+#include "editor/gui_style.hpp"
#include "sprite.hpp"
#include "gettext.h"
#include "math/vector2i.hpp"
-#include "editor_screen.hpp"
+#include "editor/editor_screen.hpp"
#include "display/drawing_context.hpp"
#include "fonts.hpp"
#include "math/math.hpp"
-#include "viewport.hpp"
-#include "editor_level.hpp"
-#include "object_selector_list.hpp"
-#include "object_selector_set.hpp"
-#include "level_objs.hpp"
+#include "editor/viewport.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/object_selector_list.hpp"
+#include "editor/object_selector_set.hpp"
+#include "editor/level_objs.hpp"
#include "display/drawing_context.hpp"
#include "gui/gui_manager.hpp"
-#include "object_selector.hpp"
+#include "editor/object_selector.hpp"
#include "resource.hpp"
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,6 +19,7 @@
#include "gui/component.hpp"
#include "res_descriptor.hpp"
+
class DrawingContext;
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,15 +17,15 @@
#include <iostream>
#include "math/math.hpp"
-#include "editor_screen.hpp"
-#include "object_selector_set.hpp"
-#include "object_selector.hpp"
-#include "viewport.hpp"
-#include "editor_level.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/object_selector_set.hpp"
+#include "editor/object_selector.hpp"
+#include "editor/viewport.hpp"
+#include "editor/editor_level.hpp"
#include "groundtype.hpp"
#include "resource.hpp"
#include "display/drawing_context.hpp"
-#include "object_selector_list.hpp"
+#include "editor/object_selector_list.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector_set.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/object_selector_set.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -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 "object_selector_set.hpp"
+#include "editor/object_selector_set.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector_set.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/editor/object_selector_set.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include <vector>
#include "math/size.hpp"
-#include "object_selector_list.hpp"
+#include "editor/object_selector_list.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -21,9 +21,9 @@
#include "sprite.hpp"
#include "gettext.h"
#include "math/vector2i.hpp"
-#include "editor_screen.hpp"
+#include "editor/editor_screen.hpp"
#include "gui/gui_manager.hpp"
-#include "panel.hpp"
+#include "editor/panel.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/editor/panel.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -19,9 +19,10 @@
#define HEADER_PINGUS_EDITOR_PANEL_HPP
#include <string>
+
#include "sprite.hpp"
#include "math/vector2i.hpp"
-#include "../gui/component.hpp"
+#include "gui/component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -23,10 +23,10 @@
#include "../display/drawing_context.hpp"
#include "../math/vector3f.hpp"
#include "../graphic_context_state.hpp"
-#include "editor_level.hpp"
-#include "editor_screen.hpp"
-#include "viewport.hpp"
-#include "level_objs.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/viewport.hpp"
+#include "editor/level_objs.hpp"
namespace Editor {
Modified: trunk/pingus/src/gui/component.cpp
===================================================================
--- trunk/pingus/src/gui/component.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/gui/component.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <assert.h>
-#include "group_component.hpp"
-#include "component.hpp"
+#include "gui/group_component.hpp"
+#include "gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/gui/group_component.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/group_component.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -16,7 +16,7 @@
#include <assert.h>
#include <iostream>
-#include "group_component.hpp"
+#include "gui/group_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/group_component.hpp
===================================================================
--- trunk/pingus/src/gui/group_component.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/group_component.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_GROUP_COMPONENT_HPP
#include "display/drawing_context.hpp"
-#include "rect_component.hpp"
+#include "gui/rect_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/gui_manager.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../globals.hpp"
#include "../input/event.hpp"
#include "display/display.hpp"
-#include "gui_manager.hpp"
+#include "gui/gui_manager.hpp"
using namespace Input;
Modified: trunk/pingus/src/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/gui_manager.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include <vector>
#include "../input/event.hpp"
-#include "group_component.hpp"
+#include "gui/group_component.hpp"
class DrawingContext;
class GameDelta;
Modified: trunk/pingus/src/gui/rect_component.hpp
===================================================================
--- trunk/pingus/src/gui/rect_component.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/rect_component.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_RECT_COMPONENT_HPP
#include "math/rect.hpp"
-#include "component.hpp"
+#include "gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/gui/surface_button.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/surface_button.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#include "../resource.hpp"
#include "../math/vector3f.hpp"
#include "../display/drawing_context.hpp"
-#include "surface_button.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:27:10 UTC (rev
4006)
+++ trunk/pingus/src/gui/surface_button.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
#include "../sprite.hpp"
-#include "component.hpp"
+#include "gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/control.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -22,8 +22,8 @@
#include "math/math.hpp"
#include "math/vector2f.hpp"
-#include "event.hpp"
-#include "controller.hpp"
+#include "input/event.hpp"
+#include "input/controller.hpp"
namespace Input {
Modified: trunk/pingus/src/input/controller.cpp
===================================================================
--- trunk/pingus/src/input/controller.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/controller.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "controller_description.hpp"
-#include "control.hpp"
-#include "controller.hpp"
+#include "input/controller_description.hpp"
+#include "input/control.hpp"
+#include "input/controller.hpp"
namespace Input {
Modified: trunk/pingus/src/input/controller.hpp
===================================================================
--- trunk/pingus/src/input/controller.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/controller.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_INPUT_CONTROLLER_HPP
#include <assert.h>
-#include "event.hpp"
+#include "input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/input/controller_description.cpp
===================================================================
--- trunk/pingus/src/input/controller_description.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/input/controller_description.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdexcept>
-#include "controller_description.hpp"
+#include "input/controller_description.hpp"
namespace Input {
Modified: trunk/pingus/src/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/input/controller_description.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/input/controller_description.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include <map>
#include <string>
-#include "event.hpp"
+#include "input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/core_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "math/math.hpp"
-#include "manager.hpp"
-#include "core_driver.hpp"
+#include "input/manager.hpp"
+#include "input/core_driver.hpp"
#include "../display/display.hpp"
#include "globals.hpp"
Modified: trunk/pingus/src/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/input/core_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/core_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_CORE_DRIVER_HPP
#define HEADER_CORE_DRIVER_HPP
-#include "driver.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/driver.hpp
===================================================================
--- trunk/pingus/src/input/driver.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/driver.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_INPUT_DRIVER_HPP
#include "util/file_reader.hpp"
-#include "control.hpp"
+#include "input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/input/evdev_device.cpp
===================================================================
--- trunk/pingus/src/input/evdev_device.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/evdev_device.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -24,7 +24,7 @@
#include <errno.h>
#include <stdio.h>
-#include "evdev_device.hpp"
+#include "input/evdev_device.hpp"
#define BITS_PER_LONG (sizeof(long) * 8)
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
Modified: trunk/pingus/src/input/evdev_device.hpp
===================================================================
--- trunk/pingus/src/input/evdev_device.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/evdev_device.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include <vector>
#include <string.h>
-#include "control.hpp"
+#include "input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/input/evdev_driver.cpp
===================================================================
--- trunk/pingus/src/input/evdev_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/evdev_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "evdev_device.hpp"
-#include "evdev_driver.hpp"
+#include "input/evdev_device.hpp"
+#include "input/evdev_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/evdev_driver.hpp
===================================================================
--- trunk/pingus/src/input/evdev_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/evdev_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
#define HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
-#include "driver.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/main.cpp
===================================================================
--- trunk/pingus/src/input/main.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/main.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -1,7 +1,7 @@
#include <stdexcept>
#include "SDL.h"
-#include "manager.hpp"
-#include "controller.hpp"
+#include "input/manager.hpp"
+#include "input/controller.hpp"
int main()
{
Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/manager.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -20,8 +20,8 @@
#include "pingus_error.hpp"
#include "util/pathname.hpp"
#include "path_manager.hpp"
-#include "sdl_driver.hpp"
-#include "core_driver.hpp"
+#include "input/sdl_driver.hpp"
+#include "input/core_driver.hpp"
#ifdef HAVE_CWIID
# include "wiimote_driver.hpp"
#endif
@@ -34,7 +34,7 @@
#ifdef HAVE_LINUXEVDEV
# include "evdev_driver.hpp"
#endif
-#include "manager.hpp"
+#include "input/manager.hpp"
namespace Input {
Modified: trunk/pingus/src/input/manager.hpp
===================================================================
--- trunk/pingus/src/input/manager.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/manager.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_INPUT_MANAGER_HPP
#include <vector>
-#include "controller.hpp"
-#include "controller_description.hpp"
-#include "driver.hpp"
+#include "input/controller.hpp"
+#include "input/controller_description.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/sdl_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "math/size.hpp"
#include "util/file_reader.hpp"
#include "display/display.hpp"
-#include "sdl_driver.hpp"
+#include "input/sdl_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -21,8 +21,8 @@
#include <vector>
#include "SDL.h"
-#include "driver.hpp"
-#include "control.hpp"
+#include "input/driver.hpp"
+#include "input/control.hpp"
class FileReader;
Modified: trunk/pingus/src/input/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/usbmouse_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -25,7 +25,7 @@
#include "debug.hpp"
#include "globals.hpp"
#include "math/vector2i.hpp"
-#include "usbmouse_driver.hpp"
+#include "input/usbmouse_driver.hpp"
#include "../display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/input/usbmouse_driver.hpp
===================================================================
--- trunk/pingus/src/input/usbmouse_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/usbmouse_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_USBMOUSE_DRIVER_HPP
#include <vector>
-#include "driver.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/wiimote.cpp
===================================================================
--- trunk/pingus/src/input/wiimote.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/input/wiimote.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -17,8 +17,8 @@
#include <iostream>
#include <assert.h>
#include <pthread.h>
-#include "math.hpp"
-#include "wiimote.hpp"
+#include "input/math.hpp"
+#include "input/wiimote.hpp"
Wiimote* wiimote = 0;
Modified: trunk/pingus/src/input/wiimote_driver.cpp
===================================================================
--- trunk/pingus/src/input/wiimote_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/wiimote_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "debug.hpp"
-#include "globals.hpp"
-#include "string_util.hpp"
-#include "wiimote.hpp"
-#include "wiimote_driver.hpp"
+#include "input/debug.hpp"
+#include "input/globals.hpp"
+#include "input/string_util.hpp"
+#include "input/wiimote.hpp"
+#include "input/wiimote_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/wiimote_driver.hpp
===================================================================
--- trunk/pingus/src/input/wiimote_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/wiimote_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_WIIMOTE_DRIVER_HPP
#define HEADER_WIIMOTE_DRIVER_HPP
-#include "driver.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/input/xinput_device.cpp
===================================================================
--- trunk/pingus/src/input/xinput_device.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/xinput_device.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -16,11 +16,11 @@
#include "SDL_syswm.h"
-#include "debug.hpp"
-#include "globals.hpp"
+#include "input/debug.hpp"
+#include "input/globals.hpp"
-#include "xinput_driver.hpp"
-#include "xinput_device.hpp"
+#include "input/xinput_driver.hpp"
+#include "input/xinput_device.hpp"
namespace Input {
Modified: trunk/pingus/src/input/xinput_driver.cpp
===================================================================
--- trunk/pingus/src/input/xinput_driver.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/xinput_driver.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -16,11 +16,11 @@
#include <iostream>
-#include "debug.hpp"
-#include "globals.hpp"
+#include "input/debug.hpp"
+#include "input/globals.hpp"
-#include "xinput_driver.hpp"
-#include "xinput_device.hpp"
+#include "input/xinput_driver.hpp"
+#include "input/xinput_device.hpp"
namespace Input {
Modified: trunk/pingus/src/input/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/input/xinput_driver.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/input/xinput_driver.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -23,7 +23,7 @@
#include <vector>
#include "SDL_syswm.h"
-#include "driver.hpp"
+#include "input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/particles/explosive_particle.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include "../world.hpp"
#include "../particles/particle_holder.hpp"
#include "../resource.hpp"
-#include "explosive_particle.hpp"
+#include "particles/explosive_particle.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
: Particle (x, y, x_a, y_a),
Modified: trunk/pingus/src/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/particles/explosive_particle.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
#include "../sprite.hpp"
-#include "particle.hpp"
+#include "particles/particle.hpp"
class ExplosiveParticle
: public Particle
Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -19,7 +19,7 @@
#include "../collision_map.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "pingu_particle_holder.hpp"
+#include "particles/pingu_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -20,7 +20,7 @@
#include "../globals.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "rain_particle_holder.hpp"
+#include "particles/rain_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -17,7 +17,7 @@
#include "../globals.hpp"
#include "../display/scene_context.hpp"
#include "../resource.hpp"
-#include "smoke_particle_holder.hpp"
+#include "particles/smoke_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -22,7 +22,7 @@
#include "../ground_map.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "snow_particle_holder.hpp"
+#include "particles/snow_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/screen/gui_screen.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#include "../debug.hpp"
#include "../display/display.hpp"
#include "gui/gui_manager.hpp"
-#include "gui_screen.hpp"
+#include "screen/gui_screen.hpp"
GUIScreen::GUIScreen()
: Screen(Display::get_size()),
Modified: trunk/pingus/src/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/screen/gui_screen.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_GUISCREEN_HPP
#define HEADER_PINGUS_GUISCREEN_HPP
-#include "screen.hpp"
+#include "screen/screen.hpp"
namespace GUI {
class GUIManager;
Modified: trunk/pingus/src/screen/screen.cpp
===================================================================
--- trunk/pingus/src/screen/screen.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/screen/screen.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -14,6 +14,6 @@
// 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 "screen.hpp"
+#include "screen/screen.hpp"
/* EOF */
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -23,9 +23,9 @@
#include "util/pathname.hpp"
#include "display/display.hpp"
#include "display/framebuffer.hpp"
-#include "screen_manager.hpp"
+#include "screen/screen_manager.hpp"
#include "../path_manager.hpp"
-#include "screen.hpp"
+#include "screen/screen.hpp"
#include "fps_counter.hpp"
#include "../display/drawing_context.hpp"
#include "../input/controller.hpp"
Modified: trunk/pingus/src/screen/screen_manager_impl.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager_impl.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/screen/screen_manager_impl.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_SCREEN_MANAGER_IMPL_HPP
#define HEADER_PINGUS_SCREEN_MANAGER_IMPL_HPP
-#include "pingus.hpp"
+#include "screen/pingus.hpp"
class ScreenManagerImpl
Modified: trunk/pingus/src/sound/sound.cpp
===================================================================
--- trunk/pingus/src/sound/sound.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/sound/sound.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,9 +18,9 @@
#include <assert.h>
#include "../path_manager.hpp"
#include "../globals.hpp"
-#include "sound_dummy.hpp"
-#include "sound_real.hpp"
-#include "sound.hpp"
+#include "sound/sound_dummy.hpp"
+#include "sound/sound_real.hpp"
+#include "sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound.hpp
===================================================================
--- trunk/pingus/src/sound/sound.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/sound/sound.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_SOUND_HPP
#include <string>
-#include "sound_impl.hpp"
+#include "sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/sound/sound_dummy.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -16,7 +16,7 @@
#include "../globals.hpp"
#include "../debug.hpp"
-#include "sound_dummy.hpp"
+#include "sound/sound_dummy.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/sound/sound_dummy.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_SOUND_DUMMY_HPP
#define HEADER_PINGUS_SOUND_DUMMY_HPP
-#include "sound_impl.hpp"
-#include "sound.hpp"
+#include "sound/sound_impl.hpp"
+#include "sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/sound/sound_real.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/sound/sound_real.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,8 +19,8 @@
#include "SDL_mixer.h"
#include "../globals.hpp"
#include "../debug.hpp"
-#include "sound_res_mgr.hpp"
-#include "sound_real.hpp"
+#include "sound/sound_res_mgr.hpp"
+#include "sound/sound_real.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/sound/sound_real.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/sound/sound_real.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,8 +20,8 @@
#include "SDL_mixer.h"
#include <config.h>
#include <vector>
-#include "sound_impl.hpp"
-#include "sound.hpp"
+#include "sound/sound_impl.hpp"
+#include "sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_res_mgr.cpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#include "../path_manager.hpp"
#include "../globals.hpp"
#include "../debug.hpp"
-#include "sound_res_mgr.hpp"
+#include "sound/sound_res_mgr.hpp"
SoundResMgr::SoundMap SoundResMgr::sound_map;
Modified: trunk/pingus/src/util/command_line.cpp
===================================================================
--- trunk/pingus/src/util/command_line.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/command_line.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -27,8 +27,8 @@
** (if your name is missing here, please add it)
*/
-#include "command_line.hpp"
-#include "command_line_generic.hpp"
+#include "util/command_line.hpp"
+#include "util/command_line_generic.hpp"
CommandLine::CommandLine()
{
Modified: trunk/pingus/src/util/command_line_generic.cpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/util/command_line_generic.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -32,7 +32,7 @@
#include <stdexcept>
#include <stdio.h>
-#include "command_line_generic.hpp"
+#include "util/command_line_generic.hpp"
#ifdef WIN32
Modified: trunk/pingus/src/util/command_line_generic.hpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/util/command_line_generic.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -36,7 +36,7 @@
#include <string>
#include <vector>
-#include "command_line.hpp"
+#include "util/command_line.hpp"
class CommandLine_Generic
{
Modified: trunk/pingus/src/util/debug_stream.cpp
===================================================================
--- trunk/pingus/src/util/debug_stream.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/debug_stream.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "debug_stream.hpp"
+#include "util/debug_stream.hpp"
#include "globals.hpp"
using std::ostream;
Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/debug_stream.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_DEBUG_STREAM_HPP
#include "pingus.hpp"
+
#include <string>
#include <vector>
#include <iostream>
Modified: trunk/pingus/src/util/file_reader.cpp
===================================================================
--- trunk/pingus/src/util/file_reader.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/file_reader.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "sexpr_file_reader.hpp"
+#include "util/sexpr_file_reader.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
-#include "pathname.hpp"
-#include "file_reader.hpp"
-#include "file_reader_impl.hpp"
+#include "util/pathname.hpp"
+#include "util/file_reader.hpp"
+#include "util/file_reader_impl.hpp"
FileReader::FileReader(boost::shared_ptr<FileReaderImpl> impl_)
: impl(impl_)
Modified: trunk/pingus/src/util/pathname.cpp
===================================================================
--- trunk/pingus/src/util/pathname.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/util/pathname.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,7 +18,7 @@
#include <iostream>
#include "util/system.hpp"
#include "path_manager.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
Pathname Pathname::tmpfile(const std::string& prefix)
{
Modified: trunk/pingus/src/util/sexpr_file_reader.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,15 +15,16 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <assert.h>
-#include "math/vector3f.hpp"
+
#include "math/color.hpp"
#include "math/rect.hpp"
#include "math/size.hpp"
+#include "math/vector2i.hpp"
+#include "math/vector3f.hpp"
#include "res_descriptor.hpp"
#include "resource_modifier.hpp"
-#include "math/vector2i.hpp"
-#include "file_reader_impl.hpp"
-#include "sexpr_file_reader.hpp"
+#include "util/file_reader_impl.hpp"
+#include "util/sexpr_file_reader.hpp"
class SExprFileReaderImpl: public FileReaderImpl
{
Modified: trunk/pingus/src/util/sexpr_file_reader.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_SEXPR_FILE_READER_HPP
#define HEADER_SEXPR_FILE_READER_HPP
-#include "file_reader.hpp"
+#include "util/file_reader.hpp"
#include "lisp/lisp.hpp"
/** */
Modified: trunk/pingus/src/util/sexpr_file_writer.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#include <iostream>
#include <string>
#include <map>
-#include "sexpr_file_writer.hpp"
+#include "util/sexpr_file_writer.hpp"
SExprFileWriter::SExprFileWriter(std::ostream& out_)
: out(&out_), level(0)
Modified: trunk/pingus/src/util/sexpr_file_writer.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_SEXPR_FILE_WRITER_HPP
#include <iosfwd>
-#include "file_writer.hpp"
+#include "util/file_writer.hpp"
#include "math/color.hpp"
#include "math/vector3f.hpp"
#include "math/size.hpp"
Modified: trunk/pingus/src/util/string_util.cpp
===================================================================
--- trunk/pingus/src/util/string_util.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/util/string_util.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "string_util.hpp"
+#include "util/string_util.hpp"
// Code based on clanstring.cpp from ClanLib 0.8
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/util/system.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -42,11 +42,11 @@
#include <iostream>
#include <sstream>
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "pingus_error.hpp"
#include "globals.hpp"
-#include "system.hpp"
-#include "string_util.hpp"
+#include "util/system.hpp"
+#include "util/string_util.hpp"
#include "gettext.h"
std::string System::userdir;
Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/util/system.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_SYSTEM_HPP
#include "pingus.hpp"
+
#include <string>
#include <vector>
#include <map>
Modified: trunk/pingus/src/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldmap/dot.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -17,7 +17,7 @@
#include <iostream>
#include <assert.h>
#include "util/file_reader.hpp"
-#include "dot.hpp"
+#include "worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot.hpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldmap/dot.hpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -19,7 +19,7 @@
#include <string>
#include "../math/vector3f.hpp"
-#include "drawable.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:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../pingus_error.hpp"
-#include "level_dot.hpp"
-#include "dot_factory.hpp"
+#include "worldmap/level_dot.hpp"
+#include "worldmap/dot_factory.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/drawable.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -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 "drawable.hpp"
+#include "worldmap/drawable.hpp"
/* EOF */
Modified: trunk/pingus/src/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/drawable_factory.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -15,9 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "sprite_drawable.hpp"
-#include "sprite_drawable.hpp"
-#include "drawable_factory.hpp"
+#include "worldmap/sprite_drawable.hpp"
+#include "worldmap/sprite_drawable.hpp"
+#include "worldmap/drawable_factory.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/drawable_factory.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_DRAWABLE_FACTORY_HPP
#define HEADER_DRAWABLE_FACTORY_HPP
-#include "drawable.hpp"
+#include "worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/graph.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldmap/graph.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -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 "graph.hpp"
+#include "worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/level_dot.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -30,7 +30,7 @@
#include "util/file_reader.hpp"
#include "input/controller.hpp"
#include "input/control.hpp"
-#include "level_dot.hpp"
+#include "worldmap/level_dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/level_dot.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../sprite.hpp"
#include "../pingus_level.hpp"
-#include "dot.hpp"
+#include "worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/worldmap/path.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldmap/path.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -17,7 +17,7 @@
#include <iostream>
#include <algorithm>
#include <assert.h>
-#include "path.hpp"
+#include "worldmap/path.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#include <iostream>
#include "../math/color.hpp"
#include "../display/drawing_context.hpp"
-#include "path_drawable.hpp"
+#include "worldmap/path_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/path_drawable.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,8 +17,8 @@
#ifndef HEADER_PATH_DRAWABLE_HPP
#define HEADER_PATH_DRAWABLE_HPP
-#include "drawable.hpp"
-#include "path_graph.hpp"
+#include "worldmap/drawable.hpp"
+#include "worldmap/path_graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,12 +19,12 @@
#include "math/math.hpp"
#include "util/file_reader.hpp"
#include "../pingus_error.hpp"
-#include "dot.hpp"
-#include "dot_factory.hpp"
-#include "worldmap.hpp"
-#include "pathfinder.hpp"
-#include "path_graph.hpp"
-#include "path_drawable.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"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,9 +20,9 @@
#include <map>
#include <vector>
#include "../math/vector3f.hpp"
-#include "path.hpp"
-#include "pathfinder.hpp"
-#include "graph.hpp"
+#include "worldmap/path.hpp"
+#include "worldmap/pathfinder.hpp"
+#include "worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/worldmap/pathfinder.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/pathfinder.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#define HEADER_PATHFINDER_HPP
#include <queue>
-#include "graph.hpp"
+#include "worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/pingus.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,10 +19,10 @@
#include "math/math.hpp"
#include "math/vector3f.hpp"
#include "display/drawing_context.hpp"
-#include "dot.hpp"
+#include "worldmap/dot.hpp"
#include "direction.hpp"
#include "resource.hpp"
-#include "pingus.hpp"
+#include "worldmap/pingus.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/pingus.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDMAP_PINGUS_HPP
#include "../state_sprite.hpp"
-#include "drawable.hpp"
-#include "path_graph.hpp"
+#include "worldmap/drawable.hpp"
+#include "worldmap/path_graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -17,8 +17,8 @@
#include <string>
#include "../pingus_error.hpp"
#include "util/file_reader.hpp"
-#include "drawable_factory.hpp"
-#include "pingus_worldmap.hpp"
+#include "worldmap/drawable_factory.hpp"
+#include "worldmap/pingus_worldmap.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,8 +19,8 @@
#include <boost/smart_ptr.hpp>
-#include "worldmap_story.hpp"
-#include "path_graph.hpp"
+#include "worldmap/worldmap_story.hpp"
+#include "worldmap/path_graph.hpp"
#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -18,10 +18,10 @@
#include "../resource.hpp"
#include "../display/drawing_context.hpp"
-#include "worldmap_screen.hpp"
-#include "worldmap.hpp"
-#include "pingus.hpp"
-#include "sprite_drawable.hpp"
+#include "worldmap/worldmap_screen.hpp"
+#include "worldmap/worldmap.hpp"
+#include "worldmap/pingus.hpp"
+#include "worldmap/sprite_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include "../sprite.hpp"
#include "../math/vector3f.hpp"
-#include "drawable.hpp"
+#include "worldmap/drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -32,15 +32,15 @@
#include "../debug.hpp"
#include "../lisp/parser.hpp"
#include "../lisp/lisp.hpp"
-#include "worldmap.hpp"
-#include "worldmap_story.hpp"
-#include "worldmap_screen.hpp"
-#include "pingus.hpp"
-#include "drawable_factory.hpp"
-#include "drawable.hpp"
-#include "dot.hpp"
-#include "level_dot.hpp"
-#include "path_graph.hpp"
+#include "worldmap/worldmap.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 "math/math.hpp"
#include "../stat_manager.hpp"
Modified: trunk/pingus/src/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldmap/worldmap.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -22,7 +22,7 @@
#include "util/file_reader.hpp"
#include "../display/drawing_context.hpp"
#include "../graphic_context_state.hpp"
-#include "pingus_worldmap.hpp"
+#include "worldmap/pingus_worldmap.hpp"
class Font;
class DrawingContext;
Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -16,9 +16,9 @@
#include "../display/display.hpp"
#include "../display/scene_context.hpp"
-#include "worldmap_screen.hpp"
-#include "worldmap.hpp"
-#include "worldmap_component.hpp"
+#include "worldmap/worldmap_screen.hpp"
+#include "worldmap/worldmap.hpp"
+#include "worldmap/worldmap_component.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -26,13 +26,13 @@
#include "../stat_manager.hpp"
#include "../display/scene_context.hpp"
#include "math/math.hpp"
-#include "worldmap.hpp"
-#include "worldmap_component.hpp"
+#include "worldmap/worldmap.hpp"
+#include "worldmap/worldmap_component.hpp"
#include "resource.hpp"
-#include "worldmap_story.hpp"
-#include "pingus.hpp"
+#include "worldmap/worldmap_story.hpp"
+#include "worldmap/pingus.hpp"
#include "../story_screen.hpp"
-#include "worldmap_screen.hpp"
+#include "worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -16,7 +16,7 @@
#include <algorithm>
#include <vector>
-#include "worldmap_story.hpp"
+#include "worldmap/worldmap_story.hpp"
#include "../story_screen.hpp"
#include "util/file_reader.hpp"
#include "../res_descriptor.hpp"
Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -20,7 +20,7 @@
#include "../pingu_holder.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "conveyor_belt.hpp"
+#include "worldobjs/conveyor_belt.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/entrance.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -22,7 +22,7 @@
#include "../pingu.hpp"
#include "../resource.hpp"
#include "../components/smallmap.hpp"
-#include "entrance.hpp"
+#include "worldobjs/entrance.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldobjs/exit.cpp 2009-11-04 01:39:16 UTC (rev 4007)
@@ -24,7 +24,7 @@
#include "../components/smallmap.hpp"
#include "../resource.hpp"
#include "util/string_util.hpp"
-#include "exit.hpp"
+#include "worldobjs/exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,7 +20,7 @@
#include "../world.hpp"
#include "../components/smallmap.hpp"
#include "../resource.hpp"
-#include "fake_exit.hpp"
+#include "worldobjs/fake_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../ground_map.hpp"
#include "../collision_map.hpp"
#include "../resource.hpp"
-#include "groundpiece.hpp"
+#include "worldobjs/groundpiece.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "guillotine.hpp"
+#include "worldobjs/guillotine.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/hammer.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "hammer.hpp"
+#include "worldobjs/hammer.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#include "../globals.hpp"
#include "../display/scene_context.hpp"
#include "../resource.hpp"
-#include "hotspot.hpp"
+#include "worldobjs/hotspot.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -21,7 +21,7 @@
#include "../ground_map.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "ice_block.hpp"
+#include "worldobjs/ice_block.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -18,7 +18,7 @@
#include "../pingu.hpp"
#include "../pingu_holder.hpp"
#include "../world.hpp"
-#include "laser_exit.hpp"
+#include "worldobjs/laser_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/liquid.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../display/scene_context.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "liquid.hpp"
+#include "worldobjs/liquid.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include "../sound/sound.hpp"
#include "../world.hpp"
#include "../display/scene_context.hpp"
-#include "rain_generator.hpp"
+#include "worldobjs/rain_generator.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -25,7 +25,7 @@
#include "../resource.hpp"
#include "../sound/sound.hpp"
#include "../world.hpp"
-#include "smasher.hpp"
+#include "worldobjs/smasher.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -19,7 +19,7 @@
#include "math/math.hpp"
#include "../world.hpp"
#include "../particles/snow_particle_holder.hpp"
-#include "snow_generator.hpp"
+#include "worldobjs/snow_generator.hpp"
#include "globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -16,7 +16,7 @@
#include "../display/display.hpp"
#include "../display/scene_context.hpp"
-#include "solid_color_background.hpp"
+#include "worldobjs/solid_color_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/spike.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "spike.hpp"
+#include "worldobjs/spike.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "starfield_background.hpp"
-#include "starfield_background_stars.hpp"
+#include "worldobjs/starfield_background.hpp"
+#include "worldobjs/starfield_background_stars.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -17,7 +17,7 @@
#include "../display/scene_context.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "starfield_background_stars.hpp"
+#include "worldobjs/starfield_background_stars.hpp"
#include "globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -22,7 +22,7 @@
#include "../globals.hpp"
#include "../blitter.hpp"
#include "../display/display.hpp"
-#include "surface_background.hpp"
+#include "worldobjs/surface_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,7 +20,7 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "switch_door.hpp"
+#include "worldobjs/switch_door.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -20,8 +20,8 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "teleporter_target.hpp"
-#include "teleporter.hpp"
+#include "worldobjs/teleporter_target.hpp"
+#include "worldobjs/teleporter.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 01:27:10 UTC
(rev 4006)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-04 01:39:16 UTC
(rev 4007)
@@ -20,7 +20,7 @@
#include "../pingu_holder.hpp"
#include "../world.hpp"
#include "../resource.hpp"
-#include "teleporter_target.hpp"
+#include "worldobjs/teleporter_target.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
01:27:10 UTC (rev 4006)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-04
01:39:16 UTC (rev 4007)
@@ -16,7 +16,7 @@
#include "../resource.hpp"
#include "../display/scene_context.hpp"
-#include "thunderstorm_background.hpp"
+#include "worldobjs/thunderstorm_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -19,7 +19,7 @@
#include "../particles/smoke_particle_holder.hpp"
#include "../resource.hpp"
#include "../world.hpp"
-#include "woodthing.hpp"
+#include "worldobjs/woodthing.hpp"
namespace WorldObjs {
// FIXME: Re-enable this namespace.
Modified: trunk/pingus/src/worldobjs/woodthing.hpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.hpp 2009-11-04 01:27:10 UTC (rev
4006)
+++ trunk/pingus/src/worldobjs/woodthing.hpp 2009-11-04 01:39:16 UTC (rev
4007)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_ENTRANCES_WOODTHING_HPP
#define HEADER_PINGUS_WORLDOBJS_ENTRANCES_WOODTHING_HPP
-#include "entrance.hpp"
+#include "worldobjs/entrance.hpp"
namespace WorldObjs {
// FIXME: Re-enable this namespace.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4007 - in trunk/pingus/src: colliders display editor gui input particles screen sound util worldmap worldobjs,
grumbel at BerliOS <=