← Back to branch summary

~hjd/widelands/packaging-19-repack-6

~hjd/widelands/packaging-19-repack-6

« back to all changes in this revision

Viewing changes to src/logic/map_objects/tribes/battle.h

Committer: Hans Joachim Desserud
Date: 2018-12-17 16:22:54 UTC
mfrom: (8935.1.8 _widelands_dev_widelands_trunk)
Revision ID: hans_joachim_desserud-20181217162254-ebv0i90n9sydok4o

Merged latest master

files modified:
.travis.sh

CMakeLists.txt

appveyor.yml

data/i18n/locales.lua

data/i18n/locales/fr.json

data/i18n/translation_stats.conf

data/txts/translators_data.lua

po/map_the_green_plateau.wmf/map_the_green_plateau.wmf.pot

po/maps/de.po

po/maps/maps.pot

po/maps/pl.po

po/mp_scenario_island_hopping.wmf/mp_scenario_island_hopping.wmf.pot

po/mp_scenario_smugglers.wmf/mp_scenario_smugglers.wmf.pot

po/scenario_atl01.wmf/scenario_atl01.wmf.pot

po/scenario_bar01.wmf/scenario_bar01.wmf.pot

po/scenario_bar02.wmf/scenario_bar02.wmf.pot

po/scenario_dummy.wmf/scenario_dummy.wmf.pot

po/scenario_emp01.wmf/scenario_emp01.wmf.pot

po/scenario_emp02.wmf/pl.po

po/scenario_emp02.wmf/scenario_emp02.wmf.pot

po/scenario_emp03.wmf/scenario_emp03.wmf.pot

po/scenario_emp04.wmf/scenario_emp04.wmf.pot

po/scenario_fri01.wmf/scenario_fri01.wmf.pot

po/scenario_fri02.wmf/scenario_fri02.wmf.pot

po/scenario_tutorial01_basic_control.wmf/scenario_tutorial01_basic_control.wmf.pot

po/scenario_tutorial02_warfare.wmf/scenario_tutorial02_warfare.wmf.pot

po/scenario_tutorial03_seafaring.wmf/scenario_tutorial03_seafaring.wmf.pot

po/scenario_tutorial04_economy.wmf/scenario_tutorial04_economy.wmf.pot

po/texts/nl.po

po/texts/texts.pot

po/tribes/tribes.pot

po/tribes_encyclopedia/ru.po

po/tribes_encyclopedia/tribes_encyclopedia.pot

po/widelands/widelands.pot

po/widelands_console/widelands_console.pot

po/widelands_editor/widelands_editor.pot

po/win_conditions/win_conditions.pot

po/world/nl.po

po/world/world.pot

src/ai/ai_hints.cc

src/ai/defaultai.cc

src/base/i18n.cc

src/base/i18n.h

src/base/log.h

src/base/md5.cc

src/economy/cmd_call_economy_balance.cc

src/economy/cmd_call_economy_balance.h

src/economy/economy.cc

src/economy/economy.h

src/economy/economy_data_packet.cc

src/economy/economy_data_packet.h

src/economy/flag.cc

src/economy/flag.h

src/economy/idleworkersupply.cc

src/economy/idleworkersupply.h

src/economy/input_queue.cc

src/economy/input_queue.h

src/economy/iroute.h

src/economy/itransport_cost_calculator.h

src/economy/request.cc

src/economy/request.h

src/economy/road.h

src/economy/route.cc

src/economy/route.h

src/economy/router.h

src/economy/routing_node.h

src/economy/supply.h

src/economy/supply_list.cc

src/economy/supply_list.h

src/economy/test/test_routing.cc

src/economy/transfer.cc

src/economy/transfer.h

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/economy/workers_queue.cc

src/economy/workers_queue.h

src/editor/editorinteractive.cc

src/editor/map_generator.cc

src/editor/map_generator.h

src/editor/tools/action_args.h

src/editor/tools/decrease_resources_tool.cc

src/editor/tools/delete_critter_tool.cc

src/editor/tools/delete_immovable_tool.cc

