[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4066 - in trunk/pingus/src: editor engine/display engine/d
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4066 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/wiimote engine/input/xinput engine/input_old engine/input_old/buttons engine/screen engine/sound math pingus pingus/actions pingus/components pingus/movers pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util |
|
Date: |
Fri, 6 Nov 2009 21:26:59 +0100 |
Author: grumbel
Date: 2009-11-06 21:26:48 +0100 (Fri, 06 Nov 2009)
New Revision: 4066
Modified:
trunk/pingus/src/editor/action_properties.cpp
trunk/pingus/src/editor/action_properties.hpp
trunk/pingus/src/editor/button.cpp
trunk/pingus/src/editor/button.hpp
trunk/pingus/src/editor/checkbox.cpp
trunk/pingus/src/editor/checkbox.hpp
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/combobox.hpp
trunk/pingus/src/editor/editor_level.cpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/editor/file_dialog.cpp
trunk/pingus/src/editor/file_dialog.hpp
trunk/pingus/src/editor/file_list.cpp
trunk/pingus/src/editor/file_list.hpp
trunk/pingus/src/editor/label.hpp
trunk/pingus/src/editor/level_objs.hpp
trunk/pingus/src/editor/level_properties.cpp
trunk/pingus/src/editor/level_properties.hpp
trunk/pingus/src/editor/minimap.cpp
trunk/pingus/src/editor/minimap.hpp
trunk/pingus/src/editor/object_properties.cpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/object_selector_list.hpp
trunk/pingus/src/editor/panel.cpp
trunk/pingus/src/editor/panel.hpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/editor/viewport.hpp
trunk/pingus/src/engine/display/blitter.cpp
trunk/pingus/src/engine/display/blitter_impl.hpp
trunk/pingus/src/engine/display/delta_framebuffer.cpp
trunk/pingus/src/engine/display/delta_framebuffer.hpp
trunk/pingus/src/engine/display/display.cpp
trunk/pingus/src/engine/display/display.hpp
trunk/pingus/src/engine/display/drawing_context.cpp
trunk/pingus/src/engine/display/drawing_context.hpp
trunk/pingus/src/engine/display/drawing_request.hpp
trunk/pingus/src/engine/display/font.cpp
trunk/pingus/src/engine/display/font.hpp
trunk/pingus/src/engine/display/font_description.cpp
trunk/pingus/src/engine/display/font_description.hpp
trunk/pingus/src/engine/display/framebuffer.hpp
trunk/pingus/src/engine/display/framebuffer_surface.cpp
trunk/pingus/src/engine/display/framebuffer_surface.hpp
trunk/pingus/src/engine/display/null_framebuffer.cpp
trunk/pingus/src/engine/display/null_framebuffer.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/rect_merger.cpp
trunk/pingus/src/engine/display/rect_merger.hpp
trunk/pingus/src/engine/display/scene_context.cpp
trunk/pingus/src/engine/display/scene_context.hpp
trunk/pingus/src/engine/display/scene_group.hpp
trunk/pingus/src/engine/display/screenshot.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.hpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/sprite.cpp
trunk/pingus/src/engine/display/sprite.hpp
trunk/pingus/src/engine/display/sprite_description.hpp
trunk/pingus/src/engine/display/sprite_impl.cpp
trunk/pingus/src/engine/display/sprite_impl.hpp
trunk/pingus/src/engine/display/surface.cpp
trunk/pingus/src/engine/display/surface.hpp
trunk/pingus/src/engine/gui/combobox_listener.hpp
trunk/pingus/src/engine/gui/component.cpp
trunk/pingus/src/engine/gui/component.hpp
trunk/pingus/src/engine/gui/game_delta_recorder.hpp
trunk/pingus/src/engine/gui/group_component.cpp
trunk/pingus/src/engine/gui/group_component.hpp
trunk/pingus/src/engine/gui/gui_manager.cpp
trunk/pingus/src/engine/gui/rect_component.hpp
trunk/pingus/src/engine/gui/surface_button.cpp
trunk/pingus/src/engine/gui/surface_button.hpp
trunk/pingus/src/engine/input/control.hpp
trunk/pingus/src/engine/input/controller.cpp
trunk/pingus/src/engine/input/controller.hpp
trunk/pingus/src/engine/input/controller_description.cpp
trunk/pingus/src/engine/input/controller_description.hpp
trunk/pingus/src/engine/input/core_driver.cpp
trunk/pingus/src/engine/input/core_driver.hpp
trunk/pingus/src/engine/input/evdev/evdev_device.cpp
trunk/pingus/src/engine/input/evdev/evdev_device.hpp
trunk/pingus/src/engine/input/evdev/evdev_driver.cpp
trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
trunk/pingus/src/engine/input/event.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/input/wiimote/wiimote.cpp
trunk/pingus/src/engine/input/wiimote/wiimote.hpp
trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
trunk/pingus/src/engine/input/xinput/xinput_device.cpp
trunk/pingus/src/engine/input/xinput/xinput_device.hpp
trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp
trunk/pingus/src/engine/input_old/controller.cpp
trunk/pingus/src/engine/input_old/controller.hpp
trunk/pingus/src/engine/input_old/event.hpp
trunk/pingus/src/engine/screen/gui_screen.cpp
trunk/pingus/src/engine/screen/gui_screen.hpp
trunk/pingus/src/engine/screen/screen.cpp
trunk/pingus/src/engine/screen/screen.hpp
trunk/pingus/src/engine/screen/screen_manager.cpp
trunk/pingus/src/engine/screen/screen_manager.hpp
trunk/pingus/src/engine/screen/screen_manager_impl.hpp
trunk/pingus/src/engine/sound/sound.cpp
trunk/pingus/src/engine/sound/sound.hpp
trunk/pingus/src/engine/sound/sound_dummy.cpp
trunk/pingus/src/engine/sound/sound_res_mgr.hpp
trunk/pingus/src/math/color.hpp
trunk/pingus/src/math/quad_tree.hpp
trunk/pingus/src/math/size.cpp
trunk/pingus/src/math/vector2f.cpp
trunk/pingus/src/math/vector2f.hpp
trunk/pingus/src/math/vector2i.cpp
trunk/pingus/src/math/vector2i.hpp
trunk/pingus/src/math/vector3f.cpp
trunk/pingus/src/math/vector3f.hpp
trunk/pingus/src/pingus/action_holder.hpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/walker.cpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/capture_rectangle.hpp
trunk/pingus/src/pingus/collider.hpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/collision_map.hpp
trunk/pingus/src/pingus/collision_mask.hpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/action_button.hpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/components/check_box.hpp
trunk/pingus/src/pingus/components/choice_box.hpp
trunk/pingus/src/pingus/components/label.hpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/menu_button.hpp
trunk/pingus/src/pingus/components/pingus_counter.cpp
trunk/pingus/src/pingus/components/pingus_counter.hpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/playfield.hpp
trunk/pingus/src/pingus/components/slider_box.hpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/smallmap.hpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/components/time_display.hpp
trunk/pingus/src/pingus/config_manager.hpp
trunk/pingus/src/pingus/direction.cpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/fps_counter.hpp
trunk/pingus/src/pingus/game_event.hpp
trunk/pingus/src/pingus/game_time.cpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/global_event.hpp
trunk/pingus/src/pingus/globals.cpp
trunk/pingus/src/pingus/globals.hpp
trunk/pingus/src/pingus/goal_manager.hpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/ground_map.hpp
trunk/pingus/src/pingus/groundtype.cpp
trunk/pingus/src/pingus/groundtype.hpp
trunk/pingus/src/pingus/layer_manager.cpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/levelset.hpp
trunk/pingus/src/pingus/mover.cpp
trunk/pingus/src/pingus/movers/linear_mover.hpp
trunk/pingus/src/pingus/particles/explosive_particle.cpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
trunk/pingus/src/pingus/path_manager.cpp
trunk/pingus/src/pingus/path_manager.hpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingu.hpp
trunk/pingus/src/pingus/pingu_action.cpp
trunk/pingus/src/pingus/pingu_action.hpp
trunk/pingus/src/pingus/pingu_enums.hpp
trunk/pingus/src/pingus/pingu_holder.cpp
trunk/pingus/src/pingus/pingu_holder.hpp
trunk/pingus/src/pingus/pingus_demo.cpp
trunk/pingus/src/pingus/pingus_demo.hpp
trunk/pingus/src/pingus/pingus_level.cpp
trunk/pingus/src/pingus/pingus_level.hpp
trunk/pingus/src/pingus/pingus_level_impl.hpp
trunk/pingus/src/pingus/plf_res_mgr.cpp
trunk/pingus/src/pingus/plf_res_mgr.hpp
trunk/pingus/src/pingus/resource.hpp
trunk/pingus/src/pingus/resource_manager.hpp
trunk/pingus/src/pingus/savegame.hpp
trunk/pingus/src/pingus/savegame_manager.cpp
trunk/pingus/src/pingus/savegame_manager.hpp
trunk/pingus/src/pingus/screens/addon_menu.hpp
trunk/pingus/src/pingus/screens/credits.cpp
trunk/pingus/src/pingus/screens/credits.hpp
trunk/pingus/src/pingus/screens/demo_session.cpp
trunk/pingus/src/pingus/screens/demo_session.hpp
trunk/pingus/src/pingus/screens/game_session.cpp
trunk/pingus/src/pingus/screens/game_session.hpp
trunk/pingus/src/pingus/screens/level_menu.cpp
trunk/pingus/src/pingus/screens/level_menu.hpp
trunk/pingus/src/pingus/screens/option_menu.hpp
trunk/pingus/src/pingus/screens/pingus_menu.cpp
trunk/pingus/src/pingus/screens/pingus_menu.hpp
trunk/pingus/src/pingus/screens/result_screen.cpp
trunk/pingus/src/pingus/screens/result_screen.hpp
trunk/pingus/src/pingus/screens/start_screen.cpp
trunk/pingus/src/pingus/screens/start_screen.hpp
trunk/pingus/src/pingus/screens/story_screen.cpp
trunk/pingus/src/pingus/screens/story_screen.hpp
trunk/pingus/src/pingus/server.cpp
trunk/pingus/src/pingus/server.hpp
trunk/pingus/src/pingus/server_event.cpp
trunk/pingus/src/pingus/server_event.hpp
trunk/pingus/src/pingus/smallmap_image.hpp
trunk/pingus/src/pingus/stat_manager.cpp
trunk/pingus/src/pingus/stat_manager.hpp
trunk/pingus/src/pingus/state_sprite.hpp
trunk/pingus/src/pingus/string_format.cpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/world.hpp
trunk/pingus/src/pingus/worldmap/dot_factory.hpp
trunk/pingus/src/pingus/worldmap/drawable.cpp
trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
trunk/pingus/src/pingus/worldmap/graph.cpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/level_dot.hpp
trunk/pingus/src/pingus/worldmap/path_drawable.hpp
trunk/pingus/src/pingus/worldmap/pathfinder.hpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/pingus.hpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap.hpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobj.hpp
trunk/pingus/src/pingus/worldobj_factory.cpp
trunk/pingus/src/pingus/worldobj_factory.hpp
trunk/pingus/src/pingus/worldobjs/entrance.hpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/snow_generator.hpp
trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
trunk/pingus/src/util/debug_stream.cpp
trunk/pingus/src/util/debug_stream.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.cpp
trunk/pingus/src/util/pathname.hpp
trunk/pingus/src/util/sexpr_file_reader.cpp
trunk/pingus/src/util/sexpr_file_reader.hpp
trunk/pingus/src/util/sexpr_file_writer.hpp
trunk/pingus/src/util/string_util.cpp
trunk/pingus/src/util/string_util.hpp
trunk/pingus/src/util/system.cpp
trunk/pingus/src/util/system.hpp
trunk/pingus/src/util/utf8.cpp
trunk/pingus/src/util/utf8.hpp
Log:
Removed double newlines, /** */ comment markers without content and ^L page
breaks
Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/action_properties.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -27,7 +27,7 @@
#include "util/string_util.hpp"
namespace Editor {
-
+
/*
*
* ActionDialog:
@@ -133,7 +133,7 @@
level->set_action(Actions::action_to_string(id), StringUtil::to<int>(value));
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/action_properties.hpp
===================================================================
--- trunk/pingus/src/editor/action_properties.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/action_properties.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -26,11 +26,10 @@
class Checkbox;
class Inputbox;
-
+
class EditorScreen;
class EditorLevel;
-/** */
class ActionProperties : public GUI::GroupComponent
{
private:
@@ -64,7 +63,7 @@
ActionProperties (const ActionProperties&);
ActionProperties& operator= (const ActionProperties&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/button.cpp
===================================================================
--- trunk/pingus/src/editor/button.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/button.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,7 +20,7 @@
#include "pingus/fonts.hpp"
namespace Editor {
-
+
Button::Button(const Rect& rect_, const std::string& text_) :
RectComponent(rect_),
text(text_),
@@ -79,7 +79,7 @@
if (mouse_over)
on_click();
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/button.hpp
===================================================================
--- trunk/pingus/src/editor/button.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/button.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -22,8 +22,7 @@
#include "engine/gui/rect_component.hpp"
namespace Editor {
-
-/** */
+
class Button : public GUI::RectComponent
{
private:
@@ -53,7 +52,7 @@
Button (const Button&);
Button& operator= (const Button&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/checkbox.cpp
===================================================================
--- trunk/pingus/src/editor/checkbox.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/checkbox.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -20,7 +20,7 @@
#include "pingus/fonts.hpp"
namespace Editor {
-
+
Checkbox::Checkbox(const Rect& rect_, const std::string& label_)
: RectComponent(rect_),
checked(false),
@@ -61,7 +61,7 @@
checked = t;
//on_change(checked);
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/checkbox.hpp
===================================================================
--- trunk/pingus/src/editor/checkbox.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/checkbox.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -22,8 +22,7 @@
#include "engine/gui/rect_component.hpp"
namespace Editor {
-
-/** */
+
class Checkbox : public GUI::RectComponent
{
private:
@@ -47,7 +46,7 @@
Checkbox (const Checkbox&);
Checkbox& operator= (const Checkbox&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
#include "pingus/resource.hpp"
namespace Editor {
-
+
Combobox::Combobox(const Rect& rect_) :
RectComponent(rect_),
sprite("core/editor/combobox"),
@@ -176,7 +176,7 @@
}
}
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/combobox.hpp
===================================================================
--- trunk/pingus/src/editor/combobox.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/combobox.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -39,7 +39,7 @@
: id(id_), label(label_)
{}
};
-
+
/** The Combobox class gives you a drop-down list of items to choose from. */
class Combobox : public GUI::RectComponent
{
@@ -99,7 +99,7 @@
Combobox& operator= (const Combobox&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -31,12 +31,12 @@
#include "util/sexpr_file_writer.hpp"
namespace Editor {
-
+
static bool LevelObjSort(LevelObj *a, LevelObj *b)
{
return (a->get_pos().z < b->get_pos().z);
}
-
+
// Default constructor
EditorLevel::EditorLevel()
: impl(new LevelImpl())
@@ -92,20 +92,20 @@
set_impl_defaults();
}
-
+
// Default Destructor
EditorLevel::~EditorLevel()
{
if (impl)
delete impl;
}
-
+
Size
EditorLevel::get_size() const
{
return impl->size;
}
-
+
/** Verify that level is valid:
Level should contain the following attributes in order to be "valid":
-----------
@@ -126,7 +126,7 @@
else
return false;
}
-
+
// Save the level to a file. Returns true if successful
bool EditorLevel::save_level(const std::string& filename)
{
@@ -193,7 +193,7 @@
return true;
}
-
+
// Load an existing level from a file
void EditorLevel::load_level(const Pathname& pathname)
{
@@ -328,14 +328,14 @@
sort();
}
-
+
void
EditorLevel::sort()
{
// Sort by Z coordinate
std::stable_sort(impl->objects.begin(), impl->objects.end(), LevelObjSort);
}
-
+
void
EditorLevel::set_description(const std::string& str)
{
@@ -551,7 +551,7 @@
}
return 0;
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -46,7 +46,7 @@
#include "util/system.hpp"
namespace Editor {
-
+
// Default constructor
EditorScreen::EditorScreen() :
plf(new EditorLevel()),
@@ -281,7 +281,7 @@
for (std::vector<LevelObj*>::const_iterator it = objs.begin(); it !=
objs.end(); it++)
add_object(*it);
}
-
+
void
EditorScreen::level_new()
{
@@ -373,7 +373,6 @@
viewport->lower_objects_to_bottom();
}
-
void
EditorScreen::objects_flip_vertical()
{
@@ -517,9 +516,8 @@
gui_manager->set_rect(Rect(Vector2i(0, 0), size_));
update_layout();
}
-
+
} // namespace Editor
/* EOF */
-
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -27,7 +27,7 @@
class Pathname;
namespace Editor {
-
+
class EditorLevel;
class LevelObj;
class Panel;
@@ -102,7 +102,7 @@
/** Load a new level */
void load(const Pathname& file);
-
+
// Functions accessible from the GUI
void level_new();
void level_load();
@@ -145,7 +145,7 @@
EditorScreen& operator= (const EditorScreen&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -32,7 +32,7 @@
#include "util/system.hpp"
namespace Editor {
-
+
FileDialog::FileDialog(EditorScreen* editor_, const Rect& rect_, Mode mode_) :
GroupComponent(rect_),
editor(editor_),
Modified: trunk/pingus/src/editor/file_dialog.hpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/file_dialog.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -21,13 +21,12 @@
#include "engine/gui/group_component.hpp"
namespace Editor {
-
+
class Button;
class EditorScreen;
class Inputbox;
class Label;
-/** */
class FileDialog : public GUI::GroupComponent
{
public:
@@ -76,7 +75,7 @@
FileDialog (const FileDialog&);
FileDialog& operator= (const FileDialog&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,7 @@
#include "pingus/fonts.hpp"
namespace Editor {
-
+
FileList::FileList(const Rect& rect_) :
RectComponent(rect_),
hspace(),
@@ -199,7 +199,7 @@
{
return (page > 0);
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/file_list.hpp
===================================================================
--- trunk/pingus/src/editor/file_list.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/file_list.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,8 +24,7 @@
#include "util/system.hpp"
namespace Editor {
-
-/** */
+
class FileList : public GUI::RectComponent
{
private:
@@ -68,7 +67,7 @@
FileList (const FileList&);
FileList& operator= (const FileList&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/label.hpp
===================================================================
--- trunk/pingus/src/editor/label.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/label.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -33,7 +33,7 @@
void draw (DrawingContext& gc);
void update (float delta);
void update_layout() {}
-
+
void set_text(const std::string& text_) { text = text_; }
};
Modified: trunk/pingus/src/editor/level_objs.hpp
===================================================================
--- trunk/pingus/src/editor/level_objs.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/level_objs.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -127,7 +127,7 @@
int small_stars;
int middle_stars;
int large_stars;
-
+
/** Number representing which attributes this object possesses */
unsigned attribs;
@@ -202,7 +202,6 @@
/** Retrieve the object's direction */
std::string get_direction() { return direction; }
-
/////////////////////////////////////////////////////////
/// Operations
public:
Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/level_properties.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -37,7 +37,7 @@
*/
namespace Editor {
-
+
LevelProperties::LevelProperties(EditorScreen* editor_, const Rect& rect_) :
GroupComponent(rect_),
editor(editor_),
@@ -130,7 +130,7 @@
comment->set_text(level->get_comment());
music->set_text(level->get_music());
}
-
+
void
LevelProperties::on_author_change(const std::string& str)
{
@@ -240,7 +240,7 @@
comment->set_rect(Rect(Vector2i(110, y+132), Size( w, 20)));
music->set_rect(Rect(Vector2i(110, y+154), Size( w, 20)));
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/level_properties.hpp
===================================================================
--- trunk/pingus/src/editor/level_properties.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/level_properties.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,12 +20,11 @@
#include "engine/gui/group_component.hpp"
namespace Editor {
-
+
class EditorScreen;
class EditorLevel;
class Inputbox;
-/** */
class LevelProperties : public GUI::GroupComponent
{
private:
@@ -75,7 +74,7 @@
LevelProperties (const LevelProperties&);
LevelProperties& operator= (const LevelProperties&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/minimap.cpp
===================================================================
--- trunk/pingus/src/editor/minimap.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/minimap.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "editor/viewport.hpp"
namespace Editor {
-
+
Minimap::Minimap(EditorScreen* editor_, const Rect& rect_)
: RectComponent(rect_),
editor(editor_),
@@ -143,7 +143,7 @@
{
drawing_context->set_rect(rect.grow(-3));
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/minimap.hpp
===================================================================
--- trunk/pingus/src/editor/minimap.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/minimap.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,10 +20,9 @@
#include "engine/gui/rect_component.hpp"
namespace Editor {
-
+
class EditorScreen;
-/** */
class Minimap : public GUI::RectComponent
{
private:
@@ -48,7 +47,7 @@
Minimap(const Minimap&);
Minimap & operator=(const Minimap&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/object_properties.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -33,7 +33,7 @@
#include "util/string_util.hpp"
namespace Editor {
-
+
ObjectProperties::ObjectProperties(EditorScreen* editor_, const Rect& rect_) :
GUI::GroupComponent(rect_, false),
editor(editor_),
@@ -421,7 +421,6 @@
place(pos_z_label, pos_z_inputbox);
}
-
if (attr & CAN_ROTATE)
{
y_pos += 4;
@@ -519,7 +518,6 @@
(*i)->set_owner(StringUtil::to<int>(str));
}
-
void
ObjectProperties::on_pos_z_change(const std::string& str)
{
@@ -678,7 +676,7 @@
{
GroupComponent::update_layout();
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -38,7 +38,7 @@
#include "pingus/resource.hpp"
namespace Editor {
-
+
struct Groundpiece : public ObjectSelectorList::Object
{
ResDescriptor desc;
@@ -59,7 +59,7 @@
return obj;
}
};
-
+
struct Entrance : public ObjectSelectorList::Object
{
Entrance()
@@ -78,7 +78,7 @@
return obj;
}
};
-
+
struct Exit : public ObjectSelectorList::Object
{
ResDescriptor desc;
@@ -97,7 +97,7 @@
return obj;
}
};
-
+
struct Hotspot : public ObjectSelectorList::Object
{
ResDescriptor desc;
@@ -119,7 +119,7 @@
return obj;
}
};
-
+
struct SurfaceBackground : public ObjectSelectorList::Object
{
ResDescriptor desc;
@@ -143,7 +143,7 @@
return obj;
}
};
-
+
struct SolidColorBackground : public ObjectSelectorList::Object
{
SolidColorBackground()
@@ -158,7 +158,7 @@
return obj;
}
};
-
+
struct StarfieldBackground : public ObjectSelectorList::Object
{
StarfieldBackground()
@@ -175,7 +175,7 @@
return obj;
}
};
-
+
struct Liquid : public ObjectSelectorList::Object
{
ResDescriptor desc;
@@ -194,7 +194,7 @@
return obj;
}
};
-
+
class ObjectSelectorButton : public GUI::RectComponent
{
private:
@@ -284,9 +284,9 @@
ObjectSelectorButton(const ObjectSelectorButton&);
ObjectSelectorButton & operator=(const ObjectSelectorButton&);
};
-
-
+
+
ObjectSelector::ObjectSelector(EditorScreen* editor_, const Rect& rect_) :
GroupComponent(rect_, false),
editor(editor_),
@@ -381,7 +381,7 @@
button_pos.y += 1;
}
}
-
+
ObjectSelectorSet*
ObjectSelector::create_objects(const std::string& prefix)
{
@@ -546,7 +546,7 @@
GroupComponent::update_layout();
object_list->set_rect(Rect(2, 2 + 60 + 2, rect.get_width() - 2,
rect.get_height() - 2));
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -30,7 +30,6 @@
class ObjectSelectorList;
class ObjectSelectorSet;
-/** */
class ObjectSelector : public GUI::GroupComponent
{
private:
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -29,7 +29,7 @@
#include "pingus/resource.hpp"
namespace Editor {
-
+
ObjectSelectorList::ObjectSelectorList(EditorScreen* editor_, ObjectSelector*
object_selector_, const Rect& rect_) :
RectComponent(rect_),
editor(editor_),
@@ -224,7 +224,7 @@
{
drawing_context->set_rect(rect);
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/object_selector_list.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/editor/object_selector_list.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -25,14 +25,13 @@
class DrawingContext;
namespace Editor {
-
+
class LevelObj;
class LevelImpl;
class EditorScreen;
class ObjectSelector;
class ObjectSelectorSet;
-/** */
class ObjectSelectorList : public GUI::RectComponent
{
public:
@@ -91,7 +90,7 @@
ObjectSelectorList (const ObjectSelectorList&);
ObjectSelectorList& operator= (const ObjectSelectorList&);
};
-
+
} // namespace Editor
#endif
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -144,7 +144,7 @@
PanelButton(const PanelButton&);
PanelButton & operator=(const PanelButton&);
};
-
+
Panel::Panel(EditorScreen* editor_) :
editor(editor_),
logo("core/editor/logo"),
Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/editor/panel.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -28,7 +28,6 @@
class EditorScreen;
-/** */
class Panel : public GUI::Component
{
private:
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -31,7 +31,7 @@
#include "math/vector3f.hpp"
namespace Editor {
-
+
// Constructor
Viewport::Viewport(EditorScreen* e, const Rect& rect_) :
RectComponent(rect_),
@@ -536,7 +536,7 @@
{
return editor->get_level()->get_objects();
}
-
+
} // namespace Editor
/* EOF */
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -29,7 +29,7 @@
class SceneContext;
namespace Editor {
-
+
class LevelObj;
class EditorScreen;
class ContextMenu;
@@ -46,7 +46,6 @@
/** The EditorScreen to which this viewport belongs */
EditorScreen* editor;
-
/** Whether or not Autoscrolling is turned on */
bool autoscroll;
@@ -113,7 +112,7 @@
void on_secondary_button_click(int x, int y);
void on_key_pressed(const unsigned short c);
-
+
void delete_selected_objects();
void duplicate_selected_objects();
@@ -145,7 +144,7 @@
Viewport (const Viewport&);
Viewport& operator= (const Viewport&);
};
-
+
} // Editor namespace
#endif
Modified: trunk/pingus/src/engine/display/blitter.cpp
===================================================================
--- trunk/pingus/src/engine/display/blitter.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/blitter.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -157,7 +157,6 @@
return BlitterImpl::modify(sur, BlitterImpl::transform_rot90());
}
-
Surface
Blitter::rotate_180 (Surface sur)
{
Modified: trunk/pingus/src/engine/display/blitter_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/blitter_impl.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/blitter_impl.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,7 @@
/** A collection of helper functions for the blitter class */
namespace BlitterImpl {
-
+
/** Rotate a surface 90 degree */
struct transform_rot90
{
@@ -203,7 +203,7 @@
return source_buffer.clone();
}
}
-
+
} // namespace BlitterImpl
#endif
Modified: trunk/pingus/src/engine/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "engine/display/sdl_framebuffer.hpp"
#include "math/math.hpp"
#include "util/memory_pool.hpp"
-
+
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
/** Little id creation function that is meant to bring equal objects
@@ -54,7 +54,7 @@
bool equal(DrawOp* op) const;
bool less(DrawOp* op) const;
};
-
+
struct SurfaceDrawOp : public DrawOp
{
Vector2i pos;
@@ -87,7 +87,7 @@
rect == rhs.rect;
}
};
-
+
struct FillRectDrawOp : public DrawOp
{
Rect rect;
@@ -116,7 +116,7 @@
}
};
-
+
struct DrawRectDrawOp : public DrawOp
{
Rect rect;
@@ -142,7 +142,7 @@
color == rhs.color;
}
};
-
+
int calculate_area(const std::vector<Rect>& rects)
{
int area = 0;
@@ -152,7 +152,7 @@
}
return area;
}
-
+
bool
DrawOp::equal(DrawOp* op) const
{
@@ -226,7 +226,7 @@
return (lhs->type < rhs->type);
}
}
-
+
inline bool ops_id_sorter(DrawOp* lhs, DrawOp* rhs)
{
return lhs->id < rhs->id;
@@ -236,7 +236,7 @@
{
return lhs->less(rhs);
}
-
+
class DrawOpBuffer
{
private:
@@ -404,7 +404,7 @@
draw_ops.push_back(op);
}
};
-
+
DeltaFramebuffer::DeltaFramebuffer()
: framebuffer(new SDLFramebuffer()),
frontbuffer(new DrawOpBuffer()),
@@ -480,5 +480,5 @@
{
return framebuffer->get_size();
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -25,7 +25,7 @@
class SDLFramebuffer;
class DrawOpBuffer;
-
+
class DeltaFramebuffer : public Framebuffer
{
private:
@@ -58,7 +58,7 @@
DeltaFramebuffer (const DeltaFramebuffer&);
DeltaFramebuffer& operator= (const DeltaFramebuffer&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/display.cpp
===================================================================
--- trunk/pingus/src/engine/display/display.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/display.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -36,7 +36,7 @@
#include "engine/display/null_framebuffer.hpp"
std::auto_ptr<Framebuffer> Display::framebuffer;
-
+
void
Display::flip_display()
{
@@ -206,5 +206,5 @@
return video_modes;
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/display.hpp
===================================================================
--- trunk/pingus/src/engine/display/display.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/display.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -27,7 +27,7 @@
class Rect;
class Color;
class Framebuffer;
-
+
class Display
{
private:
@@ -53,7 +53,7 @@
Display (const Display&);
Display& operator= (const Display&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -26,14 +26,14 @@
#include "engine/display/sprite.hpp"
#include "math/math.hpp"
#include "math/origin.hpp"
-
+
struct DrawingRequestsSorter
{
bool operator()(DrawingRequest* a, DrawingRequest* b) {
return a->get_z_pos() < b->get_z_pos();
}
};
-
+
class FontDrawingRequest : public DrawingRequest
{
private:
@@ -56,7 +56,7 @@
font.render(origin, static_cast<int>(pos.x + rect.left),
static_cast<int>(pos.y + rect.top), text, fb);
}
};
-
+
class SpriteDrawingRequest : public DrawingRequest
{
private:
@@ -75,7 +75,7 @@
sprite.render(pos.x + rect.left, pos.y + rect.top, fb);
}
};
-
+
class FillScreenDrawingRequest : public DrawingRequest
{
private:
@@ -93,7 +93,7 @@
fb.fill_rect(rect, color);
}
};
-
+
class LineDrawingRequest : public DrawingRequest
{
private:
@@ -119,7 +119,7 @@
pos2 + Vector2i(rect.left, rect.top), color);
}
};
-
+
class RectDrawingRequest : public DrawingRequest
{
private:
@@ -151,7 +151,7 @@
}
}
};
-
+
class DrawingContextDrawingRequest : public DrawingRequest
{
private:
@@ -171,7 +171,7 @@
dc.render(fb, rect);
}
};
-
+
DrawingContext::DrawingContext(const Rect& rect_, bool clip) :
drawingrequests(),
translate_stack(),
@@ -403,5 +403,5 @@
return pos + Vector2i(int(translate_stack.back().x + rect.left),
int(translate_stack.back().y + rect.top));
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -28,7 +28,7 @@
class Framebuffer;
class Font;
class Sprite;
-
+
/** The DrawingContext collects all DrawingRequests and allows you to
flush them all down to the graphics card in one run, this has the
advantage that it is possible to z-sort, texture-id sort or
@@ -115,7 +115,7 @@
DrawingContext (const DrawingContext&);
DrawingContext& operator= (const DrawingContext&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/drawing_request.hpp
===================================================================
--- trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/drawing_request.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,7 @@
#include "math/vector2i.hpp"
class Framebuffer;
-
+
class DrawingRequest
{
protected:
@@ -50,7 +50,7 @@
DrawingRequest (const DrawingRequest&);
DrawingRequest& operator= (const DrawingRequest&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/font.cpp
===================================================================
--- trunk/pingus/src/engine/display/font.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/font.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -28,7 +28,7 @@
#include "engine/display/surface.hpp"
#include "util/line_iterator.hpp"
#include "util/utf8.hpp"
-
+
class FontImpl
{
public:
@@ -181,7 +181,7 @@
return Rect(Vector2i(x, y), get_size(str));
}
};
-
+
Font::Font() :
impl()
{
@@ -250,5 +250,5 @@
else
return Rect();
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/font.hpp
===================================================================
--- trunk/pingus/src/engine/display/font.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/font.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -28,7 +28,7 @@
class FontImpl;
class FontDescription;
class Framebuffer;
-
+
class Font
{
public:
@@ -47,7 +47,7 @@
private:
boost::shared_ptr<FontImpl> impl;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/font_description.cpp
===================================================================
--- trunk/pingus/src/engine/display/font_description.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/font_description.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -19,7 +19,7 @@
#include <stdexcept>
#include "util/file_reader.hpp"
-
+
GlyphDescription::GlyphDescription() :
image(0),
unicode(0),
@@ -43,7 +43,7 @@
reader.read_int("advance", advance);
reader.read_rect("rect", rect);
}
-
+
FontDescription::FontDescription(const Pathname& pathname_) :
pathname(pathname_),
char_spacing(),
@@ -90,5 +90,5 @@
}
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/font_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/font_description.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/font_description.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -25,7 +25,7 @@
#include "util/pathname.hpp"
class FileReader;
-
+
class GlyphDescription
{
public:
@@ -38,7 +38,7 @@
GlyphDescription();
GlyphDescription(FileReader& reader);
};
-
+
class GlyphImageDescription
{
public:
@@ -53,8 +53,7 @@
glyphs()
{}
};
-
-/** */
+
class FontDescription
{
public:
@@ -73,7 +72,7 @@
FontDescription(const Pathname& filename);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/framebuffer.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -27,7 +27,7 @@
#include "math/vector2i.hpp"
class Surface;
-
+
class Framebuffer
{
public:
@@ -52,7 +52,7 @@
virtual Size get_size() const =0;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/framebuffer_surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/framebuffer_surface.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -16,7 +16,7 @@
#include "engine/display/framebuffer_surface.hpp"
-
+
FramebufferSurface::FramebufferSurface() :
impl()
{
Modified: trunk/pingus/src/engine/display/framebuffer_surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/framebuffer_surface.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -21,7 +21,7 @@
#include "engine/display/surface.hpp"
#include "math/size.hpp"
-
+
class FramebufferSurfaceImpl
{
public:
@@ -32,8 +32,7 @@
virtual int get_height() const =0;
virtual Surface to_surface() const =0;
};
-
-/** */
+
class FramebufferSurface
{
public:
@@ -58,7 +57,7 @@
private:
boost::shared_ptr<FramebufferSurfaceImpl> impl;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/null_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/null_framebuffer.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/null_framebuffer.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -17,7 +17,7 @@
#include "engine/display/null_framebuffer.hpp"
#include <iostream>
-
+
class NullFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
private:
@@ -31,7 +31,7 @@
int get_height() const { return size.height; }
Surface to_surface() const { return Surface(); }
};
-
+
NullFramebuffer::NullFramebuffer() :
size()
{
@@ -100,5 +100,5 @@
{
return size;
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/null_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/null_framebuffer.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/null_framebuffer.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_NULL_FRAMEBUFFER_HPP
#include "engine/display/framebuffer.hpp"
-
+
/** NullFramebuffer is an empty dummy class for debugging purposes */
class NullFramebuffer : public Framebuffer
{
@@ -47,7 +47,7 @@
Size get_size() const;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
#include "engine/display/surface.hpp"
#include "math/math.hpp"
-
+
OpenGLFramebuffer::OpenGLFramebuffer() :
screen(),
cliprect_stack()
@@ -240,5 +240,5 @@
{
return Size(screen->w, screen->h);
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_ENGINE_DISPLAY_OPENGL_OPENGL_FRAMEBUFFER_HPP
#include "engine/display/framebuffer.hpp"
-
+
class OpenGLFramebuffer : public Framebuffer
{
private:
@@ -50,7 +50,7 @@
OpenGLFramebuffer(const OpenGLFramebuffer&);
OpenGLFramebuffer & operator=(const OpenGLFramebuffer&);
};
-
+
#endif
/* EOF */
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
-
+
namespace {
inline int next_power_of_two(int val)
@@ -27,7 +27,7 @@
}
} // namespace
-
+
OpenGLFramebufferSurfaceImpl::OpenGLFramebufferSurfaceImpl(SDL_Surface* src) :
handle(),
size(src->w, src->h),
@@ -84,5 +84,5 @@
{
return Surface();
}
-
+
/* EOF */
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -32,7 +32,7 @@
#include <SDL.h>
#include "engine/display/framebuffer_surface.hpp"
-
+
class OpenGLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
private:
@@ -52,7 +52,7 @@
Surface to_surface() const;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -73,7 +73,7 @@
return (lhs.pos < rhs.pos);
}
}
-
+
void print_rows(std::ostream& out, const std::vector<Row>& rows)
{
for(std::vector<Row>::const_iterator i = rows.begin(); i != rows.end(); ++i)
@@ -88,7 +88,7 @@
out << std::endl;
}
}
-
+
void print_rects(std::ostream& out, const std::vector<Rect>& rects)
{
out << "(rects " << std::endl;
@@ -98,7 +98,7 @@
}
out << ") ;; rects " << std::endl;
}
-
+
/** Take a list of rectangles and generate a list of rows written to
\a rows_out. The rows are returned empty and have to be filled via
split_rectangles()
@@ -143,7 +143,7 @@
//print_rects(std::cout, rects);
assert(!rows_out.empty());
}
-
+
/** Takes a list of rectangles and adds their left and right borders to rows
@param[in] rects List of rectangles that get split up and filled into
rows, must be sorted by rect_y_sorter
@@ -175,7 +175,7 @@
for(std::vector<Row>::iterator i = rows.begin(); i != rows.end(); ++i)
std::sort(i->marks.begin(), i->marks.end(), mark_sorter);
}
-
+
/** Takes a list of rows along with markers in them to then generate a
list of rectangles which are written to \a rects_out
@@ -238,7 +238,7 @@
}
}
}
-
+
/** Takes a list of rectangles and merges non overlapping vertically
adjacent rectangles that have the same left and right borders
Modified: trunk/pingus/src/engine/display/rect_merger.hpp
===================================================================
--- trunk/pingus/src/engine/display/rect_merger.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/rect_merger.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,9 +20,9 @@
#include <vector>
#include "math/rect.hpp"
-
+
void merge_rectangles(const std::vector<Rect>& rects_in, std::vector<Rect>&
rects_out);
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/scene_context.cpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/scene_context.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -19,7 +19,7 @@
#include "engine/display/framebuffer.hpp"
#define SCALE_FACTOR 8.0f
-
+
class SceneContextImpl
{
public:
@@ -48,7 +48,7 @@
{
}
};
-
+
SceneContext::SceneContext() :
impl(new SceneContextImpl())
{
@@ -82,7 +82,6 @@
return impl->highlight;
}
-
/** Translate the drawing context */
void
SceneContext::translate(int x, int y)
@@ -194,5 +193,5 @@
{
sc->render(fb, rect);
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_context.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/scene_context.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,7 @@
#include "engine/display/drawing_context.hpp"
class SceneContextImpl;
-
+
/** The SceneContext maintains all the different drawing layers to
which a game object can draw. Each drawing layer serves a
different purporse and all are combined in the end to form the
@@ -82,7 +82,7 @@
SceneContext (const SceneContext&);
SceneContext& operator= (const SceneContext&);
};
-
+
class SceneContextDrawingRequest : public DrawingRequest
{
private:
@@ -97,7 +97,7 @@
SceneContextDrawingRequest(const SceneContextDrawingRequest&);
SceneContextDrawingRequest& operator=(const SceneContextDrawingRequest&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/scene_group.hpp
===================================================================
--- trunk/pingus/src/engine/display/scene_group.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/scene_group.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_DISPLAY_SCENE_GROUP_HPP
#define HEADER_PINGUS_ENGINE_DISPLAY_SCENE_GROUP_HPP
-/** */
class Scene_Group
{
private:
Modified: trunk/pingus/src/engine/display/screenshot.cpp
===================================================================
--- trunk/pingus/src/engine/display/screenshot.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/screenshot.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -219,5 +219,4 @@
return std::string(buffer);
}
-
/* EOF */
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,7 @@
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
#include "engine/display/surface.hpp"
#include "math/math.hpp"
-
+
namespace {
typedef void (*draw_pixel_func)(SDL_Surface* screen, int, int, const Color&);
@@ -139,7 +139,7 @@
}
} // namespace
-
+
SDLFramebuffer::SDLFramebuffer() :
screen(0),
cliprect_stack()
@@ -468,5 +468,5 @@
else
SDL_SetClipRect(screen, &cliprect_stack.back());
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,7 @@
#include "math/color.hpp"
#include "math/rect.hpp"
#include "math/vector2i.hpp"
-
+
class SDLFramebuffer : public Framebuffer
{
private:
@@ -58,7 +58,7 @@
SDLFramebuffer (const SDLFramebuffer&);
SDLFramebuffer& operator= (const SDLFramebuffer&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -17,7 +17,7 @@
#include "engine/display/sdl_framebuffer_surface_impl.hpp"
#include <stdexcept>
-
+
SDLFramebufferSurfaceImpl::SDLFramebufferSurfaceImpl(SDL_Surface* src) :
surface()
{
@@ -55,5 +55,5 @@
return Surface(surface);
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,8 +20,7 @@
#include <SDL.h>
#include "engine/display/framebuffer_surface.hpp"
-
-/** */
+
class SDLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
private:
@@ -42,7 +41,7 @@
SDLFramebufferSurfaceImpl(const SDLFramebufferSurfaceImpl&);
SDLFramebufferSurfaceImpl & operator=(const SDLFramebufferSurfaceImpl&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/sprite.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/sprite.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -30,7 +30,7 @@
#include "math/vector2i.hpp"
#include "pingus/resource.hpp"
#include "util/pathname.hpp"
-
+
Sprite::Sprite() :
impl()
{
@@ -218,5 +218,5 @@
else
return Surface();
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/sprite.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/sprite.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -30,7 +30,7 @@
class SpriteDescription;
class ResDescriptor;
class Framebuffer;
-
+
class Sprite
{
public:
@@ -65,7 +65,7 @@
private:
boost::shared_ptr<SpriteImpl> impl;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/sprite_description.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_description.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/display/sprite_description.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -25,7 +25,6 @@
#include "util/file_reader.hpp"
#include "util/pathname.hpp"
-/** */
class SpriteDescription
{
public:
Modified: trunk/pingus/src/engine/display/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/sprite_impl.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,7 @@
typedef std::map<std::string, FramebufferSurface> SurfaceCache;
SurfaceCache surface_cache;
-
+
FramebufferSurface load_framebuffer_surface(const Pathname& filename,
ResourceModifierNS::ResourceModifier mod)
{
SurfaceCache::iterator i = surface_cache.find(filename.get_sys_path());
@@ -68,7 +68,7 @@
}
}
}
-
+
SpriteImpl::SpriteImpl() :
filename(),
framebuffer_surface(),
@@ -200,5 +200,5 @@
{
return framebuffer_surface.to_surface();
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/display/sprite_impl.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,7 @@
class SpriteDescription;
class Framebuffer;
-
+
class SpriteImpl
{
private:
@@ -63,7 +63,7 @@
Surface to_surface() const;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/display/surface.cpp
===================================================================
--- trunk/pingus/src/engine/display/surface.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/surface.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,7 @@
#include "engine/display/blitter.hpp"
#include "math/rect.hpp"
#include "pingus/debug.hpp"
-
+
class SurfaceImpl
{
public:
@@ -48,7 +48,7 @@
SurfaceImpl(const SurfaceImpl&);
SurfaceImpl & operator=(const SurfaceImpl&);
};
-
+
Surface::Surface() :
impl()
{
@@ -368,5 +368,5 @@
SDL_UnlockSurface(impl->surface);
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/display/surface.hpp
===================================================================
--- trunk/pingus/src/engine/display/surface.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/display/surface.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -29,7 +29,7 @@
class Rect;
class Pathname;
class SurfaceImpl;
-
+
class Surface
{
public:
@@ -64,7 +64,7 @@
Color get_pixel(int x, int y) const;
void fill(const Color& color);
-
+
Surface scale(int w, int h);
Surface mod(ResourceModifierNS::ResourceModifier mod);
Surface clone() const;
@@ -79,7 +79,7 @@
protected:
boost::shared_ptr<SurfaceImpl> impl;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/gui/combobox_listener.hpp
===================================================================
--- trunk/pingus/src/engine/gui/combobox_listener.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/combobox_listener.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_GUI_COMBOBOX_LISTENER_HPP
#define HEADER_PINGUS_ENGINE_GUI_COMBOBOX_LISTENER_HPP
-
namespace GUI {
class Combobox;
Modified: trunk/pingus/src/engine/gui/component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/component.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/gui/component.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -21,7 +21,7 @@
#include "engine/gui/group_component.hpp"
namespace GUI {
-
+
GroupComponent*
Component::get_parent() const
{
@@ -48,7 +48,7 @@
if (parent)
parent->ungrab(this);
}
-
+
} // namespace GUI
/* EOF */
Modified: trunk/pingus/src/engine/gui/component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/component.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/gui/component.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -20,7 +20,7 @@
class DrawingContext;
namespace GUI {
-
+
class GroupComponent;
/** A component represents an area which recivies events in the GUI,
@@ -52,7 +52,7 @@
virtual void update (float delta) { }
virtual bool is_at (int x, int y) { return false; }
-
+
// Events
/** Gets issued once the primary button is pressed */
virtual void on_primary_button_press (int x, int y) { }
@@ -95,7 +95,7 @@
Component (const Component&);
Component& operator= (const Component&);
};
-
+
} // namespace GUI
#endif
Modified: trunk/pingus/src/engine/gui/game_delta_recorder.hpp
===================================================================
--- trunk/pingus/src/engine/gui/game_delta_recorder.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/game_delta_recorder.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_ENGINE_GUI_GAME_DELTA_RECORDER_HPP
#define HEADER_PINGUS_ENGINE_GUI_GAME_DELTA_RECORDER_HPP
-
class GameDeltaRecorder
{
private:
@@ -27,7 +26,6 @@
GameDelta* get ();
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/engine/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/engine/gui/group_component.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/group_component.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,7 +20,7 @@
#include <iostream>
namespace GUI {
-
+
GroupComponent::GroupComponent(const Rect& rect_, bool clip_) :
RectComponent(rect_),
children(),
@@ -72,7 +72,7 @@
{
return (RectComponent::is_at(x,y) ||
component_at(drawing_context.screen_to_world(Vector2i(x, y))));
}
-
+
void
GroupComponent::on_primary_button_press (int x, int y)
{
@@ -291,7 +291,7 @@
grabbed_comp = 0;
Component::ungrab();
}
-
+
} // namespace GUI
/* EOF */
Modified: trunk/pingus/src/engine/gui/group_component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/group_component.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/group_component.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,8 +21,7 @@
#include "engine/gui/rect_component.hpp"
namespace GUI {
-
-/** */
+
class GroupComponent : public RectComponent
{
private:
@@ -51,7 +50,7 @@
virtual void draw_background(DrawingContext& gc) {}
void update(float delta);
-
+
void on_primary_button_press(int x, int y);
void on_primary_button_release(int x, int y);
@@ -84,7 +83,7 @@
GroupComponent(const GroupComponent&);
GroupComponent& operator=(const GroupComponent&);
};
-
+
} // namespace GUI
#endif
Modified: trunk/pingus/src/engine/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,30 +26,30 @@
using namespace Input;
namespace GUI {
-
+
GUIManager::GUIManager ()
: GroupComponent(Rect(0, 0, Display::get_width(), Display::get_height()),
false),
mouse_pos(400,300)
{
}
-
+
GUIManager::GUIManager(const Rect& rect_)
: GroupComponent(rect_),
mouse_pos(400,300)
{
}
-
+
GUIManager::~GUIManager ()
{
}
-
+
void
GUIManager::update(float delta)
{
GroupComponent::update(delta);
}
-
+
void
GUIManager::update(const Input::Event& event)
{
@@ -96,7 +96,7 @@
break;
}
}
-
+
} // namespace GUI
/* EOF */
Modified: trunk/pingus/src/engine/gui/rect_component.hpp
===================================================================
--- trunk/pingus/src/engine/gui/rect_component.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/rect_component.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,8 +21,7 @@
#include "math/rect.hpp"
namespace GUI {
-
-/** */
+
class RectComponent : public Component
{
protected:
@@ -44,7 +43,7 @@
Rect get_rect() const { return rect; }
};
-
+
} // namespace GUI
#endif
Modified: trunk/pingus/src/engine/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,7 +21,7 @@
#include "pingus/resource.hpp"
namespace GUI {
-
+
SurfaceButton::SurfaceButton (int arg_x_pos, int arg_y_pos,
const std::string& arg_button_surface,
const std::string& arg_button_pressed_surface,
@@ -101,7 +101,7 @@
x_pos = x;
y_pos = y;
}
-
+
} // namespace GUI
/* EOF */
Modified: trunk/pingus/src/engine/gui/surface_button.hpp
===================================================================
--- trunk/pingus/src/engine/gui/surface_button.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/gui/surface_button.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,7 +21,7 @@
#include "engine/gui/component.hpp"
namespace GUI {
-
+
/** A simple surface button, which different surfaces for pressed,
released and mouse over */
class SurfaceButton : public Component
@@ -62,7 +62,7 @@
SurfaceButton (const SurfaceButton&);
SurfaceButton& operator= (const SurfaceButton&);
};
-
+
} // namespace GUI
#endif
Modified: trunk/pingus/src/engine/input/control.hpp
===================================================================
--- trunk/pingus/src/engine/input/control.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/input/control.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
#include "math/vector2f.hpp"
namespace Input {
-
+
class Control
{
private:
@@ -63,7 +63,7 @@
Control(const Control&);
Control & operator=(const Control&);
};
-
+
class Button : public Control
{
protected:
@@ -86,7 +86,7 @@
}
}
};
-
+
class ButtonGroup : public Button
{
private:
@@ -131,7 +131,7 @@
}
}
};
-
+
class ControllerButton : public ButtonGroup
{
private:
@@ -153,7 +153,7 @@
ControllerButton(const ControllerButton&);
ControllerButton & operator=(const ControllerButton&);
};
-
+
class Axis : public Control
{
protected:
@@ -185,7 +185,7 @@
}
}
};
-
+
class Pointer : public Control
{
protected:
@@ -207,7 +207,7 @@
}
}
};
-
+
class Scroller : public Control
{
protected:
@@ -229,7 +229,7 @@
}
}
};
-
+
class AxisGroup : public Axis {
private:
std::vector<Axis*> axes;
@@ -269,7 +269,7 @@
set_state(new_pos);
}
};
-
+
class ControllerAxis : public AxisGroup
{
private:
@@ -291,7 +291,7 @@
ControllerAxis(const ControllerAxis&);
ControllerAxis & operator=(const ControllerAxis&);
};
-
+
class PointerGroup : public Pointer
{
private:
@@ -329,7 +329,7 @@
pointer.push_back(p);
}
};
-
+
class ControllerPointer : public PointerGroup
{
private:
@@ -351,7 +351,7 @@
ControllerPointer(const ControllerPointer&);
ControllerPointer & operator=(const ControllerPointer&);
};
-
+
class ScrollerGroup : public Scroller
{
private:
@@ -389,7 +389,7 @@
ScrollerGroup(const ScrollerGroup&);
ScrollerGroup & operator=(const ScrollerGroup&);
};
-
+
class ControllerScroller : public ScrollerGroup
{
private:
@@ -411,7 +411,7 @@
ControllerScroller(const ControllerScroller&);
ControllerScroller & operator=(const ControllerScroller&);
};
-
+
class Keyboard : public Control
{
protected:
@@ -430,7 +430,7 @@
Keyboard(const Keyboard&);
Keyboard & operator=(const Keyboard&);
};
-
+
class KeyboardGroup : public Keyboard
{
private:
@@ -461,7 +461,7 @@
keyboards.push_back(keyboard);
}
};
-
+
class ControllerKeyboard : public KeyboardGroup
{
private:
@@ -483,7 +483,7 @@
ControllerKeyboard(const ControllerKeyboard&);
ControllerKeyboard & operator=(const ControllerKeyboard&);
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input/controller.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/controller.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,7 +20,7 @@
#include "engine/input/controller_description.hpp"
namespace Input {
-
+
Controller* Controller::current_ = 0;
Controller*
@@ -253,7 +253,7 @@
events.clear();
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/controller.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -30,15 +30,15 @@
class ControllerPointer;
class ControllerScroller;
class ControllerKeyboard;
-
+
class Controller
{
-
+
private:
static Controller* current_;
public:
static Controller* current();
-
+
private:
// State Stuff
std::vector<ControllerButton*> buttons;
@@ -80,7 +80,7 @@
Controller(const Controller&);
Controller& operator= (const Controller&);
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/controller_description.cpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/controller_description.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -19,8 +19,8 @@
#include <stdexcept>
namespace Input {
-
+
ControllerDescription::ControllerDescription() :
str_to_event(),
id_to_event()
@@ -116,7 +116,7 @@
return i->second;
}
-
+
static std::vector<int> map2vector(const std::map<int, InputEventDefinition>&
map,
EventType type)
{
@@ -160,7 +160,7 @@
return map2vector(id_to_event, KEYBOARD_EVENT_TYPE);
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/engine/input/controller_description.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/controller_description.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "engine/input/event.hpp"
namespace Input {
-
+
struct InputEventDefinition
{
EventType type;
@@ -36,7 +36,7 @@
name()
{}
};
-
+
class ControllerDescription
{
private:
@@ -62,7 +62,7 @@
std::vector<int> get_scrollers() const;
std::vector<int> get_keyboards() const;
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/core_driver.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/core_driver.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -87,7 +87,7 @@
AxisPointer(const AxisPointer&);
AxisPointer & operator=(const AxisPointer&);
};
-
+
class AxisScroller : public Scroller
{
private:
@@ -144,7 +144,7 @@
AxisScroller(const AxisScroller&);
AxisScroller & operator=(const AxisScroller&);
};
-
+
class ButtonScroller : public Scroller
{
private:
@@ -210,7 +210,7 @@
ButtonScroller(const ButtonScroller&);
ButtonScroller & operator=(const ButtonScroller&);
};
-
+
Button*
CoreDriver::create_button(const FileReader& reader, Control* parent)
{
Modified: trunk/pingus/src/engine/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/core_driver.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/core_driver.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,6 @@
class Manager;
-/** */
class CoreDriver : public Driver
{
private:
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -34,7 +34,7 @@
#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
namespace Input {
-
+
EvdevDevice::EvdevDevice(const std::string& filename) :
fd(),
version(),
@@ -324,7 +324,7 @@
std::cout << "EvdevDevice: " << device << " doesn't have button " << id <<
std::endl;
return 0;
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -24,7 +24,7 @@
#include "engine/input/control.hpp"
namespace Input {
-
+
class EvdevDevice
{
private:
@@ -97,7 +97,7 @@
Scroller* create_scroller(Control* parent, int x, int y);
Button* create_button(Control* parent, int id);
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/evdev/evdev_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_driver.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/evdev/evdev_driver.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -19,7 +19,7 @@
#include "engine/input/evdev/evdev_device.hpp"
namespace Input {
-
+
EvdevDriver::EvdevDriver() :
devices()
{
@@ -121,7 +121,7 @@
{
return 0;
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/evdev/evdev_driver.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/evdev/evdev_driver.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -20,10 +20,9 @@
#include "engine/input/driver.hpp"
namespace Input {
-
+
class EvdevDevice;
-/** */
class EvdevDriver : public Driver
{
private:
@@ -45,7 +44,7 @@
EvdevDevice* get_device(const std::string& device_filename);
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/event.hpp
===================================================================
--- trunk/pingus/src/engine/input/event.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/input/event.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -21,7 +21,7 @@
#include <vector>
namespace Input {
-
+
enum EventType { BUTTON_EVENT_TYPE,
POINTER_EVENT_TYPE,
AXIS_EVENT_TYPE,
@@ -63,7 +63,7 @@
ACTION_AXIS
};
-
+
enum ButtonState { BUTTON_RELEASED, BUTTON_PRESSED };
struct ButtonEvent
@@ -71,33 +71,33 @@
EventName name;
ButtonState state;
};
-
+
struct PointerEvent
{
EventName name;
float x;
float y;
};
-
+
struct AxisEvent
{
EventName name;
float dir;
};
-
+
struct ScrollEvent
{
EventName name;
float x_delta;
float y_delta;
};
-
+
struct KeyboardEvent
{
unsigned short key;
};
-
+
struct Event
{
EventType type;
@@ -112,7 +112,7 @@
};
typedef std::vector<Event> EventLst;
-
+
inline Event makeButtonEvent(EventName name, ButtonState state)
{
Event event;
@@ -123,7 +123,7 @@
return event;
}
-
+
inline Event makePointerEvent(EventName name, float x, float y)
{
Event event;
@@ -135,7 +135,7 @@
return event;
}
-
+
inline Event makeAxisEvent(EventName name, float dir)
{
Event event;
@@ -146,7 +146,7 @@
return event;
}
-
+
inline Event makeScrollerEvent(EventName name, float x_delta, float y_delta)
{
Event event;
@@ -158,7 +158,7 @@
return event;
}
-
+
inline Event makeKeyboardEvent(unsigned short c)
{
Event event;
@@ -168,7 +168,7 @@
return event;
}
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/engine/input/manager.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/input/manager.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -38,7 +38,7 @@
#endif
namespace Input {
-
+
Manager::Manager() :
drivers(),
controllers(),
@@ -72,7 +72,7 @@
desc.add_button("action-9-button", ACTION_9_BUTTON);
desc.add_button("action-10-button", ACTION_10_BUTTON);
}
-
+
Manager::~Manager()
{
for(Drivers::iterator i = drivers.begin(); i != drivers.end(); ++i)
@@ -80,7 +80,7 @@
delete *i;
}
}
-
+
static std::string get_driver_part(const std::string& fullname)
{
std::string::size_type i = fullname.find_first_of(':');
@@ -93,7 +93,7 @@
return "core";
}
}
-
+
Controller*
Manager::create_controller(const Pathname& filename)
{
@@ -195,7 +195,7 @@
controllers.push_back(ctrl);
return ctrl;
}
-
+
void
Manager::update(float delta)
{
@@ -206,7 +206,7 @@
i != controllers.end(); ++i)
(*i)->update(delta);
}
-
+
Driver*
Manager::get_driver(const std::string& name)
{
@@ -219,7 +219,7 @@
}
return 0;
}
-
+
Driver*
Manager::load_driver(const std::string& name)
{
@@ -262,7 +262,7 @@
return driver;
}
}
-
+
Button*
Manager::create_button(const FileReader& reader, Control* parent)
{
@@ -279,7 +279,7 @@
return 0;
}
}
-
+
Axis*
Manager::create_axis(const FileReader& reader, Control* parent)
{
@@ -296,7 +296,7 @@
return 0;
}
}
-
+
Pointer*
Manager::create_pointer(const FileReader& reader, Control* parent)
{
@@ -313,7 +313,7 @@
return 0;
}
}
-
+
Scroller*
Manager::create_scroller(const FileReader& reader, Control* parent)
{
@@ -347,7 +347,7 @@
return 0;
}
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.cpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -281,7 +281,7 @@
}
}
}
-
+
void
Wiimote::add_button_event(int device, int button, bool down)
{
@@ -325,8 +325,8 @@
events.push_back(event);
}
-
+
void
Wiimote::on_status(const cwiid_status_mesg& msg)
{
@@ -565,7 +565,7 @@
pthread_mutex_unlock(&mutex);
}
-
+
// static callback functions
void
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -63,7 +63,6 @@
uint8_t z;
};
-/** */
class Wiimote
{
public:
Modified: trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -21,7 +21,6 @@
namespace Input {
-/** */
class WiimoteDriver : public Driver
{
private:
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "pingus/globals.hpp"
namespace Input {
-
+
#define INVALID_EVENT_TYPE -1
XInputDevice::XInputDevice(XInputDriver* owner_, XDeviceInfo* info) :
@@ -139,7 +139,6 @@
printf("CL_InputDevice_XInput: what's that %d\n", event.type);
}
-
for (std::vector<bool>::size_type i = 0; i < buttons.size(); ++i)
{
if (buttons[i] != old_buttons[i])
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -26,10 +26,9 @@
#include "math/vector2i.hpp"
namespace Input {
-
+
class XInputDriver;
-/** */
class XInputDevice
{
private:
@@ -43,7 +42,7 @@
: min_value(min_value_), max_value(max_value_), resolution(resolution_),
pos(0)
{}
};
-
+
private:
XInputDriver* owner;
std::string name;
@@ -84,7 +83,7 @@
XInputDevice(const XInputDevice&);
XInputDevice & operator=(const XInputDevice&);
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "pingus/globals.hpp"
namespace Input {
-
+
XInputDriver::XInputDriver() :
sys(),
devices()
@@ -147,7 +147,7 @@
{
return 0;
}
-
+
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -27,10 +27,9 @@
#include "engine/input/driver.hpp"
namespace Input {
-
+
class XInputDevice;
-/** */
class XInputDriver : public Driver
{
private:
@@ -59,7 +58,7 @@
Pointer* create_pointer (const FileReader& reader, Control* parent);
Keyboard* create_keyboard(const FileReader& reader, Control* parent) {
return 0; }
};
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/input_old/buttons/mouse_button.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -83,7 +83,6 @@
}
}
-
} // namespace Buttons
} // namespace Input
Modified: trunk/pingus/src/engine/input_old/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input_old/controller.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -369,7 +369,6 @@
Controller::get_current()->events.push_back(makeButtonEvent(name, released));
}
-
} // namespace Input
/* EOF */
Modified: trunk/pingus/src/engine/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/input_old/controller.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -66,7 +66,7 @@
Controller(const Controller&);
Controller& operator= (const Controller&);
-
+
static void set_current(Controller* controller) { current_controller =
controller; }
static Controller* get_current() { return current_controller; }
Modified: trunk/pingus/src/engine/input_old/event.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/input_old/event.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -23,14 +23,14 @@
#include "pingus.hpp"
namespace Input {
-
+
enum EventType { ButtonEventType, PointerEventType, AxisEventType,
ScrollEventType, KeyboardEventType };
enum ButtonName { primary, secondary, pause, fast_forward, armageddon, escape,
action_1, action_2,
action_3, action_4, action_5, action_6, action_7, action_8,
action_9, action_10,
action_up, action_down, max_button };
-
+
enum State { pressed, released };
struct ButtonEvent
@@ -38,7 +38,7 @@
ButtonName name;
State state;
};
-
+
enum PointerName { standard };
struct PointerEvent
@@ -47,7 +47,7 @@
float x;
float y;
};
-
+
enum AxisName { action };
struct AxisEvent
@@ -55,18 +55,18 @@
float dir;
AxisName name;
};
-
+
struct ScrollEvent
{
float x_delta;
float y_delta;
};
-
+
struct KeyboardEvent
{
unsigned short key;
};
-
+
struct Event
{
EventType type;
@@ -81,7 +81,7 @@
};
typedef std::vector<Event> EventLst;
-
+
inline Event makeButtonEvent(ButtonName name, State state)
{
Event event;
@@ -136,7 +136,7 @@
return event;
}
-
+
} // namespace Input
#endif
Modified: trunk/pingus/src/engine/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/engine/screen/gui_screen.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/screen/gui_screen.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,7 +20,7 @@
#include "engine/gui/gui_manager.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-
+
GUIScreen::GUIScreen()
: Screen(Display::get_size()),
gui_manager(new GUI::GUIManager())
@@ -166,5 +166,5 @@
Screen::resize(size_);
gui_manager->set_rect(Rect(Vector2i(0, 0), size));
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/gui_screen.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/screen/gui_screen.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -65,7 +65,6 @@
GUIScreen& operator= (const GUIScreen&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/screen/screen.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -16,5 +16,4 @@
#include "engine/screen/screen.hpp"
-
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/screen/screen.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -27,7 +27,7 @@
class Size;
class DrawingContext;
-
+
/** A interface for screens. A screen is a Pingus 'thing' which gets
complete controll over the display and input. Examples of
screens are the PingusMenu or a PingusGameSession */
@@ -59,7 +59,7 @@
Screen (const Screen&);
Screen& operator= (const Screen&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -31,7 +31,7 @@
#include "pingus/globals.hpp"
#include "pingus/path_manager.hpp"
#include "util/pathname.hpp"
-
+
template<class C>
void write(std::ostream& out, C value)
{
@@ -138,9 +138,9 @@
assert(!"Unknown Event type");
}
}
-
+
ScreenManager* ScreenManager::instance_ = 0;
-
+
ScreenManager::ScreenManager() :
input_manager(),
input_controller(),
@@ -308,7 +308,7 @@
{
return instance_;
}
-
+
void
ScreenManager::push_screen (Screen* screen)
{
@@ -345,7 +345,7 @@
screens.back()->on_startup();
}
-
+
void
ScreenManager::fade_over(ScreenPtr old_screen, ScreenPtr new_screen)
{
@@ -404,5 +404,5 @@
SDL_ShowCursor(SDL_ENABLE);
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/screen/screen_manager.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -34,7 +34,7 @@
class Size;
class DrawingContext;
class Screen;
-
+
typedef boost::shared_ptr<Screen> ScreenPtr;
class ScreenManager
@@ -100,7 +100,7 @@
ScreenManager (const ScreenManager&);
ScreenManager& operator= (const ScreenManager&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen_manager_impl.hpp
===================================================================
--- trunk/pingus/src/engine/screen/screen_manager_impl.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/engine/screen/screen_manager_impl.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -19,7 +19,6 @@
#include "engine/screen/pingus.hpp"
-
class ScreenManagerImpl
{
private:
@@ -35,7 +34,6 @@
ScreenManagerImpl& operator= (const ScreenManagerImpl&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/engine/sound/sound.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/sound/sound.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -25,7 +25,7 @@
#include "pingus/path_manager.hpp"
namespace Sound {
-
+
PingusSoundImpl * PingusSound::sound;
void
@@ -89,7 +89,7 @@
assert(sound);
sound->real_stop_music();
}
-
+
} // namespace Sound
/* EOF */
Modified: trunk/pingus/src/engine/sound/sound.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/engine/sound/sound.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,7 @@
namespace Sound {
class PingusSoundImpl;
-
+
class PingusSound
{
private:
@@ -51,7 +51,7 @@
PingusSound (const PingusSound&);
PingusSound& operator= (const PingusSound&);
};
-
+
} // namespace Sound
#endif
Modified: trunk/pingus/src/engine/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_dummy.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/sound/sound_dummy.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -27,7 +27,6 @@
pout(PINGUS_DEBUG_SOUND) << "PingusSoundDummy::real_play_sound: " <<
filename << std::endl;
}
-
void
PingusSoundDummy::real_play_music(const std::string & filename, float
/*volume*/, bool /*loop*/)
{
Modified: trunk/pingus/src/engine/sound/sound_res_mgr.hpp
===================================================================
--- trunk/pingus/src/engine/sound/sound_res_mgr.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/engine/sound/sound_res_mgr.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,6 @@
typedef Mix_Chunk* SoundHandle;
-/** */
class SoundResMgr
{
private:
Modified: trunk/pingus/src/math/color.hpp
===================================================================
--- trunk/pingus/src/math/color.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/color.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -19,7 +19,6 @@
#include <SDL.h>
-/** */
class Color
{
public:
Modified: trunk/pingus/src/math/quad_tree.hpp
===================================================================
--- trunk/pingus/src/math/quad_tree.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/quad_tree.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -24,7 +24,7 @@
#include <vector>
#include "math/rect.hpp"
-
+
/**
+----+----+
| nw | ne |
@@ -190,7 +190,7 @@
}
}
};
-
+
template<class C>
class QuadTree
{
@@ -215,7 +215,7 @@
return items;
}
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/math/size.cpp
===================================================================
--- trunk/pingus/src/math/size.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/size.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -25,10 +25,10 @@
#include "math/size.hpp"
#include <iostream>
-
+
std::ostream& operator<<(std::ostream& os, const Size& size)
{
return os << "Size(" << size.width << ", " << size.height << ")";
}
-
+
/* EOF */
Modified: trunk/pingus/src/math/vector2f.cpp
===================================================================
--- trunk/pingus/src/math/vector2f.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector2f.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -19,11 +19,11 @@
#include <config.h>
#include <iostream>
-
+
std::ostream& operator<<(std::ostream& s, const Vector2f& v)
{
s << "Vector2f(" << v.x << ", " << v.y << ")";
return s;
}
-
+
/* EOF */
Modified: trunk/pingus/src/math/vector2f.hpp
===================================================================
--- trunk/pingus/src/math/vector2f.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector2f.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -22,7 +22,7 @@
#include "math/math.hpp"
#include "vector2i.hpp"
-
+
/** Simple two dimensional vector. */
class Vector2f
{
@@ -147,8 +147,8 @@
float x, y; // leave this public, get/set methods just give me headaches
// for such simple stuff :)
};
-
+
std::ostream& operator<<(std::ostream& s, const Vector2f& v);
-
+
#endif
Modified: trunk/pingus/src/math/vector2i.cpp
===================================================================
--- trunk/pingus/src/math/vector2i.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector2i.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,15 +20,15 @@
#include "vector2f.hpp"
#include "vector2i.hpp"
-
+
Vector2i::Vector2i(const Vector2f& v)
: x(int(v.x)), y(int(v.y))
{}
-
+
std::ostream& operator<<(std::ostream& s, const Vector2i& v)
{
s << "Vector2i(" << v.x << ", " << v.y << ")";
return s;
}
-
+
/* EOF */
Modified: trunk/pingus/src/math/vector2i.hpp
===================================================================
--- trunk/pingus/src/math/vector2i.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector2i.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,8 +20,7 @@
#include <iosfwd>
class Vector2f;
-
-/** */
+
class Vector2i
{
public:
@@ -36,7 +35,6 @@
Vector2i(int x_, int y_)
: x(x_), y(y_) {}
-
Vector2i operator+ (const Vector2i& add) const
{
return Vector2i(x + add.x, y + add.y);
@@ -83,9 +81,9 @@
return (other.x == x && other.y == y);
}
};
-
+
std::ostream& operator<<(std::ostream& s, const Vector2i& v);
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/math/vector3f.cpp
===================================================================
--- trunk/pingus/src/math/vector3f.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector3f.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -39,10 +39,10 @@
+ z * (pos.z * pos.z * (1-c) + c)
);
}
-
+
std::ostream& operator<<(std::ostream& os, const Vector3f& v)
{
return os << "Vector3f(" << v.x << ", " << v.y << ", " << v.z << ")";
}
-
+
/* EOF */
Modified: trunk/pingus/src/math/vector3f.hpp
===================================================================
--- trunk/pingus/src/math/vector3f.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/math/vector3f.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -22,7 +22,7 @@
#include "math/math.hpp"
#include "math/vector2f.hpp"
#include "math/vector2i.hpp"
-
+
class Vector3f
{
public:
@@ -131,9 +131,9 @@
return a + (c * perc);
}
};
-
+
std::ostream& operator<< (std::ostream& os, const Vector3f& v);
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/action_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/action_holder.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/action_holder.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,7 @@
class PingusLevel;
class PinguAction;
-
+
/**
* The ActionHolder is the backend of the ButtonPanel. It is responsible for
* creating new PinguActions and (if necessary) restricting the number of
@@ -76,7 +76,7 @@
ActionHolder (const ActionHolder&);
ActionHolder& operator= (const ActionHolder&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -104,7 +104,6 @@
static_cast<int>(pingu->get_y()) - 5);
}
-
if (sprite[pingu->direction].get_current_frame () >= 13 && !colmap_exploded)
{
colmap_exploded = true;
Modified: trunk/pingus/src/pingus/actions/walker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/actions/walker.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -59,7 +59,6 @@
3) Check if up-hill or down-hill is required
-
4)
*/
@@ -104,7 +103,6 @@
}
}
-
// FIXME: here we could/should scan more pixels
if (rel_getpixel(1, 0) == Groundtype::GP_BRIDGE
&& !head_collision_on_walk(1, 1)) // bridge
@@ -120,7 +118,6 @@
// FIXME: currently the pingu takes multiple steps at once when
// FIXME: working uphill, this looks kind of ugly
-
// FIXME: rel_getpixel works on the current pos, so modifing pos
// FIXME: is evil, a backup copy might help
@@ -175,7 +172,6 @@
}
}
-
// This is moved here to fix the bug where pingu stuck turning both
// sides indefinetely when a head collision occured. the fix needs the
// above downhill walk being done before head collision check.
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -26,7 +26,7 @@
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "util/string_util.hpp"
-
+
CaptureRectangle::CaptureRectangle(GameSession* session_) :
session(session_),
pingu(0),
@@ -106,5 +106,5 @@
}
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/capture_rectangle.hpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/capture_rectangle.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -27,7 +27,7 @@
class GameSession;
class DrawingContext;
class SceneContext;
-
+
/** The rectangle that is shown when the mouse cursor is above a
pingu. The rectangle shows the current pingu direction along with
the current active action.
@@ -61,7 +61,7 @@
CaptureRectangle (const CaptureRectangle&);
CaptureRectangle& operator= (const CaptureRectangle&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/collider.hpp
===================================================================
--- trunk/pingus/src/pingus/collider.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/collider.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_COLLIDER_HPP
#define HEADER_PINGUS_PINGUS_COLLIDER_HPP
-
class Vector3f;
class World;
@@ -40,7 +39,6 @@
int getpixel(World* const world, const Vector3f& pos) const;
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -25,7 +25,7 @@
#include "pingus/collision_mask.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
-
+
CollisionMap::CollisionMap(int w, int h)
: serial(0),
width(w),
@@ -222,5 +222,5 @@
{
return serial;
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/collision_map.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/collision_map.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
class DrawingContext;
class ResDescriptor;
class PixelStatus;
-
+
/** The CollisionMap is used to represent the enviroment where the
Pingus walk around. The ground can have different properties, it
can contain lava or water, it can be solid and many more. */
@@ -88,7 +88,7 @@
CollisionMap (const CollisionMap&);
CollisionMap& operator= (const CollisionMap&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/collision_mask.hpp
===================================================================
--- trunk/pingus/src/pingus/collision_mask.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/collision_mask.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -22,7 +22,6 @@
#include "engine/display/surface.hpp"
#include "pingus/res_descriptor.hpp"
-/** */
class CollisionMask
{
public:
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -26,7 +26,7 @@
#include "util/string_util.hpp"
using namespace Actions;
-
+
ArmageddonButton::ArmageddonButton(Server* s, int x, int y) :
RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
server(s),
@@ -96,7 +96,7 @@
pressed = true;
}
}
-
+
ForwardButton::ForwardButton(GameSession* s, int x, int y) :
RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
session(s),
@@ -131,7 +131,7 @@
{
session->set_fast_forward(!session->get_fast_forward());
}
-
+
PauseButton::PauseButton(GameSession* s, int x, int y) :
RectComponent(Rect(Vector2i(x, y), Size(38, 60))),
session(s),
@@ -168,5 +168,5 @@
{
session->set_pause(!session->get_pause());
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/action_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/components/action_button.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -29,7 +29,7 @@
class GameSession;
class ActionHolder;
class Vector;
-
+
/** ArmageddonButton, press it to start the armageddon and to turn all
pingus into bomber
@@ -56,7 +56,7 @@
ArmageddonButton (const ArmageddonButton&);
ArmageddonButton& operator= (const ArmageddonButton&);
};
-
+
/** Fast Forward button, press it to let the game run faster, press it
again to return to normal speed
@@ -80,7 +80,7 @@
ForwardButton (const ForwardButton&);
ForwardButton& operator= (const ForwardButton&);
};
-
+
/** Pause button, press it to pause the game, press it again to
continue
@@ -106,7 +106,7 @@
PauseButton (const PauseButton&);
PauseButton& operator= (const PauseButton&);
};
-
+
#endif /* ACTIONBUTTON */
/* EOF */
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -28,7 +28,7 @@
#include "util/string_util.hpp"
using namespace Actions;
-
+
ButtonPanel::ButtonPanel(GameSession* s, const Vector2i& pos) :
RectComponent(Rect()),
session(s),
@@ -166,5 +166,5 @@
set_rect(Rect(Vector2i(pos.x, pos.y - (buttons.size() * 38)/2),
Size(60, buttons.size() * 38)));
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,7 @@
#include "pingus/components/action_button.hpp"
class GameSession;
-
+
class ButtonPanel : public GUI::RectComponent
{
private:
@@ -77,7 +77,7 @@
ButtonPanel (const ButtonPanel&);
ButtonPanel& operator= (const ButtonPanel&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/components/check_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/check_box.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,6 @@
#include "engine/gui/rect_component.hpp"
-/** */
class CheckBox : public GUI::RectComponent
{
private:
Modified: trunk/pingus/src/pingus/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,6 @@
#include "engine/gui/rect_component.hpp"
-/** */
class ChoiceBox : public GUI::RectComponent
{
private:
Modified: trunk/pingus/src/pingus/components/label.hpp
===================================================================
--- trunk/pingus/src/pingus/components/label.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/label.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,6 @@
#include "engine/display/font.hpp"
#include "engine/gui/rect_component.hpp"
-/** */
class Label : public GUI::RectComponent
{
private:
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,7 @@
#include "pingus/resource.hpp"
#include "pingus/screens/pingus_menu.hpp"
-
+
MenuButton::MenuButton(PingusMenu* menu_,
const Vector2i& pos_,
const std::string& text_, const std::string& desc_) :
@@ -132,5 +132,5 @@
x_pos = x;
y_pos = y;
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -25,7 +25,7 @@
#include "math/vector2i.hpp"
class PingusMenu;
-
+
/** Framework for menu buttons */
class MenuButton : public GUI::Component
{
@@ -70,7 +70,7 @@
MenuButton (const MenuButton&);
MenuButton& operator= (const MenuButton&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/components/pingus_counter.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -53,5 +53,4 @@
gc.print_center(font, Vector2i(gc.get_width()/2, -2), str);
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -42,7 +42,6 @@
PingusCounter& operator= (const PingusCounter&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -28,7 +28,7 @@
#include "pingus/screens/game_session.hpp"
#include "pingus/server.hpp"
#include "pingus/world.hpp"
-
+
Playfield::Playfield(Server* server_, GameSession* session_, const Rect&
rect_) :
RectComponent(rect_),
server(server_),
@@ -274,5 +274,5 @@
state.set_size(rect.get_width(), rect.get_height());
scene_context->set_rect(rect);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/playfield.hpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/playfield.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -30,7 +30,7 @@
class ButtonPanel;
class Controller;
class View;
-
+
/** This class encapsulates all the different Views */
class Playfield : public GUI::RectComponent
{
@@ -84,7 +84,7 @@
Playfield (const Playfield&);
Playfield& operator= (const Playfield&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,6 @@
#include "engine/gui/rect_component.hpp"
-/** */
class SliderBox : public GUI::RectComponent
{
private:
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -29,7 +29,7 @@
#include "pingus/server.hpp"
#include "pingus/smallmap_image.hpp"
#include "pingus/world.hpp"
-
+
SmallMap::SmallMap(Server* server_, Playfield* playfield_, const Rect& rect_) :
RectComponent(rect_),
server(server_),
@@ -174,5 +174,5 @@
{
has_focus = false;
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/smallmap.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,7 @@
class Server;
class Vector3f;
class SmallMapImage;
-
+
/** This is the map that appears in the corner of the screen */
class SmallMap : public GUI::RectComponent
{
@@ -79,7 +79,7 @@
SmallMap (const SmallMap&);
SmallMap& operator= (const SmallMap&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -29,7 +29,7 @@
#include "pingus/world.hpp"
#include "util/string_util.hpp"
-
+
TimeDisplay::TimeDisplay (GameSession* c) :
server(c->get_server()),
font(),
@@ -63,5 +63,5 @@
gc.print_right(font, Vector2i(Display::get_width() - 30, 3),
time_string, 150);
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/components/time_display.hpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/components/time_display.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -44,7 +44,6 @@
TimeDisplay& operator= (const TimeDisplay&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/config_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/config_manager.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -23,7 +23,6 @@
#include "math/size.hpp"
#include "tinygettext/language.hpp"
-/** */
class ConfigManager
{
private:
Modified: trunk/pingus/src/pingus/direction.cpp
===================================================================
--- trunk/pingus/src/pingus/direction.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/direction.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -17,7 +17,6 @@
#include "pingus/direction.hpp"
-
Direction::Direction() : direction(NONE)
{
}
@@ -74,5 +73,4 @@
return direction == RIGHT;
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -23,7 +23,7 @@
#include "pingus/fonts.hpp"
FPSCounter fps_counter;
-
+
FPSCounter::FPSCounter() :
odd_frame(),
fps_string(),
@@ -75,5 +75,5 @@
fps_string = str.str();
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/fps_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/fps_counter.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_FPS_COUNTER_HPP
#include <string>
-
+
class FPSCounter
{
private:
@@ -49,7 +49,7 @@
FPSCounter (const FPSCounter&);
FPSCounter& operator= (const FPSCounter&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/game_event.hpp
===================================================================
--- trunk/pingus/src/pingus/game_event.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/game_event.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -48,7 +48,6 @@
// nothing
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/game_time.cpp
===================================================================
--- trunk/pingus/src/pingus/game_time.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/game_time.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -48,5 +48,4 @@
}
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -114,5 +114,4 @@
{
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/global_event.hpp
===================================================================
--- trunk/pingus/src/pingus/global_event.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/global_event.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -35,7 +35,6 @@
extern GlobalEvent global_event;
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/globals.cpp
===================================================================
--- trunk/pingus/src/pingus/globals.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/globals.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -16,7 +16,7 @@
#include "pingus/globals.hpp"
-
+
int game_speed = 20;
float desired_fps = 40;
bool print_fps = false;
@@ -48,5 +48,5 @@
bool static_graphics = false;
FramebufferType framebuffer_type = DELTA_FRAMEBUFFER;
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/globals.hpp
===================================================================
--- trunk/pingus/src/pingus/globals.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/globals.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -21,7 +21,7 @@
#define HEADER_PINGUS_PINGUS_GLOBALS_HPP
#include <string>
-
+
extern int game_speed; ///< -t, --set-speed
extern float desired_fps; ///< -k, --set-fps
extern bool print_fps; ///< --print-fps
@@ -52,7 +52,7 @@
enum FramebufferType { DELTA_FRAMEBUFFER, SDL_FRAMEBUFFER, NULL_FRAMEBUFFER,
OPENGL_FRAMEBUFFER };
extern FramebufferType framebuffer_type;
-
+
enum { PINGUS_DEBUG_ACTIONS = (1 << 0),
PINGUS_DEBUG_SOUND = (1 << 1),
PINGUS_DEBUG_GAMETIME = (1 << 2),
@@ -69,7 +69,7 @@
PINGUS_DEBUG_DIRECTORIES = (1 << 13),
PINGUS_DEBUG_ALL = (~0)
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/goal_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/goal_manager.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/goal_manager.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -17,7 +17,6 @@
#ifndef HEADER_PINGUS_PINGUS_GOAL_MANAGER_HPP
#define HEADER_PINGUS_PINGUS_GOAL_MANAGER_HPP
-
class Server;
/** Class that looks at the server and searches for goal conditions,
@@ -54,7 +53,6 @@
GoalManager& operator= (const GoalManager&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -27,7 +27,7 @@
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/pingus_level.hpp"
-
+
class MapTile
{
private:
@@ -44,7 +44,7 @@
const Sprite& get_sprite();
};
-
+
MapTile::MapTile () :
sprite(),
surface(),
@@ -90,7 +90,7 @@
return sprite;
}
}
-
+
GroundMap::GroundMap(int width_, int height_) :
colmap(),
tiles(),
@@ -316,5 +316,5 @@
{
return tiles[y*tile_width + x];
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/ground_map.hpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/ground_map.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -28,7 +28,7 @@
class CollisionMap;
class GroundMap;
class MapTile;
-
+
/** This map type is the defaulh maptype, it is should be used for the
most levels. It allows to construct a map, from a set of simple
small images, this allows the generation of large map without
@@ -83,7 +83,7 @@
GroundMap (const GroundMap&);
GroundMap& operator= (const GroundMap&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/groundtype.cpp
===================================================================
--- trunk/pingus/src/pingus/groundtype.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/groundtype.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -18,7 +18,6 @@
#include <iostream>
-
Groundtype::GPType
Groundtype::string_to_type(const std::string& arg_type)
{
@@ -43,7 +42,6 @@
}
}
-
std::string
Groundtype::type_to_string(GPType arg_type)
{
@@ -69,5 +67,4 @@
}
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/groundtype.hpp
===================================================================
--- trunk/pingus/src/pingus/groundtype.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/groundtype.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -19,7 +19,6 @@
#include <string>
-
/** This class olds the definitions of the different types of ground
available in pingus, it might also provide converter function from
GPType to std::string and vice verse. */
@@ -42,7 +41,6 @@
static std::string type_to_string (GPType arg_type);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/layer_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/layer_manager.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -18,7 +18,6 @@
#include <iostream>
-
LayerManager::LayerManager () :
layers()
{
@@ -50,5 +49,4 @@
i->update(delta);
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -86,7 +86,6 @@
LayerManager& operator= (const LayerManager&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/levelset.hpp
===================================================================
--- trunk/pingus/src/pingus/levelset.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/levelset.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,6 @@
#include "pingus/pingus_level.hpp"
#include "util/pathname.hpp"
-/** */
class Levelset
{
public:
Modified: trunk/pingus/src/pingus/mover.cpp
===================================================================
--- trunk/pingus/src/pingus/mover.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/mover.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -16,7 +16,6 @@
#include "pingus/mover.hpp"
-
Mover::Mover(World* const world_arg, const Vector3f& pos_arg)
: world(world_arg),
pos(pos_arg),
Modified: trunk/pingus/src/pingus/movers/linear_mover.hpp
===================================================================
--- trunk/pingus/src/pingus/movers/linear_mover.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/movers/linear_mover.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -19,7 +19,6 @@
#include "pingus/mover.hpp"
-
class Collider;
namespace Movers {
Modified: trunk/pingus/src/pingus/particles/explosive_particle.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/explosive_particle.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -83,7 +83,6 @@
// sprite.put_screen (int(pos.x + ofx), int(pos.y + ofy));
//}
-
bool
ExplosiveParticle::is_alive(void)
{
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -35,14 +35,12 @@
{
}
-
PinguParticleHolder::PinguParticleHolder () :
surface("particles/pingu_explo"),
particles()
{
}
-
void
PinguParticleHolder::add_particle (int x, int y)
{
@@ -113,7 +111,6 @@
it->pos.y += tmp_y_add;
}
-
if (it->velocity.x > 0)
{
for (tmp_x_add = it->velocity.x; tmp_x_add >= 1.0; --tmp_x_add)
@@ -149,7 +146,6 @@
}
}
-
void
PinguParticleHolder::draw (SceneContext& gc)
{
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,6 @@
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-
class SceneContext;
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -24,7 +24,7 @@
#include "pingus/world.hpp"
namespace Particles {
-
+
RainParticleHolder::RainParticle::RainParticle(int x, int y)
: alive(true), splash(false), use_rain2_surf(false), splash_counter(0),
splash_frame(0), pos(Vector3f((float)x, (float)y))
{
@@ -32,7 +32,6 @@
pos.z = 1.0f + Math::frand() * 3.0f;
}
-
RainParticleHolder::RainParticleHolder () :
rain1_surf("particles/rain1"),
rain2_surf("particles/rain2"),
@@ -41,7 +40,6 @@
{
}
-
void
RainParticleHolder::add_particle (int x, int y)
{
@@ -102,7 +100,6 @@
}
-
void
RainParticleHolder::draw (SceneContext& gc)
{
@@ -126,7 +123,7 @@
static_cast<int>(it->pos.y -
static_cast<float>(rain1_surf.get_height()))));
}
}
-
+
} // namespace Particles
/* EOF */
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,11 +23,10 @@
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-
class GraphicContext;
namespace Particles {
-
+
class RainParticleHolder : public WorldObj
{
struct RainParticle {
@@ -67,7 +66,7 @@
RainParticleHolder (const RainParticleHolder&);
RainParticleHolder& operator= (const RainParticleHolder&);
};
-
+
} // namespace Particles
#endif
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -33,7 +33,6 @@
use_surf2 = rand() % 2;
}
-
SmokeParticleHolder::SmokeParticleHolder ()
: surf1("particles/smoke"),
surf2("particles/smoke2"),
@@ -41,7 +40,6 @@
{
}
-
void
SmokeParticleHolder::add_particle (float x, float y, float vel_x, float vel_y)
{
@@ -74,7 +72,6 @@
}
}
-
void
SmokeParticleHolder::draw (SceneContext& gc)
{
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,6 @@
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-
class SceneContext;
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -66,7 +66,6 @@
{
}
-
void
SnowParticleHolder::add_particle (int x, int y, bool colliding)
{
@@ -115,7 +114,6 @@
}
}
-
void
SnowParticleHolder::draw (SceneContext& gc)
{
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,6 @@
#include "math/vector3f.hpp"
#include "pingus/worldobj.hpp"
-
class SceneContext;
namespace Particles {
Modified: trunk/pingus/src/pingus/path_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/path_manager.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -83,5 +83,4 @@
base_path = path;
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/path_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/path_manager.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/path_manager.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -56,7 +56,6 @@
extern PathManager path_manager;
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -57,7 +57,7 @@
#include "pingus/actions/walker.hpp"
using namespace Actions;
-
+
// Init a pingu at the given position while falling
Pingu::Pingu (int arg_id, const Vector3f& arg_pos, int owner) :
action(),
@@ -496,5 +496,5 @@
default: assert(!"Invalid action name provied");
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/pingu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/pingu.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -26,7 +26,7 @@
class ActionHolder;
class PinguAction;
class SceneContext;
-
+
/** The class for managing one of the many penguins which are walking
around in the World. All actions are handled by PinguAction
objects. */
@@ -218,7 +218,7 @@
Pingu (const Pingu&);
Pingu& operator= (const Pingu&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingu_action.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -25,7 +25,6 @@
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
-
PinguAction::PinguAction (Pingu* p)
: pingu (p)
{
@@ -276,5 +275,4 @@
#endif
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/pingu_action.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_action.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingu_action.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -116,7 +116,6 @@
PinguAction& operator= (const PinguAction&);
};
-
#endif /* PINGU_ACTION_HH */
/* EOF */
Modified: trunk/pingus/src/pingus/pingu_enums.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingu_enums.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -79,5 +79,4 @@
#endif
-
/* EOF */
Modified: trunk/pingus/src/pingus/pingu_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingu_holder.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -22,7 +22,6 @@
#include "pingus/pingu.hpp"
#include "pingus/pingus_level.hpp"
-
PinguHolder::PinguHolder(const PingusLevel& plf) :
number_of_allowed(plf.get_number_of_pingus()),
number_of_exited(0),
@@ -182,5 +181,4 @@
return (unsigned int)all_pingus.size();
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/pingu_holder.hpp
===================================================================
--- trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingu_holder.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -22,7 +22,6 @@
#include "pingus/worldobj.hpp"
-
class PingusLevel;
class Vector3f;
class Pingu;
@@ -114,7 +113,6 @@
PinguHolder& operator= (const PinguHolder&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingus_demo.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -23,7 +23,7 @@
#include "pingus/server_event.hpp"
#include "util/file_reader.hpp"
#include "util/pathname.hpp"
-
+
PingusDemo::PingusDemo(const Pathname& pathname) :
levelname(),
checksum(),
@@ -53,5 +53,5 @@
}
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingus_demo.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -23,8 +23,7 @@
#include "pingus/server_event.hpp"
class Pathname;
-
-/** */
+
class PingusDemo
{
private:
@@ -44,7 +43,7 @@
PingusDemo (const PingusDemo&);
PingusDemo& operator= (const PingusDemo&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingus_level.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -191,5 +191,4 @@
return impl->ambient_light;
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/pingus_level.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/pingus_level.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -90,7 +90,6 @@
boost::shared_ptr<PingusLevelImpl> impl;
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/pingus_level_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/pingus_level_impl.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -65,7 +65,6 @@
std::vector<FileReader> objects;
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/plf_res_mgr.cpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/plf_res_mgr.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -99,5 +99,4 @@
return load_plf_raw(res_name, Pathname("levels/" + res_name + ".pingus",
Pathname::DATA_PATH));
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/plf_res_mgr.hpp
===================================================================
--- trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/plf_res_mgr.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -22,7 +22,6 @@
class Pathname;
-/** */
class PLFResMgr
{
private:
@@ -57,7 +56,6 @@
static PingusLevel load_plf_from_filename(const Pathname& filename);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/resource.hpp
===================================================================
--- trunk/pingus/src/pingus/resource.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/resource.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
#include "pingus/collision_mask.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_manager.hpp"
-
+
class Resource
{
public:
@@ -51,7 +51,7 @@
Resource (const Resource&);
Resource& operator= (const Resource&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/resource_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/resource_manager.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/resource_manager.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -24,7 +24,6 @@
class SpriteDescription;
class FileReader;
-/** */
class ResourceManager
{
private:
Modified: trunk/pingus/src/pingus/savegame.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/savegame.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -63,7 +63,6 @@
int get_saved_pingus() const { return saved_pingus; }
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/savegame_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/savegame_manager.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -162,5 +162,4 @@
writer.end_section(); // pingus-savegame
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/savegame_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/savegame_manager.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,8 +21,6 @@
#include "pingus/savegame.hpp"
-
-/** */
class SavegameManager
{
private:
@@ -52,7 +50,6 @@
SavegameManager& operator= (const SavegameManager&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/addon_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/addon_menu.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/addon_menu.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -20,7 +20,6 @@
#include "engine/display/sprite.hpp"
#include "engine/screen/gui_screen.hpp"
-/** */
class AddOnMenu : public GUIScreen
{
private:
Modified: trunk/pingus/src/pingus/screens/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/screens/credits.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -29,7 +29,7 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/resource.hpp"
#include "pingus/stat_manager.hpp"
-
+
class CreditsOkButton
: public GUI::SurfaceButton
{
@@ -61,7 +61,7 @@
CreditsOkButton(const CreditsOkButton&);
CreditsOkButton & operator=(const CreditsOkButton&);
};
-
+
Credits::Credits() :
scene_context(),
fast_scrolling(false),
@@ -338,5 +338,5 @@
{
ScreenManager::instance ()->pop_screen ();
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/credits.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/screens/credits.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -24,7 +24,7 @@
#include "engine/display/scene_context.hpp"
#include "engine/display/sprite.hpp"
#include "engine/screen/gui_screen.hpp"
-
+
class Credits : public GUIScreen
{
private:
@@ -70,7 +70,7 @@
Credits& operator= (const Credits&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/demo_session.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -34,7 +34,7 @@
#include "pingus/server.hpp"
#include "pingus/world.hpp"
#include "util/pathname.hpp"
-
+
static bool false_func() { return false; }
class BButton : public GUI::SurfaceButton
@@ -72,7 +72,7 @@
callback();
}
};
-
+
DemoSession::DemoSession(const Pathname& pathname_) :
pathname(pathname_),
server(),
@@ -248,12 +248,11 @@
Size(Math::min(size.width, world_width),
Math::min(size.height, world_height))));
-
fastforward_button->set_pos(32+50, 32);
pause_button->set_pos(32, 32);
restart_button->set_pos(size.width - 32 - 48, 32);
small_map->set_rect(Rect(Vector2i(5, size.height - 105), Size(175, 100)));
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/demo_session.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/demo_session.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -37,7 +37,7 @@
class Playfield;
class SmallMap;
class BButton;
-
+
/** A DemoSession is analog to a GameSession, but instead of loading a
level and letting the player play a game, a demo file will be
loaded and the level will be played automatically. */
@@ -87,7 +87,7 @@
DemoSession (const DemoSession&);
DemoSession& operator= (const DemoSession&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/game_session.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -38,7 +38,7 @@
#include "pingus/savegame_manager.hpp"
#include "pingus/screens/result_screen.hpp"
#include "pingus/world.hpp"
-
+
GameSession::GameSession (const PingusLevel& arg_plf, bool
arg_show_result_screen) :
plf(arg_plf),
show_result_screen(arg_show_result_screen),
@@ -391,5 +391,5 @@
button_panel->set_pos(Vector2i(0, (size.height - 150)/2));
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/game_session.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -39,7 +39,7 @@
class ForwardButton;
class PauseButton;
class Server;
-
+
/** You can use this class to start up a game session, which consist
of a single level. */
class GameSession : public GUIScreen
@@ -118,7 +118,7 @@
GameSession& operator= (const GameSession&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/level_menu.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -35,7 +35,7 @@
#include "pingus/screens/option_menu.hpp"
#include "pingus/screens/start_screen.hpp"
#include "util/system.hpp"
-
+
class LevelMenuAbortButton : public GUI::SurfaceButton
{
private:
@@ -70,7 +70,7 @@
LevelMenuAbortButton(const LevelMenuAbortButton&);
LevelMenuAbortButton & operator=(const LevelMenuAbortButton&);
};
-
+
class LevelScrollButton : public GUI::SurfaceButton
{
private:
@@ -100,7 +100,7 @@
LevelScrollButton(const LevelScrollButton&);
LevelScrollButton & operator=(const LevelScrollButton&);
};
-
+
class LevelsetSelector : public GUI::RectComponent
{
private:
@@ -228,7 +228,7 @@
LevelsetSelector(const LevelsetSelector&);
LevelsetSelector & operator=(const LevelsetSelector&);
};
-
+
class LevelSelector : public GUI::RectComponent
{
private:
@@ -358,7 +358,7 @@
LevelSelector(const LevelSelector&);
LevelSelector & operator=(const LevelSelector&);
};
-
+
LevelMenu::LevelMenu() :
x_pos((Display::get_width() - default_screen_width)/2),
y_pos((Display::get_height() - default_screen_height)/2),
@@ -479,5 +479,5 @@
abort_button->set_pos(size.width /2 - 300,
size.height/2 + 144);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/level_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/level_menu.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/level_menu.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -27,8 +27,7 @@
class LevelSelector;
class LevelsetSelector;
-
-/** */
+
class LevelMenu : public GUIScreen
{
private:
@@ -64,7 +63,7 @@
LevelMenu (const LevelMenu&);
LevelMenu& operator= (const LevelMenu&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/option_menu.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/option_menu.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -31,7 +31,6 @@
class CheckBox;
class SliderBox;
-/** */
class OptionMenu : public GUIScreen
{
private:
Modified: trunk/pingus/src/pingus/screens/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/pingus_menu.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -38,7 +38,7 @@
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
#include "util/pathname.hpp"
-
+
PingusMenu::PingusMenu() :
is_init(),
hint(),
@@ -271,5 +271,5 @@
quit_button->set_pos(size.width/2 + 150,
size.height/2 + 100);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/pingus_menu.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/pingus_menu.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -32,7 +32,7 @@
class GameDelta;
class LayerManager;
class MenuButton;
-
+
class PingusMenu : public GUIScreen
{
public:
@@ -79,7 +79,7 @@
PingusMenu (const PingusMenu&);
PingusMenu& operator= (const PingusMenu&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/result_screen.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -32,7 +32,7 @@
#include "pingus/screens/game_session.hpp"
#include "util/string_util.hpp"
#include "util/system.hpp"
-
+
class ResultScreenComponent : public GUI::Component
{
public:
@@ -45,7 +45,7 @@
virtual ~ResultScreenComponent() {}
void draw(DrawingContext& gc) ;
};
-
+
class ResultScreenOkButton
: public GUI::SurfaceButton
{
@@ -76,7 +76,7 @@
ResultScreenOkButton(const ResultScreenOkButton&);
ResultScreenOkButton & operator=(const ResultScreenOkButton&);
};
-
+
class ResultScreenAbortButton
: public GUI::SurfaceButton
{
@@ -101,7 +101,6 @@
parent->close_screen();
}
-
void on_pointer_enter()
{
SurfaceButton::on_pointer_enter();
@@ -112,7 +111,7 @@
ResultScreenAbortButton(const ResultScreenAbortButton&);
ResultScreenAbortButton & operator=(const ResultScreenAbortButton&);
};
-
+
class ResultScreenRetryButton : public GUI::SurfaceButton
{
private:
@@ -154,7 +153,7 @@
ResultScreenRetryButton(const ResultScreenRetryButton&);
ResultScreenRetryButton & operator=(const ResultScreenRetryButton&);
};
-
+
ResultScreenComponent::ResultScreenComponent(Result arg_result) :
result(arg_result),
background("core/menu/wood"),
@@ -244,7 +243,6 @@
gc.print_left(Fonts::chalk_normal, Vector2i(left_x, (y+=30)), _("Died: "));
gc.print_right(Fonts::chalk_normal, Vector2i(right_x, y),
StringUtil::to_string(result.killed));
-
gc.print_left(Fonts::chalk_normal, Vector2i(left_x, (y+=30)), _("Time left:
"));
gc.print_right(Fonts::chalk_normal, Vector2i(right_x, y), time_str);
}
@@ -339,5 +337,5 @@
if (retry_button)
retry_button->set_pos(size.width/2 + 225, size.height/2 + 125);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/result_screen.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/result_screen.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,8 +23,7 @@
namespace GUI {
class SurfaceButton;
} // namespace GUI
-
-/** */
+
class ResultScreen : public GUIScreen
{
private:
@@ -49,7 +48,7 @@
ResultScreen (const ResultScreen&);
ResultScreen& operator= (const ResultScreen&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/start_screen.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -35,7 +35,7 @@
#include "pingus/string_format.hpp"
#include "util/string_util.hpp"
#include "util/system.hpp"
-
+
class StartScreenComponent : public GUI::Component
{
private:
@@ -53,7 +53,7 @@
private:
const std::string& format_description(int length);
};
-
+
class StartScreenOkButton : public GUI::SurfaceButton
{
private:
@@ -85,7 +85,6 @@
parent->start_game();
}
-
void on_pointer_enter()
{
SurfaceButton::on_pointer_enter();
@@ -96,7 +95,7 @@
StartScreenOkButton(const StartScreenOkButton&);
StartScreenOkButton & operator=(const StartScreenOkButton&);
};
-
+
class StartScreenAbortButton
: public GUI::SurfaceButton
{
@@ -133,7 +132,7 @@
StartScreenAbortButton(const StartScreenAbortButton&);
StartScreenAbortButton & operator=(const StartScreenAbortButton&);
};
-
+
StartScreenComponent::StartScreenComponent(const PingusLevel& p) :
plf(p),
background("core/menu/wood"),
@@ -207,7 +206,7 @@
return description;
}
-
+
StartScreen::StartScreen(const PingusLevel& arg_plf) :
plf(arg_plf),
abort_button(),
@@ -263,5 +262,5 @@
abort_button->set_pos(size.width/2 - 300, size.height/2 + 144);
ok_button ->set_pos(size.width/2 + 225, size.height/2 + 125);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/start_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/start_screen.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/start_screen.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,8 +23,7 @@
namespace GUI {
class SurfaceButton;
} // namespace GUI
-
-/** */
+
class StartScreen : public GUIScreen
{
private:
@@ -49,7 +48,7 @@
StartScreen (const StartScreen&);
StartScreen& operator= (const StartScreen&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/screens/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/story_screen.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -37,7 +37,7 @@
#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldmap/worldmap_story.hpp"
#include "util/utf8.hpp"
-
+
class StoryScreenComponent : public GUI::Component
{
private:
@@ -70,7 +70,7 @@
StoryScreenComponent(const StoryScreenComponent&);
StoryScreenComponent & operator=(const StoryScreenComponent&);
};
-
+
class StoryScreenContinueButton : public GUI::SurfaceButton
{
private:
@@ -100,7 +100,7 @@
StoryScreenContinueButton(const StoryScreenContinueButton&);
StoryScreenContinueButton & operator=(const StoryScreenContinueButton&);
};
-
+
class StoryScreenSkipButton : public GUI::SurfaceButton
{
private:
@@ -142,7 +142,7 @@
StoryScreenSkipButton(const StoryScreenSkipButton&);
StoryScreenSkipButton & operator=(const StoryScreenSkipButton&);
};
-
+
StoryScreen::StoryScreen(FileReader reader) :
story(new WorldmapNS::WorldmapStory(reader)),
story_comp(),
@@ -320,5 +320,5 @@
skip_button->set_pos(size.width - 4,
size.height - 26);
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -33,8 +33,7 @@
namespace GUI {
class SurfaceButton;
}
-
-/** */
+
class StoryScreen : public GUIScreen
{
private:
@@ -57,7 +56,7 @@
StoryScreen (const StoryScreen&);
StoryScreen& operator= (const StoryScreen&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/server.cpp
===================================================================
--- trunk/pingus/src/pingus/server.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/server.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -28,7 +28,7 @@
#include "util/system.hpp"
using Actions::action_from_string;
-
+
static std::string get_date_string ()
{
char buffer[32];
@@ -155,5 +155,5 @@
record(ServerEvent::make_finish_event(get_time()));
goal_manager->set_abort_goal();
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/server.hpp
===================================================================
--- trunk/pingus/src/pingus/server.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/server.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -70,7 +70,6 @@
Server& operator= (const Server&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/server_event.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
#include "pingus/server.hpp"
#include "pingus/world.hpp"
#include "util/string_util.hpp"
-
+
ServerEvent::ServerEvent() :
type(PINGU_ACTION_EVENT),
time_stamp(0),
@@ -192,5 +192,5 @@
assert(!"Unknown type");
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/server_event.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -82,7 +82,6 @@
static ServerEvent make_pingu_action_event(int t, int id, const Vector3f&
pos, Actions::ActionName action);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/smallmap_image.hpp
===================================================================
--- trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/smallmap_image.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -55,7 +55,6 @@
SmallMapImage& operator= (const SmallMapImage&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/stat_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/stat_manager.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -196,5 +196,4 @@
flush();
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/stat_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/stat_manager.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/stat_manager.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -20,8 +20,6 @@
#include <map>
#include <string>
-
-/** */
class StatManager
{
private:
@@ -62,7 +60,6 @@
StatManager& operator= (const StatManager&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/state_sprite.hpp
===================================================================
--- trunk/pingus/src/pingus/state_sprite.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/state_sprite.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -40,7 +40,6 @@
Sprite& operator[](int state);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/string_format.cpp
===================================================================
--- trunk/pingus/src/pingus/string_format.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/string_format.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -102,5 +102,4 @@
return out.str();
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -38,7 +38,7 @@
#include "pingus/worldobjs/entrance.hpp"
using Actions::BOMBER;
-
+
static
bool WorldObj_less (WorldObj* a, WorldObj* b)
{
@@ -330,5 +330,5 @@
return pos;
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/world.hpp
===================================================================
--- trunk/pingus/src/pingus/world.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/world.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -42,7 +42,7 @@
class SmokeParticleHolder;
class SnowParticleHolder;
}
-
+
/** The World holds all objects of the pingu enviroment.
It holds the pingus, traps, exits, entrances, etc.. It keeps
@@ -164,7 +164,7 @@
World (const World&);
World& operator= (const World&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot_factory.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/dot_factory.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,6 @@
class Dot;
-/** */
class DotFactory
{
private:
Modified: trunk/pingus/src/pingus/worldmap/drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/drawable.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -17,5 +17,4 @@
#include "pingus/worldmap/drawable.hpp"
-
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable_factory.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -21,7 +21,6 @@
namespace WorldmapNS {
-/** */
class DrawableFactory
{
private:
Modified: trunk/pingus/src/pingus/worldmap/graph.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/graph.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/worldmap/graph.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -16,7 +16,6 @@
#include "pingus/worldmap/graph.hpp"
-
namespace WorldmapNS {
const NodeId NoNode = -1;
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -16,7 +16,6 @@
#include "pingus/worldmap/level_dot.hpp"
-
#include <iostream>
#include "engine/display/drawing_context.hpp"
@@ -124,7 +123,6 @@
return false;
}
-
void
LevelDot::draw_hover(DrawingContext& gc)
{
Modified: trunk/pingus/src/pingus/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/level_dot.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -23,7 +23,6 @@
namespace WorldmapNS {
-/** */
class LevelDot : public Dot
{
private:
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,7 +21,7 @@
#include "pingus/worldmap/path_graph.hpp"
namespace WorldmapNS {
-
+
/** Drawable to show the path between two nodes, only used for
debugging */
class PathDrawable : public Drawable
@@ -39,7 +39,7 @@
PathDrawable (const PathDrawable&);
PathDrawable& operator= (const PathDrawable&);
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldmap/pathfinder.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pathfinder.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/pathfinder.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -34,7 +34,6 @@
{}
};
-/** */
template<class T, class C>
class Pathfinder
{
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -54,7 +54,6 @@
{
}
-
void
Pingus::draw (DrawingContext& gc)
{
Modified: trunk/pingus/src/pingus/worldmap/pingus.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/worldmap/pingus.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -75,7 +75,6 @@
Vector3f last_pos;
public:
- /** */
Pingus (PathGraph* arg_path);
~Pingus ();
@@ -113,7 +112,6 @@
float calc_edge_path_length();
- /** */
Vector3f interpolate(const Vector3f& a, const Vector3f& b, float perc);
Pingus (const Pingus&);
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -23,7 +23,7 @@
#include "util/file_reader.hpp"
using namespace WorldmapNS;
-
+
class PingusWorldmapImpl
{
public:
@@ -65,7 +65,7 @@
objects()
{}
};
-
+
PingusWorldmap::PingusWorldmap() :
impl()
{
@@ -114,7 +114,7 @@
reader.read_string("default-node", impl->default_node);
reader.read_string("final-node", impl->final_node);
}
-
+
std::string
PingusWorldmap::get_name() const
{
@@ -198,5 +198,5 @@
{
return impl->end_story;
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -24,7 +24,7 @@
#include "util/pathname.hpp"
class PingusWorldmapImpl;
-
+
/** PingusWorldmap is responisble for loading .worldmap files, its
analog to PingusLevel */
class PingusWorldmap
@@ -59,7 +59,7 @@
protected:
boost::shared_ptr<PingusWorldmapImpl> impl;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -25,7 +25,7 @@
#include "pingus/worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
-
+
SpriteDrawable::SpriteDrawable(FileReader reader) :
Drawable(reader),
surface(),
@@ -73,7 +73,7 @@
}
}
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -22,7 +22,7 @@
#include "pingus/worldmap/drawable.hpp"
namespace WorldmapNS {
-
+
class SpriteDrawable : public Drawable
{
private:
@@ -43,7 +43,7 @@
SpriteDrawable (const SpriteDrawable&);
SpriteDrawable& operator= (const SpriteDrawable&);
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -51,7 +51,7 @@
namespace WorldmapNS {
Worldmap* Worldmap::current_ = 0;
-
+
Worldmap::Worldmap(const std::string& arg_filename) :
worldmap(),
filename(arg_filename),
@@ -389,7 +389,7 @@
{
return worldmap.get_height();
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -37,7 +37,7 @@
class PathGraph;
class Drawable;
class Pingus;
-
+
/** A class for loading, displaying and managing the worldmap. The
worldmap is basically a multi-layered image and a path
(bidirectional graph) where a pingu can walk on. Parts of the
@@ -129,7 +129,7 @@
Worldmap(const Worldmap&);
Worldmap & operator=(const Worldmap&);
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -22,7 +22,7 @@
#include "pingus/worldmap/worldmap_screen.hpp"
namespace WorldmapNS {
-
+
WorldmapComponent::WorldmapComponent(WorldmapScreen* worldmap_screen_) :
scene_context(new SceneContext),
worldmap_screen(worldmap_screen_)
@@ -78,7 +78,6 @@
worldmap_screen->get_worldmap()->update(delta);
}
-
void
WorldmapComponent::on_primary_button_press (int x, int y)
{
@@ -87,7 +86,6 @@
y - cliprect.top);
}
-
void
WorldmapComponent::on_pointer_move (int x, int y)
{
@@ -103,7 +101,7 @@
worldmap_screen->get_worldmap()->on_secondary_button_press(x - cliprect.left,
y - cliprect.top);
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -28,7 +28,7 @@
class WorldmapScreen;
class Worldmap;
-
+
class WorldmapComponent : public GUI::Component
{
private:
@@ -52,7 +52,7 @@
WorldmapComponent (const WorldmapComponent&);
WorldmapComponent& operator= (const WorldmapComponent&);
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -16,7 +16,6 @@
#include "pingus/worldmap/worldmap_screen.hpp"
-
#include <iostream>
#include "engine/display/display.hpp"
@@ -38,7 +37,7 @@
#include "pingus/worldmap/worldmap_story.hpp"
namespace WorldmapNS {
-
+
class WorldmapScreenCloseButton
: public GUI::SurfaceButton
{
@@ -54,7 +53,7 @@
WorldmapScreenCloseButton(const WorldmapScreenCloseButton&);
WorldmapScreenCloseButton & operator=(const WorldmapScreenCloseButton&);
};
-
+
class WorldmapScreenStoryButton
: public GUI::SurfaceButton
{
@@ -70,7 +69,7 @@
WorldmapScreenStoryButton(const WorldmapScreenStoryButton&);
WorldmapScreenStoryButton & operator=(const WorldmapScreenStoryButton&);
};
-
+
class WorldmapScreenCreditsButton
: public GUI::SurfaceButton
{
@@ -86,7 +85,7 @@
WorldmapScreenCreditsButton(const WorldmapScreenCreditsButton&);
WorldmapScreenCreditsButton & operator=(const WorldmapScreenCreditsButton&);
};
-
+
class WorldmapScreenEnterButton
: public GUI::SurfaceButton
{
@@ -102,7 +101,7 @@
WorldmapScreenEnterButton(const WorldmapScreenEnterButton&);
WorldmapScreenEnterButton & operator=(const WorldmapScreenEnterButton&);
};
-
+
WorldmapScreenCreditsButton::WorldmapScreenCreditsButton(WorldmapScreen*
worldmap_screen_) :
GUI::SurfaceButton(Display::get_width() - 150, 0,
"core/worldmap/credits_button_normal",
@@ -160,7 +159,7 @@
{
worldmap_screen->show_intro_story();
}
-
+
WorldmapScreenCloseButton::WorldmapScreenCloseButton(WorldmapScreen*
worldmap_screen_) :
GUI::SurfaceButton(0, Display::get_height() - 37,
"core/worldmap/leave_button_normal",
@@ -189,7 +188,7 @@
{
ScreenManager::instance ()->pop_screen ();
}
-
+
WorldmapScreenEnterButton::WorldmapScreenEnterButton(WorldmapScreen*
worldmap_screen_) :
GUI::SurfaceButton(Display::get_width() - 119, Display::get_height() - 37,
"core/worldmap/enter_button_normal",
@@ -228,7 +227,7 @@
{
worldmap_screen->get_worldmap()->enter_level();
}
-
+
WorldmapScreen::WorldmapScreen() :
levelname_bg("core/worldmap/levelname_bg"),
is_init(false),
@@ -342,7 +341,7 @@
story_button->set_pos(0, 0);
enter_button->set_pos(size.width - 119, size.height - 37);
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -34,7 +34,7 @@
typedef int NodeId;
class Worldmap;
class WorldmapComponent;
-
+
/** The WorldmapScreen manages the worldmaps and the translation
between two worldmaps, it also holds the GUI elements that are
accessible in the Worldmap Screen */
@@ -91,7 +91,7 @@
WorldmapScreen (const WorldmapScreen&);
WorldmapScreen& operator= (const WorldmapScreen&);
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -28,7 +28,7 @@
#include "util/file_reader.hpp"
namespace WorldmapNS {
-
+
WorldmapStory::WorldmapStory(const FileReader &reader) :
title(),
music(),
@@ -61,7 +61,7 @@
if (pages.empty())
throw std::runtime_error("WorldmapStory: Worldmap does not include a valid
story");
}
-
+
} // namespace WorldmapNS
/* EOF */
Modified: trunk/pingus/src/pingus/worldmap/worldmap_story.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldmap/worldmap_story.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -43,7 +43,7 @@
};
namespace WorldmapNS {
-
+
class WorldmapStory
{
public:
@@ -59,7 +59,7 @@
std::string music;
std::vector<StoryPage> pages;
};
-
+
} // namespace WorldmapNS
#endif
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -21,7 +21,6 @@
#include "engine/display/scene_context.hpp"
-
World* WorldObj::world;
void
@@ -85,5 +84,4 @@
#endif
}
-
/* EOF */
Modified: trunk/pingus/src/pingus/worldobj.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/pingus/worldobj.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -92,7 +92,6 @@
virtual void update ();
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/worldobj_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobj_factory.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -46,7 +46,7 @@
using namespace WorldObjs;
WorldObjFactory* WorldObjFactory::instance_ = 0;
-
+
/** WorldObjAbstractFactory, interface for creating factories */
class WorldObjAbstractFactory
{
@@ -63,7 +63,7 @@
WorldObjAbstractFactory (const WorldObjAbstractFactory&);
WorldObjAbstractFactory& operator= (const WorldObjAbstractFactory&);
};
-
+
/** Template to create factories, usage:
new WorldObjFactoryImpl<"liquid", Liquid>; */
template<class T>
@@ -81,7 +81,7 @@
WorldObjFactoryImpl (const WorldObjFactoryImpl&);
WorldObjFactoryImpl& operator= (const WorldObjFactoryImpl&);
};
-
+
WorldObjFactory::WorldObjFactory() :
factories()
{
@@ -175,5 +175,5 @@
delete i->second;
}
}
-
+
/* EOF */
Modified: trunk/pingus/src/pingus/worldobj_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobj_factory.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -54,7 +54,6 @@
WorldObjFactory& operator= (const WorldObjFactory&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/pingus/worldobjs/entrance.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/entrance.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -21,7 +21,6 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
-
namespace WorldObjsData {
class EntranceData;
}
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -47,7 +47,6 @@
gc.color().draw (surface, pos);
}
-
void
FakeExit::update ()
{
Modified: trunk/pingus/src/pingus/worldobjs/groundpiece.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/groundpiece.hpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/groundpiece.hpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -22,7 +22,6 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/worldobj.hpp"
-
namespace WorldObjsData {
class GroundpieceData;
}
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-06 20:12:41 UTC
(rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-06 20:26:48 UTC
(rev 4066)
@@ -52,7 +52,6 @@
}
}
-
float
Guillotine::get_z_pos () const
{
Modified: trunk/pingus/src/pingus/worldobjs/snow_generator.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/snow_generator.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/snow_generator.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -19,7 +19,6 @@
#include "pingus/worldobj.hpp"
-
namespace WorldObjsData {
class SnowGeneratorData;
}
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.cpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -48,7 +48,6 @@
delete stars[i];
}
-
void
StarfieldBackground::update ()
{
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background.hpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background.hpp 2009-11-06
20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background.hpp 2009-11-06
20:26:48 UTC (rev 4066)
@@ -21,7 +21,6 @@
#include "pingus/worldobj.hpp"
-
namespace WorldObjsData {
class StarfieldBackgroundData;
}
Modified: trunk/pingus/src/util/debug_stream.cpp
===================================================================
--- trunk/pingus/src/util/debug_stream.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/debug_stream.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -20,7 +20,6 @@
using std::ostream;
-
NilStream DebugStream::nilstream;
DebugStream::Buffer::Buffer (const std::string& p) :
@@ -109,17 +108,14 @@
out_streams.push_back (&s);
}
-
void
DebugStream::Buffer::set_prefix (const std::string & prefix_)
{
prefix = prefix_;
}
-
// ----------------------------------------------------------------
-
DebugStream::DebugStream (const std::string& prefix)
: ostream (&buffer),
buffer (prefix)
@@ -152,12 +148,10 @@
buffer.set_prefix(prefix);
}
-
NilStream::NilStream() :
ostream(&buffer),
buffer()
{
}
-
/* EOF */
Modified: trunk/pingus/src/util/debug_stream.hpp
===================================================================
--- trunk/pingus/src/util/debug_stream.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/debug_stream.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -74,7 +74,6 @@
};
-
/// Stream used to consume unwanted debugmessages
class NilStream : public std::ostream
{
@@ -109,7 +108,6 @@
NilStream & operator << (int &) { return *this; }
NilStream & operator << (unsigned int &) { return *this; }
-
friend class DebugStream;
};
Modified: trunk/pingus/src/util/file_reader_impl.hpp
===================================================================
--- trunk/pingus/src/util/file_reader_impl.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/file_reader_impl.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -27,7 +27,7 @@
class FileReader;
class ResDescriptor;
-
+
class FileReaderImpl
{
public:
@@ -49,7 +49,7 @@
virtual std::vector<FileReader> get_sections() const =0;
virtual std::vector<std::string> get_section_names() const =0;
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/util/file_writer.hpp
===================================================================
--- trunk/pingus/src/util/file_writer.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/file_writer.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -19,7 +19,6 @@
#include <string>
-
class Vector3f;
class Size;
class Color;
@@ -44,7 +43,6 @@
virtual void write_size (const char* name, const Size&) = 0;
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/util/memory_pool.hpp
===================================================================
--- trunk/pingus/src/util/memory_pool.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/memory_pool.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -19,7 +19,7 @@
#include <assert.h>
#include <vector>
-
+
/** MemoryPool allows the allocation of small objects on a previous
allocated chunk of memeroy, thus reducing the amount of new/delete
calls that have do be done and providing a speed up. */
@@ -105,7 +105,7 @@
MemoryPool& operator= (const MemoryPool&);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/util/pathname.cpp
===================================================================
--- trunk/pingus/src/util/pathname.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/pathname.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -21,7 +21,7 @@
#include "pingus/path_manager.hpp"
#include "util/system.hpp"
-
+
Pathname Pathname::tmpfile(const std::string& prefix)
{
assert(!"Unimplemented");
@@ -127,5 +127,5 @@
}
return os;
}
-
+
/* EOF */
Modified: trunk/pingus/src/util/pathname.hpp
===================================================================
--- trunk/pingus/src/util/pathname.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/pathname.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,7 +20,7 @@
#include <SDL.h>
#include <iosfwd>
#include <string>
-
+
/** Simple class to allow a distinction of paths that refer to the
* filesystem and paths that refer to the datadir, it also hides
* path_manager from the rest of the code. */
@@ -69,7 +69,7 @@
};
std::ostream& operator<< (std::ostream& os, const Pathname& p);
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/util/sexpr_file_reader.cpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/sexpr_file_reader.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -26,7 +26,7 @@
#include "pingus/res_descriptor.hpp"
#include "pingus/resource_modifier.hpp"
#include "util/file_reader_impl.hpp"
-
+
class SExprFileReaderImpl: public FileReaderImpl
{
public:
@@ -267,5 +267,5 @@
: FileReader(boost::shared_ptr<FileReaderImpl>(new
SExprFileReaderImpl(lisp)))
{
}
-
+
/* EOF */
Modified: trunk/pingus/src/util/sexpr_file_reader.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/sexpr_file_reader.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -19,15 +19,14 @@
#include "lisp/lisp.hpp"
#include "util/file_reader.hpp"
-
-/** */
+
class SExprFileReader : public FileReader
{
private:
public:
SExprFileReader(boost::shared_ptr<lisp::Lisp> lisp);
};
-
+
#endif
/* EOF */
Modified: trunk/pingus/src/util/sexpr_file_writer.hpp
===================================================================
--- trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/sexpr_file_writer.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -25,7 +25,6 @@
#include "math/vector3f.hpp"
#include "util/file_writer.hpp"
-/** */
class SExprFileWriter : public FileWriter
{
private:
Modified: trunk/pingus/src/util/string_util.cpp
===================================================================
--- trunk/pingus/src/util/string_util.cpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/string_util.cpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -16,7 +16,6 @@
#include "util/string_util.hpp"
-
// Code based on clanstring.cpp from ClanLib 0.8
std::string
Modified: trunk/pingus/src/util/string_util.hpp
===================================================================
--- trunk/pingus/src/util/string_util.hpp 2009-11-06 20:12:41 UTC (rev
4065)
+++ trunk/pingus/src/util/string_util.hpp 2009-11-06 20:26:48 UTC (rev
4066)
@@ -19,7 +19,6 @@
#include <sstream>
-/** */
class StringUtil
{
private:
Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/system.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -401,7 +401,6 @@
return str.str();
}
-
uint64_t
System::get_mtime(const std::string& filename)
{
Modified: trunk/pingus/src/util/system.hpp
===================================================================
--- trunk/pingus/src/util/system.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/system.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -111,7 +111,6 @@
System& operator= (const System&);
};
-
#endif
/* EOF */
Modified: trunk/pingus/src/util/utf8.cpp
===================================================================
--- trunk/pingus/src/util/utf8.cpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/utf8.cpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -185,7 +185,7 @@
throw std::runtime_error("Malformed utf-8 sequence");
}
}
-
+
// FIXME: Get rid of exceptions in this code
UTF8::iterator::iterator(const std::string& text_)
: text(&text_),
Modified: trunk/pingus/src/util/utf8.hpp
===================================================================
--- trunk/pingus/src/util/utf8.hpp 2009-11-06 20:12:41 UTC (rev 4065)
+++ trunk/pingus/src/util/utf8.hpp 2009-11-06 20:26:48 UTC (rev 4066)
@@ -20,7 +20,7 @@
#include <stdint.h>
#include <string>
-
+
class UTF8
{
public:
@@ -85,7 +85,7 @@
static uint32_t decode_utf8(const std::string& text);
};
-
+
#endif
/* EOF */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4066 - in trunk/pingus/src: editor engine/display engine/display/opengl engine/gui engine/input engine/input/evdev engine/input/wiimote engine/input/xinput engine/input_old engine/input_old/buttons engine/screen engine/sound math pingus pingus/actions pingus/components pingus/movers pingus/particles pingus/screens pingus/worldmap pingus/worldobjs util,
grumbel at BerliOS <=