Mercurial > mm7
diff mm7_data.h @ 208:07eb7d649bd5
Слияние
author | Ritor1 |
---|---|
date | Sat, 16 Feb 2013 08:42:58 +0600 |
parents | 9b77686e2239 |
children | 982c1ec5a983 |
line wrap: on
line diff
--- a/mm7_data.h Sat Feb 16 08:42:43 2013 +0600 +++ b/mm7_data.h Sat Feb 16 08:42:58 2013 +0600 @@ -1415,10 +1415,10 @@ extern struct StorylineText *pStorylineText; extern struct FactionTable *pFactionTable; extern char byte_5C8D1A[]; // weak -extern char *pGlobalTXT_LocalizationStrings[677]; + extern char byte_5E4C15[]; // weak extern char *pSomeItemsNames[14]; -extern char *pGlobalTXT_Raw; + extern char *pMonstersTXT_Raw; extern char *pMonsterPlacementTXT_Raw; extern char *pSpellsTXT_Raw; @@ -2078,9 +2078,7 @@ inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);} // int __cdecl crt_452B74(); int __cdecl j_SetSomeItemsNames(); -void __cdecl SetSomeItemsNames(); -char *RemoveQuotes(char *Str); -void __cdecl InitializeGameText(); + unsigned int __fastcall ParseSpellType(struct FrameTableTxtLine *, int a2); int __thiscall ParseAttackType(unsigned __int8 *_this); char __fastcall ParseDamage(const char *Str, int a2, int a3, int a4); @@ -2386,7 +2384,7 @@ int /*__usercall*/ sr_sub_4D72EC/*<eax>*/(int a1/*<ebp>*/); int /*__usercall*/ sr_sub_4D73DF/*<eax>*/(int a1/*<ebp>*/); signed int __fastcall SpawnRandomTreasure(struct MapInfo *a1, struct SpawnPointMM7 *a2); -bool __fastcall DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, struct Vec3_int_ *pVelocity); +void DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, struct Vec3_int_ *pVelocity); #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0)