Mercurial > mm7

comparison mm7_5.cpp @ 402:74205b91647b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 23 Feb 2013 15:10:34 +0600
parents 787b2c441840 35a62d1948d4
children a05e12cac518
comparison
equal deleted inserted replaced
401:787b2c441840 402:74205b91647b
9585 if ( v1->uActorQueueSize > v2 ) 9585 if ( v1->uActorQueueSize > v2 )
9586 { 9586 {
9587 v8 = v1->pQueue; 9587 v8 = v1->pQueue;
9588 do 9588 do
9589 { 9589 {
9590 if ( (v8->uPackedID & 7) == OBJECT_Actor && ai_array_4F7DB0_actor_ids[v20] == v8->uPackedID >> 3 ) 9590 if ( (v8->uPackedID & 7) == OBJECT_Actor && ai_near_actors_ids[v20] == v8->uPackedID >> 3 )
9591 break; 9591 break;
9592 ++v18; 9592 ++v18;
9593 ++v8; 9593 ++v8;
9594 } 9594 }
9595 while ( v18 < v1->uActorQueueSize ); 9595 while ( v18 < v1->uActorQueueSize );
9596 v2 = 0; 9596 v2 = 0;
9597 } 9597 }
9598 if ( v18 == v1->uActorQueueSize ) 9598 if ( v18 == v1->uActorQueueSize )
9599 { 9599 {
9600 v9 = ai_array_4F7DB0_actor_ids[v20]; 9600 v9 = ai_near_actors_ids[v20];
9601 *(int *)v7 = 1; 9601 *(int *)v7 = 1;
9602 *((int *)v7 + 2) = v2; 9602 *((int *)v7 + 2) = v2;
9603 *((int *)v7 - 1) = 8 * v9 | 3; 9603 *((int *)v7 - 1) = 8 * v9 | 3;
9604 *((int *)v7 + 1) = v2; 9604 *((int *)v7 + 1) = v2;
9605 ++v3; 9605 ++v3;
13867 v2 = 1; 13867 v2 = 1;
13868 goto LABEL_15; 13868 goto LABEL_15;
13869 } 13869 }
13870 v2 = 1; 13870 v2 = 1;
13871 v31 = 1; 13871 v31 = 1;
13872 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13872 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13873 LABEL_15: 13873 LABEL_15:
13874 dword_506568 = 0; 13874 dword_506568 = 0;
13875 pRenderer->DrawTextureTransparent(pViewport->uViewportX + 398, pViewport->uViewportY + 113, pTexture_506394); 13875 pRenderer->DrawTextureTransparent(pViewport->uViewportX + 398, pViewport->uViewportY + 113, pTexture_506394);
13876 LABEL_16: 13876 LABEL_16:
13877 if ( dword_50653C ) 13877 if ( dword_50653C )
13878 { 13878 {
13879 if ( dword_506568 != v2 ) 13879 if ( dword_506568 != v2 )
13880 { 13880 {
13881 v31 = v2; 13881 v31 = v2;
13882 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13882 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13883 } 13883 }
13884 } 13884 }
13885 else 13885 else
13886 { 13886 {
13887 if ( dword_506568 != v2 ) 13887 if ( dword_506568 != v2 )
13901 if ( dword_506538 ) 13901 if ( dword_506538 )
13902 { 13902 {
13903 if ( dword_506568 != 2 ) 13903 if ( dword_506568 != 2 )
13904 { 13904 {
13905 v31 = v2; 13905 v31 = v2;
13906 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13906 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13907 } 13907 }
13908 } 13908 }
13909 else 13909 else
13910 { 13910 {
13911 if ( dword_506568 != 2 ) 13911 if ( dword_506568 != 2 )
13925 if ( dword_506534 ) 13925 if ( dword_506534 )
13926 { 13926 {
13927 if ( dword_506568 != 3 ) 13927 if ( dword_506568 != 3 )
13928 { 13928 {
13929 v31 = v2; 13929 v31 = v2;
13930 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13930 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13931 } 13931 }
13932 } 13932 }
13933 else 13933 else
13934 { 13934 {
13935 if ( dword_506568 != 3 ) 13935 if ( dword_506568 != 3 )
13949 if ( dword_506530 ) 13949 if ( dword_506530 )
13950 { 13950 {
13951 if ( dword_506568 != 4 ) 13951 if ( dword_506568 != 4 )
13952 { 13952 {
13953 v31 = v2; 13953 v31 = v2;
13954 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13954 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13955 } 13955 }
13956 } 13956 }
13957 else 13957 else
13958 { 13958 {
13959 if ( dword_506568 != 4 ) 13959 if ( dword_506568 != 4 )
13973 if ( dword_50652C ) 13973 if ( dword_50652C )
13974 { 13974 {
13975 if ( dword_506568 != 5 ) 13975 if ( dword_506568 != 5 )
13976 { 13976 {
13977 v31 = v2; 13977 v31 = v2;
13978 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 13978 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
13979 } 13979 }
13980 } 13980 }
13981 else 13981 else
13982 { 13982 {
13983 if ( dword_506568 != 5 ) 13983 if ( dword_506568 != 5 )
14209 { 14209 {
14210 viewparams->_443225(); 14210 viewparams->_443225();
14211 //v6 = dword_506534; 14211 //v6 = dword_506534;
14212 } 14212 }
14213 if ( dword_506548 | dword_506544 | dword_506540 | dword_50653C | dword_506538 | dword_506534 ) 14213 if ( dword_506548 | dword_506544 | dword_506540 | dword_50653C | dword_506538 | dword_506534 )
14214 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 14214 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
14215 dword_506548 = 0; 14215 dword_506548 = 0;
14216 dword_506544 = 0; 14216 dword_506544 = 0;
14217 dword_506534 = 0; 14217 dword_506534 = 0;
14218 dword_506538 = 0; 14218 dword_506538 = 0;
14219 dword_50653C = 0; 14219 dword_50653C = 0;
15077 GameUI_MainMenu_DrawLoad(); 15077 GameUI_MainMenu_DrawLoad();
15078 continue; 15078 continue;
15079 case WINDOW_5E: // window that initiates savegame loading 15079 case WINDOW_5E: // window that initiates savegame loading
15080 { 15080 {
15081 if (pWindow->Hint != (char *)1) 15081 if (pWindow->Hint != (char *)1)
15082 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15082 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15083 auto pGUIButton3 = (GUIButton *)pWindow->ptr_1C; 15083 auto pGUIButton3 = (GUIButton *)pWindow->ptr_1C;
15084 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pGUIButton3->pTextures[0]); 15084 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pGUIButton3->pTextures[0]);
15085 pHint = pWindow->Hint; 15085 pHint = pWindow->Hint;
15086 viewparams->bRedrawGameUI = 1; 15086 viewparams->bRedrawGameUI = 1;
15087 if ( pHint && pHint != (char *)1 ) 15087 if ( pHint && pHint != (char *)1 )
15100 { 15100 {
15101 v33 = pWindowType - 96; 15101 v33 = pWindowType - 96;
15102 if ( pWindowType == WINDOW_60 )//96 15102 if ( pWindowType == WINDOW_60 )//96
15103 { 15103 {
15104 if ( pWindow->Hint != (char *)1 ) 15104 if ( pWindow->Hint != (char *)1 )
15105 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15105 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15106 pGUIButton = (GUIButton *)pWindow->ptr_1C; 15106 pGUIButton = (GUIButton *)pWindow->ptr_1C;
15107 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pGUIButton->pTextures[0]); 15107 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pGUIButton->pTextures[0]);
15108 pHint = pWindow->Hint; 15108 pHint = pWindow->Hint;
15109 viewparams->bRedrawGameUI = 1; 15109 viewparams->bRedrawGameUI = 1;
15110 if ( pHint && pHint != (char *)1 ) 15110 if ( pHint && pHint != (char *)1 )
15181 GUIButton2.uX = 27; 15181 GUIButton2.uX = 27;
15182 GUIButton2.uY = 161; 15182 GUIButton2.uY = 161;
15183 GUIButton2.uWidth = 171; 15183 GUIButton2.uWidth = 171;
15184 GUIButton2.uHeight = 37; 15184 GUIButton2.uHeight = 37;
15185 GUIButton2.pParent = pButton_RestUI_WaitUntilDawn->pParent; 15185 GUIButton2.pParent = pButton_RestUI_WaitUntilDawn->pParent;
15186 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15186 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15187 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)pWindow->ptr_1C + 15)); 15187 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)pWindow->ptr_1C + 15));
15188 viewparams->bRedrawGameUI = 1; 15188 viewparams->bRedrawGameUI = 1;
15189 GUIButton2.DrawLabel(pGlobalTXT_LocalizationStrings[183], pFontCreate, 0, 0);// 8 15189 GUIButton2.DrawLabel(pGlobalTXT_LocalizationStrings[183], pFontCreate, 0, 0);// 8
15190 GUIButton2.pParent = 0; 15190 GUIButton2.pParent = 0;
15191 //goto LABEL_134; 15191 //goto LABEL_134;
15193 //goto LABEL_110; 15193 //goto LABEL_110;
15194 pGUIWindow2->Release(); 15194 pGUIWindow2->Release();
15195 continue; 15195 continue;
15196 } 15196 }
15197 if ( pWindow->Hint != (char *)1 )//pWindowType == WINDOW_61 15197 if ( pWindow->Hint != (char *)1 )//pWindowType == WINDOW_61
15198 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15198 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15199 v32 = pWindow->ptr_1C; 15199 v32 = pWindow->ptr_1C;
15200 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 16)); 15200 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 16));
15201 //goto LABEL_138; 15201 //goto LABEL_138;
15202 pHint = pWindow->Hint; 15202 pHint = pWindow->Hint;
15203 viewparams->bRedrawGameUI = 1; 15203 viewparams->bRedrawGameUI = 1;
15217 } 15217 }
15218 15218
15219 if ( pWindowType == WINDOW_5F ) 15219 if ( pWindowType == WINDOW_5F )
15220 { 15220 {
15221 if ( pWindow->Hint != (char *)1 ) 15221 if ( pWindow->Hint != (char *)1 )
15222 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15222 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15223 v32 = pWindow->ptr_1C; 15223 v32 = pWindow->ptr_1C;
15224 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 15)); 15224 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)v32 + 15));
15225 //LABEL_138: 15225 //LABEL_138:
15226 pHint = pWindow->Hint; 15226 pHint = pWindow->Hint;
15227 viewparams->bRedrawGameUI = 1; 15227 viewparams->bRedrawGameUI = 1;
15283 } 15283 }
15284 v16 = v15 - 1; 15284 v16 = v15 - 1;
15285 if ( pWindowType == WINDOW_5A ) // Press buttons in title menu and in game, and escape in game 15285 if ( pWindowType == WINDOW_5A ) // Press buttons in title menu and in game, and escape in game
15286 { 15286 {
15287 if ( pWindow->Hint != (char *)1 ) 15287 if ( pWindow->Hint != (char *)1 )
15288 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15288 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15289 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C; 15289 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
15290 if ( pButtonPtr_1C->uX >= 0 )//if ( (pButtonPtr_1C->uX & 0x80000000u) == 0 ) 15290 if ( pButtonPtr_1C->uX >= 0 )//if ( (pButtonPtr_1C->uX & 0x80000000u) == 0 )
15291 { 15291 {
15292 if ( (signed int)pButtonPtr_1C->uX <= 640 ) 15292 if ( (signed int)pButtonPtr_1C->uX <= 640 )
15293 { 15293 {
15334 } 15334 }
15335 v17 = v16 - 1; 15335 v17 = v16 - 1;
15336 if ( pWindowType == WINDOW_5B )//Change button in Character window 15336 if ( pWindowType == WINDOW_5B )//Change button in Character window
15337 { 15337 {
15338 if ( pWindow->Hint != (char *)1 ) 15338 if ( pWindow->Hint != (char *)1 )
15339 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15339 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15340 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C; 15340 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
15341 pTexture2 = pButtonPtr_1C->pTextures[1]; 15341 pTexture2 = pButtonPtr_1C->pTextures[1];
15342 //LABEL_94: 15342 //LABEL_94:
15343 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pTexture2); 15343 pRenderer->DrawTextureIndexed(pWindow->uFrameX, pWindow->uFrameY, pTexture2);
15344 //LABEL_80: 15344 //LABEL_80:
15359 } 15359 }
15360 v18 = v17 - 1; 15360 v18 = v17 - 1;
15361 if ( pWindowType == WINDOW_VoiceSwitcherButton ) // Change page in AutonotesBook 15361 if ( pWindowType == WINDOW_VoiceSwitcherButton ) // Change page in AutonotesBook
15362 { 15362 {
15363 if ( pWindow->Hint != (char *)1 ) 15363 if ( pWindow->Hint != (char *)1 )
15364 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15364 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15365 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C; 15365 pButtonPtr_1C = (GUIButton *)pWindow->ptr_1C;
15366 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, pButtonPtr_1C->pTextures[0]); 15366 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, pButtonPtr_1C->pTextures[0]);
15367 //goto LABEL_80; 15367 //goto LABEL_80;
15368 pHint1 = pWindow->Hint; 15368 pHint1 = pWindow->Hint;
15369 viewparams->bRedrawGameUI = 1; 15369 viewparams->bRedrawGameUI = 1;
15379 } 15379 }
15380 v19 = v18 - 1; 15380 v19 = v18 - 1;
15381 if ( pWindowType == WINDOW_5D ) 15381 if ( pWindowType == WINDOW_5D )
15382 { 15382 {
15383 if ( pWindow->Hint != (char *)1 ) 15383 if ( pWindow->Hint != (char *)1 )
15384 pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); 15384 pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0);
15385 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)pWindow->ptr_1C + 16)); 15385 pRenderer->DrawTextureTransparent(pWindow->uFrameX, pWindow->uFrameY, *((Texture **)pWindow->ptr_1C + 16));
15386 viewparams->bRedrawGameUI = 1; 15386 viewparams->bRedrawGameUI = 1;
15387 //goto LABEL_134; 15387 //goto LABEL_134;
15388 pGUIWindow2 = pWindow; 15388 pGUIWindow2 = pWindow;
15389 //goto LABEL_110; 15389 //goto LABEL_110;