diff mm7_data.h @ 944:7cbe4f80e322

Слияние
author Ritor1
date Wed, 01 May 2013 17:06:31 +0600
parents 016e3577865c
children 5a2dbb00c399
line wrap: on
line diff
--- a/mm7_data.h	Wed May 01 17:06:18 2013 +0600
+++ b/mm7_data.h	Wed May 01 17:06:31 2013 +0600
@@ -342,6 +342,7 @@
 extern char aPending[]; // idb
 extern char aCanTFindS[]; // idb
 extern char pDayMoonPhase[28];
+extern int paperdoll_Weapon[4][16][2];
 extern char *spellbook_texture_filename_suffices[]; // weak
 extern __int16 word_4E1D3A[]; // weak
 extern __int16 pTownPortalBook_xs[6];
@@ -603,16 +604,15 @@
 extern int pPaperdoll_BodyY; // weak
 extern int paperdoll_Armor[4][17][2];
 extern int paperdoll_shoulder[4][17][2];
+extern int paperdoll_helm_texture[2][16];
+extern int paperdoll_belt_texture[2][7];
 extern int dword_4E5270[4][2];
 extern int paperdoll_Boot[4][7][2];
 extern int paperdoll_Cloak[4][10][2];
 extern int paperdoll_CloakCollar[4][10][2];
-//extern int dword_4E56B4; // weak
 extern int paperdoll_Belt[4][7][2];
 extern int paperdoll_Helm[4][16][2];
-//extern int dword_4E58D4[]; // weak
 extern int pPaperdoll_Beards[4]; // weak
-extern int dword_4E5AD4[]; // weak
 extern int pPaperdoll_LeftHand[4][2];
 extern int pPaperdoll_SecondLeftHand[4][2];
 extern int pPaperdoll_RightHand[4][2];
@@ -621,10 +621,6 @@
 extern int pPaperdollRingsY[6];
 extern char aItem092v3[]; // idb
 extern char aIbCd5D[]; // idb
-extern char aAr_dn_dn[]; // idb
-extern char aAr_dn_up[]; // idb
-extern char aAr_up_dn[]; // idb
-extern char aAr_up_up[]; // idb
 extern char aItem281pc02d[]; // idb
 extern char aPc02dbrd[]; // idb
 extern char aPc23vDlhu[]; // idb
@@ -1538,8 +1534,6 @@
 unsigned int __fastcall SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID);
 unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup);
 unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2);
-// char __usercall am_408BB4<al>(int a1<ecx>, int a2<ebp>);
-void __cdecl sub_409BE8();
 void __cdecl PrepareArcomage();
 char __cdecl am_409FE9();
 char __cdecl am_40A198();