diff mm7_1.cpp @ 48:6a62c4005f0e

23.10.12
author Ritor1
date Tue, 23 Oct 2012 17:33:33 +0600
parents 916bec351934
children 25fabc49627b
line wrap: on
line diff
--- a/mm7_1.cpp	Mon Oct 22 17:28:15 2012 +0600
+++ b/mm7_1.cpp	Tue Oct 23 17:33:33 2012 +0600
@@ -203,7 +203,7 @@
   v1 = uPlayerID;
   a5 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
   v84 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xAFu, 0xFFu);
-  v85 = pGUIWindow_CurrentMenu->field_2C_focus_id;
+  v85 = pGUIWindow_CurrentMenu->pCurrentPosActiveItem;
   v86 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0, 0);
   v79 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
   pPlayer = (Player *)&stru_AA1058[3].pSounds[6972 * v1 + 40552];
@@ -2143,9 +2143,9 @@
     if ( pWindowList[v3].field_30 != v1 )
     {
       pMouse->GetClickPos(&uClickX, &uClickY);
-      v4 = pWindowList[v3].field_38;
-      v29 = v4 + pWindowList[v3].field_28;
-      if ( v4 < v4 + pWindowList[v3].field_28 )
+      v4 = pWindowList[v3].pStartingPosActiveItem;
+      v29 = v4 + pWindowList[v3].pNumPresenceButton;
+      if ( v4 < v4 + pWindowList[v3].pNumPresenceButton )
       {
         while ( 1 )
         {
@@ -2184,10 +2184,10 @@
   if ( v26 == 37 )
   {
     v12 = pWindowList[v3].field_34;
-    if ( pWindowList[v3].field_2C_focus_id - pWindowList[v3].field_38 - v12 >= 0 )
+    if ( pWindowList[v3].pCurrentPosActiveItem - pWindowList[v3].pStartingPosActiveItem - v12 >= 0 )
     {
       v8 = pCurrentScreen == 21;
-      pWindowList[v3].field_2C_focus_id -= v12;
+      pWindowList[v3].pCurrentPosActiveItem -= v12;
       if ( v8 )
       {
         pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1);
@@ -2197,7 +2197,7 @@
     if ( pWindowList[v3].field_30 != v1 )
       goto LABEL_47;
     v9 = pWindowList[v3].pControlsHead;
-    v13 = pWindowList[v3].field_2C_focus_id;
+    v13 = pWindowList[v3].pCurrentPosActiveItem;
     if ( v13 > (signed int)v1 )
     {
       do
@@ -2223,11 +2223,11 @@
   {
     if ( v26 == 39 )
     {
-      v7 = pWindowList[v3].field_2C_focus_id + pWindowList[v3].field_34;
-      if ( v7 < pWindowList[v3].field_28 + pWindowList[v3].field_38 )
+      v7 = pWindowList[v3].pCurrentPosActiveItem + pWindowList[v3].field_34;
+      if ( v7 < pWindowList[v3].pNumPresenceButton + pWindowList[v3].pStartingPosActiveItem )
       {
         v8 = pCurrentScreen == 21;
-        pWindowList[v3].field_2C_focus_id = v7;
+        pWindowList[v3].pCurrentPosActiveItem = v7;
         if ( v8 )
         {
           pAudioPlayer->PlaySound((SoundID)66, v1, v1, -1, v1, v1, v1, v1);
@@ -2237,7 +2237,7 @@
       if ( pWindowList[v3].field_30 != v1 )
         goto LABEL_47;
       v9 = pWindowList[v3].pControlsHead;
-      v10 = pWindowList[v3].field_2C_focus_id;
+      v10 = pWindowList[v3].pCurrentPosActiveItem;
       if ( v10 > (signed int)v1 )
       {
         do
@@ -2251,16 +2251,16 @@
     }
     if ( v26 == 40 )
     {
-      v17 = pWindowList[v3].field_38;
-      v18 = pWindowList[v3].field_2C_focus_id;
-      if ( v18 >= pWindowList[v3].field_28 + v17 - 1 )
-        pWindowList[v3].field_2C_focus_id = v17;
+      v17 = pWindowList[v3].pStartingPosActiveItem;
+      v18 = pWindowList[v3].pCurrentPosActiveItem;
+      if ( v18 >= pWindowList[v3].pNumPresenceButton + v17 - 1 )
+        pWindowList[v3].pCurrentPosActiveItem = v17;
       else
-        pWindowList[v3].field_2C_focus_id = v18 + 1;
+        pWindowList[v3].pCurrentPosActiveItem = v18 + 1;
       if ( pWindowList[v3].field_30 != v1 )
         return 1;
       v19 = pWindowList[v3].pControlsHead;
-      v20 = pWindowList[v3].field_2C_focus_id;
+      v20 = pWindowList[v3].pCurrentPosActiveItem;
       if ( v20 > (signed int)v1 )
       {
         do
@@ -2275,9 +2275,9 @@
     if ( v26 == 41 )
     {
       pMouse->GetClickPos(&uClickX, &uClickY);
-      v4 = pWindowList[v3].field_38;
-      v28 = v4 + pWindowList[v3].field_28;
-      if ( v4 < v4 + pWindowList[v3].field_28 )
+      v4 = pWindowList[v3].pStartingPosActiveItem;
+      v28 = v4 + pWindowList[v3].pNumPresenceButton;
+      if ( v4 < v4 + pWindowList[v3].pNumPresenceButton )
       {
         while ( 1 )
         {
@@ -2302,7 +2302,7 @@
             goto LABEL_45;
         }
 LABEL_66:
-        pWindowList[v3].field_2C_focus_id = v4;
+        pWindowList[v3].pCurrentPosActiveItem = v4;
         return 1;
       }
 LABEL_46:
@@ -2311,18 +2311,18 @@
     }
     goto LABEL_47;
   }
-  v22 = pWindowList[v3].field_2C_focus_id;
-  v23 = pWindowList[v3].field_38;
+  v22 = pWindowList[v3].pCurrentPosActiveItem;
+  v23 = pWindowList[v3].pStartingPosActiveItem;
   if ( v22 <= v23 )
-    v24 = pWindowList[v3].field_28 + v23 - 1;
+    v24 = pWindowList[v3].pNumPresenceButton + v23 - 1;
   else
     v24 = v22 - 1;
   v8 = pWindowList[v3].field_30 == v1;
-  pWindowList[v3].field_2C_focus_id = v24;
+  pWindowList[v3].pCurrentPosActiveItem = v24;
   if ( !v8 )
     return 1;
   v19 = pWindowList[v3].pControlsHead;
-  v25 = pWindowList[v3].field_2C_focus_id;
+  v25 = pWindowList[v3].pCurrentPosActiveItem;
   if ( v25 > (signed int)v1 )
   {
     do
@@ -3952,7 +3952,7 @@
       8u,
       (Texture *)(uTextureID_RestUI_restmain != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_RestUI_restmain] : 0));
     v10 = pParty->uCurrentHour;
-    dword_506F1C = pGUIWindow_CurrentMenu->field_2C_focus_id;
+    dword_506F1C = pGUIWindow_CurrentMenu->pCurrentPosActiveItem;
     if ( (signed int)pParty->uCurrentHour <= 12 )
     {
       if ( !v10 )