if(histime < 0)
return strcat(col, cpname);
else if(hisname == "")
- return strcat(col, sprintf(_("%s (%s)")), cpname, timestr);
+ return strcat(col, sprintf(_("%s (%s)"), cpname, timestr));
else
- return strcat(col, sprintf(_("%s (%s %s)")), cpname, timestr, strcat(hisname, col, lapstr));
+ return strcat(col, sprintf(_("%s (%s %s)"), cpname, timestr, strcat(hisname, col, lapstr)));
}
// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
fclose(fh);
}
else
- print(sprintf(_("^1Couldn't write to \n"), filename));
+ print(sprintf(_("^1Couldn't write to %s\n"), filename));
}
const float hlBorderSize = 4;
}
else if (stof(s2) > 2) {
if(gentle)
- print (sprintf(_("^1%s's ^1%s scoring spree was ended by a team mate!\n"), s1, stof(s3)));
+ print (sprintf(_("^1%s^1's %s scoring spree was ended by a team mate!\n"), s1, stof(s3)));
else
- print (sprintf(_("^1%s's ^1%s kill spree was ended by a team mate!\n"), s1, stof(s3)));
+ print (sprintf(_("^1%s^1's %s kill spree was ended by a team mate!\n"), s1, stof(s3)));
}
}
else if(type == KILL_FIRST_BLOOD)
} else if(type == DEATH_SBCRUSH) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was crushed by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was crushed by %s\n"), s2, s1));
} else if(type == DEATH_SBMINIGUN) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 got shredded by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 got shredded by %s\n"), s2, s1));
} else if(type == DEATH_SBROCKET) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was blased to bits by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was blasted to bits by %s\n"), s2, s1));
} else if(type == DEATH_SBBLOWUP) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 got caught in the destruction of ^1%s's vehicle\n"), s2, s1));
+ print (sprintf(_("^1%s^1 got caught in the destruction of %s^1's vehicle\n"), s2, s1));
} else if(type == DEATH_WAKIGUN) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was bolted down by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was bolted down by %s\n"), s2, s1));
} else if(type == DEATH_WAKIROCKET) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 could find no shelter from ^1%s's rockets\n"), s2, s1));
+ print (sprintf(_("^1%s^1 could find no shelter from %s^1's rockets\n"), s2, s1));
} else if(type == DEATH_WAKIBLOWUP) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 dies when ^1%s's wakizashi dies.\n"), s2, s1));
+ print (sprintf(_("^1%s^1 dies when %s^1's wakizashi dies.\n"), s2, s1));
} else if(type == DEATH_TURRET) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was pushed into the line of fire by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was pushed into the line of fire by %s\n"), s2, s1));
} else if(type == DEATH_TOUCHEXPLODE) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was pushed into an accident by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was pushed into an accident by %s\n"), s2, s1));
} else if(type == DEATH_CHEAT) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was unfairly eliminated by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was unfairly eliminated by %s\n"), s2, s1));
} else if (type == DEATH_FIRE) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
if(alsoprint)
- print (sprintf(_("^1%s^1 was burnt to death by ^1%s\n"), s2, s1));
+ print (sprintf(_("^1%s^1 was burnt to death by %s\n"), s2, s1));
} else if (type == DEATH_CUSTOM) {
HUD_KillNotify_Push(s1, s2, 1, DEATH_CUSTOM);
if(alsoprint)
} else if(msg == MSG_SPREE) {
if(type == KILL_END_SPREE) {
if(gentle)
- print (sprintf(_("^1%s's ^1%s scoring spree was ended by %s\n"), s1, s2, s3));
+ print (sprintf(_("^1%s^1's %s scoring spree was ended by %s\n"), s1, s2, s3));
else
- print (sprintf(_("^1%s's ^1%s kill spree was ended by %s\n"), s1, s2, s3));
+ print (sprintf(_("^1%s^1's %s kill spree was ended by %s\n"), s1, s2, s3));
} else if(type == KILL_SPREE) {
if(gentle)
print (sprintf(_("^1%s^1 made %s scores in a row\n"), s1, s2));
height = mySize_y/entries;
vector fontsize;
- fontsize = '0.5 0.5 0' * height;
+ float fontheight = height * autocvar_hud_panel_notify_fontsize;
+ fontsize = '0.5 0.5 0' * fontheight;
float a;
float when;
}
attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
- pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height);
+ pos_attacker = pos + eX * (0.52 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight)));
weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
if(s != "")
victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
:hud_config_notifyprint
width_attacker = stringwidth(attacker, TRUE, fontsize);
- pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * (0.5 * fontsize_y + i * height);
- pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * (0.5 * fontsize_y + i * height);
+ pos_attacker = pos + eX * (0.48 * mySize_x - height - width_attacker) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight)));
+ pos_victim = pos + eX * (0.52 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight)));
weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
if(s != "")