Minor code cleanup with variables

Author: ensiform

code/cgame/cg_draw.c

@@ -1698,7 +1698,6 @@ static void CG_DrawObits(void)
 	static float textHeight, spaceWidth;
 	const float textScale = 0.15f;
 	altObit_t *p;
-	int i = 0;
 
 	if (!cg.snap)
 		return;
@@ -1711,7 +1710,7 @@ static void CG_DrawObits(void)
 
 	y = cg_killFeedY.value;
 
-	for (i = 0, p = cg.obits; p < cg.obits + cg.numObits; i++, p++) {
+	for (p = cg.obits; p < cg.obits + cg.numObits; p++) {
 		const char *modstr = CG_GetObitString(p->mod);
 
 		if (p->victim >= MAX_CLIENTS)

code/cgame/cg_localents.c

@@ -969,15 +969,16 @@ void CG_MatchPredictedEnt(centity_t* cent) {
 	localEntity_t* match = NULL;
 	float best = SQR(32);
 	vec3_t diff;
+	int i;
 
 	// Can only match entities we own.
 	if (!CG_PredictedMissilesEnabled() ||
 			cent->currentState.clientNum != cg.snap->ps.clientNum)
 		return;
 
-	for (int i = 0; i < num_predicted_ents; i++) {
+	for (i = 0; i < num_predicted_ents; i++) {
 		localEntity_t* le = predicted_ents[i];
-		float len;
+		float len = SQR(64);
 
 		if (cent->currentState.eType == ET_MISSILE) {
 			VectorSubtract(cent->lerpOrigin, le->lerp.trBase, diff);
@@ -1007,8 +1008,9 @@ void CG_MatchPredictedEnt(centity_t* cent) {
 
 void CG_UpdateLocalPredictedEnts(void) {
 	float now = cg.time + 1000 / cgs.sv_fps;
+	int i;
 
-	for (int i = 0; i < num_predicted_ents; i++) {
+	for (i = 0; i < num_predicted_ents; i++) {
 		localEntity_t* le = predicted_ents[i];
 		vec3_t next;
 		trace_t trace;
@@ -1235,5 +1237,3 @@ void CG_AddLocalEntities( void ) {
 	//	CG_PositionSunflares();
 	//}
 }
-
-

code/cgame/cg_newdraw.c

@@ -3252,6 +3252,7 @@ void CG_Q3F_DrawHUDIcons(rectDef_t *rect, float tscale, vec4_t color, int textSt
 					Com_sprintf(buf, sizeof(buf), "%d", (int)t/1000);
 					y += (h - CG_Text_Height(buf, tscale, 0, font)) / 2;
 
+					// TODO put the reverse'd text on left hand side of the icon as well
 					CG_Text_Paint(x + text_x + (w/2) + 7, y + text_y + 2, tscale, colorWhite, buf, 0, 0, textStyle, font, textalignment);
 				}
 			}

code/cgame/cg_q3f_flare.c

@@ -522,7 +522,7 @@ void CG_RenderSunflares( void ) {
 					*gFlareFadeTime = cg.time;
 
 				// fade it in a bit
-				if( *gFlareFadeValue < 1 ) {
+				if( gFlareFadeValue && *gFlareFadeValue < 1 ) {
 					fadeValue = cg.time - *gFlareFadeTime;
 					fadeValue *= (float)FLARE_FADE_SPEED;
 					*gFlareFadeValue += fadeValue;
@@ -535,7 +535,7 @@ void CG_RenderSunflares( void ) {
 					*gFlareFadeTime = -1 * cg.time;
 
 				// fade it out a bit
-				if( *gFlareFadeValue > 0 ) {
+				if( gFlareFadeValue && *gFlareFadeValue > 0 ) {
 					fadeValue = cg.time + *gFlareFadeTime;	// add because time is negative
 					fadeValue *= (float)FLARE_FADE_SPEED;
 					*gFlareFadeValue -= fadeValue; 

code/game/g_active.c

@@ -549,6 +549,7 @@ void ClientTimerActions( gentity_t *ent ) {
 	const char *dataptr;
 	gentity_t *other;
 	int data;
+	int i;
 
 	client = ent->client;
 
@@ -770,7 +771,7 @@ void ClientTimerActions( gentity_t *ent ) {
 	G_Q3F_Check_Maladies(ent);
 
 	// turn off any expired powerups
-	for (int i = 0 ; i < MAX_POWERUPS ; i++ ) {
+	for (i = 0 ; i < MAX_POWERUPS ; i++ ) {
 		if ( ent->client->ps.powerups[ i ] && ent->client->ps.powerups[ i ] < level.time ) {
 			switch( i )
 			{
@@ -1107,7 +1108,7 @@ void ClientThink_real( gentity_t *ent ) {
 	if ( ucmd->serverTime < level.time - 1000 ) {
 		ucmd->serverTime = level.time - 1000;
 //		G_Printf("serverTime >>>>>\n" );
-	} 
+	}
 
 	// frameOffset should be about the number of milliseconds into a frame 
 	// this command packet was received, depending on how fast the server

code/game/g_q3f_eventlog.c

@@ -111,13 +111,13 @@ static void Q_FSWriteJSON( cJSON *object, fileHandle_t f ) {
 
 // TODO implement the milliseconds from qwtf-live
 // 
-static const char *ISOTimemills(void) {
+/*static const char *ISOTimemills(void) {
 	static char timeuse[64] = { 0 };
 	qtime_t now;
 	trap_RealTime( &now );
 	Com_sprintf(timeuse, sizeof(timeuse), "%d-%02d-%02dT%02d:%02d:%02d.%dZ", now.tm_year + 1900, now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec, 100);
 	return timeuse;
-}
+}*/
 
 void G_EventLog_PlayerStart( gentity_t *player ) {
 	cJSON *root;