Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-09 12:08:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed weapon attachments not being detached

Browse source
This commit is contained in:
smallmodel 2023-12-27 16:28:49 +01:00
parent 210f2fef77
commit 4eb83c0766
No known key found for this signature in database
GPG key ID: A96F163ED4891440
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
code/fgame/player_combat.cpp
View file

@ -163,7 +163,7 @@ void Player::EventCorrectWeaponAttachments(Event *ev)
iTagLeft = gi.Tag_NumForName(edict->tiki, "tag_weapon_left"); iTagLeft = gi.Tag_NumForName(edict->tiki, "tag_weapon_left");
iNumChildren = numchildren; iNumChildren = numchildren;
for (int i = 0; i < iNumChildren; i++) { for (int i = 0; i < MAX_MODEL_CHILDREN && iNumChildren; i++) {
iChild = children[i]; iChild = children[i];
if (iChild == ENTITYNUM_NONE) { if (iChild == ENTITYNUM_NONE) {
@ -176,18 +176,17 @@ void Player::EventCorrectWeaponAttachments(Event *ev)
} }
if (pChild->edict->s.tag_num == iTagLeft || pChild->edict->s.tag_num == iTagRight) { if (pChild->edict->s.tag_num == iTagLeft || pChild->edict->s.tag_num == iTagRight) {
if (pChild->IsSubclassOfWeapon()) { if (!pChild->IsSubclassOfWeapon()) {
if (pChild->edict->s.tag_num == iTagLeft) {
iUseAngles = edict->s.attach_use_angles;
vOffset = edict->s.attach_offset;
// reattach to the right tag
detach();
attach(entnum, iTagRight, iUseAngles, vOffset);
}
} else {
// Remove entities like ammoclip // Remove entities like ammoclip
pChild->PostEvent(EV_Remove, 0); pChild->PostEvent(EV_Remove, 0);
iNumChildren--;
} else if (pChild->edict->s.tag_num == iTagLeft) {
iUseAngles = edict->s.attach_use_angles;
vOffset = edict->s.attach_offset;
// reattach to the right tag
pChild->detach();
pChild->attach(entnum, iTagRight, iUseAngles, vOffset);
} }
} }
} }