Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

diff --git a/maps/dance.map b/maps/dance.map
index cd8872d2726505e111a2ec506a56c6b20066dfd7..cb51a3333ec62faa20b84b83fcdd6b6c7ed88c43 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -23741,6 +23741,6 @@ effects_jumppad/jumppadfx1_a
 "angles" "18.369183 11.335669 90.000000"
 }
 {
-"classname" "weapon_sniperrifle"
+"classname" "weapon_rifle"
 "origin" "0.000000 0.000000 -176.000000"
 }

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 532b9c4ca12305705ed450fa20cd894a3b30e923..3eb5392055d802e12479943b7934ef5636500947 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -66300,7 +66300,7 @@ exx/trim-vert01
 "origin" "-3456.000000 0.000000 72.000000"
 }
 {
-"classname" "weapon_sniperrifle"
+"classname" "weapon_rifle"
 "origin" "-2800.000000 -448.000000 416.000000"
 }
 {

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index c2cc754a3347fae121e7b8a93cba9f61a86e785d..8aedb5ab1589f19093046acedc7479a673a70bc6 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -33147,7 +33147,7 @@ effects_jumppad/jumppadfx1_a
 "origin" "-208.000000 -688.000000 -64.000000"
 }
 {
-"classname" "weapon_sniperrifle"
+"classname" "weapon_rifle"
 "origin" "0.000000 0.000000 704.000000"
 "height" "64"
 }

diff --git a/scripts/entities.def b/scripts/entities.def
index 0eab53c2989478c624ded2602e90f080142a83c8..22ca96eb184a40dfc7eb6789281ed1719dd00210 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1679,7 +1679,7 @@ max_health: max health this trigger will give (default 200)
 noise: sound file to play (use misc/null.wav to make it silent), default = item_health_medium sound
 */
 
-/*QUAKED weapon_sniperrifle (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
+/*QUAKED weapon_rifle (1 0 .5) (-30 -30 0) (30 30 32) FLOATING
 the Sniper Rifle.
 -------- KEYS --------
 ammo_nails: initial bullets of the weapon (if unset, g_pickup_nails is used)

diff --git a/scripts/entities.ent b/scripts/entities.ent
index b7884cc1080bef1675f99c8807f3423106088dfc..a4da6fbc39cfa9e75f70611ba12ae1a90052f648 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -1681,7 +1681,7 @@ Any object touching this will be healed.
 <sound key="noise" name="noise">sound file to play (use misc/null.wav to make it silent), default = item_health_medium sound</sound>
 </group>
 
-<point name="weapon_sniperrifle" color="1 0 .5" box="-30 -30 0 30 30 32">
+<point name="weapon_rifle" color="1 0 .5" box="-30 -30 0 30 30 32">
 the Sniper Rifle.
 -------- KEYS --------
 <real key="ammo_nails" name="ammo_nails">initial bullets of the weapon (if unset, g_pickup_nails is used)</real>