comparison mm7_data.h @ 208:07eb7d649bd5

Слияние
author Ritor1
date Sat, 16 Feb 2013 08:42:58 +0600
parents 9b77686e2239
children 982c1ec5a983
comparison
equal deleted inserted replaced
207:f96601c7e503 208:07eb7d649bd5
1413 extern char *pStatsTXT_Raw; 1413 extern char *pStatsTXT_Raw;
1414 extern char *pSkillDescTXT_Raw; 1414 extern char *pSkillDescTXT_Raw;
1415 extern struct StorylineText *pStorylineText; 1415 extern struct StorylineText *pStorylineText;
1416 extern struct FactionTable *pFactionTable; 1416 extern struct FactionTable *pFactionTable;
1417 extern char byte_5C8D1A[]; // weak 1417 extern char byte_5C8D1A[]; // weak
1418 extern char *pGlobalTXT_LocalizationStrings[677]; 1418
1419 extern char byte_5E4C15[]; // weak 1419 extern char byte_5E4C15[]; // weak
1420 extern char *pSomeItemsNames[14]; 1420 extern char *pSomeItemsNames[14];
1421 extern char *pGlobalTXT_Raw; 1421
1422 extern char *pMonstersTXT_Raw; 1422 extern char *pMonstersTXT_Raw;
1423 extern char *pMonsterPlacementTXT_Raw; 1423 extern char *pMonsterPlacementTXT_Raw;
1424 extern char *pSpellsTXT_Raw; 1424 extern char *pSpellsTXT_Raw;
1425 extern char *pMapStatsTXT_Raw; 1425 extern char *pMapStatsTXT_Raw;
1426 extern char *pHostileTXT_Raw; 1426 extern char *pHostileTXT_Raw;
2076 *p++ = value; 2076 *p++ = value;
2077 } 2077 }
2078 inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);} 2078 inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);}
2079 // int __cdecl crt_452B74(); 2079 // int __cdecl crt_452B74();
2080 int __cdecl j_SetSomeItemsNames(); 2080 int __cdecl j_SetSomeItemsNames();
2081 void __cdecl SetSomeItemsNames(); 2081
2082 char *RemoveQuotes(char *Str);
2083 void __cdecl InitializeGameText();
2084 unsigned int __fastcall ParseSpellType(struct FrameTableTxtLine *, int a2); 2082 unsigned int __fastcall ParseSpellType(struct FrameTableTxtLine *, int a2);
2085 int __thiscall ParseAttackType(unsigned __int8 *_this); 2083 int __thiscall ParseAttackType(unsigned __int8 *_this);
2086 char __fastcall ParseDamage(const char *Str, int a2, int a3, int a4); 2084 char __fastcall ParseDamage(const char *Str, int a2, int a3, int a4);
2087 int __fastcall ParseMissleAttackType(const char *Str1); 2085 int __fastcall ParseMissleAttackType(const char *Str1);
2088 unsigned int __fastcall SkillToMastery(unsigned __int16 a1); 2086 unsigned int __fastcall SkillToMastery(unsigned __int16 a1);
2384 int __cdecl sub_4D79FD(int a1, int a2, int a3, int a4); 2382 int __cdecl sub_4D79FD(int a1, int a2, int a3, int a4);
2385 int __cdecl sub_4D7A10(int a1, int a2, int a3, int a4); 2383 int __cdecl sub_4D7A10(int a1, int a2, int a3, int a4);
2386 int /*__usercall*/ sr_sub_4D72EC/*<eax>*/(int a1/*<ebp>*/); 2384 int /*__usercall*/ sr_sub_4D72EC/*<eax>*/(int a1/*<ebp>*/);
2387 int /*__usercall*/ sr_sub_4D73DF/*<eax>*/(int a1/*<ebp>*/); 2385 int /*__usercall*/ sr_sub_4D73DF/*<eax>*/(int a1/*<ebp>*/);
2388 signed int __fastcall SpawnRandomTreasure(struct MapInfo *a1, struct SpawnPointMM7 *a2); 2386 signed int __fastcall SpawnRandomTreasure(struct MapInfo *a1, struct SpawnPointMM7 *a2);
2389 bool __fastcall DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, struct Vec3_int_ *pVelocity); 2387 void DamageMonsterFromParty(signed int a1, unsigned int uActorID_Monster, struct Vec3_int_ *pVelocity);
2390 2388
2391 2389
2392 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0) 2390 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0)
2393 2391
2394 2392