[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4068 - in trunk/pingus: . src/editor src/engine/display sr
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4068 - in trunk/pingus: . src/editor src/engine/display src/engine/display/opengl src/engine/gui src/engine/input src/engine/input/evdev src/engine/input/usbmouse src/engine/input/wiimote src/engine/input/xinput src/engine/screen src/engine/sound src/lisp src/math src/pingus src/pingus/actions src/pingus/colliders src/pingus/components src/pingus/particles src/pingus/screens src/pingus/worldmap src/pingus/worldobjs src/util |
|
Date: |
Sat, 7 Nov 2009 05:17:13 +0100 |
Author: grumbel
Date: 2009-11-07 05:16:52 +0100 (Sat, 07 Nov 2009)
New Revision: 4068
Modified:
trunk/pingus/TODO
trunk/pingus/src/editor/action_properties.cpp
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/combobox.hpp
trunk/pingus/src/editor/editor_level.cpp
trunk/pingus/src/editor/editor_level.hpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/file_dialog.cpp
trunk/pingus/src/editor/file_list.cpp
trunk/pingus/src/editor/gui_style.hpp
trunk/pingus/src/editor/inputbox.cpp
trunk/pingus/src/editor/level_objs.cpp
trunk/pingus/src/editor/minimap.cpp
trunk/pingus/src/editor/object_properties.cpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/panel.cpp
trunk/pingus/src/editor/panel.hpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/editor/viewport.hpp
trunk/pingus/src/engine/display/blitter.cpp
trunk/pingus/src/engine/display/blitter.hpp
trunk/pingus/src/engine/display/delta_framebuffer.cpp
trunk/pingus/src/engine/display/delta_framebuffer.hpp
trunk/pingus/src/engine/display/display.cpp
trunk/pingus/src/engine/display/drawing_context.cpp
trunk/pingus/src/engine/display/drawing_context.hpp
trunk/pingus/src/engine/display/font.cpp
trunk/pingus/src/engine/display/font.hpp
trunk/pingus/src/engine/display/font_description.hpp
trunk/pingus/src/engine/display/framebuffer_surface.hpp
trunk/pingus/src/engine/display/graphic_context_state.cpp
trunk/pingus/src/engine/display/graphic_context_state.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/rect_merger.cpp
trunk/pingus/src/engine/display/scene_context.hpp
trunk/pingus/src/engine/display/screenshot.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.hpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/sprite.cpp
trunk/pingus/src/engine/display/sprite.hpp
trunk/pingus/src/engine/display/sprite_impl.hpp
trunk/pingus/src/engine/display/surface.cpp
trunk/pingus/src/engine/gui/component.cpp
trunk/pingus/src/engine/gui/group_component.cpp
trunk/pingus/src/engine/gui/gui_manager.cpp
trunk/pingus/src/engine/gui/gui_manager.hpp
trunk/pingus/src/engine/gui/surface_button.cpp
trunk/pingus/src/engine/input/controller.cpp
trunk/pingus/src/engine/input/controller.hpp
trunk/pingus/src/engine/input/controller_description.hpp
trunk/pingus/src/engine/input/core_driver.cpp
trunk/pingus/src/engine/input/evdev/evdev_device.cpp
trunk/pingus/src/engine/input/evdev/evdev_device.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/input/manager.hpp
trunk/pingus/src/engine/input/sdl_driver.cpp
trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
trunk/pingus/src/engine/input/wiimote/wiimote.cpp
trunk/pingus/src/engine/input/wiimote/wiimote.hpp
trunk/pingus/src/engine/input/xinput/xinput_device.cpp
trunk/pingus/src/engine/input/xinput/xinput_device.hpp
trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
trunk/pingus/src/engine/screen/screen.cpp
trunk/pingus/src/engine/screen/screen.hpp
trunk/pingus/src/engine/screen/screen_manager.cpp
trunk/pingus/src/engine/sound/sound_dummy.hpp
trunk/pingus/src/engine/sound/sound_real.cpp
trunk/pingus/src/engine/sound/sound_real.hpp
trunk/pingus/src/lisp/getters.cpp
trunk/pingus/src/lisp/lexer.cpp
trunk/pingus/src/lisp/lisp.cpp
trunk/pingus/src/lisp/lisp.hpp
trunk/pingus/src/lisp/parser.cpp
trunk/pingus/src/math/rect.hpp
trunk/pingus/src/math/vector2f.cpp
trunk/pingus/src/math/vector2f.hpp
trunk/pingus/src/math/vector2i.cpp
trunk/pingus/src/math/vector2i.hpp
trunk/pingus/src/math/vector3f.cpp
trunk/pingus/src/math/vector3f.hpp
trunk/pingus/src/pingus/action_holder.cpp
trunk/pingus/src/pingus/actions/angel.cpp
trunk/pingus/src/pingus/actions/basher.cpp
trunk/pingus/src/pingus/actions/basher.hpp
trunk/pingus/src/pingus/actions/boarder.cpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/bomber.hpp
trunk/pingus/src/pingus/actions/bridger.cpp
trunk/pingus/src/pingus/actions/bridger.hpp
trunk/pingus/src/pingus/actions/digger.cpp
trunk/pingus/src/pingus/actions/digger.hpp
trunk/pingus/src/pingus/actions/drown.cpp
trunk/pingus/src/pingus/actions/exiter.cpp
trunk/pingus/src/pingus/actions/faller.cpp
trunk/pingus/src/pingus/actions/jumper.cpp
trunk/pingus/src/pingus/actions/laser_kill.cpp
trunk/pingus/src/pingus/actions/miner.cpp
trunk/pingus/src/pingus/actions/miner.hpp
trunk/pingus/src/pingus/actions/rocket_launcher.cpp
trunk/pingus/src/pingus/actions/smashed.cpp
trunk/pingus/src/pingus/actions/splashed.cpp
trunk/pingus/src/pingus/actions/superman.cpp
trunk/pingus/src/pingus/actions/waiter.cpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/colliders/pingu_collider.cpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/collision_mask.cpp
trunk/pingus/src/pingus/collision_mask.hpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/pingus_counter.cpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/slider_box.cpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/config_manager.cpp
trunk/pingus/src/pingus/config_manager.hpp
trunk/pingus/src/pingus/fonts.cpp
trunk/pingus/src/pingus/fonts.hpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/gettext.cpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/goal_manager.cpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/ground_map.hpp
trunk/pingus/src/pingus/layer_manager.cpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/levelset.cpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/explosive_particle.hpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_level.cpp
trunk/pingus/src/pingus/pingus_level.hpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_main.hpp
trunk/pingus/src/pingus/res_descriptor.cpp
trunk/pingus/src/pingus/resource.cpp
trunk/pingus/src/pingus/resource.hpp
trunk/pingus/src/pingus/resource_manager.cpp
trunk/pingus/src/pingus/savegame.cpp
trunk/pingus/src/pingus/savegame_manager.cpp
trunk/pingus/src/pingus/savegame_manager.hpp
trunk/pingus/src/pingus/screens/addon_menu.cpp
trunk/pingus/src/pingus/screens/credits.cpp
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/level_menu.cpp
trunk/pingus/src/pingus/screens/option_menu.cpp
trunk/pingus/src/pingus/screens/pingus_menu.cpp
trunk/pingus/src/pingus/screens/result_screen.cpp
trunk/pingus/src/pingus/screens/start_screen.cpp
trunk/pingus/src/pingus/screens/story_screen.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/stat_manager.cpp
trunk/pingus/src/pingus/state_sprite.cpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldmap/dot.cpp
trunk/pingus/src/pingus/worldmap/dot.hpp
trunk/pingus/src/pingus/worldmap/drawable.cpp
trunk/pingus/src/pingus/worldmap/drawable.hpp
trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/path.cpp
trunk/pingus/src/pingus/worldmap/path_drawable.cpp
trunk/pingus/src/pingus/worldmap/path_graph.cpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobj.hpp
trunk/pingus/src/pingus/worldobj_factory.cpp
trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
trunk/pingus/src/pingus/worldobjs/entrance.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/hotspot.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.hpp
trunk/pingus/src/pingus/worldobjs/liquid.cpp
trunk/pingus/src/pingus/worldobjs/smasher.cpp
trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
trunk/pingus/src/pingus/worldobjs/spike.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/pingus/worldobjs/surface_background.cpp
trunk/pingus/src/pingus/worldobjs/surface_background.hpp
trunk/pingus/src/pingus/worldobjs/switch_door.cpp
trunk/pingus/src/pingus/worldobjs/switch_door.hpp
trunk/pingus/src/pingus/worldobjs/teleporter.cpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/pingus/worldobjs/woodthing.cpp
trunk/pingus/src/util/command_line_generic.hpp
trunk/pingus/src/util/debug_stream.hpp
trunk/pingus/src/util/file_reader.cpp
trunk/pingus/src/util/file_reader.hpp
trunk/pingus/src/util/pathname.hpp
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/system.cpp
trunk/pingus/src/util/utf8.cpp
Log:
Brute force removal of unneeded includes
Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/TODO 2009-11-07 04:16:52 UTC (rev 4068)
@@ -43,7 +43,9 @@
* data/prefab/ completly obsolete? if so remove
+* pass FileReader by const reference
+
Beta Testing
============
@@ -221,6 +223,7 @@
* forest level shows bug in DeltaRenderer
+
New Features
============
@@ -231,6 +234,7 @@
* add clickable WorldObjs, that can be triggered by the user, not by a
Pingu
+
Wishlist:
=========
@@ -247,6 +251,7 @@
* make option menu accessible from in-game (top/left corner)
+
Animation and graphic issues:
=============================
@@ -273,6 +278,7 @@
* create jumper animation
+
Bugs:
=====
@@ -292,6 +298,7 @@
* paint climber
+
Unsorted:
=========
@@ -330,6 +337,7 @@
* make climber attach to wall after jumper
+
Bugs:
=====
@@ -355,6 +363,7 @@
with the current s-expr format, which can handle explicit line
breaks just fine
+
Wishlist Stuff:
===============
@@ -363,6 +372,7 @@
* Liquids/water is 32, others are 64, this is causing trouble with the
collision map
+
Undecided stuff:
================
@@ -416,6 +426,7 @@
* keep-aspect is missing in the editor
+
Medium Important:
=================
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,13 +17,13 @@
#include "editor/action_properties.hpp"
#include <boost/bind.hpp>
-#include <iostream>
+//#include <iostream>
#include "editor/checkbox.hpp"
#include "editor/editor_level.hpp"
#include "editor/gui_style.hpp"
#include "editor/inputbox.hpp"
-#include "pingus/pingu_enums.hpp"
+//#include "pingus/pingu_enums.hpp"
#include "util/string_util.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,14 +16,16 @@
#include "editor/combobox.hpp"
-#include <iostream>
-#include <string>
-#include <vector>
+//#include <iostream>
+//#include <string>
+//#include <vector>
-#include "math/math.hpp"
-#include "math/vector2i.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/resource.hpp"
+#include "pingus/resource_modifier.hpp"
+//#include "math/math.hpp"
+//#include "math/vector2i.hpp"
+//#include "pingus/resource.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/combobox.hpp
===================================================================
--- trunk/pingus/src/editor/combobox.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/combobox.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,11 +19,11 @@
#define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
#include <boost/signal.hpp>
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "engine/display/sprite.hpp"
-#include "engine/gui/component.hpp"
+//#include "engine/gui/component.hpp"
#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,15 +19,15 @@
#include <fstream>
#include <iostream>
-#include <string>
+//#include <string>
#include "config.h"
-#include "editor/level_impl.hpp"
-#include "editor/level_objs.hpp"
-#include "editor/viewport.hpp"
+//#include "editor/level_impl.hpp"
+//#include "editor/level_objs.hpp"
+//#include "editor/viewport.hpp"
#include "pingus/pingus_level.hpp"
-#include "util/pathname.hpp"
+//#include "util/pathname.hpp"
#include "util/sexpr_file_writer.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_level.hpp
===================================================================
--- trunk/pingus/src/editor/editor_level.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/editor_level.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#ifndef HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
#define HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
-#include <vector>
+//#include <vector>
#include "editor/level_impl.hpp"
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -15,35 +15,35 @@
// You 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 "editor/editor_screen.hpp"
#include <boost/bind.hpp>
#include <iostream>
#include "editor/action_properties.hpp"
#include "editor/editor_level.hpp"
-#include "editor/file_dialog.hpp"
-#include "editor/level_objs.hpp"
+//#include "editor/file_dialog.hpp"
+//#include "editor/level_objs.hpp"
#include "editor/level_properties.hpp"
#include "editor/minimap.hpp"
#include "editor/object_properties.hpp"
#include "editor/object_selector.hpp"
#include "editor/panel.hpp"
-#include "editor/panel.hpp"
+//#include "editor/panel.hpp"
#include "editor/viewport.hpp"
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "engine/sound/sound.hpp"
+//#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/path_manager.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/path_manager.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
-#include "util/pathname.hpp"
-#include "util/system.hpp"
+//#include "util/pathname.hpp"
+//#include "util/system.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "editor/file_dialog.hpp"
+//#include "editor/file_dialog.hpp"
#include <boost/bind.hpp>
#include <iostream>
@@ -24,12 +24,12 @@
#include "editor/gui_style.hpp"
#include "editor/inputbox.hpp"
#include "editor/label.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/gui/gui_manager.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/gui/gui_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "util/pathname.hpp"
-#include "util/system.hpp"
+//#include "util/pathname.hpp"
+//#include "util/system.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,11 +16,11 @@
#include "editor/file_list.hpp"
-#include <iostream>
+//#include <iostream>
#include "editor/gui_style.hpp"
-#include "math/math.hpp"
-#include "math/vector2i.hpp"
+//#include "math/math.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/gui_style.hpp
===================================================================
--- trunk/pingus/src/editor/gui_style.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/gui_style.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
#include "engine/display/drawing_context.hpp"
-#include "math/rect.hpp"
+//#include "math/rect.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/inputbox.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "editor/inputbox.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,14 +18,14 @@
#include "editor/level_objs.hpp"
#include <iostream>
-#include <string>
+//#include <string>
-#include "editor/level_impl.hpp"
-#include "engine/display/blitter.hpp"
-#include "engine/display/display.hpp"
+//#include "editor/level_impl.hpp"
+//#include "engine/display/blitter.hpp"
+//#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,9 +17,9 @@
#include "editor/minimap.hpp"
#include "editor/editor_level.hpp"
-#include "editor/editor_screen.hpp"
+//#include "editor/editor_screen.hpp"
#include "editor/gui_style.hpp"
-#include "editor/level_objs.hpp"
+//#include "editor/level_objs.hpp"
#include "editor/viewport.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/editor/object_properties.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -22,12 +22,12 @@
#include "editor/button.hpp"
#include "editor/checkbox.hpp"
#include "editor/combobox.hpp"
-#include "editor/editor_screen.hpp"
+//#include "editor/editor_screen.hpp"
#include "editor/gui_style.hpp"
#include "editor/inputbox.hpp"
#include "editor/label.hpp"
#include "editor/level_objs.hpp"
-#include "pingus/fonts.hpp"
+//#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/groundtype.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,22 +17,23 @@
#include "editor/object_selector.hpp"
#include <boost/bind.hpp>
+#include <boost/signal.hpp>
#include <iostream>
-#include "editor/editor_level.hpp"
-#include "editor/editor_screen.hpp"
+//#include "editor/editor_level.hpp"
+//#include "editor/editor_screen.hpp"
#include "editor/gui_style.hpp"
#include "editor/level_objs.hpp"
-#include "editor/object_selector_list.hpp"
+//#include "editor/object_selector_list.hpp"
#include "editor/object_selector_set.hpp"
-#include "editor/viewport.hpp"
-#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/sprite.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "math/math.hpp"
-#include "math/vector2i.hpp"
+//#include "editor/viewport.hpp"
+//#include "engine/display/display.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/display/sprite.hpp"
+//#include "engine/gui/gui_manager.hpp"
+//#include "math/math.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -14,19 +14,19 @@
// You 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 "editor/object_selector_list.hpp"
#include <iostream>
#include "editor/editor_level.hpp"
-#include "editor/editor_screen.hpp"
+//#include "editor/editor_screen.hpp"
#include "editor/object_selector.hpp"
#include "editor/object_selector_set.hpp"
#include "editor/viewport.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "math/math.hpp"
-#include "pingus/groundtype.hpp"
-#include "pingus/resource.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "math/math.hpp"
+//#include "pingus/groundtype.hpp"
+//#include "pingus/resource.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,13 +18,13 @@
#include "editor/editor_screen.hpp"
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/sprite.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/display/sprite.hpp"
#include "engine/gui/gui_manager.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/editor/panel.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,11 +18,11 @@
#ifndef HEADER_PINGUS_EDITOR_PANEL_HPP
#define HEADER_PINGUS_EDITOR_PANEL_HPP
-#include <string>
+//#include <string>
#include "engine/display/sprite.hpp"
#include "engine/gui/component.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,17 +18,17 @@
#include "editor/viewport.hpp"
#include <iostream>
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "editor/editor_level.hpp"
-#include "editor/editor_screen.hpp"
-#include "editor/level_objs.hpp"
+//#include "editor/editor_screen.hpp"
+//#include "editor/level_objs.hpp"
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/graphic_context_state.hpp"
-#include "engine/gui/gui_manager.hpp"
-#include "math/vector3f.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/display/graphic_context_state.hpp"
+//#include "engine/gui/gui_manager.hpp"
+//#include "math/vector3f.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,8 +19,8 @@
#define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
#include <boost/signal.hpp>
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "engine/display/graphic_context_state.hpp"
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/engine/display/blitter.cpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/blitter.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,16 +16,16 @@
#include "engine/display/blitter.hpp"
-#include <SDL.h>
-#include <assert.h>
-#include <config.h>
-#include <stdio.h>
+//#include <SDL.h>
+//#include <assert.h>
+//#include <config.h>
+//#include <stdio.h>
#include "engine/display/blitter_impl.hpp"
-#include "math/math.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/globals.hpp"
-#include "util/string_util.hpp"
+//#include "math/math.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/globals.hpp"
+//#include "util/string_util.hpp"
SDL_Surface*
Blitter::scale_surface(SDL_Surface* surface, int width, int height)
Modified: trunk/pingus/src/engine/display/blitter.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/blitter.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,8 +19,8 @@
#include <SDL.h>
-#include "math/color.hpp"
-#include "math/rect.hpp"
+//#include "math/color.hpp"
+//#include "math/rect.hpp"
class Surface;
Modified: trunk/pingus/src/engine/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,12 +16,12 @@
#include "engine/display/delta_framebuffer.hpp"
-#include <assert.h>
-#include <iostream>
+//#include <assert.h>
+//#include <iostream>
#include "engine/display/rect_merger.hpp"
#include "engine/display/sdl_framebuffer.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "util/memory_pool.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
-#include <map>
-#include <memory>
+//#include <map>
+//#include <memory>
#include "engine/display/framebuffer.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
class SDLFramebuffer;
class DrawOpBuffer;
Modified: trunk/pingus/src/engine/display/display.cpp
===================================================================
--- trunk/pingus/src/engine/display/display.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/display.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,18 +16,18 @@
#include "engine/display/display.hpp"
-#include <algorithm>
-#include <iostream>
+//#include <algorithm>
+//#include <iostream>
#include <stdexcept>
-#include <stdio.h>
+//#include <stdio.h>
-#include "../config.h"
+//#include "../config.h"
#include "engine/display/sdl_framebuffer.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "math/color.hpp"
-#include "math/math.hpp"
-#include "math/rect.hpp"
-#include "math/vector2i.hpp"
+//#include "math/color.hpp"
+//#include "math/math.hpp"
+//#include "math/rect.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/globals.hpp"
#ifdef HAVE_OPENGL
# include "engine/display/opengl/opengl_framebuffer.hpp"
Modified: trunk/pingus/src/engine/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,16 +16,16 @@
#include "engine/display/drawing_context.hpp"
-#include <algorithm>
-#include <assert.h>
+//#include <algorithm>
+//#include <assert.h>
#include <iostream>
#include "engine/display/display.hpp"
#include "engine/display/font.hpp"
#include "engine/display/framebuffer.hpp"
#include "engine/display/sprite.hpp"
-#include "math/math.hpp"
-#include "math/origin.hpp"
+//#include "math/math.hpp"
+//#include "math/origin.hpp"
struct DrawingRequestsSorter
{
Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,12 +17,12 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
-#include <SDL.h>
+//#include <SDL.h>
#include <vector>
#include "engine/display/drawing_request.hpp"
#include "math/color.hpp"
-#include "math/rect.hpp"
+//#include "math/rect.hpp"
#include "math/vector3f.hpp"
class Framebuffer;
Modified: trunk/pingus/src/engine/display/font.cpp
===================================================================
--- trunk/pingus/src/engine/display/font.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/font.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,16 +16,16 @@
#include "engine/display/font.hpp"
-#include <SDL.h>
-#include <SDL_image.h>
+//#include <SDL.h>
+//#include <SDL_image.h>
#include <iostream>
-#include <map>
-#include <vector>
+//#include <map>
+//#include <vector>
#include "engine/display/display.hpp"
#include "engine/display/font_description.hpp"
#include "engine/display/framebuffer.hpp"
-#include "engine/display/surface.hpp"
+//#include "engine/display/surface.hpp"
#include "util/line_iterator.hpp"
#include "util/utf8.hpp"
Modified: trunk/pingus/src/engine/display/font.hpp
===================================================================
--- trunk/pingus/src/engine/display/font.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/font.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,11 +19,11 @@
#include <SDL.h>
#include <boost/shared_ptr.hpp>
-#include <string>
+//#include <string>
-#include "math/origin.hpp"
+//#include "math/origin.hpp"
#include "math/rect.hpp"
-#include "math/size.hpp"
+//#include "math/size.hpp"
class FontImpl;
class FontDescription;
Modified: trunk/pingus/src/engine/display/font_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/font_description.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/font_description.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
-#include <string>
+//#include <string>
#include <vector>
#include "math/rect.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
#include "util/pathname.hpp"
class FileReader;
Modified: trunk/pingus/src/engine/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
-#include <boost/smart_ptr.hpp>
+//#include <boost/smart_ptr.hpp>
#include "engine/display/surface.hpp"
-#include "math/size.hpp"
+//#include "math/size.hpp"
class FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/engine/display/graphic_context_state.cpp
===================================================================
--- trunk/pingus/src/engine/display/graphic_context_state.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/graphic_context_state.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#include "engine/display/graphic_context_state.hpp"
#include "engine/display/display.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
class GraphicContextStateImpl
{
Modified: trunk/pingus/src/engine/display/graphic_context_state.hpp
===================================================================
--- trunk/pingus/src/engine/display/graphic_context_state.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/graphic_context_state.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -19,12 +19,12 @@
#include <boost/shared_ptr.hpp>
-#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/rect.hpp"
-#include "math/vector2f.hpp"
-#include "math/vector2i.hpp"
-#include "math/vector3f.hpp"
+//#include "math/rect.hpp"
+//#include "math/vector2f.hpp"
+//#include "math/vector2i.hpp"
+//#include "math/vector3f.hpp"
class GraphicContextStateImpl;
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "engine/display/opengl/opengl_framebuffer.hpp"
-#include <iostream>
+//#include <iostream>
#include <sstream>
#include <stdexcept>
#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
-#include "engine/display/surface.hpp"
-#include "math/math.hpp"
+//#include "engine/display/surface.hpp"
+//#include "math/math.hpp"
OpenGLFramebuffer::OpenGLFramebuffer() :
screen(),
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -20,16 +20,16 @@
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX /* Don't defined min() and max() */
-#include <GL/gl.h>
-#include <windows.h>
+//#include <GL/gl.h>
+//#include <windows.h>
#elif defined(MACOSX)
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
+//#include <OpenGL/gl.h>
+//#include <OpenGL/glext.h>
#else
#include <GL/gl.h>
-#include <GL/glext.h>
+//#include <GL/glext.h>
#endif
-#include <SDL.h>
+//#include <SDL.h>
#include "engine/display/framebuffer_surface.hpp"
Modified: trunk/pingus/src/engine/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,11 +18,11 @@
//#include <ext/algorithm>
#include <algorithm>
-#include <assert.h>
+//#include <assert.h>
#include <iostream>
-#include "math/size.hpp"
-#include "math/vector2i.hpp"
+//#include "math/size.hpp"
+//#include "math/vector2i.hpp"
struct Mark {
enum Type { START_MARK = 0, END_MARK = 1 } type;
Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/scene_context.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
-#include <SDL.h>
+//#include <SDL.h>
#include "engine/display/drawing_context.hpp"
Modified: trunk/pingus/src/engine/display/screenshot.cpp
===================================================================
--- trunk/pingus/src/engine/display/screenshot.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/screenshot.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,14 +18,14 @@
#include <assert.h>
#include <config.h>
-#include <fstream>
+//#include <fstream>
#include <iostream>
#include <png.h>
-#include <stdio.h>
-#include <time.h>
+//#include <stdio.h>
+//#include <time.h>
-#include "engine/display/display.hpp"
-#include "engine/display/framebuffer.hpp"
+//#include "engine/display/display.hpp"
+//#include "engine/display/framebuffer.hpp"
#include "pingus/gettext.h"
#include "util/system.hpp"
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,10 +18,10 @@
#include <iostream>
-#include "engine/display/display.hpp"
+//#include "engine/display/display.hpp"
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
-#include "engine/display/surface.hpp"
-#include "math/math.hpp"
+//#include "engine/display/surface.hpp"
+//#include "math/math.hpp"
namespace {
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,13 +17,13 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
-#include <SDL.h>
-#include <vector>
+//#include <SDL.h>
+//#include <vector>
#include "engine/display/framebuffer.hpp"
-#include "math/color.hpp"
-#include "math/rect.hpp"
-#include "math/vector2i.hpp"
+//#include "math/color.hpp"
+//#include "math/rect.hpp"
+//#include "math/vector2i.hpp"
class SDLFramebuffer : public Framebuffer
{
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,7 +16,7 @@
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
-#include <stdexcept>
+//#include <stdexcept>
SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src) :
surface()
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
-#include <SDL.h>
+//#include <SDL.h>
#include "engine/display/framebuffer_surface.hpp"
Modified: trunk/pingus/src/engine/display/sprite.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/sprite.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,20 +16,20 @@
#include "engine/display/sprite.hpp"
-#include <SDL.h>
-#include <SDL_image.h>
-#include <assert.h>
-#include <iostream>
-#include <sstream>
+//#include <SDL.h>
+//#include <SDL_image.h>
+//#include <assert.h>
+//#include <iostream>
+//#include <sstream>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/sprite_description.hpp"
#include "engine/display/sprite_impl.hpp"
-#include "engine/display/surface.hpp"
-#include "math/origin.hpp"
-#include "math/vector2i.hpp"
+//#include "engine/display/surface.hpp"
+//#include "math/origin.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/resource.hpp"
-#include "util/pathname.hpp"
+//#include "util/pathname.hpp"
Sprite::Sprite() :
impl()
Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/sprite.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
#include <boost/shared_ptr.hpp>
-#include <string>
+//#include <string>
#include "math/origin.hpp"
#include "pingus/resource_modifier.hpp"
Modified: trunk/pingus/src/engine/display/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
#include "engine/display/framebuffer_surface.hpp"
-#include "engine/display/surface.hpp"
+//#include "engine/display/surface.hpp"
#include "math/vector2i.hpp"
class SpriteDescription;
Modified: trunk/pingus/src/engine/display/surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/surface.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/display/surface.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,8 +18,8 @@
#include <SDL_image.h>
#include <boost/format.hpp>
-#include <iostream>
-#include <sstream>
+//#include <iostream>
+//#include <sstream>
#include "engine/display/blitter.hpp"
#include "math/rect.hpp"
Modified: trunk/pingus/src/engine/gui/component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/component.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/gui/component.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "engine/gui/component.hpp"
+//#include "engine/gui/component.hpp"
-#include <assert.h>
+//#include <assert.h>
#include "engine/gui/group_component.hpp"
Modified: trunk/pingus/src/engine/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/group_component.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/gui/group_component.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,8 +16,8 @@
#include "engine/gui/group_component.hpp"
-#include <assert.h>
-#include <iostream>
+//#include <assert.h>
+//#include <iostream>
namespace GUI {
Modified: trunk/pingus/src/engine/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,10 +16,10 @@
#include "engine/gui/gui_manager.hpp"
-#include <algorithm>
+//#include <algorithm>
#include "engine/display/display.hpp"
-#include "engine/input/event.hpp"
+//#include "engine/input/event.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/engine/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
#define HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
-#include <vector>
+//#include <vector>
#include "engine/gui/group_component.hpp"
#include "engine/input/event.hpp"
Modified: trunk/pingus/src/engine/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,8 +17,8 @@
#include "engine/gui/surface_button.hpp"
#include "engine/display/drawing_context.hpp"
-#include "math/vector3f.hpp"
-#include "pingus/resource.hpp"
+//#include "math/vector3f.hpp"
+//#include "pingus/resource.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/input/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input/controller.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/controller.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "engine/input/controller.hpp"
+//#include "engine/input/controller.hpp"
#include "engine/input/control.hpp"
#include "engine/input/controller_description.hpp"
Modified: trunk/pingus/src/engine/input/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/controller.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
-#include <assert.h>
+//#include <assert.h>
#include "engine/input/event.hpp"
Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/controller_description.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_DESCRIPTION_HPP
#include <map>
-#include <string>
+//#include <string>
#include "engine/input/event.hpp"
Modified: trunk/pingus/src/engine/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/core_driver.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/core_driver.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,8 +18,8 @@
#include "engine/display/display.hpp"
#include "engine/input/manager.hpp"
-#include "math/math.hpp"
-#include "pingus/globals.hpp"
+//#include "math/math.hpp"
+//#include "pingus/globals.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,15 +16,15 @@
#include "engine/input/evdev/evdev_device.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <errno.h>
#include <fcntl.h>
-#include <iostream>
-#include <linux/input.h>
+//#include <iostream>
+//#include <linux/input.h>
#include <stdexcept>
#include <stdio.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
+//#include <sys/ioctl.h>
+//#include <unistd.h>
#define BITS_PER_LONG (sizeof(long) * 8)
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -19,7 +19,7 @@
#include <linux/input.h>
#include <string.h>
-#include <vector>
+//#include <vector>
#include "engine/input/control.hpp"
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/engine/input/manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/input/manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,10 +18,10 @@
#include <stdexcept>
-#include "config.h"
+//#include "config.h"
#include "engine/input/core_driver.hpp"
#include "engine/input/sdl_driver.hpp"
-#include "pingus/path_manager.hpp"
+//#include "pingus/path_manager.hpp"
#include "util/pathname.hpp"
#include "util/string_util.hpp"
#ifdef HAVE_CWIID
Modified: trunk/pingus/src/engine/input/manager.hpp
===================================================================
--- trunk/pingus/src/engine/input/manager.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/input/manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,9 +17,9 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
-#include <vector>
+//#include <vector>
-#include "engine/input/controller.hpp"
+//#include "engine/input/controller.hpp"
#include "engine/input/controller_description.hpp"
#include "engine/input/driver.hpp"
Modified: trunk/pingus/src/engine/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,9 +18,9 @@
#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "math/size.hpp"
+//#include "math/size.hpp"
#include "pingus/global_event.hpp"
-#include "util/file_reader.hpp"
+//#include "util/file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -18,14 +18,14 @@
#include <errno.h>
#include <fcntl.h>
-#include <iostream>
+//#include <iostream>
#include <stdexcept>
#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
+//#include <sys/ioctl.h>
+//#include <unistd.h>
#include "engine/display/display.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
-#include <vector>
+//#include <vector>
#include "engine/input/driver.hpp"
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.cpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,9 +16,9 @@
#include "engine/input/wiimote/wiimote.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <iostream>
-#include <pthread.h>
+//#include <pthread.h>
#include "math/math.hpp"
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
#define HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
-#include <pthread.h>
+//#include <pthread.h>
#include <string>
#include <vector>
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,11 +16,11 @@
#include "engine/input/xinput/xinput_device.hpp"
-#include <SDL_syswm.h>
+//#include <SDL_syswm.h>
#include "engine/input/xinput/xinput_driver.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/globals.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DEVICE_HPP
#define HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DEVICE_HPP
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+//#include <X11/Xlib.h>
+//#include <X11/Xutil.h>
#include <X11/extensions/XInput.h>
#include <string>
#include <vector>
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,7 +16,7 @@
#include "engine/input/xinput/xinput_driver.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/input/xinput/xinput_device.hpp"
#include "pingus/debug.hpp"
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DRIVER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_XINPUT_XINPUT_DRIVER_HPP
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+//#include <X11/Xlib.h>
+//#include <X11/Xutil.h>
#include <X11/extensions/XInput.h>
-#include <vector>
+//#include <vector>
#include <SDL_syswm.h>
Modified: trunk/pingus/src/engine/screen/screen.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/screen/screen.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -14,6 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "engine/screen/screen.hpp"
+//#include "engine/screen/screen.hpp"
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/engine/screen/screen.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_SCREEN_SCREEN_HPP
#define HEADER_PINGUS_ENGINE_SCREEN_SCREEN_HPP
-#include <SDL.h>
-
#include "math/size.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,21 +16,21 @@
#include "engine/screen/screen_manager.hpp"
-#include <SDL.h>
-#include <fstream>
-#include <iostream>
+//#include <SDL.h>
+//#include <fstream>
+//#include <iostream>
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
#include "engine/display/framebuffer.hpp"
-#include "engine/input/controller.hpp"
+//#include "engine/input/controller.hpp"
#include "engine/input/manager.hpp"
#include "engine/screen/screen.hpp"
-#include "math/size.hpp"
+//#include "math/size.hpp"
#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
-#include "pingus/path_manager.hpp"
-#include "util/pathname.hpp"
+//#include "pingus/path_manager.hpp"
+//#include "util/pathname.hpp"
template<class C>
void write(std::ostream& out, C value)
Modified: trunk/pingus/src/engine/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
-#include "engine/sound/sound.hpp"
+//#include "engine/sound/sound.hpp"
#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#include "engine/sound/sound_real.hpp"
#include <SDL.h>
-#include <SDL_mixer.h>
+//#include <SDL_mixer.h>
#include <stdexcept>
#include "engine/sound/sound_res_mgr.hpp"
Modified: trunk/pingus/src/engine/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,10 +18,10 @@
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_REAL_HPP
#include <SDL_mixer.h>
-#include <config.h>
-#include <vector>
+//#include <config.h>
+//#include <vector>
-#include "engine/sound/sound.hpp"
+//#include "engine/sound/sound.hpp"
#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/lisp/getters.cpp
===================================================================
--- trunk/pingus/src/lisp/getters.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/lisp/getters.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -1,4 +1,4 @@
-#include <config.h>
+//#include <config.h>
#include "getters.hpp"
Modified: trunk/pingus/src/lisp/lexer.cpp
===================================================================
--- trunk/pingus/src/lisp/lexer.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/lisp/lexer.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -15,9 +15,9 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <config.h>
+//#include <config.h>
-#include <iostream>
+//#include <iostream>
#include <sstream>
#include <stdexcept>
#include <string.h>
Modified: trunk/pingus/src/lisp/lisp.cpp
===================================================================
--- trunk/pingus/src/lisp/lisp.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/lisp/lisp.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,8 +16,8 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <assert.h>
-#include <config.h>
+//#include <assert.h>
+//#include <config.h>
#include <string.h>
#include "lisp.hpp"
Modified: trunk/pingus/src/lisp/lisp.hpp
===================================================================
--- trunk/pingus/src/lisp/lisp.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/lisp/lisp.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,12 +18,12 @@
#ifndef __LISP_HPP__
#define __LISP_HPP__
-#include <assert.h>
+//#include <assert.h>
#include <boost/shared_ptr.hpp>
#include <iostream>
-#include <sstream>
+//#include <sstream>
#include <stdexcept>
-#include <string>
+//#include <string>
#include <vector>
namespace lisp
Modified: trunk/pingus/src/lisp/parser.cpp
===================================================================
--- trunk/pingus/src/lisp/parser.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/lisp/parser.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,15 +16,15 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <config.h>
+//#include <config.h>
-#include <cassert>
-#include <exception>
+//#include <cassert>
+//#include <exception>
#include <fstream>
-#include <iostream>
+//#include <iostream>
#include <sstream>
#include <string.h>
-#include <string>
+//#include <string>
//#include "physfs/physfs_stream.hpp"
#include "lisp.hpp"
Modified: trunk/pingus/src/math/rect.hpp
===================================================================
--- trunk/pingus/src/math/rect.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/rect.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -32,7 +32,7 @@
#include <math.h>
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "math/origin.hpp"
#include "math/vector2f.hpp"
Modified: trunk/pingus/src/math/vector2f.cpp
===================================================================
--- trunk/pingus/src/math/vector2f.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector2f.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#include "math/vector2f.hpp"
-#include <config.h>
+//#include <config.h>
#include <iostream>
std::ostream& operator<<(std::ostream& s, const Vector2f& v)
Modified: trunk/pingus/src/math/vector2f.hpp
===================================================================
--- trunk/pingus/src/math/vector2f.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector2f.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#ifndef SUPERTUX_VECTOR_H
#define SUPERTUX_VECTOR_H
-#include <iosfwd>
+//#include <iosfwd>
#include "math/math.hpp"
#include "vector2i.hpp"
Modified: trunk/pingus/src/math/vector2i.cpp
===================================================================
--- trunk/pingus/src/math/vector2i.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector2i.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -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 "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
#include <iostream>
#include "vector2f.hpp"
-#include "vector2i.hpp"
+//#include "vector2i.hpp"
Vector2i::Vector2i(const Vector2f& v)
: x(int(v.x)), y(int(v.y))
Modified: trunk/pingus/src/math/vector2i.hpp
===================================================================
--- trunk/pingus/src/math/vector2i.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector2i.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_MATH_VECTOR2I_HPP
#define HEADER_PINGUS_MATH_VECTOR2I_HPP
-#include <iosfwd>
+//#include <iosfwd>
class Vector2f;
Modified: trunk/pingus/src/math/vector3f.cpp
===================================================================
--- trunk/pingus/src/math/vector3f.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector3f.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#include <iostream>
-#include "math/math.hpp"
+//#include "math/math.hpp"
Vector3f
Vector3f::rotate (float angle, const Vector3f& pos) const
Modified: trunk/pingus/src/math/vector3f.hpp
===================================================================
--- trunk/pingus/src/math/vector3f.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/math/vector3f.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_MATH_VECTOR3F_HPP
#define HEADER_PINGUS_MATH_VECTOR3F_HPP
-#include <iosfwd>
+//#include <iosfwd>
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "math/vector2f.hpp"
-#include "math/vector2i.hpp"
+//#include "math/vector2i.hpp"
class Vector3f
{
Modified: trunk/pingus/src/pingus/action_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/action_holder.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "pingus/action_holder.hpp"
-#include <iostream>
+//#include <iostream>
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/actions/angel.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/angel.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/angel.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/actions/basher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/basher.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,10 +18,10 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-#include "pingus/collision_map.hpp"
+//#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/basher.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/basher.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,6 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_BASHER_HPP
+#include "pingus/collision_mask.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/boarder.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,13 +18,13 @@
#include "engine/display/scene_context.hpp"
#include "pingus/colliders/pingu_collider.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/globals.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/movers/linear_mover.hpp"
#include "pingus/particles/pingu_particle_holder.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/pingu_enums.hpp"
+//#include "pingus/pingu_enums.hpp"
#include "pingus/world.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bomber.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/bomber.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,6 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_BOMBER_HPP
+#include "pingus/collision_mask.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,12 +16,12 @@
#include "pingus/actions/bridger.hpp"
-#include <cassert>
+//#include <cassert>
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/gettext.h"
-#include "pingus/ground_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/bridger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/bridger.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_ACTIONS_BRIDGER_HPP
#include "math/vector3f.hpp"
+#include "pingus/collision_mask.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/digger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/digger.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,11 +16,11 @@
#include "pingus/actions/digger.hpp"
-#include <cstdio>
+//#include <cstdio>
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/digger.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/digger.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,6 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_DIGGER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_DIGGER_HPP
+#include "pingus/collision_mask.hpp"
#include "engine/display/sprite.hpp"
#include "pingus/pingu_action.hpp"
Modified: trunk/pingus/src/pingus/actions/drown.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/drown.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/drown.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/faller.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,10 +17,10 @@
#include "pingus/actions/faller.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/colliders/pingu_collider.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/movers/linear_mover.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/jumper.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/laser_kill.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/miner.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/miner.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,7 +19,7 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/miner.hpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/miner.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,6 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_ACTIONS_MINER_HPP
#define HEADER_PINGUS_PINGUS_ACTIONS_MINER_HPP
+#include "pingus/collision_mask.hpp"
#include "pingus/pingu_action.hpp"
#include "pingus/state_sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,8 +20,8 @@
//#include "pingus/particles/particle_holder.hpp"
//#include "pingus/particles/explosive_particle.hpp"
#include "pingus/pingu.hpp"
-#include "pingus/world.hpp"
-#include "pingus/worldobj.hpp"
+//#include "pingus/world.hpp"
+//#include "pingus/worldobj.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,8 +17,8 @@
#include "pingus/actions/smashed.hpp"
#include "engine/display/scene_context.hpp"
-#include "engine/display/sprite.hpp"
-#include "math/vector3f.hpp"
+//#include "engine/display/sprite.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/splashed.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/superman.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/actions/superman.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/superman.hpp"
#include "engine/display/scene_context.hpp"
-#include "engine/display/sprite.hpp"
+//#include "engine/display/sprite.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#include "pingus/actions/waiter.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,14 +17,14 @@
#include "pingus/capture_rectangle.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_action.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
-#include "pingus/server.hpp"
+//#include "pingus/server.hpp"
#include "util/string_util.hpp"
CaptureRectangle::CaptureRectangle(GameSession* session_) :
Modified: trunk/pingus/src/pingus/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#include "math/vector3f.hpp"
#include "pingus/groundtype.hpp"
-#include "pingus/pingu_action.hpp"
+//#include "pingus/pingu_action.hpp"
namespace Colliders {
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,15 +16,15 @@
#include "pingus/collision_map.hpp"
-#include <SDL.h>
-#include <iostream>
+//#include <SDL.h>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
#include "engine/display/sprite.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/collision_mask.hpp"
-#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
+//#include "pingus/gettext.h"
+//#include "pingus/globals.hpp"
CollisionMap::CollisionMap(int w, int h)
: serial(0),
Modified: trunk/pingus/src/pingus/collision_mask.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/collision_mask.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,10 +16,11 @@
#include "pingus/collision_mask.hpp"
-#include <iostream>
+//#include <iostream>
#include "pingus/resource.hpp"
-#include "util/system.hpp"
+//#include "util/system.hpp"
+//#include "pingus/res_descriptor.hpp"
CollisionMask::CollisionMask() :
surface(),
Modified: trunk/pingus/src/pingus/collision_mask.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/collision_mask.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -20,8 +20,9 @@
#include <string>
#include "engine/display/surface.hpp"
-#include "pingus/res_descriptor.hpp"
+class ResDescriptor;
+
class CollisionMask
{
public:
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,13 +17,13 @@
#include "pingus/components/action_button.hpp"
#include "engine/display/drawing_context.hpp"
-#include "math/vector3f.hpp"
-#include "pingus/fonts.hpp"
-#include "pingus/globals.hpp"
+//#include "math/vector3f.hpp"
+//#include "pingus/fonts.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "util/string_util.hpp"
+//#include "util/string_util.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,13 +16,13 @@
#include "pingus/components/button_panel.hpp"
-#include <algorithm>
-#include <iostream>
+//#include <algorithm>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,11 +17,12 @@
#include "pingus/components/menu_button.hpp"
#include "engine/sound/sound.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/fonts.hpp"
-#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+#include "engine/display/drawing_context.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/fonts.hpp"
+//#include "pingus/gettext.h"
+//#include "pingus/globals.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/pingus_menu.hpp"
Modified: trunk/pingus/src/pingus/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,13 +16,14 @@
#include "pingus/components/pingus_counter.hpp"
-#include <stdio.h>
+//#include <stdio.h>
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,12 +16,12 @@
#include "pingus/components/playfield.hpp"
-#include <iostream>
-#include <stdio.h>
+//#include <iostream>
+//#include <stdio.h>
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "engine/display/scene_context.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
Modified: trunk/pingus/src/pingus/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/components/slider_box.hpp"
#include "engine/display/drawing_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,16 +16,16 @@
#include "pingus/components/smallmap.hpp"
-#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "math/math.hpp"
-#include "math/vector3f.hpp"
+//#include "engine/display/display.hpp"
+//#include "engine/display/drawing_context.hpp"
+//#include "math/math.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/components/playfield.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/screens/game_session.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/smallmap_image.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,14 +16,15 @@
#include "pingus/components/time_display.hpp"
-#include <assert.h>
-#include <stdio.h>
+//#include <assert.h>
+//#include <stdio.h>
#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/game_time.hpp"
#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/config_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/config_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,15 +16,15 @@
#include "pingus/config_manager.hpp"
-#include <SDL.h>
+//#include <SDL.h>
#include <fstream>
-#include <iostream>
+//#include <iostream>
#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "lisp/lisp.hpp"
+//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-#include "pingus/fps_counter.hpp"
+//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "util/sexpr_file_reader.hpp"
Modified: trunk/pingus/src/pingus/config_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/config_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
#include <boost/signal.hpp>
-#include <string>
+//#include <string>
#include "math/size.hpp"
#include "tinygettext/language.hpp"
Modified: trunk/pingus/src/pingus/fonts.cpp
===================================================================
--- trunk/pingus/src/pingus/fonts.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/fonts.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/fonts.hpp"
+//#include "pingus/fonts.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/fonts.hpp
===================================================================
--- trunk/pingus/src/pingus/fonts.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/fonts.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_FONTS_HPP
#define HEADER_PINGUS_PINGUS_FONTS_HPP
-#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
#include "engine/display/font.hpp"
namespace Fonts {
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,7 +19,7 @@
#include <sstream>
#include "engine/display/display.hpp"
-#include "gettext.h"
+//#include "gettext.h"
#include "pingus/fonts.hpp"
FPSCounter fps_counter;
Modified: trunk/pingus/src/pingus/gettext.cpp
===================================================================
--- trunk/pingus/src/pingus/gettext.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/gettext.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/gettext.h"
+//#include "pingus/gettext.h"
-#include "gettext.h"
-#include "tinygettext/dictionary.hpp"
+//#include "gettext.h"
+//#include "tinygettext/dictionary.hpp"
#include "tinygettext/dictionary_manager.hpp"
tinygettext::DictionaryManager dictionary_manager;
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,18 +16,18 @@
#include "pingus/global_event.hpp"
-#include <algorithm>
-#include <config.h>
+//#include <algorithm>
+//#include <config.h>
#include <iostream>
-#include <stdio.h>
+//#include <stdio.h>
#include "engine/display/screenshot.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/config_manager.hpp"
-#include "pingus/fps_counter.hpp"
+//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "pingus/screens/addon_menu.hpp"
-#include "pingus/screens/level_menu.hpp"
+//#include "pingus/screens/level_menu.hpp"
#include "pingus/screens/option_menu.hpp"
GlobalEvent global_event;
Modified: trunk/pingus/src/pingus/goal_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/goal_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,9 +16,9 @@
#include "pingus/goal_manager.hpp"
-#include <iostream>
+//#include <iostream>
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,17 +16,17 @@
#include "pingus/ground_map.hpp"
-#include <SDL.h>
-#include <iostream>
+//#include <SDL.h>
+//#include <iostream>
#include <stdexcept>
-#include <stdio.h>
+//#include <stdio.h>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/scene_context.hpp"
-#include "gettext.h"
-#include "math/math.hpp"
+//#include "gettext.h"
+//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "pingus/pingus_level.hpp"
+//#include "pingus/pingus_level.hpp"
class MapTile
{
Modified: trunk/pingus/src/pingus/ground_map.hpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/ground_map.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
#define HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
-#include <vector>
+//#include <vector>
#include "engine/display/surface.hpp"
#include "pingus/globals.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/pingus/layer_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/layer_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "pingus/layer_manager.hpp"
-#include <iostream>
+//#include <iostream>
LayerManager::LayerManager () :
layers()
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -20,7 +20,7 @@
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
#include "engine/display/sprite.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/globals.hpp"
class LayerManager
Modified: trunk/pingus/src/pingus/levelset.cpp
===================================================================
--- trunk/pingus/src/pingus/levelset.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/levelset.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -21,9 +21,9 @@
#include "math/math.hpp"
#include "pingus/plf_res_mgr.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
-#include "util/file_reader.hpp"
+//#include "util/file_reader.hpp"
Levelset::Levelset(const Pathname& pathname) :
title(),
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/particles/explosive_particle.hpp"
+//#include "pingus/particles/explosive_particle.hpp"
#if 0
-#include "pingus/collision_map.hpp"
-#include "pingus/particles/particle_holder.hpp"
-#include "pingus/pingu_map.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/world.hpp"
+//#include "pingus/collision_map.hpp"
+//#include "pingus/particles/particle_holder.hpp"
+//#include "pingus/pingu_map.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/world.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
: Particle (x, y, x_a, y_a),
Modified: trunk/pingus/src/pingus/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/explosive_particle.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
#define HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-#include "engine/display/sprite.hpp"
-#include "pingus/particles/particle.hpp"
+//#include "engine/display/sprite.hpp"
+//#include "pingus/particles/particle.hpp"
class ExplosiveParticle
: public Particle
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,9 +17,9 @@
#include "pingus/particles/pingu_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,10 +17,10 @@
#include "pingus/particles/rain_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,8 +17,8 @@
#include "pingus/particles/smoke_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/globals.hpp"
+//#include "pingus/resource.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "pingus/particles/snow_particle_holder.hpp"
-#include <assert.h>
+//#include <assert.h>
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/ground_map.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -21,6 +21,7 @@
#include "engine/display/sprite.hpp"
#include "math/vector3f.hpp"
+#include "pingus/collision_mask.hpp"
#include "pingus/worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,20 +16,20 @@
#include "pingus/pingu.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <sstream>
-#include <stdio.h>
+//#include <stdio.h>
#include "engine/display/scene_context.hpp"
-#include "engine/sound/sound.hpp"
-#include "gettext.h"
-#include "math/math.hpp"
+//#include "engine/sound/sound.hpp"
+//#include "gettext.h"
+//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-#include "pingus/pingu_action.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/pingu_action.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,10 +16,10 @@
#include "pingus/pingu_action.hpp"
-#include <assert.h>
+//#include <assert.h>
-#include "math/math.hpp"
-#include "math/vector3f.hpp"
+//#include "math/math.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
#include "engine/display/surface.hpp"
-#include "pingus/collision_mask.hpp"
+//#include "pingus/collision_mask.hpp"
#include "pingus/pingu_enums.hpp"
class ActionHolder;
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,8 +16,8 @@
#include "pingus/pingu_holder.hpp"
-#include <assert.h>
-#include <iostream>
+//#include <assert.h>
+//#include <iostream>
#include "pingus/pingu.hpp"
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,12 +16,12 @@
#include "pingus/pingus_demo.hpp"
-#include <fstream>
+//#include <fstream>
#include <stdexcept>
-#include "pingus/pingu_enums.hpp"
-#include "pingus/server_event.hpp"
-#include "util/file_reader.hpp"
+//#include "pingus/pingu_enums.hpp"
+//#include "pingus/server_event.hpp"
+//#include "util/file_reader.hpp"
#include "util/pathname.hpp"
PingusDemo::PingusDemo(const Pathname& pathname) :
Modified: trunk/pingus/src/pingus/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "pingus/server_event.hpp"
Modified: trunk/pingus/src/pingus/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_level.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,13 +16,13 @@
#include "pingus/pingus_level.hpp"
-#include <iostream>
+//#include <iostream>
#include <stdexcept>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingus_level_impl.hpp"
-#include "util/file_reader.hpp"
+//#include "util/file_reader.hpp"
#include "util/pathname.hpp"
PingusLevel::PingusLevel()
Modified: trunk/pingus/src/pingus/pingus_level.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_level.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,10 +17,10 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
-#include <boost/shared_ptr.hpp>
+//#include <boost/shared_ptr.hpp>
#include <map>
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,21 +17,21 @@
#include "pingus/pingus_main.hpp"
#include <config.h>
-#include <iostream>
-#include <locale.h>
+//#include <iostream>
+//#include <locale.h>
#include <signal.h>
-#include <stdio.h>
-#include <sys/stat.h>
+//#include <stdio.h>
+//#include <sys/stat.h>
#include "editor/editor_level.hpp"
#include "engine/display/display.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/parser.hpp"
+//#include "lisp/lisp.hpp"
+//#include "lisp/parser.hpp"
#include "pingus/config_manager.hpp"
-#include "pingus/fonts.hpp"
+//#include "pingus/fonts.hpp"
#include "pingus/screens/demo_session.hpp"
#include "pingus/screens/pingus_menu.hpp"
-#include "util/sexpr_file_reader.hpp"
+//#include "util/sexpr_file_reader.hpp"
#include "util/string_util.hpp"
#if defined(__APPLE__)
@@ -49,7 +49,7 @@
}
#endif
-#include <SDL.h>
+//#include <SDL.h>
#ifdef ENABLE_BINRELOC
#include "../external/binreloc-2.0/binreloc.h"
@@ -61,13 +61,13 @@
#include "util/command_line.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "pingus/fps_counter.hpp"
+//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "pingus/screens/story_screen.hpp"
-#include "util/system.hpp"
+//#include "pingus/screens/game_session.hpp"
+//#include "pingus/screens/story_screen.hpp"
+//#include "util/system.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/debug.hpp"
@@ -77,11 +77,11 @@
#include "pingus/screens/font_test_screen.hpp"
#include "pingus/screens/start_screen.hpp"
#include "pingus/stat_manager.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
+//#include "pingus/worldmap/worldmap_screen.hpp"
+//#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldobj_factory.hpp"
-#include "editor/editor_screen.hpp"
+//#include "editor/editor_screen.hpp"
#if _MSC_VER >= 1400
// Disable stupid deprecation warnings
Modified: trunk/pingus/src/pingus/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/pingus_main.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
-#include <SDL.h>
-#include <string>
+//#include <SDL.h>
+//#include <string>
#include "pingus/pingus_options.hpp"
-#include "util/pathname.hpp"
+//#include "util/pathname.hpp"
void segfault_handler(int);
Modified: trunk/pingus/src/pingus/res_descriptor.cpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "pingus/res_descriptor.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <iostream>
/*
Modified: trunk/pingus/src/pingus/resource.cpp
===================================================================
--- trunk/pingus/src/pingus/resource.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/resource.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,16 +16,16 @@
#include "pingus/resource.hpp"
-#include <assert.h>
+//#include <assert.h>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/font_description.hpp"
#include "engine/display/sprite_description.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "util/system.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "util/system.hpp"
ResourceManager Resource::resmgr;
Modified: trunk/pingus/src/pingus/resource.hpp
===================================================================
--- trunk/pingus/src/pingus/resource.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/resource.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,13 +17,13 @@
#ifndef HEADER_PINGUS_PINGUS_RESOURCE_HPP
#define HEADER_PINGUS_PINGUS_RESOURCE_HPP
-#include <map>
-#include <vector>
+//#include <map>
+//#include <vector>
#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
#include "engine/display/surface.hpp"
-#include "pingus/collision_mask.hpp"
+//#include "pingus/collision_mask.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_manager.hpp"
Modified: trunk/pingus/src/pingus/resource_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/resource_manager.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,10 +16,10 @@
#include "pingus/resource_manager.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/sprite_description.hpp"
-#include "lisp/lisp.hpp"
+//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/savegame.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "pingus/savegame.hpp"
-#include <iostream>
+//#include <iostream>
#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-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,10 +16,10 @@
#include "pingus/savegame_manager.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <fstream>
-#include "lisp/lisp.hpp"
+//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
@@ -42,9 +42,9 @@
instance_ = 0;
}
-SavegameManager::SavegameManager(const std::string& arg_filename)
- : filename(System::get_userdir() + arg_filename),
- savegames()
+SavegameManager::SavegameManager(const std::string& arg_filename) :
+ filename(System::get_userdir() + arg_filename),
+ savegames()
{
boost::shared_ptr<lisp::Lisp> sexpr;
Modified: trunk/pingus/src/pingus/savegame_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_SAVEGAME_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_SAVEGAME_MANAGER_HPP
-#include <map>
+//#include <map>
#include "pingus/savegame.hpp"
Modified: trunk/pingus/src/pingus/screens/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,8 +20,8 @@
#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/resource.hpp"
-#include "pingus/screens/option_menu.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/screens/option_menu.hpp"
AddOnMenu::AddOnMenu() :
background(),
Modified: trunk/pingus/src/pingus/screens/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/screens/credits.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#include <iostream>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
@@ -26,8 +26,8 @@
#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/stat_manager.hpp"
class CreditsOkButton
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,20 +20,20 @@
#include <boost/function.hpp>
#include <iostream>
-#include "engine/display/display.hpp"
-#include "engine/display/scene_context.hpp"
+//#include "engine/display/display.hpp"
+//#include "engine/display/scene_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/playfield.hpp"
#include "pingus/components/smallmap.hpp"
#include "pingus/pingus_demo.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "util/pathname.hpp"
+//#include "util/pathname.hpp"
static bool false_func() { return false; }
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,16 +16,16 @@
#include "pingus/screens/game_session.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/server.hpp"
-#include "engine/input/event.hpp"
+//#include "engine/input/event.hpp"
#include "engine/sound/sound.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/components/button_panel.hpp"
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/playfield.hpp"
@@ -34,7 +34,7 @@
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/result_screen.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/screens/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -21,18 +21,18 @@
#include <boost/function.hpp>
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
-#include "engine/gui/rect_component.hpp"
+//#include "engine/gui/rect_component.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "pingus/screens/option_menu.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/screens/game_session.hpp"
+//#include "pingus/screens/option_menu.hpp"
#include "pingus/screens/start_screen.hpp"
#include "util/system.hpp"
Modified: trunk/pingus/src/pingus/screens/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,25 +18,25 @@
#include <boost/bind.hpp>
#include <iostream>
-#include <set>
-#include <sstream>
+//#include <set>
+//#include <sstream>
#include "engine/display/display.hpp"
-#include "engine/display/drawing_context.hpp"
+//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/components/check_box.hpp"
#include "pingus/components/choice_box.hpp"
-#include "pingus/components/label.hpp"
+//#include "pingus/components/label.hpp"
#include "pingus/components/slider_box.hpp"
#include "pingus/config_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/globals.hpp"
+//#include "pingus/resource.hpp"
#include "tinygettext/dictionary_manager.hpp"
-#include "tinygettext/language.hpp"
+//#include "tinygettext/language.hpp"
#define C(x) connections.push_back(x)
Modified: trunk/pingus/src/pingus/screens/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -19,25 +19,25 @@
#include <config.h>
#include "editor/editor_screen.hpp"
-#include "engine/gui/gui_manager.hpp"
+//#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/components/menu_button.hpp"
-#include "pingus/debug.hpp"
+//#include "pingus/debug.hpp"
#include "pingus/gettext.h"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/layer_manager.hpp"
-#include "pingus/path_manager.hpp"
+//#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
#include "pingus/resource.hpp"
#include "pingus/screens/credits.hpp"
#include "pingus/screens/level_menu.hpp"
#include "pingus/screens/start_screen.hpp"
-#include "pingus/screens/story_screen.hpp"
-#include "pingus/stat_manager.hpp"
-#include "pingus/worldmap/worldmap.hpp"
+//#include "pingus/screens/story_screen.hpp"
+//#include "pingus/stat_manager.hpp"
+//#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-#include "util/pathname.hpp"
+//#include "util/pathname.hpp"
PingusMenu::PingusMenu() :
is_init(),
Modified: trunk/pingus/src/pingus/screens/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,9 +16,9 @@
#include "pingus/screens/result_screen.hpp"
-#include <iostream>
+//#include <iostream>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
@@ -27,11 +27,11 @@
#include "pingus/fonts.hpp"
#include "pingus/game_time.hpp"
#include "pingus/gettext.h"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "util/string_util.hpp"
-#include "util/system.hpp"
+//#include "util/system.hpp"
class ResultScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/screens/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,11 +16,11 @@
#include "pingus/screens/start_screen.hpp"
-#include <iostream>
+//#include <iostream>
-#include "engine/display/blitter.hpp"
+//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
-#include "engine/gui/component.hpp"
+//#include "engine/gui/component.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
@@ -29,12 +29,12 @@
#include "pingus/game_time.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/pingus_level.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/pingus_level.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/string_format.hpp"
#include "util/string_util.hpp"
-#include "util/system.hpp"
+//#include "util/system.hpp"
class StartScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/screens/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,26 +16,26 @@
#include "pingus/screens/story_screen.hpp"
-#include <algorithm>
-#include <vector>
+//#include <algorithm>
+//#include <vector>
#include "engine/display/display.hpp"
-#include "engine/gui/component.hpp"
+//#include "engine/gui/component.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/screens/credits.hpp"
-#include "pingus/stat_manager.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/screens/credits.hpp"
+//#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/worldmap.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/worldmap_story.hpp"
+//#include "pingus/worldmap/worldmap_screen.hpp"
+//#include "pingus/worldmap/worldmap_story.hpp"
#include "util/utf8.hpp"
class StoryScreenComponent : public GUI::Component
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,10 +18,10 @@
#include <fstream>
#include <iostream>
-#include <time.h>
+//#include <time.h>
-#include "pingus/game_time.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/game_time.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/goal_manager.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -14,18 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/server_event.hpp"
+//#include "pingus/server_event.hpp"
-#include <assert.h>
+//#include <assert.h>
#include <boost/format.hpp>
#include <iostream>
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-#include "util/string_util.hpp"
+//#include "util/string_util.hpp"
ServerEvent::ServerEvent() :
type(PINGU_ACTION_EVENT),
Modified: trunk/pingus/src/pingus/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "pingus/smallmap_image.hpp"
-#include <iostream>
+//#include <iostream>
#include "pingus/collision_map.hpp"
#include "pingus/server.hpp"
Modified: trunk/pingus/src/pingus/stat_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/stat_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,10 +16,10 @@
#include "pingus/stat_manager.hpp"
-#include <algorithm>
+//#include <algorithm>
#include <fstream>
-#include "lisp/lisp.hpp"
+//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
Modified: trunk/pingus/src/pingus/state_sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/state_sprite.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#include <stdexcept>
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
StateSprite::StateSprite() :
sprites()
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,12 +16,12 @@
#include "pingus/world.hpp"
-#include <algorithm>
-#include <assert.h>
-#include <iostream>
-#include <typeinfo>
+//#include <algorithm>
+//#include <assert.h>
+//#include <iostream>
+//#include <typeinfo>
-#include "engine/display/display.hpp"
+//#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/collision_map.hpp"
Modified: trunk/pingus/src/pingus/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,10 +16,10 @@
#include "pingus/worldmap/dot.hpp"
-#include <assert.h>
-#include <iostream>
+//#include <assert.h>
+//#include <iostream>
-#include "util/file_reader.hpp"
+//#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
-#include <string>
+//#include <string>
#include "math/vector3f.hpp"
#include "pingus/worldmap/drawable.hpp"
Modified: trunk/pingus/src/pingus/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "pingus/worldmap/drawable.hpp"
+//#include "pingus/worldmap/drawable.hpp"
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/drawable.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_DRAWABLE_HPP
+#include <string>
+
#include "util/file_reader.hpp"
class DrawingContext;
Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable_factory.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -19,7 +19,6 @@
#include <iostream>
#include "pingus/worldmap/sprite_drawable.hpp"
-#include "pingus/worldmap/sprite_drawable.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,23 +16,23 @@
#include "pingus/worldmap/level_dot.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
-#include "engine/display/font.hpp"
+//#include "engine/display/font.hpp"
#include "engine/input/control.hpp"
-#include "engine/input/controller.hpp"
+//#include "engine/input/controller.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/path_manager.hpp"
+//#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/start_screen.hpp"
-#include "util/file_reader.hpp"
-#include "util/system.hpp"
+//#include "util/file_reader.hpp"
+//#include "util/system.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,9 +16,9 @@
#include "pingus/worldmap/path.hpp"
-#include <algorithm>
-#include <assert.h>
-#include <iostream>
+//#include <algorithm>
+//#include <assert.h>
+//#include <iostream>
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,10 +16,10 @@
#include "pingus/worldmap/path_drawable.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
-#include "math/color.hpp"
+//#include "math/color.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -14,19 +14,19 @@
// You 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/worldmap/path_graph.hpp"
+//#include "pingus/worldmap/path_graph.hpp"
-#include <iostream>
+//#include <iostream>
#include <stdexcept>
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/worldmap/dot.hpp"
#include "pingus/worldmap/dot_factory.hpp"
#include "pingus/worldmap/path_drawable.hpp"
-#include "pingus/worldmap/pathfinder.hpp"
+//#include "pingus/worldmap/pathfinder.hpp"
#include "pingus/worldmap/worldmap.hpp"
-#include "util/file_reader.hpp"
+//#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,13 +16,13 @@
#include "pingus/worldmap/pingus.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/drawing_context.hpp"
-#include "math/math.hpp"
-#include "math/vector3f.hpp"
+//#include "math/math.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/direction.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,10 +17,10 @@
#include "pingus/worldmap/pingus_worldmap.hpp"
#include <stdexcept>
-#include <string>
+//#include <string>
-#include "pingus/worldmap/drawable_factory.hpp"
-#include "util/file_reader.hpp"
+//#include "pingus/worldmap/drawable_factory.hpp"
+//#include "util/file_reader.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,11 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
-#include <boost/smart_ptr.hpp>
+//#include <boost/smart_ptr.hpp>
#include "pingus/worldmap/path_graph.hpp"
-#include "pingus/worldmap/worldmap_story.hpp"
-#include "util/pathname.hpp"
+//#include "pingus/worldmap/worldmap_story.hpp"
+//#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "pingus/worldmap/sprite_drawable.hpp"
-#include <iostream>
+//#include <iostream>
-#include "engine/display/drawing_context.hpp"
-#include "pingus/resource.hpp"
+//#include "engine/display/drawing_context.hpp"
+#include "pingus/res_descriptor.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
+//#include "pingus/worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,37 +16,38 @@
#include "pingus/worldmap/worldmap.hpp"
-#include <assert.h>
-#include <iostream>
+//#include <assert.h>
+//#include <iostream>
-#include "engine/display/display.hpp"
+//#include "engine/display/display.hpp"
#include "engine/sound/sound.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/parser.hpp"
-#include "math/math.hpp"
-#include "pingus/debug.hpp"
-#include "pingus/fonts.hpp"
+//#include "lisp/lisp.hpp"
+//#include "lisp/parser.hpp"
+//#include "math/math.hpp"
+//#include "pingus/debug.hpp"
+//#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
+//#include "pingus/globals.hpp"
#include "pingus/globals.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/path_manager.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/savegame_manager.hpp"
+//#include "pingus/path_manager.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/savegame_manager.hpp"
#include "pingus/stat_manager.hpp"
-#include "pingus/stat_manager.hpp"
-#include "pingus/worldmap/dot.hpp"
-#include "pingus/worldmap/drawable.hpp"
+//#include "pingus/stat_manager.hpp"
+//#include "pingus/worldmap/dot.hpp"
+//#include "pingus/worldmap/drawable.hpp"
#include "pingus/worldmap/drawable_factory.hpp"
#include "pingus/worldmap/level_dot.hpp"
-#include "pingus/worldmap/path_graph.hpp"
+//#include "pingus/worldmap/path_graph.hpp"
#include "pingus/worldmap/pingus.hpp"
-#include "pingus/worldmap/worldmap_screen.hpp"
-#include "pingus/worldmap/worldmap_story.hpp"
-#include "util/sexpr_file_reader.hpp"
-#include "util/system.hpp"
+//#include "pingus/worldmap/worldmap_screen.hpp"
+//#include "pingus/worldmap/worldmap_story.hpp"
+#include "util/pathname.hpp"
+//#include "util/sexpr_file_reader.hpp"
+//#include "util/system.hpp"
-#include "engine/screen/screen_manager.hpp"
-#include "pingus/screens/story_screen.hpp"
+//#include "engine/screen/screen_manager.hpp"
+//#include "pingus/screens/story_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/worldmap/worldmap_component.hpp"
#include "engine/display/display.hpp"
-#include "engine/display/scene_context.hpp"
+//#include "engine/display/scene_context.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,25 +16,25 @@
#include "pingus/worldmap/worldmap_screen.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/display.hpp"
-#include "engine/display/scene_context.hpp"
+//#include "engine/display/scene_context.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/path_manager.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/path_manager.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/screens/story_screen.hpp"
-#include "pingus/stat_manager.hpp"
+//#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_component.hpp"
-#include "pingus/worldmap/worldmap_story.hpp"
+//#include "pingus/worldmap/worldmap_story.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,14 +16,14 @@
#include "pingus/worldmap/worldmap_story.hpp"
-#include <algorithm>
+//#include <algorithm>
#include <stdexcept>
-#include <vector>
+//#include <vector>
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/screens/story_screen.hpp"
+//#include "pingus/res_descriptor.hpp"
+//#include "pingus/screens/story_screen.hpp"
#include "pingus/string_format.hpp"
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,9 +17,9 @@
#include "pingus/worldobj.hpp"
#include <iostream>
-#include <typeinfo>
+//#include <typeinfo>
-#include "engine/display/scene_context.hpp"
+//#include "engine/display/scene_context.hpp"
World* WorldObj::world;
Modified: trunk/pingus/src/pingus/worldobj.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldobj.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
#include "engine/display/sprite.hpp"
-#include "pingus/collision_mask.hpp"
+//#include "pingus/collision_mask.hpp"
#include "util/file_reader.hpp"
class FileReader;
Modified: trunk/pingus/src/pingus/worldobj_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,11 +16,11 @@
#include "pingus/worldobj_factory.hpp"
-#include <iostream>
+//#include <iostream>
#include <stdexcept>
#include "pingus/worldobjs/conveyor_belt.hpp"
-#include "pingus/worldobjs/entrance.hpp"
+//#include "pingus/worldobjs/entrance.hpp"
#include "pingus/worldobjs/exit.hpp"
#include "pingus/worldobjs/fake_exit.hpp"
#include "pingus/worldobjs/groundpiece.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,10 +17,10 @@
#include "pingus/worldobjs/conveyor_belt.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/collision_map.hpp"
+//#include "pingus/collision_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,10 +20,10 @@
#include "engine/display/scene_context.hpp"
#include "pingus/components/smallmap.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,15 +16,15 @@
#include "pingus/worldobjs/exit.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/components/smallmap.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,7 +20,7 @@
#include "pingus/components/smallmap.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,11 +16,11 @@
#include "pingus/worldobjs/groundpiece.hpp"
-#include <iostream>
+//#include <iostream>
-#include "pingus/collision_map.hpp"
-#include "pingus/ground_map.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/collision_map.hpp"
+//#include "pingus/ground_map.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -19,7 +19,7 @@
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,10 +17,10 @@
#include "pingus/worldobjs/hammer.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/vector3f.hpp"
+//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,11 +16,11 @@
#include "pingus/worldobjs/hotspot.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/scene_context.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/globals.hpp"
+#include "pingus/res_descriptor.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,11 +17,11 @@
#include "pingus/worldobjs/ice_block.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/collision_map.hpp"
-#include "pingus/ground_map.hpp"
+//#include "pingus/collision_map.hpp"
+//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJS_ICE_BLOCK_HPP
#include "math/vector3f.hpp"
+#include "pingus/collision_mask.hpp"
#include "pingus/worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/pingus/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -16,11 +16,11 @@
#include "pingus/worldobjs/liquid.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,12 +20,12 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-#include "math/math.hpp"
-#include "pingus/collision_map.hpp"
+//#include "math/math.hpp"
+//#include "pingus/collision_map.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,9 +16,9 @@
#include "pingus/worldobjs/snow_generator.hpp"
-#include <iostream>
+//#include <iostream>
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/particles/snow_particle_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/solid_color_background.hpp"
-#include "engine/display/display.hpp"
+//#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -19,7 +19,7 @@
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/starfield_background.hpp"
-#include <iostream>
+//#include <iostream>
#include "pingus/worldobjs/starfield_background_stars.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "pingus/worldobjs/surface_background.hpp"
-#include <iostream>
+//#include <iostream>
-#include "engine/display/blitter.hpp"
-#include "engine/display/display.hpp"
+//#include "engine/display/blitter.hpp"
+//#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-#include "pingus/globals.hpp"
+//#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SURFACE_BACKGROUND_HPP
#include "math/vector3f.hpp"
+#include "math/color.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -20,7 +20,7 @@
#include "pingus/collision_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJS_SWITCH_DOOR_HPP
#include "math/vector3f.hpp"
+#include "pingus/collision_mask.hpp"
#include "pingus/worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/pingus/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -21,7 +21,7 @@
#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobjs/teleporter_target.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-06
20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-07
04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "pingus/worldobjs/teleporter_target.hpp"
-#include <iostream>
+//#include <iostream>
#include "engine/display/scene_context.hpp"
-#include "pingus/pingu.hpp"
-#include "pingus/pingu_holder.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/world.hpp"
+//#include "pingus/pingu.hpp"
+//#include "pingus/pingu_holder.hpp"
+//#include "pingus/resource.hpp"
+//#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-07 04:16:52 UTC (rev 4068)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/thunderstorm_background.hpp"
#include "engine/display/scene_context.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -17,9 +17,9 @@
#include "pingus/worldobjs/woodthing.hpp"
#include "engine/display/scene_context.hpp"
-#include "math/math.hpp"
+//#include "math/math.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
-#include "pingus/resource.hpp"
+//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/util/command_line_generic.hpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.hpp 2009-11-06 20:37:52 UTC
(rev 4067)
+++ trunk/pingus/src/util/command_line_generic.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
@@ -34,8 +34,8 @@
#pragma once
#endif
-#include <string>
-#include <vector>
+//#include <string>
+//#include <vector>
#include "util/command_line.hpp"
Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/debug_stream.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
#include <iostream>
-#include <string>
+//#include <string>
#include <vector>
class NilStream;
Modified: trunk/pingus/src/util/file_reader.cpp
===================================================================
--- trunk/pingus/src/util/file_reader.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/file_reader.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,7 +16,7 @@
#include "util/file_reader.hpp"
-#include "lisp/lisp.hpp"
+//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "util/file_reader_impl.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/util/file_reader.hpp
===================================================================
--- trunk/pingus/src/util/file_reader.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/file_reader.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_UTIL_FILE_READER_HPP
#include <boost/shared_ptr.hpp>
-#include <string>
+//#include <string>
#include <vector>
class Size;
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/util/pathname.hpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_UTIL_PATHNAME_HPP
#include <SDL.h>
-#include <iosfwd>
+//#include <iosfwd>
#include <string>
/** Simple class to allow a distinction of paths that refer to the
Modified: trunk/pingus/src/util/sexpr_file_reader.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,15 +16,15 @@
#include "util/sexpr_file_reader.hpp"
-#include <assert.h>
+//#include <assert.h>
#include "math/color.hpp"
#include "math/rect.hpp"
-#include "math/size.hpp"
-#include "math/vector2i.hpp"
+//#include "math/size.hpp"
+//#include "math/vector2i.hpp"
#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
-#include "pingus/resource_modifier.hpp"
+//#include "pingus/resource_modifier.hpp"
#include "util/file_reader_impl.hpp"
class SExprFileReaderImpl: public FileReaderImpl
Modified: trunk/pingus/src/util/sexpr_file_writer.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -16,9 +16,9 @@
#include "util/sexpr_file_writer.hpp"
-#include <iostream>
+//#include <iostream>
#include <map>
-#include <string>
+//#include <string>
SExprFileWriter::SExprFileWriter(std::ostream& out_)
: out(&out_), level(0)
Modified: trunk/pingus/src/util/sexpr_file_writer.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-06 20:37:52 UTC (rev
4067)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-07 04:16:52 UTC (rev
4068)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
#define HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
-#include <iosfwd>
+//#include <iosfwd>
#include <ostream>
#include "math/color.hpp"
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/util/system.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -16,13 +16,13 @@
#include "util/system.hpp"
-#include <config.h>
+//#include <config.h>
#include <iostream>
-#include <locale.h>
+//#include <locale.h>
#include <sstream>
#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
+//#include <stdio.h>
+//#include <stdlib.h>
#ifndef WIN32
# include <dirent.h>
@@ -44,10 +44,10 @@
#define F_OK 0
#endif
-#include "pingus/gettext.h"
+//#include "pingus/gettext.h"
#include "pingus/globals.hpp"
#include "util/pathname.hpp"
-#include "util/string_util.hpp"
+//#include "util/string_util.hpp"
std::string System::userdir;
std::string System::default_email;
Modified: trunk/pingus/src/util/utf8.cpp
===================================================================
--- trunk/pingus/src/util/utf8.cpp 2009-11-06 20:37:52 UTC (rev 4067)
+++ trunk/pingus/src/util/utf8.cpp 2009-11-07 04:16:52 UTC (rev 4068)
@@ -20,8 +20,6 @@
#include <iostream>
#include <stdexcept>
-#include "utf8.hpp"
-
/** Replacement character for invalid UTF-8 sequences */
static const uint32_t INVALID_UTF8_SEQUENCE = 0xFFFD;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4068 - in trunk/pingus: . src/editor src/engine/display src/engine/display/opengl src/engine/gui src/engine/input src/engine/input/evdev src/engine/input/usbmouse src/engine/input/wiimote src/engine/input/xinput src/engine/screen src/engine/sound src/lisp src/math src/pingus src/pingus/actions src/pingus/colliders src/pingus/components src/pingus/particles src/pingus/screens src/pingus/worldmap src/pingus/worldobjs src/util,
grumbel at BerliOS <=