Merge pull request #50 from WofWca/baseq3e-fix-gibbing-after-match-end

fix: allow gibbing after `intermissionQueued` CVAR

Author: ec-

README.md

@@ -11,6 +11,7 @@ Unofficial Quake III Arena gamecode patch
  * fixed spawn system
  * fixed in-game crosshair proportions
  * fixed UI mouse sensitivity for high-resolution
+ * fixed not being able to gib after match end (right before showing the scores)
  * fixed shotgun not gibbing unless aiming at the feet
  * fixed server browser + faster scanning
  * fixed grappling hook muzzle position visuals

code/game/g_combat.c

@@ -816,6 +816,29 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 	// the intermission has allready been qualified for, so don't
 	// allow any extra scoring
 	if ( level.intermissionQueued ) {
+
+		// With a special exception for gibbing bodies.
+		// This was introduced in https://github.com/ec-/baseq3a/pull/50.
+		if (targ->die == body_die) {
+			// Note that this also affects the situation where the last frag
+			// is done with the shotgun. Because each pellet calls `G_Damage`
+			// separately. That is, if we don't do this,
+			// the shotgun will never gib if it's the last frag.
+			//
+			// Note that this does not check for friendly fire, quad,
+			// battlesuit, handicap, armor, etc.
+			// We could simply continue normal execution of G_Damage
+			// instead of returning, but let's play it safe
+			// and only do what's necessary.
+
+			targ->health = targ->health - damage;
+			if ( targ->health <= 0 ) {
+				// `body_die` doesn't use any of its arguments (except `targ`),
+				// so it's fine if they're `NULL`.
+				targ->die (targ, inflictor, attacker, damage, mod);
+			}
+		}
+
 		return;
 	}
 #ifdef MISSIONPACK