Reverted ghud change until I have time to fix it

actionquake · Mar 1, 2024 · 062c86b · 062c86b
1 parent aa95007
commit 062c86b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/source/g_spawn.c b/source/g_spawn.c
@@ -1003,8 +1003,8 @@ void SpawnEntities (char *mapname, char *entities, char *spawnpoint)
 		Q_strncpyz(teams[TEAM2].name, "BLUE", sizeof(teams[TEAM2].name));
 		Q_strncpyz(teams[TEAM1].skin, "male/ctf_r", sizeof(teams[TEAM1].skin));
 		Q_strncpyz(teams[TEAM2].skin, "male/ctf_b", sizeof(teams[TEAM2].skin));
-		Q_strncpyz(teams[TEAM1].skin_index, "ctf_r", sizeof(teams[TEAM1].skin_index));
-		Q_strncpyz(teams[TEAM2].skin_index, "ctf_b", sizeof(teams[TEAM2].skin_index));
+		Q_strncpyz(teams[TEAM1].skin_index, "ctf_r_i", sizeof(teams[TEAM1].skin_index));
+		Q_strncpyz(teams[TEAM2].skin_index, "ctf_b_i", sizeof(teams[TEAM2].skin_index));
 	}
 	else if (esp->value)
 	{

diff --git a/source/p_hud.c b/source/p_hud.c
@@ -1007,8 +1007,10 @@ void HUD_SpectatorUpdate(edict_t *clent)
 
 			if (IS_ALIVE(cl_ent) && cl->curr_weap)
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->curr_weap]);
-			else
-				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			// else if (cl->resp.team && cl->pers.chosenWeapon->typeNum)
+			// 	Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			else // no weapon, set to mk23
+				Ghud_SetInt(clent, hud[h + 4], level.pic_items[MK23_NUM]);
 		}
 
 
@@ -1086,8 +1088,10 @@ void HUD_SpectatorUpdate(edict_t *clent)
 
 			if (IS_ALIVE(cl_ent) && cl->curr_weap)
 				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->curr_weap]);
-			else
-				Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			// else if (cl->resp.team && cl->pers.chosenWeapon->typeNum)
+			// 	Ghud_SetInt(clent, hud[h + 4], level.pic_items[cl->pers.chosenWeapon->typeNum]);
+			else // no weapon, set to mk23
+				Ghud_SetInt(clent, hud[h + 4], level.pic_items[MK23_NUM]);
 		}
 	}
 }