[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2648 - in branches/pingus_sdl/src: . actions colliders com
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r2648 - in branches/pingus_sdl/src: . actions colliders components display editor gui input input/axes input/buttons input/pointers input/scrollers movers particles sound worldmap worldobjs |
|
Date: |
Sun, 14 Jan 2007 20:30:17 +0100 |
Author: grumbel
Date: 2007-01-14 20:30:03 +0100 (Sun, 14 Jan 2007)
New Revision: 2648
Modified:
branches/pingus_sdl/src/action_holder.cxx
branches/pingus_sdl/src/action_holder.hxx
branches/pingus_sdl/src/actions/angel.cxx
branches/pingus_sdl/src/actions/angel.hxx
branches/pingus_sdl/src/actions/basher.cxx
branches/pingus_sdl/src/actions/basher.hxx
branches/pingus_sdl/src/actions/blocker.cxx
branches/pingus_sdl/src/actions/blocker.hxx
branches/pingus_sdl/src/actions/boarder.cxx
branches/pingus_sdl/src/actions/boarder.hxx
branches/pingus_sdl/src/actions/bomber.cxx
branches/pingus_sdl/src/actions/bomber.hxx
branches/pingus_sdl/src/actions/bridger.cxx
branches/pingus_sdl/src/actions/bridger.hxx
branches/pingus_sdl/src/actions/climber.cxx
branches/pingus_sdl/src/actions/climber.hxx
branches/pingus_sdl/src/actions/digger.cxx
branches/pingus_sdl/src/actions/digger.hxx
branches/pingus_sdl/src/actions/drown.cxx
branches/pingus_sdl/src/actions/drown.hxx
branches/pingus_sdl/src/actions/exiter.cxx
branches/pingus_sdl/src/actions/exiter.hxx
branches/pingus_sdl/src/actions/faller.cxx
branches/pingus_sdl/src/actions/faller.hxx
branches/pingus_sdl/src/actions/floater.cxx
branches/pingus_sdl/src/actions/floater.hxx
branches/pingus_sdl/src/actions/jumper.cxx
branches/pingus_sdl/src/actions/jumper.hxx
branches/pingus_sdl/src/actions/laser_kill.cxx
branches/pingus_sdl/src/actions/laser_kill.hxx
branches/pingus_sdl/src/actions/miner.cxx
branches/pingus_sdl/src/actions/miner.hxx
branches/pingus_sdl/src/actions/rocket_launcher.cxx
branches/pingus_sdl/src/actions/rocket_launcher.hxx
branches/pingus_sdl/src/actions/slider.cxx
branches/pingus_sdl/src/actions/slider.hxx
branches/pingus_sdl/src/actions/smashed.cxx
branches/pingus_sdl/src/actions/smashed.hxx
branches/pingus_sdl/src/actions/splashed.cxx
branches/pingus_sdl/src/actions/splashed.hxx
branches/pingus_sdl/src/actions/superman.cxx
branches/pingus_sdl/src/actions/superman.hxx
branches/pingus_sdl/src/actions/teleported.cxx
branches/pingus_sdl/src/actions/teleported.hxx
branches/pingus_sdl/src/actions/waiter.cxx
branches/pingus_sdl/src/actions/waiter.hxx
branches/pingus_sdl/src/actions/walker.cxx
branches/pingus_sdl/src/actions/walker.hxx
branches/pingus_sdl/src/blitter.cxx
branches/pingus_sdl/src/blitter.hxx
branches/pingus_sdl/src/blitter_impl.hxx
branches/pingus_sdl/src/blitter_test.cxx
branches/pingus_sdl/src/blitter_test.hxx
branches/pingus_sdl/src/capture_rectangle.cxx
branches/pingus_sdl/src/capture_rectangle.hxx
branches/pingus_sdl/src/cheat.cxx
branches/pingus_sdl/src/cheat.hxx
branches/pingus_sdl/src/client.cxx
branches/pingus_sdl/src/client.hxx
branches/pingus_sdl/src/col_map.cxx
branches/pingus_sdl/src/col_map.hxx
branches/pingus_sdl/src/collider.cxx
branches/pingus_sdl/src/collider.hxx
branches/pingus_sdl/src/colliders/pingu_collider.cxx
branches/pingus_sdl/src/colliders/pingu_collider.hxx
branches/pingus_sdl/src/components/action_button.cxx
branches/pingus_sdl/src/components/action_button.hxx
branches/pingus_sdl/src/components/button_panel.cxx
branches/pingus_sdl/src/components/button_panel.hxx
branches/pingus_sdl/src/components/hurry_up.cxx
branches/pingus_sdl/src/components/hurry_up.hxx
branches/pingus_sdl/src/components/menu_button.cxx
branches/pingus_sdl/src/components/menu_button.hxx
branches/pingus_sdl/src/components/pingus_counter.cxx
branches/pingus_sdl/src/components/pingus_counter.hxx
branches/pingus_sdl/src/components/playfield.cxx
branches/pingus_sdl/src/components/playfield.hxx
branches/pingus_sdl/src/components/smallmap.cxx
branches/pingus_sdl/src/components/smallmap.hxx
branches/pingus_sdl/src/components/time_display.cxx
branches/pingus_sdl/src/components/time_display.hxx
branches/pingus_sdl/src/config.cxx
branches/pingus_sdl/src/config.hxx
branches/pingus_sdl/src/console.cxx
branches/pingus_sdl/src/console.hxx
branches/pingus_sdl/src/credits.cxx
branches/pingus_sdl/src/credits.hxx
branches/pingus_sdl/src/debug.cxx
branches/pingus_sdl/src/debug.hxx
branches/pingus_sdl/src/debug_stream.cxx
branches/pingus_sdl/src/debug_stream.hxx
branches/pingus_sdl/src/delta_manager.hxx
branches/pingus_sdl/src/demo_player.cxx
branches/pingus_sdl/src/demo_player.hxx
branches/pingus_sdl/src/demo_recorder.cxx
branches/pingus_sdl/src/demo_recorder.hxx
branches/pingus_sdl/src/demo_session.cxx
branches/pingus_sdl/src/demo_session.hxx
branches/pingus_sdl/src/direction.cxx
branches/pingus_sdl/src/direction.hxx
branches/pingus_sdl/src/display/drawing_context.cxx
branches/pingus_sdl/src/display/drawing_context.hxx
branches/pingus_sdl/src/display/scene_context.cxx
branches/pingus_sdl/src/display/scene_context.hxx
branches/pingus_sdl/src/dummy_screen.hxx
branches/pingus_sdl/src/editor/context_menu.cxx
branches/pingus_sdl/src/editor/context_menu.hxx
branches/pingus_sdl/src/editor/editor_panel.cxx
branches/pingus_sdl/src/editor/editor_panel.hxx
branches/pingus_sdl/src/editor/editor_screen.cxx
branches/pingus_sdl/src/editor/editor_screen.hxx
branches/pingus_sdl/src/editor/editor_viewport.cxx
branches/pingus_sdl/src/editor/editor_viewport.hxx
branches/pingus_sdl/src/editor/level_head.cxx
branches/pingus_sdl/src/editor/level_head.hxx
branches/pingus_sdl/src/editor/level_impl.hxx
branches/pingus_sdl/src/editor/level_objs.cxx
branches/pingus_sdl/src/editor/level_objs.hxx
branches/pingus_sdl/src/editor/panel_buttons.cxx
branches/pingus_sdl/src/editor/panel_buttons.hxx
branches/pingus_sdl/src/editor/xml_level.cxx
branches/pingus_sdl/src/editor/xml_level.hxx
branches/pingus_sdl/src/exit_menu.cxx
branches/pingus_sdl/src/exit_menu.hxx
branches/pingus_sdl/src/file_dialog.cxx
branches/pingus_sdl/src/file_dialog.hxx
branches/pingus_sdl/src/file_dialog_item.cxx
branches/pingus_sdl/src/file_dialog_item.hxx
branches/pingus_sdl/src/file_dialog_listener.hxx
branches/pingus_sdl/src/file_reader.cxx
branches/pingus_sdl/src/file_reader.hxx
branches/pingus_sdl/src/file_reader_impl.hxx
branches/pingus_sdl/src/file_writer.hxx
branches/pingus_sdl/src/fonts.cxx
branches/pingus_sdl/src/fonts.hxx
branches/pingus_sdl/src/fps_counter.cxx
branches/pingus_sdl/src/fps_counter.hxx
branches/pingus_sdl/src/game_counter.cxx
branches/pingus_sdl/src/game_counter.hxx
branches/pingus_sdl/src/game_event.hxx
branches/pingus_sdl/src/game_session.cxx
branches/pingus_sdl/src/game_session.hxx
branches/pingus_sdl/src/game_session_result.cxx
branches/pingus_sdl/src/game_session_result.hxx
branches/pingus_sdl/src/game_time.cxx
branches/pingus_sdl/src/game_time.hxx
branches/pingus_sdl/src/gettext.cxx
branches/pingus_sdl/src/gettext.h
branches/pingus_sdl/src/global_event.cxx
branches/pingus_sdl/src/global_event.hxx
branches/pingus_sdl/src/globals.cxx
branches/pingus_sdl/src/globals.hxx
branches/pingus_sdl/src/goal_manager.cxx
branches/pingus_sdl/src/goal_manager.hxx
branches/pingus_sdl/src/ground_map.cxx
branches/pingus_sdl/src/ground_map.hxx
branches/pingus_sdl/src/groundtype.cxx
branches/pingus_sdl/src/groundtype.hxx
branches/pingus_sdl/src/gui/buffer_graphic_context.cxx
branches/pingus_sdl/src/gui/buffer_graphic_context.hxx
branches/pingus_sdl/src/gui/button.hxx
branches/pingus_sdl/src/gui/checkbox.cxx
branches/pingus_sdl/src/gui/checkbox.hxx
branches/pingus_sdl/src/gui/checkbox_listener.hxx
branches/pingus_sdl/src/gui/combobox.cxx
branches/pingus_sdl/src/gui/combobox.hxx
branches/pingus_sdl/src/gui/combobox_listener.hxx
branches/pingus_sdl/src/gui/component.hxx
branches/pingus_sdl/src/gui/cursor.cxx
branches/pingus_sdl/src/gui/cursor.hxx
branches/pingus_sdl/src/gui/display.cxx
branches/pingus_sdl/src/gui/display.hxx
branches/pingus_sdl/src/gui/game_delta.hxx
branches/pingus_sdl/src/gui/game_delta_recorder.hxx
branches/pingus_sdl/src/gui/gui_manager.cxx
branches/pingus_sdl/src/gui/gui_manager.hxx
branches/pingus_sdl/src/gui/gui_screen.cxx
branches/pingus_sdl/src/gui/gui_screen.hxx
branches/pingus_sdl/src/gui/input_box.cxx
branches/pingus_sdl/src/gui/input_box.hxx
branches/pingus_sdl/src/gui/input_debug_screen.cxx
branches/pingus_sdl/src/gui/input_debug_screen.hxx
branches/pingus_sdl/src/gui/root_gui_manager.cxx
branches/pingus_sdl/src/gui/root_gui_manager.hxx
branches/pingus_sdl/src/gui/screen.hxx
branches/pingus_sdl/src/gui/screen_manager.cxx
branches/pingus_sdl/src/gui/screen_manager.hxx
branches/pingus_sdl/src/gui/screen_manager_impl.hxx
branches/pingus_sdl/src/gui/screen_ptr.cxx
branches/pingus_sdl/src/gui/screen_ptr.hxx
branches/pingus_sdl/src/gui/surface_button.cxx
branches/pingus_sdl/src/gui/surface_button.hxx
branches/pingus_sdl/src/indexed_canvas.cxx
branches/pingus_sdl/src/indexed_canvas.hxx
branches/pingus_sdl/src/input/axes/button_axis.cxx
branches/pingus_sdl/src/input/axes/button_axis.hxx
branches/pingus_sdl/src/input/axes/dummy_axis.hxx
branches/pingus_sdl/src/input/axes/inverted_axis.cxx
branches/pingus_sdl/src/input/axes/inverted_axis.hxx
branches/pingus_sdl/src/input/axes/joystick_axis.cxx
branches/pingus_sdl/src/input/axes/joystick_axis.hxx
branches/pingus_sdl/src/input/axes/multiple_axis.cxx
branches/pingus_sdl/src/input/axes/multiple_axis.hxx
branches/pingus_sdl/src/input/axis.hxx
branches/pingus_sdl/src/input/axis_factory.cxx
branches/pingus_sdl/src/input/axis_factory.hxx
branches/pingus_sdl/src/input/button.hxx
branches/pingus_sdl/src/input/button_factory.cxx
branches/pingus_sdl/src/input/button_factory.hxx
branches/pingus_sdl/src/input/buttons/double_button.cxx
branches/pingus_sdl/src/input/buttons/double_button.hxx
branches/pingus_sdl/src/input/buttons/dummy_button.hxx
branches/pingus_sdl/src/input/buttons/joystick_button.cxx
branches/pingus_sdl/src/input/buttons/joystick_button.hxx
branches/pingus_sdl/src/input/buttons/key_button.cxx
branches/pingus_sdl/src/input/buttons/key_button.hxx
branches/pingus_sdl/src/input/buttons/mouse_button.cxx
branches/pingus_sdl/src/input/buttons/mouse_button.hxx
branches/pingus_sdl/src/input/buttons/multiple_button.cxx
branches/pingus_sdl/src/input/buttons/multiple_button.hxx
branches/pingus_sdl/src/input/buttons/triple_button.cxx
branches/pingus_sdl/src/input/buttons/triple_button.hxx
branches/pingus_sdl/src/input/controller.cxx
branches/pingus_sdl/src/input/controller.hxx
branches/pingus_sdl/src/input/event.hxx
branches/pingus_sdl/src/input/event_fwd.hxx
branches/pingus_sdl/src/input/pointer.hxx
branches/pingus_sdl/src/input/pointer_factory.cxx
branches/pingus_sdl/src/input/pointer_factory.hxx
branches/pingus_sdl/src/input/pointers/axis_pointer.cxx
branches/pingus_sdl/src/input/pointers/axis_pointer.hxx
branches/pingus_sdl/src/input/pointers/dummy_pointer.hxx
branches/pingus_sdl/src/input/pointers/mouse_pointer.cxx
branches/pingus_sdl/src/input/pointers/mouse_pointer.hxx
branches/pingus_sdl/src/input/pointers/multiple_pointer.cxx
branches/pingus_sdl/src/input/pointers/multiple_pointer.hxx
branches/pingus_sdl/src/input/scroller.hxx
branches/pingus_sdl/src/input/scroller_factory.cxx
branches/pingus_sdl/src/input/scroller_factory.hxx
branches/pingus_sdl/src/input/scrollers/axis_scroller.cxx
branches/pingus_sdl/src/input/scrollers/axis_scroller.hxx
branches/pingus_sdl/src/input/scrollers/dummy_scroller.hxx
branches/pingus_sdl/src/input/scrollers/inverted_scroller.cxx
branches/pingus_sdl/src/input/scrollers/inverted_scroller.hxx
branches/pingus_sdl/src/input/scrollers/joystick_scroller.cxx
branches/pingus_sdl/src/input/scrollers/joystick_scroller.hxx
branches/pingus_sdl/src/input/scrollers/mouse_scroller.cxx
branches/pingus_sdl/src/input/scrollers/mouse_scroller.hxx
branches/pingus_sdl/src/input/scrollers/multiple_scroller.cxx
branches/pingus_sdl/src/input/scrollers/multiple_scroller.hxx
branches/pingus_sdl/src/input/scrollers/pointer_scroller.cxx
branches/pingus_sdl/src/input/scrollers/pointer_scroller.hxx
branches/pingus_sdl/src/input_event.hxx
branches/pingus_sdl/src/layer_manager.cxx
branches/pingus_sdl/src/layer_manager.hxx
branches/pingus_sdl/src/level_desc.cxx
branches/pingus_sdl/src/level_desc.hxx
branches/pingus_sdl/src/level_interrupt.cxx
branches/pingus_sdl/src/level_interrupt.hxx
branches/pingus_sdl/src/level_result.cxx
branches/pingus_sdl/src/level_result.hxx
branches/pingus_sdl/src/loading.cxx
branches/pingus_sdl/src/loading.hxx
branches/pingus_sdl/src/math.hxx
branches/pingus_sdl/src/mover.cxx
branches/pingus_sdl/src/mover.hxx
branches/pingus_sdl/src/movers/linear_mover.cxx
branches/pingus_sdl/src/movers/linear_mover.hxx
branches/pingus_sdl/src/multiline_text.cxx
branches/pingus_sdl/src/multiline_text.hxx
branches/pingus_sdl/src/particles/explosive_particle.hxx
branches/pingus_sdl/src/particles/pingu_particle_holder.cxx
branches/pingus_sdl/src/particles/pingu_particle_holder.hxx
branches/pingus_sdl/src/particles/rain_particle_holder.cxx
branches/pingus_sdl/src/particles/rain_particle_holder.hxx
branches/pingus_sdl/src/particles/smoke_particle_holder.cxx
branches/pingus_sdl/src/particles/smoke_particle_holder.hxx
branches/pingus_sdl/src/particles/snow_particle_holder.cxx
branches/pingus_sdl/src/particles/snow_particle_holder.hxx
branches/pingus_sdl/src/path_manager.cxx
branches/pingus_sdl/src/path_manager.hxx
branches/pingus_sdl/src/pingu.cxx
branches/pingus_sdl/src/pingu.hxx
branches/pingus_sdl/src/pingu_action.cxx
branches/pingus_sdl/src/pingu_action.hxx
branches/pingus_sdl/src/pingu_action_factory.cxx
branches/pingus_sdl/src/pingu_action_factory.hxx
branches/pingus_sdl/src/pingu_enums.cxx
branches/pingus_sdl/src/pingu_enums.hxx
branches/pingus_sdl/src/pingu_holder.cxx
branches/pingus_sdl/src/pingu_holder.hxx
branches/pingus_sdl/src/pingus_error.cxx
branches/pingus_sdl/src/pingus_error.hxx
branches/pingus_sdl/src/pingus_level.cxx
branches/pingus_sdl/src/pingus_level.hxx
branches/pingus_sdl/src/pingus_level_impl.hxx
branches/pingus_sdl/src/pingus_main.cxx
branches/pingus_sdl/src/pingus_main.hxx
branches/pingus_sdl/src/pingus_map_manager.cxx
branches/pingus_sdl/src/pingus_map_manager.hxx
branches/pingus_sdl/src/pingus_menu.cxx
branches/pingus_sdl/src/pingus_menu.hxx
branches/pingus_sdl/src/pingus_menu_manager.cxx
branches/pingus_sdl/src/pingus_menu_manager.hxx
branches/pingus_sdl/src/pingus_sub_menu.cxx
branches/pingus_sdl/src/pingus_sub_menu.hxx
branches/pingus_sdl/src/plf_res_mgr.cxx
branches/pingus_sdl/src/plf_res_mgr.hxx
branches/pingus_sdl/src/plt_xml.cxx
branches/pingus_sdl/src/plt_xml.hxx
branches/pingus_sdl/src/preview_renderer.cxx
branches/pingus_sdl/src/preview_renderer.hxx
branches/pingus_sdl/src/range.cxx
branches/pingus_sdl/src/range.hxx
branches/pingus_sdl/src/res_descriptor.cxx
branches/pingus_sdl/src/res_descriptor.hxx
branches/pingus_sdl/src/resource.cxx
branches/pingus_sdl/src/resource.hxx
branches/pingus_sdl/src/resource_manager.cpp
branches/pingus_sdl/src/resource_modifier.cxx
branches/pingus_sdl/src/resource_modifier.hxx
branches/pingus_sdl/src/result.cxx
branches/pingus_sdl/src/result.hxx
branches/pingus_sdl/src/result_screen.cxx
branches/pingus_sdl/src/result_screen.hxx
branches/pingus_sdl/src/savegame.cxx
branches/pingus_sdl/src/savegame.hxx
branches/pingus_sdl/src/savegame_manager.cxx
branches/pingus_sdl/src/savegame_manager.hxx
branches/pingus_sdl/src/screenshot.cxx
branches/pingus_sdl/src/screenshot.hxx
branches/pingus_sdl/src/server.cxx
branches/pingus_sdl/src/server.hxx
branches/pingus_sdl/src/server_event.cxx
branches/pingus_sdl/src/server_event.hxx
branches/pingus_sdl/src/sexpr_file_reader.cpp
branches/pingus_sdl/src/sexpr_file_reader.hpp
branches/pingus_sdl/src/smallmap_image.cxx
branches/pingus_sdl/src/smallmap_image.hxx
branches/pingus_sdl/src/sound/slot_manager.cxx
branches/pingus_sdl/src/sound/slot_manager.hxx
branches/pingus_sdl/src/sound/sound.cxx
branches/pingus_sdl/src/sound/sound.hxx
branches/pingus_sdl/src/sound/sound_dummy.cxx
branches/pingus_sdl/src/sound/sound_dummy.hxx
branches/pingus_sdl/src/sound/sound_impl.hxx
branches/pingus_sdl/src/sound/sound_real.cxx
branches/pingus_sdl/src/sound/sound_real.hxx
branches/pingus_sdl/src/sound/sound_res_mgr.cxx
branches/pingus_sdl/src/sound/sound_res_mgr.hxx
branches/pingus_sdl/src/sound/sounds.hxx
branches/pingus_sdl/src/start_screen.cxx
branches/pingus_sdl/src/start_screen.hxx
branches/pingus_sdl/src/stat_manager.cxx
branches/pingus_sdl/src/stat_manager.hxx
branches/pingus_sdl/src/state_sprite.cxx
branches/pingus_sdl/src/state_sprite.hxx
branches/pingus_sdl/src/story_screen.cxx
branches/pingus_sdl/src/story_screen.hxx
branches/pingus_sdl/src/string_format.cxx
branches/pingus_sdl/src/string_format.hxx
branches/pingus_sdl/src/system.cxx
branches/pingus_sdl/src/system.hxx
branches/pingus_sdl/src/target_provider.cxx
branches/pingus_sdl/src/target_provider.hxx
branches/pingus_sdl/src/theme.cxx
branches/pingus_sdl/src/theme.hxx
branches/pingus_sdl/src/theme_selector.cxx
branches/pingus_sdl/src/theme_selector.hxx
branches/pingus_sdl/src/timer.cxx
branches/pingus_sdl/src/timer.hxx
branches/pingus_sdl/src/true_server.cxx
branches/pingus_sdl/src/true_server.hxx
branches/pingus_sdl/src/world.cxx
branches/pingus_sdl/src/world.hxx
branches/pingus_sdl/src/worldmap/dot.cxx
branches/pingus_sdl/src/worldmap/dot.hxx
branches/pingus_sdl/src/worldmap/dot_factory.cxx
branches/pingus_sdl/src/worldmap/dot_factory.hxx
branches/pingus_sdl/src/worldmap/drawable.cxx
branches/pingus_sdl/src/worldmap/drawable.hxx
branches/pingus_sdl/src/worldmap/drawable_factory.cxx
branches/pingus_sdl/src/worldmap/drawable_factory.hxx
branches/pingus_sdl/src/worldmap/graph.cxx
branches/pingus_sdl/src/worldmap/graph.hxx
branches/pingus_sdl/src/worldmap/level_dot.cxx
branches/pingus_sdl/src/worldmap/level_dot.hxx
branches/pingus_sdl/src/worldmap/manager.cxx
branches/pingus_sdl/src/worldmap/manager.hxx
branches/pingus_sdl/src/worldmap/metamap.cxx
branches/pingus_sdl/src/worldmap/metamap.hxx
branches/pingus_sdl/src/worldmap/path.cxx
branches/pingus_sdl/src/worldmap/path.hxx
branches/pingus_sdl/src/worldmap/path_drawable.cxx
branches/pingus_sdl/src/worldmap/path_drawable.hxx
branches/pingus_sdl/src/worldmap/path_graph.cxx
branches/pingus_sdl/src/worldmap/path_graph.hxx
branches/pingus_sdl/src/worldmap/pathfinder.hxx
branches/pingus_sdl/src/worldmap/pingus.cxx
branches/pingus_sdl/src/worldmap/pingus.hxx
branches/pingus_sdl/src/worldmap/sprite_drawable.cxx
branches/pingus_sdl/src/worldmap/sprite_drawable.hxx
branches/pingus_sdl/src/worldmap/surface_drawable.cxx
branches/pingus_sdl/src/worldmap/surface_drawable.hxx
branches/pingus_sdl/src/worldmap/world_dot.cxx
branches/pingus_sdl/src/worldmap/world_dot.hxx
branches/pingus_sdl/src/worldmap/worldmap.cxx
branches/pingus_sdl/src/worldmap/worldmap.hxx
branches/pingus_sdl/src/worldmap/worldmap_story.cxx
branches/pingus_sdl/src/worldmap/worldmap_story.hxx
branches/pingus_sdl/src/worldobj.cxx
branches/pingus_sdl/src/worldobj.hxx
branches/pingus_sdl/src/worldobj_factory.cxx
branches/pingus_sdl/src/worldobj_factory.hxx
branches/pingus_sdl/src/worldobjs/conveyor_belt.cxx
branches/pingus_sdl/src/worldobjs/conveyor_belt.hxx
branches/pingus_sdl/src/worldobjs/entrance.cxx
branches/pingus_sdl/src/worldobjs/entrance.hxx
branches/pingus_sdl/src/worldobjs/exit.cxx
branches/pingus_sdl/src/worldobjs/exit.hxx
branches/pingus_sdl/src/worldobjs/fake_exit.cxx
branches/pingus_sdl/src/worldobjs/fake_exit.hxx
branches/pingus_sdl/src/worldobjs/groundpiece.cxx
branches/pingus_sdl/src/worldobjs/groundpiece.hxx
branches/pingus_sdl/src/worldobjs/guillotine.cxx
branches/pingus_sdl/src/worldobjs/guillotine.hxx
branches/pingus_sdl/src/worldobjs/hammer.cxx
branches/pingus_sdl/src/worldobjs/hammer.hxx
branches/pingus_sdl/src/worldobjs/hotspot.cxx
branches/pingus_sdl/src/worldobjs/hotspot.hxx
branches/pingus_sdl/src/worldobjs/ice_block.cxx
branches/pingus_sdl/src/worldobjs/ice_block.hxx
branches/pingus_sdl/src/worldobjs/info_box.cxx
branches/pingus_sdl/src/worldobjs/info_box.hxx
branches/pingus_sdl/src/worldobjs/laser_exit.cxx
branches/pingus_sdl/src/worldobjs/laser_exit.hxx
branches/pingus_sdl/src/worldobjs/liquid.cxx
branches/pingus_sdl/src/worldobjs/liquid.hxx
branches/pingus_sdl/src/worldobjs/rain_generator.cxx
branches/pingus_sdl/src/worldobjs/rain_generator.hxx
branches/pingus_sdl/src/worldobjs/smasher.cxx
branches/pingus_sdl/src/worldobjs/smasher.hxx
branches/pingus_sdl/src/worldobjs/snow_generator.cxx
branches/pingus_sdl/src/worldobjs/snow_generator.hxx
branches/pingus_sdl/src/worldobjs/solid_color_background.cxx
branches/pingus_sdl/src/worldobjs/solid_color_background.hxx
branches/pingus_sdl/src/worldobjs/spike.cxx
branches/pingus_sdl/src/worldobjs/spike.hxx
branches/pingus_sdl/src/worldobjs/starfield_background.cxx
branches/pingus_sdl/src/worldobjs/starfield_background.hxx
branches/pingus_sdl/src/worldobjs/starfield_background_stars.cxx
branches/pingus_sdl/src/worldobjs/starfield_background_stars.hxx
branches/pingus_sdl/src/worldobjs/surface_background.cxx
branches/pingus_sdl/src/worldobjs/surface_background.hxx
branches/pingus_sdl/src/worldobjs/switch_door.cxx
branches/pingus_sdl/src/worldobjs/switch_door.hxx
branches/pingus_sdl/src/worldobjs/teleporter.cxx
branches/pingus_sdl/src/worldobjs/teleporter.hxx
branches/pingus_sdl/src/worldobjs/thunderstorm_background.cxx
branches/pingus_sdl/src/worldobjs/thunderstorm_background.hxx
branches/pingus_sdl/src/worldobjs/woodthing.cxx
branches/pingus_sdl/src/worldobjs/woodthing.hxx
branches/pingus_sdl/src/xml_file_reader.cxx
branches/pingus_sdl/src/xml_file_reader.hxx
branches/pingus_sdl/src/xml_file_writer.cxx
branches/pingus_sdl/src/xml_file_writer.hxx
branches/pingus_sdl/src/xml_pdf.cxx
branches/pingus_sdl/src/xml_pdf.hxx
branches/pingus_sdl/src/xml_pingus_level.cxx
branches/pingus_sdl/src/xml_pingus_level.hxx
Log:
- removed namespace Pingus
Modified: branches/pingus_sdl/src/action_holder.cxx
===================================================================
--- branches/pingus_sdl/src/action_holder.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/action_holder.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,8 +23,6 @@
#include "action_holder.hxx"
#include "cheat.hxx"
-namespace Pingus {
-
using namespace Actions;
ActionHolder::ActionHolder(const PingusLevel& plf)
@@ -95,6 +93,4 @@
return available_actions[name];
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/action_holder.hxx
===================================================================
--- branches/pingus_sdl/src/action_holder.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/action_holder.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <vector>
#include "pingu_enums.hxx"
-namespace Pingus {
class PingusLevel;
class PinguAction;
@@ -81,7 +80,6 @@
ActionHolder& operator= (const ActionHolder&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/angel.cxx
===================================================================
--- branches/pingus_sdl/src/actions/angel.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/angel.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../globals.hxx"
#include "angel.hxx"
-namespace Pingus {
namespace Actions {
Angel::Angel (Pingu* p)
@@ -55,6 +54,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/angel.hxx
===================================================================
--- branches/pingus_sdl/src/actions/angel.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/angel.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Angel : public PinguAction
@@ -46,7 +45,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/basher.cxx
===================================================================
--- branches/pingus_sdl/src/actions/basher.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/basher.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -28,7 +28,6 @@
#include "../worldobj.hxx"
#include "basher.hxx"
-namespace Pingus {
namespace Actions {
Basher::Basher (Pingu* p)
@@ -171,6 +170,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/basher.hxx
===================================================================
--- branches/pingus_sdl/src/actions/basher.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/basher.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Basher : public PinguAction
@@ -76,7 +75,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/blocker.cxx
===================================================================
--- branches/pingus_sdl/src/actions/blocker.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/blocker.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "../world.hxx"
#include "blocker.hxx"
-namespace Pingus {
namespace Actions {
Blocker::Blocker(Pingu* p)
@@ -106,6 +105,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/blocker.hxx
===================================================================
--- branches/pingus_sdl/src/actions/blocker.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/blocker.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Blocker : public PinguAction
@@ -51,7 +50,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/boarder.cxx
===================================================================
--- branches/pingus_sdl/src/actions/boarder.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/boarder.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../resource.hxx"
#include "boarder.hxx"
-namespace Pingus {
namespace Actions {
Boarder::Boarder (Pingu* p)
@@ -92,6 +91,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/boarder.hxx
===================================================================
--- branches/pingus_sdl/src/actions/boarder.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/boarder.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../pingu_action.hxx"
#include "../state_sprite.hxx"
-namespace Pingus {
namespace Actions {
/** The Boarder action causes a pingu to use a skateboard to move
@@ -51,7 +50,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/bomber.cxx
===================================================================
--- branches/pingus_sdl/src/actions/bomber.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/bomber.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -32,7 +32,6 @@
#include "../movers/linear_mover.hxx"
#include "bomber.hxx"
-namespace Pingus {
namespace Actions {
bool Bomber::static_surface_loaded = false;
@@ -140,6 +139,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/bomber.hxx
===================================================================
--- branches/pingus_sdl/src/actions/bomber.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/bomber.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
/** An action with lets the Pingu explode. After the explosion the the
@@ -61,7 +60,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/bridger.cxx
===================================================================
--- branches/pingus_sdl/src/actions/bridger.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/bridger.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
#include "../gettext.h"
#include "bridger.hxx"
-namespace Pingus {
namespace Actions {
Bridger::Bridger (Pingu* p)
@@ -256,6 +255,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/bridger.hxx
===================================================================
--- branches/pingus_sdl/src/actions/bridger.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/bridger.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../pingu_action.hxx"
#include "../state_sprite.hxx"
-namespace Pingus {
namespace Actions {
class Bridger : public PinguAction
@@ -69,7 +68,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/climber.cxx
===================================================================
--- branches/pingus_sdl/src/actions/climber.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/climber.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../pingu.hxx"
#include "climber.hxx"
-namespace Pingus {
namespace Actions {
Climber::Climber (Pingu* p)
@@ -93,6 +92,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/climber.hxx
===================================================================
--- branches/pingus_sdl/src/actions/climber.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/climber.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Climber : public PinguAction
@@ -52,7 +51,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/digger.cxx
===================================================================
--- branches/pingus_sdl/src/actions/digger.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/digger.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -28,7 +28,6 @@
#include "../pingu.hxx"
#include "digger.hxx"
-namespace Pingus {
namespace Actions {
Digger::Digger (Pingu* p)
@@ -109,6 +108,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/digger.hxx
===================================================================
--- branches/pingus_sdl/src/actions/digger.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/digger.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Digger : public PinguAction
@@ -62,7 +61,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/drown.cxx
===================================================================
--- branches/pingus_sdl/src/actions/drown.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/drown.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../resource.hxx"
#include "drown.hxx"
-namespace Pingus {
namespace Actions {
Drown::Drown (Pingu* p)
@@ -52,6 +51,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/drown.hxx
===================================================================
--- branches/pingus_sdl/src/actions/drown.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/drown.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Drown : public PinguAction
@@ -47,7 +46,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/exiter.cxx
===================================================================
--- branches/pingus_sdl/src/actions/exiter.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/exiter.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../sound/sound.hxx"
#include "exiter.hxx"
-namespace Pingus {
namespace Actions {
Exiter::Exiter (Pingu* p)
@@ -64,6 +63,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/exiter.hxx
===================================================================
--- branches/pingus_sdl/src/actions/exiter.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/exiter.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Exiter : public PinguAction
@@ -46,7 +45,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/faller.cxx
===================================================================
--- branches/pingus_sdl/src/actions/faller.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/faller.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
#include "../worldobj.hxx"
#include "faller.hxx"
-namespace Pingus {
namespace Actions {
Faller::Faller (Pingu* p)
@@ -172,6 +171,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/faller.hxx
===================================================================
--- branches/pingus_sdl/src/actions/faller.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/faller.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Faller : public PinguAction
@@ -52,7 +51,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/floater.cxx
===================================================================
--- branches/pingus_sdl/src/actions/floater.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/floater.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../groundtype.hxx"
#include "floater.hxx"
-namespace Pingus {
namespace Actions {
Floater::Floater(Pingu* p)
@@ -69,6 +68,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/floater.hxx
===================================================================
--- branches/pingus_sdl/src/actions/floater.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/floater.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Floater : public PinguAction
@@ -51,7 +50,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/jumper.cxx
===================================================================
--- branches/pingus_sdl/src/actions/jumper.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/jumper.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../resource.hxx"
#include "jumper.hxx"
-namespace Pingus {
namespace Actions {
Jumper::Jumper (Pingu* p)
@@ -57,6 +56,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/jumper.hxx
===================================================================
--- branches/pingus_sdl/src/actions/jumper.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/jumper.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Jumper : public PinguAction
@@ -44,7 +43,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/laser_kill.cxx
===================================================================
--- branches/pingus_sdl/src/actions/laser_kill.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/laser_kill.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../pingu.hxx"
#include "laser_kill.hxx"
-namespace Pingus {
namespace Actions {
LaserKill::LaserKill(Pingu* p)
@@ -49,6 +48,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/laser_kill.hxx
===================================================================
--- branches/pingus_sdl/src/actions/laser_kill.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/laser_kill.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
/** This action is triggered by the LaserExit trap and causes the
@@ -50,7 +49,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/miner.cxx
===================================================================
--- branches/pingus_sdl/src/actions/miner.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/miner.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -27,7 +27,6 @@
#include "../worldobj.hxx"
#include "miner.hxx"
-namespace Pingus {
namespace Actions {
Miner::Miner (Pingu* p)
@@ -102,6 +101,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/miner.hxx
===================================================================
--- branches/pingus_sdl/src/actions/miner.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/miner.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../pingu_action.hxx"
#include "../state_sprite.hxx"
-namespace Pingus {
namespace Actions {
class Miner : public PinguAction
@@ -56,7 +55,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/rocket_launcher.cxx
===================================================================
--- branches/pingus_sdl/src/actions/rocket_launcher.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/rocket_launcher.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../worldobj.hxx"
#include "rocket_launcher.hxx"
-namespace Pingus {
namespace Actions {
RocketLauncher::RocketLauncher (Pingu* p)
@@ -65,6 +64,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/rocket_launcher.hxx
===================================================================
--- branches/pingus_sdl/src/actions/rocket_launcher.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/rocket_launcher.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class RocketLauncher : public PinguAction
@@ -46,7 +45,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/slider.cxx
===================================================================
--- branches/pingus_sdl/src/actions/slider.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/slider.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../pingu.hxx"
#include "slider.hxx"
-namespace Pingus {
namespace Actions {
Slider::Slider (Pingu* p)
@@ -78,6 +77,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/slider.hxx
===================================================================
--- branches/pingus_sdl/src/actions/slider.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/slider.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../state_sprite.hxx"
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Slider : public PinguAction
@@ -45,7 +44,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/smashed.cxx
===================================================================
--- branches/pingus_sdl/src/actions/smashed.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/smashed.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../pingu.hxx"
#include "smashed.hxx"
-namespace Pingus {
namespace Actions {
Smashed::Smashed (Pingu* p)
@@ -49,6 +48,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/smashed.hxx
===================================================================
--- branches/pingus_sdl/src/actions/smashed.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/smashed.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
/** FIXME: this action doesn't have a purpose, its pretty much equal
@@ -50,7 +49,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/splashed.cxx
===================================================================
--- branches/pingus_sdl/src/actions/splashed.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/splashed.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../worldobj.hxx"
#include "splashed.hxx"
-namespace Pingus {
namespace Actions {
Splashed::Splashed (Pingu* p)
@@ -60,6 +59,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/splashed.hxx
===================================================================
--- branches/pingus_sdl/src/actions/splashed.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/splashed.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Splashed : public PinguAction
@@ -48,7 +47,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/superman.cxx
===================================================================
--- branches/pingus_sdl/src/actions/superman.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/superman.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../resource.hxx"
#include "superman.hxx"
-namespace Pingus {
namespace Actions {
Superman::Superman (Pingu* p)
@@ -51,6 +50,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/superman.hxx
===================================================================
--- branches/pingus_sdl/src/actions/superman.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/superman.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Superman : public PinguAction
@@ -46,7 +45,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/teleported.cxx
===================================================================
--- branches/pingus_sdl/src/actions/teleported.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/teleported.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../pingu.hxx"
#include "teleported.hxx"
-namespace Pingus {
namespace Actions {
Teleported::Teleported(Pingu* p)
@@ -49,6 +48,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/teleported.hxx
===================================================================
--- branches/pingus_sdl/src/actions/teleported.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/actions/teleported.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include <ClanLib/Display/sprite.h>
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
class Teleported : public PinguAction
@@ -48,7 +47,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/waiter.cxx
===================================================================
--- branches/pingus_sdl/src/actions/waiter.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/waiter.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../resource.hxx"
#include "waiter.hxx"
-namespace Pingus {
namespace Actions {
Waiter::Waiter (Pingu* p)
@@ -51,6 +50,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/waiter.hxx
===================================================================
--- branches/pingus_sdl/src/actions/waiter.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/waiter.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingu_action.hxx"
-namespace Pingus {
namespace Actions {
/** A Waiting action for the bridger, it gets activated when the
@@ -48,7 +47,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/actions/walker.cxx
===================================================================
--- branches/pingus_sdl/src/actions/walker.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/walker.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../debug.hxx"
#include "walker.hxx"
-namespace Pingus {
namespace Actions {
Walker::Walker (Pingu* p)
@@ -214,6 +213,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/actions/walker.hxx
===================================================================
--- branches/pingus_sdl/src/actions/walker.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/actions/walker.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../pingu_action.hxx"
#include "../state_sprite.hxx"
-namespace Pingus {
namespace Actions {
class Walker : public PinguAction
@@ -48,7 +47,6 @@
};
} // namespace Actions
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/blitter.cxx
===================================================================
--- branches/pingus_sdl/src/blitter.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/blitter.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -37,8 +37,6 @@
/* Headers needed for i18n / gettext */
#include "gettext.h"
-namespace Pingus {
-
void
Blitter::put_surface(CL_PixelBuffer canvas, const CL_Surface& sur,
int x, int y)
@@ -675,6 +673,4 @@
return BlitterImpl::modify(sur, BlitterImpl::transform_rot270_flip());
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/blitter.hxx
===================================================================
--- branches/pingus_sdl/src/blitter.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/blitter.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
class CL_Surface;
class CL_PixelBuffer;
-namespace Pingus {
#if 0
/** A bunch of blitting and creation functions to operate on
CL_PixelBuffer. Some of them a similar to the ones in ClanLib, but
@@ -107,7 +106,6 @@
Blitter& operator= (const Blitter&);
};
#endif
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/blitter_impl.hxx
===================================================================
--- branches/pingus_sdl/src/blitter_impl.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/blitter_impl.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <ClanLib/Display/surface.h>
#include "pingus.hxx"
-namespace Pingus {
/** A collection of helper functions for the blitter class */
namespace BlitterImpl
@@ -240,7 +239,6 @@
}
} // namespace BlitterImpl
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/blitter_test.cxx
===================================================================
--- branches/pingus_sdl/src/blitter_test.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/blitter_test.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "blitter.hxx"
#include "blitter_test.hxx"
-namespace Pingus {
class BlitterTestImpl
{
@@ -69,6 +68,5 @@
impl->run();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/blitter_test.hxx
===================================================================
--- branches/pingus_sdl/src/blitter_test.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/blitter_test.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_BLITTER_TEST_HXX
#define HEADER_BLITTER_TEST_HXX
-namespace Pingus {
class BlitterTestImpl;
@@ -34,7 +33,6 @@
void run();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/capture_rectangle.cxx
===================================================================
--- branches/pingus_sdl/src/capture_rectangle.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/capture_rectangle.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,8 +29,6 @@
#include "display/scene_context.hxx"
#include "fonts.hxx"
-namespace Pingus {
-
CaptureRectangle::CaptureRectangle (ButtonPanel* arg_button_panel)
: pingu(0),
owner_id(0),
@@ -110,6 +108,4 @@
}
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/capture_rectangle.hxx
===================================================================
--- branches/pingus_sdl/src/capture_rectangle.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/capture_rectangle.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
class CL_Font;
-namespace Pingus {
class Pingu;
class PinguAction;
@@ -66,7 +65,6 @@
CaptureRectangle& operator= (const CaptureRectangle&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/cheat.cxx
===================================================================
--- branches/pingus_sdl/src/cheat.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/cheat.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -21,8 +21,6 @@
#include "pingus_error.hxx"
#include "cheat.hxx"
-namespace Pingus {
-
bool Cheat::unlimited_actions = false;
bool Cheat::no_time_limit = false;
bool Cheat::all_actions = false;
@@ -67,6 +65,4 @@
exit(EXIT_SUCCESS);
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/cheat.hxx
===================================================================
--- branches/pingus_sdl/src/cheat.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/cheat.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,8 +22,6 @@
#include <string>
-namespace Pingus {
-
/** */
namespace Cheat
{
@@ -43,8 +41,6 @@
void print_help();
}
-} // namespace Pingus
-
#endif
/* EOF */
Modified: branches/pingus_sdl/src/client.cxx
===================================================================
--- branches/pingus_sdl/src/client.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/client.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -34,7 +34,6 @@
#include "components/button_panel.hxx"
#include "gui/gui_manager.hxx"
-namespace Pingus {
Client::Client (TrueServer * s)
: server (s),
@@ -244,6 +243,5 @@
{
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/client.hxx
===================================================================
--- branches/pingus_sdl/src/client.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/client.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
class CL_InputEvent;
-namespace Pingus {
namespace Input {
class Controller;
@@ -116,7 +115,6 @@
Client& operator= (const Client&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/col_map.cxx
===================================================================
--- branches/pingus_sdl/src/col_map.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/col_map.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -29,7 +29,6 @@
#define COLMAP_WITH_MEMORY_HOLE 1
-namespace Pingus {
// Obtain the colmap from a memory area
ColMap::ColMap(int w, int h)
@@ -297,6 +296,5 @@
return serial;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/col_map.hxx
===================================================================
--- branches/pingus_sdl/src/col_map.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/col_map.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
class CL_Surface;
class CL_PixelBuffer;
-namespace Pingus {
class DrawingContext;
class ResDescriptor;
@@ -91,7 +90,6 @@
ColMap& operator= (const ColMap&);
};
-} // namespace Pingus
#endif /* COLMAP_HH */
Modified: branches/pingus_sdl/src/collider.cxx
===================================================================
--- branches/pingus_sdl/src/collider.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/collider.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,8 +22,6 @@
#include "vector.hxx"
#include "world.hxx"
-namespace Pingus {
-
Collider::Collider()
{
}
@@ -48,6 +46,4 @@
static_cast<int>(pos.y));
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/collider.hxx
===================================================================
--- branches/pingus_sdl/src/collider.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/collider.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_COLLIDER_HXX
#define HEADER_PINGUS_COLLIDER_HXX
-namespace Pingus {
class Vector;
class World;
@@ -44,7 +43,6 @@
int getpixel(World* const world, const Vector& pos) const;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/colliders/pingu_collider.cxx
===================================================================
--- branches/pingus_sdl/src/colliders/pingu_collider.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/colliders/pingu_collider.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../vector.hxx"
#include "pingu_collider.hxx"
-namespace Pingus {
namespace Colliders {
PinguCollider::PinguCollider(const int height_arg) : height(height_arg)
@@ -85,6 +84,5 @@
}
} // namespace Colliders
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/colliders/pingu_collider.hxx
===================================================================
--- branches/pingus_sdl/src/colliders/pingu_collider.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/colliders/pingu_collider.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../collider.hxx"
-namespace Pingus {
namespace Colliders {
class PinguCollider : public Collider
@@ -46,7 +45,6 @@
};
} // namespace Colliders
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/action_button.cxx
===================================================================
--- branches/pingus_sdl/src/components/action_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/components/action_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -29,7 +29,6 @@
#include "../gui/display.hxx"
#include "../fonts.hxx"
-namespace Pingus {
using namespace Actions;
@@ -328,6 +327,5 @@
UNUSED_ARG(y);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/action_button.hxx
===================================================================
--- branches/pingus_sdl/src/components/action_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/components/action_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -29,7 +29,6 @@
class CL_Font;
-namespace Pingus {
class TrueServer;
class ActionHolder;
@@ -191,7 +190,6 @@
VerticalActionButton& operator= (const VerticalActionButton&);
};
-} // namespace Pingus
#endif /* ACTIONBUTTON */
Modified: branches/pingus_sdl/src/components/button_panel.cxx
===================================================================
--- branches/pingus_sdl/src/components/button_panel.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/button_panel.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "../client.hxx"
#include "button_panel.hxx"
-namespace Pingus {
using namespace Actions;
@@ -185,6 +184,5 @@
pressed_button = (pressed_button - 1 + (int)a_buttons.size()) %
(int)a_buttons.size();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/button_panel.hxx
===================================================================
--- branches/pingus_sdl/src/components/button_panel.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/button_panel.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
class CL_InputEvent;
-namespace Pingus {
class Client;
@@ -79,7 +78,6 @@
ButtonPanel& operator= (const ButtonPanel&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/hurry_up.cxx
===================================================================
--- branches/pingus_sdl/src/components/hurry_up.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/hurry_up.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../fonts.hxx"
#include "hurry_up.hxx"
-namespace Pingus {
HurryUp::HurryUp (Client* c)
: font(Fonts::pingus_large),
@@ -105,6 +104,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/hurry_up.hxx
===================================================================
--- branches/pingus_sdl/src/components/hurry_up.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/hurry_up.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
class CL_Font;
-namespace Pingus {
class DrawingContext;
class Client;
@@ -57,6 +56,5 @@
HurryUp& operator= (const HurryUp&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/menu_button.cxx
===================================================================
--- branches/pingus_sdl/src/components/menu_button.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/menu_button.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -31,7 +31,6 @@
#include "menu_button.hxx"
-namespace Pingus {
MenuButton::MenuButton(const Vector2i& pos_, const Sprite& sprite_,
const std::string& text_, const std::string& desc_)
@@ -160,6 +159,5 @@
&& y < y_pos + int(surface_p.get_height()) / 2);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/menu_button.hxx
===================================================================
--- branches/pingus_sdl/src/components/menu_button.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/menu_button.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "math/vector2i.hpp"
#include "../gui/component.hxx"
-namespace Pingus {
class PingusMenu;
@@ -74,7 +73,6 @@
MenuButton& operator= (const MenuButton&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/pingus_counter.cxx
===================================================================
--- branches/pingus_sdl/src/components/pingus_counter.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/components/pingus_counter.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -29,7 +29,6 @@
#include "../fonts.hxx"
#include "pingus_counter.hxx"
-namespace Pingus {
PingusCounter::PingusCounter(Server* s)
: server(s),
@@ -58,6 +57,5 @@
gc.print_center(font, gc.get_width()/2, 3, str);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/pingus_counter.hxx
===================================================================
--- branches/pingus_sdl/src/components/pingus_counter.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/components/pingus_counter.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
class CL_Font;
-namespace Pingus {
class DrawingContext;
class World;
@@ -48,7 +47,6 @@
PingusCounter& operator= (const PingusCounter&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/playfield.cxx
===================================================================
--- branches/pingus_sdl/src/components/playfield.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/playfield.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -32,7 +32,6 @@
#include "button_panel.hxx"
#include "playfield.hxx"
-namespace Pingus {
Playfield::Playfield (Client* client_, const CL_Rect& rect_)
: rect(rect_),
@@ -246,6 +245,5 @@
state.set_pos(state.get_pos() + CL_Point(x, y));
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/playfield.hxx
===================================================================
--- branches/pingus_sdl/src/components/playfield.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/playfield.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../gui/component.hxx"
#include "../capture_rectangle.hxx"
-namespace Pingus {
class Pingu;
class World;
@@ -102,7 +101,6 @@
Playfield& operator= (const Playfield&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/smallmap.cxx
===================================================================
--- branches/pingus_sdl/src/components/smallmap.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/smallmap.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -33,7 +33,6 @@
#include "playfield.hxx"
#include "smallmap.hxx"
-namespace Pingus {
SmallMap::SmallMap(Client* c)
: client(c),
@@ -189,6 +188,5 @@
has_focus = false;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/smallmap.hxx
===================================================================
--- branches/pingus_sdl/src/components/smallmap.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/smallmap.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
class CL_Key;
-namespace Pingus {
class Client;
class Vector;
@@ -106,7 +105,6 @@
SmallMap& operator= (const SmallMap&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/components/time_display.cxx
===================================================================
--- branches/pingus_sdl/src/components/time_display.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/time_display.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -33,7 +33,6 @@
#include "time_display.hxx"
-namespace Pingus {
TimeDisplay::TimeDisplay (Client* c)
: server(c->get_server()),
@@ -68,6 +67,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/components/time_display.hxx
===================================================================
--- branches/pingus_sdl/src/components/time_display.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/components/time_display.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
class CL_Font;
-namespace Pingus {
class Server;
class Client;
@@ -50,7 +49,6 @@
TimeDisplay& operator= (const TimeDisplay&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/config.cxx
===================================================================
--- branches/pingus_sdl/src/config.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/config.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
#include "cheat.hxx"
#include "gettext.h"
-namespace Pingus {
struct ConfigParserEOF {};
@@ -409,7 +408,6 @@
return ret_val;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/config.hxx
===================================================================
--- branches/pingus_sdl/src/config.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/config.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include <string>
#include <fstream>
-namespace Pingus {
/** FIXME: Rewrite or replace me */
class ConfigParser
@@ -88,7 +87,6 @@
Config& operator= (const Config&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/console.cxx
===================================================================
--- branches/pingus_sdl/src/console.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/console.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
using std::ostream;
-namespace Pingus {
// Globale console
Console console;
@@ -251,6 +250,5 @@
draw();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/console.hxx
===================================================================
--- branches/pingus_sdl/src/console.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/console.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include <iostream>
#include "gui/display.hxx"
-namespace Pingus {
class ConsoleBuffer :
public std::streambuf
@@ -115,7 +114,6 @@
/** The globale console object to which you can send messages */
extern Console console;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/credits.cxx
===================================================================
--- branches/pingus_sdl/src/credits.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/credits.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -31,8 +31,6 @@
#include "fonts.hxx"
#include "gettext.h"
-namespace Pingus {
-
class CreditsOkButton
: public GUI::SurfaceButton
{
@@ -346,6 +344,4 @@
ScreenManager::instance ()->pop_screen ();
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/credits.hxx
===================================================================
--- branches/pingus_sdl/src/credits.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/credits.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
class CL_Font;
-namespace Pingus {
class Credits : public GUIScreen
{
@@ -80,7 +79,6 @@
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/debug.cxx
===================================================================
--- branches/pingus_sdl/src/debug.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/debug.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "debug.hxx"
-namespace Pingus {
/* Stream for error messages */
DebugStream perr("[Error] ");
@@ -30,6 +29,5 @@
/* For everything else (temporary stuff only) */
DebugStream pout ("[Output] ");
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/debug.hxx
===================================================================
--- branches/pingus_sdl/src/debug.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/debug.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "debug_stream.hxx"
-namespace Pingus {
/* Stream for error messages */
extern DebugStream perr;
@@ -33,7 +32,6 @@
/* Stream for warnings */
extern DebugStream pout;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/debug_stream.cxx
===================================================================
--- branches/pingus_sdl/src/debug_stream.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/debug_stream.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
using std::ostream;
-namespace Pingus {
NilStream DebugStream::nilstream;
@@ -159,6 +158,5 @@
{
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/debug_stream.hxx
===================================================================
--- branches/pingus_sdl/src/debug_stream.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/debug_stream.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <vector>
#include <iostream>
-namespace Pingus {
class NilStream;
@@ -119,7 +118,6 @@
friend class DebugStream;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/delta_manager.hxx
===================================================================
--- branches/pingus_sdl/src/delta_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/delta_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <iostream>
#include "pingus.hxx"
-namespace Pingus {
class DeltaManager
{
@@ -76,7 +75,6 @@
DeltaManager& operator= (const DeltaManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/demo_player.cxx
===================================================================
--- branches/pingus_sdl/src/demo_player.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_player.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "demo_player.hxx"
#include "xml_pdf.hxx"
-namespace Pingus {
DemoPlayer::DemoPlayer(Server* s, XMLPDF* pdf)
: server(s),
@@ -55,6 +54,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/demo_player.hxx
===================================================================
--- branches/pingus_sdl/src/demo_player.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_player.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "server_event.hxx"
-namespace Pingus {
class Server;
class XMLPDF;
@@ -45,7 +44,6 @@
DemoPlayer& operator= (const DemoPlayer&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/demo_recorder.cxx
===================================================================
--- branches/pingus_sdl/src/demo_recorder.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_recorder.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "server.hxx"
#include "gettext.h"
-namespace Pingus {
DemoRecorder::DemoRecorder (Server* server)
: record_demo (true)
@@ -105,6 +104,5 @@
return std::string(buffer);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/demo_recorder.hxx
===================================================================
--- branches/pingus_sdl/src/demo_recorder.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_recorder.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <fstream>
#include <string>
-namespace Pingus {
class Server;
class ServerEvent;
@@ -54,7 +53,6 @@
DemoRecorder& operator= (const DemoRecorder&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/demo_session.cxx
===================================================================
--- branches/pingus_sdl/src/demo_session.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_session.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -29,7 +29,6 @@
#include "display/scene_context.hxx"
#include "demo_session.hxx"
-namespace Pingus {
DemoSession::DemoSession(const std::string& filename)
{
@@ -113,6 +112,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/demo_session.hxx
===================================================================
--- branches/pingus_sdl/src/demo_session.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/demo_session.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "gui/gui_screen.hxx"
-namespace Pingus {
class Server;
class XMLPDF;
@@ -57,7 +56,6 @@
DemoSession& operator= (const DemoSession&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/direction.cxx
===================================================================
--- branches/pingus_sdl/src/direction.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/direction.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -19,7 +19,6 @@
#include "direction.hxx"
-namespace Pingus {
Direction::Direction() : direction(NONE)
{
@@ -77,6 +76,5 @@
return direction == RIGHT;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/direction.hxx
===================================================================
--- branches/pingus_sdl/src/direction.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/direction.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
/// Simple class for managing the direction of a pingu
class Direction
@@ -49,7 +48,6 @@
bool is_right () const;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/display/drawing_context.cxx
===================================================================
--- branches/pingus_sdl/src/display/drawing_context.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/display/drawing_context.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../font.hpp"
#include "../origin.hpp"
-namespace Pingus {
struct DrawingRequestsSorter
{
@@ -441,6 +440,4 @@
return pos + Vector3f(translate_stack.back().x, translate_stack.back().y);
}
-}
-
/* EOF */
Modified: branches/pingus_sdl/src/display/drawing_context.hxx
===================================================================
--- branches/pingus_sdl/src/display/drawing_context.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/display/drawing_context.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -32,8 +32,6 @@
class Sprite;
class CL_Surface;
-namespace Pingus {
-
/** 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
@@ -135,8 +133,6 @@
DrawingContext& operator= (const DrawingContext&);
};
-}
-
#endif
/* EOF */
Modified: branches/pingus_sdl/src/display/scene_context.cxx
===================================================================
--- branches/pingus_sdl/src/display/scene_context.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/display/scene_context.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#define SCALE_FACTOR 8.0f
-namespace Pingus {
class SceneContextImpl
{
@@ -175,6 +174,5 @@
sc->render(gc);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/display/scene_context.hxx
===================================================================
--- branches/pingus_sdl/src/display/scene_context.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/display/scene_context.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
class CL_GraphicContext;
-namespace Pingus {
class SceneContextImpl;
@@ -94,7 +93,6 @@
void draw(CL_GraphicContext* gc);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/dummy_screen.hxx
===================================================================
--- branches/pingus_sdl/src/dummy_screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/dummy_screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "gui/screen.hxx"
-namespace Pingus {
class DrawingContext;
@@ -47,7 +46,6 @@
DummyScreen& operator= (const DummyScreen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/editor/context_menu.cxx
===================================================================
--- branches/pingus_sdl/src/editor/context_menu.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/context_menu.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../gui/gui_manager.hxx"
#include "../fonts.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/context_menu.hxx
===================================================================
--- branches/pingus_sdl/src/editor/context_menu.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/context_menu.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include "../gui/component.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/editor_panel.cxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_panel.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_panel.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -31,7 +31,6 @@
#include "editor_viewport.hxx"
#include "panel_buttons.hxx"
-namespace Pingus {
class GUI::Component;
Modified: branches/pingus_sdl/src/editor/editor_panel.hxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_panel.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_panel.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../gui/checkbox_listener.hxx"
#include "../gui/combobox_listener.hxx"
-namespace Pingus {
class DrawingContext;
class GUI::Checkbox;
Modified: branches/pingus_sdl/src/editor/editor_screen.cxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_screen.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_screen.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -35,7 +35,6 @@
#include "xml_level.hxx"
#include "level_objs.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/editor_screen.hxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_screen.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_screen.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../gui/gui_screen.hxx"
#include "../file_dialog_listener.hxx"
-namespace Pingus {
class DrawingContext;
class FileDialog;
@@ -110,8 +109,7 @@
EditorScreen& operator= (const EditorScreen&);
}; // EditorScreen
-} // Editor namespace
-} // Pingus namespace
+} // Editor namespace
#endif
Modified: branches/pingus_sdl/src/editor/editor_viewport.cxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_viewport.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_viewport.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -31,7 +31,6 @@
#include "xml_level.hxx"
#include "level_objs.hxx"
-namespace Pingus {
namespace Editor {
// Constructor
Modified: branches/pingus_sdl/src/editor/editor_viewport.hxx
===================================================================
--- branches/pingus_sdl/src/editor/editor_viewport.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/editor_viewport.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include <vector>
#include <string>
-namespace Pingus {
class Vector;
class DrawingContext;
Modified: branches/pingus_sdl/src/editor/level_head.cxx
===================================================================
--- branches/pingus_sdl/src/editor/level_head.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/level_head.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -34,7 +34,6 @@
#include "editor_screen.hxx"
#include "xml_level.hxx"
-namespace Pingus {
namespace Editor {
class LevelHeadCloseButton : public GUI::SurfaceButton
Modified: branches/pingus_sdl/src/editor/level_head.hxx
===================================================================
--- branches/pingus_sdl/src/editor/level_head.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/level_head.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../gui/component.hxx"
-namespace Pingus {
class Vector;
Modified: branches/pingus_sdl/src/editor/level_impl.hxx
===================================================================
--- branches/pingus_sdl/src/editor/level_impl.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/level_impl.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,7 +29,6 @@
#include <algorithm>
#include "level_objs.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/level_objs.cxx
===================================================================
--- branches/pingus_sdl/src/editor/level_objs.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/level_objs.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
#include "../display/drawing_context.hxx"
#include "../xml_file_writer.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/level_objs.hxx
===================================================================
--- branches/pingus_sdl/src/editor/level_objs.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/level_objs.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../res_descriptor.hxx"
#include <string>
-namespace Pingus {
class XMLFileWriter;
class DrawingContext;
Modified: branches/pingus_sdl/src/editor/panel_buttons.cxx
===================================================================
--- branches/pingus_sdl/src/editor/panel_buttons.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/panel_buttons.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -32,7 +32,6 @@
#include "level_head.hxx"
#include "xml_level.hxx"
-namespace Pingus {
class Resource;
Modified: branches/pingus_sdl/src/editor/panel_buttons.hxx
===================================================================
--- branches/pingus_sdl/src/editor/panel_buttons.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/panel_buttons.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../gui/component.hxx"
#include "../vector.hxx"
-namespace Pingus {
class DrawingContext;
Modified: branches/pingus_sdl/src/editor/xml_level.cxx
===================================================================
--- branches/pingus_sdl/src/editor/xml_level.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/xml_level.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,7 +29,6 @@
#include "../xml_file_reader.hxx"
#include "../res_descriptor.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/editor/xml_level.hxx
===================================================================
--- branches/pingus_sdl/src/editor/xml_level.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/editor/xml_level.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "level_impl.hxx"
-namespace Pingus {
namespace Editor {
Modified: branches/pingus_sdl/src/exit_menu.cxx
===================================================================
--- branches/pingus_sdl/src/exit_menu.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/exit_menu.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "gui/gui_manager.hxx"
#include "sound/sound.hxx"
-namespace Pingus {
class ExitMenuYesButton : public GUI::SurfaceButton
{
@@ -121,6 +120,5 @@
sur = Resource::load_sprite("core/menu/exit_menu");
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/exit_menu.hxx
===================================================================
--- branches/pingus_sdl/src/exit_menu.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/exit_menu.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus_sub_menu.hxx"
-namespace Pingus {
class PingusMenuManager;
@@ -43,7 +42,6 @@
ExitMenu& operator= (const ExitMenu&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/file_dialog.cxx
===================================================================
--- branches/pingus_sdl/src/file_dialog.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/file_dialog.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -31,7 +31,6 @@
#include "file_dialog_item.hxx"
#include "file_dialog_listener.hxx"
-namespace Pingus {
const int DIR_UP = 0;
const int DIR_DOWN = 1;
@@ -455,6 +454,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/file_dialog.hxx
===================================================================
--- branches/pingus_sdl/src/file_dialog.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/file_dialog.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <string>
#include "pingus_sub_menu.hxx"
-namespace Pingus {
class Vector;
class FileDialogItem;
@@ -135,7 +134,6 @@
FileDialog& operator= (const FileDialog&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/file_dialog_item.cxx
===================================================================
--- branches/pingus_sdl/src/file_dialog_item.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/file_dialog_item.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -39,7 +39,6 @@
#include "worldmap/manager.hxx"
#include "worldmap/metamap.hxx"
-namespace Pingus {
// Only Constructor
Modified: branches/pingus_sdl/src/file_dialog_item.hxx
===================================================================
--- branches/pingus_sdl/src/file_dialog_item.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/file_dialog_item.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "vector.hxx"
#include "file_dialog.hxx"
-namespace Pingus {
/** Class representing a clickable object in a File Dialog (a Directory, Level,
or Worldmap */
Modified: branches/pingus_sdl/src/file_dialog_listener.hxx
===================================================================
--- branches/pingus_sdl/src/file_dialog_listener.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/file_dialog_listener.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,18 +23,14 @@
#include <string>
#include "pingus.hxx"
-namespace Pingus {
+class FileDialogListener {
+public:
+ virtual ~FileDialogListener() {}
+ virtual void save(const std::string &file, const std::string &filemask) { }
+ virtual void load(const std::string &file, const std::string &filemask) { }
+ virtual void cancel() { }
+}; // class FileDialogListener
- class FileDialogListener {
- public:
- virtual ~FileDialogListener() {}
- virtual void save(const std::string &file, const std::string
&filemask) { }
- virtual void load(const std::string &file, const std::string
&filemask) { }
- virtual void cancel() { }
- }; // class FileDialogListener
-
-} // namespace Pingus
-
#endif
/* EOF */
Modified: branches/pingus_sdl/src/file_reader.cxx
===================================================================
--- branches/pingus_sdl/src/file_reader.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/file_reader.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,8 +20,6 @@
#include "file_reader.hxx"
#include "file_reader_impl.hxx"
-namespace Pingus {
-
FileReader::FileReader(SharedPtr<FileReaderImpl> impl_)
: impl(impl_)
{
@@ -150,6 +148,4 @@
return reader;
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/file_reader.hxx
===================================================================
--- branches/pingus_sdl/src/file_reader.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/file_reader.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -28,8 +28,6 @@
class Color;
class Vector3f;
-namespace Pingus {
-
class ResDescriptor;
class FileReaderImpl;
@@ -75,8 +73,6 @@
SharedPtr<FileReaderImpl> impl;
};
-} // namespace Pingus
-
#endif
/* EOF */
Modified: branches/pingus_sdl/src/file_reader_impl.hxx
===================================================================
--- branches/pingus_sdl/src/file_reader_impl.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/file_reader_impl.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
class Color;
class Vector3f;
-namespace Pingus {
class FileReader;
class ResDescriptor;
@@ -53,7 +52,6 @@
virtual std::vector<std::string> get_section_names() const =0;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/file_writer.hxx
===================================================================
--- branches/pingus_sdl/src/file_writer.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/file_writer.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include <string>
-namespace Pingus {
class Vector;
@@ -44,7 +43,6 @@
virtual void write_vector (const char* name, const Vector&) =0;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/fonts.cxx
===================================================================
--- branches/pingus_sdl/src/fonts.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/fonts.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include "resource.hxx"
#include "fonts.hxx"
-namespace Pingus {
namespace Fonts {
std::string encoding("ISO-8859-1");
@@ -77,6 +76,5 @@
}
} // namespace Fonts
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/fonts.hxx
===================================================================
--- branches/pingus_sdl/src/fonts.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/fonts.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include "display/drawing_context.hxx"
#include "font.hpp"
-namespace Pingus {
namespace Fonts {
extern std::string encoding;
@@ -50,7 +49,6 @@
void deinit ();
} // namespace Fonts
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/fps_counter.cxx
===================================================================
--- branches/pingus_sdl/src/fps_counter.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/fps_counter.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "fps_counter.hxx"
#include "gettext.h"
-namespace Pingus {
FPSCounter fps_counter;
@@ -97,6 +96,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/fps_counter.hxx
===================================================================
--- branches/pingus_sdl/src/fps_counter.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/fps_counter.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "gui/display.hxx"
-namespace Pingus {
///
class FPSCounter : public DisplayHook
@@ -73,7 +72,6 @@
it over and over again */
extern FPSCounter fps_counter;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/game_counter.cxx
===================================================================
--- branches/pingus_sdl/src/game_counter.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_counter.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -21,7 +21,6 @@
#include "game_counter.hxx"
-namespace Pingus {
GameCounter::GameCounter()
{
@@ -153,6 +152,5 @@
return int(count);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/game_counter.hxx
===================================================================
--- branches/pingus_sdl/src/game_counter.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_counter.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
class GameCounter
{
@@ -55,7 +54,6 @@
operator int ();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/game_event.hxx
===================================================================
--- branches/pingus_sdl/src/game_event.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_event.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "pingus.hxx"
#include <string>
-namespace Pingus {
/** This will need some^H^H^H^H a lot of work */
typedef enum {
@@ -54,7 +53,6 @@
// nothing
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/game_session.cxx
===================================================================
--- branches/pingus_sdl/src/game_session.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_session.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -31,7 +31,6 @@
#include "savegame_manager.hxx"
#include "globals.hxx"
-namespace Pingus {
PingusGameSession::PingusGameSession (const PingusLevel& arg_plf, bool
arg_show_result_screen)
: plf(arg_plf),
@@ -192,6 +191,5 @@
client->on_escape_press ();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/game_session.hxx
===================================================================
--- branches/pingus_sdl/src/game_session.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_session.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "gui/screen.hxx"
#include "pingus_level.hxx"
-namespace Pingus {
class Client;
class TrueServer;
@@ -86,7 +85,6 @@
PingusGameSession& operator= (const PingusGameSession&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/game_session_result.cxx
===================================================================
--- branches/pingus_sdl/src/game_session_result.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/game_session_result.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -19,7 +19,6 @@
#include "game_session_result.hxx"
-namespace Pingus {
PingusGameSessionResult::PingusGameSessionResult ()
{
@@ -44,6 +43,5 @@
return 100.0;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/game_session_result.hxx
===================================================================
--- branches/pingus_sdl/src/game_session_result.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/game_session_result.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
/** With this class you can obtain information about the success or
failure of a level, in addition you can get details like how many
@@ -46,7 +45,6 @@
float percentage_time ();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/game_time.cxx
===================================================================
--- branches/pingus_sdl/src/game_time.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_time.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "globals.hxx"
#include "game_time.hxx"
-namespace Pingus {
GameTime::GameTime (int arg_tick_time)
: count (0), tick_time (arg_tick_time)
@@ -85,6 +84,5 @@
return time_str;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/game_time.hxx
===================================================================
--- branches/pingus_sdl/src/game_time.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/game_time.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
/** The GameTime represents the time which passes in the Pingus World.
Its behaviour is analogue to CL_System::get_time (), but with the
@@ -64,7 +63,6 @@
GameTime& operator= (const GameTime&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gettext.cxx
===================================================================
--- branches/pingus_sdl/src/gettext.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/gettext.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -19,8 +19,6 @@
#include "gettext.h"
-namespace Pingus {
TinyGetText::DictionaryManager dictionary_manager;
-}
/* EOF */
Modified: branches/pingus_sdl/src/gettext.h
===================================================================
--- branches/pingus_sdl/src/gettext.h 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/gettext.h 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,11 +22,9 @@
#include "tinygettext/tinygettext.hxx"
-namespace Pingus {
extern TinyGetText::DictionaryManager dictionary_manager;
-}
-#define _(String)
::Pingus::dictionary_manager.get_dictionary().translate(String).c_str()
-#define N_(id, id2, num)
::Pingus::dictionary_manager.get_dictionary().translate(id, di2, num).c_str()
+#define _(String)
dictionary_manager.get_dictionary().translate(String).c_str()
+#define N_(id, id2, num) dictionary_manager.get_dictionary().translate(id,
di2, num).c_str()
#endif /* HEADER_GETTEXT_HXX */
Modified: branches/pingus_sdl/src/global_event.cxx
===================================================================
--- branches/pingus_sdl/src/global_event.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/global_event.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
#include "global_event.hxx"
#include "globals.hxx"
-namespace Pingus {
GlobalEvent global_event;
@@ -106,6 +105,5 @@
{
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/global_event.hxx
===================================================================
--- branches/pingus_sdl/src/global_event.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/global_event.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
class CL_Key;
class CL_InputDevice;
-namespace Pingus {
class GlobalEvent
{
@@ -43,7 +42,6 @@
extern GlobalEvent global_event;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/globals.cxx
===================================================================
--- branches/pingus_sdl/src/globals.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/globals.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "globals.hxx"
-namespace Pingus {
int game_speed = 20;
bool print_fps = false;
@@ -66,6 +65,5 @@
// Use the clanSDL target by default for systems other than Windows and OSX
(aka Linux).
bool use_opengl = false;
#endif
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/globals.hxx
===================================================================
--- branches/pingus_sdl/src/globals.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/globals.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
#include "pingus.hxx"
#include <string>
-namespace Pingus {
extern int game_speed; ///< -t, --set-speed
extern bool print_fps; ///< --print-fps
@@ -86,7 +85,6 @@
PINGUS_DEBUG_ALL = (~0)
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/goal_manager.cxx
===================================================================
--- branches/pingus_sdl/src/goal_manager.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/goal_manager.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "pingu_holder.hxx"
#include "goal_manager.hxx"
-namespace Pingus {
GoalManager::GoalManager(Server* s)
: server(s), goal(GT_NONE), exit_time(0)
@@ -89,6 +88,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/goal_manager.hxx
===================================================================
--- branches/pingus_sdl/src/goal_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/goal_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_GOAL_MANAGER_HXX
#define HEADER_PINGUS_GOAL_MANAGER_HXX
-namespace Pingus {
class Server;
@@ -58,7 +57,6 @@
GoalManager& operator= (const GoalManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/ground_map.cxx
===================================================================
--- branches/pingus_sdl/src/ground_map.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/ground_map.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -34,7 +34,6 @@
#include <ClanLib/Core/IOData/datatypes.h>
#include <ClanLib/Display/palette.h>
-namespace Pingus {
MapTile::MapTile ()
{
@@ -296,6 +295,5 @@
return colmap;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/ground_map.hxx
===================================================================
--- branches/pingus_sdl/src/ground_map.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/ground_map.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
class CL_PixelBuffer;
-namespace Pingus {
class SceneContext;
class PingusLevel;
@@ -108,7 +107,6 @@
GroundMap& operator= (const GroundMap&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/groundtype.cxx
===================================================================
--- branches/pingus_sdl/src/groundtype.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/groundtype.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include <iostream>
#include "groundtype.hxx"
-namespace Pingus {
Groundtype::GPType
Groundtype::string_to_type(const std::string& arg_type)
@@ -72,6 +71,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/groundtype.hxx
===================================================================
--- branches/pingus_sdl/src/groundtype.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/groundtype.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include <string>
-namespace Pingus {
/** This class olds the definitions of the different types of ground
available in pingus, it might also provide converter function from
@@ -46,7 +45,6 @@
static std::string type_to_string (GPType arg_type);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/buffer_graphic_context.cxx
===================================================================
--- branches/pingus_sdl/src/gui/buffer_graphic_context.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/gui/buffer_graphic_context.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../screenshot.hxx"
#include "buffer_graphic_context.hxx"
-namespace Pingus {
BufferGraphicContext::BufferGraphicContext(int width, int height)
: canvas(width, height, width*4, CL_PixelFormat::rgba8888)
@@ -105,6 +104,5 @@
canvas.unlock();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/buffer_graphic_context.hxx
===================================================================
--- branches/pingus_sdl/src/gui/buffer_graphic_context.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/gui/buffer_graphic_context.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -30,7 +30,6 @@
class CL_Surface;
class CL_Font;
-namespace Pingus {
typedef CL_Font FontHandle;
@@ -95,7 +94,6 @@
void write(const std::string& filename);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/button.hxx
===================================================================
--- branches/pingus_sdl/src/gui/button.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/button.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace GUI {
class Button
{
@@ -39,7 +38,6 @@
};
} // namespace GUI
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/checkbox.cxx
===================================================================
--- branches/pingus_sdl/src/gui/checkbox.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/checkbox.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "../display/drawing_context.hxx"
#include "../gui/checkbox_listener.hxx"
-namespace Pingus {
namespace GUI {
Modified: branches/pingus_sdl/src/gui/checkbox.hxx
===================================================================
--- branches/pingus_sdl/src/gui/checkbox.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/checkbox.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../gui/component.hxx"
#include "../vector.hxx"
-namespace Pingus {
class DrawingContext;
Modified: branches/pingus_sdl/src/gui/checkbox_listener.hxx
===================================================================
--- branches/pingus_sdl/src/gui/checkbox_listener.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/checkbox_listener.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_GUI_CHECKBOX_LISTENER_HXX
#define HEADER_PINGUS_GUI_CHECKBOX_LISTENER_HXX
-namespace Pingus {
namespace GUI {
Modified: branches/pingus_sdl/src/gui/combobox.cxx
===================================================================
--- branches/pingus_sdl/src/gui/combobox.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/combobox.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "combobox_listener.hxx"
#include "../fonts.hxx"
-namespace Pingus {
namespace GUI {
// Constructor
Modified: branches/pingus_sdl/src/gui/combobox.hxx
===================================================================
--- branches/pingus_sdl/src/gui/combobox.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/combobox.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "component.hxx"
#include "../vector.hxx"
-namespace Pingus {
namespace GUI {
Modified: branches/pingus_sdl/src/gui/combobox_listener.hxx
===================================================================
--- branches/pingus_sdl/src/gui/combobox_listener.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/combobox_listener.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_GUI_COMBOBOX_LISTENER_HXX
#define HEADER_PINGUS_GUI_COMBOBOX_LISTENER_HXX
-namespace Pingus {
namespace GUI {
Modified: branches/pingus_sdl/src/gui/component.hxx
===================================================================
--- branches/pingus_sdl/src/gui/component.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/component.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
class DrawingContext;
@@ -94,7 +93,6 @@
};
} // namespace GUI
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/cursor.cxx
===================================================================
--- branches/pingus_sdl/src/gui/cursor.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/cursor.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../resource.hxx"
#include "cursor.hxx"
-namespace Pingus {
Cursor::Cursor(const std::string& ident)
// : sprite(Resource::load_sprite(ident))
@@ -47,6 +46,5 @@
// pointer->get_y_pos ());
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/cursor.hxx
===================================================================
--- branches/pingus_sdl/src/gui/cursor.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/cursor.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <string>
#include "display.hxx"
-namespace Pingus {
/** A simple mouse cursor class and stupid. We can't use the X11/win32
nativ mouse cursor because we want also to support non-mouse input
@@ -45,7 +44,6 @@
Cursor& operator= (const Cursor&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/display.cxx
===================================================================
--- branches/pingus_sdl/src/gui/display.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/display.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../globals.hxx"
#include "display.hxx"
-namespace Pingus {
std::list<DisplayHook*> Display::display_hooks;
SDL_Surface* Display::screen;
@@ -105,6 +104,5 @@
return screen->h;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/display.hxx
===================================================================
--- branches/pingus_sdl/src/gui/display.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/display.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "SDL.h"
#include <list>
-namespace Pingus {
class DisplayHook;
@@ -73,7 +72,6 @@
Display& operator= (const Display&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/game_delta.hxx
===================================================================
--- branches/pingus_sdl/src/gui/game_delta.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/game_delta.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../delta_manager.hxx"
#include "../input/event.hxx"
-namespace Pingus {
/** Input for the game engine */
class GameDelta
@@ -63,7 +62,6 @@
GameDelta& operator= (const GameDelta&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/game_delta_recorder.hxx
===================================================================
--- branches/pingus_sdl/src/gui/game_delta_recorder.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/game_delta_recorder.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_GAME_DELTA_RECORDER_HXX
#define HEADER_PINGUS_GAME_DELTA_RECORDER_HXX
-namespace Pingus {
class GameDeltaRecorder
{
@@ -31,7 +30,6 @@
GameDelta* get ();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/gui_manager.cxx
===================================================================
--- branches/pingus_sdl/src/gui/gui_manager.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/gui_manager.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "game_delta.hxx"
#include "gui_manager.hxx"
-namespace Pingus {
using namespace GUI;
using namespace Input;
@@ -293,6 +292,5 @@
focussed_component->set_focus(true);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/gui_manager.hxx
===================================================================
--- branches/pingus_sdl/src/gui/gui_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/gui_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../input/event.hxx"
#include "component.hxx"
-namespace Pingus {
class DrawingContext;
class GameDelta;
@@ -95,7 +94,6 @@
};
} // namespace GUI
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/gui_screen.cxx
===================================================================
--- branches/pingus_sdl/src/gui/gui_screen.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/gui_screen.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "gui_screen.hxx"
#include "gui_manager.hxx"
-namespace Pingus {
GUIScreen::GUIScreen()
: gui_manager (new GUI::GUIManager())
@@ -164,6 +163,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/gui_screen.hxx
===================================================================
--- branches/pingus_sdl/src/gui/gui_screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/gui_screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "screen.hxx"
-namespace Pingus {
namespace GUI {
class GUIManager;
@@ -71,7 +70,6 @@
GUIScreen& operator= (const GUIScreen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/input_box.cxx
===================================================================
--- branches/pingus_sdl/src/gui/input_box.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/input_box.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../vector.hxx"
#include "../fonts.hxx"
-namespace Pingus {
namespace GUI {
InputBox::InputBox(float width_, Vector p, const std::string& default_value,
Modified: branches/pingus_sdl/src/gui/input_box.hxx
===================================================================
--- branches/pingus_sdl/src/gui/input_box.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/input_box.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include <string>
-namespace Pingus {
class DrawingContext;
Modified: branches/pingus_sdl/src/gui/input_debug_screen.cxx
===================================================================
--- branches/pingus_sdl/src/gui/input_debug_screen.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/input_debug_screen.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
//#include "input/scroll_event.hxx"
#include "input_debug_screen.hxx"
-namespace Pingus {
using namespace Input;
@@ -98,6 +97,5 @@
std::cout << "InputDebugScreen::on_shutdown ()" << std::endl;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/input_debug_screen.hxx
===================================================================
--- branches/pingus_sdl/src/gui/input_debug_screen.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/input_debug_screen.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "screen.hxx"
-namespace Pingus {
class InputDebugScreen : public Screen
{
@@ -47,7 +46,6 @@
void on_shutdown ();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/root_gui_manager.cxx
===================================================================
--- branches/pingus_sdl/src/gui/root_gui_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/root_gui_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include "root_gui_manager.hxx"
#include "../input/controller.hxx"
-namespace Pingus {
using namespace GUI;
using namespace Input;
@@ -46,6 +45,5 @@
UNUSED_ARG(delta);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/root_gui_manager.hxx
===================================================================
--- branches/pingus_sdl/src/gui/root_gui_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/root_gui_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "gui_manager.hxx"
-namespace Pingus {
namespace Input {
class Controller;
@@ -49,7 +48,6 @@
};
}
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/screen.hxx
===================================================================
--- branches/pingus_sdl/src/gui/screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "game_delta.hxx"
-namespace Pingus {
class DrawingContext;
@@ -59,7 +58,6 @@
Screen& operator= (const Screen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/screen_manager.cxx
===================================================================
--- branches/pingus_sdl/src/gui/screen_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/screen_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "../display/drawing_context.hxx"
#include "../input/controller.hxx"
-namespace Pingus {
ScreenManager* ScreenManager::instance_ = 0;
@@ -312,6 +311,5 @@
instance_ = 0;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/screen_manager.hxx
===================================================================
--- branches/pingus_sdl/src/gui/screen_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/screen_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "screen_ptr.hxx"
-namespace Pingus {
class DrawingContext;
class Screen;
@@ -95,7 +94,6 @@
ScreenManager& operator= (const ScreenManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/screen_manager_impl.hxx
===================================================================
--- branches/pingus_sdl/src/gui/screen_manager_impl.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/screen_manager_impl.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
class ScreenManagerImpl
{
@@ -39,7 +38,6 @@
ScreenManagerImpl& operator= (const ScreenManagerImpl&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/screen_ptr.cxx
===================================================================
--- branches/pingus_sdl/src/gui/screen_ptr.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/screen_ptr.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -21,7 +21,6 @@
#include <iostream>
#include "screen_ptr.hxx"
-namespace Pingus {
void
ScreenPtr::decrease_refcount()
@@ -56,6 +55,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/screen_ptr.hxx
===================================================================
--- branches/pingus_sdl/src/gui/screen_ptr.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/gui/screen_ptr.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "screen.hxx"
-namespace Pingus {
/** The ScreenPtr is a simple smart pointer to point at a Screen. It
either deletes the pointer or not, depending on the value of
@@ -105,7 +104,6 @@
void increase_refcount();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/gui/surface_button.cxx
===================================================================
--- branches/pingus_sdl/src/gui/surface_button.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/surface_button.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../display/drawing_context.hxx"
#include "surface_button.hxx"
-namespace Pingus {
namespace GUI {
@@ -102,6 +101,5 @@
}
} // namespace GUI
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/gui/surface_button.hxx
===================================================================
--- branches/pingus_sdl/src/gui/surface_button.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/gui/surface_button.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "component.hxx"
-namespace Pingus {
class ResDescriptor;
@@ -66,7 +65,6 @@
};
} // namespace GUI
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/indexed_canvas.cxx
===================================================================
--- branches/pingus_sdl/src/indexed_canvas.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/indexed_canvas.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include "indexed_canvas.hxx"
#include <assert.h>
-namespace Pingus {
IndexedCanvas::IndexedCanvas(int w, int h)
: width(w),
@@ -48,6 +47,5 @@
return const_cast<CL_Palette*>(&palette);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/indexed_canvas.hxx
===================================================================
--- branches/pingus_sdl/src/indexed_canvas.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/indexed_canvas.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/pixel_buffer.h>
#include <ClanLib/Display/palette.h>
-namespace Pingus {
/** This class is analog to CL_Canvas, but instead of being true
color, it is indexed */
@@ -69,7 +68,6 @@
IndexedCanvas& operator= (const IndexedCanvas&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axes/button_axis.cxx
===================================================================
--- branches/pingus_sdl/src/input/axes/button_axis.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/axes/button_axis.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#include "button_axis.hxx"
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -76,6 +75,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/axes/button_axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axes/button_axis.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/axes/button_axis.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../axis.hxx"
-namespace Pingus {
namespace Input {
class Button;
@@ -60,7 +59,6 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axes/dummy_axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axes/dummy_axis.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/axes/dummy_axis.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -53,7 +52,6 @@
} // namespace Axis
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axes/inverted_axis.cxx
===================================================================
--- branches/pingus_sdl/src/input/axes/inverted_axis.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/inverted_axis.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "inverted_axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -53,6 +52,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/axes/inverted_axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axes/inverted_axis.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/inverted_axis.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -53,7 +52,6 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axes/joystick_axis.cxx
===================================================================
--- branches/pingus_sdl/src/input/axes/joystick_axis.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/joystick_axis.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "joystick_axis.hxx"
#include "../../pingus_error.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -63,6 +62,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/axes/joystick_axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axes/joystick_axis.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/joystick_axis.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -55,7 +54,6 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axes/multiple_axis.cxx
===================================================================
--- branches/pingus_sdl/src/input/axes/multiple_axis.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/multiple_axis.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "multiple_axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -64,6 +63,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/axes/multiple_axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axes/multiple_axis.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/axes/multiple_axis.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../axis.hxx"
-namespace Pingus {
namespace Input {
namespace Axes {
@@ -59,7 +58,6 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axis.hxx
===================================================================
--- branches/pingus_sdl/src/input/axis.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/axis.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Input {
/// abstract base class which defines the axis interface
@@ -46,7 +45,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/axis_factory.cxx
===================================================================
--- branches/pingus_sdl/src/input/axis_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/axis_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "axes/multiple_axis.hxx"
#include "../debug.hxx"
-namespace Pingus {
namespace Input {
using namespace Axes;
@@ -107,6 +106,5 @@
}
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/axis_factory.hxx
===================================================================
--- branches/pingus_sdl/src/input/axis_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/axis_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../file_reader.hxx"
-namespace Pingus {
namespace Input {
class Axis;
@@ -45,7 +44,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/button.hxx
===================================================================
--- branches/pingus_sdl/src/input/button.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/button.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Input {
/// abstract base class which defines the button interface
@@ -49,7 +48,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/button_factory.cxx
===================================================================
--- branches/pingus_sdl/src/input/button_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/button_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -30,7 +30,6 @@
#include "buttons/multiple_button.hxx"
#include "buttons/triple_button.hxx"
-namespace Pingus {
namespace Input {
using namespace Buttons;
@@ -137,6 +136,5 @@
}
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/button_factory.hxx
===================================================================
--- branches/pingus_sdl/src/input/button_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/button_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../file_reader.hxx"
-namespace Pingus {
namespace Input {
class Button;
@@ -47,7 +46,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/double_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/double_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/double_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include "../event_fwd.hxx"
#include "double_button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -64,6 +63,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/double_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/double_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/double_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -58,7 +57,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/dummy_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/dummy_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/dummy_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -45,7 +44,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/joystick_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/joystick_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/joystick_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "joystick_button.hxx"
#include "../../pingus_error.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -50,6 +49,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/joystick_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/joystick_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/joystick_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -51,7 +50,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/key_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/key_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/key_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <iostream>
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -68,6 +67,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/key_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/key_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/key_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
class CL_InputEvent;
class CL_InputDevice;
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -60,7 +59,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/mouse_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/mouse_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/mouse_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "mouse_button.hxx"
#include "../../pingus_error.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -105,6 +104,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/mouse_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/mouse_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/mouse_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
class CL_InputEvent;
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -58,7 +57,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/multiple_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/multiple_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/multiple_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include <iostream>
#include "multiple_button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -80,6 +79,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/multiple_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/multiple_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/multiple_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -57,7 +56,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/buttons/triple_button.cxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/triple_button.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/triple_button.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "triple_button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -69,6 +68,5 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/buttons/triple_button.hxx
===================================================================
--- branches/pingus_sdl/src/input/buttons/triple_button.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/buttons/triple_button.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../button.hxx"
-namespace Pingus {
namespace Input {
namespace Buttons {
@@ -59,7 +58,6 @@
} // namespace Buttons
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/controller.cxx
===================================================================
--- branches/pingus_sdl/src/input/controller.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/controller.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -30,7 +30,6 @@
#include "scroller_factory.hxx"
////#include "button_factory.hxx"
-namespace Pingus {
namespace Input {
using namespace Axes;
@@ -285,6 +284,5 @@
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/controller.hxx
===================================================================
--- branches/pingus_sdl/src/input/controller.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/controller.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "../file_reader.hxx"
#include "event.hxx"
-namespace Pingus {
namespace Input {
class Axis;
@@ -86,7 +85,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/event.hxx
===================================================================
--- branches/pingus_sdl/src/input/event.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/event.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <string>
#include "../pingus.hxx"
-namespace Pingus {
namespace Input {
enum EventType { ButtonEventType, PointerEventType, AxisEventType,
ScrollEventType, KeyboardEventType };
@@ -140,7 +139,6 @@
}
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/event_fwd.hxx
===================================================================
--- branches/pingus_sdl/src/input/event_fwd.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/event_fwd.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,14 +24,12 @@
// Forward Header for event.hxx, just here to reduce compile time
// dependencies a bit.
-namespace Pingus {
namespace Input {
struct Event;
typedef std::vector<Event> EventLst;
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointer.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointer.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/pointer.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Input {
/// abstract base class defining the pointer interface
@@ -49,7 +48,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointer_factory.cxx
===================================================================
--- branches/pingus_sdl/src/input/pointer_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/pointer_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "pointers/multiple_pointer.hxx"
#include "pointer_factory.hxx"
-namespace Pingus {
namespace Input {
using namespace Pointers;
@@ -83,6 +82,5 @@
}
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/pointer_factory.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointer_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/pointer_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../file_reader.hxx"
-namespace Pingus {
namespace Input {
class Pointer;
@@ -44,7 +43,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointers/axis_pointer.cxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/axis_pointer.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/axis_pointer.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../axis.hxx"
#include "axis_pointer.hxx"
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -71,6 +70,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/pointers/axis_pointer.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/axis_pointer.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/axis_pointer.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../pointer.hxx"
-namespace Pingus {
namespace Input {
class Axis;
@@ -68,7 +67,6 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointers/dummy_pointer.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/dummy_pointer.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/dummy_pointer.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../pointer.hxx"
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -53,7 +52,6 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointers/mouse_pointer.cxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/mouse_pointer.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/mouse_pointer.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -21,7 +21,6 @@
#include <ClanLib/Display/input_event.h>
#include "mouse_pointer.hxx"
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -65,6 +64,5 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/pointers/mouse_pointer.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/mouse_pointer.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/mouse_pointer.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
class CL_InputEvent;
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -60,7 +59,6 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/pointers/multiple_pointer.cxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/multiple_pointer.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/multiple_pointer.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "multiple_pointer.hxx"
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -96,7 +95,6 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/pointers/multiple_pointer.hxx
===================================================================
--- branches/pingus_sdl/src/input/pointers/multiple_pointer.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/pointers/multiple_pointer.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../pointer.hxx"
-namespace Pingus {
namespace Input {
namespace Pointers {
@@ -65,7 +64,6 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scroller.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input/scroller.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Input {
/// abstract base class defining the scroller interface
@@ -48,7 +47,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scroller_factory.cxx
===================================================================
--- branches/pingus_sdl/src/input/scroller_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/scroller_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -33,7 +33,6 @@
#include "scrollers/multiple_scroller.hxx"
#include "scrollers/pointer_scroller.hxx"
-namespace Pingus {
namespace Input {
using namespace Scrollers;
@@ -153,6 +152,5 @@
}
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scroller_factory.hxx
===================================================================
--- branches/pingus_sdl/src/input/scroller_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/input/scroller_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../file_reader.hxx"
-namespace Pingus {
namespace Input {
class Scroller;
@@ -47,7 +46,6 @@
};
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/axis_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/axis_scroller.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/axis_scroller.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include "../axis.hxx"
#include "axis_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -80,7 +79,6 @@
} // namespace Scrollers
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/axis_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/axis_scroller.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/axis_scroller.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
class Axis;
@@ -64,7 +63,6 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/dummy_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/dummy_scroller.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/dummy_scroller.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -53,7 +52,6 @@
} // namespace Scrollers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/inverted_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/inverted_scroller.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/inverted_scroller.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "inverted_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -65,6 +64,5 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/inverted_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/inverted_scroller.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/inverted_scroller.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -61,7 +60,6 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/joystick_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/joystick_scroller.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/joystick_scroller.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include "../axes/joystick_axis.hxx"
#include "joystick_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -71,6 +70,5 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/joystick_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/joystick_scroller.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/joystick_scroller.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
class Axis;
@@ -64,7 +63,6 @@
} // namespace Pointers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/mouse_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/mouse_scroller.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/mouse_scroller.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -21,7 +21,6 @@
#include <ClanLib/Core/System/error.h>
#include "mouse_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -64,7 +63,6 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/mouse_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/mouse_scroller.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/mouse_scroller.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/input_device.h>
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -57,7 +56,6 @@
} // namespace Scrollers
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/multiple_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/multiple_scroller.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/multiple_scroller.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -17,7 +17,6 @@
#include "multiple_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -70,6 +69,5 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/multiple_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/multiple_scroller.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/multiple_scroller.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -57,7 +56,6 @@
} // namespace Scroller
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input/scrollers/pointer_scroller.cxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/pointer_scroller.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/pointer_scroller.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -21,7 +21,6 @@
#include "../pointer.hxx"
#include "pointer_scroller.hxx"
-namespace Pingus {
namespace Input {
namespace Scrollers {
@@ -90,6 +89,5 @@
} // namespace Axes
} // namespace Input
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/input/scrollers/pointer_scroller.hxx
===================================================================
--- branches/pingus_sdl/src/input/scrollers/pointer_scroller.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/input/scrollers/pointer_scroller.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../scroller.hxx"
-namespace Pingus {
namespace Input {
class Button;
@@ -68,7 +67,6 @@
} // namespace Pointer
} // namespace Input
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/input_event.hxx
===================================================================
--- branches/pingus_sdl/src/input_event.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/input_event.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "pingus.hxx"
#include "vector.hxx"
-namespace Pingus {
/** This will need some^H^H^H^H a lot of work */
typedef enum {
@@ -79,7 +78,6 @@
int owner;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/layer_manager.cxx
===================================================================
--- branches/pingus_sdl/src/layer_manager.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/layer_manager.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include <iostream>
#include "layer_manager.hxx"
-namespace Pingus {
LayerManager::LayerManager ()
{
@@ -52,6 +51,5 @@
i->update(delta);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/layer_manager.hxx
===================================================================
--- branches/pingus_sdl/src/layer_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/layer_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "gui/display.hxx"
#include "display/drawing_context.hxx"
-namespace Pingus {
class LayerManager
{
@@ -87,7 +86,6 @@
LayerManager& operator= (const LayerManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/level_desc.cxx
===================================================================
--- branches/pingus_sdl/src/level_desc.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_desc.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -27,7 +27,6 @@
#include "system.hxx"
#include "gettext.h"
-namespace Pingus {
PingusLevelDesc::PingusLevelDesc(const PingusLevel& arg_plf)
{
@@ -99,7 +98,6 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/level_desc.hxx
===================================================================
--- branches/pingus_sdl/src/level_desc.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_desc.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
class CL_Font;
-namespace Pingus {
///
class PingusLevelDesc
@@ -50,7 +49,6 @@
PingusLevelDesc& operator= (const PingusLevelDesc&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/level_interrupt.cxx
===================================================================
--- branches/pingus_sdl/src/level_interrupt.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_interrupt.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -19,7 +19,6 @@
#include "level_interrupt.hxx"
-namespace Pingus {
LevelInterrupt::LevelInterrupt()
{
@@ -36,6 +35,5 @@
return status;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/level_interrupt.hxx
===================================================================
--- branches/pingus_sdl/src/level_interrupt.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_interrupt.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
class LevelInterrupt
{
@@ -40,7 +39,6 @@
LevelInterrupt& operator= (const LevelInterrupt&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/level_result.cxx
===================================================================
--- branches/pingus_sdl/src/level_result.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_result.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -33,7 +33,6 @@
#include "gettext.h"
#include "input/controller.hxx"
-namespace Pingus {
PingusLevelResult::PingusLevelResult(World* w, Controller* c)
{
@@ -129,6 +128,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/level_result.hxx
===================================================================
--- branches/pingus_sdl/src/level_result.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/level_result.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
class CL_Font;
-namespace Pingus {
class World;
class Controller;
@@ -50,7 +49,6 @@
PingusLevelResult& operator= (const PingusLevelResult&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/loading.cxx
===================================================================
--- branches/pingus_sdl/src/loading.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/loading.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "fonts.hxx"
#include "loading.hxx"
-namespace Pingus {
Loading loading_screen;
@@ -88,6 +87,5 @@
Display::flip_display();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/loading.hxx
===================================================================
--- branches/pingus_sdl/src/loading.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/loading.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
class CL_Font;
-namespace Pingus {
class Loading
{
@@ -49,7 +48,6 @@
extern Loading loading_screen;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/math.hxx
===================================================================
--- branches/pingus_sdl/src/math.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/math.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include "pingus.hxx"
-namespace Pingus {
/** A collection of small math helper functions, some of them might be
equal in functionality to standard STL functions, but provided
@@ -89,7 +88,6 @@
}
} // namespace Math
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/mover.cxx
===================================================================
--- branches/pingus_sdl/src/mover.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/mover.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -19,7 +19,6 @@
#include "mover.hxx"
-namespace Pingus {
Mover::Mover(World* const world_arg, const Vector& pos_arg)
: world(world_arg),
@@ -48,6 +47,5 @@
return collision;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/mover.hxx
===================================================================
--- branches/pingus_sdl/src/mover.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/mover.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "vector.hxx"
-namespace Pingus {
class Collider;
class World;
@@ -62,7 +61,6 @@
bool collision;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/movers/linear_mover.cxx
===================================================================
--- branches/pingus_sdl/src/movers/linear_mover.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/movers/linear_mover.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#include "linear_mover.hxx"
#include "../collider.hxx"
-namespace Pingus {
namespace Movers {
LinearMover::LinearMover(World* const world_arg, const Vector& pos_arg)
@@ -61,6 +60,5 @@
}
} // namespace Movers
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/movers/linear_mover.hxx
===================================================================
--- branches/pingus_sdl/src/movers/linear_mover.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/movers/linear_mover.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../mover.hxx"
-namespace Pingus {
class Collider;
@@ -42,7 +41,6 @@
};
} // namespace Movers
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/multiline_text.cxx
===================================================================
--- branches/pingus_sdl/src/multiline_text.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/multiline_text.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "multiline_text.hxx"
#include "math.hxx"
-namespace Pingus {
MultiLineText::MultiLineText()
{
@@ -144,7 +143,6 @@
return height;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/multiline_text.hxx
===================================================================
--- branches/pingus_sdl/src/multiline_text.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/multiline_text.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <string>
#include <vector>
-namespace Pingus {
class MultiLineText
{
@@ -49,7 +48,6 @@
MultiLineText& operator= (const MultiLineText&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/particles/explosive_particle.hxx
===================================================================
--- branches/pingus_sdl/src/particles/explosive_particle.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/explosive_particle.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include "../sprite.hxx"
#include "particle.hxx"
-namespace Pingus {
class ExplosiveParticle
: public Particle
Modified: branches/pingus_sdl/src/particles/pingu_particle_holder.cxx
===================================================================
--- branches/pingus_sdl/src/particles/pingu_particle_holder.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/pingu_particle_holder.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../world.hxx"
#include "pingu_particle_holder.hxx"
-namespace Pingus {
namespace Particles {
const float x_collision_decrease = 0.3f;
@@ -166,6 +165,5 @@
}
} // namespace Particles
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/particles/pingu_particle_holder.hxx
===================================================================
--- branches/pingus_sdl/src/particles/pingu_particle_holder.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/pingu_particle_holder.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../vector.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
class SceneContext;
@@ -68,7 +67,6 @@
};
} // namespace Particles
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/particles/rain_particle_holder.cxx
===================================================================
--- branches/pingus_sdl/src/particles/rain_particle_holder.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/rain_particle_holder.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../world.hxx"
#include "rain_particle_holder.hxx"
-namespace Pingus {
namespace Particles {
RainParticleHolder::RainParticle::RainParticle(int x, int y)
@@ -127,6 +126,5 @@
}
} // namespace Particles
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/particles/rain_particle_holder.hxx
===================================================================
--- branches/pingus_sdl/src/particles/rain_particle_holder.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/rain_particle_holder.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../vector.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
class GraphicContext;
@@ -72,7 +71,6 @@
};
} // namespace Particles
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/particles/smoke_particle_holder.cxx
===================================================================
--- branches/pingus_sdl/src/particles/smoke_particle_holder.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/smoke_particle_holder.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../resource.hxx"
#include "smoke_particle_holder.hxx"
-namespace Pingus {
namespace Particles {
SmokeParticleHolder::SmokeParticle::SmokeParticle (float x, float y, float
vel_x, float vel_y)
@@ -89,6 +88,5 @@
}
} // namespace Particles
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/particles/smoke_particle_holder.hxx
===================================================================
--- branches/pingus_sdl/src/particles/smoke_particle_holder.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/smoke_particle_holder.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../vector.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
class SceneContext;
@@ -68,7 +67,6 @@
};
} // namespace Particles
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/particles/snow_particle_holder.cxx
===================================================================
--- branches/pingus_sdl/src/particles/snow_particle_holder.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/snow_particle_holder.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
#include "../world.hxx"
#include "snow_particle_holder.hxx"
-namespace Pingus {
namespace Particles {
SnowParticleHolder::SnowParticle::SnowParticle (int x, int y, bool colliding_)
@@ -152,6 +151,5 @@
}
} // namespace Particles
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/particles/snow_particle_holder.hxx
===================================================================
--- branches/pingus_sdl/src/particles/snow_particle_holder.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/particles/snow_particle_holder.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../vector.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
class SceneContext;
@@ -77,7 +76,6 @@
};
} //namespace Particles
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/path_manager.cxx
===================================================================
--- branches/pingus_sdl/src/path_manager.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/path_manager.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "path_manager.hxx"
#include "debug.hxx"
-namespace Pingus {
PathManager path_manager;
@@ -109,6 +108,5 @@
base_path = path;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/path_manager.hxx
===================================================================
--- branches/pingus_sdl/src/path_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/path_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <string>
#include <list>
-namespace Pingus {
class PathManager
{
@@ -65,7 +64,6 @@
extern PathManager path_manager;
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingu.cxx
===================================================================
--- branches/pingus_sdl/src/pingu.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/pingu.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -34,7 +34,6 @@
#include "resource.hxx"
#include "fonts.hxx"
-namespace Pingus {
using namespace Actions;
@@ -449,6 +448,5 @@
return action->catchable ();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingu.hxx
===================================================================
--- branches/pingus_sdl/src/pingu.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/pingu.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "direction.hxx"
#include "pingu_enums.hxx"
-namespace Pingus {
// Forward declarations
class Vector;
@@ -223,7 +222,6 @@
Pingu& operator= (const Pingu&);
};
-} // namespace Pingus
#endif /* PINGU_HH */
Modified: branches/pingus_sdl/src/pingu_action.cxx
===================================================================
--- branches/pingus_sdl/src/pingu_action.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_action.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "pingu_action.hxx"
#include "worldobj.hxx"
-namespace Pingus {
PinguAction::PinguAction (Pingu* p)
: pingu (p)
@@ -278,6 +277,5 @@
#endif
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingu_action.hxx
===================================================================
--- branches/pingus_sdl/src/pingu_action.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_action.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingu_enums.hxx"
-namespace Pingus {
class ActionHolder;
class SceneContext;
@@ -119,7 +118,6 @@
PinguAction& operator= (const PinguAction&);
};
-} // namespace Pingus
#endif /* PINGU_ACTION_HH */
Modified: branches/pingus_sdl/src/pingu_action_factory.cxx
===================================================================
--- branches/pingus_sdl/src/pingu_action_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingu_action_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -46,7 +46,6 @@
#include "pingu_action_factory.hxx"
-namespace Pingus {
using namespace Actions;
@@ -194,6 +193,5 @@
factories[id] = factory;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingu_action_factory.hxx
===================================================================
--- branches/pingus_sdl/src/pingu_action_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingu_action_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include <vector>
#include "pingu.hxx"
-namespace Pingus {
class PinguAction;
class PinguActionAbstractFactory;
@@ -63,7 +62,6 @@
PinguActionFactory& operator= (const PinguActionFactory&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingu_enums.cxx
===================================================================
--- branches/pingus_sdl/src/pingu_enums.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_enums.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
const float deadly_velocity = 10.0f;
const int pingu_height = 26;
-namespace Pingus {
namespace Actions {
std::string action_to_screenname (ActionName action)
@@ -120,6 +119,5 @@
}
} // namespace Actions
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingu_enums.hxx
===================================================================
--- branches/pingus_sdl/src/pingu_enums.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_enums.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -32,7 +32,6 @@
FIXME: splashed, smashed, etc.) */
enum PinguStatus { PS_ALIVE, PS_EXITED, PS_DEAD };
-namespace Pingus {
namespace Actions {
/** The order of the actions here are the same as the order of actions
@@ -77,7 +76,6 @@
std::string action_to_screenname(ActionName action);
} // namespace Actions
-} // namespace Pingus
// Pingu "globals"
extern const int pingu_height;
Modified: branches/pingus_sdl/src/pingu_holder.cxx
===================================================================
--- branches/pingus_sdl/src/pingu_holder.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_holder.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "pingus_level.hxx"
#include "pingu.hxx"
-namespace Pingus {
PinguHolder::PinguHolder(const PingusLevel& plf)
: number_of_allowed(plf.get_number_of_pingus()),
@@ -183,6 +182,5 @@
return all_pingus.size();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingu_holder.hxx
===================================================================
--- branches/pingus_sdl/src/pingu_holder.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingu_holder.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <vector>
#include "worldobj.hxx"
-namespace Pingus {
class PingusLevel;
class Vector;
@@ -117,7 +116,6 @@
PinguHolder& operator= (const PinguHolder&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_error.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_error.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_error.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include "pingus_error.hxx"
#include "gettext.h"
-namespace Pingus {
PingusError::PingusError (const std::string& mes)
: message("PingusError: " + mes)
@@ -49,6 +48,5 @@
return message.c_str();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_error.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_error.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_error.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <string>
#include <exception>
-namespace Pingus {
/** A PingusError is thrown in situation where an error occured due to
invalid user input, file not found events or similar stuff. */
@@ -42,7 +41,6 @@
static void raise (const std::string& msg);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_level.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_level.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_level.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus_level.hxx"
#include "pingus_level_impl.hxx"
-namespace Pingus {
PingusLevel::PingusLevel()
: impl(new PingusLevelImpl())
@@ -107,6 +106,5 @@
return impl->ambient_light;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_level.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_level.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_level.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "shared_ptr.hxx"
#include "file_reader.hxx"
-namespace Pingus {
class FileReader;
class PingusLevelImpl;
@@ -84,7 +83,6 @@
SharedPtr<PingusLevelImpl> impl;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_level_impl.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_level_impl.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingus_level_impl.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
#include <map>
-namespace Pingus {
class PingusLevelImpl
{
@@ -64,7 +63,6 @@
std::vector<FileReader> objects;
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_main.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_main.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_main.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -87,7 +87,6 @@
#pragma warning( disable : 4996 )
#endif
-namespace Pingus {
void
signal_handler(int signo)
@@ -1001,11 +1000,10 @@
Resource::deinit();
}
-} // namespace Pingus
int main(int argc, char** argv)
{
- Pingus::PingusMain app;
+ PingusMain app;
return app.main(argc, argv);
}
Modified: branches/pingus_sdl/src/pingus_main.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_main.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_main.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
void segfault_handler(int);
-namespace Pingus {
class PingusMain
{
@@ -83,7 +82,6 @@
} app; // golbal class instance
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_map_manager.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_map_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingus_map_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include <ClanLib/Display/pixel_buffer.h>
#include "pingus_map_manager.hxx"
-namespace Pingus {
std::string PingusMapManager::directory;
@@ -46,6 +45,5 @@
UNUSED_ARG(level_filename);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_map_manager.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_map_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingus_map_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
class CL_Surface;
-namespace Pingus {
class PingusMapManager
{
@@ -42,7 +41,6 @@
PingusMapManager& operator= (const PingusMapManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_menu.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_menu.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_menu.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -37,7 +37,6 @@
#include "file_dialog.hxx"
#include "editor/editor_screen.hxx"
-namespace Pingus {
PingusMenu::PingusMenu (PingusMenuManager* m)
: PingusSubMenu (m),
@@ -267,6 +266,5 @@
manager->pop_menu();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_menu.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_menu.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_menu.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
class CL_InputDevice;
class CL_Slot;
-namespace Pingus {
class SurfaceButton;
class GameDelta;
@@ -99,7 +98,6 @@
PingusMenu& operator= (const PingusMenu&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_menu_manager.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_menu_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingus_menu_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "blitter.hxx"
#include "pingus_menu_manager.hxx"
-namespace Pingus {
PingusMenuManager* PingusMenuManager::instance_ = 0;
@@ -168,6 +167,5 @@
delete instance_;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_menu_manager.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_menu_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/pingus_menu_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "pingus_menu.hxx"
#include "file_dialog.hxx"
-namespace Pingus {
class PingusSubMenu;
@@ -87,7 +86,6 @@
PingusMenuManager& operator= (const PingusMenuManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/pingus_sub_menu.cxx
===================================================================
--- branches/pingus_sdl/src/pingus_sub_menu.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_sub_menu.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -19,7 +19,6 @@
#include "pingus_sub_menu.hxx"
-namespace Pingus {
PingusSubMenu::PingusSubMenu (PingusMenuManager* m)
: manager (m)
@@ -30,6 +29,5 @@
{
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/pingus_sub_menu.hxx
===================================================================
--- branches/pingus_sdl/src/pingus_sub_menu.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/pingus_sub_menu.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
class CL_Key;
class CL_InputDevice;
-namespace Pingus {
class PingusMenuManager;
@@ -49,7 +48,6 @@
PingusSubMenu& operator= (const PingusSubMenu&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/plf_res_mgr.cxx
===================================================================
--- branches/pingus_sdl/src/plf_res_mgr.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/plf_res_mgr.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "xml_pingus_level.hxx"
#include "plf_res_mgr.hxx"
-namespace Pingus {
PLFResMgr::PLFMap PLFResMgr::plf_map;
@@ -101,6 +100,5 @@
return load_plf_raw(res_name, path_manager.complete("levels/" + res_name +
".pingus"));
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/plf_res_mgr.hxx
===================================================================
--- branches/pingus_sdl/src/plf_res_mgr.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/plf_res_mgr.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "pingus_level.hxx"
-namespace Pingus {
/** */
class PLFResMgr
@@ -53,7 +52,6 @@
static PingusLevel load_plf_from_filename(const std::string& filename);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/plt_xml.cxx
===================================================================
--- branches/pingus_sdl/src/plt_xml.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/plt_xml.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "xml_file_reader.hxx"
#include "plt_xml.hxx"
-namespace Pingus {
PLTXML::PLTXML ()
{
@@ -79,6 +78,5 @@
return description;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/plt_xml.hxx
===================================================================
--- branches/pingus_sdl/src/plt_xml.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/plt_xml.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include <string>
-namespace Pingus {
class PLTXML
{
@@ -49,7 +48,6 @@
PLTXML& operator= (const PLTXML&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/preview_renderer.cxx
===================================================================
--- branches/pingus_sdl/src/preview_renderer.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/preview_renderer.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
//#include "gui/buffer_graphic_context.hxx"
#include "preview_renderer.hxx"
-namespace Pingus {
void
PreviewRenderer::render(const PingusLevel& plf,
@@ -38,6 +37,5 @@
#endif
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/preview_renderer.hxx
===================================================================
--- branches/pingus_sdl/src/preview_renderer.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/preview_renderer.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "plf_res_mgr.hxx"
-namespace Pingus {
/** By given a PLF, the PreviewRenderer renders a CL_Canvas with a
graphic of the complete level, it also allows to save it down to a
@@ -40,7 +39,6 @@
static void render(const PingusLevel& plf, const std::string& output_file);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/range.cxx
===================================================================
--- branches/pingus_sdl/src/range.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/range.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include <algorithm>
#include "range.hxx"
-namespace Pingus {
#ifdef WIN32
void swap(int& a, int& b)
@@ -130,6 +129,5 @@
count = start;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/range.hxx
===================================================================
--- branches/pingus_sdl/src/range.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/range.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
/** A class similar to an integer, but keeps the value in a given range.
@@ -58,7 +57,6 @@
void set_range(int, int);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/res_descriptor.cxx
===================================================================
--- branches/pingus_sdl/src/res_descriptor.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/res_descriptor.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "res_descriptor.hxx"
#include "pingus_error.hxx"
-namespace Pingus {
/*
uri -> file:///home/ingo/.pingus/images/...
@@ -50,12 +49,8 @@
return (res_name < res_desc.res_name) && (modifier < res_desc.modifier);
}
-} // namespace Pingus
-
-std::ostream& operator<<(std::ostream& s, const Pingus::ResDescriptor& desc)
+std::ostream& operator<<(std::ostream& s, const ResDescriptor& desc)
{
- using namespace Pingus;
-
return s << "[" << desc.res_name << ", "
<< ResourceModifierNS::rs_to_string(desc.modifier) << "]";
}
Modified: branches/pingus_sdl/src/res_descriptor.hxx
===================================================================
--- branches/pingus_sdl/src/res_descriptor.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/res_descriptor.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,8 +22,6 @@
#include "resource_modifier.hxx"
-namespace Pingus {
-
/// Resource descriptor, tells were to find a resource.
class ResDescriptor
{
@@ -40,10 +38,8 @@
bool operator< (const ResDescriptor&) const;
};
-} // namespace Pingus
-
/// Our own function to print out the ResDescriptor
-std::ostream& operator<<(std::ostream& s, const Pingus::ResDescriptor& desc);
+std::ostream& operator<<(std::ostream& s, const ResDescriptor& desc);
#endif
Modified: branches/pingus_sdl/src/resource.cxx
===================================================================
--- branches/pingus_sdl/src/resource.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/resource.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -32,7 +32,6 @@
#include "blitter.hxx"
#include "debug.hxx"
-namespace Pingus {
ResourceManager Resource::resmgr;
#if 0
std::map<ResDescriptor, CL_Surface> Resource::surface_map;
@@ -362,6 +361,5 @@
return 0;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/resource.hxx
===================================================================
--- branches/pingus_sdl/src/resource.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/resource.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -28,7 +28,6 @@
class CL_ResourceManager;
-namespace Pingus {
/** General Resource Managing class, it provides wrappers around
CL_Surface::load(), CL_Font::load() and friends. This class is
@@ -90,7 +89,6 @@
Resource& operator= (const Resource&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/resource_manager.cpp
===================================================================
--- branches/pingus_sdl/src/resource_manager.cpp 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/resource_manager.cpp 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,6 +24,9 @@
*/
#include <iostream>
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "sexpr_file_reader.hpp"
#include "resource_manager.hpp"
ResourceManager::ResourceManager()
@@ -37,7 +40,24 @@
void
ResourceManager::add_resources(const std::string& filename)
{
+#if 0
std::cout << "ResourceManager: " << filename << std::endl;
+ lisp::Lisp* sexpr = lisp::Parser::parse("test.scm");
+ if (sexpr)
+ {
+ SExprFileReader root_reader(sexpr = sexpr->get_list_elem(0));
+ SExprFileReader reader;
+
+ if (root_reader.read_section("pingus-resources", reader))
+ {
+ std::vector<FileReader> sections = reader.get_sections();
+ }
+ }
+ else
+ {
+ std::cout << "ResourceManager: File not found " << filename << std::endl;
+ }
+#endif
}
/* EOF */
Modified: branches/pingus_sdl/src/resource_modifier.cxx
===================================================================
--- branches/pingus_sdl/src/resource_modifier.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/resource_modifier.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#include <assert.h>
#include "resource_modifier.hxx"
-namespace Pingus {
namespace ResourceModifierNS {
ResourceModifier horizontal_flip (ResourceModifier modifier)
@@ -179,6 +178,5 @@
}
} // namespace ResourceModifierNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/resource_modifier.hxx
===================================================================
--- branches/pingus_sdl/src/resource_modifier.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/resource_modifier.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "pingus.hxx"
#include <string>
-namespace Pingus {
namespace ResourceModifierNS {
/** This array contains possible modifications of a surface */
@@ -49,7 +48,6 @@
ResourceModifier rs_from_string (const std::string&);
} // namespace ResourceModifierNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/result.cxx
===================================================================
--- branches/pingus_sdl/src/result.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/result.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
//#include <iostream>
//#include "result.hxx"
-namespace Pingus {
/*Result::Result()
{
@@ -109,6 +108,5 @@
}
*/
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/result.hxx
===================================================================
--- branches/pingus_sdl/src/result.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/result.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include "pingus_level.hxx"
#include "pingus.hxx"
-namespace Pingus {
/** Result of a Pingus game */
struct Result
@@ -54,7 +53,6 @@
}
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/result_screen.cxx
===================================================================
--- branches/pingus_sdl/src/result_screen.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/result_screen.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -34,7 +34,6 @@
#include "game_time.hxx"
#include "result_screen.hxx"
-namespace Pingus {
class ResultScreenComponent : public GUI::Component
{
@@ -320,6 +319,5 @@
close_screen();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/result_screen.hxx
===================================================================
--- branches/pingus_sdl/src/result_screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/result_screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "result.hxx"
#include "gui/gui_screen.hxx"
-namespace Pingus {
/** */
class ResultScreen : public GUIScreen
@@ -45,7 +44,6 @@
ResultScreen& operator= (const ResultScreen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/savegame.cxx
===================================================================
--- branches/pingus_sdl/src/savegame.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/savegame.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "xml_file_writer.hxx"
#include "savegame.hxx"
-namespace Pingus {
std::string
Savegame::status_to_string(S_Status status)
@@ -95,6 +94,5 @@
reader.read_int ("saved-pingus", saved_pingus);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/savegame.hxx
===================================================================
--- branches/pingus_sdl/src/savegame.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/savegame.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <string>
#include "file_reader.hxx"
-namespace Pingus {
class XMLFileWriter;
@@ -58,7 +57,6 @@
void write_xml(XMLFileWriter& xml);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/savegame_manager.cxx
===================================================================
--- branches/pingus_sdl/src/savegame_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/savegame_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "xml_file_writer.hxx"
#include "savegame_manager.hxx"
-namespace Pingus {
SavegameManager* SavegameManager::instance_ = 0;
@@ -151,6 +150,5 @@
xml.end_section(); // pingus-savegame
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/savegame_manager.hxx
===================================================================
--- branches/pingus_sdl/src/savegame_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/savegame_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <map>
#include "savegame.hxx"
-namespace Pingus {
/** */
class SavegameManager
@@ -50,7 +49,6 @@
SavegameManager& operator= (const SavegameManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/screenshot.cxx
===================================================================
--- branches/pingus_sdl/src/screenshot.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/screenshot.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -31,7 +31,6 @@
#include "screenshot.hxx"
#include "gettext.h"
-namespace Pingus {
// Saves a screenshot to file, it return the filename the screenshot
// was saved to.
@@ -196,6 +195,5 @@
return std::string(buffer);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/screenshot.hxx
===================================================================
--- branches/pingus_sdl/src/screenshot.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/screenshot.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
class CL_Target;
-namespace Pingus {
/** Simple class to get a screenshot and save it as pnm */
class Screenshot
@@ -48,7 +47,6 @@
Screenshot& operator= (const Screenshot&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/server.cxx
===================================================================
--- branches/pingus_sdl/src/server.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/server.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "demo_recorder.hxx"
#include "goal_manager.hxx"
-namespace Pingus {
using Actions::action_from_string;
@@ -105,6 +104,5 @@
return get_world()->get_game_time()->get_ticks();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/server.hxx
===================================================================
--- branches/pingus_sdl/src/server.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/server.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "action_holder.hxx"
#include "pingus_level.hxx"
-namespace Pingus {
class Pingu;
class World;
@@ -75,7 +74,6 @@
Server& operator= (const Server&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/server_event.cxx
===================================================================
--- branches/pingus_sdl/src/server_event.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/server_event.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "world.hxx"
#include "pingu_holder.hxx"
-namespace Pingus {
ServerEvent::ServerEvent() :
type(PINGU_ACTION_EVENT),
@@ -120,6 +119,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/server_event.hxx
===================================================================
--- branches/pingus_sdl/src/server_event.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/server_event.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "file_reader.hxx"
#include "pingu_enums.hxx"
-namespace Pingus {
class Server;
@@ -67,7 +66,6 @@
static ServerEvent make_pingu_action_event(int t, int id,
Actions::ActionName action);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sexpr_file_reader.cpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_reader.cpp 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sexpr_file_reader.cpp 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -30,8 +30,6 @@
#include "file_reader_impl.hxx"
#include "sexpr_file_reader.hpp"
-namespace Pingus {
-
class SExprFileReaderImpl: public FileReaderImpl
{
public:
@@ -219,6 +217,4 @@
}
-} // namespace Pingus
-
/* EOF */
Modified: branches/pingus_sdl/src/sexpr_file_reader.hpp
===================================================================
--- branches/pingus_sdl/src/sexpr_file_reader.hpp 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sexpr_file_reader.hpp 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,8 +29,6 @@
#include "file_reader.hxx"
#include "lisp/lisp.hpp"
-namespace Pingus {
-
/** */
class SExprFileReader : public FileReader
{
@@ -39,8 +37,6 @@
SExprFileReader(lisp::Lisp* lisp);
};
-} // namespace Pingus
-
#endif
/* EOF */
Modified: branches/pingus_sdl/src/smallmap_image.cxx
===================================================================
--- branches/pingus_sdl/src/smallmap_image.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/smallmap_image.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "col_map.hxx"
#include "server.hxx"
-namespace Pingus {
SmallMapImage::SmallMapImage(Server* s, int width, int height)
: server(s),
@@ -221,6 +220,5 @@
sur = CL_Sprite(desc);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/smallmap_image.hxx
===================================================================
--- branches/pingus_sdl/src/smallmap_image.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/smallmap_image.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <ClanLib/Display/sprite.h>
#include "vector.hxx"
-namespace Pingus {
class Server;
@@ -60,7 +59,6 @@
SmallMapImage& operator= (const SmallMapImage&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/slot_manager.cxx
===================================================================
--- branches/pingus_sdl/src/sound/slot_manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/slot_manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -19,7 +19,6 @@
#include "slot_manager.hxx"
-namespace Pingus {
namespace Sound {
SlotEntry&
@@ -50,6 +49,5 @@
}
} // namespace Sound
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/sound/slot_manager.hxx
===================================================================
--- branches/pingus_sdl/src/sound/slot_manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/slot_manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include <ClanLib/sound.h>
-namespace Pingus {
namespace Sound {
struct SlotEntry
@@ -65,7 +64,6 @@
};
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sound.cxx
===================================================================
--- branches/pingus_sdl/src/sound/sound.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/sound/sound.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "sound_dummy.hxx"
#include "sound.hxx"
-namespace Pingus {
namespace Sound {
PingusSoundImpl * PingusSound::sound;
@@ -126,7 +125,6 @@
}
} // namespace Sound
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/sound/sound.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sound.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/sound/sound.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "sounds.hxx"
#include "sound_impl.hxx"
-namespace Pingus {
namespace Sound {
class PingusSoundImpl;
@@ -59,7 +58,6 @@
};
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sound_dummy.cxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_dummy.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_dummy.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include "../debug.hxx"
#include "sound_dummy.hxx"
-namespace Pingus {
namespace Sound {
void
@@ -43,7 +42,6 @@
}
} // namespace Sound
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/sound/sound_dummy.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_dummy.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_dummy.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "sound_impl.hxx"
#include "sound.hxx"
-namespace Pingus {
namespace Sound {
class PingusSoundDummy : public PingusSoundImpl
@@ -41,7 +40,6 @@
};
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sound_impl.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_impl.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_impl.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Sound {
class PingusSoundImpl
@@ -46,7 +45,7 @@
virtual void real_play_sound(const std::string & filename,
float volume, float panning) = 0;
}; // class PingusSoundImpl
+
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sound_real.cxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_real.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_real.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "sound_res_mgr.hxx"
#include "sound_real.hxx"
-namespace Pingus {
namespace Sound {
PingusSoundReal::PingusSoundReal ()
@@ -153,7 +152,6 @@
}
} // namespace Sound
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/sound/sound_real.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_real.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_real.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
class CL_SoundBuffer;
class CL_SoundBuffer_Session;
-namespace Pingus {
namespace Sound {
/** A simple wrapper class around SDL_Mixer, it will init itself
@@ -68,7 +67,6 @@
};
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sound_res_mgr.cxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_res_mgr.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_res_mgr.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../debug.hxx"
#include "sound_res_mgr.hxx"
-namespace Pingus {
SoundResMgr::SoundMap SoundResMgr::sound_map;
@@ -61,6 +60,5 @@
#endif
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/sound/sound_res_mgr.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sound_res_mgr.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/sound/sound_res_mgr.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
typedef CL_SoundBuffer* SoundHandle;
-namespace Pingus {
/** */
class SoundResMgr
@@ -43,7 +42,6 @@
SoundResMgr& operator= (const SoundResMgr&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/sound/sounds.hxx
===================================================================
--- branches/pingus_sdl/src/sound/sounds.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/sound/sounds.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../pingus.hxx"
-namespace Pingus {
namespace Sound {
enum Name {
@@ -34,7 +33,6 @@
};
} // namespace Sound
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/start_screen.cxx
===================================================================
--- branches/pingus_sdl/src/start_screen.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/start_screen.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -37,7 +37,6 @@
#include "pingus_level.hxx"
#include "string_format.hxx"
-namespace Pingus {
class StartScreenComponent : public GUI::Component
{
@@ -242,6 +241,5 @@
ScreenManager::instance()->pop_screen();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/start_screen.hxx
===================================================================
--- branches/pingus_sdl/src/start_screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/start_screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "pingus_level.hxx"
#include "gui/gui_screen.hxx"
-namespace Pingus {
/** */
class StartScreen : public GUIScreen
@@ -48,7 +47,6 @@
StartScreen& operator= (const StartScreen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/stat_manager.cxx
===================================================================
--- branches/pingus_sdl/src/stat_manager.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/stat_manager.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -26,7 +26,6 @@
#include "xml_file_reader.hxx"
#include "stat_manager.hxx"
-namespace Pingus {
StatManager* StatManager::instance_ = 0;
@@ -186,6 +185,5 @@
flush();
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/stat_manager.hxx
===================================================================
--- branches/pingus_sdl/src/stat_manager.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/stat_manager.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <map>
#include <string>
-namespace Pingus {
/** */
class StatManager
@@ -66,7 +65,6 @@
StatManager& operator= (const StatManager&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/state_sprite.cxx
===================================================================
--- branches/pingus_sdl/src/state_sprite.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/state_sprite.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -21,7 +21,6 @@
#include "pingus_error.hxx"
#include "state_sprite.hxx"
-namespace Pingus {
StateSprite::StateSprite()
{
@@ -66,6 +65,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/state_sprite.hxx
===================================================================
--- branches/pingus_sdl/src/state_sprite.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/state_sprite.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <map>
#include <ClanLib/Display/sprite.h>
-namespace Pingus {
/** Simple Wrapper class around CL_Sprite that allows to have multiple
sprites for different states (running, walking, left, right) */
@@ -44,7 +43,6 @@
CL_Sprite& operator[](int state);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/story_screen.cxx
===================================================================
--- branches/pingus_sdl/src/story_screen.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/story_screen.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -38,7 +38,6 @@
#include "credits.hxx"
#include "sound/sound.hxx"
-namespace Pingus {
class StoryScreenComponent : public GUI::Component
{
@@ -213,7 +212,6 @@
}
}
-} // namespace Pingus
// Local Variables: ***
// coding:iso-latin-1
Modified: branches/pingus_sdl/src/story_screen.hxx
===================================================================
--- branches/pingus_sdl/src/story_screen.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/story_screen.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,11 +25,10 @@
#include "gui/gui_screen.hxx"
#include "worldmap/worldmap_story.hxx"
-namespace Pingus {
class StoryScreenComponent;
-using namespace Pingus::WorldMapNS;
+using namespace WorldMapNS;
/** */
class StoryScreen : public GUIScreen
@@ -48,7 +47,6 @@
StoryScreen& operator= (const StoryScreen&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/string_format.cxx
===================================================================
--- branches/pingus_sdl/src/string_format.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/string_format.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include <ClanLib/Display/font.h>
#include "string_format.hxx"
-namespace Pingus {
std::string
StringFormat::break_line (std::string text, int length, const CL_Font& font)
@@ -86,6 +85,5 @@
return text;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/string_format.hxx
===================================================================
--- branches/pingus_sdl/src/string_format.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/string_format.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
class CL_Font;
-namespace Pingus {
class StringFormat {
@@ -32,7 +31,6 @@
static std::string break_line (std::string text, int length, const CL_Font&
font);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/system.cxx
===================================================================
--- branches/pingus_sdl/src/system.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/system.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -42,7 +42,6 @@
#include "system.hxx"
#include "gettext.h"
-namespace Pingus {
int System::verbose;
std::string System::default_email;
@@ -477,6 +476,5 @@
#endif
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/system.hxx
===================================================================
--- branches/pingus_sdl/src/system.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/system.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
#include <list>
#include <map>
-namespace Pingus {
/** A wrapper class around some system dependend functions (mostly
POSIX stuff) */
@@ -132,7 +131,6 @@
System& operator= (const System&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/target_provider.cxx
===================================================================
--- branches/pingus_sdl/src/target_provider.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/target_provider.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include <ClanLib/Display/pixel_buffer.h>
#include "target_provider.hxx"
-namespace Pingus {
CL_Canvas*
TargetProvider::create_canvas (CL_Target* target)
@@ -40,6 +39,5 @@
return canvas;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/target_provider.hxx
===================================================================
--- branches/pingus_sdl/src/target_provider.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/target_provider.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -27,7 +27,6 @@
class CL_Palette;
class CL_Canvas;
-namespace Pingus {
class TargetProvider : public CL_PixelBuffer
{
@@ -62,7 +61,6 @@
TargetProvider& operator= (const TargetProvider&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/theme.cxx
===================================================================
--- branches/pingus_sdl/src/theme.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/theme.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -36,7 +36,6 @@
#include "fonts.hxx"
#include "gui/screen_manager.hxx"
-namespace Pingus {
Theme::Theme (const std::string& filename_)
: font(Fonts::pingus_small),
@@ -350,6 +349,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/theme.hxx
===================================================================
--- branches/pingus_sdl/src/theme.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/theme.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
class CL_Font;
-namespace Pingus {
class Theme
{
@@ -88,7 +87,6 @@
Theme& operator= (const Theme&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/theme_selector.cxx
===================================================================
--- branches/pingus_sdl/src/theme_selector.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/theme_selector.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -38,7 +38,6 @@
#include "fonts.hxx"
#include "theme.hxx"
-namespace Pingus {
ListBox::ListBox ()
{
@@ -371,6 +370,5 @@
return (*current_theme)->mark_level_at_point(x, y);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/theme_selector.hxx
===================================================================
--- branches/pingus_sdl/src/theme_selector.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/theme_selector.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -28,7 +28,6 @@
class Font;
class CL_InputDevice;
-namespace Pingus {
class Theme;
class AlphaButton;
@@ -139,7 +138,6 @@
ThemeSelector& operator= (const ThemeSelector&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/timer.cxx
===================================================================
--- branches/pingus_sdl/src/timer.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/timer.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "globals.hxx"
#include "timer.hxx"
-namespace Pingus {
Timer::Timer(const char* desc)
: description(desc),
@@ -39,6 +38,5 @@
<< time << "msec" << std::endl;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/timer.hxx
===================================================================
--- branches/pingus_sdl/src/timer.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/timer.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "pingus.hxx"
-namespace Pingus {
/** A simple class for benchmark purpose. It lets you start and stop a
timer and recieve the time passed.*/
@@ -45,7 +44,6 @@
Timer& operator= (const Timer&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/true_server.cxx
===================================================================
--- branches/pingus_sdl/src/true_server.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/true_server.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -20,7 +20,6 @@
#include "goal_manager.hxx"
#include "true_server.hxx"
-namespace Pingus {
TrueServer::TrueServer(const PingusLevel& arg_plf)
: Server(arg_plf)
@@ -83,6 +82,5 @@
set_pause(false);
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/true_server.hxx
===================================================================
--- branches/pingus_sdl/src/true_server.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/true_server.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "pingus_level.hxx"
#include "server.hxx"
-namespace Pingus {
/** FIXME: This whole Server/Client concept is screwed and the
TrueServer/Server thing even more... */
@@ -54,7 +53,6 @@
TrueServer& operator= (const TrueServer&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/world.cxx
===================================================================
--- branches/pingus_sdl/src/world.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/world.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -35,7 +35,6 @@
#include "worldobj_factory.hxx"
#include "game_time.hxx"
-namespace Pingus {
using Actions::Bomber;
@@ -273,6 +272,5 @@
return gravitational_acceleration;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/world.hxx
===================================================================
--- branches/pingus_sdl/src/world.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/world.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include <string>
#include <ClanLib/Display/color.h>
-namespace Pingus {
// Forward declarations
class Vector;
@@ -170,7 +169,6 @@
World& operator= (const World&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/dot.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/dot.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/dot.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "../file_reader.hxx"
#include "dot.hxx"
-namespace Pingus {
namespace WorldMapNS {
Dot::Dot(FileReader reader)
@@ -35,6 +34,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/dot.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/dot.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/dot.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include "drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** A Dot is a node between all the pathes on the worldmap, there are
@@ -54,7 +53,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/dot_factory.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/dot_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/dot_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "world_dot.hxx"
#include "dot_factory.hxx"
-namespace Pingus {
namespace WorldMapNS {
Dot*
@@ -45,6 +44,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/dot_factory.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/dot_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/dot_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -20,7 +20,6 @@
#ifndef HEADER_PINGUS_DOT_FACTORY_HXX
#define HEADER_PINGUS_DOT_FACTORY_HXX
-namespace Pingus {
namespace WorldMapNS {
class Dot;
@@ -38,7 +37,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/drawable.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/drawable.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/drawable.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -19,7 +19,5 @@
#include "drawable.hxx"
-namespace Pingus {
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/drawable.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/drawable.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/drawable.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../pingus_error.hxx"
#include "../file_reader.hxx"
-namespace Pingus {
class DrawingContext;
@@ -72,7 +71,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/drawable_factory.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/drawable_factory.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/drawable_factory.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "sprite_drawable.hxx"
#include "drawable_factory.hxx"
-namespace Pingus {
namespace WorldMapNS {
Drawable*
@@ -40,6 +39,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/drawable_factory.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/drawable_factory.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/drawable_factory.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** */
@@ -38,7 +37,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/graph.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/graph.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/graph.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -19,13 +19,11 @@
#include "graph.hxx"
-namespace Pingus {
namespace WorldMapNS {
const NodeId NoNode = -1;
const EdgeId NoEdge = -1;
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/graph.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/graph.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/graph.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <iostream>
#include <vector>
-namespace Pingus {
namespace WorldMapNS {
typedef int NodeId;
@@ -180,7 +179,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/level_dot.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/level_dot.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -36,7 +36,6 @@
#include "../file_reader.hxx"
#include "level_dot.hxx"
-namespace Pingus {
namespace WorldMapNS {
LevelDot::LevelDot(FileReader reader)
@@ -186,6 +185,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/level_dot.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/level_dot.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/level_dot.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../pingus_level.hxx"
#include "dot.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** */
@@ -60,7 +59,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/manager.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/manager.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/manager.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -33,7 +33,6 @@
#include "manager.hxx"
#include "../story_screen.hxx"
-namespace Pingus {
namespace WorldMapNS {
WorldMapManager* WorldMapManager::instance_ = 0;
@@ -353,6 +352,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/manager.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/manager.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/manager.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
class CL_Key;
class GameDelta;
-namespace Pingus {
namespace WorldMapNS {
typedef int NodeId;
@@ -119,7 +118,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/metamap.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/metamap.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/metamap.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
#include "../stat_manager.hxx"
#include "../xml_file_reader.hxx"
-namespace Pingus {
namespace WorldMapNS {
// Constructor
Modified: branches/pingus_sdl/src/worldmap/metamap.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/metamap.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/metamap.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include <string>
-namespace Pingus {
class FileReader;
Modified: branches/pingus_sdl/src/worldmap/path.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/path.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include <assert.h>
#include "path.hxx"
-namespace Pingus {
namespace WorldMapNS {
Path::Path()
@@ -108,6 +107,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/path.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/path.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include <vector>
#include "../vector.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** a wrapper class around std::vector<Vector>, which can calculate
@@ -87,7 +86,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/path_drawable.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path_drawable.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/path_drawable.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include "../display/drawing_context.hxx"
#include "path_drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
PathDrawable::PathDrawable (const Path& arg_path)
@@ -50,6 +49,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/path_drawable.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path_drawable.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/path_drawable.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "drawable.hxx"
#include "path_graph.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** Drawable to show the path between two nodes, only used for
@@ -44,7 +43,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/path_graph.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path_graph.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/path_graph.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -30,7 +30,6 @@
#include "path_drawable.hxx"
#include "../globals.hxx"
-namespace Pingus {
namespace WorldMapNS {
PathGraph::PathGraph(WorldMap* arg_worldmap, FileReader &reader)
@@ -283,6 +282,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/path_graph.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/path_graph.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/path_graph.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "pathfinder.hxx"
#include "graph.hxx"
-namespace Pingus {
namespace WorldMapNS {
class Dot;
@@ -96,7 +95,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/pathfinder.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/pathfinder.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/pathfinder.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <queue>
#include "graph.hxx"
-namespace Pingus {
namespace WorldMapNS {
struct PathfinderResult
@@ -180,7 +179,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/pingus.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/pingus.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/pingus.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -27,7 +27,6 @@
#include "../resource.hxx"
#include "pingus.hxx"
-namespace Pingus {
namespace WorldMapNS {
Pingus::Pingus (PathGraph* arg_path)
@@ -258,6 +257,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/pingus.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/pingus.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldmap/pingus.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include "drawable.hxx"
#include "path_graph.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** This is the representation of the horde of Pingus which will walk
@@ -126,7 +125,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/sprite_drawable.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/sprite_drawable.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/sprite_drawable.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -20,7 +20,6 @@
#include "../display/drawing_context.hxx"
#include "sprite_drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
SpriteDrawable::SpriteDrawable(FileReader reader)
@@ -41,6 +40,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/sprite_drawable.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/sprite_drawable.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/sprite_drawable.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include "drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** */
@@ -51,7 +50,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/surface_drawable.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/surface_drawable.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/surface_drawable.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -26,7 +26,6 @@
#include "pingus.hxx"
#include "surface_drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
SurfaceDrawable::SurfaceDrawable(FileReader reader)
@@ -76,6 +75,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/surface_drawable.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/surface_drawable.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldmap/surface_drawable.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include "drawable.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** */
@@ -49,7 +48,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/world_dot.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/world_dot.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/world_dot.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -21,7 +21,6 @@
#include "../stat_manager.hxx"
#include "../file_reader.hxx"
-namespace Pingus {
namespace WorldMapNS {
WorldDot::WorldDot(FileReader reader) :
Modified: branches/pingus_sdl/src/worldmap/world_dot.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/world_dot.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/world_dot.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "dot.hxx"
-namespace Pingus {
namespace WorldMapNS {
/** Represents a WorldMap dot on a MetaMap */
Modified: branches/pingus_sdl/src/worldmap/worldmap.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/worldmap.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -51,7 +51,6 @@
#include "../story_screen.hxx"
#include "../gui/screen_manager.hxx"
-namespace Pingus {
namespace WorldMapNS {
WorldMap::WorldMap(const std::string& arg_filename)
@@ -442,6 +441,5 @@
}
} // namespace WorldMapNS
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldmap/worldmap.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/worldmap.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,7 +29,6 @@
class CL_Font;
class CL_InputDevice;
-namespace Pingus {
class DrawingContext;
@@ -155,7 +154,6 @@
};
} // namespace WorldMapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldmap/worldmap_story.cxx
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap_story.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/worldmap_story.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
#include "../fonts.hxx"
#include "../gettext.h"
-namespace Pingus {
namespace WorldMapNS {
bool StoryPageCompare(const StoryPage& a, const StoryPage& b)
Modified: branches/pingus_sdl/src/worldmap/worldmap_story.hxx
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap_story.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldmap/worldmap_story.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include <string>
#include "../res_descriptor.hxx"
-namespace Pingus {
class FileReader;
@@ -64,7 +63,6 @@
}; // class WorldMapStory
} // namespace WorldmapNS
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobj.cxx
===================================================================
--- branches/pingus_sdl/src/worldobj.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobj.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "worldobj.hxx"
#include "display/scene_context.hxx"
-namespace Pingus {
World* WorldObj::world;
@@ -82,6 +81,5 @@
#endif
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobj.hxx
===================================================================
--- branches/pingus_sdl/src/worldobj.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobj.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "pingus.hxx"
#include "file_reader.hxx"
-namespace Pingus {
class SceneContext;
class SmallMap;
@@ -89,7 +88,6 @@
virtual void update ();
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobj_factory.cxx
===================================================================
--- branches/pingus_sdl/src/worldobj_factory.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobj_factory.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -46,7 +46,6 @@
#include "worldobjs/thunderstorm_background.hxx"
#include "worldobjs/woodthing.hxx"
-namespace Pingus {
using namespace WorldObjs;
@@ -180,6 +179,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobj_factory.hxx
===================================================================
--- branches/pingus_sdl/src/worldobj_factory.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobj_factory.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include <string>
#include "file_reader.hxx"
-namespace Pingus {
class WorldObj;
class WorldObjAbstractFactory;
@@ -57,7 +56,6 @@
WorldObjFactory& operator= (const WorldObjFactory&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/conveyor_belt.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/conveyor_belt.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/conveyor_belt.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../world.hxx"
#include "conveyor_belt.hxx"
-namespace Pingus {
namespace WorldObjs {
ConveyorBelt::ConveyorBelt(const FileReader& reader)
@@ -93,6 +92,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/conveyor_belt.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/conveyor_belt.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/conveyor_belt.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../vector.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class ConveyorBeltData;
@@ -58,7 +57,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/entrance.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/entrance.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/entrance.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -28,7 +28,6 @@
#include "../components/smallmap.hxx"
#include "entrance.hxx"
-namespace Pingus {
namespace WorldObjs {
Entrance::Entrance(const FileReader& reader)
@@ -163,6 +162,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/entrance.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/entrance.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/entrance.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../res_descriptor.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class EntranceData;
@@ -74,7 +73,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/exit.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/exit.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobjs/exit.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -29,7 +29,6 @@
#include "../resource.hxx"
#include "exit.hxx"
-namespace Pingus {
namespace WorldObjs {
Exit::Exit(const FileReader& reader)
@@ -113,6 +112,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/exit.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/exit.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobjs/exit.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../res_descriptor.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class ExitData;
@@ -61,7 +60,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/fake_exit.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/fake_exit.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/fake_exit.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../resource.hxx"
#include "fake_exit.hxx"
-namespace Pingus {
namespace WorldObjs {
FakeExit::FakeExit(const FileReader& reader)
@@ -91,6 +90,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/fake_exit.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/fake_exit.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/fake_exit.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
class Pingu;
@@ -65,7 +64,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/groundpiece.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/groundpiece.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/groundpiece.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../resource.hxx"
#include "groundpiece.hxx"
-namespace Pingus {
namespace WorldObjs {
Groundpiece::Groundpiece(const FileReader& reader)
@@ -58,6 +57,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/groundpiece.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/groundpiece.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/groundpiece.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../worldobj.hxx"
#include "../vector.hxx"
-namespace Pingus {
namespace WorldObjsData {
class GroundpieceData;
@@ -57,7 +56,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/guillotine.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/guillotine.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/guillotine.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../resource.hxx"
#include "guillotine.hxx"
-namespace Pingus {
namespace WorldObjs {
Guillotine::Guillotine(const FileReader& reader)
@@ -101,6 +100,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/guillotine.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/guillotine.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/guillotine.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../direction.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class GuillotineData;
@@ -61,7 +60,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/hammer.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/hammer.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/hammer.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../resource.hxx"
#include "hammer.hxx"
-namespace Pingus {
namespace WorldObjs {
Hammer::Hammer(const FileReader& reader)
@@ -69,6 +68,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/hammer.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/hammer.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/hammer.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class HammerData;
@@ -52,7 +51,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/hotspot.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/hotspot.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/hotspot.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../resource.hxx"
#include "hotspot.hxx"
-namespace Pingus {
namespace WorldObjs {
Hotspot::Hotspot(const FileReader& reader)
@@ -61,6 +60,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/hotspot.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/hotspot.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/hotspot.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class HotspotData;
@@ -52,7 +51,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/ice_block.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/ice_block.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/ice_block.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "../world.hxx"
#include "ice_block.hxx"
-namespace Pingus {
namespace WorldObjs {
IceBlock::IceBlock(const FileReader& reader)
@@ -98,6 +97,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/ice_block.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/ice_block.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/ice_block.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class IceBlockData;
@@ -59,7 +58,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/info_box.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/info_box.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/info_box.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -27,7 +27,6 @@
#include "../resource.hxx"
#include "info_box.hxx"
-namespace Pingus {
namespace WorldObjs {
InfoBox::InfoBox(const FileReader& reader)
@@ -93,6 +92,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/info_box.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/info_box.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/info_box.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class InfoBoxData;
@@ -54,7 +53,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/laser_exit.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/laser_exit.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/laser_exit.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include "../world.hxx"
#include "laser_exit.hxx"
-namespace Pingus {
namespace WorldObjs {
LaserExit::LaserExit(const FileReader& reader)
@@ -81,6 +80,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/laser_exit.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/laser_exit.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/laser_exit.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class LaserExitData;
@@ -57,7 +56,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/liquid.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/liquid.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/liquid.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../world.hxx"
#include "liquid.hxx"
-namespace Pingus {
namespace WorldObjs {
Liquid::Liquid(const FileReader& reader)
@@ -84,6 +83,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/liquid.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/liquid.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/liquid.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../res_descriptor.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class LiquidData;
@@ -61,7 +60,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/rain_generator.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/rain_generator.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/rain_generator.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -25,7 +25,6 @@
#include "../display/scene_context.hxx"
#include "rain_generator.hxx"
-namespace Pingus {
namespace WorldObjs {
RainGenerator::RainGenerator (const FileReader& reader)
@@ -75,6 +74,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/rain_generator.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/rain_generator.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/rain_generator.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjs {
class RainGenerator : public WorldObj
@@ -45,7 +44,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/smasher.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/smasher.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/smasher.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -29,7 +29,6 @@
#include "../world.hxx"
#include "smasher.hxx"
-namespace Pingus {
namespace WorldObjs {
Smasher::Smasher(const FileReader& reader)
@@ -147,6 +146,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/smasher.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/smasher.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/smasher.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SmasherData;
@@ -60,7 +59,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/snow_generator.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/snow_generator.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/snow_generator.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../particles/snow_particle_holder.hxx"
#include "snow_generator.hxx"
-namespace Pingus {
namespace WorldObjs {
SnowGenerator::SnowGenerator(const FileReader& reader)
@@ -72,6 +71,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/snow_generator.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/snow_generator.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/snow_generator.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SnowGeneratorData;
@@ -49,7 +48,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/solid_color_background.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/solid_color_background.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/solid_color_background.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../display/scene_context.hxx"
#include "solid_color_background.hxx"
-namespace Pingus {
namespace WorldObjs {
SolidColorBackground::SolidColorBackground(const FileReader& reader)
@@ -41,6 +40,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/solid_color_background.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/solid_color_background.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/solid_color_background.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SolidColorBackgroundData;
@@ -50,7 +49,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/spike.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/spike.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobjs/spike.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -24,7 +24,6 @@
#include "../resource.hxx"
#include "spike.hxx"
-namespace Pingus {
namespace WorldObjs {
Spike::Spike (const FileReader& reader)
@@ -85,6 +84,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/spike.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/spike.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/worldobjs/spike.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include "../game_counter.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SpikeData;
@@ -57,7 +56,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/starfield_background.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/starfield_background.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/starfield_background.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -21,7 +21,6 @@
#include "starfield_background.hxx"
#include "starfield_background_stars.hxx"
-namespace Pingus {
namespace WorldObjs {
StarfieldBackground::StarfieldBackground(const FileReader& reader)
@@ -72,6 +71,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/starfield_background.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/starfield_background.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/starfield_background.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <vector>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class StarfieldBackgroundData;
@@ -58,8 +57,7 @@
};
} // namespace WorldObjs
-} // namespace Pingus {
-
+} //
#endif
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/starfield_background_stars.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/starfield_background_stars.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/starfield_background_stars.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -22,7 +22,6 @@
#include "../resource.hxx"
#include "starfield_background_stars.hxx"
-namespace Pingus {
namespace WorldObjs {
StarfieldBackgroundStars::StarfieldBackgroundStars (Type type)
@@ -67,6 +66,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus {
-
+} //
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/starfield_background_stars.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/starfield_background_stars.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/starfield_background_stars.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjs {
class StarfieldBackgroundStars
@@ -56,7 +55,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/surface_background.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/surface_background.cxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/surface_background.cxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -28,7 +28,6 @@
#include "../blitter.hxx"
#include "surface_background.hxx"
-namespace Pingus {
namespace WorldObjs {
SurfaceBackground::SurfaceBackground(const FileReader& reader)
@@ -191,6 +190,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/surface_background.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/surface_background.hxx 2007-01-14
17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/surface_background.hxx 2007-01-14
19:30:03 UTC (rev 2648)
@@ -24,7 +24,6 @@
#include "../res_descriptor.hxx"
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SurfaceBackgroundData;
@@ -86,7 +85,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/switch_door.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/switch_door.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/switch_door.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -26,7 +26,6 @@
#include "../resource.hxx"
#include "switch_door.hxx"
-namespace Pingus {
namespace WorldObjs {
SwitchDoor::SwitchDoor(const FileReader& reader)
@@ -121,6 +120,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/switch_door.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/switch_door.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/switch_door.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class SwitchDoorData;
@@ -73,7 +72,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/teleporter.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/teleporter.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/teleporter.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -25,7 +25,6 @@
#include "../resource.hxx"
#include "teleporter.hxx"
-namespace Pingus {
namespace WorldObjs {
Teleporter::Teleporter(const FileReader& reader)
@@ -73,6 +72,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/teleporter.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/teleporter.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/teleporter.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class TeleporterData;
@@ -53,7 +52,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/thunderstorm_background.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/thunderstorm_background.cxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/thunderstorm_background.cxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -21,7 +21,6 @@
#include "../display/scene_context.hxx"
#include "thunderstorm_background.hxx"
-namespace Pingus {
namespace WorldObjs {
ThunderstormBackground:: ThunderstormBackground(const FileReader& reader)
@@ -52,6 +51,5 @@
}
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/thunderstorm_background.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/thunderstorm_background.hxx
2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/worldobjs/thunderstorm_background.hxx
2007-01-14 19:30:03 UTC (rev 2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Display/sprite.h>
#include "../worldobj.hxx"
-namespace Pingus {
namespace WorldObjsData {
class ThunderstormBackgroundData;
@@ -52,7 +51,6 @@
};
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/worldobjs/woodthing.cxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/woodthing.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/woodthing.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -24,7 +24,6 @@
#include "../world.hxx"
#include "woodthing.hxx"
-namespace Pingus {
namespace WorldObjs {
// FIXME: Re-enable this namespace.
// namespace Entrances {
@@ -64,6 +63,5 @@
// } // namespace Entrances
} // namespace WorldObjs
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/worldobjs/woodthing.hxx
===================================================================
--- branches/pingus_sdl/src/worldobjs/woodthing.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/worldobjs/woodthing.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "entrance.hxx"
-namespace Pingus {
namespace WorldObjs {
// FIXME: Re-enable this namespace.
//namespace Entrances {
@@ -45,7 +44,6 @@
//} // namespace Entrances
} // namespace WorldObjs
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/xml_file_reader.cxx
===================================================================
--- branches/pingus_sdl/src/xml_file_reader.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/xml_file_reader.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -30,7 +30,6 @@
#include "resource_modifier.hxx"
#include "xml_file_reader.hxx"
-namespace Pingus {
class XMLFileReaderImpl : public FileReaderImpl
{
@@ -210,6 +209,5 @@
{
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/xml_file_reader.hxx
===================================================================
--- branches/pingus_sdl/src/xml_file_reader.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/xml_file_reader.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -23,7 +23,6 @@
#include <ClanLib/Core/XML/dom_element.h>
#include "file_reader.hxx"
-namespace Pingus {
/** */
class XMLFileReader : public FileReader
@@ -32,7 +31,6 @@
XMLFileReader(CL_DomElement element);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/xml_file_writer.cxx
===================================================================
--- branches/pingus_sdl/src/xml_file_writer.cxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/xml_file_writer.cxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -22,7 +22,6 @@
#include "vector.hxx"
#include "xml_file_writer.hxx"
-namespace Pingus {
XMLFileWriter::XMLFileWriter(std::ostream& out_)
: out(&out_)
@@ -127,5 +126,4 @@
<< "</" << name << ">\n";
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/xml_file_writer.hxx
===================================================================
--- branches/pingus_sdl/src/xml_file_writer.hxx 2007-01-14 17:27:53 UTC (rev
2647)
+++ branches/pingus_sdl/src/xml_file_writer.hxx 2007-01-14 19:30:03 UTC (rev
2648)
@@ -25,7 +25,6 @@
#include <ClanLib/Display/color.h>
#include "file_writer.hxx"
-namespace Pingus {
/** */
class XMLFileWriter : public FileWriter
@@ -62,7 +61,6 @@
XMLFileWriter& operator= (const XMLFileWriter&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/xml_pdf.cxx
===================================================================
--- branches/pingus_sdl/src/xml_pdf.cxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/xml_pdf.cxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
#include "xml_file_reader.hxx"
#include "xml_pdf.hxx"
-namespace Pingus {
XMLPDF::XMLPDF(const std::string& filename)
{
@@ -108,6 +107,5 @@
return events;
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/xml_pdf.hxx
===================================================================
--- branches/pingus_sdl/src/xml_pdf.hxx 2007-01-14 17:27:53 UTC (rev 2647)
+++ branches/pingus_sdl/src/xml_pdf.hxx 2007-01-14 19:30:03 UTC (rev 2648)
@@ -27,7 +27,6 @@
#include "pingus_level.hxx"
#include "server_event.hxx"
-namespace Pingus {
/** XMLPDF stands for Pingus Demo File, it contains all the infos
necesarry to play a pingus demo recording */
@@ -58,7 +57,6 @@
XMLPDF& operator= (const XMLPDF&);
};
-} // namespace Pingus
#endif
Modified: branches/pingus_sdl/src/xml_pingus_level.cxx
===================================================================
--- branches/pingus_sdl/src/xml_pingus_level.cxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/xml_pingus_level.cxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -32,7 +32,6 @@
#include "pingus_level_impl.hxx"
#include "xml_pingus_level.hxx"
-namespace Pingus {
XMLPingusLevel::XMLPingusLevel(const std::string& res_name,
const std::string& filename)
@@ -110,6 +109,5 @@
}
}
-} // namespace Pingus
/* EOF */
Modified: branches/pingus_sdl/src/xml_pingus_level.hxx
===================================================================
--- branches/pingus_sdl/src/xml_pingus_level.hxx 2007-01-14 17:27:53 UTC
(rev 2647)
+++ branches/pingus_sdl/src/xml_pingus_level.hxx 2007-01-14 19:30:03 UTC
(rev 2648)
@@ -22,7 +22,6 @@
#include "pingus_level.hxx"
-namespace Pingus {
/** */
class XMLPingusLevel : public PingusLevel
@@ -33,7 +32,6 @@
const std::string& filename);
};
-} // namespace Pingus
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2648 - in branches/pingus_sdl/src: . actions colliders components display editor gui input input/axes input/buttons input/pointers input/scrollers movers particles sound worldmap worldobjs,
grumbel at BerliOS <=