diff UI/UIHouses.cpp @ 1661:e1d1fe32c194

NPCTopics
author Ritor1
date Wed, 18 Sep 2013 14:19:37 +0600
parents d453ed393d6e
children 620b6ba3e6b8
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Wed Sep 18 11:05:06 2013 +0600
+++ b/UI/UIHouses.cpp	Wed Sep 18 14:19:37 2013 +0600
@@ -2984,20 +2984,8 @@
   signed int v10; // esi@6
   int pPrice; // ecx@6
   signed int v14; // esi@14
-  //unsigned int v15; // esi@16
   int v16; // eax@16
-  //unsigned int v17; // eax@17
   int v19; // ecx@24
-  //GUIButton *v20; // eax@26
-  //GUIButton *v21; // esi@26
-  //int v22; // eax@26
-  //const char *v23; // eax@28
-  //int v24; // eax@28
-  //unsigned int v25; // ecx@28
-  //int v26; // eax@28
-  //unsigned __int16 v27; // ax@28
-  //unsigned __int16 v29; // ST14_2@34
-  //int v30; // eax@34
   int v33; // eax@36
   unsigned int v36; // eax@38
   unsigned int v42; // eax@46
@@ -3008,7 +2996,6 @@
   int pTextHeight; // eax@71
   unsigned __int16 pTextColor; // ax@71
   GUIWindow training_dialog_window; // [sp+Ch] [bp-78h]@1
-  //int v68; // [sp+6Ch] [bp-18h]@3
   int v69; // [sp+70h] [bp-14h]@6
   int v73; // [sp+80h] [bp-4h]@14
 
@@ -3065,7 +3052,6 @@
         v49 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138;
         if (pDialogueWindow->pStartingPosActiveItem < pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton)
         {
-          //int pCurrentItem = 2;
           index = 0;
           for ( int i = pDialogueWindow->pStartingPosActiveItem;
                 i < pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton; ++i )
@@ -3080,7 +3066,6 @@
             if ( pDialogueWindow->pCurrentPosActiveItem != i )
               pTextColor = TargetColor(255, 255, 255);
             training_dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[index], 3);
-            //++pCurrentItem;
             ++index;
           }
         }
@@ -3096,7 +3081,6 @@
         pDialogueWindow->pNumPresenceButton = 0;
         return;
       }
-      //v34 = pPlayers[uActiveCharacter]->uLevel;
       if ( pPlayers[uActiveCharacter]->uLevel < pMaxLevelPerTrainingHallType[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_TRAINING_HALL_EMERALD_ISLE] )
       {
         if ( (signed __int64)pPlayers[uActiveCharacter]->uExperience >= v5 )
@@ -3443,7 +3427,7 @@
     switch ( pButton->msg_param )
     {
       case 19://evt_A
-        v15 = (char *)pNPCTopics[pNPC->evt_A-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_A].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;
@@ -3452,7 +3436,7 @@
         strcpy(pButton->pButtonName, v15);
         continue;
       case 20://evt_B
-        v15 = (char *)pNPCTopics[pNPC->evt_B-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_B].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;
@@ -3469,7 +3453,7 @@
         strcpy(pButton->pButtonName, v15);
         continue;
       case 21://evt_C
-        v15 = (char *)pNPCTopics[pNPC->evt_C-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_C].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;
@@ -3478,7 +3462,7 @@
         strcpy(pButton->pButtonName, v15);
         continue;
       case 22://evt_D
-        v15 = (char *)pNPCTopics[pNPC->evt_D-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_D].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;
@@ -3487,7 +3471,7 @@
         strcpy(pButton->pButtonName, v15);
         continue;
       case 23://evt_E
-        v15 = (char *)pNPCTopics[pNPC->evt_E-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_E].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;
@@ -3496,7 +3480,7 @@
         strcpy(pButton->pButtonName, v15);
         continue;
       case 24://evt_F
-        v15 = (char *)pNPCTopics[pNPC->evt_F-1].pTopic;
+        v15 = (char *)pNPCTopics[pNPC->evt_F].pTopic;
         if ( !v15 )
         {
           pButton->msg_param = 0;