changeset 1201:601c085deff7

m
author Gloval
date Sun, 09 Jun 2013 01:05:02 +0400
parents c42f255ce1dc
children 4d90f0591add
files Arcomage.cpp
diffstat 1 files changed, 31 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/Arcomage.cpp	Sun Jun 09 00:57:17 2013 +0400
+++ b/Arcomage.cpp	Sun Jun 09 01:05:02 2013 +0400
@@ -114,20 +114,13 @@
 
 stru272 array_4FABD0[10];
 
+
 ArcomageDeck playDeck;
-
-//char byte_5052A8[108];
-//int dword_505314[108]; // weak
-
 ArcomageDeck deckMaster;
-//char byte_5054C8[32]; // idb
-//char byte_5054E8[108];
-//int dword_505554[108]; 
-
-char pArcomagePlayer2Name[]="Enemy";
-char pArcomagePlayer1Name[]="Player";
-char pDeckMaster[]="Master Deck";
-
+
+char Player2Name[] = "Enemy";
+char Player1Name[] = "Player";
+char pDeckMaster[] = "Master Deck";
 
 /*  267 */
 #pragma pack(push, 1)
@@ -149,20 +142,20 @@
 
 char am_byte_4E185D; // weak
 
-int start_tower_height; // weak
-int start_wall_height; // weak
-int start_quarry_level; // weak
-int start_magic_level; // weak
-int start_zoo_level; // weak
-
-
-int minimum_cards_at_hand  = 5; // weak
-int quarry_bonus  = 1; // weak
-int magic_bonus  = 1; // weak
-int might_bonus  = 1; // weak
-
-int max_tower_height = 50; // weak
-int max_resources_amount = 100 ; // weak
+int start_tower_height;
+int start_wall_height; 
+int start_quarry_level; 
+int start_magic_level; 
+int start_zoo_level; 
+
+
+int minimum_cards_at_hand  = 5; 
+int quarry_bonus           = 1; 
+int magic_bonus            = 1; 
+int zoo_bonus              = 1; 
+
+int max_tower_height       = 50; 
+int max_resources_amount   = 100 ; 
 
 int dword_4DF3A4; // weak
 
@@ -172,14 +165,14 @@
 int current_player_num; // idb
 char am_byte_4FAA77; // weak
 
-signed int current_card_slot_index; // idb
+signed int current_card_slot_index; 
 unsigned int played_card_id; // idb
 
-int deck_walk_index; // weak
-
-int start_bricks_amount; // weak
-int start_gems_amount; // weak
-int start_beasts_amount; // weak
+int deck_walk_index; 
+
+int start_bricks_amount; 
+int start_gems_amount; 
+int start_beasts_amount; 
 
 
 //----- (0040DD2F) --------------------------------------------------------
@@ -1831,7 +1824,7 @@
 {
   am_Players[player_num].resource_bricks += quarry_bonus + am_Players[player_num].quarry_level;
   am_Players[player_num].resource_gems   += magic_bonus  + am_Players[player_num].magic_level;
-  am_Players[player_num].resource_beasts += might_bonus  + am_Players[player_num].zoo_level;
+  am_Players[player_num].resource_beasts += zoo_bonus  + am_Players[player_num].zoo_level;
 }
 
 
@@ -2385,7 +2378,7 @@
 
   res_value = am_Players[0].zoo_level;
   if ( byte_4E185E )
-    res_value = am_Players[0].zoo_level + might_bonus;
+    res_value = am_Players[0].zoo_level + zoo_bonus;
   intToString(res_value, text_buff);
  // v8 = 0;
   text_position.y = 236;
@@ -2394,7 +2387,7 @@
 
   res_value = am_Players[1].zoo_level;
   if ( byte_4E185E )
-    res_value =  am_Players[1].zoo_level + might_bonus;
+    res_value =  am_Players[1].zoo_level + zoo_bonus;
   intToString(res_value, text_buff);
  // v10 = 0;
   text_position.y = 236;
@@ -5808,8 +5801,8 @@
   POINT pXY; // [sp+18h] [bp-Ch]@5
 
   pAudioPlayer->StopChannels(-1, -1);
-  strcpy(pArcomageGame->pPlayer1Name, pArcomagePlayer1Name);
-  strcpy(pArcomageGame->pPlayer2Name, pArcomagePlayer2Name);
+  strcpy(pArcomageGame->pPlayer1Name, Player1Name);
+  strcpy(pArcomageGame->pPlayer2Name, Player2Name);
   am_byte_4FAA76 = 0;
   am_byte_4FAA75 = 0;
 
@@ -5895,7 +5888,7 @@
   minimum_cards_at_hand = 5;
   quarry_bonus = 1;
   magic_bonus = 1;
-  might_bonus = 1;
+  zoo_bonus = 1;
   max_tower_height = st_cond->max_tower;
   max_resources_amount = st_cond->max_resources;