← Back to branch summary

~widelands-dev/widelands/trunk

~widelands-dev/widelands/trunk

Viewing all changes in revision 7696.

Committer: Wideland's Bunnybot
Date: 2016-01-08 21:22:04 UTC
mfrom: (7649.1.6 logic_directory_layout)
Revision ID: bunnybot@widelands.org-20160108212204-87rzmnzinueslvup

Merged lp:~widelands-dev/widelands/logic_directory_layout:
Created subdirectories in src/logic to make understanding and navigating the code easier.

files added:
src/logic/map_objects

files removed:
src/logic/soldier_counts.h

files renamed:
src/logic/expedition_bootstrap.cc => src/economy/expedition_bootstrap.cc

src/logic/expedition_bootstrap.h => src/economy/expedition_bootstrap.h

src/logic/attackable.h => src/logic/map_objects/attackable.h

src/logic/bob.cc => src/logic/map_objects/bob.cc

src/logic/bob.h => src/logic/map_objects/bob.h

src/logic/buildcost.cc => src/logic/map_objects/buildcost.cc

src/logic/buildcost.h => src/logic/map_objects/buildcost.h

src/logic/checkstep.cc => src/logic/map_objects/checkstep.cc

src/logic/checkstep.h => src/logic/map_objects/checkstep.h

src/logic/immovable.cc => src/logic/map_objects/immovable.cc

src/logic/immovable.h => src/logic/map_objects/immovable.h

src/logic/immovable_program.h => src/logic/map_objects/immovable_program.h

src/logic/instances.cc => src/logic/map_objects/map_object.cc

src/logic/instances.h => src/logic/map_objects/map_object.h

src/logic/terrain_affinity.cc => src/logic/map_objects/terrain_affinity.cc

src/logic/terrain_affinity.h => src/logic/map_objects/terrain_affinity.h

src/logic/tribes/ => src/logic/map_objects/tribes/

src/logic/battle.cc => src/logic/map_objects/tribes/battle.cc

src/logic/battle.h => src/logic/map_objects/tribes/battle.h

src/logic/bill_of_materials.h => src/logic/map_objects/tribes/bill_of_materials.h

src/logic/building.cc => src/logic/map_objects/tribes/building.cc

src/logic/building.h => src/logic/map_objects/tribes/building.h

src/logic/carrier.cc => src/logic/map_objects/tribes/carrier.cc

src/logic/carrier.h => src/logic/map_objects/tribes/carrier.h

src/logic/constructionsite.cc => src/logic/map_objects/tribes/constructionsite.cc

src/logic/constructionsite.h => src/logic/map_objects/tribes/constructionsite.h

src/logic/dismantlesite.cc => src/logic/map_objects/tribes/dismantlesite.cc

src/logic/dismantlesite.h => src/logic/map_objects/tribes/dismantlesite.h

src/logic/militarysite.cc => src/logic/map_objects/tribes/militarysite.cc

src/logic/militarysite.h => src/logic/map_objects/tribes/militarysite.h

src/logic/partially_finished_building.cc => src/logic/map_objects/tribes/partially_finished_building.cc

src/logic/partially_finished_building.h => src/logic/map_objects/tribes/partially_finished_building.h

src/logic/production_program.cc => src/logic/map_objects/tribes/production_program.cc

src/logic/production_program.h => src/logic/map_objects/tribes/production_program.h

src/logic/productionsite.cc => src/logic/map_objects/tribes/productionsite.cc

src/logic/productionsite.h => src/logic/map_objects/tribes/productionsite.h

src/logic/program_result.h => src/logic/map_objects/tribes/program_result.h

src/logic/requirements.cc => src/logic/map_objects/tribes/requirements.cc

src/logic/requirements.h => src/logic/map_objects/tribes/requirements.h

src/logic/road_textures.cc => src/logic/map_objects/tribes/road_textures.cc

src/logic/road_textures.h => src/logic/map_objects/tribes/road_textures.h

src/logic/ship.cc => src/logic/map_objects/tribes/ship.cc

src/logic/ship.h => src/logic/map_objects/tribes/ship.h

src/logic/soldier.cc => src/logic/map_objects/tribes/soldier.cc

src/logic/soldier.h => src/logic/map_objects/tribes/soldier.h

