From 0116523cfd2d6dfeccd0c487d6dd3e0fab2acf92 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 9 Jul 2011 03:40:54 +0300 Subject: [PATCH] Remove the team bubble, now that we have new shownames --- data/models/misc/teambubble.spr | Bin 1086 -> 0 bytes data/models/misc/teambubble.spr_0.tga | Bin 16402 -> 0 bytes data/models/misc/teambubbleheal.spr | Bin 1086 -> 0 bytes data/models/misc/teambubbleheal.spr_0.tga | Bin 16428 -> 0 bytes data/qcsrc/server/cl_client.qc | 56 ---------------------- data/qcsrc/server/miscfunctions.qc | 2 - 6 files changed, 58 deletions(-) delete mode 100644 data/models/misc/teambubble.spr delete mode 100644 data/models/misc/teambubble.spr_0.tga delete mode 100644 data/models/misc/teambubbleheal.spr delete mode 100644 data/models/misc/teambubbleheal.spr_0.tga diff --git a/data/models/misc/teambubble.spr b/data/models/misc/teambubble.spr deleted file mode 100644 index 33063d438bbaeeb92984e8ba93766a610a9a275b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1086 zcmeIxJxIeq6bJBBBvh~fJvLqu}R%8V!imIqcRf(b!l^{Yiq9IMwiKc5h(siooRHukirc*{4V$7k; zVGeQ}mpQKEBGmg<%wgQ5c~pilZ2kL~#-)C`r;d zNs|<%={QNp&>>~Z#u>`834oL>pX4adi@ZQZF)gN$8Gw{+KAX+U@HyvPfRp<7cTPYM zKH#rb;YKWO2rPdbad=}I-%oY#4>qj9&SGPUk*;;z+!6av_AYGN?1h+Tjds6d(qWBr zvA6wf4iDIcVI1z&dGl`2YTBzU+jzY_+1upS+xauy->w;S)NeJ`xosLIIc#iI4Ek^? Ya&DQU(e+USUc7Sj^+}6f;qrI+1P%@C4gdfE diff --git a/data/models/misc/teambubble.spr_0.tga b/data/models/misc/teambubble.spr_0.tga deleted file mode 100644 index 9c6af1e955777e1afde0c255da53fce39ea371b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16402 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 Y1vT2|8{x!MvFa4XZ&MP>|CjIo0l*N$qyPW_ diff --git a/data/models/misc/teambubbleheal.spr b/data/models/misc/teambubbleheal.spr deleted file mode 100644 index 33063d438bbaeeb92984e8ba93766a610a9a275b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1086 zcmeIxJxIeq6bJBBBvh~fJvLqu}R%8V!imIqcRf(b!l^{Yiq9IMwiKc5h(siooRHukirc*{4V$7k; zVGeQ}mpQKEBGmg<%wgQ5c~pilZ2kL~#-)C`r;d zNs|<%={QNp&>>~Z#u>`834oL>pX4adi@ZQZF)gN$8Gw{+KAX+U@HyvPfRp<7cTPYM zKH#rb;YKWO2rPdbad=}I-%oY#4>qj9&SGPUk*;;z+!6av_AYGN?1h+Tjds6d(qWBr zvA6wf4iDIcVI1z&dGl`2YTBzU+jzY_+1upS+xauy->w;S)NeJ`xosLIIc#iI4Ek^? Ya&DQU(e+USUc7Sj^+}6f;qrI+1P%@C4gdfE diff --git a/data/models/misc/teambubbleheal.spr_0.tga b/data/models/misc/teambubbleheal.spr_0.tga deleted file mode 100644 index 379d670cccefbce4b1eba11a5ccf3bb4ef4e0b63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16428 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 Mm@s+j_(2u_1JTqtWB>pF diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 7ecabb60..d9b9437d 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1534,7 +1534,6 @@ Called when a client disconnects from the server ============= */ .entity chatbubbleentity; -.entity teambubbleentity; void ReadyCount(); void ClientDisconnect (void) { @@ -1582,9 +1581,6 @@ void ClientDisconnect (void) if (self.chatbubbleentity) remove (self.chatbubbleentity); - if (self.teambubbleentity) - remove (self.teambubbleentity); - if (self.killindicator) remove (self.killindicator); @@ -1661,57 +1657,6 @@ void UpdateChatBubble() } } -void TeamBubbleThink() -{ - self.nextthink = time; - if (!self.owner.modelindex || self.owner.teambubbleentity != self) - { - if(self.owner) // but why can that ever be world? - self.owner.teambubbleentity = world; - remove(self); - return; - } -// setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1'); // bandwidth hog. setattachment does this now - if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.stat_eaten) - self.model = ""; - else - { - if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore")) - if(self.owner.health < cvar("g_balance_vore_teamheal_stable")) - setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed - else - setmodel(self, "models/misc/teambubble.spr"); - } -}; - -float TeamBubble_customizeentityforclient() -{ - return (self.owner != other && self.owner.team == other.team && other.killcount > -666); -} - -void UpdateTeamBubble() -{ - if (!self.modelindex || !teams_matter) - return; - // spawn a teambubble entity if needed - if (!self.teambubbleentity && teams_matter) - { - self.teambubbleentity = spawn(); - self.teambubbleentity.owner = self; - self.teambubbleentity.exteriormodeltoclient = self; - self.teambubbleentity.think = TeamBubbleThink; - self.teambubbleentity.nextthink = time; - setmodel(self.teambubbleentity, "models/misc/teambubble.spr"); // precision set below -// setorigin(self.teambubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1'); - setorigin(self.teambubbleentity, '0 0 15' + self.maxs_z * '0 0 1'); - setattachment(self.teambubbleentity, self, ""); // sticks to moving player better, also conserves bandwidth -// self.teambubbleentity.mdl = self.teambubbleentity.model; -// self.teambubbleentity.model = self.teambubbleentity.mdl; - self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient; - self.teambubbleentity.effects = EF_LOWPRECISION; - } -} - // LordHavoc: this hack will be removed when proper _pants/_shirt layers are // added to the model skins /*void UpdateColorModHack() @@ -2875,7 +2820,6 @@ void PlayerPostThink (void) if(self.classname == "player") { CheckRules_Player(); UpdateChatBubble(); - UpdateTeamBubble(); if (self.impulse) ImpulseCommands(); if (intermission_running) diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 245d0a08..8111f535 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1332,8 +1332,6 @@ void precache() { // gamemode related things precache_model ("models/misc/chatbubble.spr"); - precache_model ("models/misc/teambubble.spr"); - precache_model ("models/misc/teambubbleheal.spr"); // used by the waypoint editor precache_model ("models/rune.mdl"); -- 2.39.2