Mercurial > mm7
diff mm7_data.h @ 906:23655ae9cd18
Слияние
author | Ritor1 |
---|---|
date | Fri, 19 Apr 2013 18:11:28 +0600 |
parents | 6daea87a3fe3 4dc2252e0b03 |
children | f3ccfc765502 |
line wrap: on
line diff
--- a/mm7_data.h Fri Apr 19 18:11:01 2013 +0600 +++ b/mm7_data.h Fri Apr 19 18:11:28 2013 +0600 @@ -487,7 +487,7 @@ //extern const char *format_4E2DC8; extern char aS[]; // idb extern char aLuSLuS[]; // idb -extern char byte_4E2DE8; // idb +extern const char *format_4E2DE8; // idb extern char asc_4E2DFC[3]; // idb extern const char *format_4E2E00; // idb extern const char *format_4E2E10; // format text of resistance in Stats screen @@ -603,20 +603,20 @@ extern int pPaperdoll_BodyY; // weak extern int paperdoll_Armor[4][17][2]; extern int paperdoll_shoulder[4][17][2]; -extern int dword_4E5270[8]; +extern int dword_4E5270[4][2]; extern int paperdoll_Boot[4][7][2]; extern int paperdoll_Cloak[4][10][2]; -extern int dword_4E56B0[64][2]; // weak +extern int paperdoll_CloakCollar[4][10][2]; //extern int dword_4E56B4; // weak extern int paperdoll_Belt[4][7][2]; -extern int paperdoll_Helm[64][2]; // weak +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[8]; -extern int pPaperdollLeftEmptyHand[8]; +extern int pPaperdoll_RightHand[4][2]; +extern int pPaperdollLeftEmptyHand[4][2]; extern int pPaperdollRingsX[6]; extern int pPaperdollRingsY[6]; extern char aItem092v3[]; // idb @@ -1088,25 +1088,26 @@ extern Vec3_int_ layingitem_vel_50FDFC; extern char pStartingMapName[]; // idb extern unsigned __int8 IsPlayerWearingWatersuit[5]; -extern char byte_5111C0[54]; +extern char party_has_equipment[54]; extern char byte_5111F6[]; extern unsigned int papredoll_dbrds[16]; extern unsigned int papredoll_drhs[4]; extern unsigned int papredoll_dlhus[4]; extern unsigned int papredoll_dlhs[4]; extern unsigned int papredoll_dbods[5]; -extern int paperdoll_array_511290[4][17][3]; +extern int paperdoll_armor_texture[4][17][3];//0x511290 +//extern int paperdoll_array_51132C[165]; extern unsigned int papredoll_dlaus[5]; extern unsigned int papredoll_dlads[4]; extern int papredoll_flying_feet[]; // idb -extern int dword_511638[4][6]; -extern int dword_511788[]; // weak -extern int dword_51179C; // weak -extern int dword_5117A0; // weak -extern int dword_5117A4; // weak -extern int dword_5117A8; // weak -extern int dword_5117AC; // weak -extern int paperdoll_array_511828[4][10]; +extern int paperdoll_boots_texture[4][6]; +extern int paperdoll_cloak_collar_texture[4][10]; // weak +//extern int dword_51179C; // weak +//extern int dword_5117A0; // weak +//extern int dword_5117A4; // weak +//extern int dword_5117A8; // weak +//extern int dword_5117AC; // weak +extern int paperdoll_cloak_texture[4][10]; extern int bRingsShownInCharScreen; // weak extern int _unused000; // weak @@ -1733,12 +1734,12 @@ // int __cdecl crt_deconstruct_43B9E3(); int __stdcall DirectInputMouse_enumerator(int, int); // weak void CharacterUI_LoadPaperdollTextures(); -int __fastcall _43C91D_FormItemTextureFilename(char *a1, signed int a2, int a3, int a4); +int __fastcall GetItemTextureFilename(char *pOut, signed int item_id, int index, int shoulder); void __fastcall CharacterUI_DrawPaperdoll(unsigned int uPlayerID); // idb void __fastcall CharacterUI_DrawPaperdollWithRingOverlay(unsigned int uPlayerID); // idb bool _43ED6F_check_party_races(bool b); bool __thiscall sub_43EDB9_get_some_race_sex_relation_2(unsigned int _this); -bool __fastcall sub_43EE15_player_has_item(unsigned int uItemID, struct Player *pPlayer, char a3); +bool __fastcall Player_has_item(unsigned int uItemID, struct Player *pPlayer, char a3); bool __fastcall sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(signed int a1); void __fastcall WetsuitOn(unsigned int uPlayerID); // idb unsigned int __fastcall WetsuitOff(unsigned int uPlayerID);