From 1945a40957d5d9d22a1fcd0b70f1e549492d295f Mon Sep 17 00:00:00 2001
From: Magnus <falloutr@users.sourceforge.net>
Date: Wed, 11 Nov 2009 14:28:41 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3433
 fc73d0e0-1445-4013-8a0c-d673dee63da5

---
 quakec/fallout2/client.qc    |  2 +-
 quakec/fallout2/inventory.qc | 10 +++++-----
 quakec/fallout2/world.qc     |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/quakec/fallout2/client.qc b/quakec/fallout2/client.qc
index 6ca64e7cf..2824ce8ce 100644
--- a/quakec/fallout2/client.qc
+++ b/quakec/fallout2/client.qc
@@ -106,7 +106,7 @@ void() SetNewParms =
 	parm5 = 0;
 	parm6 = 0;
 	parm7 = 0;
-	parm8 = 150;
+	parm8 = 200;
 	parm9 = 0;
 	parm10 = 0;
 	parm11 = 0;
diff --git a/quakec/fallout2/inventory.qc b/quakec/fallout2/inventory.qc
index a4e36dae7..eb05708f3 100644
--- a/quakec/fallout2/inventory.qc
+++ b/quakec/fallout2/inventory.qc
@@ -658,9 +658,9 @@ string(float iid) GetItemVModel =
 	if (iid == IID_WP_POWERAXE)
 		return "progs/v_axe.mdl";
 	if (iid == IID_WP_USP)
-		return "progs/v_1911.mdl";
+		return "progs/v_usp.mdl";
 	if (iid == IID_WP_USP_S)
-		return "progs/v_1911.mdl";
+		return "progs/v_usp.mdl";
 	if (iid == IID_WP_GLOCK)
 		return "progs/v_glock.mdl";
 	if (iid == IID_WP_GLOCK_S)
@@ -753,9 +753,9 @@ string(float iid) GetItemWModel =
 		return "progs/w_axe.mdl";
 
 	if (iid == IID_WP_USP)
-		return "progs/w_1911.mdl";
+		return "progs/w_usp.mdl";
 	if (iid == IID_WP_USP_S)
-		return "progs/w_1911.mdl";
+		return "progs/w_usp.mdl";
 	if (iid == IID_WP_GLOCK)
 		return "progs/w_glock.mdl";
 	if (iid == IID_WP_GLOCK_S)
@@ -765,7 +765,7 @@ string(float iid) GetItemWModel =
 	if (iid == IID_WP_DEAGLE_M)
 		return "progs/w_deagle.mdl";
 	if (iid == IID_WP_NEEDLER)
-		return "progs/w_1911.mdl";
+		return "progs/w_usp.mdl";
 	if (iid == IID_WP_ALIENBLASTER)
 		return "progs/w_alien.mdl";
 	if (iid >= IID_WP_PIPERIFLE && iid <= IID_WP_PIPERIFLE_S_R)
diff --git a/quakec/fallout2/world.qc b/quakec/fallout2/world.qc
index 1cba13e7f..ea32f2f38 100644
--- a/quakec/fallout2/world.qc
+++ b/quakec/fallout2/world.qc
@@ -1946,7 +1946,7 @@ void() worldspawn =
 	precache_model ("progs/v_fist.mdl");
 	precache_model ("progs/v_knife.mdl");
 	precache_model ("progs/v_spear.mdl");
-	precache_model ("progs/v_1911.mdl");
+	precache_model ("progs/v_usp.mdl");
 	precache_model ("progs/v_needler.mdl");
 	precache_model ("progs/v_glock.mdl");
 	precache_model ("progs/v_fnfal.mdl");
@@ -2003,7 +2003,7 @@ void() worldspawn =
 	precache_model ("progs/w_combat.mdl");
 	precache_model ("progs/w_axe.mdl");
 	precache_model ("progs/w_glock.mdl");
-	precache_model ("progs/w_1911.mdl");
+	precache_model ("progs/w_usp.mdl");
 	precache_model ("progs/w_deagle.mdl");
 	precache_model ("progs/w_alien.mdl");
 	precache_model ("progs/w_mp9.mdl");