X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWeapons.cpp;h=d876320c51b3608227d6413331d0ac57084da166;hb=bf99f4428d07954f6586112f211ac4fb63946331;hp=5207997b005a07629198a69f4167c2ee9ddf1044;hpb=65748e01b54fd8c4e1b5dd8de7d99f430d10870c;p=lugaru.git

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 5207997..d876320 100644
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -225,16 +225,10 @@ void Weapon::DoStuff(int i)
                                 (Person::players[j]->creature == rabbittype && Random() % 2 == 0 && Person::players[j]->aitype == attacktypecutoff && Person::players[j]->weaponactive == -1)) {
                             emit_sound_at(knifedrawsound, Person::players[j]->coords, 128.);
 
-                            Person::players[j]->weaponactive = 0;
                             Person::players[j]->animTarget = removeknifeanim;
                             Person::players[j]->frameTarget = 1;
                             Person::players[j]->target = 1;
-                            owner = Person::players[j]->id;
-                            if (Person::players[j]->num_weapons > 0) {
-                                Person::players[j]->weaponids[Person::players[j]->num_weapons] = Person::players[j]->weaponids[0];
-                            }
-                            Person::players[j]->num_weapons++;
-                            Person::players[j]->weaponids[0] = i;
+                            Person::players[j]->takeWeapon(i);
 
                             Person::players[j]->aitype = attacktypecutoff;
                         } else {