Mercurial > mm7

comparison Player.cpp @ 2338:1e865e8690ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving some function declarations from unsorted subs to Actor.h and SpriteObject.h
author Grumpy7
date Sat, 05 Apr 2014 20:27:09 +0200
parents d6887ee81068
children dc822157c98d
comparison
equal deleted inserted replaced
2337:d04017f3d2fa 2338:1e865e8690ba
8070 a3.x = actor->vPosition.x - pParty->vPosition.x; 8070 a3.x = actor->vPosition.x - pParty->vPosition.x;
8071 a3.y = actor->vPosition.y - pParty->vPosition.y; 8071 a3.y = actor->vPosition.y - pParty->vPosition.y;
8072 a3.z = actor->vPosition.z - pParty->vPosition.z; 8072 a3.z = actor->vPosition.z - pParty->vPosition.z;
8073 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z); 8073 Vec3_int_::Normalize(&a3.x, &a3.y, &a3.z);
8074 8074
8075 DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3); 8075 Actor::DamageMonsterFromParty(PID(OBJECT_Player, uActiveCharacter - 1), target_id, &a3);
8076 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_TWO_HANDED) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_SINGLE_HANDED)) 8076 if (player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_TWO_HANDED) || player->WearsItem(ITEM_ARTIFACT_SPLITTER, EQUIP_SINGLE_HANDED))
8077 _42FA66_do_explosive_impact(actor->vPosition.x, actor->vPosition.y, actor->vPosition.z + actor->uActorHeight / 2, 0, 512, uActiveCharacter); 8077 _42FA66_do_explosive_impact(actor->vPosition.x, actor->vPosition.y, actor->vPosition.z + actor->uActorHeight / 2, 0, 512, uActiveCharacter);
8078 } 8078 }
8079 else if (bow_idx) 8079 else if (bow_idx)
8080 { 8080 {