diff Party.h @ 1572:19f1735fca80

Слияние
author Ritor1
date Sun, 08 Sep 2013 17:07:58 +0600
parents 30db6d265ceb
children c6fe09a06712
line wrap: on
line diff
--- a/Party.h	Sun Sep 08 17:07:47 2013 +0600
+++ b/Party.h	Sun Sep 08 17:07:58 2013 +0600
@@ -150,9 +150,10 @@
 #pragma pack(push, 1)
 struct Party_stru0
 {
-  int field_0[20];
+  //__int64 field_0[10];
+  __int64 bountyHunting_next_generation_time[10];
  // int field_50[170];
-  __int64 field_50[85];
+  __int64 Shops_next_generation_time[85];//field_50
   __int64 _shop_ban_times[53];
   int field_4A0[20];
   int field_4F0[38];
@@ -185,7 +186,7 @@
   void SetHoldingItem(ItemGen *pItem);
   int GetNextActiveCharacter();
   bool _497FC5_check_party_perception_against_level();
-  bool AddItem(ItemGen *pItem);
+  bool AddItemToParty(ItemGen *pItem);
   void Yell();
   void CountHirelings();
   
@@ -218,7 +219,7 @@
   unsigned int uDefaultPartyHeight;
   int sEyelevel;
   unsigned int uDefaultEyelevel;
-  int field_14;
+  int field_14_radius;
   int y_rotation_granularity;
   unsigned int uWalkSpeed;
   int y_rotation_speed;  // deg/s
@@ -265,8 +266,8 @@
   int uNumPrisonTerms;
   unsigned int uNumBountiesCollected;
   int field_74C;
-  __int16 field_750[5];
-  __int16 field_75A[5];
+  __int16 monster_id_for_hunting[5];
+  __int16 monster_for_hunting_killed[5];
   unsigned char   days_played_without_rest;
   unsigned __int8 _quest_bits[64];
   unsigned __int8 pArcomageWins[16];