Set hc_boost default to 0, zoom crosshair default to 1

src/action/g_save.c

@@ -457,7 +457,7 @@ void InitGame( void )
 	video_check_glclear = gi.cvar( "video_check_glclear", "0", 0 );
 	video_checktime = gi.cvar( "video_checktime", "15", 0 );
 	hc_single = gi.cvar( "hc_single", "1", CVAR_LATCH );	//default ON
-	hc_boost = gi.cvar("hc_boost", "1", CVAR_LATCH); //rekkie -- allow HC to 'boost' the player
+	hc_boost = gi.cvar("hc_boost", "0", CVAR_LATCH); //rekkie -- allow HC to 'boost' the player
 	hc_boost_percent = gi.cvar("hc_boost_percent", "100", 0); //rekkie -- allow HC to 'boost' the player
 	hc_silencer = gi.cvar("hc_silencer", "0", 0); //rekkie -- allow HC to 'boost' the player
 	wp_flags = gi.cvar( "wp_flags", WPF_DEFAULT_STR, 0 );

src/action/g_weapon.c

@@ -492,6 +492,7 @@ void ProduceShotgunDamageReport (edict_t *self)
 	int i, total = 0, total_to_print, printed = 0;
 	char *textbuf;
 	gclient_t *cl;
+	int hc_boost_multiplier = 0;
 
 	for (i = 0, cl = game.clients; i < game.maxclients; i++, cl++) {
 		if (cl->took_damage)
@@ -513,9 +514,11 @@ void ProduceShotgunDamageReport (edict_t *self)
 
 		// Sanity check
 		if (hc_boost_percent->value <= 0)
-			gi.cvar_set("hc_boost_multiplier", va("%d", 100));
+			hc_boost_multiplier = 100;
+			//gi.cvar_set("hc_boost_multiplier", va("%d", 100));
 		if (hc_boost_percent->value > 1000)
-			gi.cvar_set("hc_boost_multiplier", va("%d", 1000));
+			hc_boost_multiplier = 1000;
+			//gi.cvar_set("hc_boost_multiplier", va("%d", 1000));
 
 		float knockback = 300; // Double barrel
 		if (self->client->pers.hc_mode) knockback = 150; // Single barrel
@@ -529,17 +532,14 @@ void ProduceShotgunDamageReport (edict_t *self)
 		VectorAdd(self->client->oldvelocity, kvel, self->client->oldvelocity);
 
 		//if (self->is_bot == false) Com_Printf("%s %f %f %f\n", __func__, self->client->v_angle[0], self->client->v_angle[1], self->client->v_angle[2]);
-
-		/*
-		if (hc_boost_multiplier->value < 0)
-			gi.cvar_set("hc_boost_multiplier", va("%d", 0));
-		if (hc_boost_multiplier->value > 10)
-			gi.cvar_set("hc_boost_multiplier", va("%d", 10));
+		// if (hc_boost_multiplier < 0)
+		// 	gi.cvar_set("hc_boost_multiplier", va("%d", 0));
+		// if (hc_boost_multiplier->value > 10)
+		// 	gi.cvar_set("hc_boost_multiplier", va("%d", 10));
 		if (self->client->pers.hc_mode == 0) // Double barrel
-			self->velocity[2] += (300 * hc_boost_multiplier->value);
+			self->velocity[2] += (300 * hc_boost_multiplier);
 		else // self->client->pers.hc_mode == 1 // Single barrel
-			self->velocity[2] += (150 * hc_boost_multiplier->value);
-		*/
+			self->velocity[2] += (150 * hc_boost_multiplier);
 	}
 	//rekkie -- allow HC to 'boost' the player -- e
 

src/client/screen.c

@@ -1419,7 +1419,7 @@ void SCR_Init(void)
     ch_x = Cvar_Get("ch_x", "0", 0);
     ch_y = Cvar_Get("ch_y", "0", 0);
 
-    ch_hide_while_zoomed = Cvar_Get("ch_hide_while_zoomed", "0", 0);
+    ch_hide_while_zoomed = Cvar_Get("ch_hide_while_zoomed", "1", 0);
 
     scr_draw2d = Cvar_Get("scr_draw2d", "2", 0);
     scr_showturtle = Cvar_Get("scr_showturtle", "1", 0);