[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4063 - in trunk/pingus/src: editor engine/display engine/d
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4063 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/usbmouse engine/input/wiimote engine/input/xinput engine/input_old engine/input_old/axes engine/input_old/buttons engine/input_old/pointers engine/input_old/scrollers engine/screen engine/sound lisp math pingus pingus/actions pingus/colliders pingus/components pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util |
|
Date: |
Fri, 6 Nov 2009 20:58:17 +0100 |
Author: grumbel
Date: 2009-11-06 20:58:03 +0100 (Fri, 06 Nov 2009)
New Revision: 4063
Modified:
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/level_objs.cpp
trunk/pingus/src/editor/level_properties.cpp
trunk/pingus/src/editor/minimap.cpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/editor/viewport.hpp
trunk/pingus/src/engine/display/blitter.cpp
trunk/pingus/src/engine/display/delta_framebuffer.cpp
trunk/pingus/src/engine/display/delta_framebuffer.hpp
trunk/pingus/src/engine/display/display.cpp
trunk/pingus/src/engine/display/display.hpp
trunk/pingus/src/engine/display/drawing_context.cpp
trunk/pingus/src/engine/display/drawing_context.hpp
trunk/pingus/src/engine/display/drawing_request.hpp
trunk/pingus/src/engine/display/font.cpp
trunk/pingus/src/engine/display/font.hpp
trunk/pingus/src/engine/display/font_description.hpp
trunk/pingus/src/engine/display/framebuffer.hpp
trunk/pingus/src/engine/display/graphic_context_state.cpp
trunk/pingus/src/engine/display/graphic_context_state.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/rect_merger.cpp
trunk/pingus/src/engine/display/rect_merger.hpp
trunk/pingus/src/engine/display/scene_context.hpp
trunk/pingus/src/engine/display/screenshot.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.hpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/sprite.cpp
trunk/pingus/src/engine/display/sprite.hpp
trunk/pingus/src/engine/display/sprite_description.hpp
trunk/pingus/src/engine/display/sprite_impl.cpp
trunk/pingus/src/engine/display/sprite_impl.hpp
trunk/pingus/src/engine/display/surface.cpp
trunk/pingus/src/engine/display/surface.hpp
trunk/pingus/src/engine/gui/component.cpp
trunk/pingus/src/engine/gui/gui_manager.cpp
trunk/pingus/src/engine/gui/gui_manager.hpp
trunk/pingus/src/engine/gui/rect_component.hpp
trunk/pingus/src/engine/gui/surface_button.cpp
trunk/pingus/src/engine/input/control.hpp
trunk/pingus/src/engine/input/controller.cpp
trunk/pingus/src/engine/input/controller.hpp
trunk/pingus/src/engine/input/controller_description.hpp
trunk/pingus/src/engine/input/core_driver.cpp
trunk/pingus/src/engine/input/driver.hpp
trunk/pingus/src/engine/input/evdev/evdev_device.cpp
trunk/pingus/src/engine/input/evdev/evdev_device.hpp
trunk/pingus/src/engine/input/event.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/input/manager.hpp
trunk/pingus/src/engine/input/sdl_driver.cpp
trunk/pingus/src/engine/input/sdl_driver.hpp
trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
trunk/pingus/src/engine/input/wiimote/wiimote.cpp
trunk/pingus/src/engine/input/wiimote/wiimote.hpp
trunk/pingus/src/engine/input/xinput/xinput_device.cpp
trunk/pingus/src/engine/input/xinput/xinput_device.hpp
trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
trunk/pingus/src/engine/input_old/axes/button_axis.cpp
trunk/pingus/src/engine/input_old/axes/joystick_axis.cpp
trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp
trunk/pingus/src/engine/input_old/axis_factory.cpp
trunk/pingus/src/engine/input_old/button.hpp
trunk/pingus/src/engine/input_old/button_factory.cpp
trunk/pingus/src/engine/input_old/buttons/joystick_button.cpp
trunk/pingus/src/engine/input_old/buttons/key_button.hpp
trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp
trunk/pingus/src/engine/input_old/buttons/multiple_button.cpp
trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
trunk/pingus/src/engine/input_old/controller.cpp
trunk/pingus/src/engine/input_old/controller.hpp
trunk/pingus/src/engine/input_old/event.hpp
trunk/pingus/src/engine/input_old/pointer_factory.cpp
trunk/pingus/src/engine/input_old/pointers/axis_pointer.cpp
trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp
trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
trunk/pingus/src/engine/input_old/scroller_factory.cpp
trunk/pingus/src/engine/input_old/scrollers/axis_scroller.cpp
trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
trunk/pingus/src/engine/screen/gui_screen.cpp
trunk/pingus/src/engine/screen/screen.hpp
trunk/pingus/src/engine/screen/screen_manager.cpp
trunk/pingus/src/engine/screen/screen_manager.hpp
trunk/pingus/src/engine/sound/sound.cpp
trunk/pingus/src/engine/sound/sound.hpp
trunk/pingus/src/engine/sound/sound_dummy.cpp
trunk/pingus/src/engine/sound/sound_dummy.hpp
trunk/pingus/src/engine/sound/sound_real.cpp
trunk/pingus/src/engine/sound/sound_real.hpp
trunk/pingus/src/engine/sound/sound_res_mgr.cpp
trunk/pingus/src/engine/sound/sound_res_mgr.hpp
trunk/pingus/src/lisp/getters.cpp
trunk/pingus/src/lisp/lexer.cpp
trunk/pingus/src/lisp/lisp.cpp
trunk/pingus/src/lisp/lisp.hpp
trunk/pingus/src/lisp/parser.cpp
trunk/pingus/src/lisp/parser.hpp
trunk/pingus/src/math/origin.hpp
trunk/pingus/src/math/quad_tree.hpp
trunk/pingus/src/math/rect.hpp
trunk/pingus/src/math/vector2f.hpp
trunk/pingus/src/math/vector2i.cpp
trunk/pingus/src/math/vector3f.hpp
trunk/pingus/src/pingus/action_holder.hpp
trunk/pingus/src/pingus/actions/angel.cpp
trunk/pingus/src/pingus/actions/angel.hpp
trunk/pingus/src/pingus/actions/basher.cpp
trunk/pingus/src/pingus/actions/basher.hpp
trunk/pingus/src/pingus/actions/blocker.hpp
trunk/pingus/src/pingus/actions/boarder.cpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/bomber.hpp
trunk/pingus/src/pingus/actions/bridger.cpp
trunk/pingus/src/pingus/actions/climber.hpp
trunk/pingus/src/pingus/actions/digger.cpp
trunk/pingus/src/pingus/actions/drown.cpp
trunk/pingus/src/pingus/actions/drown.hpp
trunk/pingus/src/pingus/actions/exiter.cpp
trunk/pingus/src/pingus/actions/exiter.hpp
trunk/pingus/src/pingus/actions/faller.cpp
trunk/pingus/src/pingus/actions/faller.hpp
trunk/pingus/src/pingus/actions/floater.cpp
trunk/pingus/src/pingus/actions/floater.hpp
trunk/pingus/src/pingus/actions/jumper.cpp
trunk/pingus/src/pingus/actions/jumper.hpp
trunk/pingus/src/pingus/actions/laser_kill.cpp
trunk/pingus/src/pingus/actions/laser_kill.hpp
trunk/pingus/src/pingus/actions/miner.cpp
trunk/pingus/src/pingus/actions/rocket_launcher.cpp
trunk/pingus/src/pingus/actions/rocket_launcher.hpp
trunk/pingus/src/pingus/actions/slider.cpp
trunk/pingus/src/pingus/actions/slider.hpp
trunk/pingus/src/pingus/actions/smashed.cpp
trunk/pingus/src/pingus/actions/splashed.cpp
trunk/pingus/src/pingus/actions/splashed.hpp
trunk/pingus/src/pingus/actions/superman.cpp
trunk/pingus/src/pingus/actions/waiter.cpp
trunk/pingus/src/pingus/actions/walker.cpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/collider.cpp
trunk/pingus/src/pingus/colliders/pingu_collider.cpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/collision_map.hpp
trunk/pingus/src/pingus/collision_mask.cpp
trunk/pingus/src/pingus/collision_mask.hpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/action_button.hpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/components/check_box.cpp
trunk/pingus/src/pingus/components/check_box.hpp
trunk/pingus/src/pingus/components/choice_box.cpp
trunk/pingus/src/pingus/components/choice_box.hpp
trunk/pingus/src/pingus/components/label.cpp
trunk/pingus/src/pingus/components/label.hpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/menu_button.hpp
trunk/pingus/src/pingus/components/pingus_counter.cpp
trunk/pingus/src/pingus/components/pingus_counter.hpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/slider_box.cpp
trunk/pingus/src/pingus/components/slider_box.hpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/components/time_display.hpp
trunk/pingus/src/pingus/config_manager.cpp
trunk/pingus/src/pingus/config_manager.hpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/game_time.cpp
trunk/pingus/src/pingus/gettext.cpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/goal_manager.cpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/ground_map.hpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/levelset.hpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
trunk/pingus/src/pingus/path_manager.hpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu.hpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingu_holder.hpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_level.cpp
trunk/pingus/src/pingus/pingus_level.hpp
trunk/pingus/src/pingus/pingus_level_impl.hpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_main.hpp
trunk/pingus/src/pingus/plf_res_mgr.cpp
trunk/pingus/src/pingus/resource.cpp
trunk/pingus/src/pingus/resource.hpp
trunk/pingus/src/pingus/resource_manager.cpp
trunk/pingus/src/pingus/resource_manager.hpp
trunk/pingus/src/pingus/savegame_manager.cpp
trunk/pingus/src/pingus/savegame_manager.hpp
trunk/pingus/src/pingus/screens/addon_menu.cpp
trunk/pingus/src/pingus/screens/credits.cpp
trunk/pingus/src/pingus/screens/credits.hpp
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/demo_session.hpp
trunk/pingus/src/pingus/screens/font_test_screen.cpp
trunk/pingus/src/pingus/screens/font_test_screen.hpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/game_session.hpp
trunk/pingus/src/pingus/screens/level_menu.cpp
trunk/pingus/src/pingus/screens/level_menu.hpp
trunk/pingus/src/pingus/screens/option_menu.cpp
trunk/pingus/src/pingus/screens/option_menu.hpp
trunk/pingus/src/pingus/screens/pingus_menu.cpp
trunk/pingus/src/pingus/screens/pingus_menu.hpp
trunk/pingus/src/pingus/screens/result_screen.hpp
trunk/pingus/src/pingus/screens/start_screen.hpp
trunk/pingus/src/pingus/screens/story_screen.hpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server.hpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/smallmap_image.cpp
trunk/pingus/src/pingus/state_sprite.hpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldmap/dot.cpp
trunk/pingus/src/pingus/worldmap/dot.hpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/path.cpp
trunk/pingus/src/pingus/worldmap/path.hpp
trunk/pingus/src/pingus/worldmap/path_drawable.cpp
trunk/pingus/src/pingus/worldmap/path_graph.cpp
trunk/pingus/src/pingus/worldmap/path_graph.hpp
trunk/pingus/src/pingus/worldmap/pathfinder.hpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
trunk/pingus/src/pingus/worldobjs/entrance.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.hpp
trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/guillotine.hpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/hammer.hpp
trunk/pingus/src/pingus/worldobjs/hotspot.cpp
trunk/pingus/src/pingus/worldobjs/hotspot.hpp
trunk/pingus/src/pingus/worldobjs/ice_block.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.hpp
trunk/pingus/src/pingus/worldobjs/laser_exit.hpp
trunk/pingus/src/pingus/worldobjs/liquid.cpp
trunk/pingus/src/pingus/worldobjs/liquid.hpp
trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
trunk/pingus/src/pingus/worldobjs/smasher.cpp
trunk/pingus/src/pingus/worldobjs/smasher.hpp
trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
trunk/pingus/src/pingus/worldobjs/spike.cpp
trunk/pingus/src/pingus/worldobjs/spike.hpp
trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
trunk/pingus/src/pingus/worldobjs/surface_background.cpp
trunk/pingus/src/pingus/worldobjs/surface_background.hpp
trunk/pingus/src/pingus/worldobjs/switch_door.cpp
trunk/pingus/src/pingus/worldobjs/switch_door.hpp
trunk/pingus/src/pingus/worldobjs/teleporter.cpp
trunk/pingus/src/pingus/worldobjs/teleporter.hpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
trunk/pingus/src/pingus/worldobjs/woodthing.cpp
trunk/pingus/src/util/command_line_generic.hpp
trunk/pingus/src/util/file_reader.cpp
trunk/pingus/src/util/file_reader.hpp
trunk/pingus/src/util/file_reader_impl.hpp
trunk/pingus/src/util/pathname.cpp
trunk/pingus/src/util/pathname.hpp
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/system.cpp
trunk/pingus/src/util/system.hpp
trunk/pingus/src/util/utf8.cpp
Log:
include cleanup
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#include "editor/editor_screen.hpp"
+#include <boost/bind.hpp>
#include <iostream>
-#include <boost/bind.hpp>
#include "editor/action_properties.hpp"
#include "editor/editor_level.hpp"
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#include "editor/level_objs.hpp"
+#include <iostream>
#include <string>
-#include <iostream>
#include "editor/level_impl.hpp"
#include "engine/display/blitter.hpp"
Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/editor/level_properties.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "editor/level_properties.hpp"
+#include <boost/bind.hpp>
#include <iostream>
-#include <boost/bind.hpp>
#include "editor/editor_level.hpp"
#include "editor/gui_style.hpp"
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,9 +18,9 @@
#include "editor/editor_level.hpp"
#include "editor/editor_screen.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/level_objs.hpp"
#include "editor/viewport.hpp"
-#include "editor/level_objs.hpp"
-#include "editor/gui_style.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,9 @@
#include "editor/viewport.hpp"
+#include <iostream>
+#include <string>
#include <vector>
-#include <string>
-#include <iostream>
#include "editor/editor_level.hpp"
#include "editor/editor_screen.hpp"
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,8 +19,8 @@
#define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
#include <boost/signal.hpp>
+#include <string>
#include <vector>
-#include <string>
#include "engine/display/graphic_context_state.hpp"
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/engine/display/blitter.cpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/blitter.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,16 +16,16 @@
#include "engine/display/blitter.hpp"
+#include <SDL.h>
+#include <assert.h>
#include <config.h>
#include <stdio.h>
-#include <assert.h>
-#include <SDL.h>
-#include "util/string_util.hpp"
-#include "pingus/globals.hpp"
+#include "engine/display/blitter_impl.hpp"
#include "math/math.hpp"
#include "pingus/debug.hpp"
-#include "engine/display/blitter_impl.hpp"
+#include "pingus/globals.hpp"
+#include "util/string_util.hpp"
SDL_Surface*
Blitter::scale_surface(SDL_Surface* surface, int width, int height)
Modified: trunk/pingus/src/engine/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,10 +18,11 @@
#include <assert.h>
#include <iostream>
+
+#include "engine/display/rect_merger.hpp"
+#include "engine/display/sdl_framebuffer.hpp"
#include "math/math.hpp"
#include "util/memory_pool.hpp"
-#include "engine/display/rect_merger.hpp"
-#include "engine/display/sdl_framebuffer.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,10 +17,11 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
+#include <map>
#include <memory>
-#include <map>
+
+#include "engine/display/framebuffer.hpp"
#include "math/vector2i.hpp"
-#include "engine/display/framebuffer.hpp"
class SDLFramebuffer;
class DrawOpBuffer;
Modified: trunk/pingus/src/engine/display/display.cpp
===================================================================
--- trunk/pingus/src/engine/display/display.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/display.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,24 +16,24 @@
#include "engine/display/display.hpp"
+#include <algorithm>
+#include <iostream>
#include <stdexcept>
-#include <algorithm>
#include <stdio.h>
-#include <iostream>
#include "../config.h"
-#include "pingus/globals.hpp"
-#include "math/vector2i.hpp"
-#include "math/rect.hpp"
+#include "engine/display/sdl_framebuffer.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "math/color.hpp"
#include "math/math.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "engine/display/sdl_framebuffer.hpp"
+#include "math/rect.hpp"
+#include "math/vector2i.hpp"
+#include "pingus/globals.hpp"
#ifdef HAVE_OPENGL
# include "engine/display/opengl/opengl_framebuffer.hpp"
#endif
+#include "engine/display/delta_framebuffer.hpp"
#include "engine/display/null_framebuffer.hpp"
-#include "engine/display/delta_framebuffer.hpp"
std::auto_ptr<Framebuffer> Display::framebuffer;
Modified: trunk/pingus/src/engine/display/display.hpp
===================================================================
--- trunk/pingus/src/engine/display/display.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/display.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
+#include <list>
#include <memory>
-#include <list>
#include <vector>
#include "math/size.hpp"
Modified: trunk/pingus/src/engine/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,14 +16,15 @@
#include "engine/display/drawing_context.hpp"
+#include <algorithm>
#include <assert.h>
#include <iostream>
-#include <algorithm>
-#include "math/math.hpp"
+
+#include "engine/display/display.hpp"
+#include "engine/display/font.hpp"
#include "engine/display/framebuffer.hpp"
-#include "engine/display/display.hpp"
#include "engine/display/sprite.hpp"
-#include "engine/display/font.hpp"
+#include "math/math.hpp"
#include "math/origin.hpp"
struct DrawingRequestsSorter
Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,10 +19,11 @@
#include <SDL.h>
#include <vector>
+
#include "engine/display/drawing_request.hpp"
+#include "math/color.hpp"
+#include "math/rect.hpp"
#include "math/vector3f.hpp"
-#include "math/rect.hpp"
-#include "math/color.hpp"
class Framebuffer;
class Font;
Modified: trunk/pingus/src/engine/display/drawing_request.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,8 +18,9 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_REQUEST_HPP
#include <SDL.h>
+
+#include "math/rect.hpp"
#include "math/vector2i.hpp"
-#include "math/rect.hpp"
class Framebuffer;
Modified: trunk/pingus/src/engine/display/font.cpp
===================================================================
--- trunk/pingus/src/engine/display/font.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/font.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,17 +16,18 @@
#include "engine/display/font.hpp"
+#include <SDL.h>
#include <iostream>
+#include <map>
#include <vector>
-#include <map>
-#include <SDL.h>
+
#include "SDL_image.h"
+#include "engine/display/display.hpp"
+#include "engine/display/font_description.hpp"
+#include "engine/display/framebuffer.hpp"
#include "engine/display/surface.hpp"
#include "util/line_iterator.hpp"
#include "util/utf8.hpp"
-#include "engine/display/font_description.hpp"
-#include "engine/display/framebuffer.hpp"
-#include "engine/display/display.hpp"
class FontImpl
{
Modified: trunk/pingus/src/engine/display/font.hpp
===================================================================
--- trunk/pingus/src/engine/display/font.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/font.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,10 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
+#include <SDL.h>
+#include <boost/shared_ptr.hpp>
#include <string>
-#include <boost/shared_ptr.hpp>
-#include <SDL.h>
+
#include "math/origin.hpp"
#include "math/rect.hpp"
#include "math/size.hpp"
Modified: trunk/pingus/src/engine/display/font_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/font_description.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/font_description.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -20,8 +20,8 @@
#include <string>
#include <vector>
+#include "math/rect.hpp"
#include "math/vector2i.hpp"
-#include "math/rect.hpp"
#include "util/pathname.hpp"
class FileReader;
Modified: trunk/pingus/src/engine/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/framebuffer.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,13 +17,14 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_HPP
+#include <SDL.h>
#include <vector>
-#include <SDL.h>
+
+#include "engine/display/framebuffer_surface.hpp"
#include "math/color.hpp"
+#include "math/rect.hpp"
+#include "math/size.hpp"
#include "math/vector2i.hpp"
-#include "math/size.hpp"
-#include "math/rect.hpp"
-#include "engine/display/framebuffer_surface.hpp"
class Surface;
Modified: trunk/pingus/src/engine/display/graphic_context_state.cpp
===================================================================
--- trunk/pingus/src/engine/display/graphic_context_state.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/graphic_context_state.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,8 +16,8 @@
#include "engine/display/graphic_context_state.hpp"
+#include "engine/display/display.hpp"
#include "math/math.hpp"
-#include "engine/display/display.hpp"
class GraphicContextStateImpl
{
Modified: trunk/pingus/src/engine/display/graphic_context_state.hpp
===================================================================
--- trunk/pingus/src/engine/display/graphic_context_state.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/graphic_context_state.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,12 +19,12 @@
#include <boost/shared_ptr.hpp>
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/rect.hpp"
+#include "math/vector2f.hpp"
+#include "math/vector2i.hpp"
#include "math/vector3f.hpp"
-#include "math/vector2i.hpp"
-#include "math/vector2f.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/scene_context.hpp"
class GraphicContextStateImpl;
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,8 +16,8 @@
#include "engine/display/opengl/opengl_framebuffer.hpp"
+#include <iostream>
#include <sstream>
-#include <iostream>
#include <stdexcept>
#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -20,8 +20,8 @@
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX /* Don't defined min() and max() */
+#include <GL/gl.h>
#include <windows.h>
-#include <GL/gl.h>
#elif defined(MACOSX)
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
Modified: trunk/pingus/src/engine/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,8 +20,9 @@
#include <algorithm>
#include <assert.h>
#include <iostream>
+
+#include "math/size.hpp"
#include "math/vector2i.hpp"
-#include "math/size.hpp"
struct Mark {
enum Type { START_MARK = 0, END_MARK = 1 } type;
Modified: trunk/pingus/src/engine/display/rect_merger.hpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/rect_merger.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_RECT_MERGER_HPP
#include <vector>
+
#include "math/rect.hpp"
void merge_rectangles(const std::vector<Rect>& rects_in, std::vector<Rect>&
rects_out);
Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/scene_context.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
#include <SDL.h>
+
#include "engine/display/drawing_context.hpp"
class SceneContextImpl;
Modified: trunk/pingus/src/engine/display/screenshot.cpp
===================================================================
--- trunk/pingus/src/engine/display/screenshot.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/screenshot.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,11 +18,11 @@
#include <assert.h>
#include <config.h>
-#include <time.h>
-#include <stdio.h>
#include <fstream>
#include <iostream>
#include <png.h>
+#include <stdio.h>
+#include <time.h>
#include "engine/display/display.hpp"
#include "engine/display/framebuffer.hpp"
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,10 +17,11 @@
#include "engine/display/sdl_framebuffer.hpp"
#include <iostream>
-#include "math/math.hpp"
-#include "engine/display/surface.hpp"
+
#include "engine/display/display.hpp"
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
+#include "engine/display/surface.hpp"
+#include "math/math.hpp"
namespace {
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,12 +17,13 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
+#include <SDL.h>
#include <vector>
-#include <SDL.h>
+
+#include "engine/display/framebuffer.hpp"
#include "math/color.hpp"
+#include "math/rect.hpp"
#include "math/vector2i.hpp"
-#include "math/rect.hpp"
-#include "engine/display/framebuffer.hpp"
class SDLFramebuffer : public Framebuffer
{
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#include <SDL.h>
+
#include "engine/display/framebuffer_surface.hpp"
/** */
Modified: trunk/pingus/src/engine/display/sprite.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/sprite.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,20 +16,20 @@
#include "engine/display/sprite.hpp"
+#include <SDL.h>
+#include <assert.h>
#include <iostream>
#include <sstream>
-#include <assert.h>
-#include <SDL.h>
-#include "math/origin.hpp"
-#include "math/vector2i.hpp"
#include "SDL_image.h"
#include "engine/display/blitter.hpp"
+#include "engine/display/sprite_description.hpp"
+#include "engine/display/sprite_impl.hpp"
#include "engine/display/surface.hpp"
+#include "math/origin.hpp"
+#include "math/vector2i.hpp"
+#include "pingus/resource.hpp"
#include "util/pathname.hpp"
-#include "pingus/resource.hpp"
-#include "engine/display/sprite_impl.hpp"
-#include "engine/display/sprite_description.hpp"
Sprite::Sprite() :
impl()
Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/sprite.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
+#include <boost/shared_ptr.hpp>
#include <string>
-#include <boost/shared_ptr.hpp>
#include "math/origin.hpp"
#include "pingus/resource_modifier.hpp"
Modified: trunk/pingus/src/engine/display/sprite_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_description.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/display/sprite_description.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,9 +18,10 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_DESCRIPTION_HPP
#include <iostream>
+
+#include "math/origin.hpp"
+#include "math/size.hpp"
#include "math/vector2i.hpp"
-#include "math/size.hpp"
-#include "math/origin.hpp"
#include "util/file_reader.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/engine/display/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/sprite_impl.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#include "engine/display/sprite_impl.hpp"
#include <map>
+
+#include "engine/display/display.hpp"
#include "engine/display/framebuffer.hpp"
-#include "engine/display/display.hpp"
#include "engine/display/sprite_description.hpp"
typedef std::map<std::string, FramebufferSurface> SurfaceCache;
Modified: trunk/pingus/src/engine/display/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
+#include "engine/display/framebuffer_surface.hpp"
#include "engine/display/surface.hpp"
-#include "engine/display/framebuffer_surface.hpp"
#include "math/vector2i.hpp"
class SpriteDescription;
Modified: trunk/pingus/src/engine/display/surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/surface.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/surface.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,12 +18,12 @@
#include "SDL_image.h"
#include <boost/format.hpp>
+#include <iostream>
#include <sstream>
-#include <iostream>
+#include "engine/display/blitter.hpp"
#include "math/rect.hpp"
#include "pingus/debug.hpp"
-#include "engine/display/blitter.hpp"
class SurfaceImpl
{
Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,12 +18,13 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SURFACE_HPP
#include <SDL.h>
+#include <boost/shared_ptr.hpp>
#include <string>
-#include <boost/shared_ptr.hpp>
+
+#include "math/color.hpp"
#include "math/size.hpp"
#include "pingus/resource_modifier.hpp"
#include "util/pathname.hpp"
-#include "math/color.hpp"
class Rect;
class Pathname;
Modified: trunk/pingus/src/engine/gui/component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/component.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/gui/component.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,6 +17,7 @@
#include "engine/gui/component.hpp"
#include <assert.h>
+
#include "engine/gui/group_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,10 +17,11 @@
#include "engine/gui/gui_manager.hpp"
#include <algorithm>
+
+#include "engine/display/display.hpp"
+#include "engine/input/event.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/input/event.hpp"
-#include "engine/display/display.hpp"
using namespace Input;
Modified: trunk/pingus/src/engine/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,8 +18,9 @@
#define HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
#include <vector>
+
+#include "engine/gui/group_component.hpp"
#include "engine/input/event.hpp"
-#include "engine/gui/group_component.hpp"
class DrawingContext;
class GameDelta;
Modified: trunk/pingus/src/engine/gui/rect_component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/rect_component.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/gui/rect_component.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_GUI_RECT_COMPONENT_HPP
#define HEADER_PINGUS_ENGINE_GUI_RECT_COMPONENT_HPP
+#include "engine/gui/component.hpp"
#include "math/rect.hpp"
-#include "engine/gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "engine/gui/surface_button.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "math/vector3f.hpp"
#include "pingus/resource.hpp"
-#include "math/vector3f.hpp"
-#include "engine/display/drawing_context.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/input/control.hpp
===================================================================
--- trunk/pingus/src/engine/input/control.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input/control.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -20,10 +20,10 @@
#include <iostream>
#include <vector>
+#include "engine/input/controller.hpp"
+#include "engine/input/event.hpp"
#include "math/math.hpp"
#include "math/vector2f.hpp"
-#include "engine/input/event.hpp"
-#include "engine/input/controller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input/controller.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/controller.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "engine/input/controller.hpp"
+#include "engine/input/control.hpp"
#include "engine/input/controller_description.hpp"
-#include "engine/input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/controller.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
#include <assert.h>
+
#include "engine/input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/controller_description.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#include <map>
#include <string>
+
#include "engine/input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/core_driver.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/core_driver.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "engine/input/core_driver.hpp"
+#include "engine/display/display.hpp"
+#include "engine/input/manager.hpp"
#include "math/math.hpp"
-#include "engine/input/manager.hpp"
-#include "engine/display/display.hpp"
#include "pingus/globals.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/driver.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input/driver.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_DRIVER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_DRIVER_HPP
+#include "engine/input/control.hpp"
#include "util/file_reader.hpp"
-#include "engine/input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,14 +17,14 @@
#include "engine/input/evdev/evdev_device.hpp"
#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <iostream>
#include <linux/input.h>
+#include <stdexcept>
+#include <stdio.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <stdexcept>
-#include <iostream>
-#include <errno.h>
-#include <stdio.h>
#define BITS_PER_LONG (sizeof(long) * 8)
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DEVICE_HPP
#define HEADER_PINGUS_ENGINE_INPUT_EVDEV_EVDEV_DEVICE_HPP
+#include <linux/input.h>
+#include <string.h>
#include <vector>
-#include <string.h>
-#include <linux/input.h>
#include "engine/input/control.hpp"
Modified: trunk/pingus/src/engine/input/event.hpp
===================================================================
--- trunk/pingus/src/engine/input/event.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input/event.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_EVENT_HPP
#define HEADER_PINGUS_ENGINE_INPUT_EVENT_HPP
+#include <string>
#include <vector>
-#include <string>
namespace Input {
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/engine/input/manager.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input/manager.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,11 +19,11 @@
#include <stdexcept>
#include "config.h"
+#include "engine/input/core_driver.hpp"
+#include "engine/input/sdl_driver.hpp"
+#include "pingus/path_manager.hpp"
+#include "util/pathname.hpp"
#include "util/string_util.hpp"
-#include "util/pathname.hpp"
-#include "pingus/path_manager.hpp"
-#include "engine/input/sdl_driver.hpp"
-#include "engine/input/core_driver.hpp"
#ifdef HAVE_CWIID
# include "engine/input/wiimote/wiimote_driver.hpp"
#endif
Modified: trunk/pingus/src/engine/input/manager.hpp
===================================================================
--- trunk/pingus/src/engine/input/manager.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input/manager.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
#include <vector>
+
#include "engine/input/controller.hpp"
#include "engine/input/controller_description.hpp"
#include "engine/input/driver.hpp"
Modified: trunk/pingus/src/engine/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,11 +16,11 @@
#include "engine/input/sdl_driver.hpp"
-#include "pingus/global_event.hpp"
+#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
#include "math/size.hpp"
+#include "pingus/global_event.hpp"
#include "util/file_reader.hpp"
-#include "engine/display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/sdl_driver.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/sdl_driver.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -21,8 +21,9 @@
#include <vector>
#include <SDL.h>
+
+#include "engine/input/control.hpp"
#include "engine/input/driver.hpp"
-#include "engine/input/control.hpp"
class FileReader;
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,18 +16,18 @@
#include "engine/input/usbmouse/usbmouse_driver.hpp"
+#include <errno.h>
+#include <fcntl.h>
+#include <iostream>
#include <stdexcept>
+#include <string.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <iostream>
-#include <errno.h>
-#include <string.h>
+#include "engine/display/display.hpp"
+#include "math/vector2i.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "math/vector2i.hpp"
-#include "engine/display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.cpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "engine/input/wiimote/wiimote.hpp"
+#include <assert.h>
#include <iostream>
-#include <assert.h>
#include <pthread.h>
#include "math/math.hpp"
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
#define HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
+#include <pthread.h>
+#include <string>
#include <vector>
-#include <string>
-#include <pthread.h>
#include "cwiid.h"
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,9 +18,9 @@
#include "SDL_syswm.h"
+#include "engine/input/xinput/xinput_driver.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/input/xinput/xinput_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -22,6 +22,7 @@
#include <X11/extensions/XInput.h>
#include <string>
#include <vector>
+
#include "math/vector2i.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,9 +18,9 @@
#include <iostream>
+#include "engine/input/xinput/xinput_device.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/input/xinput/xinput_device.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -21,6 +21,7 @@
#include <X11/Xutil.h>
#include <X11/extensions/XInput.h>
#include <vector>
+
#include "SDL_syswm.h"
#include "engine/input/driver.hpp"
Modified: trunk/pingus/src/engine/input_old/axes/button_axis.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/button_axis.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/axes/button_axis.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "../button.hpp"
#include "button_axis.hpp"
-#include "../button.hpp"
namespace Input {
namespace Axes {
Modified: trunk/pingus/src/engine/input_old/axes/joystick_axis.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/joystick_axis.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/axes/joystick_axis.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "../../pingus_error.hpp"
#include "joystick_axis.hpp"
-#include "../../pingus_error.hpp"
namespace Input {
namespace Axes {
Modified: trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/axes/multiple_axis.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_AXES_MULTIPLE_AXIS_HPP
#include <vector>
+
#include "../axis.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/axis_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/axis_factory.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input_old/axis_factory.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -14,15 +14,15 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus_error.hpp"
-#include "axis_factory.hpp"
-#include "button.hpp"
-#include "button_factory.hpp"
#include "axes/button_axis.hpp"
#include "axes/inverted_axis.hpp"
#include "axes/joystick_axis.hpp"
#include "axes/multiple_axis.hpp"
+#include "axis_factory.hpp"
+#include "button.hpp"
+#include "button_factory.hpp"
#include "debug.hpp"
+#include "pingus_error.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/button.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input_old/button.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_HPP
#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTON_HPP
+#include "controller.hpp"
#include "pingus.hpp"
-#include "controller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/button_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/button_factory.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/button_factory.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,8 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "file_reader.hpp"
-#include "pingus_error.hpp"
+
#include "button_factory.hpp"
#include "buttons/double_button.hpp"
#include "buttons/joystick_button.hpp"
@@ -24,6 +23,8 @@
#include "buttons/mouse_button.hpp"
#include "buttons/multiple_button.hpp"
#include "buttons/triple_button.hpp"
+#include "file_reader.hpp"
+#include "pingus_error.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/buttons/joystick_button.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/joystick_button.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/buttons/joystick_button.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "../../pingus_error.hpp"
#include "joystick_button.hpp"
-#include "../../pingus_error.hpp"
namespace Input {
namespace Buttons {
Modified: trunk/pingus/src/engine/input_old/buttons/key_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/key_button.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/buttons/key_button.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_KEY_BUTTON_HPP
#include <string>
+
#include "../button.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include "../../pingus_error.hpp"
#include "mouse_button.hpp"
-#include "../../pingus_error.hpp"
namespace Input {
namespace Buttons {
Modified: trunk/pingus/src/engine/input_old/buttons/multiple_button.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/multiple_button.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/buttons/multiple_button.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,6 +16,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+
#include "multiple_button.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/buttons/multiple_button.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_BUTTONS_MULTIPLE_BUTTON_HPP
#include <vector>
+
#include "../button.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input_old/controller.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -15,24 +15,25 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <SDL.h>
+
#include "engine/screen/screen_manager.hpp"
#include "debug.hpp"
#include "pingus_error.hpp"
-#include "path_manager.hpp"
-#include "controller.hpp"
#include "axes/dummy_axis.hpp"
+#include "button_factory.hpp"
#include "buttons/dummy_button.hpp"
+#include "buttons/key_button.hpp"
+#include "buttons/mouse_button.hpp"
+#include "controller.hpp"
+#include "global_event.hpp"
+#include "path_manager.hpp"
+#include "pointer_factory.hpp"
#include "pointers/dummy_pointer.hpp"
-#include "scrollers/dummy_scroller.hpp"
-#include "pointer_factory.hpp"
#include "scroller_factory.hpp"
-#include "button_factory.hpp"
-#include "buttons/key_button.hpp"
-#include "buttons/mouse_button.hpp"
#include "scrollers/axis_scroller.hpp"
-#include "global_event.hpp"
+#include "scrollers/dummy_scroller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/input_old/controller.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,13 +17,14 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_CONTROLLER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_OLD_CONTROLLER_HPP
+#include <SDL.h>
+#include <list>
#include <map>
-#include <list>
#include <string>
#include <vector>
-#include <SDL.h>
+
+#include "event.hpp"
#include "file_reader.hpp"
-#include "event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/event.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_HPP
#define HEADER_PINGUS_ENGINE_INPUT_OLD_EVENT_HPP
+#include <string>
#include <vector>
-#include <string>
+
#include "pingus.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/pointer_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointer_factory.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/pointer_factory.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,12 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
+
+#include "axis_factory.hpp"
#include "pingus_error.hpp"
-#include "axis_factory.hpp"
+#include "pointer_factory.hpp"
#include "pointers/axis_pointer.hpp"
#include "pointers/mouse_pointer.hpp"
#include "pointers/multiple_pointer.hpp"
-#include "pointer_factory.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/pointers/axis_pointer.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/axis_pointer.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/pointers/axis_pointer.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,6 +16,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h>
+
#include "../axis.hpp"
#include "axis_pointer.hpp"
Modified: trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/pointers/axis_pointer.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_AXIS_POINTER_HPP
#include <vector>
+
#include "../pointer.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/pointers/mouse_pointer.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,8 +18,8 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MOUSE_POINTER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MOUSE_POINTER_HPP
+#include "../controller.hpp"
#include "../pointer.hpp"
-#include "../controller.hpp"
namespace Input {
namespace Pointers {
Modified: trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/pointers/multiple_pointer.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_POINTERS_MULTIPLE_POINTER_HPP
#include <vector>
+
#include "../pointer.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/scroller_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/scroller_factory.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/scroller_factory.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -15,11 +15,12 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdlib.h>
-#include "pingus_error.hpp"
+
#include "axis.hpp"
#include "axis_factory.hpp"
#include "button.hpp"
#include "button_factory.hpp"
+#include "pingus_error.hpp"
#include "pointer.hpp"
#include "pointer_factory.hpp"
#include "scroller_factory.hpp"
Modified: trunk/pingus/src/engine/input_old/scrollers/axis_scroller.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/axis_scroller.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/scrollers/axis_scroller.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,6 +16,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <assert.h>
+
#include "../../debug.hpp"
#include "../../math.hpp"
#include "../axis.hpp"
Modified: trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/scrollers/axis_scroller.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_AXIS_SCROLLER_HPP
#include <vector>
+
#include "../scroller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/engine/input_old/scrollers/multiple_scroller.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_OLD_SCROLLERS_MULTIPLE_SCROLLER_HPP
#include <vector>
+
#include "../scroller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/engine/screen/gui_screen.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/screen/gui_screen.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,10 +16,10 @@
#include "engine/screen/gui_screen.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
+#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
GUIScreen::GUIScreen()
: Screen(Display::get_size()),
Modified: trunk/pingus/src/engine/screen/screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/screen/screen.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_HPP
#include <SDL.h>
+
#include "math/size.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,20 +17,20 @@
#include "engine/screen/screen_manager.hpp"
#include <SDL.h>
+#include <fstream>
#include <iostream>
-#include <fstream>
-#include "pingus/globals.hpp"
-#include "math/size.hpp"
-#include "util/pathname.hpp"
#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "engine/display/framebuffer.hpp"
-#include "pingus/path_manager.hpp"
+#include "engine/input/controller.hpp"
+#include "engine/input/manager.hpp"
#include "engine/screen/screen.hpp"
+#include "math/size.hpp"
#include "pingus/fps_counter.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/input/controller.hpp"
-#include "engine/input/manager.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/path_manager.hpp"
+#include "util/pathname.hpp"
template<class C>
void write(std::ostream& out, C value)
Modified: trunk/pingus/src/engine/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/screen/screen_manager.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_MANAGER_HPP
+#include <boost/smart_ptr.hpp>
#include <memory>
-#include <boost/smart_ptr.hpp>
#include <vector>
#include "engine/display/sprite.hpp"
Modified: trunk/pingus/src/engine/sound/sound.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/sound/sound.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,12 +16,13 @@
#include "engine/sound/sound.hpp"
+#include <assert.h>
#include <iostream>
-#include <assert.h>
-#include "pingus/path_manager.hpp"
-#include "pingus/globals.hpp"
+
#include "engine/sound/sound_dummy.hpp"
#include "engine/sound/sound_real.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/path_manager.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/engine/sound/sound.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_HPP
#include <string>
+
#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_dummy.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "engine/sound/sound_dummy.hpp"
+#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
+#include "engine/sound/sound.hpp"
#include "engine/sound/sound_impl.hpp"
-#include "engine/sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,12 +16,13 @@
#include "engine/sound/sound_real.hpp"
+#include <SDL.h>
#include <stdexcept>
-#include <SDL.h>
+
#include "SDL_mixer.h"
+#include "engine/sound/sound_res_mgr.hpp"
+#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
-#include "engine/sound/sound_res_mgr.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,8 +20,9 @@
#include "SDL_mixer.h"
#include <config.h>
#include <vector>
+
+#include "engine/sound/sound.hpp"
#include "engine/sound/sound_impl.hpp"
-#include "engine/sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_res_mgr.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_res_mgr.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_res_mgr.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "engine/sound/sound_res_mgr.hpp"
+#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
SoundResMgr::SoundMap SoundResMgr::sound_map;
Modified: trunk/pingus/src/engine/sound/sound_res_mgr.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_res_mgr.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/engine/sound/sound_res_mgr.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,6 +19,7 @@
#include <map>
#include <string>
+
#include "SDL_mixer.h"
typedef Mix_Chunk* SoundHandle;
Modified: trunk/pingus/src/lisp/getters.cpp
===================================================================
--- trunk/pingus/src/lisp/getters.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/getters.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -1,4 +1,5 @@
#include <config.h>
+
#include "getters.hpp"
namespace lisp
Modified: trunk/pingus/src/lisp/lexer.cpp
===================================================================
--- trunk/pingus/src/lisp/lexer.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/lexer.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
+#include <iostream>
#include <sstream>
#include <stdexcept>
-#include <iostream>
#include <string.h>
#include "lexer.hpp"
Modified: trunk/pingus/src/lisp/lisp.cpp
===================================================================
--- trunk/pingus/src/lisp/lisp.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/lisp.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,9 +16,10 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <assert.h>
#include <config.h>
-#include <assert.h>
#include <string.h>
+
#include "lisp.hpp"
namespace lisp
Modified: trunk/pingus/src/lisp/lisp.hpp
===================================================================
--- trunk/pingus/src/lisp/lisp.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/lisp.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,13 +18,13 @@
#ifndef __LISP_HPP__
#define __LISP_HPP__
-#include <string>
-#include <vector>
+#include <assert.h>
+#include <boost/shared_ptr.hpp>
#include <iostream>
#include <sstream>
#include <stdexcept>
-#include <assert.h>
-#include <boost/shared_ptr.hpp>
+#include <string>
+#include <vector>
namespace lisp
{
Modified: trunk/pingus/src/lisp/parser.cpp
===================================================================
--- trunk/pingus/src/lisp/parser.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/parser.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,17 +18,17 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
-#include <sstream>
#include <cassert>
+#include <exception>
+#include <fstream>
#include <iostream>
+#include <sstream>
+#include <string.h>
#include <string>
-#include <fstream>
-#include <exception>
-#include <string.h>
//#include "physfs/physfs_stream.hpp"
+#include "lisp.hpp"
#include "parser.hpp"
-#include "lisp.hpp"
namespace lisp
{
Modified: trunk/pingus/src/lisp/parser.hpp
===================================================================
--- trunk/pingus/src/lisp/parser.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/lisp/parser.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,8 +18,9 @@
#ifndef __LISPPARSER_H__
#define __LISPPARSER_H__
+#include <boost/shared_ptr.hpp>
#include <string>
-#include <boost/shared_ptr.hpp>
+
#include "lexer.hpp"
namespace lisp
Modified: trunk/pingus/src/math/origin.hpp
===================================================================
--- trunk/pingus/src/math/origin.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/origin.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -38,8 +38,9 @@
#endif
#include <string>
+
+#include "math/size.hpp"
#include "vector2i.hpp"
-#include "math/size.hpp"
//: Alignment origins.
//- !group=Core/Math!
Modified: trunk/pingus/src/math/quad_tree.hpp
===================================================================
--- trunk/pingus/src/math/quad_tree.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/quad_tree.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,9 +19,9 @@
#ifndef HEADER_PINGUS_MATH_QUAD_TREE_HPP
#define HEADER_PINGUS_MATH_QUAD_TREE_HPP
+#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vector>
-#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "math/rect.hpp"
Modified: trunk/pingus/src/math/rect.hpp
===================================================================
--- trunk/pingus/src/math/rect.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/rect.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -32,9 +32,9 @@
#include <math.h>
+#include "math/math.hpp"
#include "math/origin.hpp"
#include "math/vector2f.hpp"
-#include "math/math.hpp"
class Rectf;
Modified: trunk/pingus/src/math/vector2f.hpp
===================================================================
--- trunk/pingus/src/math/vector2f.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/vector2f.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,8 +19,9 @@
#define SUPERTUX_VECTOR_H
#include <iosfwd>
+
+#include "math/math.hpp"
#include "vector2i.hpp"
-#include "math/math.hpp"
/** Simple two dimensional vector. */
class Vector2f
Modified: trunk/pingus/src/math/vector2i.cpp
===================================================================
--- trunk/pingus/src/math/vector2i.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/vector2i.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,6 +17,7 @@
#include "math/vector2i.hpp"
#include <iostream>
+
#include "vector2f.hpp"
#include "vector2i.hpp"
Modified: trunk/pingus/src/math/vector3f.hpp
===================================================================
--- trunk/pingus/src/math/vector3f.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/math/vector3f.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_MATH_VECTOR3F_HPP
#include <iosfwd>
+
#include "math/math.hpp"
#include "math/vector2f.hpp"
#include "math/vector2i.hpp"
Modified: trunk/pingus/src/pingus/action_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/action_holder.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,6 +19,7 @@
#include <map>
#include <vector>
+
#include "pingus/pingu_enums.hpp"
class PingusLevel;
Modified: trunk/pingus/src/pingus/actions/angel.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/angel.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,9 @@
#include "pingus/actions/angel.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/pingu.hpp"
#include "math/math.hpp"
#include "pingus/globals.hpp"
+#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/angel.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/angel.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_ANGEL_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_ANGEL_HPP
+#include "engine/display/sprite.hpp"
#include "pingus/pingu_action.hpp"
-#include "engine/display/sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/basher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/basher.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,11 +16,11 @@
#include "pingus/actions/basher.hpp"
+#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/basher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/basher.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/blocker.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/blocker.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BLOCKER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_BLOCKER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/actions/boarder.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,16 +16,16 @@
#include "pingus/actions/bomber.hpp"
+#include "engine/display/scene_context.hpp"
+#include "pingus/colliders/pingu_collider.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
+#include "pingus/ground_map.hpp"
+#include "pingus/movers/linear_mover.hpp"
+#include "pingus/particles/pingu_particle_holder.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_enums.hpp"
-#include "pingus/ground_map.hpp"
#include "pingus/world.hpp"
-#include "pingus/particles/pingu_particle_holder.hpp"
-#include "pingus/colliders/pingu_collider.hpp"
-#include "pingus/movers/linear_mover.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bomber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,13 +17,14 @@
#include "pingus/actions/bridger.hpp"
#include <cassert>
+
#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
+#include "pingus/gettext.h"
+#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/ground_map.hpp"
-#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
-#include "pingus/gettext.h"
#include "util/string_util.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/climber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/climber.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/climber.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_CLIMBER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_CLIMBER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/digger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/digger.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,12 +17,13 @@
#include "pingus/actions/digger.hpp"
#include <cstdio>
+
#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/ground_map.hpp"
+#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
-#include "engine/sound/sound.hpp"
-#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/drown.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/drown.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/actions/drown.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/drown.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/drown.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_DROWN_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_DROWN_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,10 +16,10 @@
#include "pingus/actions/exiter.hpp"
+#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
-#include "engine/sound/sound.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/exiter.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/exiter.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_EXITER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_EXITER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/faller.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,11 +16,11 @@
#include "pingus/actions/faller.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/colliders/pingu_collider.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/movers/linear_mover.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/faller.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/faller.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_FALLER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_FALLER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/floater.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/floater.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,9 +16,9 @@
#include "pingus/actions/floater.hpp"
-#include "pingus/pingu.hpp"
#include "engine/display/scene_context.hpp"
#include "pingus/groundtype.hpp"
+#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/floater.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/floater.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_FLOATER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_FLOATER_HPP
+#include "engine/display/sprite.hpp"
#include "pingus/pingu_action.hpp"
-#include "engine/display/sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/actions/jumper.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/jumper.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/jumper.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_JUMPER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_JUMPER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "pingus/actions/laser_kill.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/laser_kill.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/laser_kill.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_LASER_KILL_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_LASER_KILL_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/miner.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/miner.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,11 +17,11 @@
#include "pingus/actions/miner.hpp"
-#include "pingus/ground_map.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/world.hpp"
#include "engine/sound/sound.hpp"
+#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
+#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,8 +19,8 @@
#include "engine/display/scene_context.hpp"
//#include "pingus/particles/particle_holder.hpp"
//#include "pingus/particles/explosive_particle.hpp"
+#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
-#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_ROCKET_LAUNCHER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/slider.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/slider.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#include "pingus/actions/slider.hpp"
#include "engine/display/scene_context.hpp"
+#include "pingus/groundtype.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/groundtype.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/slider.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/slider.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SLIDER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_SLIDER_HPP
+#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
-#include "pingus/pingu_action.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,10 +16,10 @@
#include "pingus/actions/smashed.hpp"
+#include "engine/display/scene_context.hpp"
+#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
-#include "engine/display/sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,10 +16,10 @@
#include "pingus/actions/splashed.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
+#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
-#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/splashed.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/splashed.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_SPLASHED_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_SPLASHED_HPP
+#include "engine/display/sprite.hpp"
#include "pingus/pingu_action.hpp"
-#include "engine/display/sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/superman.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/actions/superman.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#include "pingus/actions/superman.hpp"
#include "engine/display/scene_context.hpp"
+#include "engine/display/sprite.hpp"
#include "pingus/pingu.hpp"
-#include "engine/display/sprite.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/actions/waiter.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/walker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/actions/walker.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,11 +16,11 @@
#include "pingus/actions/walker.hpp"
-#include "pingus/globals.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/pingu.hpp"
#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
#include "pingus/groundtype.hpp"
+#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,13 +17,13 @@
#include "pingus/capture_rectangle.hpp"
#include "engine/display/scene_context.hpp"
+#include "math/vector3f.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/screens/game_session.hpp"
#include "pingus/globals.hpp"
-#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/resource.hpp"
+#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/collider.cpp
===================================================================
--- trunk/pingus/src/pingus/collider.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/collider.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/collider.hpp"
+#include "math/vector3f.hpp"
#include "pingus/collision_map.hpp"
-#include "math/vector3f.hpp"
#include "pingus/world.hpp"
Collider::Collider()
Modified: trunk/pingus/src/pingus/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,9 +16,9 @@
#include "pingus/colliders/pingu_collider.hpp"
+#include "math/vector3f.hpp"
+#include "pingus/groundtype.hpp"
#include "pingus/pingu_action.hpp"
-#include "pingus/groundtype.hpp"
-#include "math/vector3f.hpp"
namespace Colliders {
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,15 +16,15 @@
#include "pingus/collision_map.hpp"
+#include <SDL.h>
#include <iostream>
-#include <SDL.h>
#include "engine/display/drawing_context.hpp"
-#include "pingus/globals.hpp"
+#include "engine/display/sprite.hpp"
+#include "math/math.hpp"
#include "pingus/collision_mask.hpp"
-#include "math/math.hpp"
#include "pingus/gettext.h"
-#include "engine/display/sprite.hpp"
+#include "pingus/globals.hpp"
CollisionMap::CollisionMap(int w, int h)
: serial(0),
Modified: trunk/pingus/src/pingus/collision_map.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/collision_map.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_COLLISION_MAP_HPP
#include <SDL.h>
+
#include "pingus/groundtype.hpp"
class CollisionMask;
Modified: trunk/pingus/src/pingus/collision_mask.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/collision_mask.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,6 +17,7 @@
#include "pingus/collision_mask.hpp"
#include <iostream>
+
#include "pingus/resource.hpp"
#include "util/system.hpp"
Modified: trunk/pingus/src/pingus/collision_mask.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/collision_mask.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_COLLISION_MASK_HPP
#include <string>
+
#include "engine/display/surface.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,14 +16,14 @@
#include "pingus/components/action_button.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "math/vector3f.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
+#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
-#include "pingus/screens/game_session.hpp"
#include "pingus/world.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "pingus/fonts.hpp"
#include "util/string_util.hpp"
-#include "math/vector3f.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/components/action_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/components/action_button.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,11 +18,12 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
#include <string>
+
#include "engine/display/font.hpp"
+#include "engine/gui/component.hpp"
+#include "engine/gui/rect_component.hpp"
#include "pingus/pingu_enums.hpp"
#include "pingus/state_sprite.hpp"
-#include "engine/gui/component.hpp"
-#include "engine/gui/rect_component.hpp"
class Server;
class GameSession;
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,16 +16,16 @@
#include "pingus/components/button_panel.hpp"
+#include <algorithm>
#include <iostream>
-#include <algorithm>
+#include "engine/display/drawing_context.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
-#include "util/string_util.hpp"
#include "pingus/globals.hpp"
+#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "engine/display/drawing_context.hpp"
+#include "util/string_util.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
#include <vector>
+
#include "engine/display/sprite.hpp"
#include "engine/gui/rect_component.hpp"
#include "pingus/components/action_button.hpp"
Modified: trunk/pingus/src/pingus/components/check_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/check_box.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "pingus/components/check_box.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
CheckBox::CheckBox(const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/check_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/check_box.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,6 +19,7 @@
#include <boost/signal.hpp>
#include <string>
+
#include "engine/gui/rect_component.hpp"
/** */
Modified: trunk/pingus/src/pingus/components/choice_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/choice_box.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "pingus/components/choice_box.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
ChoiceBox::ChoiceBox(const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,10 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+#include <boost/signal.hpp>
#include <string>
#include <vector>
-#include <boost/signal.hpp>
+
#include "engine/gui/rect_component.hpp"
/** */
Modified: trunk/pingus/src/pingus/components/label.cpp
===================================================================
--- trunk/pingus/src/pingus/components/label.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/label.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,9 +16,9 @@
#include "pingus/components/label.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
Label::Label(const std::string& label_, const Rect& rect_)
: RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/label.hpp
===================================================================
--- trunk/pingus/src/pingus/components/label.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/label.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_LABEL_HPP
#include <string>
+
#include "engine/display/font.hpp"
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,12 +16,12 @@
#include "pingus/components/menu_button.hpp"
-#include "pingus/globals.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/debug.hpp"
#include "pingus/fonts.hpp"
-#include "engine/sound/sound.hpp"
+#include "pingus/gettext.h"
+#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
-#include "pingus/gettext.h"
#include "pingus/screens/pingus_menu.hpp"
Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,10 +18,11 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_MENU_BUTTON_HPP
#include <string>
+
+#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
-#include "engine/display/font.hpp"
+#include "engine/gui/component.hpp"
#include "math/vector2i.hpp"
-#include "engine/gui/component.hpp"
class PingusMenu;
Modified: trunk/pingus/src/pingus/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,8 +18,8 @@
#include <stdio.h>
+#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
-#include "engine/gui/component.hpp"
#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
+#include "engine/gui/component.hpp"
class DrawingContext;
class World;
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,17 +16,18 @@
#include "pingus/components/playfield.hpp"
+#include <iostream>
#include <stdio.h>
-#include <iostream>
-#include "pingus/globals.hpp"
-#include "pingus/pingu_holder.hpp"
+
+#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/world.hpp"
-#include "pingus/server.hpp"
+#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
-#include "engine/display/display.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/screens/game_session.hpp"
+#include "pingus/server.hpp"
+#include "pingus/world.hpp"
Playfield::Playfield(Server* server_, GameSession* session_, const Rect&
rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,10 +16,10 @@
#include "pingus/components/slider_box.hpp"
+#include "engine/display/drawing_context.hpp"
#include "math/math.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
SliderBox::SliderBox(const Rect& rect_)
: RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+#include <boost/signal.hpp>
#include <string>
-#include <boost/signal.hpp>
+
#include "engine/gui/rect_component.hpp"
/** */
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,19 +16,19 @@
#include "pingus/components/smallmap.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "pingus/pingu_holder.hpp"
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
-#include "pingus/world.hpp"
+#include "math/math.hpp"
+#include "math/vector3f.hpp"
+#include "pingus/components/playfield.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/pingu.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
+#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/smallmap_image.hpp"
-#include "pingus/pingu.hpp"
-#include "math/math.hpp"
-#include "math/vector3f.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/components/playfield.hpp"
+#include "pingus/world.hpp"
SmallMap::SmallMap(Server* server_, Playfield* playfield_, const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,14 +20,14 @@
#include <stdio.h>
#include "engine/display/display.hpp"
+#include "pingus/fonts.hpp"
+#include "pingus/game_time.hpp"
#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
+#include "pingus/screens/game_session.hpp"
+#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "pingus/server.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "pingus/game_time.hpp"
#include "util/string_util.hpp"
-#include "pingus/fonts.hpp"
TimeDisplay::TimeDisplay (GameSession* c) :
Modified: trunk/pingus/src/pingus/components/time_display.hpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
+#include "engine/display/font.hpp"
+#include "engine/display/sprite.hpp"
#include "engine/gui/component.hpp"
-#include "engine/display/sprite.hpp"
-#include "engine/display/font.hpp"
class Font;
class Server;
Modified: trunk/pingus/src/pingus/config_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/config_manager.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,19 +16,20 @@
#include "pingus/config_manager.hpp"
+#include <SDL.h>
+#include <fstream>
#include <iostream>
-#include <fstream>
-#include <SDL.h>
-#include "pingus/globals.hpp"
-#include "util/system.hpp"
-#include "pingus/fps_counter.hpp"
+
#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "pingus/fps_counter.hpp"
+#include "pingus/globals.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/parser.hpp"
+#include "util/system.hpp"
extern tinygettext::DictionaryManager dictionary_manager;
Modified: trunk/pingus/src/pingus/config_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/config_manager.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+#include <boost/signal.hpp>
#include <string>
-#include <boost/signal.hpp>
+
#include "math/size.hpp"
#include "tinygettext/language.hpp"
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,10 @@
#include "pingus/fps_counter.hpp"
#include <sstream>
+
+#include "engine/display/display.hpp"
+#include "gettext.h"
#include "pingus/fonts.hpp"
-#include "gettext.h"
-#include "engine/display/display.hpp"
FPSCounter fps_counter;
Modified: trunk/pingus/src/pingus/game_time.cpp
===================================================================
--- trunk/pingus/src/pingus/game_time.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/game_time.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,6 +17,7 @@
#include "pingus/game_time.hpp"
#include <stdio.h>
+
#include "gettext.h"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/gettext.cpp
===================================================================
--- trunk/pingus/src/pingus/gettext.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/gettext.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,9 +16,9 @@
#include "pingus/gettext.h"
+#include "gettext.h"
+#include "tinygettext/dictionary.hpp"
#include "tinygettext/dictionary_manager.hpp"
-#include "tinygettext/dictionary.hpp"
-#include "gettext.h"
tinygettext::DictionaryManager dictionary_manager;
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,17 +16,17 @@
#include "pingus/global_event.hpp"
+#include <algorithm>
#include <config.h>
+#include <iostream>
#include <stdio.h>
-#include <iostream>
-#include <algorithm>
#include "engine/display/screenshot.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "pingus/screens/addon_menu.hpp"
#include "pingus/config_manager.hpp"
#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
+#include "pingus/screens/addon_menu.hpp"
#include "pingus/screens/level_menu.hpp"
#include "pingus/screens/option_menu.hpp"
Modified: trunk/pingus/src/pingus/goal_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/goal_manager.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,10 +17,11 @@
#include "pingus/goal_manager.hpp"
#include <iostream>
+
+#include "pingus/globals.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/pingu_holder.hpp"
GoalManager::GoalManager(Server* s)
: server(s), goal(GT_NONE), exit_time(0)
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,10 +16,10 @@
#include "pingus/ground_map.hpp"
-#include <stdio.h>
+#include <SDL.h>
#include <iostream>
#include <stdexcept>
-#include <SDL.h>
+#include <stdio.h>
#include "engine/display/blitter.hpp"
#include "engine/display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/ground_map.hpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/ground_map.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,10 +18,11 @@
#define HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
#include <vector>
+
+#include "engine/display/surface.hpp"
#include "pingus/globals.hpp"
+#include "pingus/ground_map.hpp"
#include "pingus/worldobj.hpp"
-#include "pingus/ground_map.hpp"
-#include "engine/display/surface.hpp"
class SceneContext;
class CollisionMap;
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_LAYER_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_LAYER_MANAGER_HPP
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/sprite.hpp"
#include "math/math.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/sprite.hpp"
-#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
class LayerManager
{
Modified: trunk/pingus/src/pingus/levelset.hpp
===================================================================
--- trunk/pingus/src/pingus/levelset.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/levelset.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,9 +19,10 @@
#include <string>
#include <vector>
+
+#include "engine/display/sprite.hpp"
#include "pingus/pingus_level.hpp"
#include "util/pathname.hpp"
-#include "engine/display/sprite.hpp"
/** */
class Levelset
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,10 +17,10 @@
#include "pingus/particles/explosive_particle.hpp"
#if 0
#include "pingus/collision_map.hpp"
+#include "pingus/particles/particle_holder.hpp"
#include "pingus/pingu_map.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/particles/particle_holder.hpp"
-#include "pingus/resource.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
: Particle (x, y, x_a, y_a),
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_PARTICLES_PINGU_PARTICLE_HOLDER_HPP
#include <vector>
+
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_PARTICLES_RAIN_PARTICLE_HOLDER_HPP
#include <vector>
+
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,8 +16,8 @@
#include "pingus/particles/smoke_particle_holder.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_PARTICLES_SMOKE_PARTICLE_HOLDER_HPP
#include <vector>
+
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,9 +18,9 @@
#include <assert.h>
+#include "engine/display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_PARTICLES_SNOW_PARTICLE_HOLDER_HPP
#include <vector>
+
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/path_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/path_manager.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PATH_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_PATH_MANAGER_HPP
+#include <list>
#include <string>
-#include <list>
class PathManager
{
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,44 +16,44 @@
#include "pingus/pingu.hpp"
+#include <assert.h>
#include <sstream>
-#include <assert.h>
#include <stdio.h>
+#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
+#include "gettext.h"
#include "math/math.hpp"
+#include "pingus/collision_map.hpp"
+#include "pingus/debug.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
+#include "pingus/pingu_action.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "engine/sound/sound.hpp"
-#include "pingus/collision_map.hpp"
-#include "pingus/pingu_action.hpp"
-#include "gettext.h"
-#include "pingus/debug.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/worldobj.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/fonts.hpp"
-#include "pingus/actions/rocket_launcher.hpp"
-#include "pingus/actions/boarder.hpp"
-#include "pingus/actions/superman.hpp"
#include "pingus/actions/angel.hpp"
#include "pingus/actions/basher.hpp"
#include "pingus/actions/blocker.hpp"
+#include "pingus/actions/boarder.hpp"
#include "pingus/actions/bomber.hpp"
#include "pingus/actions/bridger.hpp"
#include "pingus/actions/climber.hpp"
#include "pingus/actions/digger.hpp"
+#include "pingus/actions/drown.hpp"
+#include "pingus/actions/exiter.hpp"
+#include "pingus/actions/faller.hpp"
#include "pingus/actions/floater.hpp"
+#include "pingus/actions/jumper.hpp"
+#include "pingus/actions/laser_kill.hpp"
#include "pingus/actions/miner.hpp"
-#include "pingus/actions/jumper.hpp"
+#include "pingus/actions/rocket_launcher.hpp"
#include "pingus/actions/slider.hpp"
-#include "pingus/actions/exiter.hpp"
#include "pingus/actions/smashed.hpp"
-#include "pingus/actions/laser_kill.hpp"
#include "pingus/actions/splashed.hpp"
+#include "pingus/actions/superman.hpp"
#include "pingus/actions/waiter.hpp"
-#include "pingus/actions/drown.hpp"
-#include "pingus/actions/faller.hpp"
#include "pingus/actions/walker.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/pingu.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_PINGU_HPP
#include <boost/shared_ptr.hpp>
+
#include "math/vector3f.hpp"
#include "pingus/direction.hpp"
#include "pingus/pingu_enums.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -21,8 +21,8 @@
#include "math/math.hpp"
#include "math/vector3f.hpp"
#include "pingus/collision_map.hpp"
+#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
-#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
#define HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
-#include "pingus/pingu_enums.hpp"
#include "engine/display/surface.hpp"
#include "pingus/collision_mask.hpp"
+#include "pingus/pingu_enums.hpp"
class ActionHolder;
class SceneContext;
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,10 +16,11 @@
#include "pingus/pingu_holder.hpp"
+#include <assert.h>
#include <iostream>
-#include <assert.h>
+
+#include "pingus/pingu.hpp"
#include "pingus/pingus_level.hpp"
-#include "pingus/pingu.hpp"
PinguHolder::PinguHolder(const PingusLevel& plf) :
Modified: trunk/pingus/src/pingus/pingu_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,6 +19,7 @@
#include <list>
#include <vector>
+
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,8 @@
#include "pingus/pingus_demo.hpp"
+#include <fstream>
#include <stdexcept>
-#include <fstream>
#include "pingus/pingu_enums.hpp"
#include "pingus/server_event.hpp"
Modified: trunk/pingus/src/pingus/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingus_level.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,11 +19,11 @@
#include <iostream>
#include <stdexcept>
+#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/pingus_level_impl.hpp"
#include "util/file_reader.hpp"
-#include "pingus/pingus_level_impl.hpp"
-#include "pingus/globals.hpp"
#include "util/pathname.hpp"
-#include "pingus/debug.hpp"
PingusLevel::PingusLevel()
: impl(new PingusLevelImpl())
Modified: trunk/pingus/src/pingus/pingus_level.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingus_level.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
+#include <boost/shared_ptr.hpp>
+#include <map>
#include <string>
#include <vector>
-#include <map>
-#include <boost/shared_ptr.hpp>
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/pingus_level_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_IMPL_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_IMPL_HPP
+#include "math/color.hpp"
#include "math/size.hpp"
-#include "math/color.hpp"
+#include <map>
#include <string>
#include <vector>
-#include <map>
class PingusLevelImpl
{
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,21 +17,22 @@
#include "pingus/pingus_main.hpp"
#include <config.h>
+#include <iostream>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
#include <sys/stat.h>
-#include <stdio.h>
-#include <signal.h>
-#include <locale.h>
-#include <iostream>
+
+#include "editor/editor_level.hpp"
+#include "engine/display/display.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-#include "editor/editor_level.hpp"
-#include "util/string_util.hpp"
+#include "pingus/config_manager.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/screens/demo_session.hpp"
+#include "pingus/screens/pingus_menu.hpp"
#include "util/sexpr_file_reader.hpp"
-#include "pingus/fonts.hpp"
-#include "pingus/config_manager.hpp"
-#include "engine/display/display.hpp"
-#include "pingus/screens/pingus_menu.hpp"
+#include "util/string_util.hpp"
#if defined(__APPLE__)
/* Can't use the include, some type names conflict.
@@ -60,24 +61,24 @@
#include "util/command_line.hpp"
#include "engine/screen/screen_manager.hpp"
+#include "pingus/fps_counter.hpp"
+#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
-#include "pingus/globals.hpp"
-#include "util/system.hpp"
-#include "pingus/fps_counter.hpp"
#include "pingus/plf_res_mgr.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/screens/story_screen.hpp"
+#include "util/system.hpp"
-#include "pingus/screens/start_screen.hpp"
-#include "pingus/savegame_manager.hpp"
-#include "pingus/stat_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/debug.hpp"
#include "pingus/resource.hpp"
+#include "pingus/savegame_manager.hpp"
#include "pingus/screens/credits.hpp"
-#include "engine/sound/sound.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/screens/font_test_screen.hpp"
+#include "pingus/screens/start_screen.hpp"
+#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldobj_factory.hpp"
#include "editor/editor_screen.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/pingus_main.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
+#include <SDL.h>
#include <string>
-#include <SDL.h>
#include "pingus/pingus_options.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/pingus/plf_res_mgr.cpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,10 +16,10 @@
#include "pingus/plf_res_mgr.hpp"
+#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
+#include "util/pathname.hpp"
#include "util/system.hpp"
-#include "util/pathname.hpp"
PLFResMgr::PLFMap PLFResMgr::plf_map;
Modified: trunk/pingus/src/pingus/resource.cpp
===================================================================
--- trunk/pingus/src/pingus/resource.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/resource.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,14 +18,14 @@
#include <assert.h>
-#include "util/system.hpp"
-#include "pingus/path_manager.hpp"
-#include "pingus/globals.hpp"
+#include "engine/display/blitter.hpp"
#include "engine/display/font_description.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "engine/display/blitter.hpp"
#include "engine/display/sprite_description.hpp"
#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/path_manager.hpp"
+#include "pingus/res_descriptor.hpp"
+#include "util/system.hpp"
ResourceManager Resource::resmgr;
Modified: trunk/pingus/src/pingus/resource.hpp
===================================================================
--- trunk/pingus/src/pingus/resource.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/resource.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,12 +19,13 @@
#include <map>
#include <vector>
+
+#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
#include "engine/display/surface.hpp"
+#include "pingus/collision_mask.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_manager.hpp"
-#include "pingus/collision_mask.hpp"
-#include "engine/display/font.hpp"
class Resource
{
Modified: trunk/pingus/src/pingus/resource_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/resource_manager.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,13 +17,14 @@
#include "pingus/resource_manager.hpp"
#include <iostream>
+
+#include "engine/display/sprite_description.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/parser.hpp"
+#include "util/sexpr_file_reader.hpp"
#include "util/string_util.hpp"
-#include "engine/display/sprite_description.hpp"
-#include "util/sexpr_file_reader.hpp"
ResourceManager::ResourceManager() :
resources(),
Modified: trunk/pingus/src/pingus/resource_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/resource_manager.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_RESOURCE_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_RESOURCE_MANAGER_HPP
+#include <map>
#include <string>
-#include <map>
#include <vector>
class SpriteDescription;
Modified: trunk/pingus/src/pingus/savegame_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,11 +19,11 @@
#include <assert.h>
#include <fstream>
-#include "util/system.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/parser.hpp"
+#include "util/system.hpp"
SavegameManager* SavegameManager::instance_ = 0;
Modified: trunk/pingus/src/pingus/savegame_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_SAVEGAME_MANAGER_HPP
#include <map>
+
#include "pingus/savegame.hpp"
Modified: trunk/pingus/src/pingus/screens/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,11 +16,11 @@
#include "pingus/screens/addon_menu.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/resource.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
#include "pingus/screens/option_menu.hpp"
AddOnMenu::AddOnMenu() :
Modified: trunk/pingus/src/pingus/screens/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/screens/credits.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,17 +17,18 @@
#include "pingus/screens/credits.hpp"
#include <iostream>
+
+#include "engine/display/blitter.hpp"
+#include "engine/display/display.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "engine/gui/surface_button.hpp"
-#include "engine/gui/gui_manager.hpp"
#include "engine/sound/sound.hpp"
-#include "pingus/stat_manager.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/res_descriptor.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "engine/display/display.hpp"
-#include "engine/display/blitter.hpp"
+#include "pingus/res_descriptor.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/stat_manager.hpp"
class CreditsOkButton
: public GUI::SurfaceButton
Modified: trunk/pingus/src/pingus/screens/credits.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,10 +19,11 @@
#include <string>
#include <vector>
-#include "engine/screen/gui_screen.hpp"
+
#include "engine/display/font.hpp"
#include "engine/display/scene_context.hpp"
#include "engine/display/sprite.hpp"
+#include "engine/screen/gui_screen.hpp"
class Credits : public GUIScreen
{
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,24 +16,24 @@
#include "pingus/screens/demo_session.hpp"
+#include <boost/bind.hpp>
#include <boost/function.hpp>
-#include <boost/bind.hpp>
#include <iostream>
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "math/math.hpp"
-#include "pingus/server.hpp"
-#include "util/pathname.hpp"
-#include "pingus/world.hpp"
#include "pingus/components/pingus_counter.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "engine/display/scene_context.hpp"
-#include "pingus/pingus_demo.hpp"
-#include "engine/gui/surface_button.hpp"
#include "pingus/components/playfield.hpp"
#include "pingus/components/smallmap.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "engine/display/display.hpp"
+#include "pingus/pingus_demo.hpp"
#include "pingus/resource.hpp"
+#include "pingus/server.hpp"
+#include "pingus/world.hpp"
+#include "util/pathname.hpp"
static bool false_func() { return false; }
Modified: trunk/pingus/src/pingus/screens/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/demo_session.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,9 +20,9 @@
#include <memory>
#include <vector>
-#include "util/pathname.hpp"
#include "engine/screen/gui_screen.hpp"
#include "pingus/server_event.hpp"
+#include "util/pathname.hpp"
namespace Input {
struct Event;
Modified: trunk/pingus/src/pingus/screens/font_test_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/font_test_screen.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/screens/font_test_screen.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,12 +18,12 @@
#include <iostream>
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/font_description.hpp"
#include "engine/input/event.hpp"
#include "pingus/fonts.hpp"
#include "util/string_util.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/display.hpp"
-#include "engine/display/font_description.hpp"
FontTestScreen::FontTestScreen(const Pathname& fontfile) :
Screen(Display::get_size()),
Modified: trunk/pingus/src/pingus/screens/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/font_test_screen.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/screens/font_test_screen.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_FONT_TEST_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_FONT_TEST_SCREEN_HPP
+#include "engine/display/font.hpp"
#include "engine/screen/screen.hpp"
-#include "engine/display/font.hpp"
class Pathname;
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,26 +17,27 @@
#include "pingus/screens/game_session.hpp"
#include <iostream>
+
+#include "engine/display/display.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/server.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "engine/display/display.hpp"
+#include "engine/input/event.hpp"
+#include "engine/sound/sound.hpp"
+#include "math/math.hpp"
#include "pingus/components/button_panel.hpp"
#include "pingus/components/pingus_counter.hpp"
+#include "pingus/components/playfield.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/components/time_display.hpp"
-#include "pingus/components/smallmap.hpp"
-#include "pingus/components/playfield.hpp"
-#include "engine/input/event.hpp"
-#include "engine/sound/sound.hpp"
-#include "math/math.hpp"
+#include "pingus/debug.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
-#include "pingus/pingu_holder.hpp"
+#include "pingus/savegame_manager.hpp"
+#include "pingus/screens/result_screen.hpp"
#include "pingus/world.hpp"
-#include "pingus/screens/result_screen.hpp"
-#include "pingus/savegame_manager.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/debug.hpp"
GameSession::GameSession (const PingusLevel& arg_plf, bool
arg_show_result_screen) :
plf(arg_plf),
Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,11 +17,12 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_GAME_SESSION_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_GAME_SESSION_HPP
+#include <memory>
#include <string>
-#include <memory>
+
#include "engine/screen/gui_screen.hpp"
+#include "pingus/pingu_enums.hpp"
#include "pingus/pingus_level.hpp"
-#include "pingus/pingu_enums.hpp"
namespace Input {
struct ScrollEvent;
Modified: trunk/pingus/src/pingus/screens/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,25 +16,25 @@
#include "pingus/screens/level_menu.hpp"
+#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/gui/rect_component.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/sound/sound.hpp"
+#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
+#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
+#include "pingus/screens/game_session.hpp"
#include "pingus/screens/option_menu.hpp"
+#include "pingus/screens/start_screen.hpp"
#include "util/system.hpp"
-#include "engine/display/display.hpp"
-#include "engine/gui/rect_component.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "pingus/screens/start_screen.hpp"
-#include "pingus/globals.hpp"
-#include "engine/gui/surface_button.hpp"
-#include "engine/sound/sound.hpp"
class LevelMenuAbortButton : public GUI::SurfaceButton
{
Modified: trunk/pingus/src/pingus/screens/level_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/level_menu.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_LEVEL_MENU_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_LEVEL_MENU_HPP
-#include "pingus/levelset.hpp"
#include "engine/display/sprite.hpp"
#include "engine/screen/gui_screen.hpp"
+#include "pingus/levelset.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/screens/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,25 +16,25 @@
#include "pingus/screens/option_menu.hpp"
+#include <boost/bind.hpp>
+#include <iostream>
#include <set>
-#include <boost/bind.hpp>
#include <sstream>
-#include <iostream>
-#include "pingus/config_manager.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/gettext.h"
-#include "pingus/resource.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "pingus/fonts.hpp"
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/sound/sound.hpp"
+#include "pingus/components/check_box.hpp"
+#include "pingus/components/choice_box.hpp"
#include "pingus/components/label.hpp"
-#include "pingus/components/check_box.hpp"
#include "pingus/components/slider_box.hpp"
-#include "pingus/components/choice_box.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "engine/sound/sound.hpp"
+#include "pingus/config_manager.hpp"
+#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
+#include "pingus/globals.hpp"
+#include "pingus/resource.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "tinygettext/language.hpp"
Modified: trunk/pingus/src/pingus/screens/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/option_menu.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,14 +17,15 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+#include <boost/signals.hpp>
+#include <map>
#include <vector>
-#include <map>
-#include <boost/signals.hpp>
+
#include "engine/display/sprite.hpp"
+#include "engine/gui/rect_component.hpp"
+#include "engine/gui/surface_button.hpp"
#include "engine/screen/gui_screen.hpp"
#include "pingus/components/label.hpp"
-#include "engine/gui/rect_component.hpp"
-#include "engine/gui/surface_button.hpp"
#include "tinygettext/language.hpp"
class CheckBox;
Modified: trunk/pingus/src/pingus/screens/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,26 +18,26 @@
#include <config.h>
-#include "pingus/gettext.h"
+#include "editor/editor_screen.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/components/menu_button.hpp"
-#include "pingus/resource.hpp"
#include "pingus/debug.hpp"
+#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "engine/sound/sound.hpp"
+#include "pingus/layer_manager.hpp"
+#include "pingus/path_manager.hpp"
+#include "pingus/plf_res_mgr.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/screens/credits.hpp"
#include "pingus/screens/level_menu.hpp"
-#include "pingus/stat_manager.hpp"
#include "pingus/screens/start_screen.hpp"
#include "pingus/screens/story_screen.hpp"
+#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "pingus/plf_res_mgr.hpp"
-#include "pingus/path_manager.hpp"
#include "util/pathname.hpp"
-#include "editor/editor_screen.hpp"
-#include "pingus/screens/credits.hpp"
-#include "pingus/layer_manager.hpp"
PingusMenu::PingusMenu() :
is_init(),
Modified: trunk/pingus/src/pingus/screens/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/pingus_menu.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,12 +17,12 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_PINGUS_MENU_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_PINGUS_MENU_HPP
+#include <memory>
#include <vector>
-#include <memory>
-#include "pingus/fonts.hpp"
#include "engine/display/sprite.hpp"
#include "engine/screen/gui_screen.hpp"
+#include "pingus/fonts.hpp"
namespace GUI {
class GUIManager;
Modified: trunk/pingus/src/pingus/screens/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/result_screen.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_RESULT_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_RESULT_SCREEN_HPP
+#include "engine/screen/gui_screen.hpp"
#include "pingus/result.hpp"
-#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/screens/start_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/start_screen.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_START_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_START_SCREEN_HPP
+#include "engine/screen/gui_screen.hpp"
#include "pingus/pingus_level.hpp"
-#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,10 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_SCREENS_STORY_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_SCREENS_STORY_SCREEN_HPP
+#include <memory>
#include <string>
-#include <memory>
+
+#include "engine/screen/gui_screen.hpp"
#include "pingus/res_descriptor.hpp"
-#include "engine/screen/gui_screen.hpp"
#include "pingus/worldmap/worldmap_story.hpp"
class StoryScreenComponent;
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,16 +16,16 @@
#include "pingus/server.hpp"
+#include <fstream>
+#include <iostream>
#include <time.h>
-#include <iostream>
-#include <fstream>
-#include "util/system.hpp"
+#include "pingus/game_time.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/goal_manager.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/game_time.hpp"
#include "pingus/world.hpp"
-#include "pingus/goal_manager.hpp"
+#include "util/system.hpp"
using Actions::action_from_string;
Modified: trunk/pingus/src/pingus/server.hpp
===================================================================
--- trunk/pingus/src/pingus/server.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/server.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_SERVER_HPP
#define HEADER_PINGUS_PINGUS_SERVER_HPP
-#include "pingus/server_event.hpp"
#include "pingus/action_holder.hpp"
#include "pingus/pingus_level.hpp"
+#include "pingus/server_event.hpp"
#include <memory>
class Pingu;
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,14 +17,14 @@
#include "pingus/server_event.hpp"
#include <assert.h>
+#include <boost/format.hpp>
#include <iostream>
-#include <boost/format.hpp>
#include "math/math.hpp"
+#include "pingus/pingu.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "pingus/pingu_holder.hpp"
-#include "pingus/pingu.hpp"
#include "util/string_util.hpp"
ServerEvent::ServerEvent() :
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/server_event.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,9 +18,10 @@
#define HEADER_PINGUS_PINGUS_SERVER_EVENT_HPP
#include <iosfwd>
+
+#include "math/vector3f.hpp"
+#include "pingus/pingu_enums.hpp"
#include "util/file_reader.hpp"
-#include "pingus/pingu_enums.hpp"
-#include "math/vector3f.hpp"
class Server;
Modified: trunk/pingus/src/pingus/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,10 @@
#include "pingus/smallmap_image.hpp"
#include <iostream>
-#include "pingus/world.hpp"
+
#include "pingus/collision_map.hpp"
#include "pingus/server.hpp"
+#include "pingus/world.hpp"
SmallMapImage::SmallMapImage(Server* s, int width, int height)
: server(s),
Modified: trunk/pingus/src/pingus/state_sprite.hpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/state_sprite.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_STATE_SPRITE_HPP
#include <map>
+
#include "engine/display/sprite.hpp"
/** Simple Wrapper class around Sprite that allows to have multiple
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -20,21 +20,22 @@
#include <assert.h>
#include <iostream>
#include <typeinfo>
-#include "pingus/pingu_holder.hpp"
-#include "pingus/worldobjs/entrance.hpp"
+
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
+#include "pingus/collision_map.hpp"
+#include "pingus/debug.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/particles/pingu_particle_holder.hpp"
#include "pingus/particles/rain_particle_holder.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/particles/snow_particle_holder.hpp"
-#include "engine/display/display.hpp"
#include "pingus/pingu.hpp"
-#include "engine/display/scene_context.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/pingus_level.hpp"
#include "pingus/worldobj_factory.hpp"
-#include "pingus/collision_map.hpp"
-#include "pingus/debug.hpp"
+#include "pingus/worldobjs/entrance.hpp"
using Actions::BOMBER;
Modified: trunk/pingus/src/pingus/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,9 @@
#include "pingus/worldmap/dot.hpp"
+#include <assert.h>
#include <iostream>
-#include <assert.h>
+
#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
#include <string>
+
#include "math/vector3f.hpp"
#include "pingus/worldmap/drawable.hpp"
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,9 +20,10 @@
#include <iostream>
#include "engine/display/drawing_context.hpp"
+#include "engine/display/font.hpp"
#include "engine/input/control.hpp"
#include "engine/input/controller.hpp"
-#include "engine/display/font.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
@@ -31,7 +32,6 @@
#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/start_screen.hpp"
-#include "engine/screen/screen_manager.hpp"
#include "util/file_reader.hpp"
#include "util/system.hpp"
Modified: trunk/pingus/src/pingus/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,9 +16,9 @@
#include "pingus/worldmap/path.hpp"
-#include <iostream>
#include <algorithm>
#include <assert.h>
+#include <iostream>
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldmap/path.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,6 +19,7 @@
#include <algorithm>
#include <vector>
+
#include "math/vector3f.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#include "pingus/worldmap/path_drawable.hpp"
#include <iostream>
+
+#include "engine/display/drawing_context.hpp"
#include "math/color.hpp"
-#include "engine/display/drawing_context.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,13 +20,13 @@
#include <stdexcept>
#include "math/math.hpp"
-#include "util/file_reader.hpp"
+#include "pingus/globals.hpp"
#include "pingus/worldmap/dot.hpp"
#include "pingus/worldmap/dot_factory.hpp"
+#include "pingus/worldmap/path_drawable.hpp"
+#include "pingus/worldmap/pathfinder.hpp"
#include "pingus/worldmap/worldmap.hpp"
-#include "pingus/worldmap/pathfinder.hpp"
-#include "pingus/worldmap/path_drawable.hpp"
-#include "pingus/globals.hpp"
+#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/path_graph.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "util/file_reader.hpp"
#include "math/vector3f.hpp"
+#include "pingus/worldmap/graph.hpp"
#include "pingus/worldmap/path.hpp"
#include "pingus/worldmap/pathfinder.hpp"
-#include "pingus/worldmap/graph.hpp"
+#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pathfinder.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/pathfinder.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDMAP_PATHFINDER_HPP
#include <queue>
+
#include "pingus/worldmap/graph.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -18,12 +18,12 @@
#include <iostream>
+#include "engine/display/drawing_context.hpp"
#include "math/math.hpp"
#include "math/vector3f.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "pingus/worldmap/dot.hpp"
#include "pingus/direction.hpp"
#include "pingus/resource.hpp"
+#include "pingus/worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -16,11 +16,11 @@
#include "pingus/worldmap/pingus_worldmap.hpp"
+#include <stdexcept>
#include <string>
-#include <stdexcept>
+#include "pingus/worldmap/drawable_factory.hpp"
#include "util/file_reader.hpp"
-#include "pingus/worldmap/drawable_factory.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,8 +19,8 @@
#include <boost/smart_ptr.hpp>
+#include "pingus/worldmap/path_graph.hpp"
#include "pingus/worldmap/worldmap_story.hpp"
-#include "pingus/worldmap/path_graph.hpp"
#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,11 +18,11 @@
#include <iostream>
+#include "engine/display/drawing_context.hpp"
#include "pingus/resource.hpp"
-#include "engine/display/drawing_context.hpp"
+#include "pingus/worldmap/pingus.hpp"
+#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/worldmap.hpp"
-#include "pingus/worldmap/pingus.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,34 +18,35 @@
#include <assert.h>
#include <iostream>
+
#include "engine/display/display.hpp"
+#include "engine/sound/sound.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "math/math.hpp"
+#include "pingus/debug.hpp"
#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
+#include "pingus/globals.hpp"
+#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/savegame_manager.hpp"
#include "pingus/stat_manager.hpp"
-#include "pingus/savegame_manager.hpp"
-#include "util/system.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/globals.hpp"
-#include "engine/sound/sound.hpp"
-#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
-#include "util/sexpr_file_reader.hpp"
-#include "pingus/debug.hpp"
-#include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
-#include "pingus/worldmap/worldmap_story.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/pingus.hpp"
+#include "pingus/stat_manager.hpp"
+#include "pingus/worldmap/dot.hpp"
+#include "pingus/worldmap/drawable.hpp"
#include "pingus/worldmap/drawable_factory.hpp"
-#include "pingus/worldmap/drawable.hpp"
-#include "pingus/worldmap/dot.hpp"
#include "pingus/worldmap/level_dot.hpp"
#include "pingus/worldmap/path_graph.hpp"
-#include "math/math.hpp"
-#include "pingus/stat_manager.hpp"
+#include "pingus/worldmap/pingus.hpp"
+#include "pingus/worldmap/worldmap_screen.hpp"
+#include "pingus/worldmap/worldmap_story.hpp"
+#include "util/sexpr_file_reader.hpp"
+#include "util/system.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/screens/story_screen.hpp"
-#include "engine/screen/screen_manager.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,8 +18,8 @@
#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
+#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/worldmap.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
+#include <memory>
#include <string>
-#include <memory>
+
#include "engine/gui/gui_manager.hpp"
class SceneContext;
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -22,16 +22,16 @@
#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
#include "engine/gui/surface_button.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/path_manager.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource.hpp"
+#include "pingus/screens/story_screen.hpp"
#include "pingus/stat_manager.hpp"
-#include "pingus/screens/story_screen.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "engine/sound/sound.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_component.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
+#include <memory>
#include <string>
-#include <memory>
+
#include "engine/display/sprite.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#include "pingus/worldmap/worldmap_story.hpp"
#include <algorithm>
+#include <stdexcept>
#include <vector>
-#include <stdexcept>
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
+#include <string>
#include <vector>
-#include <string>
+
#include "pingus/res_descriptor.hpp"
class FileReader;
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,8 +16,9 @@
#include "pingus/worldobj.hpp"
+#include <iostream>
#include <typeinfo>
-#include <iostream>
+
#include "engine/display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "pingus/worldobjs/conveyor_belt.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,13 +17,14 @@
#include "pingus/worldobjs/entrance.hpp"
#include <iostream>
+
#include "engine/display/scene_context.hpp"
-#include "pingus/world.hpp"
-#include "pingus/pingu_holder.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
+#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
-#include "pingus/components/smallmap.hpp"
+#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,14 +17,15 @@
#include "pingus/worldobjs/exit.hpp"
#include <iostream>
+
#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "pingus/world.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/globals.hpp"
+#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/pingu.hpp"
-#include "pingus/components/smallmap.hpp"
#include "pingus/resource.hpp"
+#include "pingus/world.hpp"
#include "util/string_util.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,11 +17,11 @@
#include "pingus/worldobjs/fake_exit.hpp"
#include "engine/display/scene_context.hpp"
+#include "pingus/components/smallmap.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/components/smallmap.hpp"
-#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
class Pingu;
Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,10 +17,11 @@
#include "pingus/worldobjs/groundpiece.hpp"
#include <iostream>
-#include "pingus/world.hpp"
+
+#include "pingus/collision_map.hpp"
#include "pingus/ground_map.hpp"
-#include "pingus/collision_map.hpp"
#include "pingus/resource.hpp"
+#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_GROUNDPIECE_HPP
+#include "math/vector3f.hpp"
+#include "pingus/groundtype.hpp"
#include "pingus/res_descriptor.hpp"
-#include "pingus/groundtype.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -19,8 +19,8 @@
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_GUILLOTINE_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_GUILLOTINE_HPP
+#include "math/vector3f.hpp"
#include "pingus/direction.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class GuillotineData;
Modified: trunk/pingus/src/pingus/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,11 +17,11 @@
#include "pingus/worldobjs/hammer.hpp"
#include "engine/display/scene_context.hpp"
+#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/hammer.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/hammer.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_HAMMER_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_HAMMER_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class HammerData;
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#include "pingus/worldobjs/hotspot.hpp"
#include <iostream>
+
+#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_HOTSPOT_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_HOTSPOT_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class HotspotData;
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,11 +16,11 @@
#include "pingus/worldobjs/ice_block.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
+#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/ground_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class IceBlockData;
Modified: trunk/pingus/src/pingus/worldobjs/laser_exit.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/laser_exit.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/laser_exit.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_LASER_EXIT_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_LASER_EXIT_HPP
-#include "pingus/worldobj.hpp"
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
+#include "pingus/worldobj.hpp"
namespace WorldObjsData {
class LaserExitData;
Modified: trunk/pingus/src/pingus/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,9 @@
#include "pingus/worldobjs/liquid.hpp"
#include <iostream>
+
+#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/liquid.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/liquid.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_LIQUID_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_LIQUID_HPP
+#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class LiquidData;
Modified: trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/rain_generator.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/rain_generator.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,10 +17,11 @@
#include "pingus/worldobjs/rain_generator.hpp"
#include <iostream>
+
+#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/particles/rain_particle_holder.hpp"
-#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
-#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -18,14 +18,14 @@
#include <iostream>
+#include "engine/display/scene_context.hpp"
+#include "engine/sound/sound.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
-#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/smasher.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/smasher.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SMASHER_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SMASHER_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class SmasherData;
Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -19,9 +19,9 @@
#include <iostream>
#include "math/math.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/particles/snow_particle_holder.hpp"
#include "pingus/world.hpp"
-#include "pingus/particles/snow_particle_holder.hpp"
-#include "pingus/globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -19,8 +19,8 @@
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/pingus/worldobjs/spike.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SPIKE_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SPIKE_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class SpikeData;
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,6 +17,7 @@
#include "pingus/worldobjs/starfield_background.hpp"
#include <iostream>
+
#include "pingus/worldobjs/starfield_background_stars.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
#include <vector>
+
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#include "pingus/worldobjs/starfield_background_stars.hpp"
#include "engine/display/scene_context.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_STARS_HPP
+#include "engine/display/sprite.hpp"
#include "pingus/worldobj.hpp"
-#include "engine/display/sprite.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,13 +17,14 @@
#include "pingus/worldobjs/surface_background.hpp"
#include <iostream>
+
+#include "engine/display/blitter.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-#include "engine/display/scene_context.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/globals.hpp"
-#include "engine/display/blitter.hpp"
-#include "engine/display/display.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
+#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class SurfaceBackgroundData;
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,12 +16,12 @@
#include "pingus/worldobjs/switch_door.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class SwitchDoorData;
Modified: trunk/pingus/src/pingus/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,11 +17,12 @@
#include "pingus/worldobjs/teleporter.hpp"
#include <iostream>
+
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
#include "pingus/worldobjs/teleporter_target.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/teleporter.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,11 +17,12 @@
#include "pingus/worldobjs/teleporter_target.hpp"
#include <iostream>
+
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
+#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp 2009-11-06
19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.hpp 2009-11-06
19:58:03 UTC (rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -16,8 +16,8 @@
#include "pingus/worldobjs/thunderstorm_background.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
-#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.hpp
2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
#define HEADER_PINGUS_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
+#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-#include "math/vector3f.hpp"
namespace WorldObjsData {
class ThunderstormBackgroundData;
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -16,8 +16,8 @@
#include "pingus/worldobjs/woodthing.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/math.hpp"
-#include "engine/display/scene_context.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/util/command_line_generic.hpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.hpp 2009-11-06 19:48:03 UTC
(rev 4062)
+++ trunk/pingus/src/util/command_line_generic.hpp 2009-11-06 19:58:03 UTC
(rev 4063)
@@ -36,6 +36,7 @@
#include <string>
#include <vector>
+
#include "util/command_line.hpp"
class CommandLine_Generic
Modified: trunk/pingus/src/util/file_reader.cpp
===================================================================
--- trunk/pingus/src/util/file_reader.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/file_reader.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -16,11 +16,11 @@
#include "util/file_reader.hpp"
-#include "util/sexpr_file_reader.hpp"
+#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
+#include "util/file_reader_impl.hpp"
#include "util/pathname.hpp"
-#include "util/file_reader_impl.hpp"
+#include "util/sexpr_file_reader.hpp"
FileReader::FileReader(boost::shared_ptr<FileReaderImpl> impl_) :
impl(impl_)
Modified: trunk/pingus/src/util/file_reader.hpp
===================================================================
--- trunk/pingus/src/util/file_reader.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/file_reader.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_UTIL_FILE_READER_HPP
#define HEADER_PINGUS_UTIL_FILE_READER_HPP
+#include <boost/shared_ptr.hpp>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
class Size;
class Color;
Modified: trunk/pingus/src/util/file_reader_impl.hpp
===================================================================
--- trunk/pingus/src/util/file_reader_impl.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/file_reader_impl.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_UTIL_FILE_READER_IMPL_HPP
#define HEADER_PINGUS_UTIL_FILE_READER_IMPL_HPP
+#include <string>
#include <vector>
-#include <string>
class Size;
class Color;
Modified: trunk/pingus/src/util/pathname.cpp
===================================================================
--- trunk/pingus/src/util/pathname.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/util/pathname.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -18,8 +18,9 @@
#include <assert.h>
#include <iostream>
+
+#include "pingus/path_manager.hpp"
#include "util/system.hpp"
-#include "pingus/path_manager.hpp"
Pathname Pathname::tmpfile(const std::string& prefix)
{
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/util/pathname.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_UTIL_PATHNAME_HPP
#define HEADER_PINGUS_UTIL_PATHNAME_HPP
+#include <SDL.h>
#include <iosfwd>
#include <string>
-#include <SDL.h>
/** Simple class to allow a distinction of paths that refer to the
* filesystem and paths that refer to the datadir, it also hides
Modified: trunk/pingus/src/util/sexpr_file_reader.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_UTIL_SEXPR_FILE_READER_HPP
#define HEADER_PINGUS_UTIL_SEXPR_FILE_READER_HPP
+#include "lisp/lisp.hpp"
#include "util/file_reader.hpp"
-#include "lisp/lisp.hpp"
/** */
class SExprFileReader : public FileReader
Modified: trunk/pingus/src/util/sexpr_file_writer.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -17,8 +17,8 @@
#include "util/sexpr_file_writer.hpp"
#include <iostream>
+#include <map>
#include <string>
-#include <map>
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-06 19:48:03 UTC (rev
4062)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-06 19:58:03 UTC (rev
4063)
@@ -20,10 +20,10 @@
#include <iosfwd>
#include <ostream>
-#include "util/file_writer.hpp"
#include "math/color.hpp"
+#include "math/size.hpp"
#include "math/vector3f.hpp"
-#include "math/size.hpp"
+#include "util/file_writer.hpp"
/** */
class SExprFileWriter : public FileWriter
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/util/system.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -44,10 +44,10 @@
#define F_OK 0
#endif
+#include "pingus/gettext.h"
+#include "pingus/globals.hpp"
#include "util/pathname.hpp"
-#include "pingus/globals.hpp"
#include "util/string_util.hpp"
-#include "pingus/gettext.h"
std::string System::userdir;
std::string System::default_email;
Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/util/system.hpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_UTIL_SYSTEM_HPP
#define HEADER_PINGUS_UTIL_SYSTEM_HPP
+#include <map>
+#include <stdint.h>
#include <string>
#include <vector>
-#include <map>
-#include <stdint.h>
class Pathname;
Modified: trunk/pingus/src/util/utf8.cpp
===================================================================
--- trunk/pingus/src/util/utf8.cpp 2009-11-06 19:48:03 UTC (rev 4062)
+++ trunk/pingus/src/util/utf8.cpp 2009-11-06 19:58:03 UTC (rev 4063)
@@ -19,6 +19,7 @@
#include <iostream>
#include <stdexcept>
+
#include "utf8.hpp"
/** Replacement character for invalid UTF-8 sequences */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4063 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/usbmouse engine/input/wiimote engine/input/xinput engine/input_old engine/input_old/axes engine/input_old/buttons engine/input_old/pointers engine/input_old/scrollers engine/screen engine/sound lisp math pingus pingus/actions pingus/colliders pingus/components pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util,
grumbel at BerliOS <=