Half-Life: Auto-reload for the few weapons it applies for (when empty)

src/shared/valve/w_crossbow.c

@@ -268,6 +268,13 @@ w_crossbow_release(void)
 {
 	player pl = (player)self;
 
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
+		return;
+	}
+
 	if (pl.w_idle_next > 0.0) {
 		return;
 	}

src/shared/valve/w_glock.c

@@ -255,6 +255,13 @@ w_glock_release(void)
 	player pl = (player)self;
 	int r;
 
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
+		return;
+	}
+
 	if (pl.w_idle_next > 0.0) {
 		return;
 	}

src/shared/valve/w_mp5.c

@@ -270,6 +270,13 @@ void
 w_mp5_release(void)
 {
 	player pl = (player)self;
+
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
+		return;
+	}
 	if (pl.w_idle_next > 0.0) {
 		return;
 	}

src/shared/valve/w_python.c

@@ -192,6 +192,7 @@ void
 w_python_reload(void)
 {
 	player pl = (player)self;
+
 	if (pl.w_attack_next > 0.0) {
 		return;
 	}
@@ -230,6 +231,13 @@ w_python_release(void)
 {
 	player pl = (player)self;
 
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
+		return;
+	}
+
 	if (pl.w_idle_next > 0.0) {
 		return;
 	}

src/shared/valve/w_rpg.c

@@ -215,19 +215,17 @@ void w_rpg_reload(void)
 void w_rpg_release(void)
 {
 	player pl = (player)self;
-	if (pl.w_idle_next > 0.0) {
+
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
 		return;
 	}
 
-#ifdef CLIENT
-	if (pl.a_ammo1 <= 0 && pl.a_ammo2 > 0) {
-		w_rpg_reload();
+	if (pl.w_idle_next > 0.0) {
+		return;
 	}
-#else
-	if (pl.rpg_mag <= 0 && pl.ammo_rocket > 0) {
-		w_rpg_reload();
-	}
-#endif
 
 	int r = (float)input_sequence % 3;
 

src/shared/valve/w_shotgun.c

@@ -217,6 +217,13 @@ void w_shotgun_release(void)
 {
 	player pl = (player)self;
 
+	/* auto-reload if need be */
+	if (pl.w_attack_next <= 0.0)
+	if (pl.a_ammo3 == SHOTTY_IDLE && pl.a_ammo1 == 0 && pl.a_ammo2 > 0) {
+		Weapons_Reload();
+		return;
+	}
+
 	if (pl.w_idle_next > 0.0) {
 		return;
 	}

src/shared/valve/weapon_common.h

@@ -40,6 +40,7 @@ typedef struct
 	void(int, vector, float) hudpic;
 } weapon_t;
 
+void Weapons_Reload(void);
 void Weapons_DrawCrosshair(void);
 void Weapons_MakeVectors(void);
 vector Weapons_GetCameraPos(void);