Mercurial > mm7

comparison mm7_6.cpp @ 305:cc8e4dc397ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MonsterPopup_Draw crash fix
author Nomad
date Tue, 19 Feb 2013 21:50:33 +0200
parents 3dcc9d945eeb
children 2a09e1d6fc8f
comparison
equal deleted inserted replaced
304:f16ac5e65438 305:cc8e4dc397ec
7968 a3.y = actor->vPosition.y - pParty->vPosition.y; 7968 a3.y = actor->vPosition.y - pParty->vPosition.y;
7969 a3.z = actor->vPosition.z - pParty->vPosition.z; 7969 a3.z = actor->vPosition.z - pParty->vPosition.z;
7970 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z); 7970 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
7971 7971
7972 DamageMonsterFromParty((8 * (uActiveCharacter - 1)) | OBJECT_Player, target_id, &a3); 7972 DamageMonsterFromParty((8 * (uActiveCharacter - 1)) | OBJECT_Player, target_id, &a3);
7973 if (player->WearsItem(506, 1) || player->WearsItem(506, 0)) 7973 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, 1) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, 0))
7974 _42FA66_do_explosive_impact( 7974 _42FA66_do_explosive_impact(
7975 actor->vPosition.x, 7975 actor->vPosition.x,
7976 actor->vPosition.y, 7976 actor->vPosition.y,
7977 actor->vPosition.z + actor->uActorHeight / 2, 7977 actor->vPosition.z + actor->uActorHeight / 2,
7978 0, 512, uActiveCharacter); 7978 0, 512, uActiveCharacter);