Mercurial > mm7

diff UI/UIHouses.cpp @ 1747:cecb080929c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Party_stru0 renamed to PartyTimeStruct, fixed its members, renamed Party::field_3C to Party::PartyTimes, started Player::SetVariable refactoring start
author Grumpy7
date Mon, 30 Sep 2013 05:48:32 +0200
parents 8251e59fd7c1
children 19684d4bbe9a
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Fri Sep 27 10:08:01 2013 +0200
+++ b/UI/UIHouses.cpp	Mon Sep 30 05:48:32 2013 +0200
@@ -833,10 +833,10 @@
 		//v10 = uHouseID;
 		if ( (signed int)uHouseID < 53 ) //entering shops and guilds
 			{
-			if ( !(pParty->field_3C._shop_ban_times[uHouseID])
-				||  (pParty->field_3C._shop_ban_times[uHouseID] <= pParty->uTimePlayed) )
+			if ( !(pParty->PartyTimes._shop_ban_times[uHouseID])
+				||  (pParty->PartyTimes._shop_ban_times[uHouseID] <= pParty->uTimePlayed) )
 				{
-				pParty->field_3C._shop_ban_times[uHouseID] = 0;
+				pParty->PartyTimes._shop_ban_times[uHouseID] = 0;
 				}
 			else
 				{
@@ -1091,7 +1091,7 @@
     case BuildingType_SelfGuild:
     case BuildingType_16:
     {
-      if ( pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C] >= (signed __int64)pParty->uTimePlayed )
+      if ( pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] >= (signed __int64)pParty->uTimePlayed )
       {
         for ( uint i = 0; i < 12; ++i )
         {
@@ -1106,7 +1106,7 @@
       else//generation new books
       {
         SpellBookGenerator();
-        pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C] = pParty->uTimePlayed + (signed __int64)((double)(0xA8C000
+        pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] = pParty->uTimePlayed + (signed __int64)((double)(0xA8C000
                                   * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C) * 0.033333335);
       }
       break;
@@ -1115,10 +1115,10 @@
     {
       if ( uMessageParam == HOUSE_DIALOGUE_TOWNHALL_MESSAGE )
       {
-        if ( pParty->field_3C.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] < (signed __int64)pParty->uTimePlayed )//new generation
+        if ( pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] < (signed __int64)pParty->uTimePlayed )//new generation
         {
           pParty->monster_for_hunting_killed[(int)((char *)v8->ptr_1C - 102)] = false;
-          pParty->field_3C.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] = (signed __int64)((double)(309657600 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015)) * 0.033333335);
+          pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] = (signed __int64)((double)(309657600 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015)) * 0.033333335);
           pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
           v16 = (int)((char *)window_SpeakInHouse->ptr_1C - 102);
           if ( !v16 )
@@ -1603,11 +1603,11 @@
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
-      if ( pParty->field_3C.Shops_next_generation_time[(unsigned int)v8->ptr_1C] < (signed __int64)pParty->uTimePlayed )
+      if ( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)v8->ptr_1C] < (signed __int64)pParty->uTimePlayed )
       {
         GenerateStandartShopItems();
         GenerateSpecialShopItems();
-        pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C] = pParty->uTimePlayed + (signed __int64)((double)(11059200 * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C) * 0.033333335);
+        pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] = pParty->uTimePlayed + (signed __int64)((double)(11059200 * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C) * 0.033333335);
       }
       if ( uMessageParam == HOUSE_DIALOGUE_SHOP_BUY_STANDARD )
       {