Mercurial > mm7
diff mm7_data.h @ 274:a9f58ca01454
Слияние
author | Ritor1 |
---|---|
date | Mon, 18 Feb 2013 16:37:17 +0600 |
parents | e5afd6848268 6e585f21a01e |
children | 0ea5fbd16edb 640a176c030f |
line wrap: on
line diff
--- a/mm7_data.h Mon Feb 18 16:37:04 2013 +0600 +++ b/mm7_data.h Mon Feb 18 16:37:17 2013 +0600 @@ -1933,7 +1933,7 @@ bool __fastcall sub_427769_spell(unsigned int uSpellID); bool __fastcall _42777D_CastSpell_UseWand_ShootArrow(int a1, unsigned int uPlayerID, unsigned int a4, __int16 a5, int a6); int __fastcall sub_42EBBE(int, int); // weak -bool __cdecl _42ECB5_PlayerAttacksActor(); +void _42ECB5_PlayerAttacksActor(); void __thiscall InitializeTurnBasedAnimations(void *); signed int __cdecl sub_42F4DA(); bool __fastcall sub_42F7EB_DropItemAt(unsigned int uSpriteID, int x, int y, int z, int a4, int count, int a7, unsigned __int16 attributes, ItemGen *a9); @@ -2052,8 +2052,6 @@ signed int __cdecl const_2(); bool __cdecl sub_44C28F_open_nwc_dungeon(); // int __cdecl crt_deconstruct_44C42C(); - - void SpawnEncounter(struct MapInfo *pMapInfo, struct SpawnPointMM7 *spawn, int a3, int a4, int a5); int __fastcall sub_44FA4C_spawn_light_elemental(int a1, int a2, int a3); void __cdecl sub_450218_prolly_generate_chests_loot(); @@ -2063,7 +2061,7 @@ bool __fastcall SpawnActor(unsigned int uMonsterID); int __cdecl GetAlertStatus(); unsigned int __fastcall sub_452442(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4); -signed int __fastcall sub_452A9E(signed int a1); +int sub_452A9E(int a1); int __fastcall MakeColorMaskFromBitDepth(int a1); void __fastcall fill_pixels_fast(unsigned int a1, unsigned __int16 *pPixels, unsigned int uNumPixels); int __fastcall GetDiceResult(unsigned int uNumDice, unsigned int uDiceSides); // idb