Mercurial > mm7
diff Actor.cpp @ 373:edd2d8b7e3c4
Interface reloading fix & party alignment enum
author | Nomad |
---|---|
date | Fri, 22 Feb 2013 18:40:38 +0200 |
parents | d720a13e2273 |
children | 243418228760 |
line wrap: on
line diff
--- a/Actor.cpp Fri Feb 22 17:56:00 2013 +0200 +++ b/Actor.cpp Fri Feb 22 18:40:38 2013 +0200 @@ -151,14 +151,14 @@ NPCData *v4; // eax@1 NPCData *v5; // ebp@1 unsigned int v6; // eax@1 - signed int v7; // eax@3 + //signed int v7; // eax@3 unsigned int v8; // eax@8 int v9; // esi@8 int v10; // eax@11 GUIWindow *v11; // ecx@19 signed int v12; // eax@21 //int v13; // [sp-8h] [bp-44h]@34 - const char *v14; // [sp-4h] [bp-40h]@4 + //const char *v14; // [sp-4h] [bp-40h]@4 //int v15; // [sp-4h] [bp-40h]@34 signed int v16; // [sp-4h] [bp-40h]@35 int v17; // [sp+10h] [bp-2Ch]@1 @@ -181,9 +181,9 @@ v6 = v4->uFlags; if ( (v6 & 3) != 2 ) v5->uFlags = v6 + 1; - v7 = const_2(); + /*v7 = const_2(); sprintf(pContainer, "evt%02d", v7); - if ( !pParty->uAlignment ) + if (pParty->alignment == PartyAlignment_Good) { v14 = "-b"; strcat(pContainer, v14); @@ -192,7 +192,15 @@ { v14 = "-c"; strcat(pContainer, v14); + }*/ + + switch (pParty->alignment) + { + case PartyAlignment_Good: sprintf(pContainer, "evt%02d-b", const_2()); break; + case PartyAlignment_Neutral: sprintf(pContainer, "evt%02d", const_2()); break; + case PartyAlignment_Evil: sprintf(pContainer, "evt%02d-c", const_2()); break; } + v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); array_5913D8[6] = 0; uNumDialogueNPCPortraits = 1;