diff UI/UICharacter.cpp @ 1452:9add223260ce

Слияние
author Ritor1
date Tue, 06 Aug 2013 09:26:17 +0600
parents 6b1c8c41c83f 8b4f4c723edd
children bfe342ae0c1f
line wrap: on
line diff
--- a/UI/UICharacter.cpp	Tue Aug 06 09:26:06 2013 +0600
+++ b/UI/UICharacter.cpp	Tue Aug 06 09:26:17 2013 +0600
@@ -615,49 +615,49 @@
   strcat(pTmpBuf.data(), "\f00000");
 
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, 18, 0, pTmpBuf.data(), 0, 0, 0);
-  result = dword_506528;
+  result = books_primary_item_per_page;
   a1.uFrameX = 12;
   a1.uFrameY = 48;
   a1.uFrameWidth = 424;
   a1.uFrameHeight = 290;
   a1.uFrameZ = 435;
   a1.uFrameW = 337;
-  if (BtnDown_flag && num_achieved_awards + dword_506528 < num_achieved_awards_2)
-    result = dword_506528++ + 1;
+  if (BtnDown_flag && num_achieved_awards + books_primary_item_per_page < full_num_items_in_book)
+    result = books_primary_item_per_page++ + 1;
   if (BtnUp_flag && result)
   {
     --result;
-    dword_506528 = result;
+    books_primary_item_per_page = result;
   }
 
-    if ( dword_50651C < 0 )
+    if ( books_page_number < 0 )
         {
         result += num_achieved_awards;
-        dword_506528 = result;
-        if ( (signed int)(num_achieved_awards + result) > num_achieved_awards_2 )
+        books_primary_item_per_page = result;
+        if ( (signed int)(num_achieved_awards + result) > full_num_items_in_book )
             {
-            result = num_achieved_awards_2 - num_achieved_awards;
-            dword_506528 = result;
+            result = full_num_items_in_book - num_achieved_awards;
+            books_primary_item_per_page = result;
             }
         }
-    else if ( dword_50651C > 0 )
+    else if ( books_page_number > 0 )
         {
         result -= num_achieved_awards;
-        dword_506528 = result;
+        books_primary_item_per_page = result;
         if ( (result & 0x80000000u) != 0 )
             {
             result = 0;
-            dword_506528 = result;
+            books_primary_item_per_page = result;
             }
         }
     //LABEL_14:
     BtnDown_flag = 0;
     BtnUp_flag = 0;
     num_achieved_awards = 0;
-    dword_50651C = 0;
+    books_page_number = 0;
 
 
-    for (uint i = result; i < num_achieved_awards_2; ++i)
+    for (uint i = result; i < full_num_items_in_book; ++i)
     {
       v5 = achieved_awards[i];
       v6 = (char *)pAwards[v5].pText;//(char *)dword_723E80_award_related[v20 / 4];
@@ -2570,8 +2570,8 @@
         memset(pTmpBuf2.data(), 0, 0x7D0u);
         BtnDown_flag = 0;
         BtnUp_flag = 0;
-        dword_50651C = 0;
-        dword_506528 = 0;
+        books_page_number = 0;
+        books_primary_item_per_page = 0;
         for (int i = 0; i < 105; ++i)
         {
             if ( _449B57_test_bit(pPlayer->_guilds_member_bits, i) && pAwards[i].pText )
@@ -2579,11 +2579,11 @@
                 achieved_awards[num_achieved_awards++] = (AwardType)i;
             }
         }
-        num_achieved_awards_2 = num_achieved_awards;
+        full_num_items_in_book = num_achieved_awards;
         num_achieved_awards = 0;
 
         //sort awards index 
-        if (num_achieved_awards_2 > 0)
+        if (full_num_items_in_book > 0)
         {
             std::stable_sort(achieved_awards.begin(), achieved_awards.end(), awardSort);
         }