[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4193 - in trunk/pingus/src: engine/display engine/screen p
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] r4193 - in trunk/pingus/src: engine/display engine/screen pingus pingus/components pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util |
|
Date: |
Tue, 30 Aug 2011 00:39:06 +0200 |
Author: grumbel
Date: 2011-08-30 00:39:06 +0200 (Tue, 30 Aug 2011)
New Revision: 4193
Removed:
trunk/pingus/src/pingus/pingu_enums.cpp
Modified:
trunk/pingus/src/engine/display/font.hpp
trunk/pingus/src/engine/display/sprite_impl.cpp
trunk/pingus/src/engine/screen/screen.hpp
trunk/pingus/src/pingus/collision_map.hpp
trunk/pingus/src/pingus/components/action_button.hpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/menu_button.hpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/explosive_particle.hpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/screens/game_session.hpp
trunk/pingus/src/pingus/screens/pingus_menu.hpp
trunk/pingus/src/pingus/screens/story_screen.cpp
trunk/pingus/src/pingus/screens/story_screen.hpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/worldmap/worldmap.hpp
trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
trunk/pingus/src/pingus/worldobjs/entrance.hpp
trunk/pingus/src/pingus/worldobjs/surface_background.hpp
trunk/pingus/src/util/pathname.hpp
trunk/pingus/src/util/system.cpp
Log:
Removed some unused #include's
Modified: trunk/pingus/src/engine/display/font.hpp
===================================================================
--- trunk/pingus/src/engine/display/font.hpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/engine/display/font.hpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_FONT_HPP
-#include <SDL.h>
#include <memory>
#include "math/rect.hpp"
Modified: trunk/pingus/src/engine/display/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.cpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/engine/display/sprite_impl.cpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -16,8 +16,6 @@
#include "engine/display/sprite_impl.hpp"
-#include <map>
-
#include "engine/display/display.hpp"
#include "engine/display/framebuffer.hpp"
#include "engine/display/sprite_description.hpp"
Modified: trunk/pingus/src/engine/screen/screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.hpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/engine/screen/screen.hpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -23,7 +23,6 @@
struct Event;
}
-class Size;
class DrawingContext;
/** A interface for screens. A screen is a Pingus 'thing' which gets
Modified: trunk/pingus/src/pingus/collision_map.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.hpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/collision_map.hpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -17,8 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_COLLISION_MAP_HPP
#define HEADER_PINGUS_PINGUS_COLLISION_MAP_HPP
-#include <SDL.h>
-
#include "pingus/groundtype.hpp"
class CollisionMask;
Modified: trunk/pingus/src/pingus/components/action_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.hpp 2011-08-29
21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/pingus/components/action_button.hpp 2011-08-29
22:39:06 UTC (rev 4193)
@@ -17,12 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
#define HEADER_PINGUS_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
-#include <string>
-
-#include "engine/display/font.hpp"
-#include "engine/gui/component.hpp"
#include "engine/gui/rect_component.hpp"
-#include "pingus/action_name.hpp"
#include "pingus/state_sprite.hpp"
class Server;
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -21,6 +21,7 @@
#include "engine/display/sprite.hpp"
#include "engine/gui/rect_component.hpp"
+#include "pingus/action_name.hpp"
#include "pingus/components/action_button.hpp"
class Server;
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -16,8 +16,9 @@
#include "pingus/components/menu_button.hpp"
+#include "engine/display/drawing_context.hpp"
#include "engine/sound/sound.hpp"
-#include "engine/display/drawing_context.hpp"
+#include "math/vector2i.hpp"
#include "pingus/screens/pingus_menu.hpp"
MenuButton::MenuButton(PingusMenu* menu_,
Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/components/menu_button.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -22,9 +22,9 @@
#include "engine/display/font.hpp"
#include "engine/display/sprite.hpp"
#include "engine/gui/component.hpp"
-#include "math/vector2i.hpp"
class PingusMenu;
+class Vector2i;
/** Framework for menu buttons */
class MenuButton : public GUI::Component
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -16,6 +16,7 @@
#include "pingus/fps_counter.hpp"
+#include <SDL.h>
#include <sstream>
#include "engine/display/display.hpp"
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.cpp 2011-08-29
21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2011-08-29
22:39:06 UTC (rev 4193)
@@ -15,11 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#if 0
-//#include "pingus/collision_map.hpp"
-//#include "pingus/particles/particle_holder.hpp"
-//#include "pingus/pingu_map.hpp"
-//#include "pingus/resource.hpp"
-//#include "pingus/world.hpp"
+#include "pingus/collision_map.hpp"
+#include "pingus/particles/particle_holder.hpp"
+#include "pingus/pingu_map.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/world.hpp"
ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
: Particle (x, y, x_a, y_a),
Modified: trunk/pingus/src/pingus/particles/explosive_particle.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.hpp 2011-08-29
21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/pingus/particles/explosive_particle.hpp 2011-08-29
22:39:06 UTC (rev 4193)
@@ -17,14 +17,11 @@
#ifndef HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
#define HEADER_PINGUS_PINGUS_PARTICLES_EXPLOSIVE_PARTICLE_HPP
-//#include "engine/display/sprite.hpp"
-//#include "pingus/particles/particle.hpp"
+#include "pingus/particles/particle.hpp"
-class ExplosiveParticle
- : public Particle
+class ExplosiveParticle : public Particle
{
private:
- //Sprite sprite;
bool alive;
public:
Deleted: trunk/pingus/src/pingus/pingu_enums.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.cpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/pingu_enums.cpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -1,19 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 1999 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#include "pingus/pingu_enums.hpp"
-
-/* EOF */
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -18,6 +18,7 @@
#include <stdexcept>
+#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 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -17,6 +17,8 @@
#ifndef HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
#define HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
+#include <vector>
+
#include "pingus/server_event.hpp"
class Pathname;
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -19,7 +19,6 @@
#include <signal.h>
#include "editor/editor_level.hpp"
-#include "engine/display/display.hpp"
#include "engine/system/sdl_system.hpp"
#include "pingus/config_manager.hpp"
#include "pingus/screens/demo_session.hpp"
Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_SCREENS_GAME_SESSION_HPP
#include <memory>
-#include <string>
#include "engine/screen/gui_screen.hpp"
#include "pingus/action_name.hpp"
Modified: trunk/pingus/src/pingus/screens/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/screens/pingus_menu.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_SCREENS_PINGUS_MENU_HPP
#include <memory>
-#include <vector>
#include "engine/display/sprite.hpp"
#include "engine/screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/screens/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.cpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/screens/story_screen.cpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -24,7 +24,6 @@
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-#include "pingus/worldmap/worldmap.hpp"
#include "util/utf8.hpp"
class StoryScreenComponent : public GUI::Component
Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -18,10 +18,8 @@
#define HEADER_PINGUS_PINGUS_SCREENS_STORY_SCREEN_HPP
#include <memory>
-#include <string>
#include "engine/screen/gui_screen.hpp"
-#include "pingus/res_descriptor.hpp"
#include "pingus/worldmap/worldmap_story.hpp"
class StoryScreenComponent;
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/server_event.cpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -21,6 +21,7 @@
#include "pingus/pingu_holder.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
+#include "util/file_reader.hpp"
ServerEvent::ServerEvent() :
type(PINGU_ACTION_EVENT),
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2011-08-29 21:30:22 UTC (rev
4192)
+++ trunk/pingus/src/pingus/server_event.hpp 2011-08-29 22:39:06 UTC (rev
4193)
@@ -19,8 +19,8 @@
#include "math/vector3f.hpp"
#include "pingus/action_name.hpp"
-#include "util/file_reader.hpp"
+class FileReader;
class Server;
/** This class represents an event that the Server can recieve from
Modified: trunk/pingus/src/pingus/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/worldmap/worldmap.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -19,11 +19,8 @@
#include <vector>
-#include "engine/display/drawing_context.hpp"
#include "engine/display/graphic_context_state.hpp"
-#include "engine/display/sprite.hpp"
#include "pingus/worldmap/pingus_worldmap.hpp"
-#include "util/file_reader.hpp"
class Font;
class DrawingContext;
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2011-08-29
21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2011-08-29
22:39:06 UTC (rev 4193)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
#include <memory>
-#include <string>
#include "engine/gui/gui_manager.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.hpp 2011-08-29 21:30:22 UTC
(rev 4192)
+++ trunk/pingus/src/pingus/worldobjs/entrance.hpp 2011-08-29 22:39:06 UTC
(rev 4193)
@@ -18,7 +18,6 @@
#define HEADER_PINGUS_PINGUS_WORLDOBJS_ENTRANCE_HPP
#include "math/vector3f.hpp"
-#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2011-08-29
21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.hpp 2011-08-29
22:39:06 UTC (rev 4193)
@@ -19,7 +19,6 @@
#include "math/vector3f.hpp"
#include "math/color.hpp"
-#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
namespace WorldObjsData {
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2011-08-29 21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/util/pathname.hpp 2011-08-29 22:39:06 UTC (rev 4193)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_UTIL_PATHNAME_HPP
#define HEADER_PINGUS_UTIL_PATHNAME_HPP
-#include <SDL.h>
#include <string>
/** Simple class to allow a distinction of paths that refer to the
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2011-08-29 21:30:22 UTC (rev 4192)
+++ trunk/pingus/src/util/system.cpp 2011-08-29 22:39:06 UTC (rev 4193)
@@ -19,6 +19,7 @@
#include <iostream>
#include <sstream>
#include <stdexcept>
+#include <string.h>
#ifndef WIN32
# include <dirent.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4193 - in trunk/pingus/src: engine/display engine/screen pingus pingus/components pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util,
grumbel <=