diff mm7_4.cpp @ 4:8e33efd39355

15.01.13(work)
author Ritor1
date Tue, 15 Jan 2013 17:44:23 +0600
parents bf31c505f4d3
children 13da46a8d45d
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Jan 13 17:41:47 2013 +0600
+++ b/mm7_4.cpp	Tue Jan 15 17:44:23 2013 +0600
@@ -5884,7 +5884,7 @@
     pAsyncMouse->Resume();
   v2 = 6;
   pGUIWindow_CurrentMenu->field_40 = 0;
-LABEL_27:
+//LABEL_27:
   SetCurrentMenuID((MENU_STATE)v2);
   while ( GetCurrentMenuID() == MENU_CREATEPARTY )
   {
@@ -5940,13 +5940,17 @@
       {
         v26 = 1;
         v2 = 0;
-        goto LABEL_27;
+        //goto LABEL_27;
+        SetCurrentMenuID((MENU_STATE)v2);
+        continue;
       }
       if ( uGameState == 6 )
       {
         uGameState = v1;
         v2 = 1;
-        goto LABEL_27;
+        //goto LABEL_27;
+        SetCurrentMenuID((MENU_STATE)v2);
+        continue;
       }
     }
   }
@@ -5990,12 +5994,12 @@
     if ( !pPlayer->uClass )
       pPlayer->sResMagicBase = 10;
     //*((short *)v10 + 400) = 0;
-	pPlayer->pPlayerBuffs[22].uExpireTime = 0;
+    pPlayer->pPlayerBuffs[22].uExpireTime = 0;
     uSpellBookPageCount = 0;
-	for ( int i = 0; i < 9; i++)
+    for ( int i = 0; i < 9; i++)
     {
       if ( pPlayer->pActiveSkills[12+i] )
-		  ++uSpellBookPageCount;
+        ++uSpellBookPageCount;
     }
     pPlayer->pNumSpellBookPage = uSpellBookPageCount;
     pItemsTable->GenerateItem(2, 40, &item);
@@ -6010,11 +6014,11 @@
         {
           case 0:
             v18 = 61;
-			pPlayer->AddItem(-1, v18);
+            pPlayer->AddItem(-1, v18);
             break;
           case 1:
             v18 = 1;
-			pPlayer->AddItem(-1, v18);
+            pPlayer->AddItem(-1, v18);
             break;
           case 2:
             v18 = 15;
@@ -6234,7 +6238,7 @@
       if ( a5 >= (signed __int16)pTexture2.uHeight )
         SetCurrentMenuID(MENU_MAIN);
       pRenderer->Present();
-      pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
+	  pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
       GUI_MainMenuMessageProc();
     }
   }