drawstring(position, text, scale, rgb, theAlpha, flag);
}
-// return the string of the given race place
-string race_PlaceName(float pos) {
- if(pos == 1)
- return _("1st");
- else if(pos == 2)
- return _("2nd");
- else if(pos == 3)
- return _("3rd");
- else
- return sprintf(_("%dth"), pos);
-}
-
// return the string of the onscreen race timer
string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
{
return 0;
}
+float GetPlayerColorForce(float i)
+{
+ if(!teamplay)
+ return 0;
+ else
+ return stof(getplayerkeyvalue(i, "colors")) & 15;
+}
+
+float GetPlayerColor(float i)
+{
+ if not(playerslots[i].gotscores) // unconnected
+ return NUM_SPECTATOR;
+ else if(stof(getplayerkeyvalue(i, "frags")) == FRAGS_SPECTATOR)
+ return NUM_SPECTATOR;
+ else
+ return GetPlayerColorForce(i);
+}
+
+string GetPlayerName(float i)
+{
+ return ColorTranslateRGB(getplayerkeyvalue(i, "name"));
+}
+
+
/*
==================
HUD panels
// Notification area (#4)
//
-string Weapon_SuicideMessage(float deathtype)
-{
- w_deathtype = deathtype;
- get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_SUICIDEMESSAGE);
- return w_deathtypestring;
-}
-
-string Weapon_KillMessage(float deathtype)
+void HUD_Notify_Push(string icon, string attacker, string victim)
{
- w_deathtype = deathtype;
- get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_KILLMESSAGE);
- return w_deathtypestring;
-}
-
-#define KN_MAX_ENTRIES 10
-float kn_index;
-float killnotify_times[KN_MAX_ENTRIES];
-float killnotify_deathtype[KN_MAX_ENTRIES];
-float killnotify_actiontype[KN_MAX_ENTRIES]; // 0 = "Y [used by] X", 1 = "X [did action to] Y"
-string killnotify_attackers[KN_MAX_ENTRIES];
-string killnotify_victims[KN_MAX_ENTRIES];
-void HUD_KillNotify_Push(string attacker, string victim, float actiontype, float wpn)
-{
- --kn_index;
- if (kn_index == -1)
- kn_index = KN_MAX_ENTRIES-1;
- killnotify_times[kn_index] = time;
- killnotify_deathtype[kn_index] = wpn;
- killnotify_actiontype[kn_index] = actiontype;
- if(killnotify_attackers[kn_index])
- strunzone(killnotify_attackers[kn_index]);
- killnotify_attackers[kn_index] = strzone(attacker);
- if(killnotify_victims[kn_index])
- strunzone(killnotify_victims[kn_index]);
- killnotify_victims[kn_index] = strzone(victim);
-}
+ if(icon != "")
+ {
+ --kn_index;
+ if (kn_index == -1) { kn_index = KN_MAX_ENTRIES-1; }
+ notify_times[kn_index] = time;
-void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s1 = attacker, s2 = victim
-{
- float w;
- float alsoprint, gentle;
- alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
- gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
-
- if ((msg == MSG_SUICIDE || msg == MSG_KILL || msg == MSG_KILL_ACTION) && gametype == MAPINFO_TYPE_CTS) // selfkill isn't interesting in CTS and only spams up the notify panel
- return;
+ // icon
+ if(notify_icon[kn_index]) { strunzone(notify_icon[kn_index]); }
+ notify_icon[kn_index] = strzone(icon);
- if(msg == MSG_SUICIDE) {
- w = DEATH_WEAPONOF(type);
- if(WEP_VALID(w)) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if (alsoprint)
- print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n");
- } else if (type == DEATH_KILL) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
- if (alsoprint)
- print (sprintf(_("^1%s^1 couldn't take it anymore\n"), s1));
- } else if (type == DEATH_ROT) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if (alsoprint)
- print (sprintf(_("^1%s^1 died\n"), s1));
- } else if (type == DEATH_NOAMMO) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO);
- if (alsoprint)
- print (sprintf(_("^7%s^7 committed suicide. What's the point of living without ammo?\n"), s1));
- } else if (type == DEATH_CAMP) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP);
- if (alsoprint)
- print (sprintf(_("^1%s^1 thought they found a nice camping ground\n"), s1));
- } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
- HUD_KillNotify_Push(s1, "", 0, type);
- if (alsoprint)
- print (sprintf(_("^1%s^1 didn't become friends with the Lord of Teamplay\n"), s1));
- } else if (type == DEATH_CHEAT) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if (alsoprint)
- print (sprintf(_("^1%s^1 unfairly eliminated themself\n"), s1));
- } else if (type == DEATH_FIRE) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if (alsoprint)
- print (sprintf(_("^1%s^1 burned to death\n"), s1));
- } else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if (alsoprint)
- print (sprintf(_("^1%s^1 couldn't resist the urge to self-destruct\n"), s1));
- }
-
- if (stof(s2) > 2) // killcount > 2
- print (sprintf(_("^1%s^1 ended it all after a %d kill spree\n"), s1, stof(s2)));
- } else if(msg == MSG_KILL) {
- w = DEATH_WEAPONOF(type);
- if(WEP_VALID(w)) {
- HUD_KillNotify_Push(s1, s2, 1, type);
- if (alsoprint)
- print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer
- }
- else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
- HUD_KillNotify_Push(s1, s2, 1, type);
- if(alsoprint)
- {
- if(gentle) {
- print (sprintf(_("^1%s^1 took action against a team mate\n"), s1));
- } else {
- print (sprintf(_("^1%s^1 mows down a team mate\n"), s1));
- }
- }
- if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
- if(gentle)
- print (sprintf(_("^1%s^1 ended a %d scoring spree by going against a team mate\n"), s1, stof(s3)));
- else
- print (sprintf(_("^1%s^1 ended a %d kill spree by killing a team mate\n"), s1, stof(s3)));
- }
- else if (stof(s2) > 2) {
- if(gentle)
- print (sprintf(_("^1%s^1's %s scoring spree was ended by a team mate!\n"), s1, stof(s3)));
- else
- 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)
- print(sprintf(_("^1%s^1 drew first blood\n"), s1));
- else if (type == DEATH_TELEFRAG) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_TELEFRAG);
- if(gentle)
- print (sprintf(_("^1%s^1 tried to occupy %s^1's teleport destination space\n"), s2, s1));
- else
- print (sprintf(_("^1%s^1 was telefragged by %s\n"), s2, s1));
- }
- else if (type == DEATH_DROWN) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_DROWN);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was drowned by %s\n"), s2, s1));
- }
- else if (type == DEATH_SLIME) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_SLIME);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was slimed by %s\n"), s2, s1));
- }
- else if (type == DEATH_LAVA) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_LAVA);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was cooked by %s\n"), s2, s1));
- }
- else if (type == DEATH_FALL) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_FALL);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was grounded by %s\n"), s2, s1));
- }
- else if (type == DEATH_SHOOTING_STAR) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_SHOOTING_STAR);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was shot into space by %s\n"), s2, s1));
- }
- else if (type == DEATH_SWAMP) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was conserved by %s\n"), s2, s1));
- }
- else if (type == DEATH_HURTTRIGGER)
- {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_HURTTRIGGER);
- if(alsoprint)
- print(sprintf(_("^1%s^1 was thrown into a world of hurt by %s\n"), s2, s1));
- } else if(type == DEATH_VHCRUSH) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- 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 %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 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 blast when %s^1's destroys a 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 %s\n"), s2, s1));
- } else if(type == DEATH_BUMB_GUN) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 saw %s's preddy lights.\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 %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 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1));
- } else if(type == DEATH_RAPTOR_CANNON) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 nailed to hell by %s\n"), s2, s1));
- } else if(type == DEATH_RAPTOR_BOMB) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 cluster crushed by %s\n"), s2, s1));
- } else if(type == DEATH_RAPTOR_DEATH) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\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 %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 %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 %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 %s\n"), s2, s1));
- } else if (type == DEATH_CUSTOM) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_CUSTOM);
- if(alsoprint)
- print("^1", sprintf(s3, strcat(s2, "^1"), strcat(s1, "^1")), "\n");
- } else if (type == DEATH_HURTTRIGGER) {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_HURTTRIGGER);
- if(alsoprint)
- print("^1", sprintf(s3, strcat(s2, "^1"), strcat(s1, "^1")), "\n");
- } else {
- HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was fragged by %s\n"), s2, s1));
- }
- } else if(msg == MSG_SPREE) {
- if(type == KILL_END_SPREE) {
- if(gentle)
- print (sprintf(_("^1%s^1's %s scoring spree was ended by %s\n"), s1, s2, s3));
- else
- 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));
- else
- print (sprintf(_("^1%s^1 has %s frags in a row\n"), s1, s2));
- } else if(type == KILL_SPREE_3) {
- if(gentle)
- print (sprintf(_("%s^7 made a ^1TRIPLE SCORE\n"), s1));
- else
- print (sprintf(_("%s^7 made a ^1TRIPLE FRAG\n"), s1));
- } else if(type == KILL_SPREE_5) {
- if(gentle)
- print (sprintf(_("%s^7 unleashes ^1SCORING RAGE\n"), s1));
- else
- print (sprintf(_("%s^7 unleashes ^1RAGE\n"), s1));
- } else if(type == KILL_SPREE_10) {
- if(gentle)
- print (sprintf(_("%s^7 made ^1TEN SCORES IN A ROW!\n"), s1));
- else
- print (sprintf(_("%s^7 starts the ^1MASSACRE!\n"), s1));
- } else if(type == KILL_SPREE_15) {
- if(gentle)
- print (sprintf(_("%s^7 made ^1FIFTEEN SCORES IN A ROW!\n"), s1));
- else
- print (sprintf(_("%s^7 executes ^1MAYHEM!\n"), s1));
- } else if(type == KILL_SPREE_20) {
- if(gentle)
- print (sprintf(_("%s^7 made ^1TWENTY SCORES IN A ROW!\n"), s1));
- else
- print (sprintf(_("%s^7 is a ^1BERSERKER!\n"), s1));
- } else if(type == KILL_SPREE_25) {
- if(gentle)
- print (sprintf(_("%s^7 made ^1TWENTY FIVE SCORES IN A ROW!\n"), s1));
- else
- print (sprintf(_("%s^7 inflicts ^1CARNAGE!\n"), s1));
- } else if(type == KILL_SPREE_30) {
- if(gentle)
- print (sprintf(_("%s^7 made ^1THIRTY SCORES IN A ROW!\n"), s1));
- else
- print (sprintf(_("%s^7 unleashes ^1ARMAGEDDON!\n"), s1));
- }
- } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
- if (type == DEATH_DROWN) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 was in the water for too long\n"), s1));
- else
- print (sprintf(_("^1%s^1 drowned\n"), s1));
- }
- } else if (type == DEATH_SLIME) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_SLIME);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was slimed\n"), s1));
- } else if (type == DEATH_LAVA) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 found a hot place\n"), s1));
- else
- print (sprintf(_("^1%s^1 turned into hot slag\n"), s1));
- }
- } else if (type == DEATH_FALL) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 tested gravity (and it worked)\n"), s1));
- else
- print (sprintf(_("^1%s^1 hit the ground with a crunch\n"), s1));
- }
- } else if (type == DEATH_SHOOTING_STAR) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_SHOOTING_STAR);
- if(alsoprint)
- print (sprintf(_("^1%s^1 became a shooting star\n"), s1));
- } else if (type == DEATH_SWAMP) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 discovered a swamp\n"), s1));
- else
- print (sprintf(_("^1%s^1 is now conserved for centuries to come\n"), s1));
- }
- } else if(DEATH_ISTURRET(type)) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 ran into a turret\n"), s1));
- else
- {
- switch(type)
- {
- case DEATH_TURRET_EWHEEL:
- print (sprintf(_("^1%s^1 was laserd down by a eWheel turret \n"), s1));
- break;
- case DEATH_TURRET_FLAC:
- print (sprintf(_("^1%s^1 got caught in the flac \n"), s1));
- break;
- case DEATH_TURRET_MACHINEGUN:
- print (sprintf(_("^1%s^1 was riddeld full of riddled by a machinegun turret \n"), s1));
- break;
- case DEATH_TURRET_WALKER_GUN:
- print (sprintf(_("^1%s^1 got served a led enrichment by a walker turret \n"), s1));
- break;
- case DEATH_TURRET_WALKER_MEELE:
- print (sprintf(_("^1%s^1 was impaled by a walker turret \n"), s1));
- break;
- case DEATH_TURRET_WALKER_ROCKET:
- print (sprintf(_("^1%s^1 was rocketed to hell by a walker turret \n"), s1));
- break;
- case DEATH_TURRET_HELLION:
- print (sprintf(_("^1%s^1 was blasted away hellion turret \n"), s1));
- break;
- case DEATH_TURRET_HK:
- print (sprintf(_("^1%s^1 could not hide from the hunter turret \n"), s1));
- break;
- case DEATH_TURRET_MLRS:
- print (sprintf(_("^1%s^1 got turned into smoldering gibs by a mlrs turret \n"), s1));
- break;
- case DEATH_TURRET_PLASMA:
- print (sprintf(_("^1%s^1 got served some superheated plasma from a plasma turret \n"), s1));
- break;
- case DEATH_TURRET_PHASER:
- print (sprintf(_("^1%s^1 was phased out \n"), s1));
- break;
- case DEATH_TURRET_TESLA:
- print (sprintf(_("^1%s^1 was electrocuted by a tesla turret \n"), s1));
- break;
- }
- }
- }
- } else if (type == DEATH_CUSTOM) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_CUSTOM);
- if(alsoprint)
- print("^1", sprintf(s2, strcat(s1, "^1")), "\n");
- } else if (type == DEATH_HURTTRIGGER) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_HURTTRIGGER);
- if(alsoprint)
- print("^1", sprintf(s2, strcat(s1, "^1")), "\n");
- } else if(type == DEATH_TOUCHEXPLODE) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 died in an accident\n"), s1));
- } else if(type == DEATH_CHEAT) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- print (sprintf(_("^1%s^1 was unfairly eliminated\n"), s1));
- } else if(type == DEATH_FIRE) {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 felt a little hot\n"), s1));
- else
- print (sprintf(_("^1%s^1 burnt to death\n"), s1));
- }
- } else {
- HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
- if(alsoprint)
- {
- if(gentle)
- print (sprintf(_("^1%s^1 needs a restart\n"), s1));
- else
- print (sprintf(_("^1%s^1 died\n"), s1));
- }
- }
- } else if(msg == MSG_KILL_ACTION_SPREE) {
- if(gentle)
- print (sprintf(_("^1%s^1 needs a restart after a %d scoring spree\n"), s1, stof(s2)));
- else
- print (sprintf(_("^1%s^1 died with a %d kill spree\n"), s1, stof(s2)));
- } else if(msg == MSG_INFO) {
- if(type == INFO_GOTFLAG) { // here, s2 is the flag name
- HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
- print(sprintf(_("%s^7 got the %s\n"), s1, s2));
- } else if(type == INFO_LOSTFLAG) {
- HUD_KillNotify_Push(s1, s2, 0, INFO_LOSTFLAG);
- print(sprintf(_("%s^7 lost the %s\n"), s1, s2));
- } else if(type == INFO_PICKUPFLAG) {
- HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
- print(sprintf(_("%s^7 picked up the %s\n"), s1, s2));
- } else if(type == INFO_RETURNFLAG) {
- HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG);
- print(sprintf(_("%s^7 returned the %s\n"), s1, s2));
- } else if(type == INFO_CAPTUREFLAG) {
- HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG);
- print(sprintf(_("%s^7 captured the %s%s\n"), s1, s2, s3));
- }
- } else if(msg == MSG_RACE) {
- if(type == RACE_SERVER_RECORD) {
- HUD_KillNotify_Push(s1, s2, 1, RACE_SERVER_RECORD);
- }
- else if(type == RACE_NEW_RANK) {
- HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_RANK);
- }
- else if(type == RACE_NEW_TIME) {
- HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_TIME);
- }
- else if(type == RACE_FAIL) {
- HUD_KillNotify_Push(s1, s2, 1, RACE_FAIL);
- }
- } else if(msg == MSG_KA) {
- if(type == KA_PICKUPBALL) {
- HUD_KillNotify_Push(s1, s2, 0, KA_PICKUPBALL);
- if(alsoprint)
- print (sprintf(_("%s^7 has picked up the ball!\n"), s1));
- }
- else if(type == KA_DROPBALL) {
- HUD_KillNotify_Push(s1, s2, 0, KA_DROPBALL);
- if(alsoprint)
- print(sprintf(_("%s^7 has dropped the ball!\n"), s1));
- }
- }
-}
+ // attacker
+ if(notify_attackers[kn_index]) { strunzone(notify_attackers[kn_index]); }
+ notify_attackers[kn_index] = strzone(attacker);
-void HUD_KillCenterprint(string s1, string s2, float type, float msg)
-{
- float gentle;
- gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
- if(msg == MSG_SUICIDE) {
- if (type == DEATH_TEAMCHANGE) {
- centerprint_hud(sprintf(_("You are now on: %s"), s1));
- } else if (type == DEATH_AUTOTEAMCHANGE) {
- centerprint_hud(sprintf(_("You have been moved into a different team to improve team balance\nYou are now on: %s"), s1));
- } else if (type == DEATH_CAMP) {
- if(gentle)
- centerprint_hud(_("^1Reconsider your tactics, camper!"));
- else
- centerprint_hud(_("^1Die camper!"));
- } else if (type == DEATH_NOAMMO) {
- if(gentle)
- centerprint_hud(_("^1You are reinserted into the game for running out of ammo..."));
- else
- centerprint_hud(_("^1You were killed for running out of ammo..."));
- } else if (type == DEATH_ROT) {
- if(gentle)
- centerprint_hud(_("^1You need to preserve your health"));
- else
- centerprint_hud(_("^1You grew too old without taking your medicine"));
- } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
- if(gentle)
- centerprint_hud(_("^1Don't go against team mates!"));
- else
- centerprint_hud(_("^1Don't shoot your team mates!"));
- } else if (type == DEATH_QUIET) {
- // do nothing
- } else { // generic message
- if(gentle)
- centerprint_hud(_("^1You need to be more careful!"));
- else
- centerprint_hud(_("^1You killed your own dumb self!"));
- }
- } else if(msg == MSG_KILL) {
- if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
- if(gentle) {
- centerprint_hud(sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1));
- } else {
- centerprint_hud(sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1));
- }
- } else if (type == KILL_FIRST_BLOOD) {
- if(gentle) {
- centerprint_hud(_("^1First score"));
- } else {
- centerprint_hud(_("^1First blood"));
- }
- } else if (type == KILL_FIRST_VICTIM) {
- if(gentle) {
- centerprint_hud(_("^1First casualty"));
- } else {
- centerprint_hud(_("^1First victim"));
- }
- } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
- if(gentle) {
- centerprint_hud(strcat(sprintf(_("^1You scored against ^7%s^1 who was typing!"), s1), s2));
- } else {
- centerprint_hud(strcat(sprintf(_("^1You typefragged ^7%s"), s1), s2));
- }
- } else if (type == KILL_TYPEFRAGGED) {
- if(gentle) {
- centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s^1 while you were typing!"), s1), s2));
- } else {
- centerprint_hud(strcat(sprintf(_("^1You were typefragged by ^7%s"), s1), s2));
- }
- } else if (type == KILL_FRAG) {
- if(gentle) {
- centerprint_hud(strcat(sprintf(_("^4You scored against ^7%s"), s1), s2));
- } else {
- centerprint_hud(strcat(sprintf(_("^4You fragged ^7%s"), s1), s2));
- }
- } else { // generic message
- if(gentle) {
- centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s"), s1), s2));
- } else {
- centerprint_hud(strcat(sprintf(_("^1You were fragged by ^7%s"), s1), s2));
- }
- }
- } else if(msg == MSG_KILL_ACTION) {
- // TODO: invent more centerprints here?
- centerprint_hud(_("^1Watch your step!"));
+ // victim
+ if(notify_victims[kn_index]) { strunzone(notify_victims[kn_index]); }
+ notify_victims[kn_index] = strzone(victim);
}
}
-void HUD_Notify (void)
+void HUD_Notify(void)
{
if(!autocvar__hud_configure)
{
float fadetime;
fadetime = autocvar_hud_panel_notify_fadetime;
- string s;
-
- vector pos_attacker, pos_victim;
- vector weap_pos;
+ vector pos_attacker, pos_victim, pos_icon;
float width_attacker;
- string attacker, victim;
+ string attacker, victim, icon;
- float i, j, w, type, step, limit;
+ float i, j, step, limit;
if(autocvar_hud_panel_notify_flip) //order items from the top down
{
i = 0;
a = entries - 1 - i;
attacker = textShortenToWidth(sprintf(_("Player %d"), a+1), 0.48 * mySize_x - height, fontsize, stringwidth_colors);
victim = textShortenToWidth(sprintf(_("Player %d"), a+2), 0.48 * mySize_x - height, fontsize, stringwidth_colors);
- s = strcat("weapon", get_weaponinfo(WEP_FIRST + mod(floor(a*2.4), WEP_LAST)).netname);
+ icon = strcat("weapon", get_weaponinfo(WEP_FIRST + mod(floor(a*2.4), WEP_LAST)).netname);
a = bound(0, (when - a) / 4, 1);
goto hud_config_notifyprint;
}
-
- if (j == KN_MAX_ENTRIES)
- j = 0;
-
- if(killnotify_times[j] + when > time)
- a = 1;
- else if(fadetime)
- {
- a = bound(0, (killnotify_times[j] + when + fadetime - time) / fadetime, 1);
- if(!a)
- {
- break;
- }
- }
else
{
- break;
- }
-
- s = "";
-
- type = killnotify_deathtype[j];
- w = DEATH_WEAPONOF(type);
+ if (j == KN_MAX_ENTRIES)
+ j = 0;
- // TODO: maybe print in team colors?
- //
- // Y [used by] X
- if(killnotify_actiontype[j] == 0)
- {
- if(type == DEATH_GENERIC)
- {
- s = "notify_death";
- }
- else if(type == DEATH_NOAMMO)
- {
- s = "notify_outofammo";
- }
- else if(type == DEATH_KILL)
- {
- s = "notify_selfkill";
- }
- else if(type == DEATH_CAMP)
- {
- s = "notify_camping";
- }
- else if(type == KILL_TEAM_RED)
- {
- s = "notify_teamkill_red";
- }
- else if(type == KILL_TEAM_BLUE)
- {
- s = "notify_teamkill_blue";
- }
- else if(type == DEATH_DROWN)
- {
- s = "notify_water";
- }
- else if(type == DEATH_SLIME)
- {
- s = "notify_slime";
- }
- else if(type == DEATH_LAVA)
- {
- s = "notify_lava";
- }
- else if(type == DEATH_FALL)
- {
- s = "notify_fall";
- }
- else if(type == DEATH_SHOOTING_STAR)
- {
- s = "notify_shootingstar";
- }
- else if(type == DEATH_HURTTRIGGER || type == DEATH_CUSTOM)
- {
- s = "notify_death";
- }
- else if(type == INFO_GOTFLAG)
- {
- if(killnotify_victims[j] == "^1RED^7 flag")
- {
- s = "notify_red_taken";
- }
- else
- {
- s = "notify_blue_taken";
- }
- }
- else if(type == INFO_RETURNFLAG)
- {
- if(killnotify_victims[j] == "^1RED^7 flag")
- {
- s = "notify_red_returned";
- }
- else
- {
- s = "notify_blue_returned";
- }
- }
- else if(type == INFO_LOSTFLAG)
- {
- if(killnotify_victims[j] == "^1RED^7 flag")
- {
- s = "notify_red_lost";
- }
- else
- {
- s = "notify_blue_lost";
- }
- }
- else if(type == INFO_CAPTUREFLAG)
+ if(notify_times[j] + when > time)
+ a = 1;
+ else if(fadetime)
{
- if(killnotify_victims[j] == "^1RED^7 flag")
- {
- s = "notify_red_captured";
- }
- else
+ a = bound(0, (notify_times[j] + when + fadetime - time) / fadetime, 1);
+ if(!a)
{
- s = "notify_blue_captured";
+ break;
}
}
- else if(type == KA_DROPBALL)
- {
- s = "notify_balldropped";
- }
- else if(type == KA_PICKUPBALL)
+ else
{
- s = "notify_ballpickedup";
+ break;
}
- 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) + (0.5 * (height - fontheight)));
- weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
-
- if(s != "")
- {
- drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
- drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
- }
+ attacker = notify_attackers[j];
+ victim = notify_victims[j];
+ icon = notify_icon[j];
}
- // X [did action to] Y
- else
+
+ //type = notify_deathtype[j];
+ //w = DEATH_WEAPONOF(type);
+
+ if(icon != "")
{
- if(type & HITTYPE_SECONDARY && w == WEP_LASER)
- {
- s = "notify_melee_laser";
- }
- else if(type & HITTYPE_SECONDARY && w == WEP_SHOTGUN)
- {
- s = "notify_melee_shotgun";
- }
- else if(type & HITTYPE_HEADSHOT && (w == WEP_RIFLE || w == WEP_MINSTANEX)) // all headshot weapons go here
- {
- s = "notify_headshot";
- }
- else if(WEP_VALID(w))
- {
- self = get_weaponinfo(w);
- s = strcat("weapon", self.netname);
- }
- else if(type == KILL_TEAM_RED)
+ if((attacker != "") && (victim == ""))
{
- s = "notify_teamkill_red";
- }
- else if(type == KILL_TEAM_BLUE)
- {
- s = "notify_teamkill_red";
- }
- else if(type == DEATH_TELEFRAG)
- {
- s = "notify_telefrag";
- }
- else if(type == DEATH_DROWN)
- {
- s = "notify_water";
- }
- else if(type == DEATH_SLIME)
- {
- s = "notify_slime";
- }
- else if(type == DEATH_LAVA)
- {
- s = "notify_lava";
- }
- else if(type == DEATH_FALL)
- {
- s = "notify_fall";
- }
- else if(type == DEATH_SHOOTING_STAR)
- {
- s = "notify_shootingstar";
- }
- else if(type == DEATH_HURTTRIGGER || type == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right?
- {
- s = "notify_void";
- }
- else if(type == RACE_SERVER_RECORD)
- {
- s = "race_newrecordserver";
- }
- else if(type == RACE_NEW_RANK)
- {
- s = "race_newrankyellow";
- }
- else if(type == RACE_NEW_TIME)
- {
- s = "race_newtime";
+ // Y [used by] X
+ attacker = textShortenToWidth(attacker, 0.73 * mySize_x - height, fontsize, stringwidth_colors);
+ pos_attacker = pos + eX * (0.27 * mySize_x + height) + eY * ((0.5 * fontsize_y + i * height) + (0.5 * (height - fontheight)));
+ pos_icon = pos + eX * 0.25 * mySize_x - eX * height + eY * i * height;
+
+ drawpic_aspect_skin(pos_icon, icon, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+ drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
}
- else if(type == RACE_FAIL)
+ else if((attacker != "") && (victim != ""))
{
- s = "race_newfail";
- }
-
- attacker = textShortenToWidth(killnotify_attackers[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
- victim = textShortenToWidth(killnotify_victims[j], 0.48 * mySize_x - height, fontsize, stringwidth_colors);
+ // X [did action to] Y
+ attacker = textShortenToWidth(attacker, 0.48 * mySize_x - height, fontsize, stringwidth_colors);
+ victim = textShortenToWidth(victim, 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) + (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;
+ width_attacker = stringwidth(attacker, TRUE, fontsize);
+ 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)));
+ pos_icon = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
- if(s != "")
- {
- drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+ drawpic_aspect_skin(pos_icon, icon, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
}
HUD_Panel_UpdateCvars(radar);
HUD_Panel_ApplyFadeAlpha();
+
+ float f = 0;
if (hud_panel_radar_maximized && !autocvar__hud_configure)
{
panel_bg = strcat(hud_skin_path, "/border_default"); // always use the default border when maximized
if(precache_pic(panel_bg) == "") { panel_bg = "gfx/hud/default/border_default"; } // fallback
+
+ switch(hud_panel_radar_maximized_zoommode)
+ {
+ default:
+ case 0:
+ f = current_zoomfraction;
+ break;
+ case 1:
+ f = 1 - current_zoomfraction;
+ break;
+ case 2:
+ f = 0;
+ break;
+ case 3:
+ f = 1;
+ break;
+ }
+
+ switch(hud_panel_radar_maximized_rotation)
+ {
+ case 0:
+ teamradar_angle = view_angles_y - 90;
+ break;
+ default:
+ teamradar_angle = 90 * hud_panel_radar_maximized_rotation;
+ break;
+ }
+ }
+ if (!hud_panel_radar_maximized && !autocvar__hud_configure)
+ {
+ switch(hud_panel_radar_zoommode)
+ {
+ default:
+ case 0:
+ f = current_zoomfraction;
+ break;
+ case 1:
+ f = 1 - current_zoomfraction;
+ break;
+ case 2:
+ f = 0;
+ break;
+ case 3:
+ f = 1;
+ break;
+ }
+
+ switch(hud_panel_radar_rotation)
+ {
+ case 0:
+ teamradar_angle = view_angles_y - 90;
+ break;
+ default:
+ teamradar_angle = 90 * hud_panel_radar_rotation;
+ break;
+ }
}
vector pos, mySize;
float color2;
entity tm;
float scale2d, normalsize, bigsize;
- float f;
teamradar_origin2d = pos + 0.5 * mySize;
teamradar_size2d = mySize;
teamradar_loadcvars();
- switch(hud_panel_radar_zoommode)
- {
- default:
- case 0:
- f = current_zoomfraction;
- break;
- case 1:
- f = 1 - current_zoomfraction;
- break;
- case 2:
- f = 0;
- break;
- case 3:
- f = 1;
- break;
- }
-
- switch(hud_panel_radar_rotation)
- {
- case 0:
- teamradar_angle = view_angles_y - 90;
- break;
- default:
- teamradar_angle = 90 * hud_panel_radar_rotation;
- break;
- }
-
scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
teamradar_size2d = mySize;
teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center
// pixels per world qu to match the teamradar_size2d_x range in the longest dimension
- if(hud_panel_radar_rotation == 0)
+ if((hud_panel_radar_rotation == 0 && !hud_panel_radar_maximized) || (hud_panel_radar_maximized_rotation == 0 && hud_panel_radar_maximized))
{
// max-min distance must fit the radar in any rotation
bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_scale));
for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
{
color2 = GetPlayerColor(tm.sv_entnum);
- //if(color == COLOR_SPECTATOR || color == color2)
- draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
+ //if(color == NUM_SPECTATOR || color == color2)
+ draw_teamradar_player(tm.origin, tm.angles, Team_ColorRGB(color2));
}
draw_teamradar_player(view_origin, view_angles, '1 1 1');
for(i=0; i<team_count; ++i) {
if (i == floor((entries - 2) / players_per_team) || (entries == 1 && i == 0))
HUD_Panel_DrawHighlight(pos + eX * score_size * i, eX * score_size + eY * fontsize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
- drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), eX * score_size + eY * fontsize_y, GetTeamRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), eX * score_size + eY * fontsize_y, Team_ColorRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
}
first_pl = 1;
pos_y += fontsize_y;
}
if (team_count)
- score_color = GetTeamRGB(ColorByTeam(floor((i - first_pl) / players_per_team))) * 0.8;
+ score_color = Team_ColorRGB(ColorByTeam(floor((i - first_pl) / players_per_team))) * 0.8;
s = textShortenToWidth(s, name_size, fontsize, stringwidth_colors);
drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
drawstring(pos + eX * (name_size + spacing_size), ftos(score), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
// show team scores in the first line
float score_size = mySize_x / team_count;
for(tm = teams.sort_next; tm; tm = tm.sort_next) {
- if(tm.team == COLOR_SPECTATOR)
+ if(tm.team == NUM_SPECTATOR)
continue;
if (tm.team == myteam)
drawfill(pos + eX * score_size * i, eX * score_size + eY * fontsize_y, '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
- drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize_y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
++i;
}
first_pl = 1;
do
for (pl = players.sort_next; pl && i<entries; pl = pl.sort_next)
{
- if ((team_count && pl.team != tm.team) || pl.team == COLOR_SPECTATOR)
+ if ((team_count && pl.team != tm.team) || pl.team == NUM_SPECTATOR)
continue;
if (i == entries-1 && !me_printed && pl != me)
if (autocvar_hud_panel_score_rankings == 1 && spectatee_status != -1)
{
for (pl = me.sort_next; pl; pl = pl.sort_next)
- if (pl.team != COLOR_SPECTATOR)
+ if (pl.team != NUM_SPECTATOR)
break;
if (pl)
drawfill(pos, eX * mySize_x + eY * fontsize_y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
}
if (team_count)
- score_color = GetTeamRGB(pl.team) * 0.8;
+ score_color = Team_ColorRGB(pl.team) * 0.8;
s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores[ps_primary])), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
pos_y += fontsize_y;
++i;
}
- while (i<entries && team_count && (tm = tm.sort_next) && (tm.team != COLOR_SPECTATOR || (tm = tm.sort_next)));
+ while (i<entries && team_count && (tm = tm.sort_next) && (tm.team != NUM_SPECTATOR || (tm = tm.sort_next)));
}
void HUD_Score(void)
vector score_pos, score_size; //for scores other than myteam
if (spectatee_status == -1 || autocvar_hud_panel_score_rankings)
{
- for(tm = teams.sort_next; tm, tm.team != COLOR_SPECTATOR; tm = tm.sort_next)
+ for(tm = teams.sort_next; tm, tm.team != NUM_SPECTATOR; tm = tm.sort_next)
++scores_count;
if (autocvar_hud_panel_score_rankings)
{
draw_beginBoldFont();
row = column = 0;
for(tm = teams.sort_next; tm; tm = tm.sort_next) {
- if(tm.team == COLOR_SPECTATOR)
+ if(tm.team == NUM_SPECTATOR)
continue;
score = tm.(teamscores[ts_primary]);
if(autocvar__hud_configure)
score_pos = pos + eX * column * (score_size_x + offset_x) + eY * row * (score_size_y + offset_y);
if (max_fragcount == score)
HUD_Panel_DrawHighlight(score_pos, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
- drawstring_aspect(score_pos, ftos(score), score_size, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(score_pos, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
++row;
if(row >= rows)
{
else if(tm.team == myteam) {
if (max_fragcount == score)
HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
- drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
} else {
if (max_fragcount == score)
HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
- drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, ftos(score), score_size, GetTeamRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * rows * mySize_y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
++rows;
}
}
case 2: red_icon = "flag_red_lost"; break;
case 3: red_icon = "flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
default:
- if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+ if((stat_items & IT_CTF_SHIELDED) && (myteam == NUM_TEAM_2))
red_icon = "flag_red_shielded";
else
red_icon = string_null;
default:
if(redflag == 3)
red_icon_prevstatus = "flag_red_carrying"; // make it more visible
- else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+ else if((stat_items & IT_CTF_SHIELDED) && (myteam == NUM_TEAM_2))
red_icon_prevstatus = "flag_red_shielded";
else
red_icon_prevstatus = string_null;
case 2: blue_icon = "flag_blue_lost"; break;
case 3: blue_icon = "flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
default:
- if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+ if((stat_items & IT_CTF_SHIELDED) && (myteam == NUM_TEAM_1))
blue_icon = "flag_blue_shielded";
else
blue_icon = string_null;
default:
if(blueflag == 3)
blue_icon_prevstatus = "flag_blue_carrying"; // make it more visible
- else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+ else if((stat_items & IT_CTF_SHIELDED) && (myteam == NUM_TEAM_1))
blue_icon_prevstatus = "flag_blue_shielded";
else
blue_icon_prevstatus = string_null;
}
if(mySize_x > mySize_y) {
- if (myteam == COLOR_TEAM1) { // always draw own flag on left
+ if (myteam == NUM_TEAM_1) { // always draw own flag on left
redflag_pos = pos;
blueflag_pos = pos + eX * 0.5 * mySize_x;
} else {
}
flag_size = eX * 0.5 * mySize_x + eY * mySize_y;
} else {
- if (myteam == COLOR_TEAM1) { // always draw own flag on left
+ if (myteam == NUM_TEAM_1) { // always draw own flag on left
redflag_pos = pos;
blueflag_pos = pos + eY * 0.5 * mySize_y;
} else {
{
switch(keyteam)
{
- case COLOR_TEAM1:
+ case NUM_TEAM_1:
drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key
break;
- case COLOR_TEAM2:
+ case NUM_TEAM_2:
drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key
break;
- case COLOR_TEAM3:
+ case NUM_TEAM_3:
drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key
break;
- case COLOR_TEAM4:
+ case NUM_TEAM_4:
drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL); // show 30% theAlpha key
break;
default:
else
rank = 0;
string rankname;
- rankname = race_PlaceName(rank);
+ rankname = count_ordinal(rank);
vector namepos;
namepos = medalPos + '0 0.8 0' * squareSize;
entity tm;
float teams_count = 0;
for(tm = teams.sort_next; tm; tm = tm.sort_next)
- if(tm.team != COLOR_SPECTATOR)
+ if(tm.team != NUM_SPECTATOR)
++teams_count;
float layout = autocvar_hud_panel_modicons_dom_layout;
{
for(; tm.sort_next; tm = tm.sort_next)
{
- if(!tm.team_size || tm.team == COLOR_SPECTATOR)
+ if(!tm.team_size || tm.team == NUM_SPECTATOR)
continue;
if(!ts_min) ts_min = tm.team_size;
else ts_min = min(ts_min, tm.team_size);
s = strcat(blinkcolor, _("Teamnumbers are unbalanced!"));
tm = GetTeam(myteam, false);
if (tm)
- if (tm.team != COLOR_SPECTATOR)
+ if (tm.team != NUM_SPECTATOR)
if (tm.team_size == ts_max)
s = strcat(s, sprintf(_(" Press ^3%s%s to adjust"), getcommandkey("team menu", "menu_showteamselect"), blinkcolor));
drawInfoMessage(s)
void centerprint_generic(float new_id, string strMessage, float duration, float countdown_num)
{
+ //print(sprintf("centerprint_generic(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num));
float i, j;
if(strMessage == "" && new_id == 0)
centerprint_messages[j] = strzone(strMessage);
centerprint_msgID[j] = new_id;
if (duration < 0)
+ {
centerprint_time[j] = -1;
+ centerprint_expire_time[j] = time;
+ }
else
{
if(duration == 0)
fontsize = '1 1 0' * height;
entries = bound(1, floor(panel_size_y/height), CENTERPRINT_MAX_ENTRIES);
- float i, j, k, n;
+ float i, j, k, n, g;
float a, sz, align, current_msg_pos_y = 0, msg_size;
vector pos;
string ts;
if (autocvar_hud_panel_centerprint_flip)
pos_y += panel_size_y;
align = bound(0, autocvar_hud_panel_centerprint_align, 1);
- for (i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
+ for (g=0, i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
{
if (j == CENTERPRINT_MAX_MSGS)
j = 0;
continue;
centerprint_expire_time[j] = centerprint_expire_time[j] + centerprint_time[j];
}
- else
+ else if(centerprint_time[j] != -1)
continue;
}
-
+
+
// fade the centerprint_hud in/out
- if (centerprint_time[j] < 0 || centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time)
+ if(centerprint_time[j] < 0)
+ a = bound(0, (time - centerprint_expire_time[j]) / max(0.0001, autocvar_hud_panel_centerprint_fade_in), 1);
+ else if(centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time)
a = bound(0, (time - (centerprint_expire_time[j] - centerprint_time[j])) / max(0.0001, autocvar_hud_panel_centerprint_fade_in), 1);
- else if (centerprint_expire_time[j] > time)
+ else if(centerprint_expire_time[j] > time)
a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out);
else
a = 0;
// also fade it based on positioning
if(autocvar_hud_panel_centerprint_fade_subsequent)
{
- a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha, (1 - (i / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passone))), 1); // pass one: all messages after the first have half theAlpha
- a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (i / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower theAlpha even more for each message
+ a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passone))), 1); // pass one: all messages after the first have half theAlpha
+ a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower theAlpha even more for each message
}
// finally set the size based on the new theAlpha from subsequent fading
drawfontscale = sz * '1 1 0';
if (centerprint_countdown_num[j])
- n = tokenizebyseparator(sprintf(centerprint_messages[j], centerprint_countdown_num[j]), "\n");
+ n = tokenizebyseparator(strreplace("^COUNT", count_seconds(centerprint_countdown_num[j]), centerprint_messages[j]), "\n");
else
n = tokenizebyseparator(centerprint_messages[j], "\n");
pos_y += fontsize_y * CENTERPRINT_SPACING/2;
}
}
+
+ ++g; // move next position number up
+
msg_size = pos_y - msg_size;
if (autocvar_hud_panel_centerprint_flip)
{
projects / xonotic / xonotic-data.pk3dir.git / blobdiff