~widelands-dev/widelands/trunk

Viewing changes to src/logic/findimmovable.h

Committer: Wideland's Bunnybot
Date: 2016-02-16 13:01:41 UTC
mfrom: (7810.1.4 bug-1395278-underscores)
Revision ID: bunnybot@widelands.org-20160216130141-d3soys8jhye32r89

Merged lp:~widelands-dev/widelands/bug-1395278-underscores:
Removed leading underscores from variable and function names.

files modified:
src/economy/economy.cc

src/economy/economy.h

src/economy/flag.h

src/economy/fleet.h

src/economy/portdock.cc

src/economy/portdock.h

src/economy/request.cc

src/economy/road.cc

src/economy/road.h

src/economy/test/test_routing.cc

src/economy/wares_queue.cc

src/graphic/richtext.cc

src/logic/cmd_calculate_statistics.h

src/logic/cmd_luacoroutine.h

src/logic/cmd_luascript.h

src/logic/cmd_queue.h

src/logic/cookie_priority_queue.h

src/logic/findbob.h

src/logic/findimmovable.h

src/logic/findnode.cc

src/logic/findnode.h

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/checkstep.h

src/logic/map_objects/immovable_program.h

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/battle.h

src/logic/map_objects/tribes/building.cc

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/requirements.cc

src/logic/map_objects/tribes/requirements.h

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/map_objects/world/terrain_description.cc

src/logic/map_objects/world/terrain_description.h

src/logic/message_id.h

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/replay.cc

src/logic/replay_game_controller.h

src/map_io/map_roaddata_packet.cc

src/map_io/widelands_map_loader.cc

src/network/nethost.cc

src/scripting/lua_ui.cc

src/ui_basic/button.cc

src/ui_basic/button.h

src/ui_basic/icongrid.cc

src/ui_basic/panel.cc

src/ui_basic/panel.h

src/ui_basic/table.cc

src/ui_basic/table.h

src/ui_basic/tabpanel.cc

src/ui_basic/window.cc

src/ui_basic/window.h

src/ui_fsmenu/mapselect.cc

src/ui_fsmenu/mapselect.h

src/wlapplication.cc

src/wlapplication.h

src/wui/encyclopedia_window.cc

src/wui/encyclopedia_window.h

src/wui/interactive_base.h

src/wui/interactive_gamebase.cc

src/wui/interactive_player.cc

src/wui/interactive_spectator.cc

src/wui/watchwindow.cc

Show diffs side-by-side

added added

removed removed

src/logic/findimmovable.h

};

template<typename T>

struct Capsule : public BaseCapsule {

Capsule(const T & _op) : op(_op) {}

Capsule(const T & init_op) : op(init_op) {}

bool accept(const BaseImmovable & imm) const override {return op.accept(imm);}

const T op;

115

bool accept(const BaseImmovable &) const;

116

};

117

struct FindImmovablePlayerMilitarySite {

118

FindImmovablePlayerMilitarySite(const Player & _player) : player(_player) {}

118

FindImmovablePlayerMilitarySite(const Player & init_player) : player(init_player) {}

119

120

bool accept(const BaseImmovable &) const;

121

127

bool accept(const BaseImmovable &) const;

128

};

129

struct FindImmovableByDescr {

130

FindImmovableByDescr(const ImmovableDescr & _descr) : descr(_descr) {}

130

FindImmovableByDescr(const ImmovableDescr & init_descr) : descr(init_descr) {}

131

132

bool accept(const BaseImmovable &) const;

133

Older »