src/logic/soldiercontrol.h => src/logic/map_objects/tribes/soldiercontrol.h

src/logic/training_attribute.h => src/logic/map_objects/tribes/training_attribute.h

src/logic/trainingsite.cc => src/logic/map_objects/tribes/trainingsite.cc

src/logic/trainingsite.h => src/logic/map_objects/tribes/trainingsite.h

src/logic/ware_descr.cc => src/logic/map_objects/tribes/ware_descr.cc

src/logic/ware_descr.h => src/logic/map_objects/tribes/ware_descr.h

src/logic/warehouse.cc => src/logic/map_objects/tribes/warehouse.cc

src/logic/warehouse.h => src/logic/map_objects/tribes/warehouse.h

src/logic/warelist.cc => src/logic/map_objects/tribes/warelist.cc

src/logic/warelist.h => src/logic/map_objects/tribes/warelist.h

src/logic/wareworker.h => src/logic/map_objects/tribes/wareworker.h

src/logic/workarea_info.h => src/logic/map_objects/tribes/workarea_info.h

src/logic/worker.cc => src/logic/map_objects/tribes/worker.cc

src/logic/worker.h => src/logic/map_objects/tribes/worker.h

src/logic/worker_descr.cc => src/logic/map_objects/tribes/worker_descr.cc

src/logic/worker_descr.h => src/logic/map_objects/tribes/worker_descr.h

src/logic/worker_program.cc => src/logic/map_objects/tribes/worker_program.cc

src/logic/worker_program.h => src/logic/map_objects/tribes/worker_program.h

src/logic/walkingdir.cc => src/logic/map_objects/walkingdir.cc

src/logic/walkingdir.h => src/logic/map_objects/walkingdir.h

src/logic/world/ => src/logic/map_objects/world/

src/logic/critter.cc => src/logic/map_objects/world/critter.cc

src/logic/critter.h => src/logic/map_objects/world/critter.h

src/logic/critter_program.h => src/logic/map_objects/world/critter_program.h

files modified:
src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/ai/defaultai.h

src/economy/CMakeLists.txt

src/economy/cmd_call_economy_balance.h

src/economy/economy.cc

src/economy/economy.h

src/economy/economy_data_packet.cc

src/economy/flag.cc

src/economy/flag.h

src/economy/fleet.cc

src/economy/fleet.h

src/economy/idleworkersupply.cc

src/economy/portdock.cc

src/economy/portdock.h

src/economy/request.cc

src/economy/request.h

src/economy/road.cc

src/economy/road.h

src/economy/route.h

src/economy/router.h

src/economy/routing_node.h

src/economy/shippingitem.cc

src/economy/shippingitem.h

src/economy/supply.h

src/economy/test/test_road.cc

src/economy/test/test_routing.cc

src/economy/transfer.cc

src/economy/ware_instance.cc

src/economy/ware_instance.h

src/economy/warehousesupply.h

src/economy/wares_queue.cc

src/economy/wares_queue.h

src/editor/editorinteractive.cc

src/editor/map_generator.cc

src/editor/map_generator.h

src/editor/tools/editor_decrease_resources_tool.cc

src/editor/tools/editor_delete_bob_tool.cc

src/editor/tools/editor_delete_immovable_tool.cc

src/editor/tools/editor_increase_resources_tool.cc

src/editor/tools/editor_info_tool.cc

src/editor/tools/editor_place_bob_tool.cc

src/editor/tools/editor_place_immovable_tool.cc

src/editor/tools/editor_set_port_space_tool.cc

src/editor/tools/editor_set_resources_tool.cc

src/editor/tools/editor_set_starting_pos_tool.cc

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/editor_main_menu_new_map.cc

src/editor/ui_menus/editor_main_menu_random_map.cc

src/editor/ui_menus/editor_player_menu.cc

src/editor/ui_menus/editor_tool_change_resources_options_menu.cc

src/editor/ui_menus/editor_tool_place_bob_options_menu.cc

src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc

src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc

src/editor/ui_menus/editor_tool_set_terrain_options_menu.h

src/game_io/game_interactive_player_packet.cc

src/game_io/game_player_economies_packet.cc

src/game_io/game_player_info_packet.cc

src/graphic/animation.cc

src/graphic/game_renderer.cc

src/graphic/gl/dither_program.h

