Mercurial > mm7

comparison mm7_4.cpp @ 613:5bf285f56fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 07 Mar 2013 22:45:43 +0600
parents 346dc5fc2969 975a231bb4ec
children 8a0ec99a5177
comparison
equal deleted inserted replaced
612:346dc5fc2969 613:5bf285f56fa8
4902 { 4902 {
4903 //__debugbreak(); // fix 4903 //__debugbreak(); // fix
4904 npc = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0) - 1)]; 4904 npc = HouseNPCData[(unsigned int)((char *)pDialogueNPCCount + -(dword_591080 != 0) - 1)];
4905 } 4905 }
4906 else 4906 else
4907 npc = GetNPCData(uDialogue_SpeakingActorNPC_ID); 4907 npc = GetNPCData(sDialogue_SpeakingActorNPC_ID);
4908 //v65 = v9; 4908 //v65 = v9;
4909 //v10 = 0; 4909 //v10 = 0;
4910 //v64 = 0; 4910 //v64 = 0;
4911 4911
4912 //int i = 0; 4912 //int i = 0;
10587 NPCData *v0; // ST40_4@1 10587 NPCData *v0; // ST40_4@1
10588 signed int v1; // edi@1 10588 signed int v1; // edi@1
10589 //GUIWindow *v2; // ecx@1 10589 //GUIWindow *v2; // ecx@1
10590 10590
10591 __debugbreak(); 10591 __debugbreak();
10592 v0 = GetNPCData(uDialogue_SpeakingActorNPC_ID); 10592 v0 = GetNPCData(sDialogue_SpeakingActorNPC_ID);
10593 v1 = 0; 10593 v1 = 0;
10594 pDialogueWindow->eWindowType = WINDOW_MainMenu; 10594 pDialogueWindow->eWindowType = WINDOW_MainMenu;
10595 pDialogueWindow->Release(); 10595 pDialogueWindow->Release();
10596 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0); 10596 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0);
10597 if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) ) 10597 if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
11941 char *v13; // [sp-8h] [bp-18h]@60 11941 char *v13; // [sp-8h] [bp-18h]@60
11942 size_t v14; // [sp-4h] [bp-14h]@46 11942 size_t v14; // [sp-4h] [bp-14h]@46
11943 const char *v15; // [sp-4h] [bp-14h]@60 11943 const char *v15; // [sp-4h] [bp-14h]@60
11944 11944
11945 //v1 = _this; 11945 //v1 = _this;
11946 speakingNPC = GetNPCData(uDialogue_SpeakingActorNPC_ID); 11946 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
11947 //v3 = v1; 11947 //v3 = v1;
11948 uDialogueType = newDialogueType; 11948 uDialogueType = newDialogueType;
11949 if ( !speakingNPC->uFlags ) 11949 if ( !speakingNPC->uFlags )
11950 { 11950 {
11951 speakingNPC->uFlags = 1; 11951 speakingNPC->uFlags = 1;
12048 pParty->field_709 = 0; 12048 pParty->field_709 = 0;
12049 sub_44A56A(); 12049 sub_44A56A();
12050 12050
12051 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 12051 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
12052 12052
12053 if ( (uDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 ) 12053 if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 )
12054 pDialogue_SpeakingActor->uAIState = Removed; 12054 pDialogue_SpeakingActor->uAIState = Removed;
12055 if ( uActiveCharacter ) 12055 if ( uActiveCharacter )
12056 pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0); 12056 pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0);
12057 goto LABEL_87; 12057 goto LABEL_87;
12058 if (newDialogueType == DIALOGUE_9) 12058 if (newDialogueType == DIALOGUE_9)
13851 } 13851 }
13852 if ( !pGame->pIndoorCameraD3D->ApplyViewTransform_TrueIfStillVisible(a1a, a2, a3, &x, &y, &z, 1) 13852 if ( !pGame->pIndoorCameraD3D->ApplyViewTransform_TrueIfStillVisible(a1a, a2, a3, &x, &y, &z, 1)
13853 || (v0 = (RenderBillboard *)abs(x), (signed int)v0 < abs(y)) ) 13853 || (v0 = (RenderBillboard *)abs(x), (signed int)v0 < abs(y)) )
13854 continue; 13854 continue;
13855 pGame->pIndoorCameraD3D->Project(x, y, z, &v43, &a6); 13855 pGame->pIndoorCameraD3D->Project(x, y, z, &v43, &a6);
13856
13857 v0 = &pBillboardRenderList[uNumBillboardsToDraw]; 13856 v0 = &pBillboardRenderList[uNumBillboardsToDraw];
13858 if (uNumBillboardsToDraw >= 500) 13857 if (uNumBillboardsToDraw >= 500)
13859 break; 13858 break;
13860 ++uNumBillboardsToDraw; 13859 ++uNumBillboardsToDraw;
13861 ++uNumSpritesDrawnThisFrame; 13860 ++uNumSpritesDrawnThisFrame;