From: Samual Lenks Date: Sun, 3 Feb 2013 21:51:20 +0000 (-0500) Subject: Remove some old junk X-Git-Tag: xonotic-v0.7.0~62^2~23^2~288 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=051658ba27f03e8069a59adb398dc782401faadd;p=xonotic%2Fxonotic-data.pk3dir.git Remove some old junk --- diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index cd7e3a28f..c639a003b 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -1199,10 +1199,6 @@ float CSQC_Parse_TempEntity() HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte()); bHandled = true; break; - case TE_CSQC_KILLCENTERPRINT: - HUD_KillCenterprint(ReadString(), ReadString(), ReadShort(), ReadByte()); - bHandled = true; - break; case TE_CSQC_CENTERPRINT_GENERIC: float id; string s; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 27e3665fc..32af3f65c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2065,91 +2065,6 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s }*/ } -void HUD_KillCenterprint(string s1, string s2, float type, float msg) -{ - float gentle; - gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages); - if(msg == MSG_SUICIDE) { - if (type == DEATH_TEAMCHANGE) { - centerprint_hud(sprintf(_("You are now on: %s"), s1)); - } else if (type == DEATH_AUTOTEAMCHANGE) { - centerprint_hud(sprintf(_("You have been moved into a different team to improve team balance\nYou are now on: %s"), s1)); - } else if (type == DEATH_CAMP) { - if(gentle) - centerprint_hud(_("^1Reconsider your tactics, camper!")); - else - centerprint_hud(_("^1Die camper!")); - } else if (type == DEATH_NOAMMO) { - if(gentle) - centerprint_hud(_("^1You are reinserted into the game for running out of ammo...")); - else - centerprint_hud(_("^1You were killed for running out of ammo...")); - } else if (type == DEATH_ROT) { - if(gentle) - centerprint_hud(_("^1You need to preserve your health")); - else - centerprint_hud(_("^1You grew too old without taking your medicine")); - } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(gentle) - centerprint_hud(_("^1Don't go against team mates!")); - else - centerprint_hud(_("^1Don't shoot your team mates!")); - } else { // generic message - if(gentle) - centerprint_hud(_("^1You need to be more careful!")); - else - centerprint_hud(_("^1You killed your own dumb self!")); - } - } else if(msg == MSG_KILL) { - if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - if(gentle) { - centerprint_hud(sprintf(_("^1Moron! You went against ^7%s^1, a team mate!"), s1)); - } else { - centerprint_hud(sprintf(_("^1Moron! You fragged ^7%s^1, a team mate!"), s1)); - } - } else if (type == KILL_FIRST_BLOOD) { - if(gentle) { - centerprint_hud(_("^1First score")); - } else { - centerprint_hud(_("^1First blood")); - } - } else if (type == KILL_FIRST_VICTIM) { - if(gentle) { - centerprint_hud(_("^1First casualty")); - } else { - centerprint_hud(_("^1First victim")); - } - } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap... - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You scored against ^7%s^1 who was typing!"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You typefragged ^7%s"), s1), s2)); - } - } else if (type == KILL_TYPEFRAGGED) { - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s^1 while you were typing!"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You were typefragged by ^7%s"), s1), s2)); - } - } else if (type == KILL_FRAG) { - if(gentle) { - centerprint_hud(strcat(sprintf(_("^4You scored against ^7%s"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^4You fragged ^7%s"), s1), s2)); - } - } else { // generic message - if(gentle) { - centerprint_hud(strcat(sprintf(_("^1You were scored against by ^7%s"), s1), s2)); - } else { - centerprint_hud(strcat(sprintf(_("^1You were fragged by ^7%s"), s1), s2)); - } - } - } else if(msg == MSG_KILL_ACTION) { - // TODO: invent more centerprints here? - centerprint_hud(_("^1Watch your step!")); - } -} - void HUD_Notify(void) { if(!autocvar__hud_configure) diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 020e49840..6dc75e42e 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -39,14 +39,13 @@ const float TE_CSQC_PINGPLREPORT = 107; const float TE_CSQC_ANNOUNCE = 110; const float TE_CSQC_TARGET_MUSIC = 111; const float TE_CSQC_KILLNOTIFY = 112; -const float TE_CSQC_KILLCENTERPRINT = 113; -const float TE_CSQC_CENTERPRINT_GENERIC = 114; -const float TE_CSQC_WEAPONCOMPLAIN = 115; -const float TE_CSQC_NEX_SCOPE = 116; -const float TE_CSQC_MINELAYER_MAXMINES = 117; -const float TE_CSQC_HAGAR_MAXROCKETS = 118; -const float TE_CSQC_VEHICLESETUP = 119; -const float TE_CSQC_SVNOTICE = 120; +const float TE_CSQC_CENTERPRINT_GENERIC = 113; +const float TE_CSQC_WEAPONCOMPLAIN = 114; +const float TE_CSQC_NEX_SCOPE = 115; +const float TE_CSQC_MINELAYER_MAXMINES = 116; +const float TE_CSQC_HAGAR_MAXROCKETS = 117; +const float TE_CSQC_VEHICLESETUP = 118; +const float TE_CSQC_SVNOTICE = 119; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh index 35c732494..ca5c554fe 100644 --- a/qcsrc/common/deathtypes.qh +++ b/qcsrc/common/deathtypes.qh @@ -99,49 +99,3 @@ float HITTYPE_SPLASH = 0x200; // automatically set by RadiusDamage float HITTYPE_BOUNCE = 0x400; float HITTYPE_HEADSHOT = 0x800; // automatically set by Damage (if headshotbonus is set) float HITTYPE_RESERVED = 0x1000; // unused yet - -// CSQC centerprint/notify message types -float MSG_SUICIDE = 0; -float MSG_KILL = 1; -float MSG_SPREE = 2; -float MSG_KILL_ACTION = 3; -float MSG_KILL_ACTION_SPREE = 4; -float MSG_INFO = 5; -float MSG_KA = 6; -float MSG_RACE = 10; - -float KILL_TEAM_RED = 12001; -float KILL_TEAM_BLUE = 12002; -float KILL_TEAM_SPREE = 12003; -float KILL_FIRST_BLOOD = 12004; -float KILL_FIRST_VICTIM = 12005; -float KILL_TYPEFRAG = 12006; -float KILL_TYPEFRAGGED = 12007; -float KILL_FRAG = 12008; -float KILL_FRAGGED = 12009; -float KILL_SPREE = 12010; -float KILL_END_SPREE = 12011; -float KILL_SPREE_3 = 12012; -float KILL_SPREE_5 = 12013; -float KILL_SPREE_10 = 12014; -float KILL_SPREE_15 = 12015; -float KILL_SPREE_20 = 12016; -float KILL_SPREE_25 = 12017; -float KILL_SPREE_30 = 12018; - - - -// this shit has got to go -float INFO_GOTFLAG = 13001; -float INFO_PICKUPFLAG = 13002; -float INFO_LOSTFLAG = 13003; -float INFO_RETURNFLAG = 13004; -float INFO_CAPTUREFLAG = 13005; - -float KA_PICKUPBALL = 14001; -float KA_DROPBALL = 14002; - -float RACE_SERVER_RECORD = 15001; -float RACE_NEW_TIME = 15002; -float RACE_NEW_RANK = 15003; -float RACE_FAIL = 15004;