diff --git a/codemp/cgame/cg_xcvar.h b/codemp/cgame/cg_xcvar.h index e1b6b90a90..c18a665c55 100644 --- a/codemp/cgame/cg_xcvar.h +++ b/codemp/cgame/cg_xcvar.h @@ -413,8 +413,8 @@ XCVAR_DEF( cg_killfeed, "0", NULL, CVAR_ARCHIVE ) XCVAR_DEF( cg_killfeedX, "0", NULL, CVAR_ARCHIVE ) XCVAR_DEF( cg_killfeedY, "0", NULL, CVAR_ARCHIVE ) XCVAR_DEF( cg_killfeedAlignment, "0", NULL, CVAR_ARCHIVE ) -XCVAR_DEF( cg_killfeedIconSize, "24", NULL, CVAR_ARCHIVE ) -XCVAR_DEF( cg_killfeedTextSize, "2", NULL, CVAR_ARCHIVE ) +XCVAR_DEF( cg_killfeedIconSize, "12", NULL, CVAR_ARCHIVE ) +XCVAR_DEF( cg_killfeedTextSize, "0.8", NULL, CVAR_ARCHIVE ) XCVAR_DEF( cg_killfeedColors, "0", NULL, CVAR_ARCHIVE ) diff --git a/codemp/cgame/hud_obituary.c b/codemp/cgame/hud_obituary.c index a60b74b6e8..b7173d6035 100644 --- a/codemp/cgame/hud_obituary.c +++ b/codemp/cgame/hud_obituary.c @@ -86,7 +86,7 @@ void HUD_DrawObituary(void) { else textScale = OBITUARY_TEXT_SIZE; - y = kfYOffset; + y = 10.0f + kfYOffset; padding = OBITUARY_PADDING_SCALAR; iconWidth = (iconSize * cgs.widthRatioCoef); iconHeight = iconSize; @@ -182,10 +182,10 @@ void HUD_DrawObituary(void) { //offset the allignment switch (killfeedAlignment){ case KF_RIGHT: - x = SCREEN_WIDTH - totalWidth + kfXOffset; + x = SCREEN_WIDTH - totalWidth - (10.0f + kfXOffset) * cgs.widthRatioCoef; break; case KF_LEFT: - x = 0.0f + kfXOffset; + x = (10.0f + kfXOffset) * cgs.widthRatioCoef; break; case KF_CENTER: x = (SCREEN_WIDTH - totalWidth) * 0.5f + kfXOffset; @@ -202,12 +202,12 @@ void HUD_DrawObituary(void) { } trap->R_SetColor(wepColor); CG_DrawPic(x + boxCenterX - 0.5f * iconWidth, boxCenterY - 0.5f * iconHeight, iconWidth, iconHeight, deathIcon); - x += (boxCenterX * 2.0f); trap->R_SetColor(NULL); + x += (boxCenterX * 2.0f); CG_FillRect(x, y, victimTextWidth + xPadding, maxHeight + yPadding, victimColor); CG_Text_Paint(x + (0.5f * xPadding), victimTextStartY, textScale, color, cgs.clientinfo[p->victim].name, 0, 0, 0, FONT_MEDIUM); - y += (2.0f * boxCenterY) + yPadding; + y += boxCenterY + yPadding; } }