src/graphic/gl/fields_to_draw.h

src/graphic/gl/terrain_program.h

src/graphic/minimap_renderer.cc

src/graphic/render_queue.h

src/graphic/rendertarget.cc

src/logic/CMakeLists.txt

src/logic/cmd_incorporate.h

src/logic/cmd_queue.cc

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/findbob.cc

src/logic/findimmovable.cc

src/logic/findimmovable.h

src/logic/findnode.cc

src/logic/game.cc

src/logic/game_settings.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/tribes/tribe_basic_info.cc

src/logic/map_objects/tribes/tribe_basic_info.h

src/logic/map_objects/tribes/tribe_descr.cc

src/logic/map_objects/tribes/tribe_descr.h

src/logic/map_objects/tribes/tribes.cc

src/logic/map_objects/tribes/tribes.h

src/logic/map_objects/world/editor_category.cc

src/logic/map_objects/world/editor_category.h

src/logic/map_objects/world/map_gen.cc

src/logic/map_objects/world/map_gen.h

src/logic/map_objects/world/resource_description.cc

src/logic/map_objects/world/resource_description.h

src/logic/map_objects/world/terrain_description.cc

src/logic/map_objects/world/terrain_description.h

src/logic/map_objects/world/world.cc

src/logic/map_objects/world/world.h

src/logic/mapastar.cc

src/logic/path.cc

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/queue_cmd_factory.cc

src/logic/single_player_game_settings_provider.cc

src/map_io/map_allowed_building_types_packet.cc

src/map_io/map_allowed_worker_types_packet.cc

src/map_io/map_bob_packet.cc

src/map_io/map_building_packet.cc

src/map_io/map_buildingdata_packet.cc

src/map_io/map_flagdata_packet.cc

src/map_io/map_heights_packet.cc

src/map_io/map_node_ownership_packet.cc

src/map_io/map_object_loader.cc

src/map_io/map_object_loader.h

src/map_io/map_object_packet.cc

src/map_io/map_object_packet.h

src/map_io/map_object_saver.cc

src/map_io/map_player_names_and_tribes_packet.cc

src/map_io/map_players_view_packet.cc

src/map_io/map_resources_packet.cc

src/map_io/map_roaddata_packet.cc

src/map_io/map_saver.cc

src/map_io/map_scripting_packet.cc

src/map_io/map_terrain_packet.cc

src/map_io/s2map.cc

src/map_io/widelands_map_loader.cc

src/network/netclient.cc

src/network/nethost.cc

src/network/network_player_settings_backend.cc

src/profile/CMakeLists.txt

src/profile/profile.cc

src/scripting/lua_bases.cc

src/scripting/lua_game.cc

src/scripting/lua_game.h

src/scripting/lua_map.cc

src/scripting/lua_map.h

src/scripting/lua_root.cc

src/ui_fsmenu/launch_mpg.cc

src/ui_fsmenu/launch_spg.cc

src/wlapplication.cc

src/wui/actionconfirm.cc

src/wui/attack_box.cc

src/wui/attack_box.h

src/wui/building_statistics_menu.cc

src/wui/building_statistics_menu.h

src/wui/building_ui.cc

src/wui/buildingwindow.cc

src/wui/constructionsitewindow.cc

src/wui/dismantlesitewindow.cc

src/wui/encyclopedia_window.cc

src/wui/encyclopedia_window.h

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/game_message_menu.cc

src/wui/general_statistics_menu.cc

src/wui/helpwindow.cc

src/wui/helpwindow.h

src/wui/interactive_base.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/itemwaresdisplay.cc

src/wui/militarysitewindow.cc

src/wui/multiplayersetupgroup.cc

src/wui/playerdescrgroup.cc

src/wui/portdockwaresdisplay.cc

src/wui/productionsitewindow.cc

src/wui/productionsitewindow.h

src/wui/shipwindow.cc

src/wui/soldiercapacitycontrol.cc

src/wui/soldierlist.cc

src/wui/stock_menu.cc

src/wui/trainingsitewindow.cc

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.h

src/wui/watchwindow.cc

Show diffs side-by-side

added added

removed removed

src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/ai/defaultai.h

src/economy/CMakeLists.txt

src/economy/cmd_call_economy_balance.h

src/economy/economy.cc

src/economy/economy.h

src/economy/economy_data_packet.cc

