From: Mircea Kitsune Date: Sun, 10 Apr 2011 13:58:20 +0000 (+0300) Subject: Some small tweaks to stuff X-Git-Tag: xonotic-v0.6.0~110^2^2~125 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b6313611f76e9f8a2f7dcb4866a1479cd0a7b4b;p=xonotic%2Fxonotic-data.pk3dir.git Some small tweaks to stuff --- diff --git a/effectinfo.txt b/effectinfo.txt index 6f40ee27d..15563178d 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -5258,10 +5258,6 @@ originjitter 1 1 1 velocityjitter 100 100 100 velocitymultiplier -0.31 -// -------------------------------- -// Weapon Damage Effects -// -------------------------------- - // tuba does not use the weapon damage effect // laser damage effect @@ -5904,8 +5900,4 @@ lightcolor 0.9 0.6 0.2 // porto does not use the weapon damage effect -// hook does not use the weapon damage effect - -// -------------------------------- -// End of Weapon Damage Effects -// -------------------------------- \ No newline at end of file +// hook does not use the weapon damage effect \ No newline at end of file diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index 48fe8a165..818b641f8 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -68,7 +68,7 @@ void Violence_DamageEffect(entity pl, float type) entity e; e = spawn(); - e.classname = "weapondamage"; + e.classname = "damageeffect"; e.cnt = type; e.state |= 8 * pl.species; // gib type, ranges from 0 to 15