X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=b1ebde7a0f9a0eb1fdbd745a36aeaf712da674a6;hb=65748e01b54fd8c4e1b5dd8de7d99f430d10870c;hp=81267bcc93355f1b446e145ae1e330fd8658729e;hpb=b1c8c3f59ed6ae0e0ac7a9be826d9dea0dde247d;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index 81267bc..b1ebde7 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -2625,16 +2625,9 @@ void Person::DoAnimations() if (weaponactive != -1) { escapednum = 0; XYZ aim; - weapons[weaponids[0]].owner = -1; aim = victim->coords + DoRotation(victim->jointPos(abdomen), 0, victim->yaw, 0) * victim->scale + victim->velocity * findDistance(&victim->coords, &coords) / 50 - (coords + DoRotation(jointPos(righthand), 0, yaw, 0) * scale); Normalise(&aim); - weapons[weaponids[0]].velocity = aim * 50; - weapons[weaponids[0]].tipvelocity = aim * 50; - weapons[weaponids[0]].missed = 0; - weapons[weaponids[0]].hitsomething = 0; - weapons[weaponids[0]].freetime = 0; - weapons[weaponids[0]].firstfree = 1; - weapons[weaponids[0]].physics = 0; + weapons[weaponids[0]].thrown(aim * 50); num_weapons--; if (num_weapons) { weaponids[0] = weaponids[num_weapons];