src/economy/expedition_bootstrap.cc

src/economy/expedition_bootstrap.h

src/economy/flag.cc

src/economy/flag.h

src/economy/fleet.cc

src/economy/fleet.h

src/economy/idleworkersupply.cc

src/economy/portdock.cc

src/economy/portdock.h

src/economy/request.cc

src/economy/request.h

src/economy/road.cc

src/economy/road.h

src/economy/route.h

src/economy/router.h

src/economy/routing_node.h

src/economy/shippingitem.cc

src/economy/shippingitem.h

src/economy/supply.h

src/economy/test/test_road.cc

src/economy/test/test_routing.cc

src/economy/transfer.cc

src/economy/ware_instance.cc

src/economy/ware_instance.h

src/economy/warehousesupply.h

src/economy/wares_queue.cc

src/economy/wares_queue.h

src/editor/editorinteractive.cc

src/editor/map_generator.cc

src/editor/map_generator.h

src/editor/tools/editor_decrease_resources_tool.cc

src/editor/tools/editor_delete_bob_tool.cc

src/editor/tools/editor_delete_immovable_tool.cc

src/editor/tools/editor_increase_resources_tool.cc

src/editor/tools/editor_info_tool.cc

src/editor/tools/editor_place_bob_tool.cc

src/editor/tools/editor_place_immovable_tool.cc

src/editor/tools/editor_set_port_space_tool.cc

src/editor/tools/editor_set_resources_tool.cc

src/editor/tools/editor_set_starting_pos_tool.cc

src/editor/ui_menus/categorized_item_selection_menu.h

src/editor/ui_menus/editor_main_menu_new_map.cc

src/editor/ui_menus/editor_main_menu_random_map.cc

src/editor/ui_menus/editor_player_menu.cc

src/editor/ui_menus/editor_tool_change_resources_options_menu.cc

src/editor/ui_menus/editor_tool_place_bob_options_menu.cc

src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc

src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc

src/editor/ui_menus/editor_tool_set_terrain_options_menu.h

src/game_io/game_interactive_player_packet.cc

src/game_io/game_player_economies_packet.cc

src/game_io/game_player_info_packet.cc

src/graphic/animation.cc

src/graphic/game_renderer.cc

src/graphic/gl/dither_program.h

src/graphic/gl/fields_to_draw.h

src/graphic/gl/terrain_program.h

src/graphic/minimap_renderer.cc

src/graphic/render_queue.h

src/graphic/rendertarget.cc

src/logic/CMakeLists.txt

src/logic/cmd_incorporate.h

src/logic/cmd_queue.cc

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/findbob.cc

src/logic/findimmovable.cc

src/logic/findimmovable.h

src/logic/findnode.cc

src/logic/game.cc

src/logic/game_settings.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/

src/logic/map_objects/attackable.h

src/logic/map_objects/bob.cc

src/logic/map_objects/bob.h

src/logic/map_objects/buildcost.cc

src/logic/map_objects/buildcost.h

src/logic/map_objects/checkstep.cc

src/logic/map_objects/checkstep.h

src/logic/map_objects/immovable.cc

src/logic/map_objects/immovable.h

src/logic/map_objects/immovable_program.h

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/terrain_affinity.cc

src/logic/map_objects/terrain_affinity.h

src/logic/map_objects/tribes/battle.cc

src/logic/map_objects/tribes/battle.h

src/logic/map_objects/tribes/bill_of_materials.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/carrier.cc

src/logic/map_objects/tribes/carrier.h

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/constructionsite.h

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/dismantlesite.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/partially_finished_building.cc

src/logic/map_objects/tribes/partially_finished_building.h

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/production_program.h

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/productionsite.h

src/logic/map_objects/tribes/program_result.h

src/logic/map_objects/tribes/requirements.cc

src/logic/map_objects/tribes/requirements.h

src/logic/map_objects/tribes/road_textures.cc

src/logic/map_objects/tribes/road_textures.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/ship.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/soldiercontrol.h

src/logic/map_objects/tribes/training_attribute.h

src/logic/map_objects/tribes/trainingsite.cc

src/logic/map_objects/tribes/trainingsite.h

src/logic/map_objects/tribes/tribe_basic_info.cc

src/logic/map_objects/tribes/tribe_basic_info.h

