Mercurial > mm7

comparison mm7_6.cpp @ 1546:9a6567c6c76c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru141 & misc cleaning
author Nomad
date Sat, 07 Sep 2013 21:55:02 +0200
parents c3da3c2985b8
children 30db6d265ceb
comparison
equal deleted inserted replaced
1545:c4ab816fcc5e 1546:9a6567c6c76c
1673 } 1673 }
1674 1674
1675 1675
1676 1676
1677 //----- (0042FA66) -------------------------------------------------------- 1677 //----- (0042FA66) --------------------------------------------------------
1678 int __fastcall _42FA66_do_explosive_impact(int a1, int a2, int a3, int a4, __int16 a5, signed int a6) 1678 void _42FA66_do_explosive_impact(int a1, int a2, int a3, int a4, __int16 a5, signed int a6)
1679 { 1679 {
1680 int v6; // edi@1 1680 int v6; // edi@1
1681 int v7; // esi@1 1681 int v7; // esi@1
1682 char *v8; // ecx@2 1682 char *v8; // ecx@2
1683 unsigned __int16 v9; // ax@5 1683 unsigned __int16 v9; // ax@5
1684 //int v10; // eax@10 1684 //int v10; // eax@10
1685 signed int result; // eax@11 1685 //signed int result; // eax@11
1686 //__int16 v12; // ax@12 1686 //__int16 v12; // ax@12
1687 //SpriteObject a1a; // [sp+Ch] [bp-74h]@1 1687 //SpriteObject a1a; // [sp+Ch] [bp-74h]@1
1688 int v14; // [sp+7Ch] [bp-4h]@1 1688 int v14; // [sp+7Ch] [bp-4h]@1
1689 1689
1690 v6 = a1; 1690 v6 = a1;
1732 } 1732 }
1733 else 1733 else
1734 { 1734 {
1735 a1a.spell_caster_pid = 0; 1735 a1a.spell_caster_pid = 0;
1736 } 1736 }
1737 result = a1a.Create(0, 0, 0, 0); 1737
1738 if ( result != -1 ) 1738 int id = a1a.Create(0, 0, 0, 0);
1739 { 1739 if (id != -1)
1740 result = stru_50FE08.Add(PID(OBJECT_Item, result), 1740 stru_50FE08.Add(PID(OBJECT_Item, id),
1741 a5, 1741 a5,
1742 SLOWORD(a1a.vPosition.x), 1742 SLOWORD(a1a.vPosition.x),
1743 SLOWORD(a1a.vPosition.y), 1743 SLOWORD(a1a.vPosition.y),
1744 SLOWORD(a1a.vPosition.z), 1744 SLOWORD(a1a.vPosition.z),
1745 0, 1745 0,
1746 0); 1746 0);
1747 }
1748 return result;
1749 } 1747 }
1750 1748
1751 //----- (0042FB5C) -------------------------------------------------------- 1749 //----- (0042FB5C) --------------------------------------------------------
1752 bool _42FB5C_check_spell(signed int a1) 1750 bool _42FB5C_check_spell(signed int a1)
1753 { 1751 {