qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2024-11-10 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

no more DMSG_TESLA

Browse source
This commit is contained in:
Finny Merrill 2004-02-17 00:23:39 +00:00
parent d8b98b5eec
commit 59056fd5c8
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
defs.qh
View file

@ -1317,7 +1317,7 @@ float (entity e) EF_GlowColor;
#define DMSG_MARTYR 40
#define DMSG_HOVER 41 //Boot exhaust!
#define DMSG_LAND_MINE 42
#define DMSG_TESLA 43
#define DMSG_GREN_EMP_RADIUS 43
#define DMSG_DEMON_FIRE 44
#define DMSG_BERSERK 45
#define DMSG_MAUSER 50
@ -1343,7 +1343,6 @@ float (entity e) EF_GlowColor;
#define DMSG_FF_STUCK_HACKED 69
#define DMSG_PHYSICS 70
#define DMSG_OUTOFBOUNDS 71
#define DMSG_GREN_EMP_RADIUS 72
//Defs for objects a spikeshooter can spawn Misc.qc
#define SPAWNFLAG_SUPERSPIKE 1

4
obituary.qc
View file

@ -172,7 +172,7 @@ void (entity targ, entity atk) Give_Frags_Building =
ro = atk.martyr_enemy;
if ((((targ.classname == "player") && Teammate(ro.team_no, targ.team_no)) ||
Teammate(ro.team_no, targ.real_owner.team_no)) && ((deathmsg != DMSG_TESLA) ||
Teammate(ro.team_no, targ.real_owner.team_no)) && ((deathmsg != DMSG_LIGHTNING) ||
!(atk.tf_items & NIT_SECURITY_CAMERA)))
{
if (targ.classname == "player") // More the victim than the owner's fault
@ -1297,7 +1297,7 @@ void (entity targ, entity attacker) Obituary_Player_by_SentryTesla =
} else if (deathmsg == DMSG_SENTRYGUN_BULLET) {
deathstring = " is mown down by ";
deathstring2 = "'s sentry gun\n";
} else if (deathmsg == DMSG_TESLA) {
} else if (deathmsg == DMSG_LIGHTNING) {
local float rnum = random ();
if (rnum < FRAC (2, 4)) {

4
tesla.qc
View file

@ -491,7 +491,7 @@ float() Tesla_Fire =
{
local float damg;
damg = random() * 100 + 200 * self.ammo_nails; // the bigger they come, the harder they fall
deathmsg = DMSG_TESLA;
deathmsg = DMSG_LIGHTNING;
WriteByte (MSG_MULTICAST, SVC_TEMPENTITY);
WriteByte (MSG_MULTICAST, TE_EXPLOSION);
WriteCoord (MSG_MULTICAST, self.origin_x);
@ -503,7 +503,7 @@ float() Tesla_Fire =
return FALSE;
}
deathmsg = DMSG_TESLA;
deathmsg = DMSG_LIGHTNING;
// OfN - Check for force field