src/logic/map_objects/tribes/tribe_descr.cc

src/logic/map_objects/tribes/tribe_descr.h

src/logic/map_objects/tribes/tribes.cc

src/logic/map_objects/tribes/tribes.h

src/logic/map_objects/tribes/ware_descr.cc

src/logic/map_objects/tribes/ware_descr.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/map_objects/tribes/warelist.cc

src/logic/map_objects/tribes/warelist.h

src/logic/map_objects/tribes/wareworker.h

src/logic/map_objects/tribes/workarea_info.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker.h

src/logic/map_objects/tribes/worker_descr.cc

src/logic/map_objects/tribes/worker_descr.h

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/tribes/worker_program.h

src/logic/map_objects/walkingdir.cc

src/logic/map_objects/walkingdir.h

src/logic/map_objects/world/critter.cc

src/logic/map_objects/world/critter.h

src/logic/map_objects/world/critter_program.h

src/logic/map_objects/world/editor_category.cc

src/logic/map_objects/world/editor_category.h

src/logic/map_objects/world/map_gen.cc

src/logic/map_objects/world/map_gen.h

src/logic/map_objects/world/resource_description.cc

src/logic/map_objects/world/resource_description.h

src/logic/map_objects/world/terrain_description.cc

src/logic/map_objects/world/terrain_description.h

src/logic/map_objects/world/world.cc

src/logic/map_objects/world/world.h

src/logic/mapastar.cc

src/logic/path.cc

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/queue_cmd_factory.cc

src/logic/single_player_game_settings_provider.cc

src/logic/soldier_counts.h

src/map_io/map_allowed_building_types_packet.cc

src/map_io/map_allowed_worker_types_packet.cc

src/map_io/map_bob_packet.cc

src/map_io/map_building_packet.cc

src/map_io/map_buildingdata_packet.cc

src/map_io/map_flagdata_packet.cc

src/map_io/map_heights_packet.cc

src/map_io/map_node_ownership_packet.cc

src/map_io/map_object_loader.cc

src/map_io/map_object_loader.h

src/map_io/map_object_packet.cc

src/map_io/map_object_packet.h

src/map_io/map_object_saver.cc

src/map_io/map_player_names_and_tribes_packet.cc

src/map_io/map_players_view_packet.cc

src/map_io/map_resources_packet.cc

src/map_io/map_roaddata_packet.cc

src/map_io/map_saver.cc

src/map_io/map_scripting_packet.cc

src/map_io/map_terrain_packet.cc

src/map_io/s2map.cc

src/map_io/widelands_map_loader.cc

src/network/netclient.cc

src/network/nethost.cc

src/network/network_player_settings_backend.cc

src/profile/CMakeLists.txt

src/profile/profile.cc

src/scripting/lua_bases.cc

src/scripting/lua_game.cc

src/scripting/lua_game.h

src/scripting/lua_map.cc

src/scripting/lua_map.h

src/scripting/lua_root.cc

src/ui_fsmenu/launch_mpg.cc

src/ui_fsmenu/launch_spg.cc

src/wlapplication.cc

src/wui/actionconfirm.cc

src/wui/attack_box.cc

src/wui/attack_box.h

src/wui/building_statistics_menu.cc

src/wui/building_statistics_menu.h

src/wui/building_ui.cc

src/wui/buildingwindow.cc

src/wui/constructionsitewindow.cc

src/wui/dismantlesitewindow.cc

src/wui/encyclopedia_window.cc

src/wui/encyclopedia_window.h

src/wui/fieldaction.cc

src/wui/game_debug_ui.cc

src/wui/game_message_menu.cc

src/wui/general_statistics_menu.cc

src/wui/helpwindow.cc

src/wui/helpwindow.h

src/wui/interactive_base.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/itemwaresdisplay.cc

src/wui/militarysitewindow.cc

src/wui/multiplayersetupgroup.cc

src/wui/playerdescrgroup.cc

src/wui/portdockwaresdisplay.cc

src/wui/productionsitewindow.cc

src/wui/productionsitewindow.h

src/wui/shipwindow.cc

src/wui/soldiercapacitycontrol.cc

src/wui/soldierlist.cc

src/wui/stock_menu.cc

src/wui/trainingsitewindow.cc

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.h

src/wui/watchwindow.cc