From: FruitieX Date: Sat, 10 Jul 2010 20:26:32 +0000 (+0300) Subject: batch of notify and pressedkeys updates X-Git-Tag: xonotic-v0.1.0preview~362^2~44^2~16 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c41727946009fa3197280323439f8bca789cc7e9 batch of notify and pressedkeys updates --- diff --git a/gfx/hud/default/notify_teamkill.tga b/gfx/hud/default/notify_teamkill.tga deleted file mode 100644 index a40920b204..0000000000 Binary files a/gfx/hud/default/notify_teamkill.tga and /dev/null differ diff --git a/gfx/hud/default/notify_teamkill_blue.tga b/gfx/hud/default/notify_teamkill_blue.tga new file mode 100644 index 0000000000..a40920b204 Binary files /dev/null and b/gfx/hud/default/notify_teamkill_blue.tga differ diff --git a/gfx/hud/default/notify_teamkill_red.tga b/gfx/hud/default/notify_teamkill_red.tga new file mode 100644 index 0000000000..a40920b204 Binary files /dev/null and b/gfx/hud/default/notify_teamkill_red.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_carrying.tga b/gfx/hud/wickedhud/flag_blue_carrying.tga index ace6a5f2c3..360df33b10 100644 Binary files a/gfx/hud/wickedhud/flag_blue_carrying.tga and b/gfx/hud/wickedhud/flag_blue_carrying.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_lost.tga b/gfx/hud/wickedhud/flag_blue_lost.tga index 67d894d82d..1f037ce925 100644 Binary files a/gfx/hud/wickedhud/flag_blue_lost.tga and b/gfx/hud/wickedhud/flag_blue_lost.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_shielded.tga b/gfx/hud/wickedhud/flag_blue_shielded.tga index a8993f6b2c..1337e24cda 100644 Binary files a/gfx/hud/wickedhud/flag_blue_shielded.tga and b/gfx/hud/wickedhud/flag_blue_shielded.tga differ diff --git a/gfx/hud/wickedhud/flag_blue_taken.tga b/gfx/hud/wickedhud/flag_blue_taken.tga index 6847e7cc19..6df08ada64 100644 Binary files a/gfx/hud/wickedhud/flag_blue_taken.tga and b/gfx/hud/wickedhud/flag_blue_taken.tga differ diff --git a/gfx/hud/wickedhud/flag_red_carrying.tga b/gfx/hud/wickedhud/flag_red_carrying.tga index 3393083323..7a8b4625c1 100644 Binary files a/gfx/hud/wickedhud/flag_red_carrying.tga and b/gfx/hud/wickedhud/flag_red_carrying.tga differ diff --git a/gfx/hud/wickedhud/flag_red_lost.tga b/gfx/hud/wickedhud/flag_red_lost.tga index f96e02147e..20380c0f33 100644 Binary files a/gfx/hud/wickedhud/flag_red_lost.tga and b/gfx/hud/wickedhud/flag_red_lost.tga differ diff --git a/gfx/hud/wickedhud/flag_red_shielded.tga b/gfx/hud/wickedhud/flag_red_shielded.tga index e7ec491fd6..fe0a8ad37f 100644 Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and b/gfx/hud/wickedhud/flag_red_shielded.tga differ diff --git a/gfx/hud/wickedhud/flag_red_taken.tga b/gfx/hud/wickedhud/flag_red_taken.tga index bf71977e14..c1a560a9c1 100644 Binary files a/gfx/hud/wickedhud/flag_red_taken.tga and b/gfx/hud/wickedhud/flag_red_taken.tga differ diff --git a/gfx/hud/wickedhud/key_backward.tga b/gfx/hud/wickedhud/key_backward.tga index 4de0f33221..5588a4b499 100644 Binary files a/gfx/hud/wickedhud/key_backward.tga and b/gfx/hud/wickedhud/key_backward.tga differ diff --git a/gfx/hud/wickedhud/key_backward_inv.tga b/gfx/hud/wickedhud/key_backward_inv.tga index bef0d1ca3d..8217ae3a2c 100644 Binary files a/gfx/hud/wickedhud/key_backward_inv.tga and b/gfx/hud/wickedhud/key_backward_inv.tga differ diff --git a/gfx/hud/wickedhud/key_crouch.tga b/gfx/hud/wickedhud/key_crouch.tga index 00b2dfe449..386bba0277 100644 Binary files a/gfx/hud/wickedhud/key_crouch.tga and b/gfx/hud/wickedhud/key_crouch.tga differ diff --git a/gfx/hud/wickedhud/key_crouch_inv.tga b/gfx/hud/wickedhud/key_crouch_inv.tga index 2cdbda804d..c2528a5564 100644 Binary files a/gfx/hud/wickedhud/key_crouch_inv.tga and b/gfx/hud/wickedhud/key_crouch_inv.tga differ diff --git a/gfx/hud/wickedhud/key_forward.tga b/gfx/hud/wickedhud/key_forward.tga index dfe223381b..e33b59ce3e 100644 Binary files a/gfx/hud/wickedhud/key_forward.tga and b/gfx/hud/wickedhud/key_forward.tga differ diff --git a/gfx/hud/wickedhud/key_forward_inv.tga b/gfx/hud/wickedhud/key_forward_inv.tga index 7bbea6070f..ccc763ede8 100644 Binary files a/gfx/hud/wickedhud/key_forward_inv.tga and b/gfx/hud/wickedhud/key_forward_inv.tga differ diff --git a/gfx/hud/wickedhud/key_jump.tga b/gfx/hud/wickedhud/key_jump.tga index d02b2dbc88..d1ddcbbb0b 100644 Binary files a/gfx/hud/wickedhud/key_jump.tga and b/gfx/hud/wickedhud/key_jump.tga differ diff --git a/gfx/hud/wickedhud/key_jump_inv.tga b/gfx/hud/wickedhud/key_jump_inv.tga index c54bb3763c..d547980222 100644 Binary files a/gfx/hud/wickedhud/key_jump_inv.tga and b/gfx/hud/wickedhud/key_jump_inv.tga differ diff --git a/gfx/hud/wickedhud/key_left.tga b/gfx/hud/wickedhud/key_left.tga index 60fe71f17e..ed991f4b88 100644 Binary files a/gfx/hud/wickedhud/key_left.tga and b/gfx/hud/wickedhud/key_left.tga differ diff --git a/gfx/hud/wickedhud/key_left_inv.tga b/gfx/hud/wickedhud/key_left_inv.tga index 92bc615e44..e607ddbf5a 100644 Binary files a/gfx/hud/wickedhud/key_left_inv.tga and b/gfx/hud/wickedhud/key_left_inv.tga differ diff --git a/gfx/hud/wickedhud/key_right.tga b/gfx/hud/wickedhud/key_right.tga index 308c03b1e5..83baa31e03 100644 Binary files a/gfx/hud/wickedhud/key_right.tga and b/gfx/hud/wickedhud/key_right.tga differ diff --git a/gfx/hud/wickedhud/key_right_inv.tga b/gfx/hud/wickedhud/key_right_inv.tga index 8f04be424e..3bd8867552 100644 Binary files a/gfx/hud/wickedhud/key_right_inv.tga and b/gfx/hud/wickedhud/key_right_inv.tga differ diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga index 2766dd1ccf..1454d5ce0d 100644 Binary files a/gfx/hud/wickedhud/notify_camping.tga and b/gfx/hud/wickedhud/notify_camping.tga differ diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga index d5e8045a20..b42738bb32 100644 Binary files a/gfx/hud/wickedhud/notify_death.tga and b/gfx/hud/wickedhud/notify_death.tga differ diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga index 3976e8ba3f..100c0fae03 100644 Binary files a/gfx/hud/wickedhud/notify_lava.tga and b/gfx/hud/wickedhud/notify_lava.tga differ diff --git a/gfx/hud/wickedhud/notify_selfkill.tga b/gfx/hud/wickedhud/notify_selfkill.tga index 646a1a2381..b05b6af56e 100644 Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and b/gfx/hud/wickedhud/notify_selfkill.tga differ diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga index c08a6a3d48..68da649d35 100644 Binary files a/gfx/hud/wickedhud/notify_slime.tga and b/gfx/hud/wickedhud/notify_slime.tga differ diff --git a/gfx/hud/wickedhud/notify_teamkill.tga b/gfx/hud/wickedhud/notify_teamkill.tga deleted file mode 100644 index a40920b204..0000000000 Binary files a/gfx/hud/wickedhud/notify_teamkill.tga and /dev/null differ diff --git a/gfx/hud/wickedhud/notify_teamkill_blue.tga b/gfx/hud/wickedhud/notify_teamkill_blue.tga new file mode 100644 index 0000000000..0ba677d292 Binary files /dev/null and b/gfx/hud/wickedhud/notify_teamkill_blue.tga differ diff --git a/gfx/hud/wickedhud/notify_teamkill_red.tga b/gfx/hud/wickedhud/notify_teamkill_red.tga new file mode 100644 index 0000000000..0ba677d292 Binary files /dev/null and b/gfx/hud/wickedhud/notify_teamkill_red.tga differ diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga index 8315f1266b..6edb791b3e 100644 Binary files a/gfx/hud/wickedhud/notify_water.tga and b/gfx/hud/wickedhud/notify_water.tga differ diff --git a/gfx/hud/wickedhud/race_newfail.tga b/gfx/hud/wickedhud/race_newfail.tga index cd1164bdf7..89d0ec59aa 100644 Binary files a/gfx/hud/wickedhud/race_newfail.tga and b/gfx/hud/wickedhud/race_newfail.tga differ diff --git a/gfx/hud/wickedhud/race_newrankgreen.tga b/gfx/hud/wickedhud/race_newrankgreen.tga index c8fa1577cb..d3fe40dfd3 100644 Binary files a/gfx/hud/wickedhud/race_newrankgreen.tga and b/gfx/hud/wickedhud/race_newrankgreen.tga differ diff --git a/gfx/hud/wickedhud/race_newrankyellow.tga b/gfx/hud/wickedhud/race_newrankyellow.tga index 0af3c593f5..d3fe40dfd3 100644 Binary files a/gfx/hud/wickedhud/race_newrankyellow.tga and b/gfx/hud/wickedhud/race_newrankyellow.tga differ diff --git a/gfx/hud/wickedhud/race_newrecordserver.tga b/gfx/hud/wickedhud/race_newrecordserver.tga index aa8bae1a81..7c1e6db615 100644 Binary files a/gfx/hud/wickedhud/race_newrecordserver.tga and b/gfx/hud/wickedhud/race_newrecordserver.tga differ diff --git a/gfx/hud/wickedhud/race_newtime.tga b/gfx/hud/wickedhud/race_newtime.tga index c9647b927b..1ec30476e3 100644 Binary files a/gfx/hud/wickedhud/race_newtime.tga and b/gfx/hud/wickedhud/race_newtime.tga differ diff --git a/gfx/hud/wickedhud/voteprogress_back.tga b/gfx/hud/wickedhud/voteprogress_back.tga index 2348be8251..3be8d40866 100644 Binary files a/gfx/hud/wickedhud/voteprogress_back.tga and b/gfx/hud/wickedhud/voteprogress_back.tga differ diff --git a/gfx/hud/wickedhud/voteprogress_prog.tga b/gfx/hud/wickedhud/voteprogress_prog.tga index 574d5d70a6..f24f524158 100644 Binary files a/gfx/hud/wickedhud/voteprogress_prog.tga and b/gfx/hud/wickedhud/voteprogress_prog.tga differ diff --git a/gfx/hud/wickedhud/voteprogress_voted.tga b/gfx/hud/wickedhud/voteprogress_voted.tga index ffc90a255c..ee06048fcd 100644 Binary files a/gfx/hud/wickedhud/voteprogress_voted.tga and b/gfx/hud/wickedhud/voteprogress_voted.tga differ diff --git a/gfx/hud/wickedhud/weapon_complainbubble.tga b/gfx/hud/wickedhud/weapon_complainbubble.tga new file mode 100644 index 0000000000..d0f73ddfe4 Binary files /dev/null and b/gfx/hud/wickedhud/weapon_complainbubble.tga differ diff --git a/hud_wickedhud_default.cfg b/hud_wickedhud_default.cfg index 7fc258413a..ab3e38e1f8 100644 --- a/hud_wickedhud_default.cfg +++ b/hud_wickedhud_default.cfg @@ -155,6 +155,7 @@ seta hud_pressedkeys_bg_color_team "" "override panel color with team color in t seta hud_pressedkeys_bg_alpha 0 "if set to something else than \"\" = override default panel background alpha" seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background" seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border" +seta hud_pressedkeys_aspect 1.6 "forced aspect on panel" seta hud_chat 1 "enable/disable this panel" seta hud_chat_pos "0.020000 0.790000" "position of this base of the panel" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index f12d5bbcfe..dba5d61902 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -183,6 +183,7 @@ var string autocvar_hud_pressedkeys_bg_color_team; var string autocvar_hud_pressedkeys_bg_alpha; var string autocvar_hud_pressedkeys_bg_border; var string autocvar_hud_pressedkeys_bg_padding; +var float autocvar_hud_pressedkeys_aspect; var float autocvar_hud_chat; var vector autocvar_hud_chat_pos; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 18e71d265d..d419605415 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2575,6 +2575,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) } else if(type == INFO_RETURNFLAG) { HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG); print(s1, "^7 returned the ", s2, "\n"); + } else if(type == INFO_CAPTUREFLAG) { + HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG); + print(s1, "^7 captured the ", s2, s3, "\n"); } } } @@ -2700,7 +2703,6 @@ void HUD_Notify (void) fadetime = autocvar_hud_notify_fadetime; string s; - vector color; vector pos_attacker, pos_victim; vector weap_pos; @@ -2743,105 +2745,99 @@ void HUD_Notify (void) if(killnotify_deathtype[j] == DEATH_GENERIC) { s = "notify_death"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_NOAMMO) { s = "notify_outofammo"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_KILL) { s = "notify_selfkill"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_CAMP) { s = "notify_camping"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - s = "notify_teamkill"; - color = '1 0 0'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - s = "notify_teamkill"; - color = '0 0 1'; + s = "notify_teamkill_blue"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { - s = "notify_"; - color = '1 1 1'; + s = "notify_water"; } else if(killnotify_deathtype[j] == DEATH_SLIME) { - s = "notify_"; - color = '1 1 1'; + s = "notify_slime"; } else if(killnotify_deathtype[j] == DEATH_LAVA) { - s = "notify_"; - color = '1 1 1'; + s = "notify_lava"; } else if(killnotify_deathtype[j] == DEATH_FALL) { - s = "notify_"; - color = '1 1 1'; + s = "notify_fall"; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { - s = "notify_"; - color = '1 1 1'; + s = "notify_shootingstar"; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) { - s = "notify_"; - color = '1 1 1'; + s = "notify_death"; } + // TODO: ctf icons... else if(killnotify_deathtype[j] == INFO_GOTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_carrying"; - color = '1 0 0'; + s = "notify_red_taken"; } else { - s = "flag_blue_carrying"; - color = '0 0 1'; + s = "notify_blue_taken"; } } else if(killnotify_deathtype[j] == INFO_RETURNFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_taken"; - color = '1 0 0'; + s = "notify_red_returned"; } else { - s = "flag_blue_taken"; - color = '0 0 1'; + s = "notify_blue_returned"; } } else if(killnotify_deathtype[j] == INFO_LOSTFLAG) { if(killnotify_victims[j] == "^1RED^7 flag") { - s = "flag_red_lost"; - color = '1 0 0'; + s = "notify_red_lost"; + } + else + { + s = "notify_blue_lost"; + } + } + else if(killnotify_deathtype[j] == INFO_CAPTUREFLAG) + { + if(killnotify_victims[j] == "^1RED^7 flag") + { + s = "notify_red_captured"; } else { - s = "flag_blue_lost"; - color = '0 0 1'; + s = "notify_blue_captured"; } } if(s != "" && a) { - drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } } @@ -2867,57 +2863,47 @@ void HUD_Notify (void) if(autocvar__hud_configure) // example actions for config mode { s = "weaponelectro"; - color = '1 1 1'; } else if(WEP_VALID(killnotify_deathtype[j])) { self = get_weaponinfo(killnotify_deathtype[j]); s = strcat("weapon", self.netname); - color = '1 1 1'; } else if(killnotify_deathtype[j] == KILL_TEAM_RED) { - s = "notify_teamkill"; - color = '1 0 0'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == KILL_TEAM_BLUE) { - s = "notify_teamkill"; - color = '0 0 1'; + s = "notify_teamkill_red"; } else if(killnotify_deathtype[j] == DEATH_DROWN) { s = "notify_water"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_SLIME) { s = "notify_slime"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_LAVA) { s = "notify_lava"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_FALL) { s = "notify_fall"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR) { s = "notify_shootingstar"; - color = '1 1 1'; } else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right? { s = "notify_void"; - color = '1 1 1'; } if(s != "" && a) { - drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, color, panel_fg_alpha * a, DRAWFLAG_NORMAL); + drawpic_aspect_skin(weap_pos, s, '2 1 0' * height, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_attacker, attacker, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); drawcolorcodedstring(pos_victim, victim, fontsize, panel_fg_alpha * a, DRAWFLAG_NORMAL); } @@ -2998,7 +2984,7 @@ void HUD_Timer(void) // void HUD_Radar(void) { - if (!(autocvar_hud_radar != 0 && (autocvar_hud_radar == 2 || teamplay || autocvar__hud_configure))) + if ((autocvar_hud_radar == 0 || (autocvar_hud_radar != 2 && !teamplay)) && !autocvar__hud_configure) return; float id = HUD_PANEL_RADAR; @@ -4054,23 +4040,26 @@ void HUD_DrawPressedKeys(void) mySize -= '2 2 0' * panel_bg_padding; } - // always force 2:1 aspect - vector newSize; - if(mySize_x/mySize_y > 2) + // force custom aspect + if(autocvar_hud_pressedkeys_aspect) { - newSize_x = 2 * mySize_y; - newSize_y = mySize_y; + vector newSize; + if(mySize_x/mySize_y > autocvar_hud_pressedkeys_aspect) + { + newSize_x = autocvar_hud_pressedkeys_aspect * mySize_y; + newSize_y = mySize_y; - pos_x = pos_x + (mySize_x - newSize_x) / 2; - } - else - { - newSize_y = 1/2 * mySize_x; - newSize_x = mySize_x; + pos_x = pos_x + (mySize_x - newSize_x) / 2; + } + else + { + newSize_y = 1/autocvar_hud_pressedkeys_aspect * mySize_x; + newSize_x = mySize_x; - pos_y = pos_y + (mySize_y - newSize_y) / 2; + pos_y = pos_y + (mySize_y - newSize_y) / 2; + } + mySize = newSize; } - mySize = newSize; vector keysize; keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5; diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 9eebbfb6c6..775628e068 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -575,6 +575,7 @@ float INFO_GOTFLAG = 10319; float INFO_PICKUPFLAG = 10320; float INFO_LOSTFLAG = 10321; float INFO_RETURNFLAG = 10322; +float INFO_CAPTUREFLAG = 10323; // weapon requests float WR_SETUP = 1; // (SVQC) setup weapon data diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index 4148136daf..6e314c88ef 100644 --- a/qcsrc/server/ctf.qc +++ b/qcsrc/server/ctf.qc @@ -473,7 +473,7 @@ void FlagTouch() h0 = strcat(h0, "^7's"); // h0: display text for previous netname if (flagcaptimerecord == 0) { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, " seconds\n"); + s = strcat(" in ", s, " seconds"); flagcaptimerecord = t; db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t)); db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1); @@ -481,7 +481,7 @@ void FlagTouch() } else if (t < flagcaptimerecord) { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", breaking ", strcat(h0, " previous record of ", s0, " seconds\n")); + s = strcat(" in ", s, " seconds, breaking ", h0, " previous record of ", s0, " seconds"); flagcaptimerecord = t; db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time"), ftos(t)); db_put(ServerProgsDB, strcat(GetMapname(), "/captimerecord/netname"), h1); @@ -489,11 +489,13 @@ void FlagTouch() } else { - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, " in ", s, ", failing to break ", strcat(h0, " record of ", s0, " seconds\n")); + s = strcat(" in ", s, " seconds, failing to break ", h0, " record of ", s0, " seconds"); } } else - bprint(other.netname, "^7 captured the ", other.flagcarried.netname, "\n"); + s = ""; + + Send_KillNotification (other.netname, other.flagcarried.netname, s, INFO_CAPTUREFLAG, MSG_INFO); PlayerTeamScore_Add(other, SP_CTF_CAPS, ST_CTF_CAPS, 1); LogCTF("capture", other.flagcarried.team, other);