Split overlay manager
Bug #536606 reported by
Sigra
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| widelands |
Fix Released
|
Low
|
Unassigned | ||
Bug Description
The overlay manager has 2 completely separate uses; node overlays and road overlays. Each of the uses has separate data structures and code. They do not interact at all (there is no dependency between them). So they should not share a type.
Related branches
lp:~widelands-dev/widelands/split_overlay_manager
- SirVer: Needs Resubmitting
-
Diff: 2189 lines (+503/-546)37 files modifiedsrc/editor/CMakeLists.txt (+1/-1)
src/editor/editorinteractive.cc (+5/-11)
src/editor/editorinteractive.h (+0/-1)
src/editor/tools/editor_decrease_resources_tool.cc (+7/-9)
src/editor/tools/editor_increase_resources_tool.cc (+7/-9)
src/editor/tools/editor_set_origin_tool.cc (+0/-1)
src/editor/tools/editor_set_port_space_tool.cc (+0/-1)
src/editor/tools/editor_set_resources_tool.cc (+17/-15)
src/editor/tools/editor_set_resources_tool.h (+3/-1)
src/editor/tools/editor_set_starting_pos_tool.cc (+6/-8)
src/editor/ui_menus/editor_player_menu.cc (+6/-7)
src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+4/-4)
src/editor/ui_menus/editor_tool_menu.cc (+2/-2)
src/game_io/CMakeLists.txt (+0/-1)
src/game_io/game_interactive_player_packet.cc (+0/-1)
src/graphic/CMakeLists.txt (+3/-2)
src/graphic/game_renderer.cc (+34/-50)
src/graphic/game_renderer.h (+3/-1)
src/graphic/rendertarget.cc (+0/-2)
src/logic/CMakeLists.txt (+0/-1)
src/logic/field.h (+0/-6)
src/logic/map.cc (+0/-23)
src/logic/map.h (+0/-8)
src/wui/CMakeLists.txt (+14/-4)
src/wui/buildingwindow.cc (+11/-11)
src/wui/buildingwindow.h (+3/-2)
src/wui/edge_overlay_manager.cc (+65/-0)
src/wui/edge_overlay_manager.h (+65/-0)
src/wui/field_overlay_manager.cc (+78/-175)
src/wui/field_overlay_manager.h (+65/-98)
src/wui/fieldaction.cc (+12/-12)
src/wui/interactive_base.cc (+40/-37)
src/wui/interactive_base.h (+35/-11)
src/wui/interactive_gamebase.cc (+8/-10)
src/wui/interactive_gamebase.h (+3/-0)
src/wui/interactive_player.cc (+6/-18)
src/wui/mapview.cc (+0/-3)
- Widelands Developers: Pending requested
-
Diff: 7897 lines (+1582/-1465)274 files modifiedCMakeLists.txt (+5/-1)
appveyor.yml (+34/-0)
src/ai/ai_help_structs.h (+6/-5)
src/ai/defaultai.cc (+20/-12)
src/ai/defaultai.h (+4/-4)
src/economy/CMakeLists.txt (+2/-0)
src/economy/cmd_call_economy_balance.h (+1/-1)
src/economy/economy.cc (+79/-21)
src/economy/economy.h (+23/-3)
src/economy/economy_data_packet.cc (+1/-1)
src/economy/expedition_bootstrap.cc (+2/-2)
src/economy/expedition_bootstrap.h (+3/-3)
src/economy/flag.cc (+5/-5)
src/economy/flag.h (+1/-1)
src/economy/fleet.cc (+2/-2)
src/economy/fleet.h (+1/-1)
src/economy/idleworkersupply.cc (+10/-5)
src/economy/idleworkersupply.h (+1/-0)
src/economy/portdock.cc (+3/-3)
src/economy/portdock.h (+2/-2)
src/economy/request.cc (+6/-6)
src/economy/request.h (+2/-2)
src/economy/road.cc (+3/-3)
src/economy/road.h (+1/-1)
src/economy/route.h (+1/-1)
src/economy/router.h (+1/-1)
src/economy/routing_node.h (+1/-1)
src/economy/shippingitem.cc (+1/-1)
src/economy/shippingitem.h (+1/-1)
src/economy/supply.h (+9/-1)
src/economy/test/test_road.cc (+1/-1)
src/economy/test/test_routing.cc (+1/-1)
src/economy/transfer.cc (+3/-3)
src/economy/ware_instance.cc (+15/-4)
src/economy/ware_instance.h (+2/-2)
src/economy/warehousesupply.h (+3/-2)
src/economy/wares_queue.cc (+1/-1)
src/economy/wares_queue.h (+1/-1)
src/editor/CMakeLists.txt (+1/-1)
src/editor/editorinteractive.cc (+8/-14)
src/editor/editorinteractive.h (+0/-1)
src/editor/map_generator.cc (+2/-2)
src/editor/map_generator.h (+1/-1)
src/editor/tools/editor_decrease_resources_tool.cc (+9/-11)
src/editor/tools/editor_delete_bob_tool.cc (+1/-1)
src/editor/tools/editor_delete_immovable_tool.cc (+1/-1)
src/editor/tools/editor_increase_resources_tool.cc (+10/-13)
src/editor/tools/editor_info_tool.cc (+3/-3)
src/editor/tools/editor_place_bob_tool.cc (+2/-2)
src/editor/tools/editor_place_immovable_tool.cc (+1/-1)
src/editor/tools/editor_set_origin_tool.cc (+0/-1)
src/editor/tools/editor_set_port_space_tool.cc (+1/-2)
src/editor/tools/editor_set_resources_tool.cc (+27/-32)
src/editor/tools/editor_set_resources_tool.h (+8/-4)
src/editor/tools/editor_set_starting_pos_tool.cc (+6/-8)
src/editor/ui_menus/categorized_item_selection_menu.h (+1/-1)
src/editor/ui_menus/editor_main_menu_new_map.cc (+2/-2)
src/editor/ui_menus/editor_main_menu_random_map.cc (+1/-1)
src/editor/ui_menus/editor_player_menu.cc (+8/-9)
src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+10/-6)
src/editor/ui_menus/editor_tool_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_place_bob_options_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc (+1/-1)
src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc (+3/-3)
src/editor/ui_menus/editor_tool_set_terrain_options_menu.h (+1/-1)
src/game_io/CMakeLists.txt (+0/-1)
src/game_io/game_interactive_player_packet.cc (+1/-2)
src/game_io/game_player_economies_packet.cc (+1/-1)
src/game_io/game_player_info_packet.cc (+1/-1)
src/graphic/CMakeLists.txt (+3/-2)
src/graphic/animation.cc (+2/-2)
src/graphic/game_renderer.cc (+35/-51)
src/graphic/game_renderer.h (+3/-1)
src/graphic/gl/dither_program.h (+1/-1)
src/graphic/gl/fields_to_draw.h (+1/-1)
src/graphic/gl/terrain_program.h (+1/-1)
src/graphic/minimap_renderer.cc (+2/-2)
src/graphic/render_queue.cc (+1/-1)
src/graphic/render_queue.h (+1/-1)
src/graphic/rendertarget.cc (+0/-2)
src/logic/CMakeLists.txt (+88/-92)
src/logic/cmd_incorporate.h (+1/-1)
src/logic/cmd_queue.cc (+2/-2)
src/logic/editor_game_base.cc (+9/-9)
src/logic/editor_game_base.h (+2/-2)
src/logic/field.h (+0/-6)
src/logic/findbob.cc (+1/-1)
src/logic/findimmovable.cc (+3/-3)
src/logic/findimmovable.h (+1/-1)
src/logic/findnode.cc (+1/-2)
src/logic/game.cc (+6/-6)
src/logic/game_data_error.h (+12/-6)
src/logic/game_settings.h (+1/-1)
src/logic/map.cc (+5/-28)
src/logic/map.h (+1/-9)
src/logic/map_objects/attackable.h (+3/-3)
src/logic/map_objects/bob.cc (+6/-6)
src/logic/map_objects/bob.h (+5/-5)
src/logic/map_objects/buildcost.cc (+3/-3)
src/logic/map_objects/buildcost.h (+3/-3)
src/logic/map_objects/checkstep.cc (+1/-1)
src/logic/map_objects/checkstep.h (+3/-3)
src/logic/map_objects/immovable.cc (+6/-6)
src/logic/map_objects/immovable.h (+5/-5)
src/logic/map_objects/immovable_program.h (+5/-5)
src/logic/map_objects/map_object.cc (+1/-1)
src/logic/map_objects/map_object.h (+6/-5)
src/logic/map_objects/terrain_affinity.cc (+2/-2)
src/logic/map_objects/terrain_affinity.h (+3/-3)
src/logic/map_objects/tribes/battle.cc (+2/-2)
src/logic/map_objects/tribes/battle.h (+4/-4)
src/logic/map_objects/tribes/bill_of_materials.h (+3/-3)
src/logic/map_objects/tribes/building.cc (+6/-6)
src/logic/map_objects/tribes/building.h (+8/-9)
src/logic/map_objects/tribes/carrier.cc (+1/-1)
src/logic/map_objects/tribes/carrier.h (+4/-4)
src/logic/map_objects/tribes/constructionsite.cc (+3/-3)
src/logic/map_objects/tribes/constructionsite.h (+4/-4)
src/logic/map_objects/tribes/dismantlesite.cc (+3/-3)
src/logic/map_objects/tribes/dismantlesite.h (+5/-5)
src/logic/map_objects/tribes/militarysite.cc (+5/-5)
src/logic/map_objects/tribes/militarysite.h (+7/-7)
src/logic/map_objects/tribes/partially_finished_building.cc (+3/-3)
src/logic/map_objects/tribes/partially_finished_building.h (+4/-4)
src/logic/map_objects/tribes/production_program.cc (+10/-10)
src/logic/map_objects/tribes/production_program.h (+6/-7)
src/logic/map_objects/tribes/productionsite.cc (+6/-6)
src/logic/map_objects/tribes/productionsite.h (+7/-7)
src/logic/map_objects/tribes/program_result.h (+3/-3)
src/logic/map_objects/tribes/requirements.cc (+2/-2)
src/logic/map_objects/tribes/requirements.h (+4/-4)
src/logic/map_objects/tribes/road_textures.cc (+1/-1)
src/logic/map_objects/tribes/road_textures.h (+3/-3)
src/logic/map_objects/tribes/ship.cc (+4/-4)
src/logic/map_objects/tribes/ship.h (+4/-4)
src/logic/map_objects/tribes/soldier.cc (+8/-8)
src/logic/map_objects/tribes/soldier.h (+5/-5)
src/logic/map_objects/tribes/soldiercontrol.h (+4/-3)
src/logic/map_objects/tribes/training_attribute.h (+3/-3)
src/logic/map_objects/tribes/trainingsite.cc (+5/-5)
src/logic/map_objects/tribes/trainingsite.h (+6/-6)
src/logic/map_objects/tribes/tribe_basic_info.cc (+1/-1)
src/logic/map_objects/tribes/tribe_basic_info.h (+3/-3)
src/logic/map_objects/tribes/tribe_descr.cc (+13/-13)
src/logic/map_objects/tribes/tribe_descr.h (+11/-11)
src/logic/map_objects/tribes/tribes.cc (+1/-1)
src/logic/map_objects/tribes/tribes.h (+17/-17)
src/logic/map_objects/tribes/ware_descr.cc (+2/-2)
src/logic/map_objects/tribes/ware_descr.h (+4/-4)
src/logic/map_objects/tribes/warehouse.cc (+9/-8)
src/logic/map_objects/tribes/warehouse.h (+7/-7)
src/logic/map_objects/tribes/warelist.cc (+1/-1)
src/logic/map_objects/tribes/warelist.h (+3/-3)
src/logic/map_objects/tribes/wareworker.h (+3/-3)
src/logic/map_objects/tribes/workarea_info.h (+3/-3)
src/logic/map_objects/tribes/worker.cc (+13/-13)
src/logic/map_objects/tribes/worker.h (+5/-5)
src/logic/map_objects/tribes/worker_descr.cc (+6/-6)
src/logic/map_objects/tribes/worker_descr.h (+5/-5)
src/logic/map_objects/tribes/worker_program.cc (+1/-1)
src/logic/map_objects/tribes/worker_program.h (+7/-7)
src/logic/map_objects/walkingdir.cc (+1/-1)
src/logic/map_objects/walkingdir.h (+3/-3)
src/logic/map_objects/world/critter.cc (+4/-4)
src/logic/map_objects/world/critter.h (+4/-4)
src/logic/map_objects/world/critter_program.h (+4/-4)
src/logic/map_objects/world/editor_category.cc (+1/-1)
src/logic/map_objects/world/editor_category.h (+3/-3)
src/logic/map_objects/world/map_gen.cc (+2/-2)
src/logic/map_objects/world/map_gen.h (+4/-4)
src/logic/map_objects/world/resource_description.cc (+1/-1)
src/logic/map_objects/world/resource_description.h (+3/-3)
src/logic/map_objects/world/terrain_description.cc (+3/-3)
src/logic/map_objects/world/terrain_description.h (+4/-4)
src/logic/map_objects/world/world.cc (+7/-7)
src/logic/map_objects/world/world.h (+3/-3)
src/logic/mapastar.cc (+1/-1)
src/logic/path.cc (+1/-1)
src/logic/player.cc (+9/-9)
src/logic/player.h (+4/-4)
src/logic/playercommand.cc (+5/-5)
src/logic/playercommand.h (+4/-4)
src/logic/queue_cmd_factory.cc (+1/-1)
src/logic/single_player_game_settings_provider.cc (+1/-1)
src/logic/soldier_counts.h (+0/-31)
src/map_io/map_allowed_building_types_packet.cc (+1/-1)
src/map_io/map_allowed_worker_types_packet.cc (+1/-1)
src/map_io/map_bob_packet.cc (+2/-2)
src/map_io/map_building_packet.cc (+2/-2)
src/map_io/map_buildingdata_packet.cc (+11/-11)
src/map_io/map_flagdata_packet.cc (+2/-2)
src/map_io/map_heights_packet.cc (+1/-1)
src/map_io/map_node_ownership_packet.cc (+1/-1)
src/map_io/map_object_loader.cc (+1/-1)
src/map_io/map_object_loader.h (+1/-1)
src/map_io/map_object_packet.cc (+5/-5)
src/map_io/map_object_packet.h (+1/-1)
src/map_io/map_object_saver.cc (+4/-4)
src/map_io/map_player_names_and_tribes_packet.cc (+1/-1)
src/map_io/map_players_view_packet.cc (+2/-3)
src/map_io/map_resources_packet.cc (+2/-2)
src/map_io/map_roaddata_packet.cc (+2/-2)
src/map_io/map_saver.cc (+16/-12)
src/map_io/map_scripting_packet.cc (+1/-1)
src/map_io/map_terrain_packet.cc (+2/-2)
src/map_io/s2map.cc (+2/-2)
src/map_io/widelands_map_loader.cc (+1/-1)
src/network/netclient.cc (+1/-1)
src/network/nethost.cc (+1/-1)
src/network/network_player_settings_backend.cc (+1/-1)
src/profile/CMakeLists.txt (+0/-1)
src/profile/profile.cc (+1/-3)
src/scripting/lua_bases.cc (+4/-4)
src/scripting/lua_game.cc (+1/-1)
src/scripting/lua_game.h (+1/-1)
src/scripting/lua_map.cc (+10/-10)
src/scripting/lua_map.h (+9/-9)
src/scripting/lua_root.cc (+5/-5)
src/ui_basic/table.h (+6/-6)
src/ui_fsmenu/launch_mpg.cc (+1/-1)
src/ui_fsmenu/launch_spg.cc (+1/-1)
src/wlapplication.cc (+0/-1)
src/wui/CMakeLists.txt (+14/-4)
src/wui/actionconfirm.cc (+2/-2)
src/wui/attack_box.cc (+1/-1)
src/wui/attack_box.h (+3/-3)
src/wui/building_statistics_menu.cc (+3/-3)
src/wui/building_statistics_menu.h (+1/-1)
src/wui/building_ui.cc (+1/-1)
src/wui/buildingwindow.cc (+17/-17)
src/wui/buildingwindow.h (+3/-2)
src/wui/constructionsitewindow.cc (+1/-1)
src/wui/dismantlesitewindow.cc (+1/-1)
src/wui/edge_overlay_manager.cc (+65/-0)
src/wui/edge_overlay_manager.h (+65/-0)
src/wui/encyclopedia_window.cc (+5/-5)
src/wui/encyclopedia_window.h (+2/-2)
src/wui/field_overlay_manager.cc (+78/-174)
src/wui/field_overlay_manager.h (+64/-94)
src/wui/fieldaction.cc (+16/-16)
src/wui/game_debug_ui.cc (+5/-5)
src/wui/game_message_menu.cc (+1/-1)
src/wui/general_statistics_menu.cc (+2/-2)
src/wui/helpwindow.cc (+1/-1)
src/wui/helpwindow.h (+1/-1)
src/wui/interactive_base.cc (+43/-40)
src/wui/interactive_base.h (+35/-11)
src/wui/interactive_gamebase.cc (+9/-11)
src/wui/interactive_gamebase.h (+3/-0)
src/wui/interactive_player.cc (+12/-24)
src/wui/itemwaresdisplay.cc (+1/-1)
src/wui/mapview.cc (+0/-3)
src/wui/militarysitewindow.cc (+1/-1)
src/wui/multiplayersetupgroup.cc (+1/-1)
src/wui/playerdescrgroup.cc (+1/-1)
src/wui/portdockwaresdisplay.cc (+1/-1)
src/wui/productionsitewindow.cc (+5/-5)
src/wui/productionsitewindow.h (+1/-1)
src/wui/shipwindow.cc (+3/-3)
src/wui/soldiercapacitycontrol.cc (+1/-1)
src/wui/soldierlist.cc (+4/-4)
src/wui/stock_menu.cc (+1/-1)
src/wui/trainingsitewindow.cc (+1/-1)
src/wui/transport_ui.cc (+2/-2)
src/wui/ware_statistics_menu.cc (+2/-2)
src/wui/warehousewindow.cc (+1/-1)
src/wui/waresdisplay.cc (+3/-3)
src/wui/waresdisplay.h (+3/-3)
src/wui/waresqueuedisplay.h (+2/-2)
src/wui/watchwindow.cc (+1/-1)
txts/developers.json (+3/-1)
txts/developers.lua (+1/-1)
utils/detect_revision.py (+5/-1)
utils/win32/innosetup/Widelands.iss (+41/-13)
| Changed in widelands: | |
| status: | New → Confirmed |
| importance: | Undecided → Low |
Revision history for this message
| SirVer (sirver) wrote | #1 |
| Changed in widelands: | |
| status: | Confirmed → Incomplete |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #2 |
| Changed in widelands: | |
| status: | Incomplete → Expired |
Revision history for this message
| Hans Joachim Desserud (hjd) wrote | #4 |
| Changed in widelands: | |
| status: | Expired → Confirmed |
| tags: |
added: cleanup removed: cleanups |
| tags: |
added: cleanups removed: cleanup |
Revision history for this message
| SirVer (sirver) wrote | #5 |
| Changed in widelands: | |
| status: | Confirmed → Incomplete |
Revision history for this message
| Launchpad Janitor (janitor) wrote | #6 |
| Changed in widelands: | |
| status: | Incomplete → Expired |
| Changed in widelands: | |
| status: | Expired → Confirmed |
| tags: | removed: lowhangingfruit |
| Changed in widelands: | |
| assignee: | nobody → SirVer (sirver) |
| status: | Confirmed → In Progress |
Revision history for this message
| TiborB (tiborb95) wrote | #7 |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #8 |
Revision history for this message
| SirVer (sirver) wrote | #9 |
Revision history for this message
| SirVer (sirver) wrote | #10 |
| Changed in widelands: | |
| status: | In Progress → Fix Committed |
| milestone: | none → build19-rc1 |
| assignee: | SirVer (sirver) → nobody |
| Changed in widelands: | |
| status: | Fix Committed → Fix Released |
Revision history for this message
| GunChleoc (gunchleoc) wrote | #11 |
To post a comment you must log in.
Setting to incomplete for bug sweeping.