Mercurial > mm7
diff mm7_data.h @ 1227:312e895a6439
Слияние
author | Ritor1 |
---|---|
date | Fri, 07 Jun 2013 22:27:51 +0600 |
parents | 33b30398e286 569216b4f54d |
children | ac1b79c498a8 |
line wrap: on
line diff
--- a/mm7_data.h Fri Jun 07 22:24:11 2013 +0600 +++ b/mm7_data.h Fri Jun 07 22:27:51 2013 +0600 @@ -312,25 +312,15 @@ extern int dword_4DF380[]; // weak extern int dword_4DF390; // weak extern char Str2[]; // idb -extern int dword_4DF3A4; // weak + extern char byte_4E185C; // weak -extern char am_byte_4E185D; // weak + extern char byte_4E185E; // weak -extern int amuint_4E1860; // weak -extern int amuint_4E1864; // weak -extern int amuint_4E1868; // weak -extern int amuint_4E186C; // weak -extern int amuint_4E1870; // weak -extern int dword_4E1874; // weak -extern int dword_4E1878; // weak + + extern float flt_4D84E8; -extern int dword_4E187C; // weak -extern int dword_4E1880; // weak -extern int dword_4E1884; // weak -extern int dword_4E1888; // weak -extern char pArcomagePlayer2Name[8]; -extern char pArcomagePlayer1Name[8]; -extern char pDeckMaster[12]; + + extern char aIxf[4]; // idb extern _UNKNOWN unk_4E19FC; // weak extern char aD[]; // idb @@ -549,8 +539,7 @@ extern _UNKNOWN unk_4FAA20; // weak extern char byte_4FAA24; // weak extern HWND dword_4FAA28; // idb -extern char byte_4FAA2C; // weak -extern char byte_4FAA2D; // weak + extern char byte_4FAA2E; // weak extern int amuint_4FAA34; // weak extern int amuint_4FAA38; // weak @@ -562,12 +551,12 @@ extern int amuint_4FAA5C_blt_xy[2]; extern int dword_4FAA64; // weak extern int dword_4FAA68; // weak -extern int amuint_4FAA6C; // idb + extern int dword_4FAA70; // weak extern char byte_4FAA74; // weak extern char am_byte_4FAA75; // weak extern char am_byte_4FAA76; // weak -extern char am_byte_4FAA77; // weak + extern int amuint_4FAA78[777]; // weak extern char am_byte_4FAA7C[777]; // weak extern int amuint_4FAA80[777]; // weak @@ -576,10 +565,10 @@ extern int amuint_4FAA8C[777]; // weak extern int amuint_4FAA90[777][2]; extern int dword_4FABB8; // weak -extern signed int dword_4FABBC; // idb -extern unsigned int amuint_4FABC0; // idb + + extern int amuint_4FABC4; // weak -extern int dword_4FABC8; // weak + extern char byte_4FABD0[]; // weak extern char byte_4FABD1[]; // weak extern _UNKNOWN unk_4FABD4; // weak @@ -598,11 +587,9 @@ extern int dword_4FAC08[]; // weak extern int dword_4FAC0C[]; // weak extern _UNKNOWN unk_5052C8; // weak -extern int dword_505314[]; // weak + extern char byte_5054C8[32]; // idb -extern char byte_5054E8[108]; -extern int dword_505554[]; // weak -extern _UNKNOWN unk_505704; // weak + extern char byte_505880; // weak extern char byte_505881; // weak extern int amuint_505884; // weak @@ -1169,47 +1156,7 @@ unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup); unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2); void __cdecl PrepareArcomage(); -char __cdecl am_409FE9(); -char __cdecl am_40A198(); -int __fastcall am_40A255(int a1, int a2); -int __fastcall am_40A283(int a1, int a2); -signed int __fastcall am_40A324(int a1); -int __fastcall am_40A346(int a1); -void __cdecl am_40A383(); -bool __cdecl am_40A514(); -char __thiscall am_40A560(unsigned int _this); -void __thiscall am_blts(int a1); // idb -void __cdecl am_40AA4E(); -void __cdecl am_chroma_blts(); -void __cdecl am_DrawUI(); -void __fastcall am_40B102(int a1, char *a2, int *pXY); // idb -void __fastcall am_40B17E(int a1, int a2, int *pXY); // idb -void __fastcall am_40B1F3(int a1, int a2, int a3); -void __fastcall am_40B268(int a1, char *a2, int *pXY); // idb -void __cdecl am_chroma_and_copy_blts(); -void __cdecl am_chroma_blt(); -void __cdecl am_40B4B9(); -void __fastcall am_40B76F(int a1); -int __fastcall am_40BB49(int a1); -signed int __fastcall am_40BB67(int a1); -char __fastcall am_40BCFB(int a1, signed int a2); -bool __fastcall am_40BE0E(int a1, signed int a2); -bool __fastcall am_40BF15(int a1, int a2); -void __fastcall am_40BF77(int a1, unsigned int uCardID); // idb -int __fastcall am_40D2B4(struct Vec2_int_ *, int); // weak -int __fastcall am_40D402(int, int); // weak -int __cdecl am_40D444(); -void ModalWindow(const char *pStr, int a4); -void pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY); -void __thiscall am_BeginScene(unsigned __int16 *pPcxPixels, int a2, int a3); // idb -void __fastcall Blt_Chroma(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3, int a4); -void __fastcall Blt_Copy(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3); -void __cdecl am_EndScene(); -void __fastcall DrawRect(struct Vec4_int_ *pXYZW, unsigned __int16 uColor, char bSolidFill); // idb -int __fastcall rand_interval(int a, int b); // idb -char *__fastcall inv_strcat(const char *Source, char *Dest); -char *__fastcall inv_strcpy(const char *Source, char *Dest); -void __fastcall intToString(int val, char *pOut); + // int __cdecl crt_retnull_sub(); unsigned int __stdcall R8G8B8_to_TargetFormat(int uColor); // idb unsigned short TargetColor(unsigned __int16 r, unsigned __int16 g, unsigned __int16 b); // idb