r4820 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-22 12:34:13 -0400 (Wed, 22 Oct 2008)
New Revision: 4820

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/weaponslist.c
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
Log:
r4816 | div0 | 2008-10-22 16:22:02 +0200 (Wed, 22 Oct 2008) | 2 lines
precache hookgun
r4818 | div0 | 2008-10-22 18:32:49 +0200 (Wed, 22 Oct 2008) | 2 lines
stupid typo
r4819 | div0 | 2008-10-22 18:33:43 +0200 (Wed, 22 Oct 2008) | 2 lines
add hook here too

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-10-22 16:33:43 UTC (rev 4819)
+++ branches/nexuiz-2.0/.patchsets	2008-10-22 16:34:13 UTC (rev 4820)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4815
+revisions_applied = 1-4819

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/weaponslist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/weaponslist.c	2008-10-22 16:33:43 UTC (rev 4819)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/weaponslist.c	2008-10-22 16:34:13 UTC (rev 4820)
@@ -92,6 +92,7 @@
 		case WEP_ROCKET_LAUNCHER:  return "Rocket Launcher";
 		case WEP_PORTO:            return "Port-O-Launch";
 		case WEP_MINSTANEX:        return "MinstaNex";
+		case WEP_HOOK:             return "Grappling Hook";
 		default:                   return "(fix qcsrc/menu/nexuiz/weaponslist.c)";
 	}
 }

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-10-22 16:33:43 UTC (rev 4819)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-10-22 16:34:13 UTC (rev 4820)
@@ -843,8 +843,8 @@
 
 	if(g_grappling_hook) // offhand hook
 	{
-		start_weapons (-) WEP_HOOK;
-		warmup_start_weapons (-) WEP_HOOK;
+		start_weapons (-) WEPBIT_HOOK;
+		warmup_start_weapons (-) WEPBIT_HOOK;
 	}
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc	2008-10-22 16:33:43 UTC (rev 4819)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc	2008-10-22 16:34:13 UTC (rev 4820)
@@ -125,9 +125,9 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/weapons/g_hook.md3");
-		precache_model ("models/weapons/v_hook.md3");
-		precache_model ("models/weapons/w_hook.zym");
+		precache_model ("models/weapons/g_hookgun.md3");
+		precache_model ("models/weapons/v_hookgun.md3");
+		precache_model ("models/weapons/w_hookgun.zym");
 		precache_sound ("weapons/hook_fire.wav");
 		precache_sound ("weapons/hook_impact.wav");
 		precache_sound ("weapons/hookbomb_fire.wav");