From 5f3c48154ab0860401d179f93af8b8c1f05e8a60 Mon Sep 17 00:00:00 2001
From: kadaverjack <kadaverjack@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 6 Apr 2006 19:59:24 +0000
Subject: [PATCH] fixed some item positions that where messed up by the
 "nodrop" patch

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1238 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/maps/nexdm02.ent             |  3 ++-
 data/maps/nexdm03.ent             |  3 ++-
 data/maps/nexdm04.ent             | 10 ----------
 data/maps/nexdm08.ent             |  4 ++--
 data/maps/nexdm09.ent             |  3 ++-
 data/maps/nexdm11.ent             |  2 +-
 data/maps/nexdm16.ent             |  3 ++-
 data/maps/nexdmextra1.ent         |  3 ++-
 data/qcsrc/server/gamec/t_items.c |  5 +++--
 9 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/data/maps/nexdm02.ent b/data/maps/nexdm02.ent
index 94f233c07..51a456cc5 100644
--- a/data/maps/nexdm02.ent
+++ b/data/maps/nexdm02.ent
@@ -1472,7 +1472,8 @@
 }
 {
 "classname" "weapon_uzi"
-"origin" "680 32 32"
+"origin" "680 32 22"
+"noalign" "1"
 }
 {
 "classname" "weapon_electro"
diff --git a/data/maps/nexdm03.ent b/data/maps/nexdm03.ent
index 8e09c72bf..06e8cfafc 100644
--- a/data/maps/nexdm03.ent
+++ b/data/maps/nexdm03.ent
@@ -117,7 +117,8 @@
 {
 "classname" "weapon_uzi"
 "angles" "0 0 0"
-"origin" "-1344 -20 220"
+"origin" "-1344 -20 200"
+"noalign" "1"
 }
 {
 "classname" "item_cells"
diff --git a/data/maps/nexdm04.ent b/data/maps/nexdm04.ent
index ccd654810..f5c63bfdb 100644
--- a/data/maps/nexdm04.ent
+++ b/data/maps/nexdm04.ent
@@ -30,54 +30,45 @@
 {
 "angle" "270"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "-81 1395 119"
 }
 {
 "angle" "270"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "176 1395 119"
 }
 {
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "-378 1395 134"
 }
 {
 "angle" "90"
 "classname" "info_player_start"
-"angles" "0 0 0"
 "origin" "111 -352 0"
 }
 {
 "angle" "90"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "176 -352 0"
 }
 {
 "angle" "90"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "1087 -237 308"
 }
 {
 "angle" "90"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "1309 -237 308"
 }
 {
 "angle" "270"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "1068 358 308"
 }
 {
 "angle" "270"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "1328 358 308"
 }
 {
@@ -230,7 +221,6 @@
 {
 "angle" "135"
 "classname" "info_player_deathmatch"
-"angles" "0 0 0"
 "origin" "80 15 -1"
 }
 {
diff --git a/data/maps/nexdm08.ent b/data/maps/nexdm08.ent
index c41396bcb..9721d4035 100644
--- a/data/maps/nexdm08.ent
+++ b/data/maps/nexdm08.ent
@@ -104,11 +104,11 @@
 }
 {
 "classname" "item_armor25"
-"origin" "15 -9 -133"
+"origin" "15 0 -133"
 }
 {
 "classname" "item_armor25"
-"origin" "15 -9 -133"
+"origin" "15 0 -133"
 }
 {
 "origin" "-449 4 -133"
diff --git a/data/maps/nexdm09.ent b/data/maps/nexdm09.ent
index b8df1f20c..0447042c2 100644
--- a/data/maps/nexdm09.ent
+++ b/data/maps/nexdm09.ent
@@ -147,8 +147,9 @@
 "classname" "item_health25"
 }
 {
-"origin" "1056 72 248"
+"origin" "1056 72 238"
 "classname" "weapon_grenadelauncher"
+"noalign" "1"
 }
 {
 "origin" "1136 680 272"
diff --git a/data/maps/nexdm11.ent b/data/maps/nexdm11.ent
index b4b439c8d..6e2b1b51c 100644
--- a/data/maps/nexdm11.ent
+++ b/data/maps/nexdm11.ent
@@ -135,7 +135,7 @@
 }
 {
 "classname" "weapon_crylink"
-"origin" "474 -464 53"
+"origin" "480 -520 53"
 }
 {
 "classname" "item_armor1"
diff --git a/data/maps/nexdm16.ent b/data/maps/nexdm16.ent
index 4660795f3..eafa96265 100644
--- a/data/maps/nexdm16.ent
+++ b/data/maps/nexdm16.ent
@@ -294,7 +294,8 @@
 }
 {
 "classname" "item_armor25"
-"origin" "-9 1722 1467"
+"origin" "-9 1722 1417"
+"noalign" "1"
 }
 {
 "classname" "item_strength"
diff --git a/data/maps/nexdmextra1.ent b/data/maps/nexdmextra1.ent
index bc6872011..282fba546 100644
--- a/data/maps/nexdmextra1.ent
+++ b/data/maps/nexdmextra1.ent
@@ -4,7 +4,8 @@
 }
 {
 "classname" "weapon_rocketlauncher"
-"origin" "720 832 64"
+"origin" "720 832 27"
+"noalign" "1"
 }
 {
 "classname" "info_player_deathmatch"
diff --git a/data/qcsrc/server/gamec/t_items.c b/data/qcsrc/server/gamec/t_items.c
index edfc4d2c2..7db1ad45b 100644
--- a/data/qcsrc/server/gamec/t_items.c
+++ b/data/qcsrc/server/gamec/t_items.c
@@ -272,8 +272,9 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 			z_offset = '0 0 1' * 3;
 
 		self.movetype = MOVETYPE_NONE;
-		traceline(self.origin, self.origin - '0 0 1' * 1024, TRUE, self);
-		setorigin(self, trace_endpos + z_offset);
+		traceline(self.origin, self.origin - '0 0 1' * 512, TRUE, self);
+		if (trace_fraction < 1)
+			setorigin(self, trace_endpos + z_offset);
 	}
 	else
 	{
-- 
2.39.2