Refactors

Makefile.common

@@ -65,7 +65,6 @@ SOURCES_C :=  \
 	$(CORE_DIR)/common/r_part.c \
 	$(CORE_DIR)/common/r_sky.c \
 	$(CORE_DIR)/common/r_sprite.c \
-	$(CORE_DIR)/common/r_vars.c \
 	$(CORE_DIR)/common/r_surf.c \
 	$(CORE_DIR)/common/rb_tree.c \
 	$(CORE_DIR)/common/sbar.c \

QW/client/cl_cam.c

@@ -141,14 +141,6 @@ Cam_Lock(int playernum)
 static pmtrace_t
 Cam_DoTrace(vec3_t vec1, vec3_t vec2)
 {
-#if 0
-    memset(&pmove, 0, sizeof(pmove));
-
-    pmove.numphysent = 1;
-    VectorCopy(vec3_origin, pmove.physents[0].origin);
-    pmove.physents[0].model = cl.worldmodel;
-#endif
-
     VectorCopy(vec1, pmove.origin);
     return PM_PlayerMove(pmove.origin, vec2);
 }
@@ -408,75 +400,6 @@ Cam_Track(usercmd_t *cmd)
    }
 }
 
-#if 0
-static float
-adjustang(float current, float ideal, float speed)
-{
-    float move;
-
-    current = anglemod(current);
-    ideal = anglemod(ideal);
-
-    if (current == ideal)
-	return current;
-
-    move = ideal - current;
-    if (ideal > current) {
-	if (move >= 180)
-	    move = move - 360;
-    } else {
-	if (move <= -180)
-	    move = move + 360;
-    }
-    if (move > 0) {
-	if (move > speed)
-	    move = speed;
-    } else {
-	if (move < -speed)
-	    move = -speed;
-    }
-
-//Con_Printf("c/i: %4.2f/%4.2f move: %4.2f\n", current, ideal, move);
-    return anglemod(current + move);
-}
-#endif
-
-#if 0
-static void
-Cam_SetView(void)
-{
-    return;
-    player_state_t *player, *self;
-    frame_t *frame;
-    vec3_t vec, vec2;
-
-    if (cls.state != ca_active || !cl.spectator || !autocam || !locked)
-	return;
-
-    frame = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
-    player = frame->playerstate + spec_track;
-    self = frame->playerstate + cl.playernum;
-
-    VectorSubtract(player->origin, cl.simorg, vec);
-    if (cam_forceview) {
-	cam_forceview = false;
-	vectoangles(vec, cam_viewangles);
-	cam_viewangles[0] = -cam_viewangles[0];
-    } else {
-	vectoangles(vec, vec2);
-	vec2[PITCH] = -vec2[PITCH];
-
-	cam_viewangles[PITCH] =
-	    adjustang(cam_viewangles[PITCH], vec2[PITCH],
-		      cl_camera_maxpitch.value);
-	cam_viewangles[YAW] =
-	    adjustang(cam_viewangles[YAW], vec2[YAW], cl_camera_maxyaw.value);
-    }
-    VectorCopy(cam_viewangles, cl.viewangles);
-    VectorCopy(cl.viewangles, cl.simangles);
-}
-#endif
-
 void
 Cam_FinishMove(usercmd_t *cmd)
 {
@@ -490,32 +413,6 @@ Cam_FinishMove(usercmd_t *cmd)
     if (!cl.spectator)		// only in spectator mode
 	return;
 
-#if 0
-    if (autocam && locked) {
-	frame = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
-	player = frame->playerstate + spec_track;
-	self = frame->playerstate + cl.playernum;
-
-	VectorSubtract(player->origin, self->origin, vec);
-	if (cam_forceview) {
-	    cam_forceview = false;
-	    vectoangles(vec, cam_viewangles);
-	    cam_viewangles[0] = -cam_viewangles[0];
-	} else {
-	    vectoangles(vec, vec2);
-	    vec2[PITCH] = -vec2[PITCH];
-
-	    cam_viewangles[PITCH] =
-		adjustang(cam_viewangles[PITCH], vec2[PITCH],
-			  cl_camera_maxpitch.value);
-	    cam_viewangles[YAW] =
-		adjustang(cam_viewangles[YAW], vec2[YAW],
-			  cl_camera_maxyaw.value);
-	}
-	VectorCopy(cam_viewangles, cl.viewangles);
-    }
-#endif
-
     if (cmd->buttons & BUTTON_ATTACK) {
 	if (!(oldbuttons & BUTTON_ATTACK)) {
 

QW/client/cl_demo.c

@@ -636,20 +636,6 @@ CL_Record_f(void)
 	}
     }
 
-#if 0
-    MSG_WriteByte(&buf, svc_updatestatlong);
-    MSG_WriteByte(&buf, STAT_TOTALMONSTERS);
-    MSG_WriteLong(&buf, cl.stats[STAT_TOTALMONSTERS]);
-
-    MSG_WriteByte(&buf, svc_updatestatlong);
-    MSG_WriteByte(&buf, STAT_SECRETS);
-    MSG_WriteLong(&buf, cl.stats[STAT_SECRETS]);
-
-    MSG_WriteByte(&buf, svc_updatestatlong);
-    MSG_WriteByte(&buf, STAT_MONSTERS);
-    MSG_WriteLong(&buf, cl.stats[STAT_MONSTERS]);
-#endif
-
     // get the client to check and download skins
     // when that is completed, a begin command will be issued
     MSG_WriteByte(&buf, svc_stufftext);

QW/client/cl_ents.c

@@ -231,8 +231,6 @@ FlushEntityPacket(void)
     int word;
     entity_state_t olde, newe;
 
-    Con_DPrintf("FlushEntityPacket\n");
-
     memset(&olde, 0, sizeof(olde));
 
     cl.validsequence = 0;	// can't render a frame
@@ -274,12 +272,9 @@ CL_ParsePacketEntities(qboolean delta)
     cl.frames[newpacket].invalid = false;
 
     if (delta) {
-	from = MSG_ReadByte();
+	from      = MSG_ReadByte();
 
 	oldpacket = cl.frames[newpacket].delta_sequence;
-
-	if ((from & UPDATE_MASK) != (oldpacket & UPDATE_MASK))
-	    Con_DPrintf("WARNING: from mismatch\n");
     } else
 	oldpacket = -1;
 
@@ -851,13 +846,11 @@ CL_LinkPlayers(void)
 	if (msec <= 0
 	    || (!cl_predict_players.value && !cl_predict_players2.value)) {
 	    VectorCopy(state->origin, ent->origin);
-//Con_DPrintf ("nopredict\n");
 	} else {
 	    // predict players movement
 	    if (msec > 255)
 		msec = 255;
 	    state->command.msec = msec;
-//Con_DPrintf ("predict: %i\n", msec);
 
 	    oldphysent = pmove.numphysent;
 	    CL_SetSolidPlayers(j);
@@ -971,13 +964,11 @@ CL_SetUpPlayerPrediction(qboolean dopred)
 		(!cl_predict_players.value && !cl_predict_players2.value) ||
 		!dopred) {
 		VectorCopy(state->origin, pplayer->origin);
-		//Con_DPrintf ("nopredict\n");
 	    } else {
 		// predict players movement
 		if (msec > 255)
 		    msec = 255;
 		state->command.msec = msec;
-		//Con_DPrintf ("predict: %i\n", msec);
 
 		CL_PredictUsercmd(state, &exact, &state->command, false);
 		VectorCopy(exact.origin, pplayer->origin);

QW/client/cl_input.c

@@ -706,16 +706,3 @@ CL_InitInput(void)
 
     Cvar_RegisterVariable(&cl_nodelta);
 }
-
-// FIXME - unused function?
-#if 0
-/*
-============
-CL_ClearStates
-============
-*/
-static void
-CL_ClearStates(void)
-{
-}
-#endif