X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fsurvival%2Fcl_survival.qc;h=02d0907abccf0a40b28a6c388455fd962cd8f2ad;hb=refs%2Fheads%2FMario%2Fsurvival;hp=c35418647ed9c78b66407895d25b501f68749f6e;hpb=61fe092d7042eb1bf8aa8b4e35a807775ae7803a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
index c35418647..02d0907ab 100644
--- a/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
+++ b/qcsrc/common/gamemodes/gamemode/survival/cl_survival.qc
@@ -11,13 +11,13 @@ void HUD_Mod_Survival(vector pos, vector mySize)
 	string player_text = "";
 	vector player_color = '1 1 1';
 	//string player_icon = "";
-	if(mystatus == SV_STATUS_HUNTER)
+	if(mystatus == SURV_STATUS_HUNTER)
 	{
 		player_text = _("Hunter");
 		player_color = '1 0 0';
 		//player_icon = "player_red";
 	}
-	else if(mystatus == SV_STATUS_PREY)
+	else if(mystatus == SURV_STATUS_PREY)
 	{
 		player_text = _("Survivor");
 		player_color = '0 1 0';
@@ -32,27 +32,27 @@ void HUD_Mod_Survival(vector pos, vector mySize)
 	drawstring_aspect(pos, player_text, vec2(mySize.x, mySize.y), player_color, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
-REGISTER_MUTATOR(cl_sv, true);
+REGISTER_MUTATOR(cl_surv, true);
 
-MUTATOR_HOOKFUNCTION(cl_sv, ForcePlayercolors_Skip, CBC_ORDER_LAST)
+MUTATOR_HOOKFUNCTION(cl_surv, ForcePlayercolors_Skip, CBC_ORDER_LAST)
 {
 	if(!ISGAMETYPE(SURVIVAL))
 		return false;
-		
+
 	entity player = M_ARGV(0, entity);
 	entity e = entcs_receiver(player.entnum - 1);
 	int surv_status = ((e) ? e.survival_status : 0);
 	int mystatus = entcs_receiver(player_localnum).survival_status;
 
-	int plcolor = SV_COLOR_PREY; // default to survivor
-	if((mystatus == SV_STATUS_HUNTER || intermission || STAT(GAME_STOPPED)) && surv_status == SV_STATUS_HUNTER)
-		plcolor = SV_COLOR_HUNTER;
+	int plcolor = SURV_COLOR_PREY; // default to survivor
+	if((mystatus == SURV_STATUS_HUNTER || intermission || STAT(GAME_STOPPED)) && surv_status == SURV_STATUS_HUNTER)
+		plcolor = SURV_COLOR_HUNTER;
 
 	player.colormap = 1024 + plcolor;
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(cl_sv, DrawScoreboard_Force)
+MUTATOR_HOOKFUNCTION(cl_surv, DrawScoreboard_Force)
 {
 	// show the scoreboard when the round ends, so players can see who the hunter was
 	return STAT(GAME_STOPPED);