[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4070 - in trunk/pingus/src: editor engine/display engine/s
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4070 - in trunk/pingus/src: editor engine/display engine/sound pingus pingus/components pingus/particles pingus/screens pingus/worldmap util |
|
Date: |
Sat, 7 Nov 2009 12:35:49 +0100 |
Author: grumbel
Date: 2009-11-07 12:35:45 +0100 (Sat, 07 Nov 2009)
New Revision: 4070
Modified:
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/level_objs.hpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.hpp
trunk/pingus/src/engine/display/display.hpp
trunk/pingus/src/engine/display/sprite.hpp
trunk/pingus/src/engine/display/surface.hpp
trunk/pingus/src/engine/sound/sound.hpp
trunk/pingus/src/pingus/action_holder.cpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/collision_mask.cpp
trunk/pingus/src/pingus/collision_mask.hpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/check_box.hpp
trunk/pingus/src/pingus/components/choice_box.hpp
trunk/pingus/src/pingus/components/label.hpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/pingus_counter.cpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/slider_box.cpp
trunk/pingus/src/pingus/components/slider_box.hpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/config_manager.cpp
trunk/pingus/src/pingus/fonts.cpp
trunk/pingus/src/pingus/fonts.hpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/goal_manager.cpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/ground_map.hpp
trunk/pingus/src/pingus/layer_manager.cpp
trunk/pingus/src/pingus/levelset.cpp
trunk/pingus/src/pingus/levelset.hpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingu_holder.hpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_level.cpp
trunk/pingus/src/pingus/pingus_level.hpp
trunk/pingus/src/pingus/pingus_main.hpp
trunk/pingus/src/pingus/savegame_manager.hpp
trunk/pingus/src/pingus/screens/addon_menu.cpp
trunk/pingus/src/pingus/screens/credits.cpp
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/level_menu.cpp
trunk/pingus/src/pingus/screens/option_menu.cpp
trunk/pingus/src/pingus/screens/pingus_menu.cpp
trunk/pingus/src/pingus/screens/result_screen.cpp
trunk/pingus/src/pingus/screens/start_screen.cpp
trunk/pingus/src/pingus/screens/story_screen.cpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/smallmap_image.cpp
trunk/pingus/src/pingus/stat_manager.cpp
trunk/pingus/src/pingus/state_sprite.cpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/world.hpp
trunk/pingus/src/pingus/worldmap/dot.cpp
trunk/pingus/src/pingus/worldmap/dot.hpp
trunk/pingus/src/pingus/worldmap/drawable.cpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/path.cpp
trunk/pingus/src/pingus/worldmap/path_drawable.cpp
trunk/pingus/src/pingus/worldmap/path_graph.cpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
trunk/pingus/src/pingus/worldobj.hpp
trunk/pingus/src/pingus/worldobj_factory.hpp
trunk/pingus/src/util/system.hpp
Log:
Brute force removal of unneeded includes
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,7 +18,6 @@
#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
-#include "pingus/resource_modifier.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_objs.hpp
===================================================================
--- trunk/pingus/src/editor/level_objs.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/editor/level_objs.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,11 +17,9 @@
#ifndef HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
#define HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
-#include <string>
#include "engine/display/sprite.hpp"
#include "math/color.hpp"
-#include "math/origin.hpp"
#include "math/rect.hpp"
#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,10 +17,7 @@
#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
-#include "engine/gui/component.hpp"
#include "engine/gui/group_component.hpp"
-#include "math/vector2i.hpp"
-#include "pingus/res_descriptor.hpp"
class DrawingContext;
Modified: trunk/pingus/src/editor/object_selector_list.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/editor/object_selector_list.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
-#include <vector>
#include "engine/display/sprite.hpp"
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/engine/display/display.hpp
===================================================================
--- trunk/pingus/src/engine/display/display.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/engine/display/display.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_DISPLAY_HPP
-#include <list>
#include <memory>
#include <vector>
Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/engine/display/sprite.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,6 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_SPRITE_HPP
#include <boost/shared_ptr.hpp>
+#include <string>
#include "math/origin.hpp"
#include "pingus/resource_modifier.hpp"
@@ -34,7 +35,7 @@
{
public:
Sprite();
- Sprite(const std::string& name);
+ Sprite(const std::string& name);
Sprite(const ResDescriptor& desc);
Sprite(const Pathname& name);
Sprite(const SpriteDescription& desc, ResourceModifierNS::ResourceModifier
mod = ResourceModifierNS::ROT0);
Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,9 +17,7 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SURFACE_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SURFACE_HPP
-#include <SDL.h>
#include <boost/shared_ptr.hpp>
-#include <string>
#include "math/color.hpp"
#include "math/size.hpp"
Modified: trunk/pingus/src/engine/sound/sound.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/engine/sound/sound.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -19,7 +19,6 @@
#include <string>
-#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/pingus/action_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/action_holder.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,7 +16,6 @@
#include "pingus/action_holder.hpp"
-//#include <iostream>
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -17,14 +17,11 @@
#include "pingus/capture_rectangle.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/vector3f.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_action.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
-//#include "pingus/server.hpp"
#include "util/string_util.hpp"
CaptureRectangle::CaptureRectangle(GameSession* session_) :
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,15 +16,10 @@
#include "pingus/collision_map.hpp"
-//#include <SDL.h>
-//#include <iostream>
#include "engine/display/drawing_context.hpp"
#include "engine/display/sprite.hpp"
-//#include "math/math.hpp"
#include "pingus/collision_mask.hpp"
-//#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
CollisionMap::CollisionMap(int w, int h)
: serial(0),
Modified: trunk/pingus/src/pingus/collision_mask.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/collision_mask.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,11 +16,8 @@
#include "pingus/collision_mask.hpp"
-//#include <iostream>
#include "pingus/resource.hpp"
-//#include "util/system.hpp"
-//#include "pingus/res_descriptor.hpp"
CollisionMask::CollisionMask() :
surface(),
Modified: trunk/pingus/src/pingus/collision_mask.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/collision_mask.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_COLLISION_MASK_HPP
#define HEADER_PINGUS_PINGUS_COLLISION_MASK_HPP
-#include <string>
#include "engine/display/surface.hpp"
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,13 +17,9 @@
#include "pingus/components/action_button.hpp"
#include "engine/display/drawing_context.hpp"
-//#include "math/vector3f.hpp"
-//#include "pingus/fonts.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-//#include "util/string_util.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,13 +16,9 @@
#include "pingus/components/button_panel.hpp"
-//#include <algorithm>
-//#include <iostream>
#include "engine/display/drawing_context.hpp"
-//#include "math/math.hpp"
#include "pingus/fonts.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/pingus/components/check_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/check_box.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
#include <boost/signal.hpp>
-#include <string>
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/pingus/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,8 +18,6 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
#include <boost/signal.hpp>
-#include <string>
-#include <vector>
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/pingus/components/label.hpp
===================================================================
--- trunk/pingus/src/pingus/components/label.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/label.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -17,9 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_LABEL_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_LABEL_HPP
-#include <string>
-#include "engine/display/font.hpp"
#include "engine/gui/rect_component.hpp"
class Label : public GUI::RectComponent
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,11 +18,6 @@
#include "engine/sound/sound.hpp"
#include "engine/display/drawing_context.hpp"
-//#include "pingus/debug.hpp"
-//#include "pingus/fonts.hpp"
-//#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/pingus_menu.hpp"
MenuButton::MenuButton(PingusMenu* menu_,
Modified: trunk/pingus/src/pingus/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -16,14 +16,11 @@
#include "pingus/components/pingus_counter.hpp"
-//#include <stdio.h>
#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,12 +16,8 @@
#include "pingus/components/playfield.hpp"
-//#include <iostream>
-//#include <stdio.h>
#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
-//#include "engine/display/scene_context.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
Modified: trunk/pingus/src/pingus/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -17,7 +17,6 @@
#include "pingus/components/slider_box.hpp"
#include "engine/display/drawing_context.hpp"
-//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
#include <boost/signal.hpp>
-#include <string>
#include "engine/gui/rect_component.hpp"
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,16 +16,9 @@
#include "pingus/components/smallmap.hpp"
-//#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
-//#include "math/math.hpp"
-//#include "math/vector3f.hpp"
#include "pingus/components/playfield.hpp"
-//#include "pingus/globals.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/smallmap_image.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,15 +16,12 @@
#include "pingus/components/time_display.hpp"
-//#include <assert.h>
-//#include <stdio.h>
#include "engine/display/display.hpp"
#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/game_time.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/config_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/config_manager.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,15 +16,11 @@
#include "pingus/config_manager.hpp"
-//#include <SDL.h>
#include <fstream>
-//#include <iostream>
#include "engine/display/display.hpp"
#include "engine/screen/screen_manager.hpp"
-//#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
-//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "util/sexpr_file_reader.hpp"
Modified: trunk/pingus/src/pingus/fonts.cpp
===================================================================
--- trunk/pingus/src/pingus/fonts.cpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/fonts.cpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -14,7 +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/fonts.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/fonts.hpp
===================================================================
--- trunk/pingus/src/pingus/fonts.hpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/fonts.hpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_FONTS_HPP
#define HEADER_PINGUS_PINGUS_FONTS_HPP
-//#include "engine/display/drawing_context.hpp"
#include "engine/display/font.hpp"
namespace Fonts {
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,18 +16,13 @@
#include "pingus/global_event.hpp"
-//#include <algorithm>
-//#include <config.h>
#include <iostream>
-//#include <stdio.h>
#include "engine/display/screenshot.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/config_manager.hpp"
-//#include "pingus/fps_counter.hpp"
#include "pingus/globals.hpp"
#include "pingus/screens/addon_menu.hpp"
-//#include "pingus/screens/level_menu.hpp"
#include "pingus/screens/option_menu.hpp"
GlobalEvent global_event;
Modified: trunk/pingus/src/pingus/goal_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/goal_manager.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,9 +16,7 @@
#include "pingus/goal_manager.hpp"
-//#include <iostream>
-//#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,17 +16,10 @@
#include "pingus/ground_map.hpp"
-//#include <SDL.h>
-//#include <iostream>
#include <stdexcept>
-//#include <stdio.h>
-//#include "engine/display/blitter.hpp"
#include "engine/display/scene_context.hpp"
-//#include "gettext.h"
-//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-//#include "pingus/pingus_level.hpp"
class MapTile
{
Modified: trunk/pingus/src/pingus/ground_map.hpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/ground_map.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,11 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
#define HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
-//#include <vector>
#include "engine/display/surface.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/ground_map.hpp"
#include "pingus/worldobj.hpp"
class SceneContext;
Modified: trunk/pingus/src/pingus/layer_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/layer_manager.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,7 +16,6 @@
#include "pingus/layer_manager.hpp"
-//#include <iostream>
LayerManager::LayerManager () :
layers()
Modified: trunk/pingus/src/pingus/levelset.cpp
===================================================================
--- trunk/pingus/src/pingus/levelset.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/levelset.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -21,9 +21,7 @@
#include "math/math.hpp"
#include "pingus/plf_res_mgr.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
-//#include "util/file_reader.hpp"
Levelset::Levelset(const Pathname& pathname) :
title(),
Modified: trunk/pingus/src/pingus/levelset.hpp
===================================================================
--- trunk/pingus/src/pingus/levelset.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/levelset.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_LEVELSET_HPP
#define HEADER_PINGUS_PINGUS_LEVELSET_HPP
-#include <string>
-#include <vector>
#include "engine/display/sprite.hpp"
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -14,7 +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/particles/explosive_particle.hpp"
#if 0
//#include "pingus/collision_map.hpp"
//#include "pingus/particles/particle_holder.hpp"
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,9 +17,7 @@
#include "pingus/particles/pingu_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,10 +17,8 @@
#include "pingus/particles/rain_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,8 +17,6 @@
#include "pingus/particles/smoke_particle_holder.hpp"
#include "engine/display/scene_context.hpp"
-//#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -16,13 +16,10 @@
#include "pingus/particles/snow_particle_holder.hpp"
-//#include <assert.h>
#include "engine/display/scene_context.hpp"
-//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/ground_map.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -16,20 +16,13 @@
#include "pingus/pingu.hpp"
-//#include <assert.h>
#include <sstream>
-//#include <stdio.h>
#include "engine/display/scene_context.hpp"
-//#include "engine/sound/sound.hpp"
-//#include "gettext.h"
-//#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/fonts.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/pingu_action.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
#define HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
-#include "engine/display/surface.hpp"
#include "pingus/pingu_enums.hpp"
class ActionHolder;
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,8 +16,6 @@
#include "pingus/pingu_holder.hpp"
-//#include <assert.h>
-//#include <iostream>
#include "pingus/pingu.hpp"
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/pingu_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_PINGU_HOLDER_HPP
#include <list>
-#include <vector>
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,12 +16,8 @@
#include "pingus/pingus_demo.hpp"
-//#include <fstream>
#include <stdexcept>
-//#include "pingus/pingu_enums.hpp"
-//#include "pingus/server_event.hpp"
-//#include "util/file_reader.hpp"
#include "util/pathname.hpp"
PingusDemo::PingusDemo(const Pathname& pathname) :
Modified: trunk/pingus/src/pingus/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
-//#include <string>
-//#include <vector>
#include "pingus/server_event.hpp"
Modified: trunk/pingus/src/pingus/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingus_level.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,13 +16,11 @@
#include "pingus/pingus_level.hpp"
-//#include <iostream>
#include <stdexcept>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingus_level_impl.hpp"
-//#include "util/file_reader.hpp"
#include "util/pathname.hpp"
PingusLevel::PingusLevel()
Modified: trunk/pingus/src/pingus/pingus_level.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingus_level.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,10 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
-//#include <boost/shared_ptr.hpp>
#include <map>
-//#include <string>
-//#include <vector>
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/pingus_main.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,11 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
-//#include <SDL.h>
-//#include <string>
#include "pingus/pingus_options.hpp"
-//#include "util/pathname.hpp"
void segfault_handler(int);
Modified: trunk/pingus/src/pingus/savegame_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_SAVEGAME_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_SAVEGAME_MANAGER_HPP
-//#include <map>
#include "pingus/savegame.hpp"
Modified: trunk/pingus/src/pingus/screens/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/addon_menu.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -20,8 +20,6 @@
#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/resource.hpp"
-//#include "pingus/screens/option_menu.hpp"
AddOnMenu::AddOnMenu() :
background(),
Modified: trunk/pingus/src/pingus/screens/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/screens/credits.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,7 +18,6 @@
#include <iostream>
-//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
@@ -26,8 +25,6 @@
#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/res_descriptor.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/stat_manager.hpp"
class CreditsOkButton
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -20,20 +20,15 @@
#include <boost/function.hpp>
#include <iostream>
-//#include "engine/display/display.hpp"
-//#include "engine/display/scene_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
-//#include "math/math.hpp"
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/playfield.hpp"
#include "pingus/components/smallmap.hpp"
#include "pingus/pingus_demo.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-//#include "util/pathname.hpp"
static bool false_func() { return false; }
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,16 +16,13 @@
#include "pingus/screens/game_session.hpp"
-//#include <iostream>
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/server.hpp"
-//#include "engine/input/event.hpp"
#include "engine/sound/sound.hpp"
-//#include "math/math.hpp"
#include "pingus/components/button_panel.hpp"
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/playfield.hpp"
@@ -34,7 +31,6 @@
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/result_screen.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/screens/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -21,18 +21,13 @@
#include <boost/function.hpp>
#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
-//#include "engine/gui/rect_component.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/screens/game_session.hpp"
-//#include "pingus/screens/option_menu.hpp"
#include "pingus/screens/start_screen.hpp"
#include "util/system.hpp"
Modified: trunk/pingus/src/pingus/screens/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/option_menu.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,25 +18,18 @@
#include <boost/bind.hpp>
#include <iostream>
-//#include <set>
-//#include <sstream>
#include "engine/display/display.hpp"
-//#include "engine/display/drawing_context.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/components/check_box.hpp"
#include "pingus/components/choice_box.hpp"
-//#include "pingus/components/label.hpp"
#include "pingus/components/slider_box.hpp"
#include "pingus/config_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
-//#include "pingus/resource.hpp"
#include "tinygettext/dictionary_manager.hpp"
-//#include "tinygettext/language.hpp"
#define C(x) connections.push_back(x)
Modified: trunk/pingus/src/pingus/screens/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -19,25 +19,17 @@
#include <config.h>
#include "editor/editor_screen.hpp"
-//#include "engine/gui/gui_manager.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/components/menu_button.hpp"
-//#include "pingus/debug.hpp"
#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
#include "pingus/layer_manager.hpp"
-//#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
#include "pingus/resource.hpp"
#include "pingus/screens/credits.hpp"
#include "pingus/screens/level_menu.hpp"
#include "pingus/screens/start_screen.hpp"
-//#include "pingus/screens/story_screen.hpp"
-//#include "pingus/stat_manager.hpp"
-//#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-//#include "util/pathname.hpp"
PingusMenu::PingusMenu() :
is_init(),
Modified: trunk/pingus/src/pingus/screens/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,9 +16,7 @@
#include "pingus/screens/result_screen.hpp"
-//#include <iostream>
-//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
@@ -27,11 +25,8 @@
#include "pingus/fonts.hpp"
#include "pingus/game_time.hpp"
#include "pingus/gettext.h"
-//#include "pingus/res_descriptor.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "util/string_util.hpp"
-//#include "util/system.hpp"
class ResultScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/screens/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,11 +16,8 @@
#include "pingus/screens/start_screen.hpp"
-//#include <iostream>
-//#include "engine/display/blitter.hpp"
#include "engine/display/display.hpp"
-//#include "engine/gui/component.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
@@ -29,12 +26,9 @@
#include "pingus/game_time.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-//#include "pingus/pingus_level.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/game_session.hpp"
#include "pingus/string_format.hpp"
#include "util/string_util.hpp"
-//#include "util/system.hpp"
class StartScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/screens/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,26 +16,16 @@
#include "pingus/screens/story_screen.hpp"
-//#include <algorithm>
-//#include <vector>
#include "engine/display/display.hpp"
-//#include "engine/gui/component.hpp"
#include "engine/gui/gui_manager.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
-//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-//#include "pingus/res_descriptor.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/screens/credits.hpp"
-//#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/worldmap.hpp"
-//#include "pingus/worldmap/worldmap_screen.hpp"
-//#include "pingus/worldmap/worldmap_story.hpp"
#include "util/utf8.hpp"
class StoryScreenComponent : public GUI::Component
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -14,18 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//#include "pingus/server_event.hpp"
-//#include <assert.h>
#include <boost/format.hpp>
#include <iostream>
-//#include "math/math.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-//#include "util/string_util.hpp"
ServerEvent::ServerEvent() :
type(PINGU_ACTION_EVENT),
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/server_event.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_SERVER_EVENT_HPP
#define HEADER_PINGUS_PINGUS_SERVER_EVENT_HPP
-#include <iosfwd>
-
#include "math/vector3f.hpp"
#include "pingus/pingu_enums.hpp"
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/smallmap_image.cpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/smallmap_image.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,7 +16,6 @@
#include "pingus/smallmap_image.hpp"
-//#include <iostream>
#include "pingus/collision_map.hpp"
#include "pingus/server.hpp"
Modified: trunk/pingus/src/pingus/stat_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/stat_manager.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,10 +16,8 @@
#include "pingus/stat_manager.hpp"
-//#include <algorithm>
#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/state_sprite.cpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/state_sprite.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,7 +18,6 @@
#include <stdexcept>
-//#include "pingus/resource.hpp"
StateSprite::StateSprite() :
sprites()
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -16,12 +16,7 @@
#include "pingus/world.hpp"
-//#include <algorithm>
-//#include <assert.h>
-//#include <iostream>
-//#include <typeinfo>
-//#include "engine/display/display.hpp"
#include "engine/display/scene_context.hpp"
#include "engine/sound/sound.hpp"
#include "pingus/collision_map.hpp"
Modified: trunk/pingus/src/pingus/world.hpp
===================================================================
--- trunk/pingus/src/pingus/world.hpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/world.hpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -17,11 +17,9 @@
#ifndef HEADER_PINGUS_PINGUS_WORLD_HPP
#define HEADER_PINGUS_PINGUS_WORLD_HPP
-#include <memory>
#include <string>
#include <vector>
-#include "math/color.hpp"
#include "math/vector2i.hpp"
#include "pingus/collision_mask.hpp"
#include "pingus/groundtype.hpp"
Modified: trunk/pingus/src/pingus/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/worldmap/dot.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,10 +16,7 @@
#include "pingus/worldmap/dot.hpp"
-//#include <assert.h>
-//#include <iostream>
-//#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_DOT_HPP
-//#include <string>
#include "math/vector3f.hpp"
#include "pingus/worldmap/drawable.hpp"
Modified: trunk/pingus/src/pingus/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -14,6 +14,5 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//#include "pingus/worldmap/drawable.hpp"
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,23 +16,16 @@
#include "pingus/worldmap/level_dot.hpp"
-//#include <iostream>
#include "engine/display/drawing_context.hpp"
-//#include "engine/display/font.hpp"
#include "engine/input/control.hpp"
-//#include "engine/input/controller.hpp"
#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-//#include "pingus/path_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/start_screen.hpp"
-//#include "util/file_reader.hpp"
-//#include "util/system.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/worldmap/path.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,9 +16,6 @@
#include "pingus/worldmap/path.hpp"
-//#include <algorithm>
-//#include <assert.h>
-//#include <iostream>
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,10 +16,8 @@
#include "pingus/worldmap/path_drawable.hpp"
-//#include <iostream>
#include "engine/display/drawing_context.hpp"
-//#include "math/color.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/path_graph.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -14,19 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//#include "pingus/worldmap/path_graph.hpp"
-//#include <iostream>
#include <stdexcept>
-//#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/worldmap/dot.hpp"
#include "pingus/worldmap/dot_factory.hpp"
#include "pingus/worldmap/path_drawable.hpp"
-//#include "pingus/worldmap/pathfinder.hpp"
#include "pingus/worldmap/worldmap.hpp"
-//#include "util/file_reader.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -16,13 +16,9 @@
#include "pingus/worldmap/pingus.hpp"
-//#include <iostream>
#include "engine/display/drawing_context.hpp"
-//#include "math/math.hpp"
-//#include "math/vector3f.hpp"
#include "pingus/direction.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/worldmap/dot.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,10 +17,7 @@
#include "pingus/worldmap/pingus_worldmap.hpp"
#include <stdexcept>
-//#include <string>
-//#include "pingus/worldmap/drawable_factory.hpp"
-//#include "util/file_reader.hpp"
using namespace WorldmapNS;
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,11 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
#define HEADER_PINGUS_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
-//#include <boost/smart_ptr.hpp>
#include "pingus/worldmap/path_graph.hpp"
-//#include "pingus/worldmap/worldmap_story.hpp"
-//#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -16,13 +16,10 @@
#include "pingus/worldmap/sprite_drawable.hpp"
-//#include <iostream>
-//#include "engine/display/drawing_context.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
-//#include "pingus/worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,38 +16,16 @@
#include "pingus/worldmap/worldmap.hpp"
-//#include <assert.h>
-//#include <iostream>
-//#include "engine/display/display.hpp"
#include "engine/sound/sound.hpp"
-//#include "lisp/lisp.hpp"
-//#include "lisp/parser.hpp"
-//#include "math/math.hpp"
-//#include "pingus/debug.hpp"
-//#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/globals.hpp"
#include "pingus/globals.hpp"
-//#include "pingus/path_manager.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/savegame_manager.hpp"
#include "pingus/stat_manager.hpp"
-//#include "pingus/stat_manager.hpp"
-//#include "pingus/worldmap/dot.hpp"
-//#include "pingus/worldmap/drawable.hpp"
#include "pingus/worldmap/drawable_factory.hpp"
#include "pingus/worldmap/level_dot.hpp"
-//#include "pingus/worldmap/path_graph.hpp"
#include "pingus/worldmap/pingus.hpp"
-//#include "pingus/worldmap/worldmap_screen.hpp"
-//#include "pingus/worldmap/worldmap_story.hpp"
#include "util/pathname.hpp"
-//#include "util/sexpr_file_reader.hpp"
-//#include "util/system.hpp"
-//#include "engine/screen/screen_manager.hpp"
-//#include "pingus/screens/story_screen.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -17,7 +17,6 @@
#include "pingus/worldmap/worldmap_component.hpp"
#include "engine/display/display.hpp"
-//#include "engine/display/scene_context.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-07
04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-07
11:35:45 UTC (rev 4070)
@@ -16,25 +16,17 @@
#include "pingus/worldmap/worldmap_screen.hpp"
-//#include <iostream>
#include "engine/display/display.hpp"
-//#include "engine/display/scene_context.hpp"
#include "engine/gui/surface_button.hpp"
#include "engine/screen/screen_manager.hpp"
#include "engine/sound/sound.hpp"
-//#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/path_manager.hpp"
-//#include "pingus/res_descriptor.hpp"
-//#include "pingus/resource.hpp"
#include "pingus/screens/story_screen.hpp"
-//#include "pingus/stat_manager.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_component.hpp"
-//#include "pingus/worldmap/worldmap_story.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -16,14 +16,10 @@
#include "pingus/worldmap/worldmap_story.hpp"
-//#include <algorithm>
#include <stdexcept>
-//#include <vector>
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
-//#include "pingus/res_descriptor.hpp"
-//#include "pingus/screens/story_screen.hpp"
#include "pingus/string_format.hpp"
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/worldobj.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.hpp 2009-11-07 04:23:49 UTC (rev
4069)
+++ trunk/pingus/src/pingus/worldobj.hpp 2009-11-07 11:35:45 UTC (rev
4070)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
#include "engine/display/sprite.hpp"
-//#include "pingus/collision_mask.hpp"
#include "util/file_reader.hpp"
class FileReader;
Modified: trunk/pingus/src/pingus/worldobj_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-07 04:23:49 UTC
(rev 4069)
+++ trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-07 11:35:45 UTC
(rev 4070)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJ_FACTORY_HPP
#include <map>
-#include <string>
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp 2009-11-07 04:23:49 UTC (rev 4069)
+++ trunk/pingus/src/util/system.hpp 2009-11-07 11:35:45 UTC (rev 4070)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_UTIL_SYSTEM_HPP
#define HEADER_PINGUS_UTIL_SYSTEM_HPP
-#include <map>
#include <stdint.h>
#include <string>
#include <vector>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4070 - in trunk/pingus/src: editor engine/display engine/sound pingus pingus/components pingus/particles pingus/screens pingus/worldmap util,
grumbel at BerliOS <=