← Back to branch summary

~widelands-dev/widelands/weaver_spins_gold

~widelands-dev/widelands/weaver_spins_gold

Viewing all changes in revision 8368.

Committer: Wideland's Bunnybot
Date: 2017-05-21 22:18:02 UTC
mfrom: (8365.2.4 warehouse_refactor)
Revision ID: bunnybot@widelands.org-20170521221802-bo3j85vgle3ikika

Merged lp:~widelands-dev/widelands/warehouse_refactor:
Refactor Attackable.

- Getting rid of some multiple inheritance in Warehouse and MilitarySite by
composing Attackable as a member into Building.
- Rename Attackable -> AttackTarget and change the interface to be cleaner.
- Mild related cleanups.

files renamed:
src/logic/map_objects/attackable.h => src/logic/map_objects/tribes/attack_target.h

files modified:
src/ai/defaultai_warfare.cc

src/economy/route.h

src/logic/CMakeLists.txt

src/logic/cmd_queue.h

src/logic/findimmovable.cc

src/logic/findimmovable.h

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/player.cc

src/wui/attack_box.h

src/wui/fieldaction.cc

Show diffs side-by-side

added added

removed removed

src/ai/defaultai_warfare.cc

src/economy/route.h

src/logic/CMakeLists.txt

src/logic/cmd_queue.h

src/logic/findimmovable.cc

src/logic/findimmovable.h

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/attack_target.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building.h

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/player.cc

src/wui/attack_box.h

src/wui/fieldaction.cc

Older »