diff -Nru feuerkraft-0.1.0+svn397/debian/changelog feuerkraft-0.1.0+svn402/debian/changelog --- feuerkraft-0.1.0+svn397/debian/changelog 2010-05-12 21:49:34.000000000 +0100 +++ feuerkraft-0.1.0+svn402/debian/changelog 2010-05-14 00:48:04.000000000 +0100 @@ -1,3 +1,9 @@ +feuerkraft (0.1.0+svn402-1) lucid; urgency=low + + * Upgrade to newer upstream + + -- Ingo Ruhnke Fri, 14 May 2010 01:47:48 +0200 + feuerkraft (0.1.0+svn397-1) lucid; urgency=low * Upgraded to newer upstream diff -Nru feuerkraft-0.1.0+svn397/debian/control feuerkraft-0.1.0+svn402/debian/control --- feuerkraft-0.1.0+svn397/debian/control 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/debian/control 2010-05-14 00:46:08.000000000 +0100 @@ -1,5 +1,5 @@ Source: feuerkraft -Section: utils +Section: games Priority: extra Maintainer: Ingo Ruhnke Build-Depends: debhelper (>= 7.0.50~), scons, libclanlib-dev, guile-1.6-dev, swig1.3, pkg-config, diff -Nru feuerkraft-0.1.0+svn397/debian/patches/debian-changes-0.1.0+svn397-1 feuerkraft-0.1.0+svn402/debian/patches/debian-changes-0.1.0+svn397-1 --- feuerkraft-0.1.0+svn397/debian/patches/debian-changes-0.1.0+svn397-1 2010-05-12 21:58:25.000000000 +0100 +++ feuerkraft-0.1.0+svn402/debian/patches/debian-changes-0.1.0+svn397-1 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -Description: Upstream changes introduced in version 0.1.0+svn397-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - feuerkraft (0.1.0+svn397-1) lucid; urgency=low - . - * Upgraded to newer upstream - . - The person named in the Author field signed this changelog entry. -Author: Ingo Ruhnke - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- feuerkraft-0.1.0+svn397.orig/src/SConscript -+++ feuerkraft-0.1.0+svn397/src/SConscript -@@ -1,34 +1,18 @@ - import os - --if True: -- env = Environment(CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], -- CPPPATH=['../external/clanlib/', '..', '.'], -- LIBPATH=['/usr/X11R6/lib/', -- '../external/clanlib/'], -- LIBS=['clanSound', -- 'clanGL', -- 'clanApp', -- 'clanVorbis', -- 'clanMikMod', -- 'clanDisplay', -- 'clanSignals', -- 'clanCore', -- 'X11', 'Xmu', 'GL', 'GLU', 'png', 'jpeg', 'Xxf86vm', 'Xi', -- 'guile']) --else: -- env = Environment(ENV = os.environ, -- CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], -- CPPPATH=["..", "."], -- LIBS=["guile"]) -- -- env.ParseConfig("pkg-config --cflags --libs " + -- "clanCore-0.8 " + -- "clanApp-0.8 " + -- "clanDisplay-0.8 " + -- "clanGL-0.8 " + -- "clanSound-0.8 " + -- "clanMikMod-0.8 " + -- "clanVorbis-0.8") -+env = Environment(ENV = os.environ, -+ CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], -+ CPPPATH=["..", "."], -+ LIBS=["guile"]) -+ -+env.ParseConfig("pkg-config --cflags --libs " + -+ "clanCore-1.0 " + -+ "clanApp-1.0 " + -+ "clanDisplay-1.0 " + -+ "clanGL-1.0 " + -+ "clanSound-1.0 " + -+ "clanMikMod-1.0 " + -+ "clanVorbis-1.0") - - env.Command("scripting/feuerkraft_wrap.cpp", "scripting/feuerkraft.i", - "swig -guile -c++ -o $TARGET $SOURCE") diff -Nru feuerkraft-0.1.0+svn397/debian/patches/series feuerkraft-0.1.0+svn402/debian/patches/series --- feuerkraft-0.1.0+svn397/debian/patches/series 2010-05-12 21:58:25.000000000 +0100 +++ feuerkraft-0.1.0+svn402/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian-changes-0.1.0+svn397-1 diff -Nru feuerkraft-0.1.0+svn397/SConstruct feuerkraft-0.1.0+svn402/SConstruct --- feuerkraft-0.1.0+svn397/SConstruct 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/SConstruct 2010-05-14 00:46:07.000000000 +0100 @@ -1,4 +1,182 @@ -# SConscript("external/clanlib/SConstruct") -SConscript("src/SConscript") +# -*- python -*- + +env = Environment(CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], + CPPPATH=["-Isrc/"], + LIBS=["guile"]) + +env.ParseConfig("pkg-config --cflags --libs " + + "clanCore-1.0 " + + "clanApp-1.0 " + + "clanDisplay-1.0 " + + "clanGL-1.0 " + + "clanSound-1.0 " + + "clanMikMod-1.0 " + + "clanVorbis-1.0 | sed 's/-I/-isystem/'") + +env.Command("src/scripting/feuerkraft_wrap.cpp", "src/scripting/feuerkraft.i", + "swig -guile -c++ -o $TARGET $SOURCE") + +env.Program("feuerkraft", [ + "src/editor/editor.cpp", + + "src/buildings/ammotent.cpp", + "src/buildings/building.cpp", + "src/buildings/building_manager.cpp", + "src/buildings/building_map.cpp", + "src/buildings/building_map_data.cpp", + "src/buildings/building_type_manager.cpp", + "src/buildings/custom_building.cpp", + "src/buildings/fuelstation.cpp", + "src/buildings/headquarter.cpp", + "src/buildings/tower.cpp", + "src/buildings/tower_ai.cpp", + "src/buildings/wall.cpp", + "src/buildings/wall_door.cpp", + + "src/vehicles/tank.cpp", + "src/vehicles/helicopter.cpp", + "src/vehicles/jeep.cpp", + "src/vehicles/turret.cpp", + "src/vehicles/rotor.cpp", + "src/vehicles/vehicle.cpp", + "src/generic/random.cpp", + + + "src/input/axis_button.cpp", + "src/input/axis_factory.cpp", + "src/input/button_axis.cpp", + "src/input/button_factory.cpp", + "src/input/controller.cpp", + "src/input/input_axis_input_device.cpp", + "src/input/input_button_input_device.cpp", + "src/input/input_manager.cpp", + "src/input/input_manager_custom.cpp", + "src/input/input_manager_impl.cpp", + "src/input/input_manager_player.cpp", + "src/input/input_recorder.cpp", + "src/input/multi_button.cpp", + "src/particles/fire_particle.cpp", + "src/particles/fire_emitter.cpp", + "src/particles/rocket_smoke_particle.cpp", + "src/particles/smoke_emitter.cpp", + + "src/scripting/ai_commands.cpp", + "src/scripting/ai_vehicle_commands.cpp", + "src/scripting/building_commands.cpp", + "src/scripting/clanlib_commands.cpp", + "src/scripting/comm_commands.cpp", + "src/scripting/debug_commands.cpp", + "src/scripting/display_commands.cpp", + "src/scripting/effect_commands.cpp", + "src/scripting/feuerkraft_wrap.cpp", + "src/scripting/game_commands.cpp", + "src/scripting/gameobj_commands.cpp", + "src/scripting/input_commands.cpp", + "src/scripting/menu_commands.cpp", + "src/scripting/object_commands.cpp", + "src/scripting/player_commands.cpp", + "src/scripting/script_helper.cpp", + "src/scripting/sequence_commands.cpp", + "src/scripting/sound_commands.cpp", + "src/scripting/trigger_commands.cpp", + "src/scripting/vehicle_commands.cpp", + + "src/sound/sound.cpp", + "src/sound/sound_dummy.cpp", + "src/sound/sound_real.cpp", + "src/sound/sound_res_mgr.cpp", + + "src/groundmap/grid_map.cpp", + "src/groundmap/grid_map_data.cpp", + "src/groundmap/grid_tile.cpp", + "src/groundmap/grid_tile_data.cpp", + "src/groundmap/grid_tile_generator.cpp", + "src/groundmap/ground_map_data.cpp", + "src/groundmap/ground_map_data_factory.cpp", + "src/groundmap/ground_type.cpp", + "src/groundmap/multi_ground_map.cpp", + "src/groundmap/multi_ground_map_data.cpp", + "src/groundmap/sprite_tile.cpp", + "src/groundmap/sprite_tile_data.cpp", + "src/groundmap/tile_data_factory.cpp", + "src/groundmap/tile_map.cpp", + "src/groundmap/tile_map_data.cpp", + + "src/ai_manager.cpp", + "src/ai_vehicle.cpp", + "src/alist.cpp", + "src/ambulance.cpp", + "src/background.cpp", + "src/collision_manager.cpp", + "src/color.cpp", + "src/command_line_arguments.cpp", + "src/communication_dialog.cpp", + "src/controller_def.cpp", + "src/display/drawing_context.cpp", + "src/display/scene_context.cpp", + "src/display_manager.cpp", + "src/energie.cpp", + "src/explosion.cpp", + "src/feuerkraft.cpp", + "src/fonts.cpp", + "src/game_delta.cpp", + "src/game_mission.cpp", + "src/game_obj.cpp", + "src/game_obj_data_factory.cpp", + "src/game_obj_factory.cpp", + "src/game_obj_manager.cpp", + "src/game_session.cpp", + "src/game_session_manager.cpp", + "src/game_world.cpp", + "src/game_world_builder.cpp", + "src/game_world_data.cpp", + "src/globals.cpp", + "src/goal_manager.cpp", + "src/guile.cpp", + "src/help.cpp", + "src/ipc.cpp", + "src/keyboard_manager.cpp", + "src/keys.cpp", + "src/level_map.cpp", + "src/line_segments.cpp", + "src/marker.cpp", + "src/math.cpp", + "src/menu.cpp", + "src/menu_handle_mgr.cpp", + "src/menu_item.cpp", + "src/message_buffer.cpp", + "src/mine.cpp", + "src/output_world_builder.cpp", + "src/path_manager.cpp", + "src/player.cpp", + "src/player_view.cpp", + "src/projectile.cpp", + "src/property.cpp", + "src/property_set.cpp", + "src/radar.cpp", + "src/resource_manager.cpp", + "src/robot_tank.cpp", + "src/rocket.cpp", + "src/satchel_charge.cpp", + "src/scm_functor.cpp", + "src/scm_sequence_hook.cpp", + "src/screen.cpp", + "src/screenshot.cpp", + "src/sequence_manager.cpp", + "src/sexpr_world_reader.cpp", + "src/shockwave.cpp", + "src/soldier.cpp", + "src/soldier_ai.cpp", + "src/start_screen.cpp", + "src/system.cpp", + "src/tree.cpp", + "src/trigger_manager.cpp", + "src/unit.cpp", + "src/vector2d.cpp", + "src/vehicle_ai.cpp", + "src/vehicle_status.cpp", + "src/vehicle_view.cpp", + "src/view.cpp", + ]) # EOF # diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building.cpp feuerkraft-0.1.0+svn402/src/buildings/building.cpp --- feuerkraft-0.1.0+svn397/src/buildings/building.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -20,9 +20,11 @@ #include "../radar.hpp" #include "building.hpp" -Building::Building (const AList& lst) - : x_pos (lst.get_int("x-pos")), - y_pos (lst.get_int("y-pos")) +Building::Building (const AList& lst) : + id(), + properties(), + x_pos (lst.get_int("x-pos")), + y_pos (lst.get_int("y-pos")) { register_properties(); } diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building.hpp feuerkraft-0.1.0+svn402/src/buildings/building.hpp --- feuerkraft-0.1.0+svn397/src/buildings/building.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -89,6 +89,10 @@ false the building will 'disapear' from the collision map */ virtual bool alive () { return true; } + +private: + Building(const Building&); + Building& operator=(const Building&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building_manager.cpp feuerkraft-0.1.0+svn402/src/buildings/building_manager.cpp --- feuerkraft-0.1.0+svn397/src/buildings/building_manager.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building_manager.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -24,7 +24,8 @@ BuildingManager* BuildingManager::current_ = 0; int BuildingManager::next_id = 1; -BuildingManager::BuildingManager() +BuildingManager::BuildingManager() : + buildings() { current_ = this; } diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building_map.cpp feuerkraft-0.1.0+svn402/src/buildings/building_map.cpp --- feuerkraft-0.1.0+svn397/src/buildings/building_map.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building_map.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -28,8 +28,11 @@ #include "wall.hpp" #include "wall_door.hpp" -BuildingMap::BuildingMap(const BuildingMapData& data) - : BuildingMapData (data) +BuildingMap::BuildingMap(const BuildingMapData& data) : + BuildingMapData (data), + buildings(), + building_map() + { for (std::vector::iterator i = buildings_data.begin (); i != buildings_data.end (); diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building_map_data.cpp feuerkraft-0.1.0+svn402/src/buildings/building_map_data.cpp --- feuerkraft-0.1.0+svn397/src/buildings/building_map_data.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building_map_data.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -21,7 +21,10 @@ #include "building_map.hpp" #include "../guile.hpp" -BuildingMapData::BuildingMapData (SCM desc) +BuildingMapData::BuildingMapData (SCM desc) : + buildings_data(), + width(), + height() { //std::cout << "BuildingMapData: parsing: start" << std::endl; diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building_type_manager.cpp feuerkraft-0.1.0+svn402/src/buildings/building_type_manager.cpp --- feuerkraft-0.1.0+svn397/src/buildings/building_type_manager.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building_type_manager.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -28,7 +28,9 @@ BuildingTypeManager* BuildingTypeManager::current_ = 0; -BuildingTypeManager::BuildingTypeManager() +BuildingTypeManager::BuildingTypeManager() : + next_id(), + factories() { next_id = 2; current_ = this; diff -Nru feuerkraft-0.1.0+svn397/src/buildings/building_type_manager.hpp feuerkraft-0.1.0+svn402/src/buildings/building_type_manager.hpp --- feuerkraft-0.1.0+svn397/src/buildings/building_type_manager.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/building_type_manager.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -35,7 +35,7 @@ portability. */ std::string name; - BuildingFactory() {} + BuildingFactory() : id(), name() {} virtual ~BuildingFactory() {} virtual Building* create(const AList& lst) =0; diff -Nru feuerkraft-0.1.0+svn397/src/buildings/custom_building.cpp feuerkraft-0.1.0+svn402/src/buildings/custom_building.cpp --- feuerkraft-0.1.0+svn397/src/buildings/custom_building.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/custom_building.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -20,8 +20,12 @@ #include "../resource_manager.hpp" #include "custom_building.hpp" -CustomBuilding::CustomBuilding(const AList& type, const AList& lst) - : Building(lst) +CustomBuilding::CustomBuilding(const AList& type, const AList& lst) : + Building(lst), + sprite(), + energie(), + width(), + height() { std::string sprite_str = "feuerkraft/nobuilding"; int i_energie = 100; diff -Nru feuerkraft-0.1.0+svn397/src/buildings/custom_building.hpp feuerkraft-0.1.0+svn402/src/buildings/custom_building.hpp --- feuerkraft-0.1.0+svn397/src/buildings/custom_building.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/custom_building.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -38,6 +38,7 @@ int width; int height; + public: CustomBuilding(const AList& type, const AList& lst); virtual ~CustomBuilding() {} diff -Nru feuerkraft-0.1.0+svn397/src/buildings/headquarter.cpp feuerkraft-0.1.0+svn402/src/buildings/headquarter.cpp --- feuerkraft-0.1.0+svn397/src/buildings/headquarter.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/headquarter.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,6 +27,7 @@ headquarter (resources->get_sprite("feuerkraft/headquarter")), headquarter_damaged (resources->get_sprite("feuerkraft/headquarterdamaged")), headquarter_destroyed (resources->get_sprite("feuerkraft/headquarterdestroyed")), + current_sur(), energie (100), destroyed (false) { diff -Nru feuerkraft-0.1.0+svn397/src/buildings/headquarter.hpp feuerkraft-0.1.0+svn402/src/buildings/headquarter.hpp --- feuerkraft-0.1.0+svn397/src/buildings/headquarter.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/headquarter.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -50,6 +50,10 @@ int get_map_height () { return 2; } bool alive (); + +private: + Headquarter(const Headquarter&); + Headquarter& operator=(const Headquarter&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/buildings/tower_ai.cpp feuerkraft-0.1.0+svn402/src/buildings/tower_ai.cpp --- feuerkraft-0.1.0+svn397/src/buildings/tower_ai.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/tower_ai.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -26,6 +26,7 @@ TowerAI::TowerAI(Tower* arg_tower) : tower(arg_tower), + controller(), ai_count(0) { } diff -Nru feuerkraft-0.1.0+svn397/src/buildings/tower_ai.hpp feuerkraft-0.1.0+svn402/src/buildings/tower_ai.hpp --- feuerkraft-0.1.0+svn397/src/buildings/tower_ai.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/tower_ai.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -30,10 +30,15 @@ Tower* tower; Controller controller; float ai_count; + public: TowerAI(Tower* arg_tower); GameObj* get_object(); void update(float delta); + +private: + TowerAI(const TowerAI&); + TowerAI& operator=(const TowerAI&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/buildings/tower.cpp feuerkraft-0.1.0+svn402/src/buildings/tower.cpp --- feuerkraft-0.1.0+svn397/src/buildings/tower.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/tower.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -25,14 +25,17 @@ #include "../explosion.hpp" #include "tower.hpp" -Tower::Tower(const AList& lst) - : Building(lst), - towerbase(resources->get_sprite("feuerkraft/tower/base")), - towerdamaged (resources->get_sprite("feuerkraft/tower/damaged")), - towerdestroyed (resources->get_sprite("feuerkraft/tower/destroyed")), - turret (resources->get_sprite("feuerkraft/tower/turret")), - energie (lst.get_int("start-energie", 100)), - destroyed (false) +Tower::Tower(const AList& lst) : + Building(lst), + towerbase(resources->get_sprite("feuerkraft/tower/base")), + towerdamaged (resources->get_sprite("feuerkraft/tower/damaged")), + towerdestroyed (resources->get_sprite("feuerkraft/tower/destroyed")), + turret (resources->get_sprite("feuerkraft/tower/turret")), + steering(), + orientation(), + energie (lst.get_int("start-energie", 100)), + destroyed (false), + pos() { //int energie; //std::cout << lst.retrieve_int("start-energie", energie) << std::endl; diff -Nru feuerkraft-0.1.0+svn397/src/buildings/wall.cpp feuerkraft-0.1.0+svn402/src/buildings/wall.cpp --- feuerkraft-0.1.0+svn397/src/buildings/wall.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/wall.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,7 +27,8 @@ pos (x_pos * 40 + 20, y_pos * 40 + 20), wall (resources->get_sprite("feuerkraft/wall")), wall_damaged (resources->get_sprite ("feuerkraft/wall_damaged")), - wall_destroyed (resources->get_sprite ("feuerkraft/wall_destroyed")) + wall_destroyed (resources->get_sprite ("feuerkraft/wall_destroyed")), + energie() { energie = lst.get_int("energie", 100); properties->register_int("energie", &energie); diff -Nru feuerkraft-0.1.0+svn397/src/buildings/wall_door.cpp feuerkraft-0.1.0+svn402/src/buildings/wall_door.cpp --- feuerkraft-0.1.0+svn397/src/buildings/wall_door.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/buildings/wall_door.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -22,8 +22,13 @@ #include "../resource_manager.hpp" #include "wall_door.hpp" -WallDoor::WallDoor(const AList& lst) - : Building(lst) +WallDoor::WallDoor(const AList& lst) : + Building(lst), + sprite(), + map_width(), + map_height(), + status(), + pos() { if (lst.get_string("orientation") == "vertical") { diff -Nru feuerkraft-0.1.0+svn397/src/display/drawing_request.hpp feuerkraft-0.1.0+svn402/src/display/drawing_request.hpp --- feuerkraft-0.1.0+svn397/src/display/drawing_request.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/display/drawing_request.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -1,4 +1,4 @@ -// $Id: drawing_request.hpp 388 2009-08-01 17:38:16Z grumbel $ +// $Id: drawing_request.hpp 400 2010-05-13 23:21:23Z grumbel $ // // Pingus - A free Lemmings clone // Copyright (C) 2002 Ingo Ruhnke @@ -31,6 +31,7 @@ CL_Vector pos; public: DrawingRequest(const CL_Vector& pos_) : pos(pos_) {} + virtual ~DrawingRequest() {} virtual void draw(CL_GraphicContext* gc) = 0; diff -Nru feuerkraft-0.1.0+svn397/src/energie.hpp feuerkraft-0.1.0+svn402/src/energie.hpp --- feuerkraft-0.1.0+svn397/src/energie.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/energie.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -39,14 +39,16 @@ void draw (View& view, int x_pos, int y_pos); operator int () { return int(energie); } - void operator--() { + Energie& operator--() { --energie; last_change = CL_System::get_time (); + return *this; } - void operator++() { + Energie& operator++() { ++energie; last_change = CL_System::get_time (); + return *this; } void operator+=(int i) { diff -Nru feuerkraft-0.1.0+svn397/src/feuerkraft.cpp feuerkraft-0.1.0+svn402/src/feuerkraft.cpp --- feuerkraft-0.1.0+svn397/src/feuerkraft.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/feuerkraft.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -54,7 +54,8 @@ Feuerkraft feuerkraft; CommandLineArguments* args; -Feuerkraft::Feuerkraft() +Feuerkraft::Feuerkraft() : + window() { args = 0; } diff -Nru feuerkraft-0.1.0+svn397/src/feuerkraft.hpp feuerkraft-0.1.0+svn402/src/feuerkraft.hpp --- feuerkraft-0.1.0+svn397/src/feuerkraft.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/feuerkraft.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -100,6 +100,10 @@ private: void key_down(const CL_InputEvent& event); + +private: + Feuerkraft(const Feuerkraft&); + Feuerkraft& operator=(const Feuerkraft&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/game_obj_data.hpp feuerkraft-0.1.0+svn402/src/game_obj_data.hpp --- feuerkraft-0.1.0+svn397/src/game_obj_data.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_obj_data.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,6 +27,8 @@ private: public: + virtual ~GameObjData() {} + /** Create the correct GameObj out of an GameObjData object. This is something like a virtual constructor. */ virtual GameObj* create() =0; diff -Nru feuerkraft-0.1.0+svn397/src/game_obj_factory.cpp feuerkraft-0.1.0+svn402/src/game_obj_factory.cpp --- feuerkraft-0.1.0+svn397/src/game_obj_factory.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_obj_factory.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -33,7 +33,8 @@ GameObjFactory* GameObjFactory::instance_ = 0; -GameObjFactory::GameObjFactory() +GameObjFactory::GameObjFactory() : + factories() { // If anything is changed here, make sure to update // data/feuerkraft.scm diff -Nru feuerkraft-0.1.0+svn397/src/game_obj_factory.hpp feuerkraft-0.1.0+svn402/src/game_obj_factory.hpp --- feuerkraft-0.1.0+svn397/src/game_obj_factory.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_obj_factory.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,6 +27,8 @@ class GameObjAbstractFactory { public: + virtual ~GameObjAbstractFactory() {} + virtual GameObj* create(const AList& lst) =0; }; diff -Nru feuerkraft-0.1.0+svn397/src/game_obj.hpp feuerkraft-0.1.0+svn402/src/game_obj.hpp --- feuerkraft-0.1.0+svn397/src/game_obj.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_obj.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -109,6 +109,10 @@ on */ virtual float get_physical_mass () { return 1.0; } virtual float get_physical_size () { return 1.0; } + +private: + GameObj(const GameObj&); + GameObj& operator=(const GameObj&); }; typedef GameObj* GameObjPtr; diff -Nru feuerkraft-0.1.0+svn397/src/game_session.cpp feuerkraft-0.1.0+svn402/src/game_session.cpp --- feuerkraft-0.1.0+svn397/src/game_session.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_session.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -63,11 +63,19 @@ // FIXME: Replace this with a PlayerManager class or something similar Player* player; -GameSession::GameSession(const std::string& arg_filename) - : control_state(UNIT_CONTROL), - filename(arg_filename), - do_quit(false), - do_pause(false) +GameSession::GameSession(const std::string& arg_filename) : + control_state(UNIT_CONTROL), + filename(arg_filename), + do_quit(false), + do_pause(false), + deltas(), + loops(), + frames(), + start_time(), + buildingtypemanager(), + collision_mgr(), + world(), + view() { } diff -Nru feuerkraft-0.1.0+svn397/src/game_world_data.hpp feuerkraft-0.1.0+svn402/src/game_world_data.hpp --- feuerkraft-0.1.0+svn397/src/game_world_data.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_world_data.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -39,7 +39,7 @@ public: explicit GameWorldData (SCM desc); - ~GameWorldData (); + virtual ~GameWorldData (); /** Convert the data from a given data object into an SCM which can be written to a save game file or similar things */ @@ -48,6 +48,10 @@ private: void parse_objects(SCM desc); void parse_scripts(SCM desc); + +private: + GameWorldData(const GameWorldData&); + GameWorldData& operator=(const GameWorldData&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/game_world.hpp feuerkraft-0.1.0+svn402/src/game_world.hpp --- feuerkraft-0.1.0+svn397/src/game_world.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/game_world.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -54,7 +54,7 @@ public: GameWorld (SCM scm); - ~GameWorld (); + virtual ~GameWorld (); float get_time() { return current_time; } @@ -78,6 +78,10 @@ static GameWorld* current_world; public: static GameWorld* current() { return current_world; } + +private: + GameWorld(const GameWorld&); + GameWorld& operator=(const GameWorld&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/keyboard_manager.cpp feuerkraft-0.1.0+svn402/src/keyboard_manager.cpp --- feuerkraft-0.1.0+svn397/src/keyboard_manager.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/keyboard_manager.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -25,7 +25,9 @@ KeyboardManager* KeyboardManager::instance_ = 0; -KeyboardManager::KeyboardManager() +KeyboardManager::KeyboardManager() : + slots(), + callbacks() { slots.push_back(CL_Keyboard::sig_key_down().connect(this, &KeyboardManager::button_down)); slots.push_back(CL_Keyboard::sig_key_up().connect(this, &KeyboardManager::button_up)); diff -Nru feuerkraft-0.1.0+svn397/src/keyboard_manager.hpp feuerkraft-0.1.0+svn402/src/keyboard_manager.hpp --- feuerkraft-0.1.0+svn397/src/keyboard_manager.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/keyboard_manager.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -46,6 +46,8 @@ : key_id(id) {} + virtual ~Callback() {} + virtual void run() =0; }; diff -Nru feuerkraft-0.1.0+svn397/src/particles/explosion_particle.hpp feuerkraft-0.1.0+svn402/src/particles/explosion_particle.hpp --- feuerkraft-0.1.0+svn397/src/particles/explosion_particle.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/particles/explosion_particle.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -35,7 +35,13 @@ bool direction; float angle; public: - ExplosionParticle(const FloatVector2d& arg_pos, const FloatVector2d& arg_vel, float arg_size) + ExplosionParticle(const FloatVector2d& arg_pos, const FloatVector2d& arg_vel, float arg_size) : + size(), + sprite(), + sprite_light(), + max_life_time(), + direction(), + angle() { velocity = arg_vel; pos = arg_pos; diff -Nru feuerkraft-0.1.0+svn397/src/particles/grass_particle.hpp feuerkraft-0.1.0+svn402/src/particles/grass_particle.hpp --- feuerkraft-0.1.0+svn397/src/particles/grass_particle.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/particles/grass_particle.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -31,7 +31,11 @@ float max_life_time; public: - GrassParticle(const FloatVector2d& arg_pos) + GrassParticle(const FloatVector2d& arg_pos) : + sprite(), + size(), + angle(), + max_life_time() { pos = arg_pos; size = 1; diff -Nru feuerkraft-0.1.0+svn397/src/particles/particle.hpp feuerkraft-0.1.0+svn402/src/particles/particle.hpp --- feuerkraft-0.1.0+svn397/src/particles/particle.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/particles/particle.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -33,7 +33,12 @@ float life_time; public: - Particle () {} + Particle () : + pos(), + velocity(), + acceleration(), + life_time() + {} virtual ~Particle () {} virtual void update (float delta) { diff -Nru feuerkraft-0.1.0+svn397/src/particles/sand_particle.hpp feuerkraft-0.1.0+svn402/src/particles/sand_particle.hpp --- feuerkraft-0.1.0+svn397/src/particles/sand_particle.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/particles/sand_particle.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -31,7 +31,11 @@ float angle; float max_life_time; public: - SandParticle(const FloatVector2d& arg_pos) + SandParticle(const FloatVector2d& arg_pos) : + sprite(), + size(), + angle(), + max_life_time() { pos = arg_pos; size = 1; diff -Nru feuerkraft-0.1.0+svn397/src/particles/smoke_particle.hpp feuerkraft-0.1.0+svn402/src/particles/smoke_particle.hpp --- feuerkraft-0.1.0+svn397/src/particles/smoke_particle.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/particles/smoke_particle.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -31,7 +31,11 @@ float angle; float max_life_time; public: - SmokeParticle(const FloatVector2d& arg_pos) + SmokeParticle(const FloatVector2d& arg_pos) : + sprite(), + size(), + angle(), + max_life_time() { pos = arg_pos; size = 1; diff -Nru feuerkraft-0.1.0+svn397/src/player_view.cpp feuerkraft-0.1.0+svn402/src/player_view.cpp --- feuerkraft-0.1.0+svn397/src/player_view.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/player_view.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -19,9 +19,9 @@ #include "player.hpp" #include "player_view.hpp" -PlayerViewUpdater::PlayerViewUpdater(Player* arg_player) - : VehicleViewUpdater(arg_player->get_current_unit()), - player(arg_player) +PlayerViewUpdater::PlayerViewUpdater(Player* arg_player) : + VehicleViewUpdater(arg_player->get_current_unit()), + player(arg_player) { } diff -Nru feuerkraft-0.1.0+svn397/src/player_view.hpp feuerkraft-0.1.0+svn402/src/player_view.hpp --- feuerkraft-0.1.0+svn397/src/player_view.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/player_view.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -28,10 +28,12 @@ { private: Player* player; + public: PlayerViewUpdater(Player* arg_player); void update(float delta, ViewState& state); + private: PlayerViewUpdater (const PlayerViewUpdater&); PlayerViewUpdater& operator= (const PlayerViewUpdater&); diff -Nru feuerkraft-0.1.0+svn397/src/projectile.hpp feuerkraft-0.1.0+svn402/src/projectile.hpp --- feuerkraft-0.1.0+svn397/src/projectile.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/projectile.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -55,6 +55,10 @@ void detonate (); bool is_colliding(FloatVector2d) { return false;} + +private: + Projectile(const Projectile&); + Projectile& operator=(const Projectile&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/radar.hpp feuerkraft-0.1.0+svn402/src/radar.hpp --- feuerkraft-0.1.0+svn397/src/radar.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/radar.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -53,6 +53,10 @@ 3: large vehicle, 4: building) */ void draw_blip(const FloatVector2d& pos, int size, float red = 1.0f, float green = 0.0f, float blue = 0.0f); + +private: + Radar(const Radar&); + Radar& operator=(const Radar&); }; typedef Radar* RadarPtr; diff -Nru feuerkraft-0.1.0+svn397/src/resource_manager.hpp feuerkraft-0.1.0+svn402/src/resource_manager.hpp --- feuerkraft-0.1.0+svn397/src/resource_manager.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/resource_manager.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -41,6 +41,10 @@ CL_Surface get_surface(const std::string& location); CL_Sprite get_sprite(const std::string& location); CL_Font get_font(const std::string& location); + +private: + ResourceManager(const ResourceManager&); + ResourceManager& operator=(const ResourceManager&); }; //extern CL_SpriteProviderStorage* storage; diff -Nru feuerkraft-0.1.0+svn397/src/SConscript feuerkraft-0.1.0+svn402/src/SConscript --- feuerkraft-0.1.0+svn397/src/SConscript 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/SConscript 1970-01-01 01:00:00.000000000 +0100 @@ -1,199 +0,0 @@ -import os - -if True: - env = Environment(CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], - CPPPATH=['../external/clanlib/', '..', '.'], - LIBPATH=['/usr/X11R6/lib/', - '../external/clanlib/'], - LIBS=['clanSound', - 'clanGL', - 'clanApp', - 'clanVorbis', - 'clanMikMod', - 'clanDisplay', - 'clanSignals', - 'clanCore', - 'X11', 'Xmu', 'GL', 'GLU', 'png', 'jpeg', 'Xxf86vm', 'Xi', - 'guile']) -else: - env = Environment(ENV = os.environ, - CXXFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], - CPPPATH=["..", "."], - LIBS=["guile"]) - - env.ParseConfig("pkg-config --cflags --libs " + - "clanCore-0.8 " + - "clanApp-0.8 " + - "clanDisplay-0.8 " + - "clanGL-0.8 " + - "clanSound-0.8 " + - "clanMikMod-0.8 " + - "clanVorbis-0.8") - -env.Command("scripting/feuerkraft_wrap.cpp", "scripting/feuerkraft.i", - "swig -guile -c++ -o $TARGET $SOURCE") - -env.Program("../feuerkraft", [ - "editor/editor.cpp", - - "buildings/ammotent.cpp", - "buildings/building.cpp", - "buildings/building_manager.cpp", - "buildings/building_map.cpp", - "buildings/building_map_data.cpp", - "buildings/building_type_manager.cpp", - "buildings/custom_building.cpp", - "buildings/fuelstation.cpp", - "buildings/headquarter.cpp", - "buildings/tower.cpp", - "buildings/tower_ai.cpp", - "buildings/wall.cpp", - "buildings/wall_door.cpp", - - "vehicles/tank.cpp", - "vehicles/helicopter.cpp", - "vehicles/jeep.cpp", - "vehicles/turret.cpp", - "vehicles/rotor.cpp", - "vehicles/vehicle.cpp", - "generic/random.cpp", - - - "input/axis_button.cpp", - "input/axis_factory.cpp", - "input/button_axis.cpp", - "input/button_factory.cpp", - "input/controller.cpp", - "input/input_axis_input_device.cpp", - "input/input_button_input_device.cpp", - "input/input_manager.cpp", - "input/input_manager_custom.cpp", - "input/input_manager_impl.cpp", - "input/input_manager_player.cpp", - "input/input_recorder.cpp", - "input/multi_button.cpp", - "particles/fire_particle.cpp", - "particles/fire_emitter.cpp", - "particles/rocket_smoke_particle.cpp", - "particles/smoke_emitter.cpp", - - "scripting/ai_commands.cpp", - "scripting/ai_vehicle_commands.cpp", - "scripting/building_commands.cpp", - "scripting/clanlib_commands.cpp", - "scripting/comm_commands.cpp", - "scripting/debug_commands.cpp", - "scripting/display_commands.cpp", - "scripting/effect_commands.cpp", - "scripting/feuerkraft_wrap.cpp", - "scripting/game_commands.cpp", - "scripting/gameobj_commands.cpp", - "scripting/input_commands.cpp", - "scripting/menu_commands.cpp", - "scripting/object_commands.cpp", - "scripting/player_commands.cpp", - "scripting/script_helper.cpp", - "scripting/sequence_commands.cpp", - "scripting/sound_commands.cpp", - "scripting/trigger_commands.cpp", - "scripting/vehicle_commands.cpp", - - "sound/sound.cpp", - "sound/sound_dummy.cpp", - "sound/sound_real.cpp", - "sound/sound_res_mgr.cpp", - - "groundmap/grid_map.cpp", - "groundmap/grid_map_data.cpp", - "groundmap/grid_tile.cpp", - "groundmap/grid_tile_data.cpp", - "groundmap/grid_tile_generator.cpp", - "groundmap/ground_map_data.cpp", - "groundmap/ground_map_data_factory.cpp", - "groundmap/ground_type.cpp", - "groundmap/multi_ground_map.cpp", - "groundmap/multi_ground_map_data.cpp", - "groundmap/sprite_tile.cpp", - "groundmap/sprite_tile_data.cpp", - "groundmap/tile_data_factory.cpp", - "groundmap/tile_map.cpp", - "groundmap/tile_map_data.cpp", - - "ai_manager.cpp", - "ai_vehicle.cpp", - "alist.cpp", - "ambulance.cpp", - "background.cpp", - "collision_manager.cpp", - "color.cpp", - "command_line_arguments.cpp", - "communication_dialog.cpp", - "controller_def.cpp", - "display/drawing_context.cpp", - "display/scene_context.cpp", - "display_manager.cpp", - "energie.cpp", - "explosion.cpp", - "feuerkraft.cpp", - "fonts.cpp", - "game_delta.cpp", - "game_mission.cpp", - "game_obj.cpp", - "game_obj_data_factory.cpp", - "game_obj_factory.cpp", - "game_obj_manager.cpp", - "game_session.cpp", - "game_session_manager.cpp", - "game_world.cpp", - "game_world_builder.cpp", - "game_world_data.cpp", - "globals.cpp", - "goal_manager.cpp", - "guile.cpp", - "help.cpp", - "ipc.cpp", - "keyboard_manager.cpp", - "keys.cpp", - "level_map.cpp", - "line_segments.cpp", - "marker.cpp", - "math.cpp", - "menu.cpp", - "menu_handle_mgr.cpp", - "menu_item.cpp", - "message_buffer.cpp", - "mine.cpp", - "output_world_builder.cpp", - "path_manager.cpp", - "player.cpp", - "player_view.cpp", - "projectile.cpp", - "property.cpp", - "property_set.cpp", - "radar.cpp", - "resource_manager.cpp", - "robot_tank.cpp", - "rocket.cpp", - "satchel_charge.cpp", - "scm_functor.cpp", - "scm_sequence_hook.cpp", - "screen.cpp", - "screenshot.cpp", - "sequence_manager.cpp", - "sexpr_world_reader.cpp", - "shockwave.cpp", - "soldier.cpp", - "soldier_ai.cpp", - "start_screen.cpp", - "system.cpp", - "tree.cpp", - "trigger_manager.cpp", - "unit.cpp", - "vector2d.cpp", - "vehicle_ai.cpp", - "vehicle_status.cpp", - "vehicle_view.cpp", - "view.cpp", - ]) - -# EOF # diff -Nru feuerkraft-0.1.0+svn397/src/sequence_manager.hpp feuerkraft-0.1.0+svn402/src/sequence_manager.hpp --- feuerkraft-0.1.0+svn397/src/sequence_manager.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/sequence_manager.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,7 +27,8 @@ int id; public: SequenceHook(); - + virtual ~SequenceHook() {} + int get_id() const { return id; } void set_id(int arg_id) { id = arg_id; } diff -Nru feuerkraft-0.1.0+svn397/src/soldier_ai.hpp feuerkraft-0.1.0+svn402/src/soldier_ai.hpp --- feuerkraft-0.1.0+svn397/src/soldier_ai.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/soldier_ai.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -43,6 +43,10 @@ void goto_to(const FloatVector2d& target_pos); void stop(); + +private: + SoldierAI(const SoldierAI&); + SoldierAI& operator=(const SoldierAI&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/soldier.cpp feuerkraft-0.1.0+svn402/src/soldier.cpp --- feuerkraft-0.1.0+svn397/src/soldier.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/soldier.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -27,10 +27,12 @@ #include "ai_manager.hpp" #include "soldier.hpp" -Soldier::Soldier(const AList& lst) - : ai(0), - sur(resources->get_sprite("feuerkraft/soldier")), - sur_light(resources->get_sprite("feuerkraft/soldier-light")) +Soldier::Soldier(const AList& lst) : + ai(0), + sur(resources->get_sprite("feuerkraft/soldier")), + sur_light(resources->get_sprite("feuerkraft/soldier-light")), + acceleration(), + steering() { pos.x = lst.get_float("x-pos"); pos.y = lst.get_float("y-pos"); diff -Nru feuerkraft-0.1.0+svn397/src/soldier.hpp feuerkraft-0.1.0+svn402/src/soldier.hpp --- feuerkraft-0.1.0+svn397/src/soldier.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/soldier.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -54,6 +54,10 @@ void attach_ai(); void deattach_ai(); + +private: + Soldier(const Soldier&); + Soldier& operator=(const Soldier&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/sound/sound.hpp feuerkraft-0.1.0+svn402/src/sound/sound.hpp --- feuerkraft-0.1.0+svn397/src/sound/sound.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/sound/sound.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -30,6 +30,7 @@ protected: PingusSound () { } + virtual ~PingusSound () { } virtual void real_play_sound(const std::string & name, float volume, float panning) =0; virtual void real_play_music(const std::string & name, float volume) =0; diff -Nru feuerkraft-0.1.0+svn397/src/sound/sound_real.cpp feuerkraft-0.1.0+svn402/src/sound/sound_real.cpp --- feuerkraft-0.1.0+svn397/src/sound/sound_real.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/sound/sound_real.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -38,7 +38,7 @@ namespace Sound { PingusSoundReal::PingusSoundReal () - : music_sample (0), music_session(0) + : output(), music_sample (0), music_session(0) { std::cout << "Initializing ClanLib-Sound" << std::endl; diff -Nru feuerkraft-0.1.0+svn397/src/unit.cpp feuerkraft-0.1.0+svn402/src/unit.cpp --- feuerkraft-0.1.0+svn397/src/unit.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/unit.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -23,13 +23,16 @@ extern Player* player; -Unit::Unit() +Unit::Unit() : + pos(), + orientation() { pos = FloatVector2d(0,0); orientation = 0; properties->register_float("x-pos", &pos.x); properties->register_float("y-pos", &pos.y); + properties->register_float("orientation", &orientation); } diff -Nru feuerkraft-0.1.0+svn397/src/vehicle_ai.hpp feuerkraft-0.1.0+svn402/src/vehicle_ai.hpp --- feuerkraft-0.1.0+svn397/src/vehicle_ai.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicle_ai.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -33,6 +33,10 @@ VehicleAI(Vehicle* vehicle); virtual ~VehicleAI() {}; GameObj* get_object() { return vehicle; } + +private: + VehicleAI(const VehicleAI&); + VehicleAI& operator=(const VehicleAI&); }; /** class for robot like ai which controlls a vehicle with physic @@ -59,6 +63,10 @@ void drive_to(const FloatVector2d& pos); void update(float delta); + +private: + VehiclePathAI(const VehiclePathAI&); + VehiclePathAI& operator=(const VehiclePathAI&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/vehicles/helicopter.hpp feuerkraft-0.1.0+svn402/src/vehicles/helicopter.hpp --- feuerkraft-0.1.0+svn397/src/vehicles/helicopter.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicles/helicopter.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -69,6 +69,10 @@ void attach_ai(); void dettach_ai(); + +private: + Helicopter(const Helicopter&); + Helicopter& operator=(const Helicopter&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/vehicles/tank.cpp feuerkraft-0.1.0+svn402/src/vehicles/tank.cpp --- feuerkraft-0.1.0+svn397/src/vehicles/tank.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicles/tank.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -42,8 +42,29 @@ const float circle = 6.2831854f; -Tank::Tank(const AList& lst) - : energie(100) +Tank::Tank(const AList& lst) : + tmp_pos(), + speed(), + increment(), + frame(), + burning(), + smod(), + sur_destroyed(), + sur(), + sur_light(), + sur_highlight(), + shadow(), + turret(), + smodpos(), + tmp_angle(), + smod_step(), + mine_reload_time(), + energie(100), + destroyed(), + particle_release(), + destroy_time(), + smoke_emitter(), + ai() { // FIME: This needs cleanup AList def; @@ -101,21 +122,22 @@ } Tank::Tank (const FloatVector2d &arg_pos, - int reloading_speed, std::string tank, std::string str_turret, std::string fire) - : speed (0.0f), - increment (2.0f), - burning(false), - smod (resources->get_sprite (tank.c_str ())), - sur_destroyed (resources->get_sprite ("feuerkraft/tank2destroyed")), - sur (resources->get_sprite (tank.c_str ())), - sur_light(resources->get_sprite("feuerkraft/tank_light")), - sur_highlight(resources->get_sprite("feuerkraft/tank_highlight")), - shadow (resources->get_sprite ("feuerkraft/tank2_shadow")), - turret (NULL), - smod_step (0), - mine_reload_time (0), - energie (100), - destroyed (false) + int reloading_speed, std::string tank, std::string str_turret, std::string fire) : + tmp_pos(), + speed (0.0f), + increment (2.0f), + burning(false), + smod (resources->get_sprite (tank.c_str ())), + sur_destroyed (resources->get_sprite ("feuerkraft/tank2destroyed")), + sur (resources->get_sprite (tank.c_str ())), + sur_light(resources->get_sprite("feuerkraft/tank_light")), + sur_highlight(resources->get_sprite("feuerkraft/tank_highlight")), + shadow (resources->get_sprite ("feuerkraft/tank2_shadow")), + turret (NULL), + smod_step (0), + mine_reload_time (0), + energie (100), + destroyed (false) { ai = 0; velocity = 0.0f; diff -Nru feuerkraft-0.1.0+svn397/src/vehicles/tank.hpp feuerkraft-0.1.0+svn402/src/vehicles/tank.hpp --- feuerkraft-0.1.0+svn397/src/vehicles/tank.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicles/tank.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -127,6 +127,9 @@ void attach_ai(); void dettach_ai(); +private: + Tank(const Tank&); + Tank& operator=(const Tank&); }; #endif // TANK_HH diff -Nru feuerkraft-0.1.0+svn397/src/vehicles/turret.hpp feuerkraft-0.1.0+svn402/src/vehicles/turret.hpp --- feuerkraft-0.1.0+svn397/src/vehicles/turret.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicles/turret.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -51,6 +51,10 @@ void set_absolute_orientation (float orientation); void set_relative_orientation (float orientation); + +private: + Turret(const Turret&); + Turret& operator=(const Turret&); }; #endif // TURRET_HH diff -Nru feuerkraft-0.1.0+svn397/src/vehicle_view.cpp feuerkraft-0.1.0+svn402/src/vehicle_view.cpp --- feuerkraft-0.1.0+svn397/src/vehicle_view.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicle_view.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -19,8 +19,11 @@ #include #include "vehicle_view.hpp" -VehicleViewUpdater::VehicleViewUpdater (Unit* arg_unit) - : unit(arg_unit) +VehicleViewUpdater::VehicleViewUpdater (Unit* arg_unit) : + unit(arg_unit), + pos(), + speed(), + zoom_follower() { pos = unit->get_pos(); speed = 0.1f; @@ -54,7 +57,7 @@ state.x_offset = int(pos.x); state.y_offset = int(pos.y); - + float my_rotation = -(unit->get_orientation()/3.1415927*180.0) + 90; if (state.rotation > my_rotation) diff -Nru feuerkraft-0.1.0+svn397/src/vehicle_view.hpp feuerkraft-0.1.0+svn402/src/vehicle_view.hpp --- feuerkraft-0.1.0+svn397/src/vehicle_view.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/vehicle_view.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -31,12 +31,17 @@ float speed; float zoom_follower; + public: VehicleViewUpdater (Unit* arg_unit); virtual ~VehicleViewUpdater (); virtual void update(float delta, ViewState& state); void set_unit(Unit* arg_unit); + +private: + VehicleViewUpdater(const VehicleViewUpdater&); + VehicleViewUpdater& operator=(const VehicleViewUpdater&); }; #endif diff -Nru feuerkraft-0.1.0+svn397/src/view.cpp feuerkraft-0.1.0+svn402/src/view.cpp --- feuerkraft-0.1.0+svn397/src/view.cpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/view.cpp 2010-05-14 00:46:07.000000000 +0100 @@ -16,7 +16,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include #include #include #include @@ -30,14 +29,14 @@ View::View (int arg_x1, int arg_y1, int arg_x2, int arg_y2, - ViewUpdater* arg_updater) - : x1 (arg_x1), y1 (arg_y1), - x2 (arg_x2), y2 (arg_y2), - view_updater(arg_updater) + ViewUpdater* arg_updater) : + x1 (arg_x1), y1 (arg_y1), + x2 (arg_x2), y2 (arg_y2), + state(), + view_updater(arg_updater), + properties(), + scene_context() { - //std::cout << "View: " << x1 << " " << y1 << " " << x2 << " " << y2 - //<< " " << state.x_offset << " " << state.y_offset << std::endl; - state.x_offset = -x1; state.y_offset = -y1; diff -Nru feuerkraft-0.1.0+svn397/src/view.hpp feuerkraft-0.1.0+svn402/src/view.hpp --- feuerkraft-0.1.0+svn397/src/view.hpp 2010-05-12 21:48:10.000000000 +0100 +++ feuerkraft-0.1.0+svn402/src/view.hpp 2010-05-14 00:46:07.000000000 +0100 @@ -37,11 +37,20 @@ float y_offset; float zoom; float rotation; + + ViewState() : + x_offset(), + y_offset(), + zoom(), + rotation() + {} }; class ViewUpdater { public: + virtual ~ViewUpdater() {} + virtual void update(float delta, ViewState& state) =0; }; @@ -95,6 +104,10 @@ FloatVector2d screen_to_world (const FloatVector2d&); FloatVector2d world_to_screen (const FloatVector2d&); + +private: + View(const View&); + View& operator=(const View&); }; typedef View* ViewPtr;