lp:~widelands-dev/widelands/bug-1291904
Created by
GunChleoc
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- SirVer: Approve
- GunChleoc: Needs Resubmitting
- TiborB: Needs Fixing
-
Diff: 6971 lines (+1439/-1899)98 files modifiedscripting/ui.lua (+0/-1)
src/economy/cmd_call_economy_balance.cc (+6/-25)
src/economy/economy_data_packet.cc (+55/-59)
src/economy/fleet.cc (+10/-15)
src/economy/fleet.h (+1/-1)
src/economy/portdock.cc (+22/-26)
src/economy/portdock.h (+1/-1)
src/economy/request.cc (+7/-6)
src/economy/shippingitem.cc (+12/-7)
src/economy/transfer.cc (+12/-7)
src/economy/ware_instance.cc (+26/-24)
src/economy/wares_queue.cc (+9/-10)
src/game_io/game_class_packet.cc (+6/-13)
src/game_io/game_cmd_queue_packet.cc (+6/-18)
src/game_io/game_interactive_player_packet.cc (+6/-8)
src/game_io/game_player_economies_packet.cc (+6/-7)
src/game_io/game_player_info_packet.cc (+12/-30)
src/game_io/game_preload_packet.cc (+10/-15)
src/logic/battle.cc (+10/-12)
src/logic/battle.h (+1/-1)
src/logic/bob.cc (+76/-70)
src/logic/carrier.cc (+13/-7)
src/logic/cmd_calculate_statistics.cc (+7/-6)
src/logic/cmd_incorporate.cc (+8/-6)
src/logic/cmd_incorporate.h (+0/-2)
src/logic/cmd_luacoroutine.cc (+7/-6)
src/logic/cmd_luascript.cc (+7/-6)
src/logic/cmd_queue.cc (+6/-8)
src/logic/critter.cc (+8/-6)
src/logic/expedition_bootstrap.cc (+2/-5)
src/logic/expedition_bootstrap.h (+2/-3)
src/logic/game.cc (+40/-47)
src/logic/game.h (+1/-1)
src/logic/game_data_error.cc (+15/-0)
src/logic/game_data_error.h (+15/-1)
src/logic/immovable.cc (+31/-27)
src/logic/immovable.h (+1/-1)
src/logic/instances.cc (+22/-19)
src/logic/path.cc (+17/-9)
src/logic/player.cc (+65/-136)
src/logic/player.h (+1/-1)
src/logic/playercommand.cc (+213/-180)
src/logic/replay.cc (+12/-17)
src/logic/requirements.cc (+6/-6)
src/logic/ship.cc (+43/-45)
src/logic/ship.h (+1/-1)
src/logic/soldier.cc (+33/-29)
src/logic/worker.cc (+19/-16)
src/map_io/map_allowed_building_types_packet.cc (+6/-6)
src/map_io/map_allowed_worker_types_packet.cc (+10/-10)
src/map_io/map_bob_packet.cc (+12/-11)
src/map_io/map_building_packet.cc (+34/-34)
src/map_io/map_buildingdata_packet.cc (+165/-387)
src/map_io/map_buildingdata_packet.h (+0/-4)
src/map_io/map_elemental_packet.cc (+4/-5)
src/map_io/map_exploration_packet.cc (+6/-21)
src/map_io/map_extradata_packet.cc (+6/-6)
src/map_io/map_flag_packet.cc (+6/-7)
src/map_io/map_flagdata_packet.cc (+10/-60)
src/map_io/map_heights_packet.cc (+6/-7)
src/map_io/map_node_ownership_packet.cc (+6/-7)
src/map_io/map_object_packet.cc (+6/-6)
src/map_io/map_objective_packet.cc (+6/-7)
src/map_io/map_player_names_and_tribes_packet.cc (+7/-7)
src/map_io/map_player_position_packet.cc (+6/-7)
src/map_io/map_players_messages_packet.cc (+9/-8)
src/map_io/map_players_view_packet.cc (+95/-185)
src/map_io/map_port_spaces_packet.cc (+6/-6)
src/map_io/map_port_spaces_packet.h (+0/-5)
src/map_io/map_resources_packet.cc (+52/-49)
src/map_io/map_road_packet.cc (+6/-7)
src/map_io/map_roaddata_packet.cc (+10/-35)
src/map_io/map_scripting_packet.cc (+15/-13)
src/map_io/map_terrain_packet.cc (+4/-4)
src/map_io/map_version_packet.cc (+8/-9)
src/scripting/lua_coroutine.cc (+3/-3)
test/maps/expedition.wmf/elemental (+2/-3)
test/maps/expedition.wmf/extra_data (+1/-1)
test/maps/expedition.wmf/objective (+1/-1)
test/maps/expedition.wmf/player_names (+1/-1)
test/maps/expedition.wmf/player_position (+1/-1)
test/maps/expedition.wmf/port_spaces (+1/-1)
test/maps/expedition.wmf/scripting/init.lua (+7/-0)
test/maps/expedition.wmf/version (+3/-3)
test/maps/lua_persistence.wmf/player_names (+1/-1)
test/maps/lua_testsuite.wmf/elemental (+4/-3)
test/maps/lua_testsuite.wmf/extra_data (+1/-1)
test/maps/lua_testsuite.wmf/player_names (+5/-2)
test/maps/lua_testsuite.wmf/player_position (+1/-1)
test/maps/lua_testsuite.wmf/port_spaces (+1/-1)
test/maps/lua_testsuite.wmf/scripting/cplayer.lua (+7/-7)
test/maps/plain.wmf/elemental (+1/-1)
test/maps/plain.wmf/extra_data (+1/-1)
test/maps/plain.wmf/objective (+1/-1)
test/maps/plain.wmf/player_names (+1/-1)
test/maps/plain.wmf/player_position (+1/-1)
test/maps/plain.wmf/port_spaces (+1/-1)
test/maps/plain.wmf/version (+3/-3)
Related bugs
Bug #1291904: Remove compatibility in game_io and map_io | Low | Fix Released | |
Bug #1426654: Only list compatible .wmf files in the load game dialog | Undecided | Fix Released |
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands