From ef29ccb63cd714e88aaad2e43983317ffc933174 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Wed, 8 Sep 2010 01:55:08 +0300 Subject: [PATCH] Team heal indicator for the team bubble. You will now see an additional Heal panel on the team bubble when someone can be healed. --- data/models/misc/teambubbleheal.spr | Bin 0 -> 1086 bytes data/models/misc/teambubbleheal.spr_0.tga | Bin 0 -> 16428 bytes data/qcsrc/server/cl_client.qc | 13 ++++++++----- data/qcsrc/server/miscfunctions.qc | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 data/models/misc/teambubbleheal.spr create mode 100644 data/models/misc/teambubbleheal.spr_0.tga diff --git a/data/models/misc/teambubbleheal.spr b/data/models/misc/teambubbleheal.spr new file mode 100644 index 0000000000000000000000000000000000000000..33063d438bbaeeb92984e8ba93766a610a9a275b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/data/models/misc/teambubbleheal.spr_0.tga b/data/models/misc/teambubbleheal.spr_0.tga new file mode 100644 index 0000000000000000000000000000000000000000..379d670cccefbce4b1eba11a5ccf3bb4ef4e0b63 GIT binary patch literal 16428 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 Mm@s+j_(2u_1JTqtWB>pF literal 0 HcmV?d00001 diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 98793862..3bf2ff0d 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1624,7 +1624,6 @@ void UpdateChatBubble() } } - void TeamBubbleThink() { self.nextthink = time; @@ -1639,8 +1638,12 @@ void TeamBubbleThink() if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.eater.classname == "player") self.model = ""; else - self.model = self.mdl; - + { + if(cvar("g_balance_vore_teamheal") && 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() @@ -1664,8 +1667,8 @@ void UpdateTeamBubble() // 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.mdl = self.teambubbleentity.model; +// self.teambubbleentity.model = self.teambubbleentity.mdl; self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient; self.teambubbleentity.effects = EF_LOWPRECISION; } diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 84abf864..357e93ce 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1332,6 +1332,7 @@ 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