Mercurial > mm7
comparison mm7_5.cpp @ 1876:2070d01ccfae
Actor::_43B3E0_CalcDamage changed to non-static
author | Grumpy7 |
---|---|
date | Thu, 17 Oct 2013 09:00:11 +0200 |
parents | a86c60679949 |
children | af38275939cc |
comparison
equal
deleted
inserted
replaced
1875:1d9e4b50bc7c | 1876:2070d01ccfae |
---|---|
3981 if ( v9 ) | 3981 if ( v9 ) |
3982 BYTE2(v7->uAttributes) |= 2u; | 3982 BYTE2(v7->uAttributes) |= 2u; |
3983 v6 = stru_50C198._4273BB(v8, v7, v4, 0); | 3983 v6 = stru_50C198._4273BB(v8, v7, v4, 0); |
3984 if ( v6 ) | 3984 if ( v6 ) |
3985 { | 3985 { |
3986 v10 = (unsigned int)Actor::_43B3E0_CalcDamage(v8, a4); | 3986 v10 = (unsigned int)v8->_43B3E0_CalcDamage(a4); |
3987 if ( (signed __int64)v8->pActorBuffs[3].uExpireTime > 0 ) | 3987 if ( (signed __int64)v8->pActorBuffs[3].uExpireTime > 0 ) |
3988 { | 3988 { |
3989 v11 = v8->pActorBuffs[3].uPower; | 3989 v11 = v8->pActorBuffs[3].uPower; |
3990 if ( v11 ) | 3990 if ( v11 ) |
3991 v10 = (signed int)v10 / (unsigned __int16)v11; | 3991 v10 = (signed int)v10 / (unsigned __int16)v11; |