src/editor/tools/multi_select.h

src/editor/tools/place_critter_tool.cc

src/editor/tools/place_immovable_tool.cc

src/editor/tools/place_immovable_tool.h

src/editor/tools/set_resources_tool.h

src/editor/ui_menus/main_menu.cc

src/editor/ui_menus/main_menu.h

src/editor/ui_menus/main_menu_load_map.cc

src/editor/ui_menus/main_menu_load_map.h

src/editor/ui_menus/main_menu_load_or_save_map.h

src/editor/ui_menus/main_menu_map_options.cc

src/editor/ui_menus/main_menu_map_options.h

src/editor/ui_menus/main_menu_new_map.h

src/editor/ui_menus/main_menu_random_map.cc

src/editor/ui_menus/main_menu_random_map.h

src/editor/ui_menus/main_menu_save_map.h

src/editor/ui_menus/player_menu.cc

src/editor/ui_menus/tool_change_resources_options_menu.cc

src/editor/ui_menus/tool_menu.cc

src/editor/ui_menus/tool_place_critter_options_menu.cc

src/editor/ui_menus/tool_place_immovable_options_menu.cc

src/editor/ui_menus/tool_place_immovable_options_menu.h

src/editor/ui_menus/tool_set_terrain_options_menu.cc

src/editor/ui_menus/tool_set_terrain_options_menu.h

src/editor/ui_menus/toolsize_menu.cc

src/game_io/game_class_packet.cc

src/game_io/game_class_packet.h

src/game_io/game_cmd_queue_packet.cc

src/game_io/game_cmd_queue_packet.h

src/game_io/game_data_packet.h

src/game_io/game_interactive_player_packet.cc

src/game_io/game_interactive_player_packet.h

src/game_io/game_loader.cc

src/game_io/game_loader.h

src/game_io/game_map_packet.cc

src/game_io/game_map_packet.h

src/game_io/game_player_ai_persistent_packet.h

src/game_io/game_player_economies_packet.cc

src/game_io/game_player_economies_packet.h

src/game_io/game_player_info_packet.cc

src/game_io/game_player_info_packet.h

src/game_io/game_preload_packet.cc

src/game_io/game_preload_packet.h

src/game_io/game_saver.cc

src/game_io/game_saver.h

src/graphic/align.h

src/graphic/animation.h

src/graphic/font_handler.h

src/graphic/game_renderer.h

src/graphic/gl/draw_line_program.cc

src/graphic/gl/fields_to_draw.cc

src/graphic/gl/fill_rect_program.cc

src/graphic/gl/road_program.cc

src/graphic/graphic.cc

src/graphic/rendertarget.h

src/graphic/text/bidi.cc

src/graphic/text/bidi.h

src/graphic/text/font_io.cc

src/graphic/text/font_set.cc

src/graphic/text/rt_errors.h

src/graphic/text/rt_errors_impl.h

src/graphic/text/rt_parse.cc

src/graphic/text/rt_parse.h

src/graphic/text/rt_render.cc

src/graphic/text/rt_render.h

src/graphic/text/textstream.cc

src/graphic/text/textstream.h

src/graphic/text/transient_cache.h

src/graphic/text_layout.cc

src/graphic/text_layout.h

src/graphic/texture.cc

src/graphic/texture.h

src/io/fileread.cc

src/io/filesystem/disk_filesystem.cc

src/io/filesystem/filesystem.cc

src/logic/ai_dna_handler.cc

src/logic/ai_dna_handler.h

src/logic/backtrace.cc

src/logic/cmd_calculate_statistics.cc

src/logic/cmd_calculate_statistics.h

src/logic/cmd_delete_message.cc

src/logic/cmd_delete_message.h

src/logic/cmd_incorporate.cc

src/logic/cmd_incorporate.h

src/logic/cmd_luacoroutine.cc

src/logic/cmd_luacoroutine.h

src/logic/cmd_luascript.cc

src/logic/cmd_luascript.h

src/logic/cmd_queue.cc

src/logic/cmd_queue.h

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/field.cc

src/logic/field.h

