summaryrefslogtreecommitdiffstats
path: root/matchblox/engine/C_MatchBloxEngine.cpp
diff options
context:
space:
mode:
authorWilrik de Loose <wilrik@wilrik.nl>2008-05-27 20:01:14 (GMT)
committerWilrik de Loose <wilrik@wilrik.nl>2008-05-27 20:01:14 (GMT)
commitd1be71f4ef809d3928ff6c8e3c25bc801cdf6339 (patch)
treeea93c3036e5afb5ac0109b6d832ce2878f84df76 /matchblox/engine/C_MatchBloxEngine.cpp
parent4f1e514f389bd1bd0de21bb3daaf477939b0ce33 (diff)
download2iv55-d1be71f4ef809d3928ff6c8e3c25bc801cdf6339.zip
2iv55-d1be71f4ef809d3928ff6c8e3c25bc801cdf6339.tar.gz
2iv55-d1be71f4ef809d3928ff6c8e3c25bc801cdf6339.tar.bz2
small changes in menu button handling
Diffstat (limited to 'matchblox/engine/C_MatchBloxEngine.cpp')
-rw-r--r--matchblox/engine/C_MatchBloxEngine.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/matchblox/engine/C_MatchBloxEngine.cpp b/matchblox/engine/C_MatchBloxEngine.cpp
index 2a660fd..9d385e2 100644
--- a/matchblox/engine/C_MatchBloxEngine.cpp
+++ b/matchblox/engine/C_MatchBloxEngine.cpp
@@ -102,7 +102,6 @@ GameResult C_MatchBloxEngine::ProcessMsgs(void)
{
case MESSAGE_MENU:
int l_iAction;
- int l_iGameMode;
menu_payload *l_pMsg1;
l_pMsg1 = (menu_payload*)message->payload;
@@ -111,11 +110,14 @@ GameResult C_MatchBloxEngine::ProcessMsgs(void)
switch (l_iAction)
{
case ACTION_PAUSE:
- Pause();
+ if (!Pause())
+ {
+ Resume();
+ }
break;
case ACTION_START:
- l_iGameMode = l_pMsg1->gamemode;
- StartGame();
+ Abort();
+ NewGame(0, l_pMsg1->gamemode, BS_SMALL);
break;
case ACTION_RESUME:
Resume();