Mercurial > mm7

comparison Actor.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 628694cd5744
children 1ff57450f090
comparison
equal deleted inserted replaced
612:346dc5fc2969 613:5bf285f56fa8
44 ItemGen *v8; // ecx@15 44 ItemGen *v8; // ecx@15
45 45
46 v3 = 0; 46 v3 = 0;
47 if ( (signed int)uNumActors > 0 ) 47 if ( (signed int)uNumActors > 0 )
48 { 48 {
49 v4 = (int *)&pActors[0].uNPC_ID; 49 v4 = (int *)&pActors[0].sNPC_ID;
50 while ( *(short *)v4 != npc ) 50 while ( *(short *)v4 != npc )
51 { 51 {
52 ++v3; 52 ++v3;
53 v4 += 209; 53 v4 += 209;
54 if ( v3 >= (signed int)uNumActors ) 54 if ( v3 >= (signed int)uNumActors )
145 145
146 //----- (00445D4A) -------------------------------------------------------- 146 //----- (00445D4A) --------------------------------------------------------
147 void Actor::InitializeDialogue(int bPlayerSaysHello) 147 void Actor::InitializeDialogue(int bPlayerSaysHello)
148 { 148 {
149 Actor *v2; // esi@1 149 Actor *v2; // esi@1
150 unsigned int v3; // ecx@1 150 signed int v3; // ecx@1
151 NPCData *v4; // eax@1 151 NPCData *v4; // eax@1
152 NPCData *v5; // ebp@1 152 NPCData *v5; // ebp@1
153 unsigned int v6; // eax@1 153 unsigned int v6; // eax@1
154 //signed int v7; // eax@3 154 //signed int v7; // eax@3
155 unsigned int v8; // eax@8 155 unsigned int v8; // eax@8
171 dword_AE336C = -1; 171 dword_AE336C = -1;
172 pEventTimer->Pause(); 172 pEventTimer->Pause();
173 pMiscTimer->Pause(); 173 pMiscTimer->Pause();
174 pAudioPlayer->StopChannels(-1, -1); 174 pAudioPlayer->StopChannels(-1, -1);
175 uDialogueType = 0; 175 uDialogueType = 0;
176 v3 = v2->uNPC_ID; 176 v3 = v2->sNPC_ID;
177 uDialogue_SpeakingActorNPC_ID = v2->uNPC_ID; 177 sDialogue_SpeakingActorNPC_ID = v2->sNPC_ID;
178 pDialogue_SpeakingActor = v2; 178 pDialogue_SpeakingActor = v2;
179 v4 = GetNPCData(v3); 179 v4 = GetNPCData(v3);
180 v5 = v4; 180 v5 = v4;
181 v6 = v4->uFlags; 181 v6 = v4->uFlags;
182 if ( (v6 & 3) != 2 ) 182 if ( (v6 & 3) != 2 )
245 v16 = 2; 245 v16 = 2;
246 v9 = v16; 246 v9 = v16;
247 } 247 }
248 } 248 }
249 } 249 }
250 if ( (uDialogue_SpeakingActorNPC_ID & 0x80000000u) != 0 ) 250 if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) != 0 )
251 v9 = 4; 251 v9 = 4;
252 v11 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)10, v9, 0); 252 v11 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)10, v9, 0);
253 pDialogueWindow = v11; 253 pDialogueWindow = v11;
254 if (v5->Hired()) 254 if (v5->Hired())
255 { 255 {
3893 //----- (00459671) -------------------------------------------------------- 3893 //----- (00459671) --------------------------------------------------------
3894 void Actor::Reset() 3894 void Actor::Reset()
3895 { 3895 {
3896 this->pActorName[0] = 0; 3896 this->pActorName[0] = 0;
3897 this->word_000086_some_monster_id = 0; 3897 this->word_000086_some_monster_id = 0;
3898 this->uNPC_ID = 0; 3898 this->sNPC_ID = 0;
3899 this->vPosition.z = 0; 3899 this->vPosition.z = 0;
3900 this->vPosition.y = 0; 3900 this->vPosition.y = 0;
3901 this->vPosition.x = 0; 3901 this->vPosition.x = 0;
3902 this->vVelocity.z = 0; 3902 this->vVelocity.z = 0;
3903 this->vVelocity.y = 0; 3903 this->vVelocity.y = 0;