← Back to branch summary

~widelands-dev/widelands/weaver_spins_gold

« back to all changes in this revision

Viewing changes to src/logic/findimmovable.h

  • 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/findimmovable.h
132
132
 
133
133
        const Player& player;
134
134
};
135
 
struct FindImmovableAttackable {
136
 
        FindImmovableAttackable() {
 
135
struct FindImmovableAttackTarget {
 
136
        FindImmovableAttackTarget() {
137
137
        }
138
138
 
139
139
        bool accept(const BaseImmovable&) const;