Fix a pile of dead assignments.

Some were actual bugs!

libs/gamecode/pr_strings.c

@@ -841,7 +841,6 @@ PR_Sprintf (progs_t *pr, dstring_t *result, const char *name,
 		(*fi)->data.string_var = l;
 
 		(*fi)->next = new_fmt_item ();
-		fi = &(*fi)->next;
 	}
 
 	if (fmt_count != count) {

libs/gib/gib_builtin.c

@@ -236,8 +236,8 @@ GIB_Local_f (void)
 			for (i = 3; i < GIB_Argc(); i++)
 				GIB_Return (GIB_Argv(i));
 	} else for (i = 1; i < GIB_Argc(); i++)
-		var = GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->locals, &zero,
-								 GIB_Argv (i), &index, true);
+		GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->locals, &zero,
+							 GIB_Argv (i), &index, true);
 }
 
 
@@ -261,8 +261,8 @@ GIB_Shared_f (void)
 			for (i = 3; i < GIB_Argc(); i++)
 				GIB_Return (GIB_Argv(i));
 	} else for (i = 1; i < GIB_Argc(); i++)
-		var = GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->globals, &zero,
-								 GIB_Argv (i), &index, true);
+		GIB_Var_Get_Complex (&GIB_DATA (cbuf_active)->globals, &zero,
+							 GIB_Argv (i), &index, true);
 }
 
 static void

libs/gib/gib_function.c

@@ -234,11 +234,10 @@ GIB_Function_Prepare_Args_D (cbuf_t * cbuf, dstring_t **args, unsigned int
 	g_fpad_args = args;
 	g_fpad_argc = argc;
 
-	i = 1; llist_iterate (arglist, LLIST_ICAST (fpad_iterate));
+	llist_iterate (arglist, LLIST_ICAST (fpad_iterate));
 
-	var =
-		GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpad_zero, argss,
-				&g_fpad_ind, true);
+	var = GIB_Var_Get_Complex (&GIB_DATA (cbuf)->locals, &g_fpad_zero, argss,
+							   &g_fpad_ind, true);
 	var->array = realloc (var->array, sizeof (struct gib_varray_s) * argc);
 	memset (var->array + 1, 0, (argc - 1) * sizeof (struct gib_varray_s));
 	var->size = argc;

libs/models/brush/model_brush.c

@@ -221,7 +221,6 @@ Mod_LoadTextures (bsp_t *bsp)
 		memset (altanims, 0, sizeof (altanims));
 
 		max = tx->name[1];
-		altmax = 0;
 		if (max >= 'a' && max <= 'z')
 			max -= 'a' - 'A';
 		if (max >= '0' && max <= '9') {

libs/util/cvar.c

@@ -356,8 +356,8 @@ set_cvar (const char *cmd, int orflags)
 			Cvar_SetFlags (var, var->flags | orflags);
 		}
 	} else {
-		var = Cvar_Get (var_name, value, CVAR_USER_CREATED | orflags, NULL,
-						USER_CVAR);
+		Cvar_Get (var_name, value, CVAR_USER_CREATED | orflags, NULL,
+				  USER_CVAR);
 	}
 }
 

libs/util/quakefs.c

@@ -1209,7 +1209,7 @@ qfs_file_sort (char **os1, char **os2)
 	s2 = *os2;
 
 	while (1) {
-		in1 = in2 = n1 = n2 = 0;
+		n1 = n2 = 0;
 
 		if ((in1 = isdigit ((byte) *s1)))
 			n1 = strtol (s1, &s1, 10);

libs/util/riff.c

@@ -138,7 +138,6 @@ read_adtl (dstring_t *list_buf, QFile *f, int len)
 	//FIXME list = (riff_list_t *) list_buf->str;
 	while (len) {
 		if (!Rread (f, &ck, sizeof (ck))) {
-			len = 0;
 			break;
 		}
 		len -= sizeof (ck);
@@ -392,7 +391,6 @@ riff_read (QFile *f)
 				break;
 		}
 		dstring_append (riff_buf, (char *)&chunk, sizeof (chunk));
-		riff = (riff_list_t *) riff_buf->str;
 		chunk = 0;
 	}
 bail:

libs/video/renderer/gl/gl_mod_iqm.c