src/logic/findnode.cc

src/logic/findnode.h

src/logic/game.cc

src/logic/game.h

src/logic/game_controller.h

src/logic/game_data_error.cc

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/bob.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/tribes/attack_target.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/ship.cc

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_descr.cc

src/logic/map_objects/tribes/tribe_descr.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/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/map_gen.cc

src/logic/map_objects/world/map_gen.h

src/logic/map_revision.cc

src/logic/map_revision.h

src/logic/mapdifferenceregion.cc

src/logic/mapdifferenceregion.h

src/logic/mapfringeregion.cc

src/logic/mapfringeregion.h

src/logic/maphollowregion.cc

src/logic/maphollowregion.h

src/logic/mapregion.h

src/logic/maptriangleregion.cc

src/logic/maptriangleregion.h

src/logic/message.h

src/logic/message_id.h

src/logic/message_queue.h

src/logic/nodecaps.h

src/logic/objective.h

src/logic/path.cc

src/logic/path.h

src/logic/pathfield.cc

src/logic/pathfield.h

src/logic/player.cc

src/logic/player.h

src/logic/player_area.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/playersmanager.h

src/logic/queue_cmd_factory.cc

src/logic/queue_cmd_factory.h

src/logic/replay.cc

src/logic/replay.h

src/logic/roadtype.h

src/logic/widelands_geometry.h

src/main.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_bob_packet.h

src/map_io/map_building_packet.cc

src/map_io/map_building_packet.h

src/map_io/map_buildingdata_packet.cc

src/map_io/map_buildingdata_packet.h

src/map_io/map_data_packet.h

src/map_io/map_elemental_packet.cc

src/map_io/map_elemental_packet.h

src/map_io/map_exploration_packet.cc

src/map_io/map_flag_packet.cc

src/map_io/map_flagdata_packet.cc

src/map_io/map_heights_packet.cc

src/map_io/map_images.cc

src/map_io/map_loader.h

src/map_io/map_message_saver.h

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_object_saver.h

src/map_io/map_objective_packet.cc

src/map_io/map_objective_packet.h

src/map_io/map_player_names_and_tribes_packet.cc

src/map_io/map_player_names_and_tribes_packet.h

src/map_io/map_player_position_packet.cc

src/map_io/map_players_messages_packet.cc

src/map_io/map_players_view_packet.cc

src/map_io/map_port_spaces_packet.cc

src/map_io/map_port_spaces_packet.h

src/map_io/map_resources_packet.cc

src/map_io/map_resources_packet.h

src/map_io/map_road_packet.cc

src/map_io/map_roaddata_packet.cc

src/map_io/map_saver.h

src/map_io/map_scripting_packet.cc

src/map_io/map_terrain_packet.cc

src/map_io/map_terrain_packet.h

src/map_io/map_version_packet.cc

src/map_io/s2map.cc

src/map_io/tribes_legacy_lookup_table.cc

src/map_io/widelands_map_loader.cc

src/map_io/widelands_map_loader.h

src/map_io/world_legacy_lookup_table.cc

src/network/crypto.cc

src/network/crypto.h

src/network/gameclient.cc

src/network/gamehost.cc

src/network/internet_gaming.cc

src/network/nethost.cc

src/network/network.cc

src/network/network_lan_promotion.cc

src/network/network_protocol.h

src/network/relay_protocol.h

src/notifications/notifications_impl.h

src/scripting/lua_bases.cc

src/scripting/lua_bases.h

src/scripting/lua_editor.cc

src/scripting/lua_editor.h

src/scripting/lua_game.cc

src/scripting/lua_game.h

src/scripting/lua_globals.cc

src/scripting/lua_map.cc

src/scripting/lua_map.h

src/scripting/lua_path.h

src/scripting/lua_root.cc

src/scripting/lua_ui.cc

src/scripting/lua_ui.h

src/scripting/persistence.h

src/scripting/test/test_luna.cc

src/sound/sound_handler.cc

src/sound/sound_handler.h

src/ui_basic/box.cc

src/ui_basic/box.h

src/ui_basic/button.cc

