From: Samual Lenks Date: Fri, 15 Feb 2013 14:34:12 +0000 (-0500) Subject: it compiles now :D X-Git-Tag: xonotic-v0.7.0~62^2~23^2~214 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6c12e47598dae92511b51c7911344eca2c819dd;p=xonotic%2Fxonotic-data.pk3dir.git it compiles now :D --- diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index a4acb04de..014d29deb 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -238,10 +238,10 @@ void Local_Notification(float net_type, float net_name, ...count) if not(notif) { backtrace("Local_Notification: Could not find notification entity! (This wasn't caught by usage check?...)\n"); return; } if not(notif.nent_enabled) { print("entity notification was disabled...\n"); return; } - string s1 = ((0 < notif.nent_stringcount) ? ...(0, string) : NO_STR_ARG); - string s2 = ((1 < notif.nent_stringcount) ? ...(1, string) : NO_STR_ARG); - string s3 = ((2 < notif.nent_stringcount) ? ...(2, string) : NO_STR_ARG); - string s4 = ((3 < notif.nent_stringcount) ? ...(3, string) : NO_STR_ARG); + string s1 = ((0 < notif.nent_stringcount) ? ...(0, string) : ""); + string s2 = ((1 < notif.nent_stringcount) ? ...(1, string) : ""); + string s3 = ((2 < notif.nent_stringcount) ? ...(2, string) : ""); + string s4 = ((3 < notif.nent_stringcount) ? ...(3, string) : ""); float f1 = ((notif.nent_stringcount < count) ? ...(notif.nent_stringcount, float) : NO_FL_ARG); float f2 = (((notif.nent_stringcount + 1) < count) ? ...((notif.nent_stringcount + 1), float) : NO_FL_ARG); float f3 = (((notif.nent_stringcount + 2) < count) ? ...((notif.nent_stringcount + 2), float) : NO_FL_ARG); @@ -336,10 +336,10 @@ void Read_Notification(float is_new) float stringcount = Get_Notif_Strnum(net_type, net_name); float floatcount = Get_Notif_Flnum(net_type, net_name); - string s1 = ((stringcount >= 1) ? ReadString() : NO_STR_ARG); - string s2 = ((stringcount >= 2) ? ReadString() : NO_STR_ARG); - string s3 = ((stringcount >= 3) ? ReadString() : NO_STR_ARG); - string s4 = ((stringcount == 4) ? ReadString() : NO_STR_ARG); + string s1 = ((stringcount >= 1) ? ReadString() : ""); + string s2 = ((stringcount >= 2) ? ReadString() : ""); + string s3 = ((stringcount >= 3) ? ReadString() : ""); + string s4 = ((stringcount == 4) ? ReadString() : ""); float f1 = ((floatcount >= 1) ? ReadLong() : NO_FL_ARG); float f2 = ((floatcount >= 2) ? ReadLong() : NO_FL_ARG); float f3 = ((floatcount >= 3) ? ReadLong() : NO_FL_ARG); @@ -446,7 +446,8 @@ void Send_Notification(float broadcast, entity client, "Check the notification definition and function call for accuracy...?\n"), notif.nent_stringcount, notif.nent_floatcount, count)); return; } #endif - entity notif = spawn(); + notif = world; // is this needed? + notif = spawn(); notif.nent_broadcast = broadcast; notif.nent_client = client; notif.nent_net_type = net_type; @@ -457,7 +458,7 @@ void Send_Notification(float broadcast, entity client, float i; for(i = 0; i < notif.nent_stringcount; ++i) { notif.nent_strings[i] = strzone(...(i, string)); } - for(i = 0; i < notif.nent_floatcount; ++i) { notif.nent_floats[i] = ...((stringcount + i), float); } + for(i = 0; i < notif.nent_floatcount; ++i) { notif.nent_floats[i] = ...((notif.nent_stringcount + i), float); } notif.think = Notification_Remove; notif.nextthink = (time + 0.5); @@ -489,7 +490,7 @@ void Send_Notification_Legacy_Wrapper(float broadcast, entity client, { float stringcount = Get_Notif_Strnum(net_type, net_name); float floatcount = Get_Notif_Flnum(net_type, net_name); - Send_Notification_Without_VarArgs(broadcast, client, net_type, net_name, stringcount, floatcount, s1, s2, NO_STR_ARG, NO_STR_ARG, f1, f2, f3, NO_FL_ARG); + Send_Notification_Without_VarArgs(broadcast, client, net_type, net_name, stringcount, floatcount, s1, s2, "", "", f1, f2, f3, NO_FL_ARG); } diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index cca3c861c..51616a200 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -75,8 +75,8 @@ void Read_Notification(float is_new); #define NOTIF_ANY 5 #define NOTIF_ANY_EXCEPT 6 -#define IFSTR(num) ((num < stringcount) ? ...(num, string) : "") -#define IFFL(num) ((((stringcount-1) + num) < count) ? ...(((stringcount-1) + num), float) : NO_FL_ARG) +#define IFSTR(num) ((num < notif.nent_stringcount) ? ...(num, string) : "") +#define IFFL(num) ((((notif.nent_stringcount-1) + num) < count) ? ...(((notif.nent_stringcount-1) + num), float) : NO_FL_ARG) void Send_Notification(float broadcast, entity client, float net_type, float net_name, ...count); void Send_Notification_Without_VarArgs(float broadcast, entity client, float net_type, float net_name, float stringcount, float floatcount, string s1, string s2, string s3, string s4, float f1, float f2, float f3, float f4); @@ -164,166 +164,166 @@ void Dump_Notifications(float fh, float alsoprint); MSG_INFO_NOTIF(prefix##PINK, strnum, flnum, args, hudargs, sprintf(icon, strtolower(STR_TEAM_4)), TCR(normal, COL_TEAM_4, strtoupper(STR_TEAM_4)), TCR(gentle, COL_TEAM_4, strtoupper(STR_TEAM_4))) \ #endif #define MSG_INFO_NOTIFICATIONS \ - /*MSG_INFO_NOTIF(INFO_EMPTY, 0, 0, "", "", "", "", "")*/ \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DROPPED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself\n"), "") \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DAMAGED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base\n"), "") \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_SPEEDRUN_, 2, 0, 1, "f1/100", "", "", _("^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned itself\n"), "") \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_NEEDKILL_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to base\n"), "") \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_ABORTRUN_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was returned to base by its owner\n"), "") \ - MULTITEAM_INFO(INFO_CTF_FLAGRETURN_TIMEOUT_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag has returned to the base\n"), "") \ - MULTITEAM_INFO(INFO_CTF_PICKUP_, 2, 1, 0, "s1", "s1", "notify_%s_taken", _("^BG%s^BG got the ^TC^TT^BG flag\n"), "") \ - MULTITEAM_INFO(INFO_CTF_RETURN_, 2, 1, 0, "s1", "s1", "notify_%s_returned", _("^BG%s^BG returned the ^TC^TT^BG flag\n"), "") \ - MULTITEAM_INFO(INFO_CTF_LOST_, 2, 1, 0, "s1", "s1", "notify_%s_lost", _("^BG%s^BG lost the ^TC^TT^BG flag\n"), "") \ - MULTITEAM_INFO(INFO_CTF_CAPTURE_, 2, 1, 0, "s1", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag\n"), "") \ - MULTITEAM_INFO(INFO_CTF_CAPTURE_TIME_, 2, 1, 1, "XPD(s1, f1/100)", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds\n"), "") \ - MULTITEAM_INFO(INFO_CTF_CAPTURE_BROKEN_, 2, 2, 2, "XPD(s1, f1/100, s2, f2/100)", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds, breaking ^BG%s^BG's previous record of ^F2%.2f^BG seconds\n"), "") \ - MULTITEAM_INFO(INFO_CTF_CAPTURE_UNBROKEN_, 2, 2, 2, "XPD(s1, f1/100, s2, f2/100)", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F2%.2f^BG seconds, failing to break ^BG%s^BG's previous record of ^F1%.2f^BG seconds\n"), "") \ - MULTITEAM_INFO(INFO_DEATH_TEAMKILL_, 4, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_FIRSTBLOOD, 2, 0, "s2", "", "", _("^BG%s^K1 drew first blood\n"), _("^F1%s^K1 got the first score\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_CUSTOM, 2, 1, "XPD(s1, s2, SPREE_LOST)", "s1", "notify_void", _("^BG%s^K1 %s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_GENERIC, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_selfkill", _("^BG%s^K1 died%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_VOID, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_void", _("^BG%s^K1 was in the wrong place%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_selfkill", _("^BG%s^K1 couldn't take it anymore%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_NOAMMO, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_outofammo", _("^BG%s^K1 died%s. What's the point of living without ammo?\n"), _("^F1%s^K1 ran out of ammo%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_ROT, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 rotted away%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_CAMP, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_camping", _("^BG%s^K1 thought they found a nice camping ground%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_BETRAYAL, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_teamkill_red", _("^BG%s^K1 became enemies with the Lord of Teamplay%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TEAMCHANGE, 1, 1, "XPD(s1, DEATH_TEAM)", "", "", _("^BG%s^K1 switched to the %s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_AUTOTEAMCHANGE, 1, 1, "XPD(s1, DEATH_TEAM)", "", "", _("^BG%s^K1 was moved into the %s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_FALL, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_fall", _("^BG%s^K1 hit the ground with a crunch%s\n"), _("^F1%s^K1 hit the ground with a bit too much force%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_DROWN, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_water", _("^BG%s^K1 couldn't catch their breath%s\n"), _("^F1%s^K1 was in the water for too long%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_FIRE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 became a bit too crispy%s\n"), _("^F1%s^K1 felt a little hot%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_LAVA, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_lava", _("^BG%s^K1 turned into hot slag%s\n"), _("^F1%s^K1 found a hot place%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SLIME, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_slime", _("^BG%s^K1 was slimed%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SHOOTING_STAR, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_shootingstar", _("^BG%s^K1 became a shooting star%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SWAMP, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_CHEAT, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TOUCHEXPLODE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 died in an accident%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 ran into a turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_EWHEEL, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was blasted away by an eWheel turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_FLAC, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 got caught up in the FLAC turret fire%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_MACHINEGUN, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was riddled full of holes by a Machinegun turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_GUN, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 got served a lead enrichment by a Walker turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_MEELE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was impaled by a Walker turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_ROCKET, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Walker turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_HELLION, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Hellion turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_HK, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 could not hide from the Hunter turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_MLRS, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_PLASMA, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 got served some superheated plasma from a turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_PHASER, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was phased out by a turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_TESLA, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_death", _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_TELEFRAG, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_telefrag", _("^BG%s^K1 was telefragged by ^BG%s^K1%s\n"), _("^F1%s^K1 tried to occupy ^BG%s^K1's teleport destination space\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_FALL, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_fall", _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_DROWN, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_water", _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_LAVA, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_lava", _("^BG%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SLIME, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_slime", _("^BG%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_shootingstar", _("^BG%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SWAMP, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_slime", _("^BG%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VOID, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_void", _("^BG%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^F1%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_CRUSH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was crushed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_MINIGUN, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 got shredded by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was blasted to bits by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was bolted down by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 couldn't find shelter from ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 couldn't resist ^BG%s^K1 purple blobs%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_BOMB, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MULTITEAM_INFO(INFO_FREEZETAG_ROUND_WIN_, 4, 0, 0, "", "", "", _("^TC^TT^BG team wins the round, all other teams were frozen\n"), "") \ - MSG_INFO_NOTIF(INFO_FREEZETAG_REVIVE, 2, 0, "XPD(s1, s2)", "", "", _("^BG%s^K3 was revived by ^BG%s\n"), "") \ - MSG_INFO_NOTIF(INFO_FREEZETAG_FREEZE, 2, 0, "XPD(s1, s2)", "", "", _("^BG%s^K1 was frozen by ^BG%s\n"), "") \ - MSG_INFO_NOTIF(INFO_FREEZETAG_SELF, 1, 0, "s1", "", "", _("^BG%s^K1 froze themself\n"), "") \ - MSG_INFO_NOTIF(INFO_GODMODE_OFF, 0, 1, "f1", "", "", _("^BGGodmode saved you %d units of damage, cheater!\n"), "") \ - MSG_INFO_NOTIF(INFO_JOIN_CONNECT, 1, 0, "s1", "", "", _("^BG%s^F3 connected%s\n"), "") \ - MULTITEAM_INFO(INFO_JOIN_CONNECT_TEAM_, 4, 1, 0, "s1", "", "", _("^BG%s^F3 connected and joined the ^TC^TT\n"), "") \ - MSG_INFO_NOTIF(INFO_JOIN_PLAY, 1, 0, "s1", "", "", _("^BG%s^F3 is now playing\n"), "") \ - MSG_INFO_NOTIF(INFO_KEEPAWAY_DROPPED, 1, 0, "s1", "s1", "notify_balldropped", _("^BG%s^BG has dropped the ball!\n"), "") \ - MSG_INFO_NOTIF(INFO_KEEPAWAY_PICKUP, 1, 0, "s1", "s1", "notify_ballpickedup", _("^BG%s^BG has picked up the ball!\n"), "") \ - MSG_INFO_NOTIF(INFO_LMS_NOLIVES, 1, 0, "s1", "s1", "", _("^BG%s^F3 has no more lives left\n"), "") \ - MSG_INFO_NOTIF(INFO_LMS_FORFEIT, 1, 0, "s1", "s1", "", _("^BG%s^F3 forfeited\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERDOWN_INVISIBILITY, 0, 0, "", "", "", _("^F2Invisibility has worn off\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERDOWN_SHIELD, 0, 0, "", "", "", _("^F2Shield has worn off\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERDOWN_SPEED, 0, 0, "", "", "", _("^F2Speed has worn off\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERDOWN_STRENGTH, 0, 0, "", "", "", _("^F2Strength has worn off\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERUP_INVISIBILITY, 0, 0, "", "", "", _("^F2You are invisible\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERUP_SHIELD, 0, 0, "", "", "", _("^F2Shield surrounds you\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERUP_SPEED, 0, 0, "", "", "", _("^F2You are on speed\n"), "") \ - MSG_INFO_NOTIF(INFO_POWERUP_STRENGTH, 0, 0, "", "", "", _("^F2Strength infuses your weapons with devastating power\n"), "") \ - MSG_INFO_NOTIF(INFO_QUIT_DISCONNECT, 1, 0, "s1", "s1", "", _("^BG%s^F3 disconnected\n"), "") \ - MSG_INFO_NOTIF(INFO_QUIT_KICK_IDLING, 1, 0, "s1", "s1", "", _("^BG%s^F3 was kicked for idling\n"), "") \ - MSG_INFO_NOTIF(INFO_QUIT_KICK_SPECTATING, 0, 0, "", "", "", _("^F2You were kicked from the server because you are a spectator and spectators aren't allowed at the moment.\n"), "") \ - MSG_INFO_NOTIF(INFO_QUIT_SPECTATE, 1, 0, "s1", "s1", "", _("^BG%s^F3 is now spectating\n"), "") \ - MSG_INFO_NOTIF(INFO_RACE_FAIL, 2, 0, "XPD(s1, s2)", "s1", "race_newfail", "", "") \ - MSG_INFO_NOTIF(INFO_RACE_NEW_RECORD, 2, 0, "XPD(s1, s2)", "s1", "race_newrecordserver", "", "") \ - MSG_INFO_NOTIF(INFO_RACE_NEW_TIME, 2, 0, "XPD(s1, s2)", "s1", "race_newtime", "", "") \ - MSG_INFO_NOTIF(INFO_RACE_NEW_RANK, 2, 0, "XPD(s1, s2)", "s1", "race_newrankyellow", "", "") \ - MULTITEAM_INFO(INFO_SCORES_, 4, 0, 0, "", "", "", _("^TC^TT ^BGteam scores!\n"), "") \ - MSG_INFO_NOTIF(INFO_SPECTATE_WARNING, 0, 1, "f1", "", "", _("^F2You have to become a player within the next %d seconds, otherwise you will be kicked, because spectating isn't allowed at this time!\n"), "") \ - MSG_INFO_NOTIF(INFO_SUPERWEAPON_BROKEN, 0, 0, "", "", "", _("^F2Superweapons have broken down\n"), "") \ - MSG_INFO_NOTIF(INFO_SUPERWEAPON_PICKUP, 0, 0, "", "", "", _("^F2You now have a superweapon\n"), "") \ - MSG_INFO_NOTIF(INFO_SUPERWEAPON_LOST, 0, 0, "", "", "", _("^F2Superweapons have been lost\n"), "") \ - MSG_INFO_NOTIF(INFO_VERSION_BETA, 2, 0, "XPD(s1, s2)", "", "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s\n"), "") \ - MSG_INFO_NOTIF(INFO_VERSION_OLD, 2, 0, "XPD(s1, s2)", "", "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \ - MSG_INFO_NOTIF(INFO_VERSION_OUTDATED, 2, 0, "XPD(s1, s2)", "", "", _("\{1}^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \ - MSG_INFO_NOTIF(INFO_WATERMARK, 1, 0, "s1", "", "", _("^F3SVQC Build information: ^F4%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponelectro", _("^BG%s^K1 played with Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponelectro", _("^BG%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponelectro", _("^BG%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponelectro", _("^BG%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponfireball", _("^BG%s^K1 should have used a smaller gun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponfireball", _("^BG%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponfireball", _("^BG%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HLAC_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HLAC_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponhlac", _("^BG%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HOOK_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponhook", _("^BG%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_LASER_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponlaser", _("^BG%s^K1 shot themself to hell with their Laser%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_LASER_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponlaser", _("^BG%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponminelayer", _("^BG%s^K1 forgot about their mine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponminelayer", _("^BG%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MINSTANEX_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponminstanex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_NEX_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponnex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrifle", _("^BG%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrifle", _("^BG%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "notify_headshot", _("^BG%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponseeker", _("^BG%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponseeker", _("^BG%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, "XPD(s2, s1, SPREE_END)", "s2 s1", "notify_melee_shotgun", _("^BG%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponshotgun", _("^BG%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_TUBA_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_TUBA_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_SUICIDE, 1, 1, "XPD(s1, SPREE_LOST)", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponuzi", _("^BG%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, "XPD(s1, s2, SPREE_END)", "s2 s1", "weaponuzi", _("^BG%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") + /*MSG_INFO_NOTIF(INFO_EMPTY, 0, 0, "", "", "", "", "")*/ \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DROPPED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself\n"), "") \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DAMAGED_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base\n"), "") \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_SPEEDRUN_, 2, 0, 1, "f1/100", "", "", _("^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned itself\n"), "") \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_NEEDKILL_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to base\n"), "") \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_ABORTRUN_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag was returned to base by its owner\n"), "") \ + MULTITEAM_INFO(INFO_CTF_FLAGRETURN_TIMEOUT_, 2, 0, 0, "", "", "", _("^BGThe ^TC^TT^BG flag has returned to the base\n"), "") \ + MULTITEAM_INFO(INFO_CTF_PICKUP_, 2, 1, 0, "s1", "s1", "notify_%s_taken", _("^BG%s^BG got the ^TC^TT^BG flag\n"), "") \ + MULTITEAM_INFO(INFO_CTF_RETURN_, 2, 1, 0, "s1", "s1", "notify_%s_returned", _("^BG%s^BG returned the ^TC^TT^BG flag\n"), "") \ + MULTITEAM_INFO(INFO_CTF_LOST_, 2, 1, 0, "s1", "s1", "notify_%s_lost", _("^BG%s^BG lost the ^TC^TT^BG flag\n"), "") \ + MULTITEAM_INFO(INFO_CTF_CAPTURE_, 2, 1, 0, "s1", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag\n"), "") \ + MULTITEAM_INFO(INFO_CTF_CAPTURE_TIME_, 2, 1, 1, "s1 f11", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds\n"), "") \ + MULTITEAM_INFO(INFO_CTF_CAPTURE_BROKEN_, 2, 2, 2, "s1 f11 s2 f21", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds, breaking ^BG%s^BG's previous record of ^F2%.2f^BG seconds\n"), "") \ + MULTITEAM_INFO(INFO_CTF_CAPTURE_UNBROKEN_, 2, 2, 2, "s1 f11 s2 f21", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F2%.2f^BG seconds, failing to break ^BG%s^BG's previous record of ^F1%.2f^BG seconds\n"), "") \ + MULTITEAM_INFO(INFO_DEATH_TEAMKILL_, 4, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_FIRSTBLOOD, 2, 0, "s2", "", "", _("^BG%s^K1 drew first blood\n"), _("^F1%s^K1 got the first score\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_CUSTOM, 2, 1, "s1 s2 spree_end", "s1", "notify_void", _("^BG%s^K1 %s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_GENERIC, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 died%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_VOID, 1, 1, "s1 spree_end", "s1", "notify_void", _("^BG%s^K1 was in the wrong place%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SUICIDE, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 couldn't take it anymore%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_NOAMMO, 1, 1, "s1 spree_end", "s1", "notify_outofammo", _("^BG%s^K1 died%s. What's the point of living without ammo?\n"), _("^F1%s^K1 ran out of ammo%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_ROT, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 rotted away%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_CAMP, 1, 1, "s1 spree_end", "s1", "notify_camping", _("^BG%s^K1 thought they found a nice camping ground%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_BETRAYAL, 1, 1, "s1 spree_end", "s1", "notify_teamkill_red", _("^BG%s^K1 became enemies with the Lord of Teamplay%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TEAMCHANGE, 1, 1, "s1 death_team", "", "", _("^BG%s^K1 switched to the %s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_AUTOTEAMCHANGE, 1, 1, "s1 death_team", "", "", _("^BG%s^K1 was moved into the %s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_FALL, 1, 1, "s1 spree_end", "s1", "notify_fall", _("^BG%s^K1 hit the ground with a crunch%s\n"), _("^F1%s^K1 hit the ground with a bit too much force%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_DROWN, 1, 1, "s1 spree_end", "s1", "notify_water", _("^BG%s^K1 couldn't catch their breath%s\n"), _("^F1%s^K1 was in the water for too long%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_FIRE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 became a bit too crispy%s\n"), _("^F1%s^K1 felt a little hot%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_LAVA, 1, 1, "s1 spree_end", "s1", "notify_lava", _("^BG%s^K1 turned into hot slag%s\n"), _("^F1%s^K1 found a hot place%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SLIME, 1, 1, "s1 spree_end", "s1", "notify_slime", _("^BG%s^K1 was slimed%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SHOOTING_STAR, 1, 1, "s1 spree_end", "s1", "notify_shootingstar", _("^BG%s^K1 became a shooting star%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SWAMP, 1, 1, "s1 spree_end", "s1", "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_CHEAT, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TOUCHEXPLODE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 died in an accident%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 ran into a turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_EWHEEL, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by an eWheel turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_FLAC, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught up in the FLAC turret fire%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_MACHINEGUN, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was riddled full of holes by a Machinegun turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_GUN, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got served a lead enrichment by a Walker turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_MEELE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was impaled by a Walker turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_WALKER_ROCKET, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Walker turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_HELLION, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Hellion turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_HK, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 could not hide from the Hunter turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_MLRS, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_PLASMA, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got served some superheated plasma from a turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_PHASER, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was phased out by a turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TURRET_TESLA, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_TELEFRAG, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_telefrag", _("^BG%s^K1 was telefragged by ^BG%s^K1%s\n"), _("^F1%s^K1 tried to occupy ^BG%s^K1's teleport destination space\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_FALL, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_fall", _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_DROWN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_water", _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_LAVA, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_lava", _("^BG%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SLIME, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_shootingstar", _("^BG%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SWAMP, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VOID, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_void", _("^BG%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^F1%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_CRUSH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was crushed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_MINIGUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got shredded by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was blasted to bits by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was bolted down by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 couldn't find shelter from ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 couldn't resist ^BG%s^K1 purple blobs%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_BOMB, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MULTITEAM_INFO(INFO_FREEZETAG_ROUND_WIN_, 4, 0, 0, "", "", "", _("^TC^TT^BG team wins the round, all other teams were frozen\n"), "") \ + MSG_INFO_NOTIF(INFO_FREEZETAG_REVIVE, 2, 0, "s1 s2", "", "", _("^BG%s^K3 was revived by ^BG%s\n"), "") \ + MSG_INFO_NOTIF(INFO_FREEZETAG_FREEZE, 2, 0, "s1 s2", "", "", _("^BG%s^K1 was frozen by ^BG%s\n"), "") \ + MSG_INFO_NOTIF(INFO_FREEZETAG_SELF, 1, 0, "s1", "", "", _("^BG%s^K1 froze themself\n"), "") \ + MSG_INFO_NOTIF(INFO_GODMODE_OFF, 0, 1, "f1", "", "", _("^BGGodmode saved you %d units of damage, cheater!\n"), "") \ + MSG_INFO_NOTIF(INFO_JOIN_CONNECT, 1, 0, "s1", "", "", _("^BG%s^F3 connected%s\n"), "") \ + MULTITEAM_INFO(INFO_JOIN_CONNECT_TEAM_, 4, 1, 0, "s1", "", "", _("^BG%s^F3 connected and joined the ^TC^TT\n"), "") \ + MSG_INFO_NOTIF(INFO_JOIN_PLAY, 1, 0, "s1", "", "", _("^BG%s^F3 is now playing\n"), "") \ + MSG_INFO_NOTIF(INFO_KEEPAWAY_DROPPED, 1, 0, "s1", "s1", "notify_balldropped", _("^BG%s^BG has dropped the ball!\n"), "") \ + MSG_INFO_NOTIF(INFO_KEEPAWAY_PICKUP, 1, 0, "s1", "s1", "notify_ballpickedup", _("^BG%s^BG has picked up the ball!\n"), "") \ + MSG_INFO_NOTIF(INFO_LMS_NOLIVES, 1, 0, "s1", "s1", "", _("^BG%s^F3 has no more lives left\n"), "") \ + MSG_INFO_NOTIF(INFO_LMS_FORFEIT, 1, 0, "s1", "s1", "", _("^BG%s^F3 forfeited\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERDOWN_INVISIBILITY, 0, 0, "", "", "", _("^F2Invisibility has worn off\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERDOWN_SHIELD, 0, 0, "", "", "", _("^F2Shield has worn off\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERDOWN_SPEED, 0, 0, "", "", "", _("^F2Speed has worn off\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERDOWN_STRENGTH, 0, 0, "", "", "", _("^F2Strength has worn off\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERUP_INVISIBILITY, 0, 0, "", "", "", _("^F2You are invisible\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERUP_SHIELD, 0, 0, "", "", "", _("^F2Shield surrounds you\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERUP_SPEED, 0, 0, "", "", "", _("^F2You are on speed\n"), "") \ + MSG_INFO_NOTIF(INFO_POWERUP_STRENGTH, 0, 0, "", "", "", _("^F2Strength infuses your weapons with devastating power\n"), "") \ + MSG_INFO_NOTIF(INFO_QUIT_DISCONNECT, 1, 0, "s1", "s1", "", _("^BG%s^F3 disconnected\n"), "") \ + MSG_INFO_NOTIF(INFO_QUIT_KICK_IDLING, 1, 0, "s1", "s1", "", _("^BG%s^F3 was kicked for idling\n"), "") \ + MSG_INFO_NOTIF(INFO_QUIT_KICK_SPECTATING, 0, 0, "", "", "", _("^F2You were kicked from the server because you are a spectator and spectators aren't allowed at the moment.\n"), "") \ + MSG_INFO_NOTIF(INFO_QUIT_SPECTATE, 1, 0, "s1", "s1", "", _("^BG%s^F3 is now spectating\n"), "") \ + MSG_INFO_NOTIF(INFO_RACE_FAIL, 2, 0, "s1 s2", "s1", "race_newfail", "", "") \ + MSG_INFO_NOTIF(INFO_RACE_NEW_RECORD, 2, 0, "s1 s2", "s1", "race_newrecordserver", "", "") \ + MSG_INFO_NOTIF(INFO_RACE_NEW_TIME, 2, 0, "s1 s2", "s1", "race_newtime", "", "") \ + MSG_INFO_NOTIF(INFO_RACE_NEW_RANK, 2, 0, "s1 s2", "s1", "race_newrankyellow", "", "") \ + MULTITEAM_INFO(INFO_SCORES_, 4, 0, 0, "", "", "", _("^TC^TT ^BGteam scores!\n"), "") \ + MSG_INFO_NOTIF(INFO_SPECTATE_WARNING, 0, 1, "f1", "", "", _("^F2You have to become a player within the next %d seconds, otherwise you will be kicked, because spectating isn't allowed at this time!\n"), "") \ + MSG_INFO_NOTIF(INFO_SUPERWEAPON_BROKEN, 0, 0, "", "", "", _("^F2Superweapons have broken down\n"), "") \ + MSG_INFO_NOTIF(INFO_SUPERWEAPON_PICKUP, 0, 0, "", "", "", _("^F2You now have a superweapon\n"), "") \ + MSG_INFO_NOTIF(INFO_SUPERWEAPON_LOST, 0, 0, "", "", "", _("^F2Superweapons have been lost\n"), "") \ + MSG_INFO_NOTIF(INFO_VERSION_BETA, 2, 0, "s1 s2", "", "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s\n"), "") \ + MSG_INFO_NOTIF(INFO_VERSION_OLD, 2, 0, "s1 s2", "", "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \ + MSG_INFO_NOTIF(INFO_VERSION_OUTDATED, 2, 0, "s1 s2", "", "", _("\{1}^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \ + MSG_INFO_NOTIF(INFO_WATERMARK, 1, 0, "s1", "", "", _("^F3SVQC Build information: ^F4%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 played with Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 should have used a smaller gun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, "s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, "s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HLAC_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HLAC_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhlac", _("^BG%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HOOK_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhook", _("^BG%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_LASER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponlaser", _("^BG%s^K1 shot themself to hell with their Laser%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_LASER_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponlaser", _("^BG%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponminelayer", _("^BG%s^K1 forgot about their mine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponminelayer", _("^BG%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MINSTANEX_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponminstanex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_NEX_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponnex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_headshot", _("^BG%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, "s2 s1 spree_end", "s2 s1", "notify_melee_shotgun", _("^BG%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponshotgun", _("^BG%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_TUBA_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_TUBA_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") #define MULTITEAM_CENTER(prefix,teams,strnum,flnum,args,cpid,durcnt,normal,gentle) \ MSG_CENTER_NOTIF(prefix##RED, strnum, flnum, args, cpid, durcnt, TCR(normal, COL_TEAM_1, strtoupper(STR_TEAM_1)), TCR(gentle, COL_TEAM_1, strtoupper(STR_TEAM_1))) \ @@ -340,22 +340,22 @@ void Dump_Notifications(float fh, float alsoprint); MSG_CENTER_NOTIF(CENTER_ASSAULT_DEFENDING, 0, 0, "", CPID_ASSAULT_ROLE, XPD(0, 0), _("^BGYou are defending!"), "") \ MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_SHIELDED, 0, 0, "", CPID_CTF_CAPSHIELD, XPD(0, 0), _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \ MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_FREE, 0, 0, "", CPID_CTF_CAPSHIELD, XPD(0, 0), _("^BGYou are now free.\n^BGFeel free to ^F2try to capture^BG the flag again\n^BGif you think you will succeed."), "") \ - MULTITEAM_CENTER(CENTER_CTF_PASS_OTHER_, 2, 2, 0, "s1 s2", CPID_CTF_PASS, XPD(0, 0), _("^BG%s^BG passed the ^TC^TT^BG flag to %s"), "") \ - MULTITEAM_CENTER(CENTER_CTF_PASS_SENT_, 2, 1, 0, s1, CPID_CTF_PASS, XPD(0, 0), _("^BGYou passed the ^TC^TT^BG flag to %s"), "") \ - MULTITEAM_CENTER(CENTER_CTF_PASS_RECEIVED_, 2, 1, 0, s1, CPID_CTF_PASS, XPD(0, 0), _("^BGYou received the ^TC^TT^BG flag from %s"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTING, 1, 0, s1, CPID_CTF_PASS, XPD(0, 0), _("^BGRequesting %s^BG to pass you the flag"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTED, 1, 0, XPD(s1, PASS_KEY), CPID_CTF_PASS, XPD(0, 0), _("^BG%s^BG requests you to pass the flag%s"), "") \ + MULTITEAM_CENTER(CENTER_CTF_PASS_OTHER_, 2, 2, 0, "s1 s2", CPID_CTF_PASS, XPD(0, 0), _("^BG%s^BG passed the ^TC^TT^BG flag to %s"), "") \ + MULTITEAM_CENTER(CENTER_CTF_PASS_SENT_, 2, 1, 0, "s1", CPID_CTF_PASS, XPD(0, 0), _("^BGYou passed the ^TC^TT^BG flag to %s"), "") \ + MULTITEAM_CENTER(CENTER_CTF_PASS_RECEIVED_, 2, 1, 0, "s1", CPID_CTF_PASS, XPD(0, 0), _("^BGYou received the ^TC^TT^BG flag from %s"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTING, 1, 0, "s1", CPID_CTF_PASS, XPD(0, 0), _("^BGRequesting %s^BG to pass you the flag"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTED, 1, 0, "s1 pass_key", CPID_CTF_PASS, XPD(0, 0), _("^BG%s^BG requests you to pass the flag%s"), "") \ MULTITEAM_CENTER(CENTER_CTF_RETURN_, 2, 0, 0, "", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYou returned the ^TC^TT^BG flag!"), "") \ MULTITEAM_CENTER(CENTER_CTF_CAPTURE_, 2, 0, 0, "", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYou captured the ^TC^TT^BG flag!"), "") \ MULTITEAM_CENTER(CENTER_CTF_PICKUP_, 2, 0, 0, "", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYou got the ^TC^TT^BG flag!"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM, 1, 0, s1, CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYour %steam mate^BG got the flag! Protect them!"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM_VERBOSE, 2, 0, XPD(s1, s2, s1), CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYour %steam mate (^BG%s%s)^BG got the flag! Protect them!"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY, 1, 0, s1, CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGThe %senemy^BG got your flag! Retrieve it!"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY_VERBOSE, 2, 0, XPD(s1, s2, s1), CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM, 1, 0, "s1", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYour %steam mate^BG got the flag! Protect them!"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM_VERBOSE, 2, 0, "s1 s2 s1", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGYour %steam mate (^BG%s%s)^BG got the flag! Protect them!"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY, 1, 0, "s1", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGThe %senemy^BG got your flag! Retrieve it!"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY_VERBOSE, 2, 0, "s1 s2 s1", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"), "") \ MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_CARRIER, 0, 0, "", CPID_STALEMATE, XPD(0, 0), _("^BGStalemate! Enemies can now see you on radar!"), "") \ MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_OTHER, 0, 0, "", CPID_STALEMATE, XPD(0, 0), _("^BGStalemate! Flag carriers can now be seen by enemies on radar!"), "") \ - MSG_CENTER_NOTIF(CENTER_CTF_FLAG_THROW_PUNISH, 0, 1, f1, CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGToo many flag throws! Throwing disabled for %d seconds."), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SELF_CUSTOM, 2, 0, s2, NO_CPID, XPD(0, 0), _("^K1You were %s"), "") \ + MSG_CENTER_NOTIF(CENTER_CTF_FLAG_THROW_PUNISH, 0, 1, "f1", CPID_CTF_LOWPRIO, XPD(0, 0), _("^BGToo many flag throws! Throwing disabled for %d seconds."), "") \ + MSG_CENTER_NOTIF(CENTER_DEATH_SELF_CUSTOM, 2, 0, "s2", NO_CPID, XPD(0, 0), _("^K1You were %s"), "") \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_GENERIC, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_VOID, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1Watch your step!"), "") \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_SUICIDE, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You committed suicide!"), _("^K1You ended it all!")) \ @@ -363,8 +363,8 @@ void Dump_Notifications(float fh, float alsoprint); MSG_CENTER_NOTIF(CENTER_DEATH_SELF_ROT, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health")) \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_CAMP, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!")) \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_BETRAYAL, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_SELF_TEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPD(0, 0), _("^BGYou are now on: %s"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SELF_AUTOTEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPD(0, 0), _("^BGYou have been moved into a different team\nYou are now on: %s"), "") \ + MSG_CENTER_NOTIF(CENTER_DEATH_SELF_TEAMCHANGE, 0, 1, "death_team", NO_CPID, XPD(0, 0), _("^BGYou are now on: %s"), "") \ + MSG_CENTER_NOTIF(CENTER_DEATH_SELF_AUTOTEAMCHANGE, 0, 1, "death_team", NO_CPID, XPD(0, 0), _("^BGYou have been moved into a different team\nYou are now on: %s"), "") \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_FALL, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You hit the ground with a crunch!"), "") \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_DROWN, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You couldn't catch your breath in time!"), "") \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_FIRE, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You got a little bit too crispy!"), _("^K1You felt a little too hot!")) \ @@ -377,43 +377,43 @@ void Dump_Notifications(float fh, float alsoprint); MSG_CENTER_NOTIF(CENTER_DEATH_SELF_TURRET, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were fragged by a turret!"), _("^K1You had an unfortunate run in with a turret!")) \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_TURRET_EWHEEL, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were fragged by an eWheel turret!"), _("^K1You had an unfortunate run in with an eWheel turret!")) \ MSG_CENTER_NOTIF(CENTER_DEATH_SELF_TURRET_WALKER, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were fragged by a Walker turret!"), _("^K1You had an unfortunate run in with a Walker turret!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG, 1, 1, XPD(SPREE_CEN, s1), NO_CPID, XPD(0, 0), _("^K3%sYou fragged ^BG%s"), _("^K3%sYou scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s"), _("^K1You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG, 1, 1, XPD(SPREE_CEN, s1), NO_CPID, XPD(0, 0), _("^K1%sYou typefragged ^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1You were typefragged by ^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_FIRST, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_FIRST, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_FIRST, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_VERBOSE, 1, 2, XPD(SPREE_CEN, s1, FRAG_PING), NO_CPID, XPD(0, 0), _("^K3%sYou fragged ^BG%s^BG%s"), _("^K3%sYou scored against ^BG%s^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_VERBOSE, 1, 3, XPD(s1, FRAG_STATS), NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, 1, 2, XPD(SPREE_CEN, s1, FRAG_PING), NO_CPID, XPD(0, 0), _("^K1%sYou typefragged ^BG%s^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, 1, 3, XPD(s1, FRAG_STATS), NO_CPID, XPD(0, 0), _("^K1You were typefragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPD(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE, 1, 3, s1, NO_CPID, XPD(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPD(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, 1, 3, s1, NO_CPID, XPD(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TEAMKILL_FRAG, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1Moron! You fragged ^BG%s^K1, a team mate!"), _("^K1Moron! You went against ^BG%sK1, a team mate!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TEAMKILL_FRAGGED, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s^K1, a team mate"), _("^K1You were scored against by ^BG%s^K1, a team mate")) \ - MSG_CENTER_NOTIF(CENTER_DISCONNECT_IDLING, 0, 1, "", CPID_IDLING, XPD(0, f1), _("^K1Stop idling!\n^BGDisconnecting in ^COUNT..."), "") \ - MULTITEAM_CENTER(CENTER_FREEZETAG_ROUND_WIN_, 4, 0, 0, "", NO_CPID, XPD(0, 0), _("^TC^TT^BG team wins the round, all other teams were frozen"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_SPAWN_LATE, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You spawned after the round started, you'll spawn as frozen"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_REVIVE, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K3You revived ^BG%s"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_REVIVED, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K3You were revived by ^BG%s"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_SELF, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You froze yourself"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_FREEZE, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K3You froze ^BG%s"), "") \ - MSG_CENTER_NOTIF(CENTER_FREEZETAG_FROZEN, 1, 0, s1, NO_CPID, XPD(0, 0), _("^K1You were frozen by ^BG%s"), "") \ - MSG_CENTER_NOTIF(CENTER_KEEPAWAY_DROPPED, 1, 0, s1, CPID_KEEPAWAY, XPD(0, 0), _("^BG%s^BG has dropped the ball!"), "") \ - MSG_CENTER_NOTIF(CENTER_KEEPAWAY_PICKUP, 1, 0, s1, CPID_KEEPAWAY, XPD(0, 0), _("^BG%s^BG has picked up the ball!"), "") \ - MSG_CENTER_NOTIF(CENTER_KEEPAWAY_WARN, 0, 0, "", CPID_KA_WARN, XPD(0, 0), _("^BGKilling people while you don't have the ball gives no points!"), "") \ - MSG_CENTER_NOTIF(CENTER_LMS_CAMPCHECK, 0, 0, "", CPID_LMS_CAMP, XPD(0, 0), _("^K1Don't camp!"), "") \ - MSG_CENTER_NOTIF(CENTER_JOIN_NOSPAWNS, 0, 0, "", CPID_PREVENT_JOIN, XPD(0, 0), _("^K1No spawnpoints available!\nHope your team can fix it..."), "") \ - MSG_CENTER_NOTIF(CENTER_JOIN_PREVENT, 0, 0, "", CPID_PREVENT_JOIN, XPD(0, 0), _("^K1You may not join the game at this time.\nThe player limit reached maximum capacity."), "") \ - MULTITEAM_CENTER(CENTER_TEAMCHANGE_, 4, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGChanging to ^TC^TT^BG in ^COUNT"), "") \ - MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_SPECTATE, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGSpectating in ^COUNT"), "") \ - MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_AUTO, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGChanging team in ^COUNT"), "") \ - MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_SUICIDE, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^K1Suicide in ^COUNT"), "") \ - MSG_CENTER_NOTIF(CENTER_WEAPON_MARBLES_LOST, 1, 1, XPD(s1, WEAPON_NAME), NO_CPID, XPD(0, 0), _("^K1You lost your marbles against ^BG%s^K1 using the ^BG%s!"), "") + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG, 1, 1, "spree_cen s1", NO_CPID, XPD(0, 0), _("^K3%sYou fragged ^BG%s"), _("^K3%sYou scored against ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s"), _("^K1You were scored against by ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG, 1, 1, "spree_cen s1", NO_CPID, XPD(0, 0), _("^K1%sYou typefragged ^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1You were typefragged by ^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing!")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_FIRST, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_FIRST, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_FIRST, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_VERBOSE, 1, 2, "spree_cen s1 frag_ping", NO_CPID, XPD(0, 0), _("^K3%sYou fragged ^BG%s^BG%s"), _("^K3%sYou scored against ^BG%s^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_VERBOSE, 1, 3, "s1 frag_stats", NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, 1, 2, "spree_cen s1 frag_ping", NO_CPID, XPD(0, 0), _("^K1%sYou typefragged ^BG%s^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, 1, 3, "s1 frag_stats", NO_CPID, XPD(0, 0), _("^K1You were typefragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE, 1, 1, "s1", NO_CPID, XPD(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE, 1, 3, "s1", NO_CPID, XPD(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, 1, 1, "s1", NO_CPID, XPD(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, 1, 3, "s1", NO_CPID, XPD(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_TEAMKILL_FRAG, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1Moron! You fragged ^BG%s^K1, a team mate!"), _("^K1Moron! You went against ^BG%sK1, a team mate!")) \ + MSG_CENTER_NOTIF(CENTER_DEATH_TEAMKILL_FRAGGED, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1You were fragged by ^BG%s^K1, a team mate"), _("^K1You were scored against by ^BG%s^K1, a team mate")) \ + MSG_CENTER_NOTIF(CENTER_DISCONNECT_IDLING, 0, 1, "", CPID_IDLING, XPD(0, f1), _("^K1Stop idling!\n^BGDisconnecting in ^COUNT..."), "") \ + MULTITEAM_CENTER(CENTER_FREEZETAG_ROUND_WIN_, 4, 0, 0, "", NO_CPID, XPD(0, 0), _("^TC^TT^BG team wins the round, all other teams were frozen"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_SPAWN_LATE, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You spawned after the round started, you'll spawn as frozen"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_REVIVE, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K3You revived ^BG%s"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_REVIVED, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K3You were revived by ^BG%s"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_SELF, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You froze yourself"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_FREEZE, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K3You froze ^BG%s"), "") \ + MSG_CENTER_NOTIF(CENTER_FREEZETAG_FROZEN, 1, 0, "s1", NO_CPID, XPD(0, 0), _("^K1You were frozen by ^BG%s"), "") \ + MSG_CENTER_NOTIF(CENTER_KEEPAWAY_DROPPED, 1, 0, "s1", CPID_KEEPAWAY, XPD(0, 0), _("^BG%s^BG has dropped the ball!"), "") \ + MSG_CENTER_NOTIF(CENTER_KEEPAWAY_PICKUP, 1, 0, "s1", CPID_KEEPAWAY, XPD(0, 0), _("^BG%s^BG has picked up the ball!"), "") \ + MSG_CENTER_NOTIF(CENTER_KEEPAWAY_WARN, 0, 0, "", CPID_KA_WARN, XPD(0, 0), _("^BGKilling people while you don't have the ball gives no points!"), "") \ + MSG_CENTER_NOTIF(CENTER_LMS_CAMPCHECK, 0, 0, "", CPID_LMS_CAMP, XPD(0, 0), _("^K1Don't camp!"), "") \ + MSG_CENTER_NOTIF(CENTER_JOIN_NOSPAWNS, 0, 0, "", CPID_PREVENT_JOIN, XPD(0, 0), _("^K1No spawnpoints available!\nHope your team can fix it..."), "") \ + MSG_CENTER_NOTIF(CENTER_JOIN_PREVENT, 0, 0, "", CPID_PREVENT_JOIN, XPD(0, 0), _("^K1You may not join the game at this time.\nThe player limit reached maximum capacity."), "") \ + MULTITEAM_CENTER(CENTER_TEAMCHANGE_, 4, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGChanging to ^TC^TT^BG in ^COUNT"), "") \ + MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_SPECTATE, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGSpectating in ^COUNT"), "") \ + MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_AUTO, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^BGChanging team in ^COUNT"), "") \ + MSG_CENTER_NOTIF(CENTER_TEAMCHANGE_SUICIDE, 0, 1, "", CPID_TEAMCHANGE, XPD(0, f1), _("^K1Suicide in ^COUNT"), "") \ + MSG_CENTER_NOTIF(CENTER_WEAPON_MARBLES_LOST, 1, 1, "s1 weapon_name", NO_CPID, XPD(0, 0), _("^K1You lost your marbles against ^BG%s^K1 using the ^BG%s!"), "") #define MSG_WEAPON_NOTIFICATIONS \ /*MSG_WEAPON_NOTIF(WEAPON_EMPTY, NO_MSG, NO_MSG)*/ \ @@ -616,7 +616,7 @@ string Process_Notif_Args(float is_hudargs, string args, string notiftype, strin switch(strtolower(selected)) { - #undef ARG_CASE + //#undef ARG_CASE default: { print(sprintf("^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ^7net_type = MSG_%s, net_name = %s, %s = '%s'.\n", @@ -628,7 +628,7 @@ string Process_Notif_Args(float is_hudargs, string args, string notiftype, strin if(sel_num == maxargs) { print(sprintf("^1NOTIFICATION HAS TOO MANY ARGUMENTS: ^7net_type = MSG_%s, net_name = %s, max %s = %d.\n", - notiftype, notifname, (is_hudargs ? "hudargs" : "args"), maxargs))); + notiftype, notifname, (is_hudargs ? "hudargs" : "args"), maxargs)); notif_error = TRUE; break; } diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 35b7128cb..0ad60dcaf 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -426,10 +426,10 @@ void PutObserverInServer (void) if(self.killcount != -666) { if(g_lms) { if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0 && self.lms_spectate_warning != 2) - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_LMS_NOLIVES, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_LMS_NOLIVES, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_LMS_FORFEIT, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - } else { Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_SPECTATE, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_LMS_FORFEIT, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + } else { Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_SPECTATE, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } if(self.just_joined == FALSE) { LogTeamchange(self.playerid, -1, 4); @@ -695,7 +695,7 @@ void PutClientInServer (void) spot = SelectSpawnPoint (FALSE); if(!spot) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_NOSPAWNS, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_NOSPAWNS, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); return; // spawn failed } @@ -877,9 +877,9 @@ void PutClientInServer (void) if(g_assault) { if(self.team == assault_attacker_team) - Send_Notification_Legacy_Wrapper(NOTIF_TEAM, self, MSG_CENTER, CENTER_ASSAULT_ATTACKING, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_TEAM, self, MSG_CENTER, CENTER_ASSAULT_ATTACKING, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else - Send_Notification_Legacy_Wrapper(NOTIF_TEAM, self, MSG_CENTER, CENTER_ASSAULT_DEFENDING, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_TEAM, self, MSG_CENTER, CENTER_ASSAULT_DEFENDING, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } target_voicescript_clear(self); @@ -1082,7 +1082,7 @@ void ClientKill_Now_TeamChange() if(g_ca) self.caplayer = 0; if(blockSpectators) - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, NO_STR_ARG, NO_STR_ARG, autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, "", "", autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); PutObserverInServer(); } else @@ -1233,28 +1233,28 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 self.killindicator.colormod = '0 0 0'; if(clienttype(self) == CLIENTTYPE_REAL) if(self.killindicator.cnt > 0) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_SUICIDE, NO_STR_ARG, NO_STR_ARG, self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_SUICIDE, "", "", self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); } else if(targetteam == -1) // auto { self.killindicator.colormod = '0 1 0'; if(clienttype(self) == CLIENTTYPE_REAL) if(self.killindicator.cnt > 0) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_AUTO, NO_STR_ARG, NO_STR_ARG, self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_AUTO, "", "", self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); } else if(targetteam == -2) // spectate { self.killindicator.colormod = '0.5 0.5 0.5'; if(clienttype(self) == CLIENTTYPE_REAL) if(self.killindicator.cnt > 0) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_SPECTATE, NO_STR_ARG, NO_STR_ARG, self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_TEAMCHANGE_SPECTATE, "", "", self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); } else { self.killindicator.colormod = Team_ColorRGB(targetteam); if(clienttype(self) == CLIENTTYPE_REAL) if(self.killindicator.cnt > 0) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, APP_TEAM_NUM_4(targetteam, CENTER_TEAMCHANGE_), NO_STR_ARG, NO_STR_ARG, self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, APP_TEAM_NUM_4(targetteam, CENTER_TEAMCHANGE_), "", "", self.killindicator.cnt, NO_FL_ARG, NO_FL_ARG); } } @@ -1364,7 +1364,7 @@ void ClientConnect (void) DecodeLevelParms(); #ifdef WATERMARK - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_WATERMARK, WATERMARK, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_WATERMARK, WATERMARK, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); #endif self.classname = "player_joining"; @@ -1483,9 +1483,9 @@ void ClientConnect (void) self.netname_previous = strzone(self.netname); if((self.classname == STR_PLAYER && teamplay)) - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_4(self, INFO_JOIN_CONNECT_TEAM_), self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_4(self, INFO_JOIN_CONNECT_TEAM_), self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_JOIN_CONNECT, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_JOIN_CONNECT, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); stuffcmd(self, strcat(clientstuff, "\n")); stuffcmd(self, "cl_particles_reloadeffects\n"); // TODO do we still need this? @@ -1528,7 +1528,7 @@ void ClientConnect (void) self.spectatortime = time; if(blockSpectators) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, NO_STR_ARG, NO_STR_ARG, autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_SPECTATE_WARNING, "", "", autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); } self.jointime = time; @@ -1642,7 +1642,7 @@ void ClientDisconnect (void) if(autocvar_sv_eventlog) GameLogEcho(strcat(":part:", ftos(self.playerid))); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); DropAllRunes(self); MUTATOR_CALLHOOK(ClientDisconnect); @@ -1813,7 +1813,7 @@ void player_powerups (void) self.alpha = default_player_alpha; self.exteriorweaponentity.alpha = default_weapon_alpha; self.items &~= IT_STRENGTH; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_INVISIBILITY, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_INVISIBILITY, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } else @@ -1823,7 +1823,7 @@ void player_powerups (void) self.alpha = g_minstagib_invis_alpha; self.exteriorweaponentity.alpha = g_minstagib_invis_alpha; self.items |= IT_STRENGTH; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_INVISIBILITY, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_INVISIBILITY, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } @@ -1833,7 +1833,7 @@ void player_powerups (void) if (time > self.invincible_finished) { self.items = self.items - (self.items & IT_INVINCIBLE); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_SPEED, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_SPEED, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } else @@ -1841,7 +1841,7 @@ void player_powerups (void) if (time < self.invincible_finished) { self.items = self.items | IT_INVINCIBLE; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_SPEED, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_SPEED, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } } @@ -1854,7 +1854,7 @@ void player_powerups (void) if (time > self.strength_finished) { self.items = self.items - (self.items & IT_STRENGTH); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_STRENGTH, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_STRENGTH, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } else @@ -1862,7 +1862,7 @@ void player_powerups (void) if (time < self.strength_finished) { self.items = self.items | IT_STRENGTH; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_STRENGTH, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_STRENGTH, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } if (self.items & IT_INVINCIBLE) @@ -1872,7 +1872,7 @@ void player_powerups (void) if (time > self.invincible_finished) { self.items = self.items - (self.items & IT_INVINCIBLE); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_SHIELD, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERDOWN_SHIELD, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } else @@ -1880,7 +1880,7 @@ void player_powerups (void) if (time < self.invincible_finished) { self.items = self.items | IT_INVINCIBLE; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_SHIELD, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_POWERUP_SHIELD, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } if (self.items & IT_SUPERWEAPON) @@ -1889,7 +1889,7 @@ void player_powerups (void) { self.superweapons_finished = 0; self.items = self.items - (self.items & IT_SUPERWEAPON); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_LOST, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_LOST, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } else if (self.items & IT_UNLIMITED_SUPERWEAPONS) { @@ -1902,7 +1902,7 @@ void player_powerups (void) { self.items = self.items - (self.items & IT_SUPERWEAPON); WEPSET_ANDNOT_EA(self, WEPBIT_SUPERWEAPONS); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_BROKEN, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_BROKEN, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } } @@ -1911,7 +1911,7 @@ void player_powerups (void) if (time < self.superweapons_finished || (self.items & IT_UNLIMITED_SUPERWEAPONS)) { self.items = self.items | IT_SUPERWEAPON; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_PICKUP, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_INFO, INFO_SUPERWEAPON_PICKUP, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } else { @@ -2333,7 +2333,7 @@ void LeaveSpectatorMode() PutClientInServer(); if(self.classname == STR_PLAYER) - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_JOIN_PLAY, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_JOIN_PLAY, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); if(!autocvar_g_campaign) if (time < self.jointime + autocvar_welcome_message_time) @@ -2341,7 +2341,7 @@ void LeaveSpectatorMode() if (self.prevent_join_msgtime) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); self.prevent_join_msgtime = 0; } @@ -2411,7 +2411,7 @@ float nJoinAllowed(entity ignore) { void checkSpectatorBlock() { if(self.classname == "spectator" || self.classname == "observer") { if( time > (self.spectatortime + autocvar_g_maxplayers_spectator_blocktime) ) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_QUIT_KICK_SPECTATING, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_QUIT_KICK_SPECTATING, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); dropclient(self); } } @@ -2624,7 +2624,7 @@ void PlayerPreThink (void) // GOD MODE info if(!(self.flags & FL_GODMODE)) if(self.max_armorvalue) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_GODMODE_OFF, NO_STR_ARG, NO_STR_ARG, self.max_armorvalue, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_GODMODE_OFF, "", "", self.max_armorvalue, NO_FL_ARG, NO_FL_ARG); self.max_armorvalue = 0; } @@ -2780,7 +2780,7 @@ void PlayerPreThink (void) //sprint(self, "distance: ", ftos(self.lms_traveled_distance), "\n"); if(self.lms_traveled_distance < autocvar_g_lms_campcheck_distance) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_CAMPCHECK, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_CAMPCHECK, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); // FIXME KadaverJack: gibbing player here causes playermodel to bounce around, instead of eye.md3 // I wasn't able to find out WHY that happens, so I put a workaround in place that shall prevent players from being gibbed :( Damage(self, self, self, bound(0, autocvar_g_lms_campcheck_damage, self.health + self.armorvalue * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP, self.origin, '0 0 0'); @@ -2988,11 +2988,11 @@ void PlayerPostThink (void) if(timeleft == min(10, sv_maxidle - 1)) // - 1 to support sv_maxidle <= 10 { if(!self.idlekick_lasttimeleft) - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_DISCONNECT_IDLING, NO_STR_ARG, NO_STR_ARG, timeleft, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_DISCONNECT_IDLING, "", "", timeleft, NO_FL_ARG, NO_FL_ARG); } if(timeleft <= 0) { - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_KICK_IDLING, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_QUIT_KICK_IDLING, self.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); dropclient(self); return; } diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 4cd73e175..5f640ca51 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1108,7 +1108,7 @@ void GameCommand_nospectators(float request) if(plr.classname == "spectator" || plr.classname == "observer") { plr.spectatortime = time; - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, plr, MSG_INFO, INFO_SPECTATE_WARNING, NO_STR_ARG, NO_STR_ARG, autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, plr, MSG_INFO, INFO_SPECTATE_WARNING, "", "", autocvar_g_maxplayers_spectator_blocktime, NO_FL_ARG, NO_FL_ARG); } } bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n")); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 4cb2eb1be..c1ebc1efa 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -372,7 +372,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) if not(targ.classname == STR_PLAYER) { backtrace("Obituary called on non-player?!\n"); return; } // Declarations - string s1 = NO_STR_ARG, s2 = NO_STR_ARG; + string s1 = "", s2 = ""; float f1 = NO_FL_ARG, f2 = NO_FL_ARG, f3 = NO_FL_ARG; float notif_firstblood = FALSE; @@ -405,7 +405,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { s1 = targ.netname; f1 = targ.killcount; - s2 = NO_STR_ARG; + s2 = ""; f2 = f3 = NO_FL_ARG; break; } @@ -416,7 +416,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) Obituary_SpecialDeath(targ, FALSE, deathtype, s1, s2, f1, f2, NO_FL_ARG); } - else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, NO_STR_ARG, targ.killcount)) + else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, "", targ.killcount)) { backtrace("SUICIDE: what the hell happened here?\n"); } @@ -441,8 +441,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) attacker.killcount = 0; - Send_Notification_Legacy_Wrapper(NOTIF_ONE, attacker, MSG_DEATH, DEATH_TEAMKILL_FRAG, s2, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, DEATH_TEAMKILL_FRAGGED, s1, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, attacker, MSG_DEATH, DEATH_TEAMKILL_FRAG, s2, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, DEATH_TEAMKILL_FRAGGED, s1, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), s2, s1, targ.killcount, NO_FL_ARG, NO_FL_ARG); // In this case, the death message will ALWAYS be "foo was betrayed by bar" @@ -492,7 +492,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) s2, s1, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG, NO_FL_ARG); Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE : DEATH_MURDER_TYPEFRAGGED_FIRST), - s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); + s1, "", (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } else { @@ -500,7 +500,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) s2, s1, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG, NO_FL_ARG); Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_FRAGGED_FIRST_VERBOSE : DEATH_MURDER_FRAGGED_FIRST), - s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); + s1, "", (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } } else // normal frags, kill sprees listed @@ -508,18 +508,18 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) if(targ.istypefrag) { Send_Notification_Legacy_Wrapper(NOTIF_ONE, attacker, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAG_VERBOSE : DEATH_MURDER_TYPEFRAG), - s2, NO_STR_ARG, attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); + s2, "", attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAGGED_VERBOSE : DEATH_MURDER_TYPEFRAGGED), - s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); + s1, "", (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } else { Send_Notification_Legacy_Wrapper(NOTIF_ONE, attacker, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_FRAG_VERBOSE : DEATH_MURDER_FRAG), - s2, NO_STR_ARG, attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); + s2, "", attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); Send_Notification_Legacy_Wrapper(NOTIF_ONE, targ, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_FRAGGED_VERBOSE : DEATH_MURDER_FRAGGED), - s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); + s1, "", (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } } @@ -561,7 +561,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { s1 = targ.netname; f1 = targ.killcount; - s2 = NO_STR_ARG; + s2 = ""; f2 = f3 = NO_FL_ARG; break; } diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index 7d1f3f201..2cdb6b087 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -27,7 +27,7 @@ void ctf_CaptureRecord(entity flag, entity player) float cap_record = ctf_captimerecord; float cap_time = (time - flag.ctf_pickuptime); float f1, f2 = NO_FL_ARG; - string s1, s2 = NO_STR_ARG; + string s1, s2 = ""; string refername = db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname")); // figure shit out @@ -41,13 +41,13 @@ void ctf_CaptureRecord(entity flag, entity player) // notify about shit FOR_EACH_REALCLIENT(tmp_entity) { - if not(tmp_entity.CAPTURE_VERBOSE) { notification = APP_TEAM_ENT_2(flag, INFO_CTF_CAPTURE_); s2 = NO_STR_ARG; f1 = f2 = NO_FL_ARG; } + if not(tmp_entity.CAPTURE_VERBOSE) { notification = APP_TEAM_ENT_2(flag, INFO_CTF_CAPTURE_); s2 = ""; f1 = f2 = NO_FL_ARG; } Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, tmp_entity, MSG_INFO, notification, s1, s2, f1, f2, NO_FL_ARG); } // notify server log too - if not(autocvar_notification_ctf_capture_verbose) { notification = APP_TEAM_ENT_2(flag, INFO_CTF_CAPTURE_); s2 = NO_STR_ARG; f1 = f2 = NO_FL_ARG; } - Local_Notification_Without_VarArgs(MSG_INFO, notification, Get_Notif_Strnum(MSG_INFO, notification), Get_Notif_Flnum(MSG_INFO, notification), s1, s2, NO_STR_ARG, NO_STR_ARG, f1, f2, NO_FL_ARG, NO_FL_ARG); + if not(autocvar_notification_ctf_capture_verbose) { notification = APP_TEAM_ENT_2(flag, INFO_CTF_CAPTURE_); s2 = ""; f1 = f2 = NO_FL_ARG; } + Local_Notification_Without_VarArgs(MSG_INFO, notification, Get_Notif_Strnum(MSG_INFO, notification), Get_Notif_Flnum(MSG_INFO, notification), s1, s2, "", "", f1, f2, NO_FL_ARG, NO_FL_ARG); // write that shit in the database if(success) @@ -173,9 +173,9 @@ void ctf_CaptureShield_Update(entity player, float wanted_status) if((wanted_status == player.ctf_captureshielded) && (updated_status != wanted_status)) // 0: shield only, 1: unshield only { if(updated_status) // TODO csqc notifier for this // Samual: How? - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_FREE, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_FREE, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); player.ctf_captureshielded = updated_status; } @@ -198,7 +198,7 @@ void ctf_CaptureShield_Touch() vector othermid = (other.absmin + other.absmax) * 0.5; Damage(other, self, self, 0, DEATH_HURTTRIGGER, mymid, normalize(othermid - mymid) * ctf_captureshield_force); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, other, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, other, MSG_CENTER, CENTER_CTF_CAPTURESHIELD_SHIELDED, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } void ctf_CaptureShield_Spawn(entity flag) @@ -241,7 +241,7 @@ void ctf_Handle_Drop(entity flag, entity player, float droptype) flag.ctf_status = FLAG_DROPPED; // messages and sounds - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_LOST_), player.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_LOST_), player.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); sound(flag, CH_TRIGGER, flag.snd_flag_dropped, VOL_BASE, ATTN_NONE); ctf_EventLog("dropped", player.team, player); @@ -294,9 +294,9 @@ void ctf_Handle_Retrieve(entity flag, entity player) FOR_EACH_REALPLAYER(tmp_player) { if(tmp_player == sender) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PASS_SENT_), player.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PASS_SENT_), player.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else if(tmp_player == player) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PASS_RECEIVED_), sender.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PASS_RECEIVED_), sender.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else if(!IsDifferentTeam(tmp_player, sender)) Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PASS_OTHER_), sender.netname, player.netname, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } @@ -452,8 +452,8 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype) void ctf_Handle_Return(entity flag, entity player) { // messages and sounds - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_RETURN_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_RETURN_), player.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_RETURN_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_RETURN_), player.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); sound(player, CH_TRIGGER, flag.snd_flag_returned, VOL_BASE, ATTN_NONE); ctf_EventLog("return", flag.team, player); @@ -501,20 +501,20 @@ void ctf_Handle_Pickup(entity flag, entity player, float pickuptype) } // messages and sounds - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_PICKUP_), player.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_PICKUP_), player.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); sound(player, CH_TRIGGER, flag.snd_flag_taken, VOL_BASE, ATTN_NONE); FOR_EACH_REALPLAYER(tmp_player) { if(tmp_player == player) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PICKUP_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - if(ctf_stalemate) { Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_STALEMATE_CARRIER, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, APP_TEAM_ENT_2(flag, CENTER_CTF_PICKUP_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + if(ctf_stalemate) { Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_STALEMATE_CARRIER, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } } else if(!IsDifferentTeam(tmp_player, player) && tmp_player != player) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, (tmp_player.PICKUP_TEAM_VERBOSE ? CENTER_CTF_PICKUP_TEAM_VERBOSE : CENTER_CTF_PICKUP_TEAM), Team_ColorCode(player.team), (tmp_player.PICKUP_TEAM_VERBOSE ? player.netname : NO_STR_ARG), NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, (tmp_player.PICKUP_TEAM_VERBOSE ? CENTER_CTF_PICKUP_TEAM_VERBOSE : CENTER_CTF_PICKUP_TEAM), Team_ColorCode(player.team), (tmp_player.PICKUP_TEAM_VERBOSE ? player.netname : ""), NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else if(IsDifferentTeam(tmp_player, player)) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, (tmp_player.PICKUP_ENEMY_VERBOSE ? CENTER_CTF_PICKUP_ENEMY_VERBOSE : CENTER_CTF_PICKUP_ENEMY), Team_ColorCode(player.team), (tmp_player.PICKUP_ENEMY_VERBOSE ? player.netname : NO_STR_ARG), NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_player, MSG_CENTER, (tmp_player.PICKUP_ENEMY_VERBOSE ? CENTER_CTF_PICKUP_ENEMY_VERBOSE : CENTER_CTF_PICKUP_ENEMY), Team_ColorCode(player.team), (tmp_player.PICKUP_ENEMY_VERBOSE ? player.netname : ""), NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } // scoring @@ -573,14 +573,14 @@ void ctf_CheckFlagReturn(entity flag, float returntype) { switch(returntype) { - case RETURN_DROPPED: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_DROPPED_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; - case RETURN_DAMAGE: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_DAMAGED_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; - case RETURN_SPEEDRUN: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_SPEEDRUN_), NO_STR_ARG, NO_STR_ARG, ctf_captimerecord, NO_FL_ARG, NO_FL_ARG); break; - case RETURN_NEEDKILL: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_NEEDKILL_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; + case RETURN_DROPPED: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_DROPPED_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; + case RETURN_DAMAGE: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_DAMAGED_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; + case RETURN_SPEEDRUN: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_SPEEDRUN_), "", "", ctf_captimerecord, NO_FL_ARG, NO_FL_ARG); break; + case RETURN_NEEDKILL: Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_NEEDKILL_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; default: case RETURN_TIMEOUT: - { Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_TIMEOUT_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; } + { Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(flag, INFO_CTF_FLAGRETURN_TIMEOUT_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); break; } } sound(flag, CH_TRIGGER, flag.snd_flag_respawn, VOL_BASE, ATTN_NONE); ctf_EventLog("returned", flag.team, world); @@ -635,9 +635,9 @@ void ctf_CheckStalemate(void) { FOR_EACH_REALPLAYER(tmp_entity) if(tmp_entity.flagcarried) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_entity, MSG_CENTER, CENTER_CTF_STALEMATE_CARRIER, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_entity, MSG_CENTER, CENTER_CTF_STALEMATE_CARRIER, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); else - Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_entity, MSG_CENTER, CENTER_CTF_STALEMATE_OTHER, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, tmp_entity, MSG_CENTER, CENTER_CTF_STALEMATE_OTHER, "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); wpforenemy_announced = TRUE; } @@ -1848,13 +1848,13 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) { if(clienttype(head) == CLIENTTYPE_BOT) { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_PASS_REQUESTING, head.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_PASS_REQUESTING, head.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); ctf_Handle_Throw(head, player, DROP_PASS); } else { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, head, MSG_CENTER, CENTER_CTF_PASS_REQUESTED, player.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_PASS_REQUESTING, head.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, head, MSG_CENTER, CENTER_CTF_PASS_REQUESTED, player.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_PASS_REQUESTING, head.netname, "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); } player.throw_antispam = time + autocvar_g_ctf_pass_wait; return TRUE; @@ -1891,7 +1891,7 @@ MUTATOR_HOOKFUNCTION(ctf_PlayerUseKey) } else { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_FLAG_THROW_PUNISH, NO_STR_ARG, NO_STR_ARG, rint((player.throw_prevtime + autocvar_g_ctf_throw_punish_delay) - time), NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ONE, player, MSG_CENTER, CENTER_CTF_FLAG_THROW_PUNISH, "", "", rint((player.throw_prevtime + autocvar_g_ctf_throw_punish_delay) - time), NO_FL_ARG, NO_FL_ARG); return FALSE; } } @@ -1966,7 +1966,7 @@ MUTATOR_HOOKFUNCTION(ctf_AbortSpeedrun) { if(self.flagcarried) { - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(self.flagcarried, INFO_CTF_FLAGRETURN_ABORTRUN_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_ENT_2(self.flagcarried, INFO_CTF_FLAGRETURN_ABORTRUN_), "", "", NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); ctf_RespawnFlag(self.flagcarried); return TRUE; } diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 8f48ec379..77bb81ef3 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -35,8 +35,8 @@ void freezetag_CheckWinner() if(winner != world) // just in case a winner wasn't found { - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_CENTER, APP_TEAM_NUM_4(winner.team, CENTER_FREEZETAG_ROUND_WIN_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, APP_TEAM_NUM_4(winner.team, INFO_FREEZETAG_ROUND_WIN_), NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ANY, world, MSG_CENTER, APP_TEAM_NUM_4(winner.team, CENTER_FREEZETAG_ROUND_WIN_)); + Send_Notification(NOTIF_ANY, world, MSG_INFO, APP_TEAM_NUM_4(winner.team, INFO_FREEZETAG_ROUND_WIN_)); TeamScore_AddToTeam(winner.team, ST_SCORE, +1); } @@ -270,16 +270,16 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) if(frag_attacker == frag_target || frag_attacker == world) { if(frag_target.classname == STR_PLAYER) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF); + Send_Notification(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname); } else { if(frag_target.classname == STR_PLAYER) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_FROZEN, frag_attacker.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_FROZEN, frag_attacker.netname); if(frag_attacker.classname == STR_PLAYER) - Send_Notification_Legacy_Wrapper(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_FREEZETAG_FREEZE, frag_target.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_FREEZETAG_FREEZE, frag_target.netname); + Send_Notification(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname); } frag_target.health = 1; // "respawn" the player :P @@ -301,7 +301,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn) } if(warmup && time > warmup) // spawn too late, freeze player { - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_SPAWN_LATE, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_SPAWN_LATE); freezetag_Freeze(world); } @@ -365,9 +365,9 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink) } } - Send_Notification_Legacy_Wrapper(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, self.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_REVIVE, self.netname, o.netname, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname); + Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, self.netname); + Send_Notification(NOTIF_ANY, world, MSG_INFO, INFO_FREEZETAG_REVIVE, self.netname, o.netname); } // now find EVERY teammate within reviving radius, set their revive_progress values correct diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc index 13acb68c7..05aa45deb 100644 --- a/qcsrc/server/mutators/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/gamemode_keepaway.qc @@ -101,8 +101,8 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth // messages and sounds ka_EventLog("pickup", other); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_KEEPAWAY_PICKUP, other.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_CENTER, CENTER_KEEPAWAY_PICKUP, other.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ANY, world, MSG_INFO, INFO_KEEPAWAY_PICKUP, other.netname); + Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_KEEPAWAY_PICKUP, other.netname); sound(self.owner, CH_TRIGGER, "keepaway/pickedup.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) // scoring @@ -143,8 +143,8 @@ void ka_DropEvent(entity plyr) // runs any time that a player is supposed to los // messages and sounds ka_EventLog("dropped", plyr); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_INFO, INFO_KEEPAWAY_DROPPED, plyr.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); - Send_Notification_Legacy_Wrapper(NOTIF_ANY, world, MSG_CENTER, CENTER_KEEPAWAY_DROPPED, plyr.netname, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ANY, world, MSG_INFO, INFO_KEEPAWAY_DROPPED, plyr.netname); + Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_KEEPAWAY_DROPPED, plyr.netname); sound(other, CH_TRIGGER, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) // scoring @@ -252,7 +252,7 @@ MUTATOR_HOOKFUNCTION(ka_Scoring) } else if(!frag_attacker.ballcarried) if(autocvar_g_keepaway_noncarrier_warn) - Send_Notification_Legacy_Wrapper(NOTIF_ONE_ONLY, frag_attacker, MSG_CENTER, CENTER_KEEPAWAY_WARN, NO_STR_ARG, NO_STR_ARG, NO_FL_ARG, NO_FL_ARG, NO_FL_ARG); + Send_Notification(NOTIF_ONE_ONLY, frag_attacker, MSG_CENTER, CENTER_KEEPAWAY_WARN); if(frag_attacker.ballcarried) // add to amount of kills while ballcarrier PlayerScore_Add(frag_attacker, SP_SCORE, autocvar_g_keepaway_score_killac);