# HG changeset patch
# User Grumpy7
# Date 1370720449 -7200
# Node ID 1eed3e0ab66679fe204b02eee4c618a408239760
# Parent  0dbf6c4dd0298c0ca82ce50d594489c274cb2457# Parent  9ddeeb7dfe64c54ea139444bd285ea9096d344b3
Merge

diff -r 0dbf6c4dd029 -r 1eed3e0ab666 Arcomage.cpp
diff -r 0dbf6c4dd029 -r 1eed3e0ab666 Arcomage.h
--- a/Arcomage.h	Sat Jun 08 21:33:22 2013 +0200
+++ b/Arcomage.h	Sat Jun 08 21:40:49 2013 +0200
@@ -32,12 +32,12 @@
     char pCardName[32];
     int slot;
     char field_24;
-    char field_25;
-    char field_26;
-    char field_27;
-    char field_28;
-    char field_29;
-    char field_2A;
+    char needed_quarry_level;
+    char needed_magic_level;
+    char needed_might_level;
+    char needed_bricks;
+    char needed_gems;
+    char needed_beasts;
     char field_2B;
     char field_2C;
     char field_2D;
@@ -113,15 +113,15 @@
 struct ArcomagePlayer
 {
   char pPlayerName[32];
-  int field_20;
-  int field_24;
-  int field_28;
-  int field_2C;
-  int field_30;
-  int field_34;
-  int field_38;
-  int field_3C;
-  int field_40;
+  int IsHisTurn;
+  int tower_height;
+  int wall_height;
+  int quarry_level;
+  int magic_level;
+  int might_level;
+  int resource_bricks;
+  int resource_gems;
+  int resource_beasts;
   int cards_at_hand[10];
   am_st1 arr_6C[10];
 };
@@ -185,7 +185,7 @@
   char pPlayer1Name[32];
   char pPlayer2Name[32];
   char field_F4;
-  char field_F5;
+  char GameOver;
   char field_F6;
   char field_F7;
   char field_F8;
@@ -198,7 +198,8 @@
 
 
 extern ArcomageGame *pArcomageGame;
-extern std::array<ArcomagePlayer, 2> am_Players;
+extern ArcomageCard pCards[87];
+
 
 
 #pragma pack(push, 1)
@@ -293,8 +294,8 @@
     {
     char field_0;
     char field_1;
-    char field_2;
-    char field_3;
+    char _pad_2;
+    char _pad_3;
     stru272_stru2 field_4;
     stru272_stru0 *field_40;
     stru272_stru1 field_44[150];
diff -r 0dbf6c4dd029 -r 1eed3e0ab666 ArcomageCards.cpp
--- a/ArcomageCards.cpp	Sat Jun 08 21:33:22 2013 +0200
+++ b/ArcomageCards.cpp	Sat Jun 08 21:40:49 2013 +0200
@@ -1,6 +1,6 @@
 
 #include "Arcomage.h"
-struct ArcomageCard pCards[87] = 
+ArcomageCard pCards[87] = 
 {
  {"Brick Shortage", 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
diff -r 0dbf6c4dd029 -r 1eed3e0ab666 mm7_2.cpp
--- 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;
diff -r 0dbf6c4dd029 -r 1eed3e0ab666 mm7_data.cpp
--- a/mm7_data.cpp	Sat Jun 08 21:33:22 2013 +0200
+++ b/mm7_data.cpp	Sat Jun 08 21:40:49 2013 +0200
@@ -955,9 +955,7 @@
 
 char byte_505880; // weak
 char byte_505881; // weak
-int amuint_505884; // weak
-int amuint_505888; // weak
-int amuint_50588C; // weak
+
 int dword_505890; // weak
 unsigned int pSRZBufferLineOffsets[480];
 int areWeLoadingTexture; // weak
diff -r 0dbf6c4dd029 -r 1eed3e0ab666 mm7_data.h
--- a/mm7_data.h	Sat Jun 08 21:33:22 2013 +0200
+++ b/mm7_data.h	Sat Jun 08 21:40:49 2013 +0200
@@ -592,9 +592,7 @@
 
 extern char byte_505880; // weak
 extern char byte_505881; // weak
-extern int amuint_505884; // weak
-extern int amuint_505888; // weak
-extern int amuint_50588C; // weak
+
 extern int dword_505890; // weak
 extern unsigned int pSRZBufferLineOffsets[480];
 extern int areWeLoadingTexture; // weak
@@ -1155,7 +1153,7 @@
 unsigned int __fastcall SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID);
 unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup);
 unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2);
-void __cdecl PrepareArcomage();
+void  PrepareArcomage();
 
 // int __cdecl crt_retnull_sub();
 unsigned int __stdcall R8G8B8_to_TargetFormat(int uColor); // idb