From 55500b87d644dffb45cd704ab3b42b278f57fe8c Mon Sep 17 00:00:00 2001 From: Adam Olsen Date: Sat, 13 Oct 2001 23:02:22 +0000 Subject: [PATCH] - change all usages of MSG_BROADCAST to MSG_MULTICAST, since that's what quakeworld uses anyway - when changing a player's team with the admin commands, change the player's color, not the admin's color :) --- admin.qc | 2 +- boss.qc | 20 +++---- custom.qc | 50 +++++++++--------- defs.qh | 12 ++--- demoman.qc | 40 +++++++------- demon.qc | 10 ++-- engineer.qc | 70 ++++++++++++------------ field.qc | 30 +++++------ haxxx.qc | 10 ++-- jobs.qc | 10 ++-- medic.qc | 10 ++-- misc.qc | 20 +++---- often.qc | 30 +++++------ pyro.qc | 20 +++---- sbitems.qc | 20 +++---- scout.qc | 30 +++++------ security.qc | 10 ++-- sentry.qc | 20 +++---- shambler.qc | 46 ++++++++-------- spy.qc | 30 +++++------ teleport.qc | 10 ++-- tesla.qc | 60 ++++++++++----------- tfort.qc | 10 ++-- tfortmap.qc | 10 ++-- triggers.qc | 10 ++-- weapons.qc | 150 ++++++++++++++++++++++++++-------------------------- 26 files changed, 368 insertions(+), 372 deletions(-) diff --git a/admin.qc b/admin.qc index 8cad9ec..f5c52cc 100644 --- a/admin.qc +++ b/admin.qc @@ -376,7 +376,7 @@ void() Admin_Cmd = // Set the player's color tc = TeamGetColor (targetteam) - 1; tc2 = TeamGetNiceColor (targetteam); - SetPlayerColor (self, tc, tc2); + SetPlayerColor (self.admin_kick, tc, tc2); self.admin_kick.team_no = targetteam; makeImmune(self.admin_kick,time+15); diff --git a/boss.qc b/boss.qc index e386b76..50c5702 100644 --- a/boss.qc +++ b/boss.qc @@ -181,11 +181,11 @@ void() boss_death8 = [$death8, boss_death9] {}; void() boss_death9 = [$death9, boss_death10] { sound (self, CHAN_BODY, "boss1/out1.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LAVASPLASH); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LAVASPLASH); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); }; void() boss_death10 = [$death9, boss_death10] @@ -252,11 +252,11 @@ void() boss_awake = self.enemy = activator; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LAVASPLASH); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LAVASPLASH); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); self.yaw_speed = 20; boss_rise1 (); diff --git a/custom.qc b/custom.qc index 496b8ba..c67bda8 100644 --- a/custom.qc +++ b/custom.qc @@ -961,11 +961,11 @@ void() fragspike_touch = FieldExplosion(other,self.origin,self); else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_SUPERSPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_SUPERSPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); } @@ -991,11 +991,11 @@ void() FragSpikeThink = self.nextthink = time + 0.5 + random(); } else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_SUPERSPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_SUPERSPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); } @@ -1021,11 +1021,11 @@ void() FragGrenadeExplode = deathmsg = DMSG_GREN_HAND; T_RadiusDamage (self, self.owner, 80, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); shraps = rint(6 * random()) + 6; //Pieces of shrapmetal; @@ -1067,11 +1067,11 @@ void() FragGrenadeExplode = newmis.heat = 5; shraps = shraps - 1; } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -1165,11 +1165,11 @@ void() KracGrenadeExplode = te = te.chain; } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/defs.qh b/defs.qh index cdd6305..42a055f 100644 --- a/defs.qh +++ b/defs.qh @@ -180,16 +180,12 @@ #define EF_DIMLIGHT 8 -// messages -// Since BROADCAST is never used in QW 1.5, and MULTICAST is used instead, -// just define BROADCAST as MULTICAST for QW 1.5 - -#define MSG_MULTICAST 4 -#define MSG_BROADCAST MSG_MULTICAST - +// network writes. argument to Write* #define MSG_ONE 1 // reliable to one (msg_entity) #define MSG_ALL 2 // reliable to all #define MSG_INIT 3 // write to the init string +#define MSG_MULTICAST 4 // only those in pvs/phs. see + // multicast sets below // message levels @@ -198,7 +194,7 @@ #define PRINT_HIGH 2.0 // critical messages #define PRINT_CHAT 3.0 // also goes to chat console -// multicast sets +// multicast sets. argument to multicast #define MULTICAST_ALL 0 // every client #define MULTICAST_PHS 1 // within hearing #define MULTICAST_PVS 2 // within sight diff --git a/demoman.qc b/demoman.qc index 87a15d6..d325218 100644 --- a/demoman.qc +++ b/demoman.qc @@ -73,11 +73,11 @@ void() MirvGrenadeExplode = deathmsg = DMSG_GREN_MIRV; T_RadiusDamage (self, self.owner, 100, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); self.solid = SOLID_NOT; @@ -351,18 +351,18 @@ void() TeamFortress_DetpackExplode = sound(self, CHAN_MISC, "weapons/detpack.wav", 1, ATTN_NONE); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LAVASPLASH); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LAVASPLASH); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); //- OfN - Should a detpack make the same explosion a gren does? dont think so... @@ -381,11 +381,11 @@ void() TeamFortress_DetpackExplode = if (vis2orig(self.origin,rexp)) { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, rexp_x); - WriteCoord (MSG_BROADCAST, rexp_y); - WriteCoord (MSG_BROADCAST, rexp_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, rexp_x); + WriteCoord (MSG_MULTICAST, rexp_y); + WriteCoord (MSG_MULTICAST, rexp_z); multicast (rexp, MULTICAST_PHS); } loopc = loopc + 1; diff --git a/demon.qc b/demon.qc index c9a4329..e191ebe 100644 --- a/demon.qc +++ b/demon.qc @@ -577,11 +577,11 @@ void() demon_fire_touch = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/engineer.qc b/engineer.qc index 28d1f16..8dff18b 100644 --- a/engineer.qc +++ b/engineer.qc @@ -114,11 +114,11 @@ void() LaserBolt_Touch = self.nextthink = time + 0.1; self.think = LaserBolt_Think; return; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_SPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_SPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); } @@ -191,11 +191,11 @@ void() EMPExplode = deathmsg = DMSG_GREN_EMP_AMMO; T_RadiusDamage (self, self.enemy, expsize, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); // Respawn @@ -222,11 +222,11 @@ void() EMPGrenadeExplode = //CH Slice gave idea of an emp gren getting rated based on blast so i added.. total_exp = 0; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_TAREXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_TAREXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); // Find all ammo in the area @@ -288,11 +288,11 @@ void() EMPGrenadeExplode = te.think = SUB_Remove; te.nextthink = time + 0.1; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, te.origin_x); - WriteCoord (MSG_BROADCAST, te.origin_y); - WriteCoord (MSG_BROADCAST, te.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, te.origin_x); + WriteCoord (MSG_MULTICAST, te.origin_y); + WriteCoord (MSG_MULTICAST, te.origin_z); multicast (te.origin, MULTICAST_PHS); } } @@ -332,11 +332,11 @@ void() EMPGrenadeExplode = W_SetCurrentAmmo(); self = oldself; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, te.origin_x); - WriteCoord (MSG_BROADCAST, te.origin_y); - WriteCoord (MSG_BROADCAST, te.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, te.origin_x); + WriteCoord (MSG_MULTICAST, te.origin_y); + WriteCoord (MSG_MULTICAST, te.origin_z); multicast (te.origin, MULTICAST_PHS); } } @@ -346,11 +346,11 @@ void() EMPGrenadeExplode = te.nextthink = time + 0.1; } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, te.origin_x); - WriteCoord (MSG_BROADCAST, te.origin_y); - WriteCoord (MSG_BROADCAST, te.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, te.origin_x); + WriteCoord (MSG_MULTICAST, te.origin_y); + WriteCoord (MSG_MULTICAST, te.origin_z); multicast (te.origin, MULTICAST_PHS); } } @@ -1162,11 +1162,11 @@ void() Dispenser_Explode = { T_RadiusDamage(self.demon_one, self.demon_one, self.has_holo, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.demon_one.origin_x); - WriteCoord (MSG_BROADCAST, self.demon_one.origin_y); - WriteCoord (MSG_BROADCAST, self.demon_one.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.demon_one.origin_x); + WriteCoord (MSG_MULTICAST, self.demon_one.origin_y); + WriteCoord (MSG_MULTICAST, self.demon_one.origin_z); multicast (self.demon_one.origin, MULTICAST_PHS); dremove(self.demon_one); diff --git a/field.qc b/field.qc index e4310a9..f0e2a36 100644 --- a/field.qc +++ b/field.qc @@ -804,18 +804,18 @@ void(entity tfield) Field_MakeVisual = f = tfield.origin + (tfield.forcefield_offset * 0.5 * (random() * 2 - 1)); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); if (random() > 0.5) - WriteByte (MSG_BROADCAST, TE_LIGHTNING2); + WriteByte (MSG_MULTICAST, TE_LIGHTNING2); else - WriteByte (MSG_BROADCAST, TE_LIGHTNING1); - WriteEntity (MSG_BROADCAST, tfield); - WriteCoord (MSG_BROADCAST, f_x); - WriteCoord (MSG_BROADCAST, f_y); - WriteCoord (MSG_BROADCAST, tfield.origin_z + tfield.mins_z); - WriteCoord (MSG_BROADCAST, f_x); - WriteCoord (MSG_BROADCAST, f_y); - WriteCoord (MSG_BROADCAST, tfield.origin_z + tfield.maxs_z); + WriteByte (MSG_MULTICAST, TE_LIGHTNING1); + WriteEntity (MSG_MULTICAST, tfield); + WriteCoord (MSG_MULTICAST, f_x); + WriteCoord (MSG_MULTICAST, f_y); + WriteCoord (MSG_MULTICAST, tfield.origin_z + tfield.mins_z); + WriteCoord (MSG_MULTICAST, f_x); + WriteCoord (MSG_MULTICAST, f_y); + WriteCoord (MSG_MULTICAST, tfield.origin_z + tfield.maxs_z); } }; @@ -1082,11 +1082,11 @@ void() FieldGen_Die = self.real_owner.has_fieldgen = self.real_owner.has_fieldgen - 1; if (self.real_owner.has_fieldgen < 0) self.real_owner.has_fieldgen = 0; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); // check if field should be removed.. diff --git a/haxxx.qc b/haxxx.qc index bde1b69..e2695c8 100644 --- a/haxxx.qc +++ b/haxxx.qc @@ -1194,12 +1194,12 @@ void() SBHackDotTimerThink = else if (self.martyr_enemy.classname == "building_fieldgen") org_z = org_z + 32; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } diff --git a/jobs.qc b/jobs.qc index 6abd176..2225d6a 100644 --- a/jobs.qc +++ b/jobs.qc @@ -732,11 +732,11 @@ void() GuerillaExplode = if (self.owner.num_mines < 0) self.owner.num_mines = 0; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); diff --git a/medic.qc b/medic.qc index 66fd33d..53a56f3 100644 --- a/medic.qc +++ b/medic.qc @@ -110,11 +110,11 @@ void() BioGrenadeExplode = dier = dier.chain; } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/misc.qc b/misc.qc index d995e2b..2383735 100644 --- a/misc.qc +++ b/misc.qc @@ -273,11 +273,11 @@ void() barrel_explode = // did say self.owner T_RadiusDamage (self, self, 160, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z+32); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z+32); multicast (self.origin, MULTICAST_PHS); remove (self); }; @@ -390,12 +390,12 @@ void() Laser_Touch = } else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 5); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } diff --git a/often.qc b/often.qc index 5bff6a5..64c9619 100644 --- a/often.qc +++ b/often.qc @@ -589,12 +589,12 @@ void() FlareGrenadeExplode = local vector org; org=self.origin; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); self.effects = self.effects | EF_DIMLIGHT; @@ -777,11 +777,11 @@ void() ExpBodyThink = //deathmsg = DMSG_EXPBODY; TF_T_Damage(self.owner, self.owner, self.owner.martyr_enemy, self.owner.health + 60, TF_TD_IGNOREARMOUR, TF_TD_OTHER);// TF_TD_OTHER); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); deathmsg = DMSG_EXPBODY; @@ -796,11 +796,11 @@ void() ExpBodyThink = void(vector where) spawnFOG = { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_TELEPORT); - WriteCoord (MSG_BROADCAST, where_x); - WriteCoord (MSG_BROADCAST, where_y); - WriteCoord (MSG_BROADCAST, where_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_TELEPORT); + WriteCoord (MSG_MULTICAST, where_x); + WriteCoord (MSG_MULTICAST, where_y); + WriteCoord (MSG_MULTICAST, where_z); multicast (where, MULTICAST_PHS); }; diff --git a/pyro.qc b/pyro.qc index f1c8e5e..b608ca4 100644 --- a/pyro.qc +++ b/pyro.qc @@ -259,11 +259,11 @@ void() NapalmGrenadeExplode = head = head.chain; } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); @@ -844,11 +844,11 @@ void() T_IncendiaryTouch = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it diff --git a/sbitems.qc b/sbitems.qc index 25be8d7..06dc21d 100644 --- a/sbitems.qc +++ b/sbitems.qc @@ -530,11 +530,11 @@ void() MotionSensorDie = // ThrowGib("progs/tgib2.mdl", -70); // ThrowGib("progs/tgib3.mdl", -70); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -555,11 +555,11 @@ void() AntiGravGrenadeExplode = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/scout.qc b/scout.qc index 697378c..af8a268 100644 --- a/scout.qc +++ b/scout.qc @@ -98,11 +98,11 @@ void() FlashGrenadeExplode = self.effects = self.effects | EF_BRIGHTLIGHT; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_TAREXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_TAREXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); // Find all people in area @@ -188,11 +188,11 @@ void() ConcussionGrenadeExplode = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -874,11 +874,11 @@ void() CaltropGrenadeExplode = /* deathmsg = DMSG_GREN_CALTROP; T_RadiusDamage (self, self.owner, 50, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); self.solid = SOLID_NOT; diff --git a/security.qc b/security.qc index e0d3544..df97bd4 100644 --- a/security.qc +++ b/security.qc @@ -184,11 +184,11 @@ void() Security_Camera_Die = // ThrowGib("progs/tgib2.mdl", -70); // ThrowGib("progs/tgib3.mdl", -70); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); //SwitchFromCamera(); diff --git a/sentry.qc b/sentry.qc index 1b5de91..0e517cf 100644 --- a/sentry.qc +++ b/sentry.qc @@ -490,11 +490,11 @@ void() Sentry_Die = dremove(self.trigger_field); } - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -640,11 +640,11 @@ float() Sentry_Fire = local float damg; damg = random() * 50 + 120; T_RadiusDamage(self, self, damg, world); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); if (self.tf_items & NIT_TURRET) self.origin_z = self.origin_z + 40; return FALSE; diff --git a/shambler.qc b/shambler.qc index 2f7ad89..f0766a8 100644 --- a/shambler.qc +++ b/shambler.qc @@ -278,15 +278,15 @@ void() CastLightning = FieldExplosion(trace_ent,trace_endpos,trace_ent); PutFieldWork(trace_ent); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING1); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); - WriteCoord (MSG_BROADCAST, trace_endpos_x); - WriteCoord (MSG_BROADCAST, trace_endpos_y); - WriteCoord (MSG_BROADCAST, trace_endpos_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING1); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); + WriteCoord (MSG_MULTICAST, trace_endpos_x); + WriteCoord (MSG_MULTICAST, trace_endpos_y); + WriteCoord (MSG_MULTICAST, trace_endpos_z); multicast (org, MULTICAST_PHS); return; @@ -295,15 +295,15 @@ void() CastLightning = traceline (org, self.origin + dir*3000, TRUE, self); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING1); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); - WriteCoord (MSG_BROADCAST, trace_endpos_x); - WriteCoord (MSG_BROADCAST, trace_endpos_y); - WriteCoord (MSG_BROADCAST, trace_endpos_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING1); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); + WriteCoord (MSG_MULTICAST, trace_endpos_x); + WriteCoord (MSG_MULTICAST, trace_endpos_y); + WriteCoord (MSG_MULTICAST, trace_endpos_z); ldmg = 5 + self.has_tesla * 5; if (self.has_tesla == 5) @@ -621,11 +621,11 @@ void(float side) ShamFireball = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/spy.qc b/spy.qc index 56136fa..09b107e 100644 --- a/spy.qc +++ b/spy.qc @@ -779,11 +779,11 @@ void() GasGrenadeMakeGas = // Do the cloud if (self.heat == 1) { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_TAREXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_TAREXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PVS); return; } @@ -792,11 +792,11 @@ void() GasGrenadeMakeGas = self.weapon = self.weapon + 1; if (self.weapon == 1) { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LAVASPLASH); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z - 24); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LAVASPLASH); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z - 24); multicast (self.origin, MULTICAST_PVS); } else if (self.weapon == 2) @@ -1015,11 +1015,11 @@ void() T_TranqDartTouch = FieldExplosion(other,self.origin,self); else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_SPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_SPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PVS); } } diff --git a/teleport.qc b/teleport.qc index 4b581a6..7f42f4a 100644 --- a/teleport.qc +++ b/teleport.qc @@ -208,11 +208,11 @@ void() Teleporter_Die = // ThrowGib("progs/tgib2.mdl", -70); // ThrowGib("progs/tgib3.mdl", -70); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/tesla.qc b/tesla.qc index 4fd1a09..dc0b5a5 100644 --- a/tesla.qc +++ b/tesla.qc @@ -385,11 +385,11 @@ void() Tesla_Die = ThrowGib("progs/tesgib4.mdl", self.skin); ThrowGib("progs/tesgib4.mdl", self.skin); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -516,11 +516,11 @@ float() Tesla_Fire = local float damg; damg = random() * 100 + 200 * self.ammo_nails; // the bigger they come, the harder they fall deathmsg = DMSG_TESLA; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); T_RadiusDamage(self, self, damg, world); if (self.tf_items & NIT_TURRET) self.origin_z = self.origin_z + 40; // 40 //else self.origin_z = self.origin_z - 24; @@ -537,18 +537,18 @@ float() Tesla_Fire = if (trace_ent.classname == "force_field") { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING2); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING2); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); if (self.tf_items & NIT_TURRET) - WriteCoord (MSG_BROADCAST, self.origin_z + 10); + WriteCoord (MSG_MULTICAST, self.origin_z + 10); else - WriteCoord (MSG_BROADCAST, self.origin_z + 30); - WriteCoord (MSG_BROADCAST, trace_endpos_x); - WriteCoord (MSG_BROADCAST, trace_endpos_y); - WriteCoord (MSG_BROADCAST, trace_endpos_z); + WriteCoord (MSG_MULTICAST, self.origin_z + 30); + WriteCoord (MSG_MULTICAST, trace_endpos_x); + WriteCoord (MSG_MULTICAST, trace_endpos_y); + WriteCoord (MSG_MULTICAST, trace_endpos_z); multicast (self.origin, MULTICAST_PHS); shoulddmg = FALSE; @@ -558,18 +558,18 @@ float() Tesla_Fire = } else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING2); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING2); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); if (self.tf_items & NIT_TURRET) - WriteCoord (MSG_BROADCAST, self.origin_z + 10); + WriteCoord (MSG_MULTICAST, self.origin_z + 10); else - WriteCoord (MSG_BROADCAST, self.origin_z + 30); - WriteCoord (MSG_BROADCAST, self.enemy.origin_x); - WriteCoord (MSG_BROADCAST, self.enemy.origin_y); - WriteCoord (MSG_BROADCAST, self.enemy.origin_z); + WriteCoord (MSG_MULTICAST, self.origin_z + 30); + WriteCoord (MSG_MULTICAST, self.enemy.origin_x); + WriteCoord (MSG_MULTICAST, self.enemy.origin_y); + WriteCoord (MSG_MULTICAST, self.enemy.origin_z); multicast (self.origin, MULTICAST_PHS); } diff --git a/tfort.qc b/tfort.qc index c729f28..3ebca22 100644 --- a/tfort.qc +++ b/tfort.qc @@ -3543,11 +3543,11 @@ void() NormalGrenadeExplode = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; diff --git a/tfortmap.qc b/tfortmap.qc index 21da8cd..b61aacb 100644 --- a/tfortmap.qc +++ b/tfortmap.qc @@ -2472,11 +2472,11 @@ void(entity Goal, entity AP, float addb) DoResults = //CH spawn explosions if so needed if (Goal.goal_effects & TFGE_CAUSE_EXPLOSION) { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); // BecomeExplosion(); } diff --git a/triggers.qc b/triggers.qc index 9546e25..a67b608 100644 --- a/triggers.qc +++ b/triggers.qc @@ -354,11 +354,11 @@ void(vector org) spawn_tfog = s.nextthink = time + 0.2; s.think = play_teleport; - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_TELEPORT); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_TELEPORT); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PHS); }; diff --git a/weapons.qc b/weapons.qc index 9cfb972..68caa05 100644 --- a/weapons.qc +++ b/weapons.qc @@ -351,12 +351,12 @@ void() W_FireAxe = else { // hit wall sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } }; @@ -427,12 +427,12 @@ void() W_FireSpanner = else { sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } } @@ -516,12 +516,12 @@ void() W_FireSpanner = self.ammo_cells = self.ammo_cells - healam; sound(trace_ent, CHAN_WEAPON, "items/r_item1.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); W_SetCurrentAmmo (); @@ -544,12 +544,12 @@ void() W_FireSpanner = else // hit wall { sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } }; @@ -874,12 +874,12 @@ void(float inAuto) W_FireMedikit = if (inAuto) return; //Don't click for automedic // hit wall sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } }; @@ -969,12 +969,12 @@ void() W_FireBioweapon = else { // hit wall sound (self, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_GUNSHOT); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_GUNSHOT); WriteByte (MSG_MULTICAST, 3); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); multicast (org, MULTICAST_PVS); } }; @@ -1632,11 +1632,11 @@ void() T_MissileTouch = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it @@ -1948,15 +1948,15 @@ void() W_FireLightning = FieldExplosion(trace_ent,trace_endpos,trace_ent); PutFieldWork(trace_ent); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING2); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); - WriteCoord (MSG_BROADCAST, trace_endpos_x); - WriteCoord (MSG_BROADCAST, trace_endpos_y); - WriteCoord (MSG_BROADCAST, trace_endpos_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING2); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); + WriteCoord (MSG_MULTICAST, trace_endpos_x); + WriteCoord (MSG_MULTICAST, trace_endpos_y); + WriteCoord (MSG_MULTICAST, trace_endpos_z); multicast (org, MULTICAST_PHS); return; @@ -1965,15 +1965,15 @@ void() W_FireLightning = traceline (org, org + v_forward*600, TRUE, self); - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_LIGHTNING2); - WriteEntity (MSG_BROADCAST, self); - WriteCoord (MSG_BROADCAST, org_x); - WriteCoord (MSG_BROADCAST, org_y); - WriteCoord (MSG_BROADCAST, org_z); - WriteCoord (MSG_BROADCAST, trace_endpos_x); - WriteCoord (MSG_BROADCAST, trace_endpos_y); - WriteCoord (MSG_BROADCAST, trace_endpos_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_LIGHTNING2); + WriteEntity (MSG_MULTICAST, self); + WriteCoord (MSG_MULTICAST, org_x); + WriteCoord (MSG_MULTICAST, org_y); + WriteCoord (MSG_MULTICAST, org_z); + WriteCoord (MSG_MULTICAST, trace_endpos_x); + WriteCoord (MSG_MULTICAST, trace_endpos_y); + WriteCoord (MSG_MULTICAST, trace_endpos_z); multicast (org, MULTICAST_PHS); //WK Either way of firing the gun, we handle it here @@ -2087,11 +2087,11 @@ void() GrenadeExplode = CamProjectileLockOff(); #endif - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); dremove(self); }; @@ -2262,11 +2262,11 @@ void() superspike_touch = FieldExplosion(other,self.origin,self); else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_SUPERSPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_SUPERSPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); } } @@ -2383,16 +2383,16 @@ void() spike_touch = FieldExplosion(other,self.origin,self); else { - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); if (self.classname == "wizspike") - WriteByte (MSG_BROADCAST, TE_WIZSPIKE); + WriteByte (MSG_MULTICAST, TE_WIZSPIKE); else if (self.classname == "knightspike") - WriteByte (MSG_BROADCAST, TE_KNIGHTSPIKE); + WriteByte (MSG_MULTICAST, TE_KNIGHTSPIKE); else - WriteByte (MSG_BROADCAST, TE_SPIKE); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, TE_SPIKE); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); } } @@ -4792,11 +4792,11 @@ void() T_DaedalusTouch = - WriteByte (MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte (MSG_BROADCAST, TE_EXPLOSION); - WriteCoord (MSG_BROADCAST, self.origin_x); - WriteCoord (MSG_BROADCAST, self.origin_y); - WriteCoord (MSG_BROADCAST, self.origin_z); + WriteByte (MSG_MULTICAST, SVC_TEMPENTITY); + WriteByte (MSG_MULTICAST, TE_EXPLOSION); + WriteCoord (MSG_MULTICAST, self.origin_x); + WriteCoord (MSG_MULTICAST, self.origin_y); + WriteCoord (MSG_MULTICAST, self.origin_z); multicast (self.origin, MULTICAST_PHS); if (other.classname == "force_field") //- OfN - Makes field explosion b4 removing it