[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4013 - in trunk/pingus/src: colliders components display e
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4013 - in trunk/pingus/src: colliders components display editor gui input input_old math movers pingus screen sound util worldmap worldobjs |
|
Date: |
Wed, 4 Nov 2009 06:22:33 +0100 |
Author: grumbel
Date: 2009-11-04 06:22:21 +0100 (Wed, 04 Nov 2009)
New Revision: 4013
Modified:
trunk/pingus/src/colliders/pingu_collider.hpp
trunk/pingus/src/components/action_button.hpp
trunk/pingus/src/components/button_panel.hpp
trunk/pingus/src/components/check_box.hpp
trunk/pingus/src/components/choice_box.hpp
trunk/pingus/src/components/label.hpp
trunk/pingus/src/components/menu_button.hpp
trunk/pingus/src/components/pingus_counter.hpp
trunk/pingus/src/components/playfield.hpp
trunk/pingus/src/components/slider_box.hpp
trunk/pingus/src/components/smallmap.hpp
trunk/pingus/src/components/time_display.hpp
trunk/pingus/src/display/delta_framebuffer.hpp
trunk/pingus/src/display/display.hpp
trunk/pingus/src/display/drawing_context.hpp
trunk/pingus/src/display/drawing_request.hpp
trunk/pingus/src/display/framebuffer.hpp
trunk/pingus/src/display/framebuffer_surface.hpp
trunk/pingus/src/display/null_framebuffer.hpp
trunk/pingus/src/display/opengl_framebuffer.hpp
trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/display/rect_merger.hpp
trunk/pingus/src/display/scene_context.hpp
trunk/pingus/src/display/scene_group.hpp
trunk/pingus/src/display/sdl_framebuffer.hpp
trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/editor/action_properties.hpp
trunk/pingus/src/editor/button.hpp
trunk/pingus/src/editor/checkbox.hpp
trunk/pingus/src/editor/combobox.hpp
trunk/pingus/src/editor/editor_level.hpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/editor/file_dialog.hpp
trunk/pingus/src/editor/file_list.hpp
trunk/pingus/src/editor/gui_style.hpp
trunk/pingus/src/editor/inputbox.hpp
trunk/pingus/src/editor/label.hpp
trunk/pingus/src/editor/level_properties.hpp
trunk/pingus/src/editor/object_properties.hpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.hpp
trunk/pingus/src/editor/object_selector_set.hpp
trunk/pingus/src/gui/game_delta_recorder.hpp
trunk/pingus/src/input/control.hpp
trunk/pingus/src/input/controller_description.hpp
trunk/pingus/src/input/core_driver.hpp
trunk/pingus/src/input/evdev_device.hpp
trunk/pingus/src/input/sdl_driver.hpp
trunk/pingus/src/input/usbmouse_driver.hpp
trunk/pingus/src/input/wiimote.hpp
trunk/pingus/src/input/wiimote_driver.hpp
trunk/pingus/src/input/xinput_device.hpp
trunk/pingus/src/input/xinput_driver.hpp
trunk/pingus/src/input_old/axis.hpp
trunk/pingus/src/input_old/axis_factory.hpp
trunk/pingus/src/input_old/button.hpp
trunk/pingus/src/input_old/button_factory.hpp
trunk/pingus/src/input_old/controller.hpp
trunk/pingus/src/input_old/event.hpp
trunk/pingus/src/input_old/event_fwd.hpp
trunk/pingus/src/input_old/pointer.hpp
trunk/pingus/src/input_old/pointer_factory.hpp
trunk/pingus/src/input_old/scroller.hpp
trunk/pingus/src/input_old/scroller_factory.hpp
trunk/pingus/src/math/color.hpp
trunk/pingus/src/math/math.hpp
trunk/pingus/src/math/quad_tree.hpp
trunk/pingus/src/math/size.hpp
trunk/pingus/src/math/vector2i.hpp
trunk/pingus/src/movers/linear_mover.hpp
trunk/pingus/src/pingus/action_holder.hpp
trunk/pingus/src/pingus/addon_menu.hpp
trunk/pingus/src/pingus/blitter.hpp
trunk/pingus/src/pingus/blitter_impl.hpp
trunk/pingus/src/pingus/capture_rectangle.hpp
trunk/pingus/src/pingus/collider.hpp
trunk/pingus/src/pingus/collision_map.hpp
trunk/pingus/src/pingus/collision_mask.hpp
trunk/pingus/src/pingus/config_manager.hpp
trunk/pingus/src/pingus/credits.hpp
trunk/pingus/src/pingus/debug.hpp
trunk/pingus/src/pingus/demo_session.hpp
trunk/pingus/src/pingus/direction.hpp
trunk/pingus/src/pingus/font.hpp
trunk/pingus/src/pingus/font_description.hpp
trunk/pingus/src/pingus/font_test_screen.hpp
trunk/pingus/src/pingus/fonts.hpp
trunk/pingus/src/pingus/fps_counter.hpp
trunk/pingus/src/pingus/game_event.hpp
trunk/pingus/src/pingus/game_session.hpp
trunk/pingus/src/pingus/game_time.hpp
trunk/pingus/src/pingus/global_event.hpp
trunk/pingus/src/pingus/globals.hpp
trunk/pingus/src/pingus/goal_manager.hpp
trunk/pingus/src/pingus/graphic_context_state.hpp
trunk/pingus/src/pingus/ground_map.hpp
trunk/pingus/src/pingus/groundtype.hpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/level_menu.hpp
trunk/pingus/src/pingus/levelset.hpp
trunk/pingus/src/pingus/line_iterator.hpp
trunk/pingus/src/pingus/mover.hpp
trunk/pingus/src/pingus/option_menu.hpp
trunk/pingus/src/pingus/path_manager.hpp
trunk/pingus/src/pingus/pingu.hpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_enums.hpp
trunk/pingus/src/pingus/pingu_holder.hpp
trunk/pingus/src/pingus/pingus.hpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_error.hpp
trunk/pingus/src/pingus/pingus_level.hpp
trunk/pingus/src/pingus/pingus_level_impl.hpp
trunk/pingus/src/pingus/pingus_main.hpp
trunk/pingus/src/pingus/pingus_menu.hpp
trunk/pingus/src/pingus/pingus_options.hpp
trunk/pingus/src/pingus/plf_res_mgr.hpp
trunk/pingus/src/pingus/res_descriptor.hpp
trunk/pingus/src/pingus/resource.hpp
trunk/pingus/src/pingus/resource_manager.hpp
trunk/pingus/src/pingus/resource_modifier.hpp
trunk/pingus/src/pingus/result.hpp
trunk/pingus/src/pingus/result_screen.hpp
trunk/pingus/src/pingus/savegame.hpp
trunk/pingus/src/pingus/savegame_manager.hpp
trunk/pingus/src/pingus/screenshot.hpp
trunk/pingus/src/pingus/server.hpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/smallmap_image.hpp
trunk/pingus/src/pingus/sprite.hpp
trunk/pingus/src/pingus/sprite_description.hpp
trunk/pingus/src/pingus/sprite_impl.hpp
trunk/pingus/src/pingus/start_screen.hpp
trunk/pingus/src/pingus/stat_manager.hpp
trunk/pingus/src/pingus/state_sprite.hpp
trunk/pingus/src/pingus/story_screen.hpp
trunk/pingus/src/pingus/string_format.hpp
trunk/pingus/src/pingus/surface.hpp
trunk/pingus/src/pingus/world.hpp
trunk/pingus/src/pingus/worldobj.hpp
trunk/pingus/src/pingus/worldobj_factory.hpp
trunk/pingus/src/screen/gui_screen.hpp
trunk/pingus/src/screen/screen.hpp
trunk/pingus/src/screen/screen_manager.hpp
trunk/pingus/src/screen/screen_manager_impl.hpp
trunk/pingus/src/sound/sound.hpp
trunk/pingus/src/sound/sound_dummy.hpp
trunk/pingus/src/sound/sound_impl.hpp
trunk/pingus/src/sound/sound_real.hpp
trunk/pingus/src/sound/sound_res_mgr.hpp
trunk/pingus/src/util/command_line.hpp
trunk/pingus/src/util/command_line_generic.hpp
trunk/pingus/src/util/debug_stream.hpp
trunk/pingus/src/util/file_reader.hpp
trunk/pingus/src/util/file_reader_impl.hpp
trunk/pingus/src/util/file_writer.hpp
trunk/pingus/src/util/memory_pool.hpp
trunk/pingus/src/util/pathname.hpp
trunk/pingus/src/util/sexpr_file_reader.hpp
trunk/pingus/src/util/sexpr_file_writer.hpp
trunk/pingus/src/util/string_util.hpp
trunk/pingus/src/util/system.hpp
trunk/pingus/src/util/utf8.hpp
trunk/pingus/src/worldmap/dot.hpp
trunk/pingus/src/worldmap/dot_factory.hpp
trunk/pingus/src/worldmap/drawable.hpp
trunk/pingus/src/worldmap/drawable_factory.hpp
trunk/pingus/src/worldmap/graph.hpp
trunk/pingus/src/worldmap/path_drawable.hpp
trunk/pingus/src/worldmap/path_graph.hpp
trunk/pingus/src/worldmap/pathfinder.hpp
trunk/pingus/src/worldmap/pingus_worldmap.hpp
trunk/pingus/src/worldmap/sprite_drawable.hpp
trunk/pingus/src/worldmap/worldmap_component.hpp
trunk/pingus/src/worldmap/worldmap_screen.hpp
trunk/pingus/src/worldmap/worldmap_story.hpp
trunk/pingus/src/worldobjs/entrance.hpp
trunk/pingus/src/worldobjs/fake_exit.hpp
trunk/pingus/src/worldobjs/rain_generator.hpp
trunk/pingus/src/worldobjs/snow_generator.hpp
trunk/pingus/src/worldobjs/spike.hpp
trunk/pingus/src/worldobjs/starfield_background.hpp
trunk/pingus/src/worldobjs/woodthing.hpp
Log:
Updated include guards
Modified: trunk/pingus/src/colliders/pingu_collider.hpp
===================================================================
--- trunk/pingus/src/colliders/pingu_collider.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/colliders/pingu_collider.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_UPRIGHT_PINGU_COLLIDER_HPP
-#define HEADER_PINGUS_UPRIGHT_PINGU_COLLIDER_HPP
+#ifndef HEADER_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
+#define HEADER_PINGUS_COLLIDERS_PINGU_COLLIDER_HPP
#include "pingus/collider.hpp"
Modified: trunk/pingus/src/components/action_button.hpp
===================================================================
--- trunk/pingus/src/components/action_button.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/components/action_button.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_ACTION_BUTTON_HPP
-#define HEADER_PINGUS_ACTION_BUTTON_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
+#define HEADER_PINGUS_COMPONENTS_ACTION_BUTTON_HPP
#include <string>
#include "pingus/font.hpp"
Modified: trunk/pingus/src/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/components/button_panel.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/components/button_panel.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_BUTTON_PANEL_HPP
-#define HEADER_PINGUS_BUTTON_PANEL_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
+#define HEADER_PINGUS_COMPONENTS_BUTTON_PANEL_HPP
#include <vector>
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/components/check_box.hpp
===================================================================
--- trunk/pingus/src/components/check_box.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/check_box.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_CHECK_BOX_HPP
-#define HEADER_CHECK_BOX_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_CHECK_BOX_HPP
+#define HEADER_PINGUS_COMPONENTS_CHECK_BOX_HPP
#include <boost/signal.hpp>
#include <string>
Modified: trunk/pingus/src/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/components/choice_box.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/choice_box.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_CHOICE_BOX_HPP
-#define HEADER_CHOICE_BOX_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+#define HEADER_PINGUS_COMPONENTS_CHOICE_BOX_HPP
#include <string>
#include <vector>
Modified: trunk/pingus/src/components/label.hpp
===================================================================
--- trunk/pingus/src/components/label.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/label.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LABEL_HPP
-#define HEADER_LABEL_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_LABEL_HPP
+#define HEADER_PINGUS_COMPONENTS_LABEL_HPP
#include <string>
#include "pingus/font.hpp"
Modified: trunk/pingus/src/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/components/menu_button.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/menu_button.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_MENU_BUTTON_HPP
-#define HEADER_PINGUS_MENU_BUTTON_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_MENU_BUTTON_HPP
+#define HEADER_PINGUS_COMPONENTS_MENU_BUTTON_HPP
#include <string>
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/components/pingus_counter.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGUS_COUNTER_HPP
-#define HEADER_PINGUS_PINGUS_COUNTER_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
+#define HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
#include "gui/component.hpp"
#include "pingus/font.hpp"
Modified: trunk/pingus/src/components/playfield.hpp
===================================================================
--- trunk/pingus/src/components/playfield.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/playfield.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PLAYFIELD_HPP
-#define HEADER_PINGUS_PLAYFIELD_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_PLAYFIELD_HPP
+#define HEADER_PINGUS_COMPONENTS_PLAYFIELD_HPP
#include <memory>
#include "pingus/graphic_context_state.hpp"
Modified: trunk/pingus/src/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/components/slider_box.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/slider_box.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SLIDER_BOX_HPP
-#define HEADER_SLIDER_BOX_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+#define HEADER_PINGUS_COMPONENTS_SLIDER_BOX_HPP
#include <string>
#include <boost/signal.hpp>
Modified: trunk/pingus/src/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/components/smallmap.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/components/smallmap.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SMALLMAP_HPP
-#define HEADER_PINGUS_SMALLMAP_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_SMALLMAP_HPP
+#define HEADER_PINGUS_COMPONENTS_SMALLMAP_HPP
#include "pingus/sprite.hpp"
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/components/time_display.hpp
===================================================================
--- trunk/pingus/src/components/time_display.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/components/time_display.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_TIME_DISPLAY_HPP
-#define HEADER_PINGUS_TIME_DISPLAY_HPP
+#ifndef HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
+#define HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
#include "gui/component.hpp"
Modified: trunk/pingus/src/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_DELTA_FRAMEBUFFER_HPP
-#define HEADER_DELTA_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_DELTA_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_DISPLAY_DELTA_FRAMEBUFFER_HPP
#include <memory>
#include <map>
Modified: trunk/pingus/src/display/display.hpp
===================================================================
--- trunk/pingus/src/display/display.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/display/display.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DISPLAY_HPP
-#define HEADER_PINGUS_DISPLAY_HPP
+#ifndef HEADER_PINGUS_DISPLAY_DISPLAY_HPP
+#define HEADER_PINGUS_DISPLAY_DISPLAY_HPP
#include <memory>
#include <list>
Modified: trunk/pingus/src/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/display/drawing_context.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/drawing_context.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_DRAWING_CONTEXT_HPP
-#define HEADER_DRAWING_CONTEXT_HPP
+#ifndef HEADER_PINGUS_DISPLAY_DRAWING_CONTEXT_HPP
+#define HEADER_PINGUS_DISPLAY_DRAWING_CONTEXT_HPP
#include "SDL.h"
#include <vector>
Modified: trunk/pingus/src/display/drawing_request.hpp
===================================================================
--- trunk/pingus/src/display/drawing_request.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/drawing_request.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_DRAWING_REQUEST_HPP
-#define HEADER_DRAWING_REQUEST_HPP
+#ifndef HEADER_PINGUS_DISPLAY_DRAWING_REQUEST_HPP
+#define HEADER_PINGUS_DISPLAY_DRAWING_REQUEST_HPP
#include "SDL.h"
#include "math/vector2i.hpp"
Modified: trunk/pingus/src/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/display/framebuffer.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FRAMEBUFFER_HPP
-#define HEADER_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_DISPLAY_FRAMEBUFFER_HPP
#include <vector>
#include "SDL.h"
Modified: trunk/pingus/src/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer_surface.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/framebuffer_surface.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FRAMEBUFFER_SURFACE_HPP
-#define HEADER_FRAMEBUFFER_SURFACE_HPP
+#ifndef HEADER_PINGUS_DISPLAY_FRAMEBUFFER_SURFACE_HPP
+#define HEADER_PINGUS_DISPLAY_FRAMEBUFFER_SURFACE_HPP
#include <boost/smart_ptr.hpp>
Modified: trunk/pingus/src/display/null_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/null_framebuffer.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_NULL_FRAMEBUFFER_HPP
-#define HEADER_NULL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
#include "display/framebuffer.hpp"
Modified: trunk/pingus/src/display/opengl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/opengl_framebuffer.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OPENGL_FRAMEBUFFER_HPP
-#define HEADER_OPENGL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
#include "display/framebuffer.hpp"
Modified: trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/display/opengl_framebuffer_surface_impl.hpp
2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
-#define HEADER_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#ifndef HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#define HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_SURFACE_IMPL_HPP
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
Modified: trunk/pingus/src/display/rect_merger.hpp
===================================================================
--- trunk/pingus/src/display/rect_merger.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/display/rect_merger.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_RECT_MERGER_HPP
-#define HEADER_RECT_MERGER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_RECT_MERGER_HPP
+#define HEADER_PINGUS_DISPLAY_RECT_MERGER_HPP
#include <vector>
#include "math/rect.hpp"
Modified: trunk/pingus/src/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/display/scene_context.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/display/scene_context.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SCENE_CONTEXT_HPP
-#define HEADER_SCENE_CONTEXT_HPP
+#ifndef HEADER_PINGUS_DISPLAY_SCENE_CONTEXT_HPP
+#define HEADER_PINGUS_DISPLAY_SCENE_CONTEXT_HPP
#include "SDL.h"
#include "display/drawing_context.hpp"
Modified: trunk/pingus/src/display/scene_group.hpp
===================================================================
--- trunk/pingus/src/display/scene_group.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/display/scene_group.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SCENE_GROUP_HPP
-#define HEADER_SCENE_GROUP_HPP
+#ifndef HEADER_PINGUS_DISPLAY_SCENE_GROUP_HPP
+#define HEADER_PINGUS_DISPLAY_SCENE_GROUP_HPP
/** */
class Scene_Group
Modified: trunk/pingus/src/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/display/sdl_framebuffer.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SDL_FRAMEBUFFER_HPP
-#define HEADER_SDL_FRAMEBUFFER_HPP
+#ifndef HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_HPP
+#define HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_HPP
#include <vector>
#include "SDL.h"
Modified: trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-04
05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
-#define HEADER_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#ifndef HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
+#define HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#include "SDL.h"
#include "display/framebuffer_surface.hpp"
Modified: trunk/pingus/src/editor/action_properties.hpp
===================================================================
--- trunk/pingus/src/editor/action_properties.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/editor/action_properties.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_ACTION_PROPERTIES_HPP
-#define HEADER_ACTION_PROPERTIES_HPP
+#ifndef HEADER_PINGUS_EDITOR_ACTION_PROPERTIES_HPP
+#define HEADER_PINGUS_EDITOR_ACTION_PROPERTIES_HPP
#include <map>
Modified: trunk/pingus/src/editor/button.hpp
===================================================================
--- trunk/pingus/src/editor/button.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/editor/button.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_BUTTON_HPP
-#define HEADER_BUTTON_HPP
+#ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+#define HEADER_PINGUS_EDITOR_BUTTON_HPP
#include <boost/signal.hpp>
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/checkbox.hpp
===================================================================
--- trunk/pingus/src/editor/checkbox.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/checkbox.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_CHECKBOX_HPP
-#define HEADER_CHECKBOX_HPP
+#ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+#define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
#include <boost/signal.hpp>
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/combobox.hpp
===================================================================
--- trunk/pingus/src/editor/combobox.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/combobox.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -15,8 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GUI_COMBOBOX_HPP
-#define HEADER_PINGUS_GUI_COMBOBOX_HPP
+#ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+#define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
#include <vector>
#include <string>
Modified: trunk/pingus/src/editor/editor_level.hpp
===================================================================
--- trunk/pingus/src/editor/editor_level.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/editor_level.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -15,8 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_EDITOR_EDITORLEVEL_HPP
-#define HEADER_PINGUS_EDITOR_EDITORLEVEL_HPP
+#ifndef HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
+#define HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
#include <vector>
#include "editor/level_impl.hpp"
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -15,8 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_EDITOR_SCREEN_HPP
-#define HEADER_PINGUS_EDITOR_SCREEN_HPP
+#ifndef HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
+#define HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
#include "screen/gui_screen.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/editor/file_dialog.hpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/file_dialog.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FILE_DIALOG_HPP
-#define HEADER_FILE_DIALOG_HPP
+#ifndef HEADER_PINGUS_EDITOR_FILE_DIALOG_HPP
+#define HEADER_PINGUS_EDITOR_FILE_DIALOG_HPP
#include "editor/file_list.hpp"
#include "gui/group_component.hpp"
Modified: trunk/pingus/src/editor/file_list.hpp
===================================================================
--- trunk/pingus/src/editor/file_list.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/file_list.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FILE_LIST_HPP
-#define HEADER_FILE_LIST_HPP
+#ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+#define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
#include <boost/signal.hpp>
Modified: trunk/pingus/src/editor/gui_style.hpp
===================================================================
--- trunk/pingus/src/editor/gui_style.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/gui_style.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_GUI_STYLE_HPP
-#define HEADER_GUI_STYLE_HPP
+#ifndef HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
+#define HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
#include "math/rect.hpp"
#include "display/drawing_context.hpp"
Modified: trunk/pingus/src/editor/inputbox.hpp
===================================================================
--- trunk/pingus/src/editor/inputbox.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/inputbox.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUTBOX_HPP
-#define HEADER_INPUTBOX_HPP
+#ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+#define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
#include <boost/signal.hpp>
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/label.hpp
===================================================================
--- trunk/pingus/src/editor/label.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/editor/label.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LABEL_HPP
-#define HEADER_LABEL_HPP
+#ifndef HEADER_PINGUS_EDITOR_LABEL_HPP
+#define HEADER_PINGUS_EDITOR_LABEL_HPP
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/level_properties.hpp
===================================================================
--- trunk/pingus/src/editor/level_properties.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/editor/level_properties.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LEVEL_PROPERTIES_HPP
-#define HEADER_LEVEL_PROPERTIES_HPP
+#ifndef HEADER_PINGUS_EDITOR_LEVEL_PROPERTIES_HPP
+#define HEADER_PINGUS_EDITOR_LEVEL_PROPERTIES_HPP
#include "gui/group_component.hpp"
Modified: trunk/pingus/src/editor/object_properties.hpp
===================================================================
--- trunk/pingus/src/editor/object_properties.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/editor/object_properties.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_EDITOR_OBJECT_PROPERTIES_HPP
-#define HEADER_EDITOR_OBJECT_PROPERTIES_HPP
+#ifndef HEADER_PINGUS_EDITOR_OBJECT_PROPERTIES_HPP
+#define HEADER_PINGUS_EDITOR_OBJECT_PROPERTIES_HPP
#include "gui/group_component.hpp"
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OBJECT_SELECTOR_HPP
-#define HEADER_OBJECT_SELECTOR_HPP
+#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
+#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
#include "gui/component.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/editor/object_selector_list.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/editor/object_selector_list.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OBJECT_SELECTOR_LIST_HPP
-#define HEADER_OBJECT_SELECTOR_LIST_HPP
+#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
+#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_LIST_HPP
#include "pingus/sprite.hpp"
#include "gui/rect_component.hpp"
Modified: trunk/pingus/src/editor/object_selector_set.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/editor/object_selector_set.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OBJECT_SELECTOR_SET_HPP
-#define HEADER_OBJECT_SELECTOR_SET_HPP
+#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_SET_HPP
+#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_SET_HPP
#include <vector>
#include "math/size.hpp"
Modified: trunk/pingus/src/gui/game_delta_recorder.hpp
===================================================================
--- trunk/pingus/src/gui/game_delta_recorder.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/gui/game_delta_recorder.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GAME_DELTA_RECORDER_HPP
-#define HEADER_PINGUS_GAME_DELTA_RECORDER_HPP
+#ifndef HEADER_PINGUS_GUI_GAME_DELTA_RECORDER_HPP
+#define HEADER_PINGUS_GUI_GAME_DELTA_RECORDER_HPP
class GameDeltaRecorder
Modified: trunk/pingus/src/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/input/control.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUT_CONTROL_HPP
-#define HEADER_INPUT_CONTROL_HPP
+#ifndef HEADER_PINGUS_INPUT_CONTROL_HPP
+#define HEADER_PINGUS_INPUT_CONTROL_HPP
#include <iostream>
#include <vector>
Modified: trunk/pingus/src/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/input/controller_description.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/input/controller_description.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUT_CONTROLLER_DESCRIPTION_HPP
-#define HEADER_INPUT_CONTROLLER_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_INPUT_CONTROLLER_DESCRIPTION_HPP
+#define HEADER_PINGUS_INPUT_CONTROLLER_DESCRIPTION_HPP
#include <map>
#include <string>
Modified: trunk/pingus/src/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/input/core_driver.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/core_driver.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_CORE_DRIVER_HPP
-#define HEADER_CORE_DRIVER_HPP
+#ifndef HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
+#define HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
#include "input/driver.hpp"
Modified: trunk/pingus/src/input/evdev_device.hpp
===================================================================
--- trunk/pingus/src/input/evdev_device.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/evdev_device.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_EVDEV_DEVICE_HPP
-#define HEADER_EVDEV_DEVICE_HPP
+#ifndef HEADER_PINGUS_INPUT_EVDEV_DEVICE_HPP
+#define HEADER_PINGUS_INPUT_EVDEV_DEVICE_HPP
#include <vector>
#include <string.h>
Modified: trunk/pingus/src/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/sdl_driver.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUT_SDL_DRIVER_HPP
-#define HEADER_INPUT_SDL_DRIVER_HPP
+#ifndef HEADER_PINGUS_INPUT_SDL_DRIVER_HPP
+#define HEADER_PINGUS_INPUT_SDL_DRIVER_HPP
#include <map>
#include <vector>
Modified: trunk/pingus/src/input/usbmouse_driver.hpp
===================================================================
--- trunk/pingus/src/input/usbmouse_driver.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/usbmouse_driver.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_USBMOUSE_DRIVER_HPP
-#define HEADER_USBMOUSE_DRIVER_HPP
+#ifndef HEADER_PINGUS_INPUT_USBMOUSE_DRIVER_HPP
+#define HEADER_PINGUS_INPUT_USBMOUSE_DRIVER_HPP
#include <vector>
#include "input/driver.hpp"
Modified: trunk/pingus/src/input/wiimote.hpp
===================================================================
--- trunk/pingus/src/input/wiimote.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/input/wiimote.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_WIIMOTE_HPP
-#define HEADER_WIIMOTE_HPP
+#ifndef HEADER_PINGUS_INPUT_WIIMOTE_HPP
+#define HEADER_PINGUS_INPUT_WIIMOTE_HPP
#include <vector>
#include "cwiid.h"
Modified: trunk/pingus/src/input/wiimote_driver.hpp
===================================================================
--- trunk/pingus/src/input/wiimote_driver.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/wiimote_driver.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_WIIMOTE_DRIVER_HPP
-#define HEADER_WIIMOTE_DRIVER_HPP
+#ifndef HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
+#define HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
#include "input/driver.hpp"
Modified: trunk/pingus/src/input/xinput_device.hpp
===================================================================
--- trunk/pingus/src/input/xinput_device.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/xinput_device.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUT_XINPUT_DEVICE_HPP
-#define HEADER_INPUT_XINPUT_DEVICE_HPP
+#ifndef HEADER_PINGUS_INPUT_XINPUT_DEVICE_HPP
+#define HEADER_PINGUS_INPUT_XINPUT_DEVICE_HPP
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Modified: trunk/pingus/src/input/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/input/xinput_driver.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input/xinput_driver.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_INPUT_XINPUT_DRIVER_HPP
-#define HEADER_INPUT_XINPUT_DRIVER_HPP
+#ifndef HEADER_PINGUS_INPUT_XINPUT_DRIVER_HPP
+#define HEADER_PINGUS_INPUT_XINPUT_DRIVER_HPP
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Modified: trunk/pingus/src/input_old/axis.hpp
===================================================================
--- trunk/pingus/src/input_old/axis.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/input_old/axis.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_AXIS_HPP
-#define HEADER_PINGUS_INPUT_AXIS_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_AXIS_HPP
+#define HEADER_PINGUS_INPUT_OLD_AXIS_HPP
#include "pingus.hpp"
Modified: trunk/pingus/src/input_old/axis_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/axis_factory.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/axis_factory.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_AXIS_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_AXIS_FACTORY_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_AXIS_FACTORY_HPP
+#define HEADER_PINGUS_INPUT_OLD_AXIS_FACTORY_HPP
#include "file_reader.hpp"
Modified: trunk/pingus/src/input_old/button.hpp
===================================================================
--- trunk/pingus/src/input_old/button.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/button.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_BUTTON_HPP
-#define HEADER_PINGUS_INPUT_BUTTON_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_BUTTON_HPP
+#define HEADER_PINGUS_INPUT_OLD_BUTTON_HPP
#include "pingus.hpp"
#include "controller.hpp"
Modified: trunk/pingus/src/input_old/button_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/button_factory.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/input_old/button_factory.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_BUTTON_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_BUTTON_FACTORY_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_BUTTON_FACTORY_HPP
+#define HEADER_PINGUS_INPUT_OLD_BUTTON_FACTORY_HPP
#include "file_reader.hpp"
Modified: trunk/pingus/src/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/input_old/controller.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/controller.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_CONTROLLER_HPP
-#define HEADER_PINGUS_INPUT_CONTROLLER_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_CONTROLLER_HPP
+#define HEADER_PINGUS_INPUT_OLD_CONTROLLER_HPP
#include <map>
#include <list>
Modified: trunk/pingus/src/input_old/event.hpp
===================================================================
--- trunk/pingus/src/input_old/event.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/event.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_EVENT_HPP
-#define HEADER_PINGUS_INPUT_EVENT_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_EVENT_HPP
+#define HEADER_PINGUS_INPUT_OLD_EVENT_HPP
#include <vector>
#include <string>
Modified: trunk/pingus/src/input_old/event_fwd.hpp
===================================================================
--- trunk/pingus/src/input_old/event_fwd.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/event_fwd.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_EVENT_FWD_HPP
-#define HEADER_PINGUS_INPUT_EVENT_FWD_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_EVENT_FWD_HPP
+#define HEADER_PINGUS_INPUT_OLD_EVENT_FWD_HPP
#include <vector>
Modified: trunk/pingus/src/input_old/pointer.hpp
===================================================================
--- trunk/pingus/src/input_old/pointer.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/pointer.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_POINTER_HPP
-#define HEADER_PINGUS_INPUT_POINTER_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_POINTER_HPP
+#define HEADER_PINGUS_INPUT_OLD_POINTER_HPP
#include "pingus.hpp"
Modified: trunk/pingus/src/input_old/pointer_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/pointer_factory.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/input_old/pointer_factory.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_POINTER_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_POINTER_FACTORY_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_POINTER_FACTORY_HPP
+#define HEADER_PINGUS_INPUT_OLD_POINTER_FACTORY_HPP
#include "file_reader.hpp"
Modified: trunk/pingus/src/input_old/scroller.hpp
===================================================================
--- trunk/pingus/src/input_old/scroller.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/input_old/scroller.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_SCROLLER_HPP
-#define HEADER_PINGUS_INPUT_SCROLLER_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_SCROLLER_HPP
+#define HEADER_PINGUS_INPUT_OLD_SCROLLER_HPP
#include "pingus.hpp"
Modified: trunk/pingus/src/input_old/scroller_factory.hpp
===================================================================
--- trunk/pingus/src/input_old/scroller_factory.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/input_old/scroller_factory.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_INPUT_SCROLLER_FACTORY_HPP
-#define HEADER_PINGUS_INPUT_SCROLLER_FACTORY_HPP
+#ifndef HEADER_PINGUS_INPUT_OLD_SCROLLER_FACTORY_HPP
+#define HEADER_PINGUS_INPUT_OLD_SCROLLER_FACTORY_HPP
#include "file_reader.hpp"
Modified: trunk/pingus/src/math/color.hpp
===================================================================
--- trunk/pingus/src/math/color.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/math/color.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_MATH_COLOR_HPP
-#define HEADER_MATH_COLOR_HPP
+#ifndef HEADER_PINGUS_MATH_COLOR_HPP
+#define HEADER_PINGUS_MATH_COLOR_HPP
#include "SDL.h"
Modified: trunk/pingus/src/math/math.hpp
===================================================================
--- trunk/pingus/src/math/math.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/math/math.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_MATH_HPP
-#define HEADER_PINGUS_MATH_HPP
+#ifndef HEADER_PINGUS_MATH_MATH_HPP
+#define HEADER_PINGUS_MATH_MATH_HPP
#include <assert.h>
#include <stdlib.h>
Modified: trunk/pingus/src/math/quad_tree.hpp
===================================================================
--- trunk/pingus/src/math/quad_tree.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/math/quad_tree.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -16,8 +16,8 @@
** along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef HEADER_GALAPIX_MATH_QUAD_TREE_HPP
-#define HEADER_GALAPIX_MATH_QUAD_TREE_HPP
+#ifndef HEADER_PINGUS_MATH_QUAD_TREE_HPP
+#define HEADER_PINGUS_MATH_QUAD_TREE_HPP
#include <vector>
#include <memory>
Modified: trunk/pingus/src/math/size.hpp
===================================================================
--- trunk/pingus/src/math/size.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/math/size.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -30,8 +30,8 @@
//! clanCore="Math"
//! header=core.h
-#ifndef HEADER_MATH_SIZE_HPP
-#define HEADER_MATH_SIZE_HPP
+#ifndef HEADER_PINGUS_MATH_SIZE_HPP
+#define HEADER_PINGUS_MATH_SIZE_HPP
#if _MSC_VER > 1000
#pragma once
Modified: trunk/pingus/src/math/vector2i.hpp
===================================================================
--- trunk/pingus/src/math/vector2i.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/math/vector2i.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_VECTOR2_HPP
-#define HEADER_VECTOR2_HPP
+#ifndef HEADER_PINGUS_MATH_VECTOR2I_HPP
+#define HEADER_PINGUS_MATH_VECTOR2I_HPP
#include <iosfwd>
Modified: trunk/pingus/src/movers/linear_mover.hpp
===================================================================
--- trunk/pingus/src/movers/linear_mover.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/movers/linear_mover.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_LINEAR_MOVER_HPP
-#define HEADER_PINGUS_LINEAR_MOVER_HPP
+#ifndef HEADER_PINGUS_MOVERS_LINEAR_MOVER_HPP
+#define HEADER_PINGUS_MOVERS_LINEAR_MOVER_HPP
#include "pingus/mover.hpp"
Modified: trunk/pingus/src/pingus/action_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/action_holder.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_ACTION_HOLDER_HPP
-#define HEADER_PINGUS_ACTION_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_ACTION_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_ACTION_HOLDER_HPP
#include <map>
#include <vector>
Modified: trunk/pingus/src/pingus/addon_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/addon_menu.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/addon_menu.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_ADDON_MENU_HPP
-#define HEADER_ADDON_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_ADDON_MENU_HPP
+#define HEADER_PINGUS_PINGUS_ADDON_MENU_HPP
#include "pingus/sprite.hpp"
#include "screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/blitter.hpp
===================================================================
--- trunk/pingus/src/pingus/blitter.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/blitter.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_BLITTER_HPP
-#define HEADER_PINGUS_BLITTER_HPP
+#ifndef HEADER_PINGUS_PINGUS_BLITTER_HPP
+#define HEADER_PINGUS_PINGUS_BLITTER_HPP
#include "SDL.h"
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/blitter_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/blitter_impl.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/blitter_impl.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_BLITTER_IMPL_HPP
-#define HEADER_PINGUS_BLITTER_IMPL_HPP
+#ifndef HEADER_PINGUS_PINGUS_BLITTER_IMPL_HPP
+#define HEADER_PINGUS_PINGUS_BLITTER_IMPL_HPP
#include <iostream>
#include "pingus/surface.hpp"
Modified: trunk/pingus/src/pingus/capture_rectangle.hpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/capture_rectangle.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_CAPTURE_RECTANGLE_HPP
-#define HEADER_PINGUS_CAPTURE_RECTANGLE_HPP
+#ifndef HEADER_PINGUS_PINGUS_CAPTURE_RECTANGLE_HPP
+#define HEADER_PINGUS_PINGUS_CAPTURE_RECTANGLE_HPP
#include "pingus/font.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/collider.hpp
===================================================================
--- trunk/pingus/src/pingus/collider.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/collider.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_COLLIDER_HPP
-#define HEADER_PINGUS_COLLIDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_COLLIDER_HPP
+#define HEADER_PINGUS_PINGUS_COLLIDER_HPP
class Vector3f;
Modified: trunk/pingus/src/pingus/collision_map.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/collision_map.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_COL_MAP_HPP
-#define HEADER_PINGUS_COL_MAP_HPP
+#ifndef HEADER_PINGUS_PINGUS_COLLISION_MAP_HPP
+#define HEADER_PINGUS_PINGUS_COLLISION_MAP_HPP
#include "SDL.h"
#include "pingus/groundtype.hpp"
Modified: trunk/pingus/src/pingus/collision_mask.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/collision_mask.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_COLLISION_MASK_HPP
-#define HEADER_PINGUS_COLLISION_MASK_HPP
+#ifndef HEADER_PINGUS_PINGUS_COLLISION_MASK_HPP
+#define HEADER_PINGUS_PINGUS_COLLISION_MASK_HPP
#include <string>
#include "pingus/surface.hpp"
Modified: trunk/pingus/src/pingus/config_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/config_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_CONFIG_MANAGER_HPP
-#define HEADER_CONFIG_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
#include <string>
#include <boost/signal.hpp>
Modified: trunk/pingus/src/pingus/credits.hpp
===================================================================
--- trunk/pingus/src/pingus/credits.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/credits.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_CREDITS_HPP
-#define HEADER_PINGUS_CREDITS_HPP
+#ifndef HEADER_PINGUS_PINGUS_CREDITS_HPP
+#define HEADER_PINGUS_PINGUS_CREDITS_HPP
#include <string>
#include <vector>
Modified: trunk/pingus/src/pingus/debug.hpp
===================================================================
--- trunk/pingus/src/pingus/debug.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/debug.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DEBUG_HPP
-#define HEADER_PINGUS_DEBUG_HPP
+#ifndef HEADER_PINGUS_PINGUS_DEBUG_HPP
+#define HEADER_PINGUS_PINGUS_DEBUG_HPP
#include "util/debug_stream.hpp"
Modified: trunk/pingus/src/pingus/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/demo_session.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DEMO_SESSION_HPP
-#define HEADER_PINGUS_DEMO_SESSION_HPP
+#ifndef HEADER_PINGUS_PINGUS_DEMO_SESSION_HPP
+#define HEADER_PINGUS_PINGUS_DEMO_SESSION_HPP
#include <memory>
#include "screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/direction.hpp
===================================================================
--- trunk/pingus/src/pingus/direction.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/direction.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DIRECTION_HPP
-#define HEADER_PINGUS_DIRECTION_HPP
+#ifndef HEADER_PINGUS_PINGUS_DIRECTION_HPP
+#define HEADER_PINGUS_PINGUS_DIRECTION_HPP
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/font.hpp
===================================================================
--- trunk/pingus/src/pingus/font.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/font.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FONT_HPP
-#define HEADER_FONT_HPP
+#ifndef HEADER_PINGUS_PINGUS_FONT_HPP
+#define HEADER_PINGUS_PINGUS_FONT_HPP
#include <string>
#include <boost/shared_ptr.hpp>
Modified: trunk/pingus/src/pingus/font_description.hpp
===================================================================
--- trunk/pingus/src/pingus/font_description.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/font_description.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FONT_DESCRIPTION_HPP
-#define HEADER_FONT_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_PINGUS_FONT_DESCRIPTION_HPP
+#define HEADER_PINGUS_PINGUS_FONT_DESCRIPTION_HPP
#include <string>
#include "math/vector2i.hpp"
Modified: trunk/pingus/src/pingus/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FONT_TEST_SCREEN_HPP
-#define HEADER_FONT_TEST_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
#include "screen/screen.hpp"
#include "pingus/font.hpp"
Modified: trunk/pingus/src/pingus/fonts.hpp
===================================================================
--- trunk/pingus/src/pingus/fonts.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/fonts.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_FONTS_HPP
-#define HEADER_PINGUS_FONTS_HPP
+#ifndef HEADER_PINGUS_PINGUS_FONTS_HPP
+#define HEADER_PINGUS_PINGUS_FONTS_HPP
#include "display/drawing_context.hpp"
#include "pingus/font.hpp"
Modified: trunk/pingus/src/pingus/fps_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/fps_counter.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_FPS_COUNTER_HPP
-#define HEADER_PINGUS_FPS_COUNTER_HPP
+#ifndef HEADER_PINGUS_PINGUS_FPS_COUNTER_HPP
+#define HEADER_PINGUS_PINGUS_FPS_COUNTER_HPP
#include <string>
Modified: trunk/pingus/src/pingus/game_event.hpp
===================================================================
--- trunk/pingus/src/pingus/game_event.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/game_event.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GAME_EVENT_HPP
-#define HEADER_PINGUS_GAME_EVENT_HPP
+#ifndef HEADER_PINGUS_PINGUS_GAME_EVENT_HPP
+#define HEADER_PINGUS_PINGUS_GAME_EVENT_HPP
#error "Don't used this the moment, its underdevelopment and not compilable"
Modified: trunk/pingus/src/pingus/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/game_session.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/game_session.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GAME_SESSION_HPP
-#define HEADER_PINGUS_GAME_SESSION_HPP
+#ifndef HEADER_PINGUS_PINGUS_GAME_SESSION_HPP
+#define HEADER_PINGUS_PINGUS_GAME_SESSION_HPP
#include <string>
#include <memory>
Modified: trunk/pingus/src/pingus/game_time.hpp
===================================================================
--- trunk/pingus/src/pingus/game_time.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/game_time.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GAME_TIME_HPP
-#define HEADER_PINGUS_GAME_TIME_HPP
+#ifndef HEADER_PINGUS_PINGUS_GAME_TIME_HPP
+#define HEADER_PINGUS_PINGUS_GAME_TIME_HPP
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/global_event.hpp
===================================================================
--- trunk/pingus/src/pingus/global_event.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/global_event.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GLOBAL_EVENT_HPP
-#define HEADER_PINGUS_GLOBAL_EVENT_HPP
+#ifndef HEADER_PINGUS_PINGUS_GLOBAL_EVENT_HPP
+#define HEADER_PINGUS_PINGUS_GLOBAL_EVENT_HPP
#include "SDL.h"
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/globals.hpp
===================================================================
--- trunk/pingus/src/pingus/globals.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/globals.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -17,8 +17,8 @@
/** This file defines some global variables, most of them are used to
keep the values of command line arguments. */
-#ifndef HEADER_PINGUS_GLOBALS_HPP
-#define HEADER_PINGUS_GLOBALS_HPP
+#ifndef HEADER_PINGUS_PINGUS_GLOBALS_HPP
+#define HEADER_PINGUS_PINGUS_GLOBALS_HPP
#include "pingus/pingus.hpp"
#include <string>
Modified: trunk/pingus/src/pingus/goal_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/goal_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GOAL_MANAGER_HPP
-#define HEADER_PINGUS_GOAL_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_GOAL_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_GOAL_MANAGER_HPP
class Server;
Modified: trunk/pingus/src/pingus/graphic_context_state.hpp
===================================================================
--- trunk/pingus/src/pingus/graphic_context_state.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/graphic_context_state.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_GRAPHIC_CONTEXT_STATE_HPP
-#define HEADER_GRAPHIC_CONTEXT_STATE_HPP
+#ifndef HEADER_PINGUS_PINGUS_GRAPHIC_CONTEXT_STATE_HPP
+#define HEADER_PINGUS_PINGUS_GRAPHIC_CONTEXT_STATE_HPP
#include <boost/shared_ptr.hpp>
#include "math/rect.hpp"
Modified: trunk/pingus/src/pingus/ground_map.hpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/ground_map.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GROUND_MAP_HPP
-#define HEADER_PINGUS_GROUND_MAP_HPP
+#ifndef HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
+#define HEADER_PINGUS_PINGUS_GROUND_MAP_HPP
#include <vector>
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/groundtype.hpp
===================================================================
--- trunk/pingus/src/pingus/groundtype.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/groundtype.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GROUNDTYPE_HPP
-#define HEADER_PINGUS_GROUNDTYPE_HPP
+#ifndef HEADER_PINGUS_PINGUS_GROUNDTYPE_HPP
+#define HEADER_PINGUS_PINGUS_GROUNDTYPE_HPP
#include <string>
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_LAYER_MANAGER_HPP
-#define HEADER_PINGUS_LAYER_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_LAYER_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_LAYER_MANAGER_HPP
#include "math/math.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/level_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/level_menu.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LEVEL_MENU_HPP
-#define HEADER_LEVEL_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_LEVEL_MENU_HPP
+#define HEADER_PINGUS_PINGUS_LEVEL_MENU_HPP
#include "pingus/levelset.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/levelset.hpp
===================================================================
--- trunk/pingus/src/pingus/levelset.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/levelset.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LEVELSET_HPP
-#define HEADER_LEVELSET_HPP
+#ifndef HEADER_PINGUS_PINGUS_LEVELSET_HPP
+#define HEADER_PINGUS_PINGUS_LEVELSET_HPP
#include <string>
#include <vector>
Modified: trunk/pingus/src/pingus/line_iterator.hpp
===================================================================
--- trunk/pingus/src/pingus/line_iterator.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/line_iterator.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_LINE_ITERATOR_HPP
-#define HEADER_LINE_ITERATOR_HPP
+#ifndef HEADER_PINGUS_PINGUS_LINE_ITERATOR_HPP
+#define HEADER_PINGUS_PINGUS_LINE_ITERATOR_HPP
#include <string>
Modified: trunk/pingus/src/pingus/mover.hpp
===================================================================
--- trunk/pingus/src/pingus/mover.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/mover.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_MOVER_HPP
-#define HEADER_PINGUS_MOVER_HPP
+#ifndef HEADER_PINGUS_PINGUS_MOVER_HPP
+#define HEADER_PINGUS_PINGUS_MOVER_HPP
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/pingus/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/option_menu.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OPTION_MENU_HPP
-#define HEADER_OPTION_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_OPTION_MENU_HPP
+#define HEADER_PINGUS_PINGUS_OPTION_MENU_HPP
#include <vector>
#include <map>
Modified: trunk/pingus/src/pingus/path_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/path_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PATH_MANAGER_HPP
-#define HEADER_PINGUS_PATH_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PATH_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_PATH_MANAGER_HPP
#include "pingus/pingus.hpp"
#include "pingus/path_manager.hpp"
Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/pingu.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGU_HPP
-#define HEADER_PINGUS_PINGU_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGU_HPP
+#define HEADER_PINGUS_PINGUS_PINGU_HPP
#include <boost/shared_ptr.hpp>
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGU_ACTION_HPP
-#define HEADER_PINGUS_PINGU_ACTION_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
+#define HEADER_PINGUS_PINGUS_PINGU_ACTION_HPP
#include "pingus/pingu_enums.hpp"
#include "pingus/surface.hpp"
Modified: trunk/pingus/src/pingus/pingu_enums.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGU_ENUMS_HPP
-#define HEADER_PINGUS_PINGU_ENUMS_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGU_ENUMS_HPP
+#define HEADER_PINGUS_PINGUS_PINGU_ENUMS_HPP
#include "pingus/pingus.hpp"
#include <string>
Modified: trunk/pingus/src/pingus/pingu_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGU_HOLDER_HPP
-#define HEADER_PINGUS_PINGU_HOLDER_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGU_HOLDER_HPP
+#define HEADER_PINGUS_PINGUS_PINGU_HOLDER_HPP
#include <list>
#include <vector>
Modified: trunk/pingus/src/pingus/pingus.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/pingus.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGUS_HPP
-#define HEADER_PINGUS_PINGUS_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_HPP
/**
* Multiple hacks, workarounds and helper things which are included
Modified: trunk/pingus/src/pingus/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DEMO_HPP
-#define HEADER_PINGUS_DEMO_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_DEMO_HPP
class Pathname;
Modified: trunk/pingus/src/pingus/pingus_error.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_error.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_error.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGUS_ERROR_HPP
-#define HEADER_PINGUS_PINGUS_ERROR_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_ERROR_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_ERROR_HPP
#include "pingus/pingus.hpp"
#include <string>
Modified: trunk/pingus/src/pingus/pingus_level.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_level.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_LEVEL_HPP
-#define HEADER_PINGUS_LEVEL_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_HPP
#include <string>
#include <vector>
Modified: trunk/pingus/src/pingus/pingus_level_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_LEVEL_IMPL_HPP
-#define HEADER_PINGUS_LEVEL_IMPL_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_LEVEL_IMPL_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_LEVEL_IMPL_HPP
#include "math/size.hpp"
#include "math/color.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_main.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGUS_MAIN_HPP
-#define HEADER_PINGUS_PINGUS_MAIN_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_MAIN_HPP
#include <string>
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PINGUS_MENU_HPP
-#define HEADER_PINGUS_PINGUS_MENU_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_MENU_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_MENU_HPP
#include <vector>
#include <memory>
Modified: trunk/pingus/src/pingus/pingus_options.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_options.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/pingus_options.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_OPTIONS_HPP
-#define HEADER_OPTIONS_HPP
+#ifndef HEADER_PINGUS_PINGUS_PINGUS_OPTIONS_HPP
+#define HEADER_PINGUS_PINGUS_PINGUS_OPTIONS_HPP
#include <string>
Modified: trunk/pingus/src/pingus/plf_res_mgr.hpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PLF_RES_MGR_HPP
-#define HEADER_PINGUS_PLF_RES_MGR_HPP
+#ifndef HEADER_PINGUS_PINGUS_PLF_RES_MGR_HPP
+#define HEADER_PINGUS_PINGUS_PLF_RES_MGR_HPP
#include "pingus/pingus_level.hpp"
#include "SDL.h"
Modified: trunk/pingus/src/pingus/res_descriptor.hpp
===================================================================
--- trunk/pingus/src/pingus/res_descriptor.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/res_descriptor.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_RES_DESCRIPTOR_HPP
-#define HEADER_PINGUS_RES_DESCRIPTOR_HPP
+#ifndef HEADER_PINGUS_PINGUS_RES_DESCRIPTOR_HPP
+#define HEADER_PINGUS_PINGUS_RES_DESCRIPTOR_HPP
#include "pingus/resource_modifier.hpp"
Modified: trunk/pingus/src/pingus/resource.hpp
===================================================================
--- trunk/pingus/src/pingus/resource.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/resource.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_RESOURCE_HPP
-#define HEADER_PINGUS_RESOURCE_HPP
+#ifndef HEADER_PINGUS_PINGUS_RESOURCE_HPP
+#define HEADER_PINGUS_PINGUS_RESOURCE_HPP
#include <map>
#include <vector>
Modified: trunk/pingus/src/pingus/resource_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/resource_manager.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_RESOURCE_MANAGER_HPP
-#define HEADER_RESOURCE_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_RESOURCE_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_RESOURCE_MANAGER_HPP
#include <string>
#include <map>
Modified: trunk/pingus/src/pingus/resource_modifier.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_modifier.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/resource_modifier.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_RESOURCE_MODIFIER_HPP
-#define HEADER_PINGUS_RESOURCE_MODIFIER_HPP
+#ifndef HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
+#define HEADER_PINGUS_PINGUS_RESOURCE_MODIFIER_HPP
#include "pingus/pingus.hpp"
#include <string>
Modified: trunk/pingus/src/pingus/result.hpp
===================================================================
--- trunk/pingus/src/pingus/result.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/result.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_RESULT_HPP
-#define HEADER_PINGUS_RESULT_HPP
+#ifndef HEADER_PINGUS_PINGUS_RESULT_HPP
+#define HEADER_PINGUS_PINGUS_RESULT_HPP
#include "pingus/pingus_level.hpp"
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/result_screen.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_RESULT_SCREEN_HPP
-#define HEADER_PINGUS_RESULT_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_RESULT_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_RESULT_SCREEN_HPP
#include "pingus/result.hpp"
#include "screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/savegame.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/savegame.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SAVEGAME_HPP
-#define HEADER_PINGUS_SAVEGAME_HPP
+#ifndef HEADER_PINGUS_PINGUS_SAVEGAME_HPP
+#define HEADER_PINGUS_PINGUS_SAVEGAME_HPP
#include <string>
Modified: trunk/pingus/src/pingus/savegame_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SAVEGAME_MANAGER_HPP
-#define HEADER_SAVEGAME_MANAGER_HPP
+#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/screenshot.hpp
===================================================================
--- trunk/pingus/src/pingus/screenshot.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/screenshot.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SCREENSHOT_HPP
-#define HEADER_PINGUS_SCREENSHOT_HPP
+#ifndef HEADER_PINGUS_PINGUS_SCREENSHOT_HPP
+#define HEADER_PINGUS_PINGUS_SCREENSHOT_HPP
#include "SDL.h"
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/pingus/server.hpp
===================================================================
--- trunk/pingus/src/pingus/server.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/server.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SERVER_HPP
-#define HEADER_PINGUS_SERVER_HPP
+#ifndef HEADER_PINGUS_PINGUS_SERVER_HPP
+#define HEADER_PINGUS_PINGUS_SERVER_HPP
#include "pingus/server_event.hpp"
#include "pingus/action_holder.hpp"
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/server_event.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SERVER_EVENT_HPP
-#define HEADER_PINGUS_SERVER_EVENT_HPP
+#ifndef HEADER_PINGUS_PINGUS_SERVER_EVENT_HPP
+#define HEADER_PINGUS_PINGUS_SERVER_EVENT_HPP
#include <iosfwd>
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/smallmap_image.hpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SMALLMAP_IMAGE_HPP
-#define HEADER_PINGUS_SMALLMAP_IMAGE_HPP
+#ifndef HEADER_PINGUS_PINGUS_SMALLMAP_IMAGE_HPP
+#define HEADER_PINGUS_PINGUS_SMALLMAP_IMAGE_HPP
#include "pingus/pingus.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/sprite.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/sprite.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SPRITE_HPP
-#define HEADER_SPRITE_HPP
+#ifndef HEADER_PINGUS_PINGUS_SPRITE_HPP
+#define HEADER_PINGUS_PINGUS_SPRITE_HPP
#include <string>
#include <boost/shared_ptr.hpp>
Modified: trunk/pingus/src/pingus/sprite_description.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite_description.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/sprite_description.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SPRITE_DESCRIPTION_HPP
-#define HEADER_SPRITE_DESCRIPTION_HPP
+#ifndef HEADER_PINGUS_PINGUS_SPRITE_DESCRIPTION_HPP
+#define HEADER_PINGUS_PINGUS_SPRITE_DESCRIPTION_HPP
#include <iostream>
#include "math/vector2i.hpp"
Modified: trunk/pingus/src/pingus/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SPRITE_IMPL_HPP
-#define HEADER_PINGUS_SPRITE_IMPL_HPP
+#ifndef HEADER_PINGUS_PINGUS_SPRITE_IMPL_HPP
+#define HEADER_PINGUS_PINGUS_SPRITE_IMPL_HPP
#include "pingus/surface.hpp"
#include "display/framebuffer_surface.hpp"
Modified: trunk/pingus/src/pingus/start_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/start_screen.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_START_SCREEN_HPP
-#define HEADER_PINGUS_START_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_START_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_START_SCREEN_HPP
#include "pingus/pingus_level.hpp"
#include "screen/gui_screen.hpp"
Modified: trunk/pingus/src/pingus/stat_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/stat_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_STAT_MANAGER_HPP
-#define HEADER_PINGUS_STAT_MANAGER_HPP
+#ifndef HEADER_PINGUS_PINGUS_STAT_MANAGER_HPP
+#define HEADER_PINGUS_PINGUS_STAT_MANAGER_HPP
#include <map>
#include <string>
Modified: trunk/pingus/src/pingus/state_sprite.hpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/state_sprite.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_STATE_SPRITE_HPP
-#define HEADER_STATE_SPRITE_HPP
+#ifndef HEADER_PINGUS_PINGUS_STATE_SPRITE_HPP
+#define HEADER_PINGUS_PINGUS_STATE_SPRITE_HPP
#include <map>
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/story_screen.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_STORY_SCREEN_HPP
-#define HEADER_PINGUS_STORY_SCREEN_HPP
+#ifndef HEADER_PINGUS_PINGUS_STORY_SCREEN_HPP
+#define HEADER_PINGUS_PINGUS_STORY_SCREEN_HPP
#include <string>
#include <memory>
Modified: trunk/pingus/src/pingus/string_format.hpp
===================================================================
--- trunk/pingus/src/pingus/string_format.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/string_format.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_STRING_FORMAT_HPP
-#define HEADER_PINGUS_STRING_FORMAT_HPP
+#ifndef HEADER_PINGUS_PINGUS_STRING_FORMAT_HPP
+#define HEADER_PINGUS_PINGUS_STRING_FORMAT_HPP
#include <string>
Modified: trunk/pingus/src/pingus/surface.hpp
===================================================================
--- trunk/pingus/src/pingus/surface.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/surface.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SURFACE_HPP
-#define HEADER_SURFACE_HPP
+#ifndef HEADER_PINGUS_PINGUS_SURFACE_HPP
+#define HEADER_PINGUS_PINGUS_SURFACE_HPP
#include "SDL.h"
#include <string>
Modified: trunk/pingus/src/pingus/world.hpp
===================================================================
--- trunk/pingus/src/pingus/world.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/pingus/world.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLD_HPP
-#define HEADER_PINGUS_WORLD_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLD_HPP
+#define HEADER_PINGUS_PINGUS_WORLD_HPP
#include "pingus/pingus.hpp"
#include <vector>
Modified: trunk/pingus/src/pingus/worldobj.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/pingus/worldobj.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDOBJ_HPP
-#define HEADER_PINGUS_WORLDOBJ_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJ_HPP
#include "pingus/pingus.hpp"
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/pingus/worldobj_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDOBJ_DATA_FACTORY_HPP
-#define HEADER_PINGUS_WORLDOBJ_DATA_FACTORY_HPP
+#ifndef HEADER_PINGUS_PINGUS_WORLDOBJ_FACTORY_HPP
+#define HEADER_PINGUS_PINGUS_WORLDOBJ_FACTORY_HPP
#include <map>
#include <string>
Modified: trunk/pingus/src/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/screen/gui_screen.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_GUISCREEN_HPP
-#define HEADER_PINGUS_GUISCREEN_HPP
+#ifndef HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
+#define HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
#include "screen/screen.hpp"
Modified: trunk/pingus/src/screen/screen.hpp
===================================================================
--- trunk/pingus/src/screen/screen.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/screen/screen.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SCREEN_HPP
-#define HEADER_PINGUS_SCREEN_HPP
+#ifndef HEADER_PINGUS_SCREEN_SCREEN_HPP
+#define HEADER_PINGUS_SCREEN_SCREEN_HPP
#include "SDL.h"
#include "math/size.hpp"
Modified: trunk/pingus/src/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/screen/screen_manager.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SCREEN_MANAGER_HPP
-#define HEADER_PINGUS_SCREEN_MANAGER_HPP
+#ifndef HEADER_PINGUS_SCREEN_SCREEN_MANAGER_HPP
+#define HEADER_PINGUS_SCREEN_SCREEN_MANAGER_HPP
#include "pingus/pingus.hpp"
#include <memory>
Modified: trunk/pingus/src/screen/screen_manager_impl.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager_impl.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/screen/screen_manager_impl.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SCREEN_MANAGER_IMPL_HPP
-#define HEADER_PINGUS_SCREEN_MANAGER_IMPL_HPP
+#ifndef HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
+#define HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
#include "screen/pingus.hpp"
Modified: trunk/pingus/src/sound/sound.hpp
===================================================================
--- trunk/pingus/src/sound/sound.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/sound/sound.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SOUND_HPP
-#define HEADER_PINGUS_SOUND_HPP
+#ifndef HEADER_PINGUS_SOUND_SOUND_HPP
+#define HEADER_PINGUS_SOUND_SOUND_HPP
#include <string>
#include "sound/sound_impl.hpp"
Modified: trunk/pingus/src/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/sound/sound_dummy.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SOUND_DUMMY_HPP
-#define HEADER_PINGUS_SOUND_DUMMY_HPP
+#ifndef HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
+#define HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
#include "sound/sound_impl.hpp"
#include "sound/sound.hpp"
Modified: trunk/pingus/src/sound/sound_impl.hpp
===================================================================
--- trunk/pingus/src/sound/sound_impl.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/sound/sound_impl.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SOUND_IMPL_HPP
-#define HEADER_PINGUS_SOUND_IMPL_HPP
+#ifndef HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
+#define HEADER_PINGUS_SOUND_SOUND_IMPL_HPP
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/sound/sound_real.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/sound/sound_real.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SOUND_REAL_HPP
-#define HEADER_PINGUS_SOUND_REAL_HPP
+#ifndef HEADER_PINGUS_SOUND_SOUND_REAL_HPP
+#define HEADER_PINGUS_SOUND_SOUND_REAL_HPP
#include "SDL_mixer.h"
#include <config.h>
Modified: trunk/pingus/src/sound/sound_res_mgr.hpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/sound/sound_res_mgr.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SOUND_RES_MGR_HPP
-#define HEADER_PINGUS_SOUND_RES_MGR_HPP
+#ifndef HEADER_PINGUS_SOUND_SOUND_RES_MGR_HPP
+#define HEADER_PINGUS_SOUND_SOUND_RES_MGR_HPP
#include <map>
#include "SDL_mixer.h"
Modified: trunk/pingus/src/util/command_line.hpp
===================================================================
--- trunk/pingus/src/util/command_line.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/command_line.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -30,8 +30,8 @@
//! clanCore="System"
//! header=core.h
-#ifndef HEADER_COMMAND_LINE_HPP
-#define HEADER_COMMAND_LINE_HPP
+#ifndef HEADER_PINGUS_UTIL_COMMAND_LINE_HPP
+#define HEADER_PINGUS_UTIL_COMMAND_LINE_HPP
#if _MSC_VER > 1000
#pragma once
Modified: trunk/pingus/src/util/command_line_generic.hpp
===================================================================
--- trunk/pingus/src/util/command_line_generic.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/util/command_line_generic.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -27,8 +27,8 @@
** (if your name is missing here, please add it)
*/
-#ifndef HEADER_COMMAND_LINE_GENERIC_HPP
-#define HEADER_COMMAND_LINE_GENERIC_HPP
+#ifndef HEADER_PINGUS_UTIL_COMMAND_LINE_GENERIC_HPP
+#define HEADER_PINGUS_UTIL_COMMAND_LINE_GENERIC_HPP
#if _MSC_VER > 1000
#pragma once
Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/debug_stream.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DEBUG_STREAM_HPP
-#define HEADER_PINGUS_DEBUG_STREAM_HPP
+#ifndef HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
+#define HEADER_PINGUS_UTIL_DEBUG_STREAM_HPP
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/util/file_reader.hpp
===================================================================
--- trunk/pingus/src/util/file_reader.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/file_reader.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_FILE_READER_HPP
-#define HEADER_PINGUS_FILE_READER_HPP
+#ifndef HEADER_PINGUS_UTIL_FILE_READER_HPP
+#define HEADER_PINGUS_UTIL_FILE_READER_HPP
#include <string>
#include <vector>
Modified: trunk/pingus/src/util/file_reader_impl.hpp
===================================================================
--- trunk/pingus/src/util/file_reader_impl.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/file_reader_impl.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_FILE_READER_IMPL_HPP
-#define HEADER_FILE_READER_IMPL_HPP
+#ifndef HEADER_PINGUS_UTIL_FILE_READER_IMPL_HPP
+#define HEADER_PINGUS_UTIL_FILE_READER_IMPL_HPP
#include <vector>
#include <string>
Modified: trunk/pingus/src/util/file_writer.hpp
===================================================================
--- trunk/pingus/src/util/file_writer.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/file_writer.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_FILE_WRITER_HPP
-#define HEADER_PINGUS_FILE_WRITER_HPP
+#ifndef HEADER_PINGUS_UTIL_FILE_WRITER_HPP
+#define HEADER_PINGUS_UTIL_FILE_WRITER_HPP
#include <string>
Modified: trunk/pingus/src/util/memory_pool.hpp
===================================================================
--- trunk/pingus/src/util/memory_pool.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/memory_pool.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_MEMORY_POOL_HPP
-#define HEADER_MEMORY_POOL_HPP
+#ifndef HEADER_PINGUS_UTIL_MEMORY_POOL_HPP
+#define HEADER_PINGUS_UTIL_MEMORY_POOL_HPP
#include <assert.h>
#include <vector>
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/util/pathname.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PATHNAME_HPP
-#define HEADER_PATHNAME_HPP
+#ifndef HEADER_PINGUS_UTIL_PATHNAME_HPP
+#define HEADER_PINGUS_UTIL_PATHNAME_HPP
#include <iosfwd>
#include <string>
Modified: trunk/pingus/src/util/sexpr_file_reader.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SEXPR_FILE_READER_HPP
-#define HEADER_SEXPR_FILE_READER_HPP
+#ifndef HEADER_PINGUS_UTIL_SEXPR_FILE_READER_HPP
+#define HEADER_PINGUS_UTIL_SEXPR_FILE_READER_HPP
#include "util/file_reader.hpp"
#include "lisp/lisp.hpp"
Modified: trunk/pingus/src/util/sexpr_file_writer.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SEXPR_FILE_WRITER_HPP
-#define HEADER_SEXPR_FILE_WRITER_HPP
+#ifndef HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
+#define HEADER_PINGUS_UTIL_SEXPR_FILE_WRITER_HPP
#include <iosfwd>
#include "util/file_writer.hpp"
Modified: trunk/pingus/src/util/string_util.hpp
===================================================================
--- trunk/pingus/src/util/string_util.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/util/string_util.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_STRING_UTIL_HPP
-#define HEADER_STRING_UTIL_HPP
+#ifndef HEADER_PINGUS_UTIL_STRING_UTIL_HPP
+#define HEADER_PINGUS_UTIL_STRING_UTIL_HPP
#include <sstream>
Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/util/system.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_SYSTEM_HPP
-#define HEADER_PINGUS_SYSTEM_HPP
+#ifndef HEADER_PINGUS_UTIL_SYSTEM_HPP
+#define HEADER_PINGUS_UTIL_SYSTEM_HPP
#include "pingus/pingus.hpp"
Modified: trunk/pingus/src/util/utf8.hpp
===================================================================
--- trunk/pingus/src/util/utf8.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/util/utf8.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -15,8 +15,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_UTF8_HPP
-#define HEADER_PINGUS_UTF8_HPP
+#ifndef HEADER_PINGUS_UTIL_UTF8_HPP
+#define HEADER_PINGUS_UTIL_UTF8_HPP
#include <stdint.h>
#include <string>
Modified: trunk/pingus/src/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/worldmap/dot.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DOT_HPP
-#define HEADER_PINGUS_DOT_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_DOT_HPP
+#define HEADER_PINGUS_WORLDMAP_DOT_HPP
#include <string>
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/dot_factory.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldmap/dot_factory.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DOT_FACTORY_HPP
-#define HEADER_PINGUS_DOT_FACTORY_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
+#define HEADER_PINGUS_WORLDMAP_DOT_FACTORY_HPP
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldmap/drawable.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_DRAWABLE_HPP
-#define HEADER_PINGUS_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_DRAWABLE_HPP
+#define HEADER_PINGUS_WORLDMAP_DRAWABLE_HPP
#include "pingus/pingus_error.hpp"
#include "util/file_reader.hpp"
Modified: trunk/pingus/src/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/worldmap/drawable_factory.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/drawable_factory.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_DRAWABLE_FACTORY_HPP
-#define HEADER_DRAWABLE_FACTORY_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
+#define HEADER_PINGUS_WORLDMAP_DRAWABLE_FACTORY_HPP
#include "worldmap/drawable.hpp"
Modified: trunk/pingus/src/worldmap/graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/graph.hpp 2009-11-04 05:21:04 UTC (rev 4012)
+++ trunk/pingus/src/worldmap/graph.hpp 2009-11-04 05:22:21 UTC (rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_GRAPH_HPP
-#define HEADER_GRAPH_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_GRAPH_HPP
+#define HEADER_PINGUS_WORLDMAP_GRAPH_HPP
#include <algorithm>
#include <assert.h>
Modified: trunk/pingus/src/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_drawable.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldmap/path_drawable.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PATH_DRAWABLE_HPP
-#define HEADER_PATH_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
+#define HEADER_PINGUS_WORLDMAP_PATH_DRAWABLE_HPP
#include "worldmap/drawable.hpp"
#include "worldmap/path_graph.hpp"
Modified: trunk/pingus/src/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldmap/path_graph.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PATH_GRAPH_HPP
-#define HEADER_PATH_GRAPH_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_PATH_GRAPH_HPP
+#define HEADER_PINGUS_WORLDMAP_PATH_GRAPH_HPP
#include <map>
#include <vector>
Modified: trunk/pingus/src/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/worldmap/pathfinder.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldmap/pathfinder.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PATHFINDER_HPP
-#define HEADER_PATHFINDER_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_PATHFINDER_HPP
+#define HEADER_PINGUS_WORLDMAP_PATHFINDER_HPP
#include <queue>
#include "worldmap/graph.hpp"
Modified: trunk/pingus/src/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDMAP_HPP
-#define HEADER_PINGUS_WORLDMAP_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
+#define HEADER_PINGUS_WORLDMAP_PINGUS_WORLDMAP_HPP
#include <boost/smart_ptr.hpp>
Modified: trunk/pingus/src/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/sprite_drawable.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_SURFACE_DRAWABLE_HPP
-#define HEADER_SURFACE_DRAWABLE_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
+#define HEADER_PINGUS_WORLDMAP_SPRITE_DRAWABLE_HPP
#include "pingus/sprite.hpp"
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/worldmap_component.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_WORLDMAP_COMPONENT_HPP
-#define HEADER_WORLDMAP_COMPONENT_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
+#define HEADER_PINGUS_WORLDMAP_WORLDMAP_COMPONENT_HPP
#include <string>
#include <memory>
Modified: trunk/pingus/src/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/worldmap_screen.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDMAP_MANAGER_HPP
-#define HEADER_PINGUS_WORLDMAP_MANAGER_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
+#define HEADER_PINGUS_WORLDMAP_WORLDMAP_SCREEN_HPP
#include <string>
#include <memory>
Modified: trunk/pingus/src/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldmap/worldmap_story.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDMAP_STORY_HPP
-#define HEADER_PINGUS_WORLDMAP_STORY_HPP
+#ifndef HEADER_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
+#define HEADER_PINGUS_WORLDMAP_WORLDMAP_STORY_HPP
#include <vector>
#include <string>
Modified: trunk/pingus/src/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldobjs/entrance.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_ENTRANCE_HPP
-#define HEADER_PINGUS_ENTRANCE_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_ENTRANCE_HPP
+#define HEADER_PINGUS_WORLDOBJS_ENTRANCE_HPP
#include "math/vector3f.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/worldobjs/fake_exit.hpp
===================================================================
--- trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldobjs/fake_exit.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_TRAPS_FAKE_EXIT_HPP
-#define HEADER_PINGUS_TRAPS_FAKE_EXIT_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
+#define HEADER_PINGUS_WORLDOBJS_FAKE_EXIT_HPP
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/worldobjs/rain_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldobjs/rain_generator.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PARTICLES_RAIN_GENERATOR_HPP
-#define HEADER_PINGUS_PARTICLES_RAIN_GENERATOR_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
+#define HEADER_PINGUS_WORLDOBJS_RAIN_GENERATOR_HPP
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/worldobjs/snow_generator.hpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldobjs/snow_generator.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_PARTICLES_SNOW_GENERATOR_HPP
-#define HEADER_PINGUS_PARTICLES_SNOW_GENERATOR_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
+#define HEADER_PINGUS_WORLDOBJS_SNOW_GENERATOR_HPP
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/worldobjs/spike.hpp
===================================================================
--- trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldobjs/spike.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_TRAPS_SPIKE_HPP
-#define HEADER_PINGUS_TRAPS_SPIKE_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_SPIKE_HPP
+#define HEADER_PINGUS_WORLDOBJS_SPIKE_HPP
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/worldobjs/starfield_background.hpp
===================================================================
--- trunk/pingus/src/worldobjs/starfield_background.hpp 2009-11-04 05:21:04 UTC
(rev 4012)
+++ trunk/pingus/src/worldobjs/starfield_background.hpp 2009-11-04 05:22:21 UTC
(rev 4013)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDOJBS_STARFIELD_BACKGROUND_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
#define HEADER_PINGUS_WORLDOBJS_STARFIELD_BACKGROUND_HPP
#include <vector>
Modified: trunk/pingus/src/worldobjs/woodthing.hpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.hpp 2009-11-04 05:21:04 UTC (rev
4012)
+++ trunk/pingus/src/worldobjs/woodthing.hpp 2009-11-04 05:22:21 UTC (rev
4013)
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#ifndef HEADER_PINGUS_WORLDOBJS_ENTRANCES_WOODTHING_HPP
-#define HEADER_PINGUS_WORLDOBJS_ENTRANCES_WOODTHING_HPP
+#ifndef HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
+#define HEADER_PINGUS_WORLDOBJS_WOODTHING_HPP
#include "worldobjs/entrance.hpp"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4013 - in trunk/pingus/src: colliders components display editor gui input input_old math movers pingus screen sound util worldmap worldobjs,
grumbel at BerliOS <=