- same as last on library.c

- minor fix in atoms.c

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>

code/ui/ui_atoms.c

@@ -1744,7 +1744,6 @@ void UI_InitRanksData( char* ranksName ) {
 
 refreshRank:
 		/* using our current cvar'd rank, do a compare.  if we find a match, set our player to that rank in the menu */
-		int		i;
 		for ( int i=0, uis.currentRank=0; i < MAX_RANKS; i++ ) {
 			if ( !Q_stricmp( uis.rankSet.rankNames[i].consoleName, UI_Cvar_VariableString( "ui_playerRank" ) ) ) {
 				uis.currentRank = i;

code/ui/ui_fonts.c

@@ -45,7 +45,6 @@ void M_GridFont_Graphics (void)
 
 	character[1] = 0;
 	y = 190;
-	int color = CT_LTORANGE;
 	for (i=32;i<256;)
 	{
 		x = 100;
@@ -239,8 +238,6 @@ static void Fonts_MenuEvent( void* ptr, int notification )
 	if (notification != QM_ACTIVATED)
 		return;
 
-	menuframework_s* m = ((menucommon_s*)ptr)->parent;
-
 	switch (((menucommon_s*)ptr)->id)
 	{
 		case ID_FONT_SMALL:

code/ui/ui_library.c

@@ -274,12 +274,10 @@ CrewMenu_Blinkies
 */
 void LogMenu_Blinkies (void)
 {
-	int descI;
-
 	// Turning on description a line at a time
 	if ((logmenu_graphics[LMG_CURRENT_DESC].timer < uis.realtime) && (logmenu_graphics[LMG_CURRENT_DESC].type == MG_VAR))
 	{
-		descI = logmenu_graphics[LMG_CURRENT_DESC].target;
+		int descI = logmenu_graphics[LMG_CURRENT_DESC].target;
 		if (!descI)
 		{
 			logmenu_graphics[LMG_CURRENT_DESC].type = MG_OFF;
@@ -510,29 +508,6 @@ static void UI_LibraryDrawMD3Model(qhandle_t modelHandle,int x, int y,int modelD
 
 }
 
-/*
-================
-UI_DrawLibraryMDRModel
-
-================
-*/
-static void UI_DrawLibraryMDRModel(qhandle_t modelHandle,int x, int y)
-{
-	void *voidPtr;
-
-//	vec3_t	origin = {50,0,2};
-	vec3_t	angles;
-
-	angles[PITCH] = 0;
-	angles[YAW]   = 20.0/300.0 * uis.realtime;
-	angles[ROLL]  = 0;
-
-	voidPtr = (void *) &s_library.playerModel;
-//	Controls_DrawPlayer(voidPtr);
-//	Controls_UpdateModel( 0 );
-
-}
-
 /*
 =================
 ClearLibraryDesc
@@ -988,8 +963,6 @@ M_LibraryMenu_Graphics
 */
 void M_LibraryMenu_Graphics (void)
 {
-	int nameX,stardateX; //,textIndex; //length
-
 	trap_R_SetColor( colorTable[CT_VDKPURPLE2]);
 	UI_DrawHandlePic( 30,  24,16,   32, s_library.leftRound);
 
@@ -1011,13 +984,6 @@ void M_LibraryMenu_Graphics (void)
 	UI_DrawHandlePic(  30, 386,  64, -16, s_library.corner_ll_8_47);
 	UI_DrawHandlePic(  30, 425, 128,  64, s_library.corner_ll_18_47);
 
-	stardateX  = 50;
-//	UI_DrawProportionalString( stardateX , 24, menu_normal_text[MNT_TOPICS],  UI_BIGFONT , colorTable[CT_LTPURPLE2]);	
-
-//	length = UI_ProportionalStringWidth( menu_normal_text[MNT_TOPICS],UI_BIGFONT);
-//	trap_R_SetColor( colorTable[CT_VDKBLUE1]);
-//	UI_DrawHandlePic( stardateX + 4 + length,  24, (196 - (stardateX + 4 + length)), 24, uis.whiteShader);
-
 	// Left side
 	trap_R_SetColor( colorTable[CT_VDKPURPLE2]);
 	UI_DrawHandlePic( 184,  36,  20,  23, uis.whiteShader);		// Side line1
@@ -1041,17 +1007,8 @@ void M_LibraryMenu_Graphics (void)
 	UI_DrawHandlePic( 195, 368,   7,  18, uis.whiteShader);		// Bottom2
 
 	// Right side
-	nameX = 592;
-
-//	textIndex = MNT_LIBRARYSTATION;
-
-//	UI_DrawProportionalString( nameX, 24,
-//		menu_normal_text[textIndex],   UI_BIGFONT | UI_RIGHT, colorTable[CT_LTPURPLE2]);	
-//	length = UI_ProportionalStringWidth( menu_normal_text[textIndex],UI_BIGFONT);
 
 	trap_R_SetColor( colorTable[CT_VDKPURPLE2]);
-//	UI_DrawHandlePic( nameX + 4,  24,-16,   32, s_library.leftRound);
-//	UI_DrawHandlePic( 218,  24, (nameX - (length +4)) - 218, 24, uis.whiteShader);
 	
 	UI_DrawProportionalString( 240, 58,va("%s / %s", libraryText[s_library.mainTopic].mainTopic,libraryText[s_library.mainTopic].subTopic[s_library.subTopic]),
 	   UI_SMALLFONT , colorTable[CT_VLTGOLD1]);