src/ui_basic/checkbox.cc

src/ui_basic/checkbox.h

src/ui_basic/editbox.cc

src/ui_basic/editbox.h

src/ui_basic/fullscreen_window.cc

src/ui_basic/icon.cc

src/ui_basic/icon.h

src/ui_basic/icongrid.cc

src/ui_basic/icongrid.h

src/ui_basic/listselect.cc

src/ui_basic/listselect.h

src/ui_basic/messagebox.cc

src/ui_basic/messagebox.h

src/ui_basic/multilineeditbox.cc

src/ui_basic/multilineeditbox.h

src/ui_basic/multilinetextarea.cc

src/ui_basic/multilinetextarea.h

src/ui_basic/panel.cc

src/ui_basic/panel.h

src/ui_basic/progressbar.cc

src/ui_basic/progressbar.h

src/ui_basic/progresswindow.cc

src/ui_basic/progresswindow.h

src/ui_basic/radiobutton.cc

src/ui_basic/radiobutton.h

src/ui_basic/scrollbar.cc

src/ui_basic/scrollbar.h

src/ui_basic/slider.cc

src/ui_basic/slider.h

src/ui_basic/spinbox.h

src/ui_basic/table.cc

src/ui_basic/table.h

src/ui_basic/tabpanel.cc

src/ui_basic/tabpanel.h

src/ui_basic/textarea.cc

src/ui_basic/textarea.h

src/ui_basic/unique_window.cc

src/ui_basic/unique_window.h

src/ui_basic/window.cc

src/ui_basic/window.h

src/ui_fsmenu/internet_lobby.cc

src/ui_fsmenu/load_map_or_game.h

src/ui_fsmenu/main.h

src/website/map_info.cc

src/wlapplication.cc

src/wlapplication_messages.cc

src/wui/actionconfirm.h

src/wui/building_statistics_menu.cc

src/wui/buildingwindow.cc

src/wui/chat_overlay.cc

src/wui/debugconsole.cc

src/wui/debugconsole.h

src/wui/encyclopedia_window.cc

src/wui/fieldaction.cc

src/wui/fieldaction.h

src/wui/game_chat_menu.h

src/wui/game_message_menu.h

src/wui/inputqueuedisplay.h

src/wui/interactive_base.cc

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/load_or_save_game.cc

src/wui/login_box.cc

src/wui/mapdetails.cc

src/wui/mapviewpixelfunctions.cc

src/wui/multiplayersetupgroup.cc

src/wui/plot_area.h

src/wui/portdockwaresdisplay.cc

src/wui/productionsitewindow.cc

src/wui/seafaring_statistics_menu.cc

src/wui/shipwindow.cc

src/wui/soldierlist.cc

src/wui/suggested_teams_box.cc

src/wui/suggested_teams_box.h

src/wui/transport_draw.cc

src/wui/ware_statistics_menu.cc

src/wui/waresdisplay.h

src/wui/watchwindow.cc

utils/build_deps.py

utils/buildcat.py

utils/crop_animation.py

utils/detect_revision.py

utils/fix_formatting.py

utils/generate_glossary.py

utils/glossary_checks.py

utils/macos/build_app.sh

utils/macos/fix_dependencies.py

utils/make_spritemap.py

utils/optimize_pngs.py

utils/pywi/animation.py

utils/pywi/config.py

utils/pywi/packing.py

utils/pywi/tests.py

utils/rename_animation.py

utils/run-clang-tidy.py

utils/test/test_lua-xgettext.py

utils/test/test_make_spritemap.py

utils/update_appdata.py

utils/update_copyright.py

utils/update_translation_stats.py

utils/validate_json.py

utils/win32/innosetup/Widelands.iss

Show diffs side-by-side

added added

removed removed

src/logic/map_objects/tribes/battle.h

124

124

*/

125

125

bool last_attack_hits_;

126

126

};

127

}

127

} // namespace Widelands

128

128

129

129

#endif // end of include guard: WL_LOGIC_MAP_OBJECTS_TRIBES_BATTLE_H

Older »