[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4036 - in trunk/pingus/src: display editor gui input math
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4036 - in trunk/pingus/src: display editor gui input math movers particles pingus screen sound util worldmap worldobjs |
|
Date: |
Thu, 5 Nov 2009 20:01:40 +0100 |
Author: grumbel
Date: 2009-11-05 20:01:27 +0100 (Thu, 05 Nov 2009)
New Revision: 4036
Modified:
trunk/pingus/src/display/delta_framebuffer.cpp
trunk/pingus/src/display/display.cpp
trunk/pingus/src/display/drawing_context.cpp
trunk/pingus/src/display/framebuffer_surface.cpp
trunk/pingus/src/display/null_framebuffer.cpp
trunk/pingus/src/display/rect_merger.cpp
trunk/pingus/src/display/scene_context.cpp
trunk/pingus/src/display/sdl_framebuffer.cpp
trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/editor/action_properties.cpp
trunk/pingus/src/editor/button.cpp
trunk/pingus/src/editor/checkbox.cpp
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/editor_level.cpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/file_dialog.cpp
trunk/pingus/src/editor/file_list.cpp
trunk/pingus/src/editor/gui_style.cpp
trunk/pingus/src/editor/inputbox.cpp
trunk/pingus/src/editor/label.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/object_properties.cpp
trunk/pingus/src/editor/object_properties.hpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/object_selector_list.hpp
trunk/pingus/src/editor/object_selector_set.cpp
trunk/pingus/src/editor/panel.cpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/gui/component.cpp
trunk/pingus/src/gui/group_component.cpp
trunk/pingus/src/gui/gui_manager.cpp
trunk/pingus/src/gui/surface_button.cpp
trunk/pingus/src/input/controller.cpp
trunk/pingus/src/input/controller_description.cpp
trunk/pingus/src/input/core_driver.cpp
trunk/pingus/src/input/manager.cpp
trunk/pingus/src/input/sdl_driver.cpp
trunk/pingus/src/math/math.cpp
trunk/pingus/src/math/rect.cpp
trunk/pingus/src/math/size.cpp
trunk/pingus/src/math/vector2f.cpp
trunk/pingus/src/math/vector2i.cpp
trunk/pingus/src/math/vector3f.cpp
trunk/pingus/src/movers/linear_mover.cpp
trunk/pingus/src/particles/explosive_particle.cpp
trunk/pingus/src/particles/pingu_particle_holder.cpp
trunk/pingus/src/particles/rain_particle_holder.cpp
trunk/pingus/src/particles/smoke_particle_holder.cpp
trunk/pingus/src/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/action_holder.cpp
trunk/pingus/src/pingus/addon_menu.cpp
trunk/pingus/src/pingus/blitter.cpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/collider.cpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/collision_mask.cpp
trunk/pingus/src/pingus/config_manager.cpp
trunk/pingus/src/pingus/credits.cpp
trunk/pingus/src/pingus/debug.cpp
trunk/pingus/src/pingus/demo_session.cpp
trunk/pingus/src/pingus/demo_session.hpp
trunk/pingus/src/pingus/direction.cpp
trunk/pingus/src/pingus/font.cpp
trunk/pingus/src/pingus/font_description.cpp
trunk/pingus/src/pingus/font_description.hpp
trunk/pingus/src/pingus/font_test_screen.cpp
trunk/pingus/src/pingus/font_test_screen.hpp
trunk/pingus/src/pingus/fonts.cpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/game_session.cpp
trunk/pingus/src/pingus/game_time.cpp
trunk/pingus/src/pingus/game_time.hpp
trunk/pingus/src/pingus/gettext.cpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/globals.cpp
trunk/pingus/src/pingus/goal_manager.cpp
trunk/pingus/src/pingus/graphic_context_state.cpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/groundtype.cpp
trunk/pingus/src/pingus/layer_manager.cpp
trunk/pingus/src/pingus/level_menu.cpp
trunk/pingus/src/pingus/levelset.cpp
trunk/pingus/src/pingus/line_iterator.cpp
trunk/pingus/src/pingus/mover.cpp
trunk/pingus/src/pingus/option_menu.cpp
trunk/pingus/src/pingus/path_manager.cpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_enums.cpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_error.cpp
trunk/pingus/src/pingus/pingus_level.cpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_menu.cpp
trunk/pingus/src/pingus/pingus_menu.hpp
trunk/pingus/src/pingus/plf_res_mgr.cpp
trunk/pingus/src/pingus/res_descriptor.cpp
trunk/pingus/src/pingus/resource.cpp
trunk/pingus/src/pingus/resource_manager.cpp
trunk/pingus/src/pingus/resource_manager.hpp
trunk/pingus/src/pingus/resource_modifier.cpp
trunk/pingus/src/pingus/result_screen.cpp
trunk/pingus/src/pingus/savegame.cpp
trunk/pingus/src/pingus/savegame_manager.cpp
trunk/pingus/src/pingus/screenshot.cpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/smallmap_image.cpp
trunk/pingus/src/pingus/smallmap_image.hpp
trunk/pingus/src/pingus/sprite.cpp
trunk/pingus/src/pingus/sprite_impl.cpp
trunk/pingus/src/pingus/sprite_impl.hpp
trunk/pingus/src/pingus/start_screen.cpp
trunk/pingus/src/pingus/stat_manager.cpp
trunk/pingus/src/pingus/state_sprite.cpp
trunk/pingus/src/pingus/story_screen.cpp
trunk/pingus/src/pingus/string_format.cpp
trunk/pingus/src/pingus/surface.cpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobj_factory.cpp
trunk/pingus/src/screen/gui_screen.cpp
trunk/pingus/src/screen/screen.cpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/sound/sound.cpp
trunk/pingus/src/sound/sound_dummy.cpp
trunk/pingus/src/sound/sound_impl.hpp
trunk/pingus/src/sound/sound_real.cpp
trunk/pingus/src/sound/sound_res_mgr.cpp
trunk/pingus/src/sound/sound_res_mgr.hpp
trunk/pingus/src/util/command_line.cpp
trunk/pingus/src/util/command_line_generic.cpp
trunk/pingus/src/util/debug_stream.cpp
trunk/pingus/src/util/file_reader.cpp
trunk/pingus/src/util/pathname.cpp
trunk/pingus/src/util/sexpr_file_reader.cpp
trunk/pingus/src/util/sexpr_file_writer.cpp
trunk/pingus/src/util/sexpr_file_writer.hpp
trunk/pingus/src/util/string_util.cpp
trunk/pingus/src/util/system.cpp
trunk/pingus/src/util/utf8.cpp
trunk/pingus/src/worldmap/dot.cpp
trunk/pingus/src/worldmap/dot_factory.cpp
trunk/pingus/src/worldmap/dot_factory.hpp
trunk/pingus/src/worldmap/drawable.cpp
trunk/pingus/src/worldmap/drawable_factory.cpp
trunk/pingus/src/worldmap/graph.cpp
trunk/pingus/src/worldmap/level_dot.cpp
trunk/pingus/src/worldmap/path.cpp
trunk/pingus/src/worldmap/path_drawable.cpp
trunk/pingus/src/worldmap/path_graph.cpp
trunk/pingus/src/worldmap/path_graph.hpp
trunk/pingus/src/worldmap/pingus.cpp
trunk/pingus/src/worldmap/pingus_worldmap.cpp
trunk/pingus/src/worldmap/sprite_drawable.cpp
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap_component.cpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
trunk/pingus/src/worldmap/worldmap_story.cpp
trunk/pingus/src/worldobjs/conveyor_belt.cpp
trunk/pingus/src/worldobjs/entrance.cpp
trunk/pingus/src/worldobjs/exit.cpp
trunk/pingus/src/worldobjs/exit.hpp
trunk/pingus/src/worldobjs/fake_exit.cpp
trunk/pingus/src/worldobjs/fake_exit.hpp
trunk/pingus/src/worldobjs/groundpiece.cpp
trunk/pingus/src/worldobjs/guillotine.cpp
trunk/pingus/src/worldobjs/guillotine.hpp
trunk/pingus/src/worldobjs/hammer.cpp
trunk/pingus/src/worldobjs/hammer.hpp
trunk/pingus/src/worldobjs/hotspot.cpp
trunk/pingus/src/worldobjs/hotspot.hpp
trunk/pingus/src/worldobjs/ice_block.cpp
trunk/pingus/src/worldobjs/ice_block.hpp
trunk/pingus/src/worldobjs/laser_exit.cpp
trunk/pingus/src/worldobjs/laser_exit.hpp
trunk/pingus/src/worldobjs/liquid.cpp
trunk/pingus/src/worldobjs/liquid.hpp
trunk/pingus/src/worldobjs/rain_generator.cpp
trunk/pingus/src/worldobjs/smasher.cpp
trunk/pingus/src/worldobjs/smasher.hpp
trunk/pingus/src/worldobjs/snow_generator.cpp
trunk/pingus/src/worldobjs/solid_color_background.cpp
trunk/pingus/src/worldobjs/spike.cpp
trunk/pingus/src/worldobjs/spike.hpp
trunk/pingus/src/worldobjs/starfield_background.cpp
trunk/pingus/src/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/worldobjs/surface_background.cpp
trunk/pingus/src/worldobjs/surface_background.hpp
trunk/pingus/src/worldobjs/switch_door.cpp
trunk/pingus/src/worldobjs/switch_door.hpp
trunk/pingus/src/worldobjs/teleporter.cpp
trunk/pingus/src/worldobjs/teleporter.hpp
trunk/pingus/src/worldobjs/teleporter_target.cpp
trunk/pingus/src/worldobjs/teleporter_target.hpp
trunk/pingus/src/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/worldobjs/thunderstorm_background.hpp
trunk/pingus/src/worldobjs/woodthing.cpp
Log:
Big #include cleanup
Modified: trunk/pingus/src/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/delta_framebuffer.hpp"
+
#include <assert.h>
#include <iostream>
#include "math/math.hpp"
#include "util/memory_pool.hpp"
#include "display/rect_merger.hpp"
#include "display/sdl_framebuffer.hpp"
-#include "display/delta_framebuffer.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
Modified: trunk/pingus/src/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/display/display.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/display.hpp"
+
#include <stdexcept>
#include <algorithm>
#include <stdio.h>
@@ -32,7 +34,6 @@
#endif
#include "display/null_framebuffer.hpp"
#include "display/delta_framebuffer.hpp"
-#include "display/display.hpp"
std::auto_ptr<Framebuffer> Display::framebuffer;
Modified: trunk/pingus/src/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/display/drawing_context.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/drawing_context.hpp"
+
#include <assert.h>
#include <iostream>
#include <algorithm>
-#include "display/drawing_context.hpp"
#include "math/math.hpp"
#include "display/framebuffer.hpp"
#include "display/display.hpp"
Modified: trunk/pingus/src/display/framebuffer_surface.cpp
===================================================================
--- trunk/pingus/src/display/framebuffer_surface.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/display/framebuffer_surface.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "display/framebuffer_surface.hpp"
+
FramebufferSurface::FramebufferSurface() :
impl()
Modified: trunk/pingus/src/display/null_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/display/null_framebuffer.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,8 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/null_framebuffer.hpp"
+
#include <iostream>
-#include "display/null_framebuffer.hpp"
class NullFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/display/rect_merger.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/display/rect_merger.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/rect_merger.hpp"
+
//#include <ext/algorithm>
#include <algorithm>
#include <assert.h>
#include <iostream>
#include "math/vector2i.hpp"
#include "math/size.hpp"
-#include "display/rect_merger.hpp"
struct Mark {
enum Type { START_MARK = 0, END_MARK = 1 } type;
Modified: trunk/pingus/src/display/scene_context.cpp
===================================================================
--- trunk/pingus/src/display/scene_context.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/display/scene_context.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/framebuffer.hpp"
#include "display/scene_context.hpp"
+#include "display/framebuffer.hpp"
+
#define SCALE_FACTOR 8.0f
class SceneContextImpl
Modified: trunk/pingus/src/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/sdl_framebuffer.hpp"
+
#include <iostream>
#include "math/math.hpp"
#include "pingus/surface.hpp"
#include "display/display.hpp"
-#include "display/sdl_framebuffer.hpp"
#include "display/sdl_framebuffer_surface_impl.hpp"
namespace {
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,8 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "display/sdl_framebuffer_surface_impl.hpp"
+
#include <stdexcept>
-#include "display/sdl_framebuffer_surface_impl.hpp"
SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src) :
surface()
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/action_properties.hpp"
+
#include <iostream>
#include <boost/bind.hpp>
-#include "editor/action_properties.hpp"
#include "editor/checkbox.hpp"
#include "editor/editor_level.hpp"
#include "editor/gui_style.hpp"
Modified: trunk/pingus/src/editor/button.cpp
===================================================================
--- trunk/pingus/src/editor/button.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/editor/button.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/button.hpp"
+
#include "pingus/fonts.hpp"
#include "editor/gui_style.hpp"
-#include "editor/button.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/checkbox.cpp
===================================================================
--- trunk/pingus/src/editor/checkbox.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/checkbox.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/checkbox.hpp"
+
#include "pingus/fonts.hpp"
#include "editor/gui_style.hpp"
-#include "editor/checkbox.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/combobox.hpp"
+
#include <iostream>
#include <vector>
#include <string>
#include "pingus/resource.hpp"
-#include "editor/combobox.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "math/vector2i.hpp"
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,13 +15,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/editor_level.hpp"
+
#include "config.h"
#include <iostream>
#include <string>
#include <fstream>
#include "pingus/pingus_level.hpp"
-#include "editor/editor_level.hpp"
#include "editor/level_impl.hpp"
#include "editor/level_objs.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/editor_screen.hpp"
+
#include <iostream>
#include <boost/bind.hpp>
@@ -36,7 +38,6 @@
#include "editor/panel.hpp"
#include "editor/panel.hpp"
#include "editor/minimap.hpp"
-#include "editor/editor_screen.hpp"
#include "editor/viewport.hpp"
#include "editor/level_objs.hpp"
#include "editor/object_selector.hpp"
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/file_dialog.hpp"
+
#include <iostream>
#include <boost/bind.hpp>
@@ -28,7 +30,6 @@
#include "editor/inputbox.hpp"
#include "util/pathname.hpp"
#include "editor/button.hpp"
-#include "editor/file_dialog.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/file_list.hpp"
+
#include <iostream>
-#include "editor/file_list.hpp"
#include "editor/gui_style.hpp"
#include "pingus/fonts.hpp"
#include "math/math.hpp"
Modified: trunk/pingus/src/editor/gui_style.cpp
===================================================================
--- trunk/pingus/src/editor/gui_style.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/gui_style.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -16,6 +16,7 @@
#include "editor/gui_style.hpp"
+
namespace Editor {
void
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/inputbox.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/inputbox.hpp"
+
#include <iostream>
#include "pingus/fonts.hpp"
#include "display/drawing_context.hpp"
-#include "editor/inputbox.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/label.cpp
===================================================================
--- trunk/pingus/src/editor/label.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/editor/label.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/label.hpp"
+
#include "display/drawing_context.hpp"
#include "pingus/fonts.hpp"
-#include "editor/label.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,9 +15,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/level_objs.hpp"
+
#include <string>
#include <iostream>
-#include "editor/level_objs.hpp"
#include "editor/level_impl.hpp"
#include "pingus/blitter.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/level_properties.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/level_properties.hpp"
+
#include <iostream>
#include <boost/bind.hpp>
@@ -23,7 +25,6 @@
#include "editor/gui_style.hpp"
#include "editor/editor_level.hpp"
#include "editor/viewport.hpp"
-#include "editor/level_properties.hpp"
/*
Level Properties:
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/minimap.hpp"
+
#include "editor/editor_level.hpp"
#include "editor/editor_screen.hpp"
#include "editor/viewport.hpp"
#include "editor/level_objs.hpp"
#include "editor/gui_style.hpp"
-#include "editor/minimap.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/object_properties.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/object_properties.hpp"
+
#include <boost/bind.hpp>
#include <iostream>
@@ -29,7 +31,6 @@
#include "editor/combobox.hpp"
#include "editor/inputbox.hpp"
#include "editor/checkbox.hpp"
-#include "editor/object_properties.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_properties.hpp
===================================================================
--- trunk/pingus/src/editor/object_properties.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/object_properties.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -21,14 +21,15 @@
namespace Editor {
-class Label;
+class Button;
+class Checkbox;
+class ComboItem;
+class Combobox;
class EditorScreen;
-class Combobox;
-class ComboItem;
-class Checkbox;
class Inputbox;
+class Label;
+class LevelObj;
-/** */
class ObjectProperties : public GUI::GroupComponent
{
private:
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/object_selector.hpp"
+
#include <boost/bind.hpp>
#include <iostream>
@@ -33,7 +35,6 @@
#include "editor/level_objs.hpp"
#include "display/drawing_context.hpp"
#include "gui/gui_manager.hpp"
-#include "editor/object_selector.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,8 @@
#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
#include "gui/component.hpp"
+#include "gui/group_component.hpp"
+#include "math/vector2i.hpp"
#include "pingus/res_descriptor.hpp"
class DrawingContext;
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/object_selector_list.hpp"
+
#include <iostream>
#include "math/math.hpp"
@@ -25,7 +27,6 @@
#include "pingus/groundtype.hpp"
#include "pingus/resource.hpp"
#include "display/drawing_context.hpp"
-#include "editor/object_selector_list.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector_list.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/object_selector_list.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
+#include <vector>
+
#include "pingus/sprite.hpp"
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/object_selector_set.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/editor/object_selector_set.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -16,6 +16,7 @@
#include "editor/object_selector_set.hpp"
+
namespace Editor {
ObjectSelectorSet::ObjectSelectorSet(ObjectSelectorList* list_, int thumb_w,
int thumb_h) :
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/panel.hpp"
+
#include "display/display.hpp"
#include "display/drawing_context.hpp"
#include "editor/editor_screen.hpp"
-#include "editor/panel.hpp"
#include "gui/gui_manager.hpp"
#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "editor/viewport.hpp"
+
#include <vector>
#include <string>
#include <iostream>
@@ -25,7 +27,6 @@
#include "pingus/graphic_context_state.hpp"
#include "editor/editor_level.hpp"
#include "editor/editor_screen.hpp"
-#include "editor/viewport.hpp"
#include "editor/level_objs.hpp"
namespace Editor {
Modified: trunk/pingus/src/gui/component.cpp
===================================================================
--- trunk/pingus/src/gui/component.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/gui/component.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "gui/component.hpp"
+
#include <assert.h>
#include "gui/group_component.hpp"
-#include "gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/gui/group_component.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/gui/group_component.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "gui/group_component.hpp"
+
#include <assert.h>
#include <iostream>
-#include "gui/group_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/gui/gui_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "gui/gui_manager.hpp"
+
#include <algorithm>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "input/event.hpp"
#include "display/display.hpp"
-#include "gui/gui_manager.hpp"
using namespace Input;
Modified: trunk/pingus/src/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/gui/surface_button.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/gui/surface_button.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "gui/surface_button.hpp"
+
#include "pingus/resource.hpp"
#include "math/vector3f.hpp"
#include "display/drawing_context.hpp"
-#include "gui/surface_button.hpp"
namespace GUI {
Modified: trunk/pingus/src/input/controller.cpp
===================================================================
--- trunk/pingus/src/input/controller.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/input/controller.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "input/controller.hpp"
+
#include "input/controller_description.hpp"
#include "input/control.hpp"
-#include "input/controller.hpp"
namespace Input {
Modified: trunk/pingus/src/input/controller_description.cpp
===================================================================
--- trunk/pingus/src/input/controller_description.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/input/controller_description.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <stdexcept>
#include "input/controller_description.hpp"
+#include <stdexcept>
+
namespace Input {
Modified: trunk/pingus/src/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/input/core_driver.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "input/core_driver.hpp"
+
#include "math/math.hpp"
#include "input/manager.hpp"
-#include "input/core_driver.hpp"
#include "display/display.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/input/manager.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "input/manager.hpp"
+
#include "config.h"
#include "util/string_util.hpp"
@@ -34,7 +36,6 @@
#ifdef HAVE_LINUXEVDEV
# include "evdev/evdev_driver.hpp"
#endif
-#include "input/manager.hpp"
namespace Input {
Modified: trunk/pingus/src/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/input/sdl_driver.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "input/sdl_driver.hpp"
+
#include "pingus/global_event.hpp"
#include "screen/screen_manager.hpp"
#include "math/size.hpp"
#include "util/file_reader.hpp"
#include "display/display.hpp"
-#include "input/sdl_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/math/math.cpp
===================================================================
--- trunk/pingus/src/math/math.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/math.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <math.h>
#include "math/math.hpp"
+#include <math.h>
+
namespace Math {
float abs(float v)
Modified: trunk/pingus/src/math/rect.cpp
===================================================================
--- trunk/pingus/src/math/rect.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/rect.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -27,10 +27,10 @@
** (if your name is missing here, please add it)
*/
+#include "math/rect.hpp"
+
#include <iostream>
-#include "math/rect.hpp"
-
#define cl_min(a,b) ((a < b) ? a : b)
#define cl_max(a,b) ((a > b) ? a : b)
Modified: trunk/pingus/src/math/size.cpp
===================================================================
--- trunk/pingus/src/math/size.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/size.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -22,8 +22,9 @@
** requirements or restrictions.
**/
+#include "math/size.hpp"
+
#include <iostream>
-#include "math/size.hpp"
std::ostream& operator<<(std::ostream& os, const Size& size)
{
Modified: trunk/pingus/src/math/vector2f.cpp
===================================================================
--- trunk/pingus/src/math/vector2f.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/vector2f.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -15,9 +15,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "math/vector2f.hpp"
+
#include <config.h>
#include <iostream>
-#include "math/vector2f.hpp"
std::ostream& operator<<(std::ostream& s, const Vector2f& v)
{
Modified: trunk/pingus/src/math/vector2i.cpp
===================================================================
--- trunk/pingus/src/math/vector2i.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/vector2i.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "math/vector2i.hpp"
+
#include <iostream>
#include "vector2f.hpp"
#include "vector2i.hpp"
Modified: trunk/pingus/src/math/vector3f.cpp
===================================================================
--- trunk/pingus/src/math/vector3f.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/math/vector3f.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "math/vector3f.hpp"
+
#include <iostream>
#include "math/math.hpp"
-#include "math/vector3f.hpp"
Vector3f
Vector3f::rotate (float angle, const Vector3f& pos) const
Modified: trunk/pingus/src/movers/linear_mover.cpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/movers/linear_mover.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "movers/linear_mover.hpp"
+
#include "pingus/collider.hpp"
namespace Movers {
Modified: trunk/pingus/src/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/particles/explosive_particle.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/particles/explosive_particle.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -13,13 +13,14 @@
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "particles/explosive_particle.hpp"
#if 0
#include "pingus/collision_map.hpp"
#include "pingus/pingu_map.hpp"
#include "pingus/world.hpp"
#include "particles/particle_holder.hpp"
#include "pingus/resource.hpp"
-#include "particles/explosive_particle.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
: Particle (x, y, x_a, y_a),
Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "particles/pingu_particle_holder.hpp"
+
#include "display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "particles/pingu_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "particles/rain_particle_holder.hpp"
+
#include "display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "particles/rain_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/particles/smoke_particle_holder.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "particles/smoke_particle_holder.hpp"
+
#include "pingus/globals.hpp"
#include "display/scene_context.hpp"
#include "pingus/resource.hpp"
-#include "particles/smoke_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "particles/snow_particle_holder.hpp"
+
#include <assert.h>
#include "math/math.hpp"
@@ -22,7 +24,6 @@
#include "pingus/ground_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "particles/snow_particle_holder.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/action_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/action_holder.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/action_holder.hpp"
+
#include <iostream>
#include "pingus/pingus_level.hpp"
-#include "pingus/action_holder.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/addon_menu.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/addon_menu.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/addon_menu.hpp"
+
#include "pingus/gettext.h"
#include "pingus/resource.hpp"
#include "screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "display/drawing_context.hpp"
#include "pingus/option_menu.hpp"
-#include "pingus/addon_menu.hpp"
AddOnMenu::AddOnMenu() :
background(),
Modified: trunk/pingus/src/pingus/blitter.cpp
===================================================================
--- trunk/pingus/src/pingus/blitter.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/blitter.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/blitter.hpp"
+
#include <config.h>
#include <stdio.h>
#include <assert.h>
@@ -23,7 +25,6 @@
#include "pingus/pingus_error.hpp"
#include "pingus/globals.hpp"
#include "math/math.hpp"
-#include "pingus/blitter.hpp"
#include "pingus/debug.hpp"
#include "pingus/blitter_impl.hpp"
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pingus/capture_rectangle.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/game_session.hpp"
Modified: trunk/pingus/src/pingus/collider.cpp
===================================================================
--- trunk/pingus/src/pingus/collider.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/collider.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pingus/collider.hpp"
+
#include "pingus/collision_map.hpp"
#include "math/vector3f.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/collision_map.hpp"
+
#include <iostream>
#include "SDL.h"
#include "display/drawing_context.hpp"
#include "pingus/globals.hpp"
-#include "pingus/collision_map.hpp"
#include "pingus/collision_mask.hpp"
#include "pingus/pingus_error.hpp"
#include "math/math.hpp"
Modified: trunk/pingus/src/pingus/collision_mask.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/collision_mask.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/collision_mask.hpp"
+
#include <iostream>
#include "pingus/resource.hpp"
#include "util/system.hpp"
-#include "pingus/collision_mask.hpp"
CollisionMask::CollisionMask() :
surface(),
Modified: trunk/pingus/src/pingus/config_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/config_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/config_manager.hpp"
+
#include <iostream>
#include <fstream>
#include "SDL.h"
@@ -25,7 +27,6 @@
#include "tinygettext/dictionary_manager.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
-#include "pingus/config_manager.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
Modified: trunk/pingus/src/pingus/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/credits.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/credits.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/credits.hpp"
+
#include <iostream>
#include "screen/screen_manager.hpp"
#include "gui/surface_button.hpp"
@@ -22,7 +24,6 @@
#include "pingus/stat_manager.hpp"
#include "pingus/resource.hpp"
#include "pingus/res_descriptor.hpp"
-#include "pingus/credits.hpp"
#include "pingus/fonts.hpp"
#include "gettext.h"
#include "display/display.hpp"
Modified: trunk/pingus/src/pingus/debug.cpp
===================================================================
--- trunk/pingus/src/pingus/debug.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/debug.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -17,6 +17,7 @@
#include "pingus/debug.hpp"
+
/* Stream for error messages */
DebugStream perr("[Error] ");
Modified: trunk/pingus/src/pingus/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/demo_session.hpp"
+
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <iostream>
@@ -32,7 +34,6 @@
#include "screen/screen_manager.hpp"
#include "display/display.hpp"
#include "pingus/resource.hpp"
-#include "pingus/demo_session.hpp"
static bool false_func() { return false; }
Modified: trunk/pingus/src/pingus/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/demo_session.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,14 +18,16 @@
#define HEADER_PINGUS_PINGUS_DEMO_SESSION_HPP
#include <memory>
+#include <vector>
+
+#include "util/pathname.hpp"
#include "screen/gui_screen.hpp"
-#include <vector>
#include "pingus/server_event.hpp"
namespace Input {
struct Event;
struct ScrollEvent;
-}
+} // namespace Input
class Server;
class XMLPDF;
Modified: trunk/pingus/src/pingus/direction.cpp
===================================================================
--- trunk/pingus/src/pingus/direction.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/direction.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,6 +17,7 @@
#include "pingus/direction.hpp"
+
Direction::Direction() : direction(NONE)
{
}
Modified: trunk/pingus/src/pingus/font.cpp
===================================================================
--- trunk/pingus/src/pingus/font.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/font.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/font.hpp"
+
#include <iostream>
#include <vector>
#include <map>
#include "SDL.h"
#include "SDL_image.h"
-#include "pingus/font.hpp"
#include "pingus/surface.hpp"
#include "pingus/line_iterator.hpp"
#include "util/utf8.hpp"
Modified: trunk/pingus/src/pingus/font_description.cpp
===================================================================
--- trunk/pingus/src/pingus/font_description.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/font_description.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/font_description.hpp"
+
#include "pingus/pingus_error.hpp"
#include "util/file_reader.hpp"
-#include "pingus/font_description.hpp"
GlyphDescription::GlyphDescription() :
image(0),
Modified: trunk/pingus/src/pingus/font_description.hpp
===================================================================
--- trunk/pingus/src/pingus/font_description.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/font_description.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -18,6 +18,8 @@
#define HEADER_PINGUS_PINGUS_FONT_DESCRIPTION_HPP
#include <string>
+#include <vector>
+
#include "math/vector2i.hpp"
#include "math/rect.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/pingus/font_test_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/font_test_screen.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/font_test_screen.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/font_test_screen.hpp"
+
#include <iostream>
#include "input/event.hpp"
@@ -22,7 +24,6 @@
#include "display/drawing_context.hpp"
#include "display/display.hpp"
#include "pingus/font_description.hpp"
-#include "pingus/font_test_screen.hpp"
FontTestScreen::FontTestScreen(const Pathname& fontfile) :
Screen(Display::get_size()),
Modified: trunk/pingus/src/pingus/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -20,7 +20,8 @@
#include "screen/screen.hpp"
#include "pingus/font.hpp"
-/** */
+class Pathname;
+
class FontTestScreen : public Screen
{
private:
Modified: trunk/pingus/src/pingus/fonts.cpp
===================================================================
--- trunk/pingus/src/pingus/fonts.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/fonts.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/resource.hpp"
#include "pingus/fonts.hpp"
+#include "pingus/resource.hpp"
+
namespace Fonts {
Font chalk_large;
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/fps_counter.hpp"
+
#include <sstream>
#include "pingus/fonts.hpp"
-#include "pingus/fps_counter.hpp"
#include "gettext.h"
#include "display/display.hpp"
Modified: trunk/pingus/src/pingus/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/game_session.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/game_session.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/game_session.hpp"
+
#include <iostream>
#include "screen/screen_manager.hpp"
#include "pingus/server.hpp"
@@ -28,7 +30,6 @@
#include "input/event.hpp"
#include "sound/sound.hpp"
#include "math/math.hpp"
-#include "pingus/game_session.hpp"
#include "pingus/resource.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/game_time.cpp
===================================================================
--- trunk/pingus/src/pingus/game_time.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/game_time.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/game_time.hpp"
+
#include <stdio.h>
#include "gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/game_time.hpp"
std::string
GameTime::ticks_to_realtime_string(int ticks)
Modified: trunk/pingus/src/pingus/game_time.hpp
===================================================================
--- trunk/pingus/src/pingus/game_time.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/game_time.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_GAME_TIME_HPP
#define HEADER_PINGUS_PINGUS_GAME_TIME_HPP
+#include <string>
+
#include "pingus/pingus.hpp"
/** The GameTime represents the time which passes in the Pingus World.
Modified: trunk/pingus/src/pingus/gettext.cpp
===================================================================
--- trunk/pingus/src/pingus/gettext.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/gettext.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/gettext.h"
+
#include "tinygettext/dictionary_manager.hpp"
#include "tinygettext/dictionary.hpp"
#include "gettext.h"
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/global_event.hpp"
+
#include <config.h>
#include <stdio.h>
#include <iostream>
@@ -24,7 +26,6 @@
#include "pingus/option_menu.hpp"
#include "pingus/level_menu.hpp"
#include "pingus/addon_menu.hpp"
-#include "pingus/global_event.hpp"
#include "pingus/config_manager.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/globals.cpp
===================================================================
--- trunk/pingus/src/pingus/globals.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/globals.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pingus/globals.hpp"
+
int game_speed = 20;
float desired_fps = 40;
Modified: trunk/pingus/src/pingus/goal_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/goal_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/goal_manager.hpp"
+
#include <iostream>
#include "pingus/server.hpp"
#include "pingus/world.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/goal_manager.hpp"
GoalManager::GoalManager(Server* s)
Modified: trunk/pingus/src/pingus/graphic_context_state.cpp
===================================================================
--- trunk/pingus/src/pingus/graphic_context_state.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/graphic_context_state.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/graphic_context_state.hpp"
+
#include "math/math.hpp"
#include "display/display.hpp"
-#include "pingus/graphic_context_state.hpp"
class GraphicContextStateImpl
{
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/ground_map.hpp"
+
#include <stdio.h>
#include <iostream>
#include "display/scene_context.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/blitter.hpp"
-#include "pingus/ground_map.hpp"
#include "pingus/pingus_level.hpp"
#include "gettext.h"
#include "pingus/collision_map.hpp"
Modified: trunk/pingus/src/pingus/groundtype.cpp
===================================================================
--- trunk/pingus/src/pingus/groundtype.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/groundtype.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <iostream>
#include "pingus/groundtype.hpp"
+#include <iostream>
+
Groundtype::GPType
Groundtype::string_to_type(const std::string& arg_type)
{
Modified: trunk/pingus/src/pingus/layer_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/layer_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/layer_manager.hpp"
+
#include <iostream>
-#include "pingus/layer_manager.hpp"
LayerManager::LayerManager () :
layers()
Modified: trunk/pingus/src/pingus/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/level_menu.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/level_menu.hpp"
+
#include <boost/format.hpp>
#include <boost/function.hpp>
#include <boost/bind.hpp>
@@ -25,7 +27,6 @@
#include "pingus/option_menu.hpp"
#include "util/system.hpp"
#include "display/display.hpp"
-#include "pingus/level_menu.hpp"
#include "gui/rect_component.hpp"
#include "gui/gui_manager.hpp"
#include "pingus/game_session.hpp"
Modified: trunk/pingus/src/pingus/levelset.cpp
===================================================================
--- trunk/pingus/src/pingus/levelset.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/levelset.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/levelset.hpp"
+
#include <iostream>
#include "pingus/pingus_error.hpp"
#include "util/file_reader.hpp"
-#include "pingus/levelset.hpp"
#include "pingus/plf_res_mgr.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/line_iterator.cpp
===================================================================
--- trunk/pingus/src/pingus/line_iterator.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/line_iterator.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -16,6 +16,7 @@
#include "pingus/line_iterator.hpp"
+
LineIterator::LineIterator(const std::string& str)
: first(str.begin()),
last(str.end()),
Modified: trunk/pingus/src/pingus/mover.cpp
===================================================================
--- trunk/pingus/src/pingus/mover.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/mover.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -16,6 +16,7 @@
#include "pingus/mover.hpp"
+
Mover::Mover(World* const world_arg, const Vector3f& pos_arg)
: world(world_arg),
pos(pos_arg),
Modified: trunk/pingus/src/pingus/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/option_menu.hpp"
+
#include <set>
#include <boost/bind.hpp>
#include <sstream>
@@ -35,7 +37,6 @@
#include "sound/sound.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "tinygettext/language.hpp"
-#include "pingus/option_menu.hpp"
#define C(x) connections.push_back(x)
Modified: trunk/pingus/src/pingus/path_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/path_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/path_manager.hpp"
+
#include <sstream>
#include "pingus/globals.hpp"
#include "util/system.hpp"
#include "pingus/debug.hpp"
-#include "pingus/path_manager.hpp"
PathManager path_manager;
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingu.hpp"
+
#include <sstream>
#include <assert.h>
#include <stdio.h>
@@ -30,7 +32,6 @@
#include "pingus/worldobj.hpp"
#include "pingus/resource.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/pingu.hpp"
#include "actions/rocket_launcher.hpp"
#include "actions/boarder.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingu_action.hpp"
+
#include <assert.h>
#include "math/math.hpp"
@@ -21,7 +23,6 @@
#include "pingus/collision_map.hpp"
#include "pingus/world.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/pingu_action.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingu_enums.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingu_enums.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "gettext.h"
#include "pingus/pingu_enums.hpp"
+#include "gettext.h"
+
// Pingu "globals". Make [deadly_velocity = 20 * sqrt("normal gravity")] so
// that the "deadly distance" is the same and therefore doesn't break levels.
const float deadly_velocity = 10.0f;
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingu_holder.hpp"
+
#include <iostream>
#include <assert.h>
-#include "pingus/pingu_holder.hpp"
#include "pingus/pingus_level.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingus_demo.hpp"
+
#include <stdexcept>
#include <fstream>
@@ -22,7 +24,6 @@
#include "pingus/server_event.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/pingu_enums.hpp"
-#include "pingus/pingus_demo.hpp"
PingusDemo::PingusDemo(const Pathname& pathname) :
levelname(),
Modified: trunk/pingus/src/pingus/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,6 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
+#include <string>
+#include <vector>
+
+#include "pingus/server_event.hpp"
+
class Pathname;
/** */
Modified: trunk/pingus/src/pingus/pingus_error.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_error.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_error.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "pingus/pingus_error.hpp"
+
#include "gettext.h"
Modified: trunk/pingus/src/pingus/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_level.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingus_level.hpp"
+
#include <iostream>
#include "util/file_reader.hpp"
-#include "pingus/pingus_level.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/pingus_level_impl.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingus_main.hpp"
+
#include <config.h>
#include <sys/stat.h>
#include <stdio.h>
@@ -59,7 +61,6 @@
#include "screen/screen_manager.hpp"
#include "pingus/path_manager.hpp"
-#include "pingus/pingus_main.hpp"
#include "pingus/globals.hpp"
#include "util/system.hpp"
#include "pingus/pingus_error.hpp"
Modified: trunk/pingus/src/pingus/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/pingus_menu.hpp"
+
#include <config.h>
#include "gettext.h"
#include "components/menu_button.hpp"
@@ -35,7 +37,6 @@
#include "editor/editor_screen.hpp"
#include "pingus/credits.hpp"
#include "pingus/layer_manager.hpp"
-#include "pingus/pingus_menu.hpp"
PingusMenu::PingusMenu() :
is_init(),
Modified: trunk/pingus/src/pingus/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,7 +19,9 @@
#include <vector>
#include <memory>
+
#include "pingus/fonts.hpp"
+#include "pingus/sprite.hpp"
#include "screen/gui_screen.hpp"
namespace GUI {
Modified: trunk/pingus/src/pingus/plf_res_mgr.cpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/plf_res_mgr.hpp"
+
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
#include "util/system.hpp"
#include "util/pathname.hpp"
-#include "pingus/plf_res_mgr.hpp"
PLFResMgr::PLFMap PLFResMgr::plf_map;
Modified: trunk/pingus/src/pingus/res_descriptor.cpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/res_descriptor.hpp"
+
#include <assert.h>
#include <iostream>
-#include "pingus/res_descriptor.hpp"
#include "pingus/pingus_error.hpp"
Modified: trunk/pingus/src/pingus/resource.cpp
===================================================================
--- trunk/pingus/src/pingus/resource.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/resource.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/resource.hpp"
+
#include <assert.h>
#include "util/system.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
#include "pingus/font_description.hpp"
-#include "pingus/resource.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/blitter.hpp"
#include "pingus/sprite_description.hpp"
Modified: trunk/pingus/src/pingus/resource_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/resource_manager.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/resource_manager.hpp"
+
#include <iostream>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
@@ -22,7 +24,6 @@
#include "util/string_util.hpp"
#include "pingus/sprite_description.hpp"
#include "util/sexpr_file_reader.hpp"
-#include "pingus/resource_manager.hpp"
ResourceManager::ResourceManager() :
resources(),
Modified: trunk/pingus/src/pingus/resource_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/resource_manager.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -19,6 +19,7 @@
#include <string>
#include <map>
+#include <vector>
class SpriteDescription;
class FileReader;
Modified: trunk/pingus/src/pingus/resource_modifier.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/resource_modifier.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include <assert.h>
#include "pingus/resource_modifier.hpp"
+#include <assert.h>
+
namespace ResourceModifierNS {
ResourceModifier horizontal_flip (ResourceModifier modifier)
Modified: trunk/pingus/src/pingus/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/result_screen.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/result_screen.hpp"
+
#include <iostream>
#include "gettext.h"
#include "display/display.hpp"
@@ -29,7 +31,6 @@
#include "util/string_util.hpp"
#include "sound/sound.hpp"
#include "pingus/game_time.hpp"
-#include "pingus/result_screen.hpp"
class ResultScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/savegame.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/savegame.hpp"
+
#include <iostream>
-#include "pingus/savegame.hpp"
#include "util/sexpr_file_writer.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/savegame_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/savegame_manager.hpp"
+
#include <assert.h>
#include <fstream>
@@ -21,7 +23,6 @@
#include "pingus/pingus_error.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
-#include "pingus/savegame_manager.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
Modified: trunk/pingus/src/pingus/screenshot.cpp
===================================================================
--- trunk/pingus/src/pingus/screenshot.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/screenshot.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/screenshot.hpp"
+
#include <assert.h>
#include <config.h>
#include <time.h>
@@ -24,7 +26,6 @@
#include "display/display.hpp"
#include "display/framebuffer.hpp"
#include "util/system.hpp"
-#include "pingus/screenshot.hpp"
#include "gettext.h"
#include "png.h"
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/server.hpp"
+
#include <time.h>
#include <iostream>
#include <fstream>
@@ -21,7 +23,6 @@
#include "util/system.hpp"
#include "pingus/pingu.hpp"
#include "pingus/globals.hpp"
-#include "pingus/server.hpp"
#include "pingus/game_time.hpp"
#include "pingus/world.hpp"
#include "pingus/goal_manager.hpp"
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/server_event.hpp"
+
#include <assert.h>
#include <iostream>
#include <boost/format.hpp>
Modified: trunk/pingus/src/pingus/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/smallmap_image.hpp"
+
#include <iostream>
#include "pingus/world.hpp"
-#include "pingus/smallmap_image.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/server.hpp"
Modified: trunk/pingus/src/pingus/smallmap_image.hpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,6 +19,7 @@
#include "pingus/pingus.hpp"
#include "pingus/sprite.hpp"
+#include "pingus/surface.hpp"
class Server;
Modified: trunk/pingus/src/pingus/sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/sprite.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/sprite.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/sprite.hpp"
+
#include <iostream>
#include <sstream>
#include <assert.h>
@@ -22,7 +24,6 @@
#include "math/origin.hpp"
#include "math/vector2i.hpp"
#include "SDL_image.h"
-#include "pingus/sprite.hpp"
#include "pingus/blitter.hpp"
#include "pingus/surface.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/pingus/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/sprite_impl.hpp"
+
#include <map>
#include "display/framebuffer.hpp"
#include "display/display.hpp"
#include "pingus/sprite_description.hpp"
-#include "pingus/sprite_impl.hpp"
typedef std::map<std::string, FramebufferSurface> SurfaceCache;
SurfaceCache surface_cache;
Modified: trunk/pingus/src/pingus/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -22,6 +22,7 @@
#include "math/vector2i.hpp"
class SpriteDescription;
+class Framebuffer;
class SpriteImpl
{
Modified: trunk/pingus/src/pingus/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/start_screen.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/start_screen.hpp"
+
#include <iostream>
#include "gui/gui_manager.hpp"
#include "gui/surface_button.hpp"
@@ -26,7 +28,6 @@
#include "util/system.hpp"
#include "pingus/fonts.hpp"
#include "pingus/resource.hpp"
-#include "pingus/start_screen.hpp"
#include "pingus/game_time.hpp"
#include "sound/sound.hpp"
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/stat_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/stat_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/stat_manager.hpp"
+
#include <algorithm>
#include <fstream>
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "pingus/pingus_error.hpp"
-#include "pingus/stat_manager.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/state_sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/state_sprite.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/state_sprite.hpp"
+
#include "pingus/resource.hpp"
#include "pingus/pingus_error.hpp"
-#include "pingus/state_sprite.hpp"
StateSprite::StateSprite() :
Modified: trunk/pingus/src/pingus/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/story_screen.hpp"
+
#include <algorithm>
#include <vector>
#include "gettext.h"
@@ -25,7 +27,6 @@
#include "gui/component.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/story_screen.hpp"
#include "pingus/res_descriptor.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/worldmap_screen.hpp"
Modified: trunk/pingus/src/pingus/string_format.cpp
===================================================================
--- trunk/pingus/src/pingus/string_format.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/string_format.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/string_format.hpp"
+
#include <sstream>
#include "pingus/font.hpp"
-#include "pingus/string_format.hpp"
#include "util/utf8.hpp"
std::string
Modified: trunk/pingus/src/pingus/surface.cpp
===================================================================
--- trunk/pingus/src/pingus/surface.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/surface.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/surface.hpp"
+
#include "SDL_image.h"
#include <boost/format.hpp>
#include <sstream>
@@ -21,7 +23,6 @@
#include "math/rect.hpp"
#include "pingus/debug.hpp"
#include "pingus/blitter.hpp"
-#include "pingus/surface.hpp"
class SurfaceImpl
{
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/world.hpp"
+
#include <algorithm>
#include <assert.h>
#include <iostream>
@@ -22,7 +24,6 @@
#include "worldobjs/entrance.hpp"
#include "sound/sound.hpp"
#include "pingus/ground_map.hpp"
-#include "pingus/world.hpp"
#include "particles/pingu_particle_holder.hpp"
#include "particles/rain_particle_holder.hpp"
#include "particles/smoke_particle_holder.hpp"
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/worldobj.hpp"
+
#include <typeinfo>
#include <iostream>
-#include "pingus/worldobj.hpp"
#include "display/scene_context.hpp"
Modified: trunk/pingus/src/pingus/worldobj_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "pingus/worldobj_factory.hpp"
+
#include <iostream>
#include "pingus/pingus_error.hpp"
-#include "pingus/worldobj_factory.hpp"
#include "worldobjs/conveyor_belt.hpp"
#include "worldobjs/entrance.hpp"
Modified: trunk/pingus/src/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/screen/gui_screen.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "screen/gui_screen.hpp"
+
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
#include "display/display.hpp"
#include "gui/gui_manager.hpp"
-#include "screen/gui_screen.hpp"
GUIScreen::GUIScreen()
: Screen(Display::get_size()),
Modified: trunk/pingus/src/screen/screen.cpp
===================================================================
--- trunk/pingus/src/screen/screen.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/screen/screen.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -16,4 +16,5 @@
#include "screen/screen.hpp"
+
/* EOF */
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/screen/screen_manager.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "screen/screen_manager.hpp"
+
#include "SDL.h"
#include <iostream>
#include <fstream>
@@ -23,7 +25,6 @@
#include "util/pathname.hpp"
#include "display/display.hpp"
#include "display/framebuffer.hpp"
-#include "screen/screen_manager.hpp"
#include "pingus/path_manager.hpp"
#include "screen/screen.hpp"
#include "pingus/fps_counter.hpp"
Modified: trunk/pingus/src/sound/sound.cpp
===================================================================
--- trunk/pingus/src/sound/sound.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/sound/sound.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "sound/sound.hpp"
+
#include <iostream>
#include <assert.h>
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
#include "sound/sound_dummy.hpp"
#include "sound/sound_real.hpp"
-#include "sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/sound/sound_dummy.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "sound/sound_dummy.hpp"
+
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
-#include "sound/sound_dummy.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_impl.hpp
===================================================================
--- trunk/pingus/src/sound/sound_impl.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/sound/sound_impl.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
#define HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
+#include <string>
+
#include "pingus/pingus.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/sound/sound_real.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/sound/sound_real.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "sound/sound_real.hpp"
+
#include <stdexcept>
#include "SDL.h"
#include "SDL_mixer.h"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
#include "sound/sound_res_mgr.hpp"
-#include "sound/sound_real.hpp"
namespace Sound {
Modified: trunk/pingus/src/sound/sound_res_mgr.cpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "sound/sound_res_mgr.hpp"
+
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
-#include "sound/sound_res_mgr.hpp"
-
SoundResMgr::SoundMap SoundResMgr::sound_map;
SoundHandle
@@ -56,5 +56,4 @@
}
}
-
/* EOF */
Modified: trunk/pingus/src/sound/sound_res_mgr.hpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/sound/sound_res_mgr.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,11 +18,11 @@
#define HEADER_PINGUS_SOUND_SOUND_RES_MGR_HPP
#include <map>
+#include <string>
#include "SDL_mixer.h"
typedef Mix_Chunk* SoundHandle;
-
/** */
class SoundResMgr
{
@@ -38,7 +38,6 @@
SoundResMgr& operator= (const SoundResMgr&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/util/command_line.cpp
===================================================================
--- trunk/pingus/src/util/command_line.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/command_line.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -27,7 +27,6 @@
** (if your name is missing here, please add it)
*/
-#include "util/command_line.hpp"
#include "util/command_line_generic.hpp"
CommandLine::CommandLine() :
Modified: trunk/pingus/src/util/command_line_generic.cpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/util/command_line_generic.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -27,14 +27,13 @@
** (if your name is missing here, please add it)
*/
+#include "util/command_line_generic.hpp"
+
#include <iomanip>
#include <iostream>
#include <stdexcept>
#include <stdio.h>
-#include "util/command_line_generic.hpp"
-
-
#ifdef WIN32
#define snprintf _snprintf
#endif
Modified: trunk/pingus/src/util/debug_stream.cpp
===================================================================
--- trunk/pingus/src/util/debug_stream.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/debug_stream.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util/debug_stream.hpp"
+
#include "pingus/globals.hpp"
using std::ostream;
Modified: trunk/pingus/src/util/file_reader.cpp
===================================================================
--- trunk/pingus/src/util/file_reader.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/file_reader.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/file_reader.hpp"
+
#include "util/sexpr_file_reader.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
#include "util/pathname.hpp"
-#include "util/file_reader.hpp"
#include "util/file_reader_impl.hpp"
FileReader::FileReader(boost::shared_ptr<FileReaderImpl> impl_) :
Modified: trunk/pingus/src/util/pathname.cpp
===================================================================
--- trunk/pingus/src/util/pathname.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/util/pathname.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/pathname.hpp"
+
#include <assert.h>
#include <iostream>
#include "util/system.hpp"
#include "pingus/path_manager.hpp"
-#include "util/pathname.hpp"
Pathname Pathname::tmpfile(const std::string& prefix)
{
Modified: trunk/pingus/src/util/sexpr_file_reader.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/sexpr_file_reader.hpp"
+
#include <assert.h>
#include "math/color.hpp"
@@ -24,7 +26,6 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_modifier.hpp"
#include "util/file_reader_impl.hpp"
-#include "util/sexpr_file_reader.hpp"
class SExprFileReaderImpl: public FileReaderImpl
{
Modified: trunk/pingus/src/util/sexpr_file_writer.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/sexpr_file_writer.hpp"
+
#include <iostream>
#include <string>
#include <map>
-#include "util/sexpr_file_writer.hpp"
SExprFileWriter::SExprFileWriter(std::ostream& out_)
: out(&out_), level(0)
Modified: trunk/pingus/src/util/sexpr_file_writer.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,8 @@
#define HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
#include <iosfwd>
+#include <ostream>
+
#include "util/file_writer.hpp"
#include "math/color.hpp"
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/util/string_util.cpp
===================================================================
--- trunk/pingus/src/util/string_util.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/util/string_util.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -16,6 +16,7 @@
#include "util/string_util.hpp"
+
// Code based on clanstring.cpp from ClanLib 0.8
std::string
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/util/system.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/system.hpp"
+
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
@@ -45,7 +47,6 @@
#include "util/pathname.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/globals.hpp"
-#include "util/system.hpp"
#include "util/string_util.hpp"
#include "pingus/gettext.h"
Modified: trunk/pingus/src/util/utf8.cpp
===================================================================
--- trunk/pingus/src/util/utf8.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/util/utf8.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -15,6 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "util/utf8.hpp"
+
#include <iostream>
#include <stdexcept>
#include "utf8.hpp"
Modified: trunk/pingus/src/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldmap/dot.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/dot.hpp"
+
#include <iostream>
#include <assert.h>
#include "util/file_reader.hpp"
-#include "worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/dot_factory.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/dot_factory.hpp"
+
#include "pingus/pingus_error.hpp"
#include "worldmap/level_dot.hpp"
-#include "worldmap/dot_factory.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/dot_factory.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
#define HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
+#include "util/file_reader.hpp"
+
namespace WorldmapNS {
class Dot;
Modified: trunk/pingus/src/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/drawable.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -17,4 +17,5 @@
#include "worldmap/drawable.hpp"
+
/* EOF */
Modified: trunk/pingus/src/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/drawable_factory.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/drawable_factory.hpp"
+
#include <iostream>
#include "worldmap/sprite_drawable.hpp"
#include "worldmap/sprite_drawable.hpp"
-#include "worldmap/drawable_factory.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/graph.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldmap/graph.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -16,6 +16,7 @@
#include "worldmap/graph.hpp"
+
namespace WorldmapNS {
const NodeId NoNode = -1;
Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/level_dot.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -16,6 +16,7 @@
#include "worldmap/level_dot.hpp"
+
#include <iostream>
#include "display/drawing_context.hpp"
Modified: trunk/pingus/src/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/worldmap/path.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldmap/path.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/path.hpp"
+
#include <iostream>
#include <algorithm>
#include <assert.h>
-#include "worldmap/path.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/path_drawable.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/path_drawable.hpp"
+
#include <iostream>
#include "math/color.hpp"
#include "display/drawing_context.hpp"
-#include "worldmap/path_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/path_graph.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/path_graph.hpp"
+
#include <iostream>
#include "math/math.hpp"
@@ -23,7 +25,6 @@
#include "worldmap/dot_factory.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/pathfinder.hpp"
-#include "worldmap/path_graph.hpp"
#include "worldmap/path_drawable.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/path_graph.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,6 +19,8 @@
#include <map>
#include <vector>
+
+#include "util/file_reader.hpp"
#include "math/vector3f.hpp"
#include "worldmap/path.hpp"
#include "worldmap/pathfinder.hpp"
Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/pingus.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/pingus.hpp"
+
#include <iostream>
#include "math/math.hpp"
@@ -22,7 +24,6 @@
#include "worldmap/dot.hpp"
#include "pingus/direction.hpp"
#include "pingus/resource.hpp"
-#include "worldmap/pingus.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/pingus_worldmap.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/pingus_worldmap.hpp"
+
#include <string>
#include "pingus/pingus_error.hpp"
#include "util/file_reader.hpp"
#include "worldmap/drawable_factory.hpp"
-#include "worldmap/pingus_worldmap.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/sprite_drawable.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/sprite_drawable.hpp"
+
#include <iostream>
#include "pingus/resource.hpp"
@@ -21,7 +23,6 @@
#include "worldmap/worldmap_screen.hpp"
#include "worldmap/worldmap.hpp"
#include "worldmap/pingus.hpp"
-#include "worldmap/sprite_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/worldmap.hpp"
+
#include <assert.h>
#include <iostream>
#include "display/display.hpp"
@@ -32,7 +34,6 @@
#include "pingus/debug.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
-#include "worldmap/worldmap.hpp"
#include "worldmap/worldmap_story.hpp"
#include "worldmap/worldmap_screen.hpp"
#include "worldmap/pingus.hpp"
Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/worldmap_component.hpp"
+
#include "display/display.hpp"
#include "display/scene_context.hpp"
#include "worldmap/worldmap_screen.hpp"
#include "worldmap/worldmap.hpp"
-#include "worldmap/worldmap_component.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -16,6 +16,7 @@
#include "worldmap/worldmap_screen.hpp"
+
#include <iostream>
#include "display/display.hpp"
Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldmap/worldmap_story.hpp"
+
#include <algorithm>
#include <vector>
-#include "worldmap/worldmap_story.hpp"
#include "pingus/story_screen.hpp"
#include "util/file_reader.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/conveyor_belt.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/conveyor_belt.hpp"
+
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/conveyor_belt.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/entrance.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/entrance.hpp"
+
#include <iostream>
#include "display/scene_context.hpp"
#include "pingus/world.hpp"
@@ -22,7 +24,6 @@
#include "pingus/pingu.hpp"
#include "pingus/resource.hpp"
#include "components/smallmap.hpp"
-#include "worldobjs/entrance.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.cpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/exit.cpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/exit.hpp"
+
#include <iostream>
#include "display/scene_context.hpp"
#include "pingus/collision_map.hpp"
@@ -24,7 +26,6 @@
#include "components/smallmap.hpp"
#include "pingus/resource.hpp"
#include "util/string_util.hpp"
-#include "worldobjs/exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/exit.hpp 2009-11-05 18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/exit.hpp 2009-11-05 19:01:27 UTC (rev 4036)
@@ -17,6 +17,7 @@
#ifndef HEADER_PINGUS_WORLDOBJS_EXIT_HPP
#define HEADER_PINGUS_WORLDOBJS_EXIT_HPP
+#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/fake_exit.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/fake_exit.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "components/smallmap.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/fake_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
-
class Pingu;
namespace WorldObjsData {
Modified: trunk/pingus/src/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/groundpiece.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/groundpiece.hpp"
+
#include <iostream>
#include "pingus/world.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/groundpiece.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/guillotine.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/guillotine.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/guillotine.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/guillotine.hpp
===================================================================
--- trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/guillotine.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,8 +19,8 @@
#include "pingus/direction.hpp"
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
-
namespace WorldObjsData {
class GuillotineData;
}
Modified: trunk/pingus/src/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/hammer.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/hammer.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/hammer.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hammer.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hammer.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/hammer.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDOBJS_HAMMER_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
-
namespace WorldObjsData {
class HammerData;
} // namespace WorldObjsData
Modified: trunk/pingus/src/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/hotspot.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/hotspot.hpp"
+
#include <iostream>
#include "pingus/globals.hpp"
#include "display/scene_context.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/hotspot.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/hotspot.hpp
===================================================================
--- trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/hotspot.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_HOTSPOT_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class HotspotData;
Modified: trunk/pingus/src/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/ice_block.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/ice_block.hpp"
+
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
@@ -21,7 +23,6 @@
#include "pingus/ground_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/ice_block.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/ice_block.hpp
===================================================================
--- trunk/pingus/src/worldobjs/ice_block.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/ice_block.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class IceBlockData;
Modified: trunk/pingus/src/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/laser_exit.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,11 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/laser_exit.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/laser_exit.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/laser_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/laser_exit.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/laser_exit.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,6 +19,7 @@
#include "pingus/worldobj.hpp"
#include "pingus/sprite.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class LaserExitData;
Modified: trunk/pingus/src/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/liquid.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/liquid.hpp"
+
#include <iostream>
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/liquid.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/liquid.hpp
===================================================================
--- trunk/pingus/src/worldobjs/liquid.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/liquid.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -19,6 +19,7 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class LiquidData;
Modified: trunk/pingus/src/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/rain_generator.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/rain_generator.hpp"
+
#include <iostream>
#include "particles/rain_particle_holder.hpp"
#include "sound/sound.hpp"
#include "pingus/world.hpp"
#include "display/scene_context.hpp"
-#include "worldobjs/rain_generator.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/smasher.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/smasher.hpp"
+
#include <iostream>
#include "math/math.hpp"
@@ -25,7 +27,6 @@
#include "pingus/resource.hpp"
#include "sound/sound.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/smasher.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/smasher.hpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/smasher.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDOBJS_SMASHER_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
-
namespace WorldObjsData {
class SmasherData;
}
Modified: trunk/pingus/src/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/snow_generator.hpp"
+
#include <iostream>
#include "math/math.hpp"
#include "pingus/world.hpp"
#include "particles/snow_particle_holder.hpp"
-#include "worldobjs/snow_generator.hpp"
#include "pingus/globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/solid_color_background.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/solid_color_background.hpp"
+
#include "display/display.hpp"
#include "display/scene_context.hpp"
-#include "worldobjs/solid_color_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/spike.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/spike.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/spike.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/spike.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_WORLDOBJS_SPIKE_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
-
namespace WorldObjsData {
class SpikeData;
} // namespace WorldObjsData
Modified: trunk/pingus/src/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/starfield_background.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,8 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/starfield_background.hpp"
+
#include <iostream>
-#include "worldobjs/starfield_background.hpp"
#include "worldobjs/starfield_background_stars.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/starfield_background_stars.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/starfield_background_stars.hpp"
+
#include "display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/starfield_background_stars.hpp"
#include "pingus/globals.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/surface_background.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/surface_background.hpp"
+
#include <iostream>
#include "pingus/globals.hpp"
#include "display/scene_context.hpp"
@@ -22,7 +24,6 @@
#include "pingus/globals.hpp"
#include "pingus/blitter.hpp"
#include "display/display.hpp"
-#include "worldobjs/surface_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/surface_background.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/surface_background.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -19,6 +19,7 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class SurfaceBackgroundData;
Modified: trunk/pingus/src/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/switch_door.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/switch_door.hpp"
+
#include "pingus/collision_map.hpp"
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/switch_door.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/switch_door.hpp
===================================================================
--- trunk/pingus/src/worldobjs/switch_door.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/switch_door.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class SwitchDoorData;
Modified: trunk/pingus/src/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/teleporter.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/teleporter.hpp"
+
#include <iostream>
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
@@ -21,7 +23,6 @@
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
#include "worldobjs/teleporter_target.hpp"
-#include "worldobjs/teleporter.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter.hpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter.hpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/teleporter.hpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/teleporter_target.cpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -14,13 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/teleporter_target.hpp"
+
#include <iostream>
#include "display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
-#include "worldobjs/teleporter_target.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/teleporter_target.hpp
===================================================================
--- trunk/pingus/src/worldobjs/teleporter_target.hpp 2009-11-05 18:47:22 UTC
(rev 4035)
+++ trunk/pingus/src/worldobjs/teleporter_target.hpp 2009-11-05 19:01:27 UTC
(rev 4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_TELEPORTER_TARGET_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.cpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -14,9 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/thunderstorm_background.hpp"
+
#include "pingus/resource.hpp"
#include "display/scene_context.hpp"
-#include "worldobjs/thunderstorm_background.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/worldobjs/thunderstorm_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/thunderstorm_background.hpp 2009-11-05
18:47:22 UTC (rev 4035)
+++ trunk/pingus/src/worldobjs/thunderstorm_background.hpp 2009-11-05
19:01:27 UTC (rev 4036)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_WORLDOBJS_THUNDERSTORM_BACKGROUND_HPP
#include "pingus/worldobj.hpp"
+#include "math/vector3f.hpp"
namespace WorldObjsData {
class ThunderstormBackgroundData;
Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-05 18:47:22 UTC (rev
4035)
+++ trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-05 19:01:27 UTC (rev
4036)
@@ -14,12 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "worldobjs/woodthing.hpp"
+
#include "math/math.hpp"
#include "display/scene_context.hpp"
#include "particles/smoke_particle_holder.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
-#include "worldobjs/woodthing.hpp"
namespace WorldObjs {
// FIXME: Re-enable this namespace.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4036 - in trunk/pingus/src: display editor gui input math movers particles pingus screen sound util worldmap worldobjs,
grumbel at BerliOS <=