@@ -97,7 +97,6 @@ gl_R_DrawIQMModel (entity_t *ent)
 	iqmframe_t *frame;
 	int         i;
 
-	model = ent->model;
 	blend = R_IQMGetLerpedFrames (ent, iqm);
 	frame = R_IQMBlendPalette (iqm, ent->pose1, ent->pose2, blend, 0,
 							   gl->blend_palette, gl->palette_size);

libs/video/renderer/gl/gl_sky_clip.c

@@ -370,7 +370,6 @@ process_corners (struct box_def *box)
 	for (i = 0; i < 6; i++) {
 		if (max_visit < box->face_visits[i]) {
 			max_visit = box->face_visits[i];
-			center = i;
 		}
 	}
 

libs/video/renderer/glsl/glsl_sprite.c

@@ -143,7 +143,6 @@ R_GetSpriteFrames (entity_t *ent, msprite_t *sprite, mspriteframe_t **frame1,
 	if (framenum >= sprite->numframes || framenum < 0)
 		framenum = 0;
 
-	numframes = sprite->numframes;
 	framedesc = &sprite->frames[framenum];
 	if (framedesc->type == SPR_SINGLE) {
 		frame_interval = 0.1;

libs/video/targets/vid_x11.c

@@ -536,8 +536,6 @@ x11_choose_visual (void)
 	int         num_visuals;
 	int         template_mask;
 
-	template_mask = 0;
-
 	// specify a visual id
 	if ((pnum = COM_CheckParm ("-visualid"))) {
 		if (pnum >= com_argc - 1)

nq/source/cl_demo.c

@@ -184,6 +184,10 @@ read_demopacket (void)
 	VectorCopy (cl.mviewangles[0], cl.mviewangles[1]);
 	for (i = 0; i < 3; i++) {
 		r = Qread (cls.demofile, &f, 4);
+		if (r != 4) {
+			CL_StopPlayback ();
+			return 0;
+		}
 		cl.mviewangles[0][i] = LittleFloat (f);
 	}
 	r = Qread (cls.demofile, net_message->message->data,

nq/source/host_cmd.c

@@ -692,7 +692,6 @@ Host_Loadgame_f (void)
 	ED_InitGlobals (&sv_pr_state, PL_ObjectForKey (game, "globals"));
 
 	list = PL_ObjectForKey (game, "entities");
-	entnum = 0;
 	count = PL_A_NumObjects (list);
 	if (count > sv.max_edicts)
 		Host_Error ("too many entities in saved game. adjust max_edicts\n");

qw/source/cl_slist.c

@@ -119,7 +119,6 @@ SL_Add (server_entry_t *start, const char *ip, const char *desc)
 {
 	server_entry_t *p;
 
-	p = start;
 	if (!start) {						// Nothing at beginning of list,
 										// create it
 		start = calloc (1, sizeof (server_entry_t));

qw/source/net_packetlog.c

@@ -635,7 +635,7 @@ Parse_Server_Packet (int has_sequence)
 					break;
 				case svc_playerinfo:
 					Net_LogPrintf ("\n\tPlayer: %d", MSG_ReadByte (&packet));
-					mask2 = mask1 = MSG_ReadShort (&packet);
+					mask1 = MSG_ReadShort (&packet);
 					Net_LogPrintf (" Mask1: %d", mask1);
 #if 1
 					Net_LogPrintf (" Origin:");

qw/source/sv_ents.c

@@ -577,7 +577,6 @@ SV_WritePlayersToClient (delta_t *delta, byte *pvs, sizebuf_t *msg)
 	if (delta->client) {
 		clent = delta->client->edict;
 		spec_track = delta->client->spec_track;
-		stdver = delta->client->stdver;
 		null_player_state.modelindex = sv_playermodel;
 		full = 0;		// normal qw clients don't get real deltas on players
 	}

qw/source/teamplay.c

@@ -156,7 +156,6 @@ Team_ParseSay (dstring_t *buf, const char *s)
 			case 'S':
 				bracket = 0;
 				t1 = skin->string;
-				t1 = "FIXME";
 				break;
 			case 'd':
 				bracket = 0;
@@ -475,7 +474,6 @@ Team_ParseChat (const char *string)
 	if (!cl_freply->value)
 		return;
 
-	s = strchr (string, ':');
 	if (!(s = strchr (string, ':')))
 		return;
 	s++;

tools/qfbsp/source/merge.c

@@ -74,7 +74,6 @@ TryMerge (const face_t *f1, const face_t *f2)
 		return NULL;
 
 	p1 = p2 = NULL;
-	j = 0;
 
 	// find a common edge
 	for (i = 0; i < f1p->numpoints; i++) {

tools/qfbsp/source/portals.c

@@ -280,7 +280,6 @@ CutNodePortals_r (node_t *node)
 	/// cutting plane and clipping it by all of the planes from the other
 	/// portals on the node.
 	w = BaseWindingForPlane (plane);
-	side = 0;
 	for (p = node->portals; p; p = p->next[side]) {
 		clipplane = planes[p->planenum];	// copy the plane
 		if (p->nodes[0] == node)

tools/qfcc/source/dump_globals.c

@@ -202,8 +202,6 @@ dump_functions (progs_t *pr)
 
 		name = PR_GetString (pr, func->s_name);
 
-		comment = "";
-
 		start = func->first_statement;
 		if (start > 0)
 			comment = va (" @ %x", start);

tools/qfcc/source/expr.c

@@ -1926,13 +1926,17 @@ return_expr (function_t *f, expr_t *e)
 				if (options.warnings.traditional)
 					warning (e,
 							 "return from non-void function without a value");
+				// force a nil return value in case qf code is being generated
 				e = new_nil_expr ();
 			} else {
 				e = error (e, "return from non-void function without a value");
 				return e;
 			}
 		}
-		return new_unary_expr ('r', 0);
+		// the traditional check above may have set e
+		if (!e) {
+			return new_unary_expr ('r', 0);
+		}
 	}
 
 	t = get_type (e);
@@ -2823,7 +2827,6 @@ message_expr (expr_t *receiver, keywordarg_t *message)
 			return receiver;
 		receiver = cast_expr (&type_id, receiver);	//FIXME better way?
 		class = extract_class (current_class);
-		rec_type = class->type;
 	} else {
 		if (receiver->type == ex_symbol) {
 			if (strcmp (receiver->e.symbol->name, "self") == 0)

tools/qfcc/source/flow.c

@@ -1050,7 +1050,6 @@ flow_find_dominators (flowgraph_t *graph)
 		changed = 0;
 		for (i = 1; i < graph->num_nodes; i++) {
 			node = graph->nodes[i];
-			pred = set_first (node->predecessors);
 			set_empty (work);
 			for (pred = set_first (node->predecessors); pred;
 				 pred = set_next (pred))

tools/qfcc/source/value.c

@@ -558,7 +558,7 @@ emit_value (ex_value_t *value, def_t *def)
 
 	memcpy (D_POINTER (void, cn), &val.v, 4 * type_size (type));
 
-	imm = make_def_imm (cn, tab, &val);
+	make_def_imm (cn, tab, &val);
 
 	return cn;
 }

tools/qflight/source/ltface.c

@@ -488,7 +488,6 @@ SkyLightFace (entity_t *ent, int sun, lightinfo_t *l)
 	// Check each point...
 	VectorCopy (sun_dir, incoming);
 	VectorNormalize (incoming);
-	angle = DotProduct (incoming, l->facenormal);
 	//anglesense = 0.5;	//FIXME
 
 	// FIXME global
@@ -499,11 +498,9 @@ SkyLightFace (entity_t *ent, int sun, lightinfo_t *l)
 
 		if (!TestSky (l, point->v, sun_dir))
 			continue;
+
 		add = sun_light;
-			continue;
-
 		add *= angle;
-
 		add *= options.extrascale;
 
 		sample = &l->sample[mapnum][point->samplepos];

tools/qflight/source/properties.c

@@ -237,14 +237,11 @@ set_properties (entity_t *ent, plitem_t *dict)
 	const char *str;
 
 	if (properties) {
-		prop = PL_ObjectForKey (properties, ent->classname);
 		if ((p = get_item ("light_name", dict, 0))
 			&& (str = PL_String (p)))
 			prop = PL_ObjectForKey (properties, str);
 		if (!prop)
 			prop = PL_ObjectForKey (properties, ent->classname);
-
-		prop = PL_ObjectForKey (properties, ent->classname);
 		if (!prop)
 			prop = PL_ObjectForKey (properties, "default");
 	}