wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set "user action" flag on attack action added by player

Browse source
This commit is contained in:
Vsevolod Kremianskii 2021-04-05 18:54:48 +07:00
parent 62ac46376f
commit 097af6e93f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/action/attack.h
View file

@ -27,9 +27,11 @@ namespace game {
class AttackAction : public ObjectAction {
public:
AttackAction(std::shared_ptr<SpatialObject> object, float range = kDefaultAttackRange) :
AttackAction(std::shared_ptr<SpatialObject> object, float range = kDefaultAttackRange, bool userAction = false) :
ObjectAction(ActionType::AttackObject, std::move(object)),
_range(range) {
_userAction = userAction;
}
std::shared_ptr<SpatialObject> target() const { return std::static_pointer_cast<SpatialObject>(_object); }

2
src/game/gui/selectoverlay.cpp
View file

@ -127,7 +127,7 @@ bool SelectionOverlay::handleMouseButtonDown(const SDL_MouseButtonEvent &event)
case ContextualAction::Attack: {
shared_ptr<Creature> partyLeader(_game->party().getLeader());
ActionQueue &actions = partyLeader->actionQueue();
actions.add(make_unique<AttackAction>(static_pointer_cast<Creature>(selectedObject), partyLeader->getAttackRange()));
actions.add(make_unique<AttackAction>(static_pointer_cast<Creature>(selectedObject), partyLeader->getAttackRange(), true));
break;
}