Mercurial > mm7

comparison Actor.cpp @ 373:edd2d8b7e3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Interface reloading fix & party alignment enum
author Nomad
date Fri, 22 Feb 2013 18:40:38 +0200
parents d720a13e2273
children 243418228760
comparison
equal deleted inserted replaced
372:6a2b4d1be013 373:edd2d8b7e3c4
149 Actor *v2; // esi@1 149 Actor *v2; // esi@1
150 unsigned int v3; // ecx@1 150 unsigned 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
156 int v9; // esi@8 156 int v9; // esi@8
157 int v10; // eax@11 157 int v10; // eax@11
158 GUIWindow *v11; // ecx@19 158 GUIWindow *v11; // ecx@19
159 signed int v12; // eax@21 159 signed int v12; // eax@21
160 //int v13; // [sp-8h] [bp-44h]@34 160 //int v13; // [sp-8h] [bp-44h]@34
161 const char *v14; // [sp-4h] [bp-40h]@4 161 //const char *v14; // [sp-4h] [bp-40h]@4
162 //int v15; // [sp-4h] [bp-40h]@34 162 //int v15; // [sp-4h] [bp-40h]@34
163 signed int v16; // [sp-4h] [bp-40h]@35 163 signed int v16; // [sp-4h] [bp-40h]@35
164 int v17; // [sp+10h] [bp-2Ch]@1 164 int v17; // [sp+10h] [bp-2Ch]@1
165 char pContainer[32]; // [sp+14h] [bp-28h]@3 165 char pContainer[32]; // [sp+14h] [bp-28h]@3
166 166
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 )
183 v5->uFlags = v6 + 1; 183 v5->uFlags = v6 + 1;
184 v7 = const_2(); 184 /*v7 = const_2();
185 sprintf(pContainer, "evt%02d", v7); 185 sprintf(pContainer, "evt%02d", v7);
186 if ( !pParty->uAlignment ) 186 if (pParty->alignment == PartyAlignment_Good)
187 { 187 {
188 v14 = "-b"; 188 v14 = "-b";
189 strcat(pContainer, v14); 189 strcat(pContainer, v14);
190 } 190 }
191 else if ( pParty->uAlignment == 2 ) 191 else if ( pParty->uAlignment == 2 )
192 { 192 {
193 v14 = "-c"; 193 v14 = "-c";
194 strcat(pContainer, v14); 194 strcat(pContainer, v14);
195 } 195 }*/
196
197 switch (pParty->alignment)
198 {
199 case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break;
200 case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break;
201 case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break;
202 }
203
196 v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 204 v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
197 array_5913D8[6] = 0; 205 array_5913D8[6] = 0;
198 uNumDialogueNPCPortraits = 1; 206 uNumDialogueNPCPortraits = 1;
199 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v8]; 207 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v8];
200 sprintf(pContainer, "npc%03u", v5->uPortraitID); 208 sprintf(pContainer, "npc%03u", v5->uPortraitID);