From 7a19605fcc176c03563016836f208c88c1971987 Mon Sep 17 00:00:00 2001
From: No'am Rosenthal <noam.rosenthal@nokia.com>
Date: Thu, 26 Nov 2009 14:37:34 -0800
Subject: many fixes and optimizations to SCXML

---
 examples/blackjack/blackjack.scxml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'examples/blackjack/blackjack.scxml')

diff --git a/examples/blackjack/blackjack.scxml b/examples/blackjack/blackjack.scxml
index 4c73cd4..5362546 100644
--- a/examples/blackjack/blackjack.scxml
+++ b/examples/blackjack/blackjack.scxml
@@ -197,7 +197,7 @@
             <transition event="q-messagebox.finished" target="waitForBet"  />
             <transition event="bth-mb-timeout" target="waitForBet" />
         <onentry>
-        <send event="'bth-mb-timeout'" delay="'1500ms'" />
+        <send event="bth-mb-timeout" delay="1500ms" />
         </onentry>
       </state>
       <state id="testCards">
@@ -235,20 +235,18 @@
 
       <state id="checkWinner">
         <onentry>
-            <script>
-                _global.diff = myDeck.evalBest() - dealerCards.evalBest();
-            </script>
+            <assign dataid="diff" expr="myDeck.evalBest() - dealerCards.evalBest()" />
         </onentry>
 
-        <transition cond="diff&gt;0" target="win" />
-        <transition cond="diff&lt;0" target="loss" />
-        <transition cond="diff==0" target="draw" />
+        <transition cond="_data.diff&gt;0" target="win" />
+        <transition cond="_data.diff&lt;0" target="loss" />
+        <transition cond="_data.diff==0" target="draw" />
       </state>
       <state id="endGame">
         <invoke type="q-bindings"><content>[[welcomeLabel,"text","Game Over"]]</content></invoke>
         <transition event="timeout" target="newgame" />
         <onentry>
-            <send event="'timeout'" delay="'3s'" />
+            <send event="timeout" delay="3s" />
         </onentry>
       </state>
         <state id="endRound">
@@ -256,9 +254,8 @@
            <transition event="q-signal:newRoundButton.clicked()" target="newround" />
            <transition event="timeout" target="newround" />
            <onentry>
-            <send event="'timeout'" delay="'3s'" />
+            <send event="timeout" delay="3s" />
             </onentry>
-
              <state id="win">
                 <onentry>
                   <script>
@@ -271,7 +268,7 @@
               <state id="loss">
                 <invoke type="q-bindings"><content>[[welcomeLabel,"text","You Lost..."]]</content></invoke>
                 <transition cond="points == 0" target="endGame" />
-                </state>
+              </state>
                 <state id="draw">
                 <invoke type="q-bindings"><content>[[welcomeLabel,"text","You It's a draw."]]</content></invoke>
                   <onentry>
-- 
cgit v1.2.3