[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4069 - in trunk/pingus/src: editor engine/display engine/d
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4069 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/usbmouse engine/input/wiimote engine/input/xinput engine/input_old engine/screen engine/sound lisp math pingus pingus/actions pingus/colliders pingus/components pingus/screens pingus/worldmap pingus/worldobjs util |
|
Date: |
Sat, 7 Nov 2009 05:24:06 +0100 |
Author: grumbel
Date: 2009-11-07 05:23:49 +0100 (Sat, 07 Nov 2009)
New Revision: 4069
Modified:
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.cpp
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.cpp
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/event.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/input/manager.hpp
trunk/pingus/src/engine/input/sdl_driver.cpp
trunk/pingus/src/engine/input/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/input_old/event.hpp
trunk/pingus/src/engine/screen/screen.cpp
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/actions/angel.cpp
trunk/pingus/src/pingus/actions/basher.cpp
trunk/pingus/src/pingus/actions/boarder.cpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/bridger.cpp
trunk/pingus/src/pingus/actions/digger.cpp
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/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/colliders/pingu_collider.cpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/config_manager.hpp
trunk/pingus/src/pingus/direction.cpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/gettext.cpp
trunk/pingus/src/pingus/globals.cpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingus_main.cpp
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/screens/game_session.hpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/worldmap/drawable.cpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobj_factory.cpp
trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
trunk/pingus/src/pingus/worldobjs/entrance.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/groundpiece.cpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/hotspot.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.cpp
trunk/pingus/src/pingus/worldobjs/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/switch_door.cpp
trunk/pingus/src/pingus/worldobjs/teleporter.cpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/pingus/worldobjs/woodthing.cpp
trunk/pingus/src/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/memory_pool.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
Log:
Brute force removal of unneeded includes
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,13 +17,11 @@
#include "editor/action_properties.hpp"
#include <boost/bind.hpp>
-//#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 "util/string_util.hpp"
namespace Editor {
@@ -133,7 +131,6 @@
level->set_action(Actions::action_to_string(id), StringUtil::to<int>(value));
}
-
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,16 +16,9 @@
#include "editor/combobox.hpp"
-//#include <iostream>
-//#include <string>
-//#include <vector>
-
#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/combobox.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,11 +19,8 @@
#define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
#include <boost/signal.hpp>
-//#include <string>
-//#include <vector>
#include "engine/display/sprite.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,15 +19,10 @@
#include <fstream>
#include <iostream>
-//#include <string>
#include "config.h"
-//#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/sexpr_file_writer.hpp"
namespace Editor {
@@ -92,7 +87,6 @@
set_impl_defaults();
}
-
// Default Destructor
EditorLevel::~EditorLevel()
{
Modified: trunk/pingus/src/editor/editor_level.hpp
===================================================================
--- trunk/pingus/src/editor/editor_level.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/editor_level.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,8 +18,6 @@
#ifndef HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
#define HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
-//#include <vector>
-
#include "editor/level_impl.hpp"
class Pathname;
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -15,35 +15,23 @@
// 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 <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/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/viewport.hpp"
#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
-//#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#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"
namespace Editor {
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -14,8 +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 "editor/file_dialog.hpp"
-
#include <boost/bind.hpp>
#include <iostream>
@@ -24,12 +22,8 @@
#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 "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,11 +16,7 @@
#include "editor/file_list.hpp"
-//#include <iostream>
-
#include "editor/gui_style.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/gui_style.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
#include "engine/display/drawing_context.hpp"
-//#include "math/rect.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/inputbox.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,8 +16,6 @@
#include "editor/inputbox.hpp"
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,14 +18,8 @@
#include "editor/level_objs.hpp"
#include <iostream>
-//#include <string>
-//#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"
namespace Editor {
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,9 +17,7 @@
#include "editor/minimap.hpp"
#include "editor/editor_level.hpp"
-//#include "editor/editor_screen.hpp"
#include "editor/gui_style.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/editor/object_properties.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -22,12 +22,10 @@
#include "editor/button.hpp"
#include "editor/checkbox.hpp"
#include "editor/combobox.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/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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -20,20 +20,9 @@
#include <boost/signal.hpp>
#include <iostream>
-//#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_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 "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/resource.hpp"
@@ -286,8 +275,6 @@
ObjectSelectorButton & operator=(const ObjectSelectorButton&);
};
-
-
ObjectSelector::ObjectSelector(EditorScreen* editor_, const Rect& rect_) :
GroupComponent(rect_, false),
editor(editor_),
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -14,19 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//#include "editor/object_selector_list.hpp"
-
#include <iostream>
#include "editor/editor_level.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"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,13 +18,9 @@
#include "editor/editor_screen.hpp"
#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
-//#include "engine/display/sprite.hpp"
#include "engine/gui/gui_manager.hpp"
-//#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/resource.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/editor/panel.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,11 +18,8 @@
#ifndef HEADER_PINGUS_EDITOR_PANEL_HPP
#define HEADER_PINGUS_EDITOR_PANEL_HPP
-//#include <string>
-
#include "engine/display/sprite.hpp"
#include "engine/gui/component.hpp"
-//#include "math/vector2i.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,17 +18,9 @@
#include "editor/viewport.hpp"
#include <iostream>
-//#include <string>
-//#include <vector>
#include "editor/editor_level.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"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,8 +19,6 @@
#define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
#include <boost/signal.hpp>
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/blitter.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,16 +16,7 @@
#include "engine/display/blitter.hpp"
-//#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"
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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/blitter.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,9 +19,6 @@
#include <SDL.h>
-//#include "math/color.hpp"
-//#include "math/rect.hpp"
-
class Surface;
/** A bunch of blitting and creation functions to operate on Surface. */
Modified: trunk/pingus/src/engine/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,12 +16,8 @@
#include "engine/display/delta_framebuffer.hpp"
-//#include <assert.h>
-//#include <iostream>
-
#include "engine/display/rect_merger.hpp"
#include "engine/display/sdl_framebuffer.hpp"
-//#include "math/math.hpp"
#include "util/memory_pool.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
@@ -116,7 +112,6 @@
}
};
-
struct DrawRectDrawOp : public DrawOp
{
Rect rect;
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,11 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DELTA_FRAMEBUFFER_HPP
-//#include <map>
-//#include <memory>
-
#include "engine/display/framebuffer.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/display.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,18 +16,10 @@
#include "engine/display/display.hpp"
-//#include <algorithm>
-//#include <iostream>
#include <stdexcept>
-//#include <stdio.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 "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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,16 +16,12 @@
#include "engine/display/drawing_context.hpp"
-//#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"
struct DrawingRequestsSorter
{
Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,12 +17,10 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DRAWING_CONTEXT_HPP
-//#include <SDL.h>
#include <vector>
#include "engine/display/drawing_request.hpp"
#include "math/color.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/font.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,16 +16,11 @@
#include "engine/display/font.hpp"
-//#include <SDL.h>
-//#include <SDL_image.h>
#include <iostream>
-//#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 "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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/font.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,11 +19,8 @@
#include <SDL.h>
#include <boost/shared_ptr.hpp>
-//#include <string>
-//#include "math/origin.hpp"
#include "math/rect.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/font_description.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,11 +17,9 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_DESCRIPTION_HPP
-//#include <string>
#include <vector>
#include "math/rect.hpp"
-//#include "math/vector2i.hpp"
#include "util/pathname.hpp"
class FileReader;
Modified: trunk/pingus/src/engine/display/framebuffer_surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/framebuffer_surface.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,7 +16,6 @@
#include "engine/display/framebuffer_surface.hpp"
-
FramebufferSurface::FramebufferSurface() :
impl()
{
Modified: trunk/pingus/src/engine/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,10 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FRAMEBUFFER_SURFACE_HPP
-//#include <boost/smart_ptr.hpp>
-
#include "engine/display/surface.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/graphic_context_state.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,7 +17,6 @@
#include "engine/display/graphic_context_state.hpp"
#include "engine/display/display.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/graphic_context_state.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -19,12 +19,7 @@
#include <boost/shared_ptr.hpp>
-//#include "engine/display/drawing_context.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/rect.hpp"
-//#include "math/vector2f.hpp"
-//#include "math/vector2i.hpp"
-//#include "math/vector3f.hpp"
class GraphicContextStateImpl;
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,13 +16,10 @@
#include "engine/display/opengl/opengl_framebuffer.hpp"
-//#include <iostream>
#include <sstream>
#include <stdexcept>
#include "engine/display/opengl/opengl_framebuffer_surface_impl.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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -20,16 +20,10 @@
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX /* Don't defined min() and max() */
-//#include <GL/gl.h>
-//#include <windows.h>
#elif defined(MACOSX)
-//#include <OpenGL/gl.h>
-//#include <OpenGL/glext.h>
#else
#include <GL/gl.h>
-//#include <GL/glext.h>
#endif
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,14 +16,9 @@
#include "engine/display/rect_merger.hpp"
-//#include <ext/algorithm>
#include <algorithm>
-//#include <assert.h>
#include <iostream>
-//#include "math/size.hpp"
-//#include "math/vector2i.hpp"
-
struct Mark {
enum Type { START_MARK = 0, END_MARK = 1 } type;
int pos;
Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/scene_context.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_CONTEXT_HPP
-//#include <SDL.h>
-
#include "engine/display/drawing_context.hpp"
class SceneContextImpl;
Modified: trunk/pingus/src/engine/display/screenshot.cpp
===================================================================
--- trunk/pingus/src/engine/display/screenshot.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/screenshot.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,14 +18,9 @@
#include <assert.h>
#include <config.h>
-//#include <fstream>
#include <iostream>
#include <png.h>
-//#include <stdio.h>
-//#include <time.h>
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,10 +18,7 @@
#include <iostream>
-//#include "engine/display/display.hpp"
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
-//#include "engine/display/surface.hpp"
-//#include "math/math.hpp"
namespace {
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,13 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_HPP
-//#include <SDL.h>
-//#include <vector>
-
#include "engine/display/framebuffer.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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,8 +16,6 @@
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
-//#include <SDL.h>
-
#include "engine/display/framebuffer_surface.hpp"
class SDLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
Modified: trunk/pingus/src/engine/display/sprite.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/sprite.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,20 +16,9 @@
#include "engine/display/sprite.hpp"
-//#include <SDL.h>
-//#include <SDL_image.h>
-//#include <assert.h>
-//#include <iostream>
-//#include <sstream>
-
-//#include "engine/display/blitter.hpp"
#include "engine/display/sprite_description.hpp"
#include "engine/display/sprite_impl.hpp"
-//#include "engine/display/surface.hpp"
-//#include "math/origin.hpp"
-//#include "math/vector2i.hpp"
#include "pingus/resource.hpp"
-//#include "util/pathname.hpp"
Sprite::Sprite() :
impl()
Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/sprite.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
#include <boost/shared_ptr.hpp>
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_IMPL_HPP
#include "engine/display/framebuffer_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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/display/surface.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,8 +18,6 @@
#include <SDL_image.h>
#include <boost/format.hpp>
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/gui/component.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -14,10 +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/gui/component.hpp"
-
-//#include <assert.h>
-
#include "engine/gui/group_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/group_component.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/gui/group_component.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,9 +16,6 @@
#include "engine/gui/group_component.hpp"
-//#include <assert.h>
-//#include <iostream>
-
namespace GUI {
GroupComponent::GroupComponent(const Rect& rect_, bool clip_) :
Modified: trunk/pingus/src/engine/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,10 +16,7 @@
#include "engine/gui/gui_manager.hpp"
-//#include <algorithm>
-
#include "engine/display/display.hpp"
-//#include "engine/input/event.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
@@ -43,7 +40,6 @@
{
}
-
void
GUIManager::update(float delta)
{
Modified: trunk/pingus/src/engine/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
#define HEADER_PINGUS_ENGINE_GUI_GUI_MANAGER_HPP
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,8 +17,6 @@
#include "engine/gui/surface_button.hpp"
#include "engine/display/drawing_context.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/controller.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -14,8 +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/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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/controller.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_HPP
-//#include <assert.h>
-
#include "engine/input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller_description.cpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/controller_description.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -20,7 +20,6 @@
namespace Input {
-
ControllerDescription::ControllerDescription() :
str_to_event(),
id_to_event()
@@ -116,7 +115,6 @@
return i->second;
}
-
static std::vector<int> map2vector(const std::map<int, InputEventDefinition>&
map,
EventType type)
{
@@ -160,7 +158,6 @@
return map2vector(id_to_event, KEYBOARD_EVENT_TYPE);
}
-
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.hpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/controller_description.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_ENGINE_INPUT_CONTROLLER_DESCRIPTION_HPP
#include <map>
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/core_driver.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,8 +18,6 @@
#include "engine/display/display.hpp"
#include "engine/input/manager.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,15 +16,10 @@
#include "engine/input/evdev/evdev_device.hpp"
-//#include <assert.h>
#include <errno.h>
#include <fcntl.h>
-//#include <iostream>
-//#include <linux/input.h>
#include <stdexcept>
#include <stdio.h>
-//#include <sys/ioctl.h>
-//#include <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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -19,7 +19,6 @@
#include <linux/input.h>
#include <string.h>
-//#include <vector>
#include "engine/input/control.hpp"
Modified: trunk/pingus/src/engine/input/event.hpp
===================================================================
--- trunk/pingus/src/engine/input/event.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/input/event.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -63,7 +63,6 @@
ACTION_AXIS
};
-
enum ButtonState { BUTTON_RELEASED, BUTTON_PRESSED };
struct ButtonEvent
@@ -72,7 +71,6 @@
ButtonState state;
};
-
struct PointerEvent
{
EventName name;
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/engine/input/manager.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/input/manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,10 +18,8 @@
#include <stdexcept>
-//#include "config.h"
#include "engine/input/core_driver.hpp"
#include "engine/input/sdl_driver.hpp"
-//#include "pingus/path_manager.hpp"
#include "util/pathname.hpp"
#include "util/string_util.hpp"
#ifdef HAVE_CWIID
Modified: trunk/pingus/src/engine/input/manager.hpp
===================================================================
--- trunk/pingus/src/engine/input/manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/input/manager.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,9 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_MANAGER_HPP
-//#include <vector>
-
-//#include "engine/input/controller.hpp"
#include "engine/input/controller_description.hpp"
#include "engine/input/driver.hpp"
Modified: trunk/pingus/src/engine/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,9 +18,7 @@
#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
-//#include "math/size.hpp"
#include "pingus/global_event.hpp"
-//#include "util/file_reader.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -18,14 +18,10 @@
#include <errno.h>
#include <fcntl.h>
-//#include <iostream>
#include <stdexcept>
#include <string.h>
-//#include <sys/ioctl.h>
-//#include <unistd.h>
#include "engine/display/display.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
#define HEADER_PINGUS_ENGINE_INPUT_USBMOUSE_USBMOUSE_DRIVER_HPP
-//#include <vector>
-
#include "engine/input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.cpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,9 +16,7 @@
#include "engine/input/wiimote/wiimote.hpp"
-//#include <assert.h>
#include <iostream>
-//#include <pthread.h>
#include "math/math.hpp"
@@ -326,7 +324,6 @@
events.push_back(event);
}
-
void
Wiimote::on_status(const cwiid_status_mesg& msg)
{
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
#define HEADER_PINGUS_ENGINE_INPUT_WIIMOTE_WIIMOTE_HPP
-//#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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,11 +16,7 @@
#include "engine/input/xinput/xinput_device.hpp"
-//#include <SDL_syswm.h>
-
#include "engine/input/xinput/xinput_driver.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,8 +17,6 @@
#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/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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,8 +16,6 @@
#include "engine/input/xinput/xinput_driver.hpp"
-//#include <iostream>
-
#include "engine/input/xinput/xinput_device.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -17,10 +17,7 @@
#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/extensions/XInput.h>
-//#include <vector>
#include <SDL_syswm.h>
Modified: trunk/pingus/src/engine/input_old/event.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/event.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/input_old/event.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -30,7 +30,6 @@
action_3, action_4, action_5, action_6, action_7, action_8,
action_9, action_10,
action_up, action_down, max_button };
-
enum State { pressed, released };
struct ButtonEvent
Modified: trunk/pingus/src/engine/screen/screen.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/engine/screen/screen.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -14,6 +14,4 @@
// 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"
-
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,21 +16,13 @@
#include "engine/screen/screen_manager.hpp"
-//#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/manager.hpp"
#include "engine/screen/screen.hpp"
-//#include "math/size.hpp"
#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/path_manager.hpp"
-//#include "util/pathname.hpp"
template<class C>
void write(std::ostream& out, C value)
Modified: trunk/pingus/src/engine/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_DUMMY_HPP
-//#include "engine/sound/sound.hpp"
#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#include "engine/sound/sound_real.hpp"
#include <SDL.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -18,10 +18,7 @@
#define HEADER_PINGUS_ENGINE_SOUND_SOUND_REAL_HPP
#include <SDL_mixer.h>
-//#include <config.h>
-//#include <vector>
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/lisp/getters.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -1,4 +1,3 @@
-//#include <config.h>
#include "getters.hpp"
Modified: trunk/pingus/src/lisp/lexer.cpp
===================================================================
--- trunk/pingus/src/lisp/lexer.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/lisp/lexer.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -15,9 +15,7 @@
// 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 <iostream>
#include <sstream>
#include <stdexcept>
#include <string.h>
Modified: trunk/pingus/src/lisp/lisp.cpp
===================================================================
--- trunk/pingus/src/lisp/lisp.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/lisp/lisp.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,8 +16,6 @@
// 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 <string.h>
#include "lisp.hpp"
Modified: trunk/pingus/src/lisp/lisp.hpp
===================================================================
--- trunk/pingus/src/lisp/lisp.hpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/lisp/lisp.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,12 +18,9 @@
#ifndef __LISP_HPP__
#define __LISP_HPP__
-//#include <assert.h>
#include <boost/shared_ptr.hpp>
#include <iostream>
-//#include <sstream>
#include <stdexcept>
-//#include <string>
#include <vector>
namespace lisp
Modified: trunk/pingus/src/lisp/parser.cpp
===================================================================
--- trunk/pingus/src/lisp/parser.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/lisp/parser.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,17 +16,11 @@
// 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 <cassert>
-//#include <exception>
#include <fstream>
-//#include <iostream>
#include <sstream>
#include <string.h>
-//#include <string>
-//#include "physfs/physfs_stream.hpp"
#include "lisp.hpp"
#include "parser.hpp"
Modified: trunk/pingus/src/math/rect.hpp
===================================================================
--- trunk/pingus/src/math/rect.hpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/rect.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -32,7 +32,6 @@
#include <math.h>
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector2f.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,7 +17,6 @@
#include "math/vector2f.hpp"
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector2f.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,8 +18,6 @@
#ifndef SUPERTUX_VECTOR_H
#define SUPERTUX_VECTOR_H
-//#include <iosfwd>
-
#include "math/math.hpp"
#include "vector2i.hpp"
Modified: trunk/pingus/src/math/vector2i.cpp
===================================================================
--- trunk/pingus/src/math/vector2i.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector2i.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -14,12 +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 "math/vector2i.hpp"
-
#include <iostream>
#include "vector2f.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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector2i.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_MATH_VECTOR2I_HPP
#define HEADER_PINGUS_MATH_VECTOR2I_HPP
-//#include <iosfwd>
-
class Vector2f;
class Vector2i
Modified: trunk/pingus/src/math/vector3f.cpp
===================================================================
--- trunk/pingus/src/math/vector3f.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector3f.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,8 +18,6 @@
#include <iostream>
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/math/vector3f.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,11 +17,7 @@
#ifndef HEADER_PINGUS_MATH_VECTOR3F_HPP
#define HEADER_PINGUS_MATH_VECTOR3F_HPP
-//#include <iosfwd>
-
-//#include "math/math.hpp"
#include "math/vector2f.hpp"
-//#include "math/vector2i.hpp"
class Vector3f
{
Modified: trunk/pingus/src/pingus/actions/angel.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/angel.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/angel.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/basher.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,10 +18,8 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-//#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/boarder.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,13 +18,9 @@
#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/movers/linear_mover.hpp"
#include "pingus/particles/pingu_particle_holder.hpp"
#include "pingus/pingu.hpp"
-//#include "pingus/pingu_enums.hpp"
#include "pingus/world.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,12 +16,9 @@
#include "pingus/actions/bridger.hpp"
-//#include <cassert>
-
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/gettext.h"
-//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/digger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/digger.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,11 +16,8 @@
#include "pingus/actions/digger.hpp"
-//#include <cstdio>
-
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/drown.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/drown.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/drown.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,10 +17,7 @@
#include "pingus/actions/faller.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/math.hpp"
#include "pingus/colliders/pingu_collider.hpp"
-//#include "pingus/debug.hpp"
-//#include "pingus/globals.hpp"
#include "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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/jumper.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/laser_kill.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/miner.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,7 +19,6 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
-//#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,11 +17,7 @@
#include "pingus/actions/rocket_launcher.hpp"
#include "engine/display/scene_context.hpp"
-//#include "pingus/particles/particle_holder.hpp"
-//#include "pingus/particles/explosive_particle.hpp"
#include "pingus/pingu.hpp"
-//#include "pingus/world.hpp"
-//#include "pingus/worldobj.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,8 +17,6 @@
#include "pingus/actions/smashed.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/splashed.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/actions/superman.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/superman.hpp"
#include "engine/display/scene_context.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#include "pingus/actions/waiter.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/colliders/pingu_collider.cpp
===================================================================
--- trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/colliders/pingu_collider.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -18,7 +18,6 @@
#include "math/vector3f.hpp"
#include "pingus/groundtype.hpp"
-//#include "pingus/pingu_action.hpp"
namespace Colliders {
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -25,7 +25,6 @@
//#include "pingus/resource.hpp"
#include "pingus/screens/pingus_menu.hpp"
-
MenuButton::MenuButton(PingusMenu* menu_,
const Vector2i& pos_,
const std::string& text_, const std::string& desc_) :
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -30,7 +30,6 @@
#include "pingus/world.hpp"
#include "util/string_util.hpp"
-
TimeDisplay::TimeDisplay (GameSession* c) :
server(c->get_server()),
font(),
Modified: trunk/pingus/src/pingus/config_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/config_manager.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
#include <boost/signal.hpp>
-//#include <string>
#include "math/size.hpp"
#include "tinygettext/language.hpp"
Modified: trunk/pingus/src/pingus/direction.cpp
===================================================================
--- trunk/pingus/src/pingus/direction.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/direction.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,7 +16,6 @@
#include "pingus/direction.hpp"
-
Direction::Direction() : direction(NONE)
{
}
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,7 +19,6 @@
#include <sstream>
#include "engine/display/display.hpp"
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/gettext.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -14,10 +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 "pingus/gettext.h"
-
-//#include "gettext.h"
-//#include "tinygettext/dictionary.hpp"
#include "tinygettext/dictionary_manager.hpp"
tinygettext::DictionaryManager dictionary_manager;
Modified: trunk/pingus/src/pingus/globals.cpp
===================================================================
--- trunk/pingus/src/pingus/globals.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/globals.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,7 +16,6 @@
#include "pingus/globals.hpp"
-
int game_speed = 20;
float desired_fps = 40;
bool print_fps = false;
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -20,7 +20,6 @@
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
#include "engine/display/sprite.hpp"
-//#include "math/math.hpp"
#include "pingus/globals.hpp"
class LayerManager
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,10 +16,6 @@
#include "pingus/pingu_action.hpp"
-//#include <assert.h>
-
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
#include "engine/display/surface.hpp"
-//#include "pingus/collision_mask.hpp"
#include "pingus/pingu_enums.hpp"
class ActionHolder;
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,21 +17,13 @@
#include "pingus/pingus_main.hpp"
#include <config.h>
-//#include <iostream>
-//#include <locale.h>
#include <signal.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 "pingus/config_manager.hpp"
-//#include "pingus/fonts.hpp"
#include "pingus/screens/demo_session.hpp"
#include "pingus/screens/pingus_menu.hpp"
-//#include "util/sexpr_file_reader.hpp"
#include "util/string_util.hpp"
#if defined(__APPLE__)
@@ -49,8 +41,6 @@
}
#endif
-//#include <SDL.h>
-
#ifdef ENABLE_BINRELOC
#include "../external/binreloc-2.0/binreloc.h"
#endif
@@ -61,13 +51,9 @@
#include "util/command_line.hpp"
#include "engine/screen/screen_manager.hpp"
-//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.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,12 +63,8 @@
#include "pingus/screens/font_test_screen.hpp"
#include "pingus/screens/start_screen.hpp"
#include "pingus/stat_manager.hpp"
-//#include "pingus/worldmap/worldmap_screen.hpp"
-//#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldobj_factory.hpp"
-//#include "editor/editor_screen.hpp"
-
#if _MSC_VER >= 1400
// Disable stupid deprecation warnings
#pragma warning( disable : 4996 )
Modified: trunk/pingus/src/pingus/res_descriptor.cpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/res_descriptor.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,7 +16,6 @@
#include "pingus/res_descriptor.hpp"
-//#include <assert.h>
#include <iostream>
/*
Modified: trunk/pingus/src/pingus/resource.cpp
===================================================================
--- trunk/pingus/src/pingus/resource.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/resource.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,16 +16,9 @@
#include "pingus/resource.hpp"
-//#include <assert.h>
-
-//#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/path_manager.hpp"
-//#include "pingus/res_descriptor.hpp"
-//#include "util/system.hpp"
ResourceManager Resource::resmgr;
Modified: trunk/pingus/src/pingus/resource.hpp
===================================================================
--- trunk/pingus/src/pingus/resource.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/resource.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,13 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_RESOURCE_HPP
#define HEADER_PINGUS_PINGUS_RESOURCE_HPP
-//#include <map>
-//#include <vector>
-
#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
#include "engine/display/surface.hpp"
-//#include "pingus/collision_mask.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_manager.hpp"
Modified: trunk/pingus/src/pingus/resource_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/resource_manager.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,10 +16,7 @@
#include "pingus/resource_manager.hpp"
-//#include <iostream>
-
#include "engine/display/sprite_description.hpp"
-//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/savegame.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,8 +16,6 @@
#include "pingus/savegame.hpp"
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,10 +16,8 @@
#include "pingus/savegame_manager.hpp"
-//#include <assert.h>
#include <fstream>
-//#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/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -118,7 +118,6 @@
GameSession& operator= (const GameSession&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,10 +18,7 @@
#include <fstream>
#include <iostream>
-//#include <time.h>
-//#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/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,5 +16,4 @@
//#include "pingus/worldmap/drawable.hpp"
-
/* EOF */
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,10 +17,7 @@
#include "pingus/worldobj.hpp"
#include <iostream>
-//#include <typeinfo>
-//#include "engine/display/scene_context.hpp"
-
World* WorldObj::world;
void
Modified: trunk/pingus/src/pingus/worldobj_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,11 +16,9 @@
#include "pingus/worldobj_factory.hpp"
-//#include <iostream>
#include <stdexcept>
#include "pingus/worldobjs/conveyor_belt.hpp"
-//#include "pingus/worldobjs/entrance.hpp"
#include "pingus/worldobjs/exit.hpp"
#include "pingus/worldobjs/fake_exit.hpp"
#include "pingus/worldobjs/groundpiece.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,10 +17,8 @@
#include "pingus/worldobjs/conveyor_belt.hpp"
#include "engine/display/scene_context.hpp"
-//#include "pingus/collision_map.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/entrance.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -20,10 +20,8 @@
#include "engine/display/scene_context.hpp"
#include "pingus/components/smallmap.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,15 +16,11 @@
#include "pingus/worldobjs/exit.hpp"
-//#include <iostream>
-
#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/components/smallmap.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -20,7 +20,6 @@
#include "pingus/components/smallmap.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/groundpiece.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,11 +16,6 @@
#include "pingus/worldobjs/groundpiece.hpp"
-//#include <iostream>
-
-//#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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -19,7 +19,6 @@
#include "engine/display/scene_context.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/hammer.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,10 +17,8 @@
#include "pingus/worldobjs/hammer.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/vector3f.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,10 +16,7 @@
#include "pingus/worldobjs/hotspot.hpp"
-//#include <iostream>
-
#include "engine/display/scene_context.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,11 +17,8 @@
#include "pingus/worldobjs/ice_block.hpp"
#include "engine/display/scene_context.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/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -16,11 +16,8 @@
#include "pingus/worldobjs/liquid.hpp"
-//#include <iostream>
-
#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -20,12 +20,9 @@
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.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/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,9 +16,6 @@
#include "pingus/worldobjs/snow_generator.hpp"
-//#include <iostream>
-
-//#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-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,7 +16,6 @@
#include "pingus/worldobjs/solid_color_background.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -19,7 +19,6 @@
#include "engine/display/scene_context.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/starfield_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,8 +16,6 @@
#include "pingus/worldobjs/starfield_background.hpp"
-//#include <iostream>
-
#include "pingus/worldobjs/starfield_background_stars.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,7 +18,6 @@
#include "engine/display/scene_context.hpp"
#include "pingus/globals.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-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,13 +16,8 @@
#include "pingus/worldobjs/surface_background.hpp"
-//#include <iostream>
-
-//#include "engine/display/blitter.hpp"
-//#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -20,7 +20,6 @@
#include "pingus/collision_map.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/teleporter.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -21,7 +21,6 @@
#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/worldobjs/teleporter_target.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-07
04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-07
04:23:49 UTC (rev 4069)
@@ -16,13 +16,7 @@
#include "pingus/worldobjs/teleporter_target.hpp"
-//#include <iostream>
-
#include "engine/display/scene_context.hpp"
-//#include "pingus/pingu.hpp"
-//#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-07 04:23:49 UTC (rev 4069)
@@ -17,7 +17,6 @@
#include "pingus/worldobjs/thunderstorm_background.hpp"
#include "engine/display/scene_context.hpp"
-//#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -17,9 +17,7 @@
#include "pingus/worldobjs/woodthing.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/math.hpp"
#include "pingus/particles/smoke_particle_holder.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-07 04:16:52 UTC
(rev 4068)
+++ trunk/pingus/src/util/command_line_generic.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
@@ -34,9 +34,6 @@
#pragma once
#endif
-//#include <string>
-//#include <vector>
-
#include "util/command_line.hpp"
class CommandLine_Generic
Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/debug_stream.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
#include <iostream>
-//#include <string>
#include <vector>
class NilStream;
@@ -73,7 +72,6 @@
DebugStream& operator= (const DebugStream&);
};
-
/// Stream used to consume unwanted debugmessages
class NilStream : public std::ostream
{
Modified: trunk/pingus/src/util/file_reader.cpp
===================================================================
--- trunk/pingus/src/util/file_reader.cpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/file_reader.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,7 +16,6 @@
#include "util/file_reader.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/file_reader.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_UTIL_FILE_READER_HPP
#include <boost/shared_ptr.hpp>
-//#include <string>
#include <vector>
class Size;
Modified: trunk/pingus/src/util/memory_pool.hpp
===================================================================
--- trunk/pingus/src/util/memory_pool.hpp 2009-11-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/memory_pool.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -105,7 +105,6 @@
MemoryPool& operator= (const MemoryPool&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/util/pathname.hpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_UTIL_PATHNAME_HPP
#include <SDL.h>
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,15 +16,10 @@
#include "util/sexpr_file_reader.hpp"
-//#include <assert.h>
-
#include "math/color.hpp"
#include "math/rect.hpp"
-//#include "math/size.hpp"
-//#include "math/vector2i.hpp"
#include "math/vector3f.hpp"
#include "pingus/res_descriptor.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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/sexpr_file_writer.cpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -16,9 +16,7 @@
#include "util/sexpr_file_writer.hpp"
-//#include <iostream>
#include <map>
-//#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-07 04:16:52 UTC (rev
4068)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-07 04:23:49 UTC (rev
4069)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
#define HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
-//#include <iosfwd>
#include <ostream>
#include "math/color.hpp"
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-07 04:16:52 UTC (rev 4068)
+++ trunk/pingus/src/util/system.cpp 2009-11-07 04:23:49 UTC (rev 4069)
@@ -16,13 +16,9 @@
#include "util/system.hpp"
-//#include <config.h>
#include <iostream>
-//#include <locale.h>
#include <sstream>
#include <stdexcept>
-//#include <stdio.h>
-//#include <stdlib.h>
#ifndef WIN32
# include <dirent.h>
@@ -44,10 +40,8 @@
#define F_OK 0
#endif
-//#include "pingus/gettext.h"
#include "pingus/globals.hpp"
#include "util/pathname.hpp"
-//#include "util/string_util.hpp"
std::string System::userdir;
std::string System::default_email;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4069 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/usbmouse engine/input/wiimote engine/input/xinput engine/input_old engine/screen engine/sound lisp math pingus pingus/actions pingus/colliders pingus/components pingus/screens pingus/worldmap pingus/worldobjs util,
grumbel at BerliOS <=