X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_machinegun.qc;h=8753819bee5e332bfe6cb782327a4fbb7a22dbb2;hb=8c24bad1afeccde39828a5902cf96a858146c8cd;hp=0bb2d812685edbd8cbd658672034220547af3fed;hpb=9c195bccce27ac4fa3d52052dd8707ea57eaef02;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index 0bb2d8126..8753819be 100644
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -1,15 +1,17 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(
-/* WEP_##id */ MACHINEGUN,
-/* function */ W_MachineGun,
-/* ammotype */ ammo_nails,
-/* impulse  */ 3,
-/* flags    */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN,
-/* rating   */ BOT_PICKUP_RATING_MID,
-/* color	*/ '1 1 0',
-/* model    */ "uzi",
-/* netname  */ "uzi",
-/* fullname */ _("Machine Gun")
+/* WEP_##id  */ MACHINEGUN,
+/* function  */ W_MachineGun,
+/* ammotype  */ ammo_nails,
+/* impulse   */ 3,
+/* flags     */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN,
+/* rating    */ BOT_PICKUP_RATING_MID,
+/* color     */ '1 1 0',
+/* modelname */ "uzi",
+/* simplemdl */ "foobar",
+/* crosshair */ "gfx/crosshairuzi 0.6",
+/* refname   */ "uzi",
+/* wepname   */ _("Machine Gun")
 );
 
 #define MACHINEGUN_SETTINGS(w_cvar,w_prop) MACHINEGUN_SETTINGS_LIST(w_cvar, w_prop, MACHINEGUN, machinegun)
@@ -304,15 +306,15 @@ float W_MachineGun(float req)
 			precache_model ("models/weapons/v_uzi.md3");
 			precache_model ("models/weapons/h_uzi.iqm");
 			precache_sound ("weapons/uzi_fire.wav");
-			MACHINEGUN_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+			MACHINEGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
 			return TRUE;
 		}
 		case WR_CHECKAMMO1:
 		{
 			if(WEP_CVAR(machinegun, mode) == 1)
-				ammo_amount = self.AMMO_VAL(WEP_MACHINEGUN) >= WEP_CVAR(machinegun, sustained_ammo);
+				ammo_amount = self.WEP_AMMO(MACHINEGUN) >= WEP_CVAR(machinegun, sustained_ammo);
 			else
-				ammo_amount = self.AMMO_VAL(WEP_MACHINEGUN) >= WEP_CVAR(machinegun, first_ammo);
+				ammo_amount = self.WEP_AMMO(MACHINEGUN) >= WEP_CVAR(machinegun, first_ammo);
 
 			if(WEP_CVAR(machinegun, reload_ammo))
 			{
@@ -326,9 +328,9 @@ float W_MachineGun(float req)
 		case WR_CHECKAMMO2:
 		{
 			if(WEP_CVAR(machinegun, mode) == 1)
-				ammo_amount = self.AMMO_VAL(WEP_MACHINEGUN) >= WEP_CVAR(machinegun, burst_ammo);
+				ammo_amount = self.WEP_AMMO(MACHINEGUN) >= WEP_CVAR(machinegun, burst_ammo);
 			else
-				ammo_amount = self.AMMO_VAL(WEP_MACHINEGUN) >= WEP_CVAR(machinegun, first_ammo);
+				ammo_amount = self.WEP_AMMO(MACHINEGUN) >= WEP_CVAR(machinegun, first_ammo);
 
 			if(WEP_CVAR(machinegun, reload_ammo))
 			{
@@ -391,6 +393,11 @@ float W_MachineGun(float req)
 			precache_sound("weapons/ric3.wav");
 			return TRUE;
 		}
+		case WR_ZOOMRETICLE:
+		{
+			// no weapon specific image for this weapon
+			return FALSE;
+		}
 	}
 	return TRUE;
 }