diff --git a/src/activities/penalty/Penalty.qml b/src/activities/penalty/Penalty.qml --- a/src/activities/penalty/Penalty.qml +++ b/src/activities/penalty/Penalty.qml @@ -53,6 +53,8 @@ return } + items.saveBallState = saveBallState + /* This is a shoot */ var progress = progressTop if (saveBallState == "LEFT") { @@ -103,7 +105,7 @@ anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton onClicked: { - if(mouse.button) { + if(mouse.button && (items.saveBallState == "" || items.saveBallState == "LEFT")) { changeBallState("LEFT") } } @@ -124,7 +126,7 @@ anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton onClicked: { - if(mouse.button) { + if(mouse.button && (items.saveBallState == "" || items.saveBallState == "CENTER")) { changeBallState("CENTER") } } @@ -147,7 +149,7 @@ anchors.fill: parent acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton onClicked: { - if(mouse.button) { + if(mouse.button && (items.saveBallState == "" || items.saveBallState == "RIGHT")) { changeBallState("RIGHT") } } @@ -167,6 +169,7 @@ property alias bonus: bonus property int duration : 0 property int progressBarOpacity : 40 + property string saveBallState: "" } onStart: { Activity.start(items) } @@ -432,6 +435,7 @@ acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton onClicked: { ball.state = "INITIAL" + items.saveBallState = "" progressRight.ratio = 0 progressLeft.ratio = 0 progressTop.ratio = 0 diff --git a/src/activities/penalty/penalty.js b/src/activities/penalty/penalty.js --- a/src/activities/penalty/penalty.js +++ b/src/activities/penalty/penalty.js @@ -54,6 +54,7 @@ function resetLevel() { items.ball.state = "INITIAL" + items.saveBallState = "" items.progressRight.ratio = 0 items.progressLeft.ratio = 0 items.progressTop.ratio = 0