Fixed the GHUD issue

actionquake · Mar 1, 2024 · 46d3d0f · 46d3d0f
1 parent 062c86b
commit 46d3d0f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/source/p_hud.c b/source/p_hud.c
@@ -1005,10 +1005,12 @@ void HUD_SpectatorUpdate(edict_t *clent)
 			Ghud_SetText(clent, hud[h + 2], nm_s);
 			Ghud_SetText(clent, hud[h + 3], kdr_s);
 
+			int weapNum = cl->pers.chosenWeapon ? cl->pers.chosenWeapon->typeNum : 0;
+
 			if (IS_ALIVE(cl_ent) && cl->curr_weap)
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->curr_weap]);
-			// else if (cl->resp.team && cl->pers.chosenWeapon->typeNum)
-			// 	Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			else if (cl->resp.team == TEAM1 && weapNum)
+				Ghud_SetInt(clent, hud[h + 4], level.pic_items[weapNum]);
 			else // no weapon, set to mk23
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[MK23_NUM]);
 		}
@@ -1086,10 +1088,12 @@ void HUD_SpectatorUpdate(edict_t *clent)
 			Ghud_SetText(clent, hud[h + 2], nm_s);
 			Ghud_SetText(clent, hud[h + 3], kdr_s);
 
+			int weapNum = cl->pers.chosenWeapon ? cl->pers.chosenWeapon->typeNum : 0;
+
 			if (IS_ALIVE(cl_ent) && cl->curr_weap)
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->curr_weap]);
-			// else if (cl->resp.team && cl->pers.chosenWeapon->typeNum)
-			// 	Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			else if (cl->resp.team == TEAM2 && weapNum)
+				Ghud_SetInt(clent, hud[h + 4], level.pic_items[weapNum]);
 			else // no weapon, set to mk23
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[MK23_NUM]);
 		}