diff mm7_5.cpp @ 457:e5cf03a3d98e

m
author Ritor1
date Sun, 24 Feb 2013 20:39:03 +0600
parents 0a1ea44b4a0a
children 5d2667144526
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Feb 24 13:53:18 2013 +0600
+++ b/mm7_5.cpp	Sun Feb 24 20:39:03 2013 +0600
@@ -393,8 +393,8 @@
         case UIMSG_51:
           sub_4BDB56_buy_skill____();
           continue;
-        case UIMSG_AF:
-          sub_4B2001(uMessageParam);
+        case UIMSG_AF://Click topic
+          ClickNPCTopic(uMessageParam);//CheckNPCTopic
           continue;
         case UIMSG_195:
           sub_4BCACC_bounties(uMessageParam);
@@ -3338,9 +3338,7 @@
             pMessageQueue_50CBD0->AddMessage(UIMSG_E, 0, 0);
             /*v115 = v0;
             pMessageQueue_50CBD0->uNumMessages = v0;
-//LABEL_769:
             pMessageQueue_50CBD0->pMessages[v115].eType = (UIMessageType)14;
-//LABEL_770:
             pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
             //goto LABEL_771;
             *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
@@ -3349,7 +3347,6 @@
           }
           v115 = 0;
           pMessageQueue_50CBD0->uNumMessages = 0;
-//LABEL_768:
           pMessageQueue_50CBD0->AddMessage(UIMSG_E, 0, 0);
           /*if ( (signed int)v115 < 40 )
             //goto LABEL_769;
@@ -3362,7 +3359,6 @@
           }*/
           continue;
         case UIMSG_E:
-//LABEL_772:
           if ( pMessageQueue_50CBD0->uNumMessages )
             pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
           OnGameViewportClick();
@@ -3378,28 +3374,12 @@
             pPoint3 = pMouse->GetCursorPos(&v204);
             v116 = pRenderer->pActiveZBuffer[*(int *)uNumSeconds + pSRZBufferLineOffsets[pPoint3->y]];
           }
-          v163 = 0;
           pButton2 = (GUIButton *)(unsigned __int16)v116;
-          pWindowType1 = (WindowType)15;
-          //goto LABEL_779;
-          v8 = 0;
-          v9 = 0;
-          v137 = 0;
-          v133 = 0;
-          GUIWindow::Create(v9, v8, v133, v137, pWindowType1, (int)pButton2, v163);
+          GUIWindow::Create(0, 0, 0, 0, (WindowType)15, (int)pButton2, 0);
           continue;
         case UIMSG_54:
-          v163 = 0;
           pButton2 = (GUIButton *)uMessageParam;
-          pWindowType1 = (WindowType)22;
-//LABEL_779:
-          v8 = 0;
-          v9 = 0;
-//LABEL_732:
-          v137 = 0;
-          v133 = 0;
-//LABEL_733:
-          GUIWindow::Create(v9, v8, v133, v137, pWindowType1, (int)pButton2, v163);
+          GUIWindow::Create(0, 0, 0, 0, (WindowType)22, (int)pButton2, 0);
           continue;
         case UIMSG_Game_Action:
           if ( pMessageQueue_50CBD0->uNumMessages )