weaponcfgs added. High res monitor sprite fix.

main/source/cl_dll/ammo.cpp

@@ -132,13 +132,18 @@ void WeaponsResource :: LoadWeaponSprites( WEAPON *pWeapon, int custom )
 	int screenWidth=ScreenWidth();
 
 	for ( j=0; j < numRes; j++ ) {
+		if (screenWidth > resolutions[5]) 
+		{
+			iRes = resolutions[5];
+			break;
+		}
 		if ( screenWidth == resolutions[j] ) {
 			iRes=resolutions[j];
 			break;
 		}
 		if ( j > 0 && screenWidth > resolutions[j-1] && screenWidth < resolutions[j] ) {
 			iRes=resolutions[j-1];
-			break;
+				break;
 		}
 	}
 
@@ -689,6 +694,16 @@ void CHudAmmo::Think(void)
 
 	}
 
+	if (gHUD.GetCurrentWeaponID() != gWR.LastWeaponId)
+	{
+		gWR.LastWeaponId = gHUD.GetCurrentWeaponID();
+		WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID());
+
+		char weapcfg[128];
+		sprintf(weapcfg, "exec weaponcfgs/%s.cfg", currentWeapon->szName);
+		ClientCmd(weapcfg);
+	}
+
 	if(gHUD.GetIsAlien()) //check for hive death causing loss of current weapon
 	{
 		WEAPON* currentWeapon = gWR.GetWeapon(gHUD.GetCurrentWeaponID());

main/source/cl_dll/ammohistory.h

@@ -76,6 +76,7 @@ private:
 
 	int		riAmmo[MAX_AMMO_TYPES];									// current ammo counts
 	int		iOldWeaponBits;
+	int		LastWeaponId;
 };
 
 extern WeaponsResource gWR;

main/weaponcfgs/weapon_acidrocketgun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_bilebombgun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_bite2gun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_bitegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_blink.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_charge.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_claws.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_devour.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_divinewind.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_grenade.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_grenadegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_healingspray.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_heavymachinegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_hivegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_knife.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_leap.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_machinegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_metabolize.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_mine.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_nukegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_parasite.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_pistol.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_primalscream.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_shotgun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_spikegun.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_spit.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_spore.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_stomp.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_swipe.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_umbra.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_webspinner.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.

main/weaponcfgs/weapon_welder.cfg

@@ -0,0 +1 @@
+// Enter commands to be executed when this weapon is being used. Useful for per-weapon cl_cross commands or sensitivity.