Skip to content

Commit eea443d

Browse files
committed
Fix PlayerInfo and actions bugs
1 parent ee837f6 commit eea443d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/components/GameBoard.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414

1515
<!-- Player information boxes -->
1616
<PlayerInfo :info="info" :currentAction="currentAction"
17+
:targets="targets"
1718
:actions="actions" :selectEntity="selectEntity" :startAction="startAction" :cancelAction="cancelAction" :performAction="performAction"
18-
:showActions="doingAction && info == playerInfos.user">
19+
:showActions="info == playerInfos.user">
1920

2021
</PlayerInfo>
2122

src/components/PlayerInfo.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<input @click="startAction(action)" v-show="currentAction === null" type="button" :value="action.action"
1515
class="btn btn-navbar csh-button"/>
1616
</div>
17-
<div v-show="showActions">
17+
<div v-show="showActions && currentAction != null">
1818
<input @click="cancelAction()" type="button" value="Cancel"
1919
class="btn btn-navbar csh-button"/>
2020
<input @click="performAction()" type="button" :value="currentAction ? currentAction.action : '(None)'"
@@ -26,7 +26,7 @@
2626
<script>
2727
export default {
2828
name: "PlayerInfo",
29-
props: ["info", "actions", "showActions", "currentAction", "selectEntity", "startAction", "cancelAction", "performAction"],
29+
props: ["info", "actions", "targets", "showActions", "currentAction", "selectEntity", "startAction", "cancelAction", "performAction"],
3030
filters: {
3131
formatResourceName: function(input) {
3232
input = input.replace(/_/g, ' ');

0 commit comments

Comments
 (0)