Mercurial > mm7

diff mm7_2.cpp @ 1203:1eed3e0ab666

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sat, 08 Jun 2013 21:40:49 +0200
parents 0dbf6c4dd029 2b950844f2d6
children 8c02e6f74b29
line wrap: on
line diff
--- a/mm7_2.cpp	Sat Jun 08 21:33:22 2013 +0200
+++ b/mm7_2.cpp	Sat Jun 08 21:40:49 2013 +0200
@@ -6117,7 +6117,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6140,7 +6140,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6163,7 +6163,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6186,7 +6186,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6212,7 +6212,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6235,7 +6235,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6258,7 +6258,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6281,7 +6281,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6304,7 +6304,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6331,7 +6331,7 @@
           //goto LABEL_181;
           if ( wParam == 27 )
           {
-            pArcomageGame->field_F5 = 1;
+            pArcomageGame->GameOver = 1;
             pArcomageGame->field_F4 = 1;
             pArcomageGame->uGameResult = 2;
             pArcomageGame->field_B0 = -2;
@@ -6356,7 +6356,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6379,7 +6379,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6402,7 +6402,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6425,7 +6425,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6451,7 +6451,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6474,7 +6474,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6497,7 +6497,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6520,7 +6520,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6543,7 +6543,7 @@
             //goto LABEL_181;
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6566,7 +6566,7 @@
 //LABEL_181:
             if ( wParam == 27 )
             {
-              pArcomageGame->field_F5 = 1;
+              pArcomageGame->GameOver = 1;
               pArcomageGame->field_F4 = 1;
               pArcomageGame->uGameResult = 2;
               pArcomageGame->field_B0 = -2;
@@ -6591,7 +6591,7 @@
     //goto LABEL_181;
     if ( wParam == 27 )
     {
-      pArcomageGame->field_F5 = 1;
+      pArcomageGame->GameOver = 1;
       pArcomageGame->field_F4 = 1;
       pArcomageGame->uGameResult = 2;
       pArcomageGame->field_B0 = -2;