Mercurial > mm7

comparison mm7_4.cpp @ 4:8e33efd39355

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15.01.13(work)
author Ritor1
date Tue, 15 Jan 2013 17:44:23 +0600
parents bf31c505f4d3
children 13da46a8d45d
comparison
equal deleted inserted replaced
3:bf31c505f4d3 4:8e33efd39355
5882 pTexture_PCX.Load("makeme.pcx", 0); 5882 pTexture_PCX.Load("makeme.pcx", 0);
5883 if (pAsyncMouse) 5883 if (pAsyncMouse)
5884 pAsyncMouse->Resume(); 5884 pAsyncMouse->Resume();
5885 v2 = 6; 5885 v2 = 6;
5886 pGUIWindow_CurrentMenu->field_40 = 0; 5886 pGUIWindow_CurrentMenu->field_40 = 0;
5887 LABEL_27: 5887 //LABEL_27:
5888 SetCurrentMenuID((MENU_STATE)v2); 5888 SetCurrentMenuID((MENU_STATE)v2);
5889 while ( GetCurrentMenuID() == MENU_CREATEPARTY ) 5889 while ( GetCurrentMenuID() == MENU_CREATEPARTY )
5890 { 5890 {
5891 if ( pAsyncMouse != (void *)v1 ) 5891 if ( pAsyncMouse != (void *)v1 )
5892 pAsyncMouse->_46B736_consume_click_lists(1); 5892 pAsyncMouse->_46B736_consume_click_lists(1);
5938 pRenderer->Present(); 5938 pRenderer->Present();
5939 if ( uGameState == 1 ) 5939 if ( uGameState == 1 )
5940 { 5940 {
5941 v26 = 1; 5941 v26 = 1;
5942 v2 = 0; 5942 v2 = 0;
5943 goto LABEL_27; 5943 //goto LABEL_27;
5944 SetCurrentMenuID((MENU_STATE)v2);
5945 continue;
5944 } 5946 }
5945 if ( uGameState == 6 ) 5947 if ( uGameState == 6 )
5946 { 5948 {
5947 uGameState = v1; 5949 uGameState = v1;
5948 v2 = 1; 5950 v2 = 1;
5949 goto LABEL_27; 5951 //goto LABEL_27;
5952 SetCurrentMenuID((MENU_STATE)v2);
5953 continue;
5950 } 5954 }
5951 } 5955 }
5952 } 5956 }
5953 pTexture->Release(); 5957 pTexture->Release();
5954 pGUIWindow_CurrentMenu->Release(); 5958 pGUIWindow_CurrentMenu->Release();
5988 { 5992 {
5989 //v11 = pPlayer; 5993 //v11 = pPlayer;
5990 if ( !pPlayer->uClass ) 5994 if ( !pPlayer->uClass )
5991 pPlayer->sResMagicBase = 10; 5995 pPlayer->sResMagicBase = 10;
5992 //*((short *)v10 + 400) = 0; 5996 //*((short *)v10 + 400) = 0;
5993 pPlayer->pPlayerBuffs[22].uExpireTime = 0; 5997 pPlayer->pPlayerBuffs[22].uExpireTime = 0;
5994 uSpellBookPageCount = 0; 5998 uSpellBookPageCount = 0;
5995 for ( int i = 0; i < 9; i++) 5999 for ( int i = 0; i < 9; i++)
5996 { 6000 {
5997 if ( pPlayer->pActiveSkills[12+i] ) 6001 if ( pPlayer->pActiveSkills[12+i] )
5998 ++uSpellBookPageCount; 6002 ++uSpellBookPageCount;
5999 } 6003 }
6000 pPlayer->pNumSpellBookPage = uSpellBookPageCount; 6004 pPlayer->pNumSpellBookPage = uSpellBookPageCount;
6001 pItemsTable->GenerateItem(2, 40, &item); 6005 pItemsTable->GenerateItem(2, 40, &item);
6002 pPlayer->AddItem2(-1, &item); 6006 pPlayer->AddItem2(-1, &item);
6003 uSkillIdx = 0; 6007 uSkillIdx = 0;
6008 { 6012 {
6009 switch ( uSkillIdx ) 6013 switch ( uSkillIdx )
6010 { 6014 {
6011 case 0: 6015 case 0:
6012 v18 = 61; 6016 v18 = 61;
6013 pPlayer->AddItem(-1, v18); 6017 pPlayer->AddItem(-1, v18);
6014 break; 6018 break;
6015 case 1: 6019 case 1:
6016 v18 = 1; 6020 v18 = 1;
6017 pPlayer->AddItem(-1, v18); 6021 pPlayer->AddItem(-1, v18);
6018 break; 6022 break;
6019 case 2: 6023 case 2:
6020 v18 = 15; 6024 v18 = 15;
6021 pPlayer->AddItem(-1, v18); 6025 pPlayer->AddItem(-1, v18);
6022 break; 6026 break;
6232 pRenderer->EndScene(); 6236 pRenderer->EndScene();
6233 ++a5; 6237 ++a5;
6234 if ( a5 >= (signed __int16)pTexture2.uHeight ) 6238 if ( a5 >= (signed __int16)pTexture2.uHeight )
6235 SetCurrentMenuID(MENU_MAIN); 6239 SetCurrentMenuID(MENU_MAIN);
6236 pRenderer->Present(); 6240 pRenderer->Present();
6237 pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc() 6241 pCurrentScreen = 0;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
6238 GUI_MainMenuMessageProc(); 6242 GUI_MainMenuMessageProc();
6239 } 6243 }
6240 } 6244 }
6241 while ( GetCurrentMenuID() == MENU_Credits ); 6245 while ( GetCurrentMenuID() == MENU_Credits );
6242 pAudioPlayer->_4AA258(1); 6246 pAudioPlayer->_4AA258(1);