projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52e4469
)
Revert "Fix netname field of weapon and item entities (was getting set to m_name)"
author
bones_was_here <bones_was_here@xa.org.au>
Wed, 21 Jul 2021 07:56:37 +0000
(17:56 +1000)
committer
bones_was_here <bones_was_here@xa.org.au>
Wed, 21 Jul 2021 07:56:37 +0000
(17:56 +1000)
This reverts commit
69775c048f13c32062f542016604231f6dafade9
.
qcsrc/server/items/items.qc
patch
|
blob
|
history
diff --git
a/qcsrc/server/items/items.qc
b/qcsrc/server/items/items.qc
index f2056cbc25c19d40bdd8e705c7d8ad6b86fadcf5..7408b4de8f7ab7dadbd6aa9e557a9e7a78a85bd4 100644
(file)
--- a/
qcsrc/server/items/items.qc
+++ b/
qcsrc/server/items/items.qc
@@
-1066,7
+1066,7
@@
void _StartItem(entity this, entity def, float defaultrespawntime, float default
this.bot_pickupevalfunc = pickupevalfunc;
this.bot_pickupbasevalue = pickupbasevalue;
this.mdl = this.model ? this.model : strzone(this.item_model_ent.model_str());
- this.netname =
(def.m_weapon) ? def.m_weapon.netname : def.net
name;
+ this.netname =
item
name;
settouch(this, Item_Touch);
setmodel(this, MDL_Null); // precision set below
//this.effects |= EF_LOWPRECISION;