summaryrefslogtreecommitdiff
path: root/src/cl_tent.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cl_tent.c')
-rw-r--r--src/cl_tent.c878
1 files changed, 427 insertions, 451 deletions
diff --git a/src/cl_tent.c b/src/cl_tent.c
index 6f3db5e..cdde872 100644
--- a/src/cl_tent.c
+++ b/src/cl_tent.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "cl_local.h"
-void MakeNormalVectors (vec3_t forward, vec3_t right, vec3_t up);
+void MakeNormalVectors(vec3_t forward, vec3_t right, vec3_t up);
qhandle_t cl_sfx_ric1;
qhandle_t cl_sfx_ric2;
@@ -64,81 +64,80 @@ qhandle_t cl_mod_explo4_big;
CL_RegisterTEntSounds
=================
*/
-void CL_RegisterTEntSounds (void)
+void CL_RegisterTEntSounds(void)
{
int i;
char name[MAX_QPATH];
- cl_sfx_ric1 = S_RegisterSound ("world/ric1.wav");
- cl_sfx_ric2 = S_RegisterSound ("world/ric2.wav");
- cl_sfx_ric3 = S_RegisterSound ("world/ric3.wav");
+ cl_sfx_ric1 = S_RegisterSound("world/ric1.wav");
+ cl_sfx_ric2 = S_RegisterSound("world/ric2.wav");
+ cl_sfx_ric3 = S_RegisterSound("world/ric3.wav");
cl_sfx_lashit = S_RegisterSound("weapons/lashit.wav");
- cl_sfx_spark5 = S_RegisterSound ("world/spark5.wav");
- cl_sfx_spark6 = S_RegisterSound ("world/spark6.wav");
- cl_sfx_spark7 = S_RegisterSound ("world/spark7.wav");
- cl_sfx_railg = S_RegisterSound ("weapons/railgf1a.wav");
- cl_sfx_rockexp = S_RegisterSound ("weapons/rocklx1a.wav");
- cl_sfx_grenexp = S_RegisterSound ("weapons/grenlx1a.wav");
- cl_sfx_watrexp = S_RegisterSound ("weapons/xpld_wat.wav");
+ cl_sfx_spark5 = S_RegisterSound("world/spark5.wav");
+ cl_sfx_spark6 = S_RegisterSound("world/spark6.wav");
+ cl_sfx_spark7 = S_RegisterSound("world/spark7.wav");
+ cl_sfx_railg = S_RegisterSound("weapons/railgf1a.wav");
+ cl_sfx_rockexp = S_RegisterSound("weapons/rocklx1a.wav");
+ cl_sfx_grenexp = S_RegisterSound("weapons/grenlx1a.wav");
+ cl_sfx_watrexp = S_RegisterSound("weapons/xpld_wat.wav");
// RAFAEL
// cl_sfx_plasexp = S_RegisterSound ("weapons/plasexpl.wav");
- S_RegisterSound ("player/land1.wav");
+ S_RegisterSound("player/land1.wav");
- S_RegisterSound ("player/fall2.wav");
- S_RegisterSound ("player/fall1.wav");
+ S_RegisterSound("player/fall2.wav");
+ S_RegisterSound("player/fall1.wav");
- for (i=0 ; i<4 ; i++)
- {
- Q_snprintf (name, sizeof(name), "player/step%i.wav", i+1);
- cl_sfx_footsteps[i] = S_RegisterSound (name);
+ for (i = 0; i < 4; i++) {
+ Q_snprintf(name, sizeof(name), "player/step%i.wav", i + 1);
+ cl_sfx_footsteps[i] = S_RegisterSound(name);
}
//PGM
- cl_sfx_lightning = S_RegisterSound ("weapons/tesla.wav");
- cl_sfx_disrexp = S_RegisterSound ("weapons/disrupthit.wav");
+ cl_sfx_lightning = S_RegisterSound("weapons/tesla.wav");
+ cl_sfx_disrexp = S_RegisterSound("weapons/disrupthit.wav");
//PGM
-}
+}
/*
=================
CL_RegisterTEntModels
=================
*/
-void CL_RegisterTEntModels (void)
+void CL_RegisterTEntModels(void)
{
- cl_mod_explode = R_RegisterModel ("models/objects/explode/tris.md2");
- cl_mod_smoke = R_RegisterModel ("models/objects/smoke/tris.md2");
- cl_mod_flash = R_RegisterModel ("models/objects/flash/tris.md2");
- cl_mod_parasite_segment = R_RegisterModel ("models/monsters/parasite/segment/tris.md2");
- cl_mod_grapple_cable = R_RegisterModel ("models/ctf/segment/tris.md2");
- cl_mod_parasite_tip = R_RegisterModel ("models/monsters/parasite/tip/tris.md2");
- cl_mod_explo4 = R_RegisterModel ("models/objects/r_explode/tris.md2");
- cl_mod_bfg_explo = R_RegisterModel ("sprites/s_bfg2.sp2");
- cl_mod_powerscreen = R_RegisterModel ("models/items/armor/effect/tris.md2");
-
- R_RegisterModel ("models/objects/laser/tris.md2");
- R_RegisterModel ("models/objects/grenade2/tris.md2");
- R_RegisterModel ("models/weapons/v_machn/tris.md2");
- R_RegisterModel ("models/weapons/v_handgr/tris.md2");
- R_RegisterModel ("models/weapons/v_shotg2/tris.md2");
- R_RegisterModel ("models/objects/gibs/bone/tris.md2");
- R_RegisterModel ("models/objects/gibs/sm_meat/tris.md2");
- R_RegisterModel ("models/objects/gibs/bone2/tris.md2");
+ cl_mod_explode = R_RegisterModel("models/objects/explode/tris.md2");
+ cl_mod_smoke = R_RegisterModel("models/objects/smoke/tris.md2");
+ cl_mod_flash = R_RegisterModel("models/objects/flash/tris.md2");
+ cl_mod_parasite_segment = R_RegisterModel("models/monsters/parasite/segment/tris.md2");
+ cl_mod_grapple_cable = R_RegisterModel("models/ctf/segment/tris.md2");
+ cl_mod_parasite_tip = R_RegisterModel("models/monsters/parasite/tip/tris.md2");
+ cl_mod_explo4 = R_RegisterModel("models/objects/r_explode/tris.md2");
+ cl_mod_bfg_explo = R_RegisterModel("sprites/s_bfg2.sp2");
+ cl_mod_powerscreen = R_RegisterModel("models/items/armor/effect/tris.md2");
+
+ R_RegisterModel("models/objects/laser/tris.md2");
+ R_RegisterModel("models/objects/grenade2/tris.md2");
+ R_RegisterModel("models/weapons/v_machn/tris.md2");
+ R_RegisterModel("models/weapons/v_handgr/tris.md2");
+ R_RegisterModel("models/weapons/v_shotg2/tris.md2");
+ R_RegisterModel("models/objects/gibs/bone/tris.md2");
+ R_RegisterModel("models/objects/gibs/sm_meat/tris.md2");
+ R_RegisterModel("models/objects/gibs/bone2/tris.md2");
// RAFAEL
// R_RegisterModel ("models/objects/blaser/tris.md2");
- R_RegisterPic ("w_machinegun");
- R_RegisterPic ("a_bullets");
- R_RegisterPic ("i_health");
- R_RegisterPic ("a_grenades");
+ R_RegisterPic("w_machinegun");
+ R_RegisterPic("a_bullets");
+ R_RegisterPic("i_health");
+ R_RegisterPic("a_grenades");
//ROGUE
- cl_mod_explo4_big = R_RegisterModel ("models/objects/r_explode2/tris.md2");
- cl_mod_lightning = R_RegisterModel ("models/proj/lightning/tris.md2");
- cl_mod_heatbeam = R_RegisterModel ("models/proj/beam/tris.md2");
- cl_mod_monster_heatbeam = R_RegisterModel ("models/proj/widowbeam/tris.md2");
+ cl_mod_explo4_big = R_RegisterModel("models/objects/r_explode2/tris.md2");
+ cl_mod_lightning = R_RegisterModel("models/proj/lightning/tris.md2");
+ cl_mod_heatbeam = R_RegisterModel("models/proj/beam/tris.md2");
+ cl_mod_monster_heatbeam = R_RegisterModel("models/proj/widowbeam/tris.md2");
//ROGUE
-}
+}
/*
==============================================================
@@ -172,18 +171,20 @@ typedef struct {
static explosion_t cl_explosions[MAX_EXPLOSIONS];
-static void clear_explosions( void ) {
- memset (cl_explosions, 0, sizeof(cl_explosions));
+static void clear_explosions(void)
+{
+ memset(cl_explosions, 0, sizeof(cl_explosions));
}
-static explosion_t *alloc_explosion( void ) {
+static explosion_t *alloc_explosion(void)
+{
explosion_t *e, *oldest;
int i;
int time;
-
- for( i = 0, e = cl_explosions; i < MAX_EXPLOSIONS; i++, e++ ) {
+
+ for (i = 0, e = cl_explosions; i < MAX_EXPLOSIONS; i++, e++) {
if (e->type == ex_free) {
- memset (e, 0, sizeof (*e));
+ memset(e, 0, sizeof(*e));
return e;
}
}
@@ -191,26 +192,27 @@ static explosion_t *alloc_explosion( void ) {
time = cl.time;
oldest = cl_explosions;
- for(i = 0, e = cl_explosions; i < MAX_EXPLOSIONS; i++, e++ ) {
- if ( e->start < time) {
+ for (i = 0, e = cl_explosions; i < MAX_EXPLOSIONS; i++, e++) {
+ if (e->start < time) {
time = e->start;
oldest = e;
}
}
- memset (oldest, 0, sizeof (*oldest));
+ memset(oldest, 0, sizeof(*oldest));
return oldest;
}
-static explosion_t *plain_explosion( void ) {
+static explosion_t *plain_explosion(void)
+{
explosion_t *ex;
- ex = alloc_explosion ();
- VectorCopy (te.pos1, ex->ent.origin);
+ ex = alloc_explosion();
+ VectorCopy(te.pos1, ex->ent.origin);
ex->type = ex_poly;
ex->ent.flags = RF_FULLBRIGHT;
ex->start = cl.servertime - CL_FRAMETIME;
ex->light = 350;
- VectorSet( ex->lightcolor, 1.0, 0.5, 0.5 );
+ VectorSet(ex->lightcolor, 1.0, 0.5, 0.5);
ex->ent.angles[1] = rand() % 360;
ex->ent.model = cl_mod_explo4;
if (frand() < 0.5)
@@ -229,16 +231,16 @@ void CL_SmokeAndFlash(vec3_t origin)
{
explosion_t *ex;
- ex = alloc_explosion ();
- VectorCopy (origin, ex->ent.origin);
+ ex = alloc_explosion();
+ VectorCopy(origin, ex->ent.origin);
ex->type = ex_misc;
ex->frames = 4;
ex->ent.flags = RF_TRANSLUCENT;
ex->start = cl.servertime - CL_FRAMETIME;
ex->ent.model = cl_mod_smoke;
- ex = alloc_explosion ();
- VectorCopy (origin, ex->ent.origin);
+ ex = alloc_explosion();
+ VectorCopy(origin, ex->ent.origin);
ex->type = ex_flash;
ex->ent.flags = RF_FULLBRIGHT;
ex->frames = 2;
@@ -251,7 +253,7 @@ void CL_SmokeAndFlash(vec3_t origin)
CL_AddExplosions
=================
*/
-static void CL_AddExplosions (void)
+static void CL_AddExplosions(void)
{
entity_t *ent;
int i;
@@ -259,29 +261,28 @@ static void CL_AddExplosions (void)
float frac;
int f;
- memset (&ent, 0, sizeof(ent));
+ memset(&ent, 0, sizeof(ent));
- for (i=0, ex=cl_explosions ; i< MAX_EXPLOSIONS ; i++, ex++)
- {
+ for (i = 0, ex = cl_explosions; i < MAX_EXPLOSIONS; i++, ex++) {
if (ex->type == ex_free)
continue;
- frac = (cl.time - ex->start)*BASE_1_FRAMETIME;
+ frac = (cl.time - ex->start) * BASE_1_FRAMETIME;
f = floor(frac);
ent = &ex->ent;
switch (ex->type) {
case ex_mflash:
- if (f >= ex->frames-1)
+ if (f >= ex->frames - 1)
ex->type = ex_free;
break;
case ex_misc:
case ex_light:
- if (f >= ex->frames-1) {
+ if (f >= ex->frames - 1) {
ex->type = ex_free;
break;
}
- ent->alpha = 1.0 - frac/(ex->frames-1);
+ ent->alpha = 1.0 - frac / (ex->frames - 1);
break;
case ex_flash:
if (f >= 1) {
@@ -291,15 +292,15 @@ static void CL_AddExplosions (void)
ent->alpha = 1.0;
break;
case ex_poly:
- if (f >= ex->frames-1) {
+ if (f >= ex->frames - 1) {
ex->type = ex_free;
break;
}
- ent->alpha = (16.0 - (float)f)/16.0;
+ ent->alpha = (16.0 - (float)f) / 16.0;
if (f < 10) {
- ent->skinnum = (f>>1);
+ ent->skinnum = (f >> 1);
if (ent->skinnum < 0)
ent->skinnum = 0;
} else {
@@ -311,12 +312,12 @@ static void CL_AddExplosions (void)
}
break;
case ex_poly2:
- if (f >= ex->frames-1) {
+ if (f >= ex->frames - 1) {
ex->type = ex_free;
break;
}
- ent->alpha = (5.0 - (float)f)/5.0;
+ ent->alpha = (5.0 - (float)f) / 5.0;
ent->skinnum = 0;
ent->flags |= RF_TRANSLUCENT;
break;
@@ -327,12 +328,12 @@ static void CL_AddExplosions (void)
if (ex->type == ex_free)
continue;
if (ex->light) {
- V_AddLight (ent->origin, ex->light*ent->alpha,
- ex->lightcolor[0], ex->lightcolor[1], ex->lightcolor[2]);
+ V_AddLight(ent->origin, ex->light * ent->alpha,
+ ex->lightcolor[0], ex->lightcolor[1], ex->lightcolor[2]);
}
- if( ex->type != ex_light ) {
- VectorCopy (ent->origin, ent->oldorigin);
+ if (ex->type != ex_light) {
+ VectorCopy(ent->origin, ent->oldorigin);
if (f < 0)
f = 0;
@@ -340,7 +341,7 @@ static void CL_AddExplosions (void)
ent->oldframe = ex->baseframe + f;
ent->backlerp = 1.0 - (frac - f);
- V_AddEntity (ent);
+ V_AddEntity(ent);
}
}
}
@@ -368,17 +369,19 @@ typedef struct {
static laser_t cl_lasers[MAX_LASERS];
-static void clear_lasers( void ) {
- memset (cl_lasers, 0, sizeof(cl_lasers));
+static void clear_lasers(void)
+{
+ memset(cl_lasers, 0, sizeof(cl_lasers));
}
-static laser_t *alloc_laser( void ) {
+static laser_t *alloc_laser(void)
+{
laser_t *l;
int i;
- for( i = 0, l = cl_lasers; i < MAX_LASERS; i++, l++ ) {
- if( cl.time - l->starttime >= l->lifetime ) {
- memset( l, 0, sizeof( *l ) );
+ for (i = 0, l = cl_lasers; i < MAX_LASERS; i++, l++) {
+ if (cl.time - l->starttime >= l->lifetime) {
+ memset(l, 0, sizeof(*l));
l->starttime = cl.time;
return l;
}
@@ -387,22 +390,23 @@ static laser_t *alloc_laser( void ) {
return NULL;
}
-static void CL_AddLasers( void ) {
+static void CL_AddLasers(void)
+{
laser_t *l;
entity_t ent;
int i;
int time;
- memset( &ent, 0, sizeof( ent ) );
+ memset(&ent, 0, sizeof(ent));
- for( i = 0, l = cl_lasers; i < MAX_LASERS; i++, l++ ) {
- time = l->lifetime - ( cl.time - l->starttime );
- if( time < 0 ) {
+ for (i = 0, l = cl_lasers; i < MAX_LASERS; i++, l++) {
+ time = l->lifetime - (cl.time - l->starttime);
+ if (time < 0) {
continue;
}
#if USE_REF == REF_GL
- if( l->color == -1 ) {
+ if (l->color == -1) {
float f = (float)time / (float)l->lifetime;
ent.rgba.u8[0] = l->rgba.u8[0];
ent.rgba.u8[1] = l->rgba.u8[1];
@@ -413,12 +417,12 @@ static void CL_AddLasers( void ) {
ent.alpha = 0.30f;
ent.skinnum = l->color;
- ent.flags = RF_TRANSLUCENT|RF_BEAM;
- VectorCopy( l->start, ent.origin );
- VectorCopy( l->end, ent.oldorigin );
+ ent.flags = RF_TRANSLUCENT | RF_BEAM;
+ VectorCopy(l->start, ent.origin);
+ VectorCopy(l->end, ent.oldorigin);
ent.frame = l->width;
- V_AddEntity( &ent );
+ V_AddEntity(&ent);
}
}
@@ -427,17 +431,18 @@ static void CL_AddLasers( void ) {
CL_ParseLaser
=================
*/
-static void CL_ParseLaser( int colors ) {
+static void CL_ParseLaser(int colors)
+{
laser_t *l;
l = alloc_laser();
if (!l)
return;
- VectorCopy( te.pos1, l->start );
- VectorCopy( te.pos2, l->end );
+ VectorCopy(te.pos1, l->start);
+ VectorCopy(te.pos2, l->end);
l->lifetime = 100;
- l->color = ( colors >> ( ( rand() % 4 ) * 8 ) ) & 0xff;
+ l->color = (colors >> ((rand() % 4) * 8)) & 0xff;
l->width = 4;
}
@@ -466,64 +471,67 @@ static beam_t cl_beams[MAX_BEAMS];
//Currently only used by the plasma beam
static beam_t cl_playerbeams[MAX_BEAMS];
-static void clear_beams( void ) {
- memset (cl_beams, 0, sizeof(cl_beams));
- memset (cl_playerbeams, 0, sizeof(cl_playerbeams));
+static void clear_beams(void)
+{
+ memset(cl_beams, 0, sizeof(cl_beams));
+ memset(cl_playerbeams, 0, sizeof(cl_playerbeams));
}
-static void CL_ParseBeam (qhandle_t model) {
+static void CL_ParseBeam(qhandle_t model)
+{
beam_t *b;
int i;
-
+
// override any beam with the same source AND destination entities
- for (i=0, b=cl_beams ; i< MAX_BEAMS ; i++, b++)
+ for (i = 0, b = cl_beams; i < MAX_BEAMS; i++, b++)
if (b->entity == te.entity1 && b->dest_entity == te.entity2)
goto override;
// find a free beam
- for (i=0, b=cl_beams ; i< MAX_BEAMS ; i++, b++) {
+ for (i = 0, b = cl_beams; i < MAX_BEAMS; i++, b++) {
if (!b->model || b->endtime < cl.time) {
override:
b->entity = te.entity1;
b->dest_entity = te.entity2;
b->model = model;
b->endtime = cl.time + 200;
- VectorCopy (te.pos1, b->start);
- VectorCopy (te.pos2, b->end);
- VectorCopy (te.offset, b->offset);
+ VectorCopy(te.pos1, b->start);
+ VectorCopy(te.pos2, b->end);
+ VectorCopy(te.offset, b->offset);
return;
}
}
}
// ROGUE
-static void CL_ParsePlayerBeam (qhandle_t model) {
+static void CL_ParsePlayerBeam(qhandle_t model)
+{
beam_t *b;
int i;
-
+
// override any beam with the same entity
// PMM - For player beams, we only want one per player (entity) so..
- for (i=0, b=cl_playerbeams ; i< MAX_BEAMS ; i++, b++) {
+ for (i = 0, b = cl_playerbeams; i < MAX_BEAMS; i++, b++) {
if (b->entity == te.entity1) {
b->entity = te.entity1;
b->model = model;
b->endtime = cl.time + 200;
- VectorCopy (te.pos1, b->start);
- VectorCopy (te.pos2, b->end);
- VectorCopy (te.offset, b->offset);
+ VectorCopy(te.pos1, b->start);
+ VectorCopy(te.pos2, b->end);
+ VectorCopy(te.offset, b->offset);
return;
}
}
// find a free beam
- for (i=0, b=cl_playerbeams ; i< MAX_BEAMS ; i++, b++) {
+ for (i = 0, b = cl_playerbeams; i < MAX_BEAMS; i++, b++) {
if (!b->model || b->endtime < cl.time) {
b->entity = te.entity1;
b->model = model;
b->endtime = cl.time + 100; // PMM - this needs to be 100 to prevent multiple heatbeams
- VectorCopy (te.pos1, b->start);
- VectorCopy (te.pos2, b->end);
- VectorCopy (te.offset, b->offset);
+ VectorCopy(te.pos1, b->start);
+ VectorCopy(te.pos2, b->end);
+ VectorCopy(te.offset, b->offset);
return;
}
}
@@ -536,9 +544,9 @@ static void CL_ParsePlayerBeam (qhandle_t model) {
CL_AddBeams
=================
*/
-static void CL_AddBeams (void)
+static void CL_AddBeams(void)
{
- int i,j;
+ int i, j;
beam_t *b;
vec3_t dist, org;
float d;
@@ -547,35 +555,30 @@ static void CL_AddBeams (void)
float forward;
float len, steps;
float model_length;
-
+
// update beams
- for (i=0, b=cl_beams ; i< MAX_BEAMS ; i++, b++)
- {
+ for (i = 0, b = cl_beams; i < MAX_BEAMS; i++, b++) {
if (!b->model || b->endtime < cl.time)
continue;
// if coming from the player, update the start position
- if (b->entity == cl.frame.clientNum+1) // entity 0 is the world
- {
- VectorCopy (cl.refdef.vieworg, b->start);
+ if (b->entity == cl.frame.clientNum + 1) { // entity 0 is the world
+ VectorCopy(cl.refdef.vieworg, b->start);
b->start[2] -= 22; // adjust for view height
}
- VectorAdd (b->start, b->offset, org);
+ VectorAdd(b->start, b->offset, org);
- // calculate pitch and yaw
- VectorSubtract (b->end, org, dist);
+ // calculate pitch and yaw
+ VectorSubtract(b->end, org, dist);
- if (dist[1] == 0 && dist[0] == 0)
- {
+ if (dist[1] == 0 && dist[0] == 0) {
yaw = 0;
if (dist[2] > 0)
pitch = 90;
else
pitch = 270;
- }
- else
- {
- // PMM - fixed to correct for pitch of 0
+ } else {
+ // PMM - fixed to correct for pitch of 0
if (dist[0])
yaw = (atan2(dist[1], dist[0]) * 180 / M_PI);
else if (dist[1] > 0)
@@ -584,71 +587,63 @@ static void CL_AddBeams (void)
yaw = 270;
if (yaw < 0)
yaw += 360;
-
- forward = sqrt (dist[0]*dist[0] + dist[1]*dist[1]);
+
+ forward = sqrt(dist[0] * dist[0] + dist[1] * dist[1]);
pitch = (atan2(dist[2], forward) * -180.0 / M_PI);
if (pitch < 0)
pitch += 360.0;
}
- // add new entities for the beams
+ // add new entities for the beams
d = VectorNormalize(dist);
- memset (&ent, 0, sizeof(ent));
- if (b->model == cl_mod_lightning)
- {
+ memset(&ent, 0, sizeof(ent));
+ if (b->model == cl_mod_lightning) {
model_length = 35.0;
- d-= 20.0; // correction so it doesn't end in middle of tesla
- }
- else
- {
+ d -= 20.0; // correction so it doesn't end in middle of tesla
+ } else {
model_length = 30.0;
}
- steps = ceil(d/model_length);
- len = (d-model_length)/(steps-1);
+ steps = ceil(d / model_length);
+ len = (d - model_length) / (steps - 1);
// PMM - special case for lightning model .. if the real length is shorter than the model,
// flip it around & draw it from the end to the start. This prevents the model from going
// through the tesla mine (instead it goes through the target)
- if ((b->model == cl_mod_lightning) && (d <= model_length))
- {
+ if ((b->model == cl_mod_lightning) && (d <= model_length)) {
// Com_Printf ("special case\n");
- VectorCopy (b->end, ent.origin);
+ VectorCopy(b->end, ent.origin);
// offset to push beam outside of tesla model (negative because dist is from end to start
// for this beam)
-// for (j=0 ; j<3 ; j++)
+// for (j=0; j<3; j++)
// ent.origin[j] -= dist[j]*10.0;
ent.model = b->model;
ent.flags = RF_FULLBRIGHT;
ent.angles[0] = pitch;
ent.angles[1] = yaw;
- ent.angles[2] = rand()%360;
- V_AddEntity (&ent);
+ ent.angles[2] = rand() % 360;
+ V_AddEntity(&ent);
return;
}
- while (d > 0)
- {
- VectorCopy (org, ent.origin);
+ while (d > 0) {
+ VectorCopy(org, ent.origin);
ent.model = b->model;
- if (b->model == cl_mod_lightning)
- {
+ if (b->model == cl_mod_lightning) {
ent.flags = RF_FULLBRIGHT;
ent.angles[0] = -pitch;
ent.angles[1] = yaw + 180.0;
- ent.angles[2] = rand()%360;
- }
- else
- {
+ ent.angles[2] = rand() % 360;
+ } else {
ent.angles[0] = pitch;
ent.angles[1] = yaw;
- ent.angles[2] = rand()%360;
+ ent.angles[2] = rand() % 360;
}
-
+
// Com_Printf("B: %d -> %d\n", b->entity, b->dest_entity);
- V_AddEntity (&ent);
+ V_AddEntity(&ent);
- for (j=0 ; j<3 ; j++)
- org[j] += dist[j]*len;
+ for (j = 0; j < 3; j++)
+ org[j] += dist[j] * len;
d -= model_length;
}
}
@@ -660,9 +655,9 @@ ROGUE - draw player locked beams
CL_AddPlayerBeams
=================
*/
-static void CL_AddPlayerBeams (void)
+static void CL_AddPlayerBeams(void)
{
- int i,j;
+ int i, j;
beam_t *b;
vec3_t dist, org;
float d;
@@ -672,7 +667,7 @@ static void CL_AddPlayerBeams (void)
float len, steps;
int framenum = 0;
float model_length;
-
+
float hand_multiplier;
// frame_t *oldframe;
player_state_t *ps, *ops;
@@ -687,86 +682,74 @@ static void CL_AddPlayerBeams (void)
//PMM
// update beams
- for (i=0, b=cl_playerbeams ; i< MAX_BEAMS ; i++, b++)
- {
- vec3_t f,r,u;
+ for (i = 0, b = cl_playerbeams; i < MAX_BEAMS; i++, b++) {
+ vec3_t f, r, u;
if (!b->model || b->endtime < cl.time)
continue;
- if(cl_mod_heatbeam && (b->model == cl_mod_heatbeam))
- {
+ if (cl_mod_heatbeam && (b->model == cl_mod_heatbeam)) {
// if coming from the player, update the start position
- if (b->entity == cl.frame.clientNum+1) // entity 0 is the world
- {
+ if (b->entity == cl.frame.clientNum + 1) { // entity 0 is the world
// set up gun position
ps = &cl.frame.ps;
ops = &cl.oldframe.ps;
- if( !cl.oldframe.valid || cl.oldframe.number != cl.frame.number - 1 )
+ if (!cl.oldframe.valid || cl.oldframe.number != cl.frame.number - 1)
ops = ps; // previous frame was dropped or invalid
- for (j=0 ; j<3 ; j++)
- {
+ for (j = 0; j < 3; j++) {
b->start[j] = cl.refdef.vieworg[j] + ops->gunoffset[j]
- + cl.lerpfrac * (ps->gunoffset[j] - ops->gunoffset[j]);
+ + cl.lerpfrac * (ps->gunoffset[j] - ops->gunoffset[j]);
}
- VectorMA (b->start, (hand_multiplier * b->offset[0]), cl.v_right, org);
- VectorMA ( org, b->offset[1], cl.v_forward, org);
- VectorMA ( org, b->offset[2], cl.v_up, org);
+ VectorMA(b->start, (hand_multiplier * b->offset[0]), cl.v_right, org);
+ VectorMA(org, b->offset[1], cl.v_forward, org);
+ VectorMA(org, b->offset[2], cl.v_up, org);
if (info_hand->integer == 2) {
- VectorMA (org, -1, cl.v_up, org);
+ VectorMA(org, -1, cl.v_up, org);
}
// FIXME - take these out when final
- VectorCopy (cl.v_right, r);
- VectorCopy (cl.v_forward, f);
- VectorCopy (cl.v_up, u);
+ VectorCopy(cl.v_right, r);
+ VectorCopy(cl.v_forward, f);
+ VectorCopy(cl.v_up, u);
- }
- else
- VectorCopy (b->start, org);
- }
- else
- {
+ } else
+ VectorCopy(b->start, org);
+ } else {
// if coming from the player, update the start position
- if (b->entity == cl.frame.clientNum+1) // entity 0 is the world
- {
- VectorCopy (cl.refdef.vieworg, b->start);
+ if (b->entity == cl.frame.clientNum + 1) { // entity 0 is the world
+ VectorCopy(cl.refdef.vieworg, b->start);
b->start[2] -= 22; // adjust for view height
}
- VectorAdd (b->start, b->offset, org);
+ VectorAdd(b->start, b->offset, org);
}
- // calculate pitch and yaw
- VectorSubtract (b->end, org, dist);
+ // calculate pitch and yaw
+ VectorSubtract(b->end, org, dist);
//PMM
- if(cl_mod_heatbeam && (b->model == cl_mod_heatbeam) && (b->entity == cl.frame.clientNum+1))
- {
+ if (cl_mod_heatbeam && (b->model == cl_mod_heatbeam) && (b->entity == cl.frame.clientNum + 1)) {
vec_t len;
- len = VectorLength (dist);
- VectorScale (f, len, dist);
- VectorMA (dist, (hand_multiplier * b->offset[0]), r, dist);
- VectorMA (dist, b->offset[1], f, dist);
- VectorMA (dist, b->offset[2], u, dist);
+ len = VectorLength(dist);
+ VectorScale(f, len, dist);
+ VectorMA(dist, (hand_multiplier * b->offset[0]), r, dist);
+ VectorMA(dist, b->offset[1], f, dist);
+ VectorMA(dist, b->offset[2], u, dist);
if (info_hand->integer == 2) {
- VectorMA (org, -1, cl.v_up, org);
+ VectorMA(org, -1, cl.v_up, org);
}
}
//PMM
- if (dist[1] == 0 && dist[0] == 0)
- {
+ if (dist[1] == 0 && dist[0] == 0) {
yaw = 0;
if (dist[2] > 0)
pitch = 90;
else
pitch = 270;
- }
- else
- {
- // PMM - fixed to correct for pitch of 0
+ } else {
+ // PMM - fixed to correct for pitch of 0
if (dist[0])
yaw = (atan2(dist[1], dist[0]) * 180 / M_PI);
else if (dist[1] > 0)
@@ -775,17 +758,15 @@ static void CL_AddPlayerBeams (void)
yaw = 270;
if (yaw < 0)
yaw += 360;
-
- forward = sqrt (dist[0]*dist[0] + dist[1]*dist[1]);
+
+ forward = sqrt(dist[0] * dist[0] + dist[1] * dist[1]);
pitch = (atan2(dist[2], forward) * -180.0 / M_PI);
if (pitch < 0)
pitch += 360.0;
}
-
- if (cl_mod_heatbeam && (b->model == cl_mod_heatbeam))
- {
- if (b->entity != cl.frame.clientNum+1)
- {
+
+ if (cl_mod_heatbeam && (b->model == cl_mod_heatbeam)) {
+ if (b->entity != cl.frame.clientNum + 1) {
framenum = 2;
// Com_Printf ("Third person\n");
ent.angles[0] = -pitch;
@@ -793,77 +774,63 @@ static void CL_AddPlayerBeams (void)
ent.angles[2] = 0;
// Com_Printf ("%f %f - %f %f %f\n", -pitch, yaw+180.0, b->offset[0], b->offset[1], b->offset[2]);
AngleVectors(ent.angles, f, r, u);
-
+
// if it's a non-origin offset, it's a player, so use the hardcoded player offset
- if (!VectorCompare (b->offset, vec3_origin))
- {
- VectorMA (org, -(b->offset[0])+1, r, org);
- VectorMA (org, -(b->offset[1]), f, org);
- VectorMA (org, -(b->offset[2])-10, u, org);
- }
- else
- {
+ if (!VectorCompare(b->offset, vec3_origin)) {
+ VectorMA(org, -(b->offset[0]) + 1, r, org);
+ VectorMA(org, -(b->offset[1]), f, org);
+ VectorMA(org, -(b->offset[2]) - 10, u, org);
+ } else {
// if it's a monster, do the particle effect
CL_MonsterPlasma_Shell(b->start);
}
- }
- else
- {
+ } else {
framenum = 1;
}
}
// if it's the heatbeam, draw the particle effect
- if ((cl_mod_heatbeam && (b->model == cl_mod_heatbeam) && (b->entity == cl.frame.clientNum+1)))
- {
- CL_Heatbeam (org, dist);
+ if ((cl_mod_heatbeam && (b->model == cl_mod_heatbeam) && (b->entity == cl.frame.clientNum + 1))) {
+ CL_Heatbeam(org, dist);
}
- // add new entities for the beams
+ // add new entities for the beams
d = VectorNormalize(dist);
- memset (&ent, 0, sizeof(ent));
- if (b->model == cl_mod_heatbeam)
- {
+ memset(&ent, 0, sizeof(ent));
+ if (b->model == cl_mod_heatbeam) {
model_length = 32.0;
- }
- else if (b->model == cl_mod_lightning)
- {
+ } else if (b->model == cl_mod_lightning) {
model_length = 35.0;
- d-= 20.0; // correction so it doesn't end in middle of tesla
- }
- else
- {
+ d -= 20.0; // correction so it doesn't end in middle of tesla
+ } else {
model_length = 30.0;
}
- steps = ceil(d/model_length);
- len = (d-model_length)/(steps-1);
+ steps = ceil(d / model_length);
+ len = (d - model_length) / (steps - 1);
// PMM - special case for lightning model .. if the real length is shorter than the model,
// flip it around & draw it from the end to the start. This prevents the model from going
// through the tesla mine (instead it goes through the target)
- if ((b->model == cl_mod_lightning) && (d <= model_length))
- {
+ if ((b->model == cl_mod_lightning) && (d <= model_length)) {
// Com_Printf ("special case\n");
- VectorCopy (b->end, ent.origin);
+ VectorCopy(b->end, ent.origin);
// offset to push beam outside of tesla model (negative because dist is from end to start
// for this beam)
-// for (j=0 ; j<3 ; j++)
+// for (j=0; j<3; j++)
// ent.origin[j] -= dist[j]*10.0;
ent.model = b->model;
ent.flags = RF_FULLBRIGHT;
ent.angles[0] = pitch;
ent.angles[1] = yaw;
- ent.angles[2] = rand()%360;
- V_AddEntity (&ent);
+ ent.angles[2] = rand() % 360;
+ V_AddEntity(&ent);
return;
}
- while (d > 0)
- {
- VectorCopy (org, ent.origin);
+ while (d > 0) {
+ VectorCopy(org, ent.origin);
ent.model = b->model;
- if(cl_mod_heatbeam && (b->model == cl_mod_heatbeam))
- {
+ if (cl_mod_heatbeam && (b->model == cl_mod_heatbeam)) {
// ent.flags = RF_FULLBRIGHT|RF_TRANSLUCENT;
// ent.alpha = 0.3;
ent.flags = RF_FULLBRIGHT;
@@ -872,26 +839,22 @@ static void CL_AddPlayerBeams (void)
ent.angles[2] = (cl.time) % 360;
// ent.angles[2] = rand()%360;
ent.frame = framenum;
- }
- else if (b->model == cl_mod_lightning)
- {
+ } else if (b->model == cl_mod_lightning) {
ent.flags = RF_FULLBRIGHT;
ent.angles[0] = -pitch;
ent.angles[1] = yaw + 180.0;
- ent.angles[2] = rand()%360;
- }
- else
- {
+ ent.angles[2] = rand() % 360;
+ } else {
ent.angles[0] = pitch;
ent.angles[1] = yaw;
- ent.angles[2] = rand()%360;
+ ent.angles[2] = rand() % 360;
}
-
+
// Com_Printf("B: %d -> %d\n", b->entity, b->dest_entity);
- V_AddEntity (&ent);
+ V_AddEntity(&ent);
- for (j=0 ; j<3 ; j++)
- org[j] += dist[j]*len;
+ for (j = 0; j < 3; j++)
+ org[j] += dist[j] * len;
d -= model_length;
}
}
@@ -911,15 +874,17 @@ SUSTAIN MANAGEMENT
static cl_sustain_t cl_sustains[MAX_SUSTAINS];
-static void clear_sustains( void ) {
- memset (cl_sustains, 0, sizeof(cl_sustains));
+static void clear_sustains(void)
+{
+ memset(cl_sustains, 0, sizeof(cl_sustains));
}
-static cl_sustain_t *alloc_sustain( void ) {
+static cl_sustain_t *alloc_sustain(void)
+{
int i;
cl_sustain_t *s;
- for (i=0, s=cl_sustains; i<MAX_SUSTAINS; i++, s++) {
+ for (i = 0, s = cl_sustains; i < MAX_SUSTAINS; i++, s++) {
if (s->id == 0) {
return s;
}
@@ -927,36 +892,38 @@ static cl_sustain_t *alloc_sustain( void ) {
return NULL;
}
-static void CL_ProcessSustain (void) {
+static void CL_ProcessSustain(void)
+{
cl_sustain_t *s;
int i;
- for (i=0, s=cl_sustains; i< MAX_SUSTAINS; i++, s++) {
+ for (i = 0, s = cl_sustains; i < MAX_SUSTAINS; i++, s++) {
if (s->id) {
if ((s->endtime >= cl.time) && (cl.time >= s->nextthink))
- s->think (s);
+ s->think(s);
else if (s->endtime < cl.time)
s->id = 0;
}
}
}
-static void CL_ParseSteam (void) {
+static void CL_ParseSteam(void)
+{
cl_sustain_t *s;
- if( te.entity1 == -1 ) {
- CL_ParticleSteamEffect (te.pos1, te.dir, te.color & 0xff, te.count, te.entity2);
+ if (te.entity1 == -1) {
+ CL_ParticleSteamEffect(te.pos1, te.dir, te.color & 0xff, te.count, te.entity2);
return;
}
-
+
s = alloc_sustain();
if (!s)
return;
-
+
s->id = te.entity1;
s->count = te.count;
- VectorCopy( te.pos1, s->org );
- VectorCopy( te.dir, s->dir );
+ VectorCopy(te.pos1, s->org);
+ VectorCopy(te.dir, s->dir);
s->color = te.color & 0xff;
s->magnitude = te.entity2;
s->endtime = cl.time + te.time;
@@ -965,7 +932,8 @@ static void CL_ParseSteam (void) {
s->nextthink = cl.time;
}
-static void CL_ParseWidow (void) {
+static void CL_ParseWidow(void)
+{
cl_sustain_t *s;
s = alloc_sustain();
@@ -973,14 +941,15 @@ static void CL_ParseWidow (void) {
return;
s->id = te.entity1;
- VectorCopy (te.pos1, s->org);
+ VectorCopy(te.pos1, s->org);
s->endtime = cl.time + 2100;
s->think = CL_Widowbeamout;
s->thinkinterval = 1;
s->nextthink = cl.time;
}
-static void CL_ParseNuke (void) {
+static void CL_ParseNuke(void)
+{
cl_sustain_t *s;
s = alloc_sustain();
@@ -988,7 +957,7 @@ static void CL_ParseNuke (void) {
return;
s->id = 21000;
- VectorCopy (te.pos1, s->org);
+ VectorCopy(te.pos1, s->org);
s->endtime = cl.time + 1000;
s->think = CL_Nukeblast;
s->thinkinterval = 1;
@@ -1009,38 +978,42 @@ static cvar_t *cl_railcore_width;
static cvar_t *cl_railspiral_color;
static cvar_t *cl_railspiral_radius;
-static void cl_railcore_color_changed( cvar_t *self ) {
- if( !SCR_ParseColor( self->string, &railcore_color ) ) {
- Com_WPrintf( "Invalid value '%s' for '%s'\n", self->string, self->name );
- Cvar_Reset( self );
+static void cl_railcore_color_changed(cvar_t *self)
+{
+ if (!SCR_ParseColor(self->string, &railcore_color)) {
+ Com_WPrintf("Invalid value '%s' for '%s'\n", self->string, self->name);
+ Cvar_Reset(self);
railcore_color.u32 = U32_RED;
}
}
-static void cl_railspiral_color_changed( cvar_t *self ) {
- if( !SCR_ParseColor( self->string, &railspiral_color ) ) {
- Com_WPrintf( "Invalid value '%s' for '%s'\n", self->string, self->name );
- Cvar_Reset( self );
+static void cl_railspiral_color_changed(cvar_t *self)
+{
+ if (!SCR_ParseColor(self->string, &railspiral_color)) {
+ Com_WPrintf("Invalid value '%s' for '%s'\n", self->string, self->name);
+ Cvar_Reset(self);
railspiral_color.u32 = U32_BLUE;
}
}
-static void CL_RailCore( void ) {
+static void CL_RailCore(void)
+{
laser_t *l;
l = alloc_laser();
if (!l)
return;
- VectorCopy( te.pos1, l->start );
- VectorCopy( te.pos2, l->end );
+ VectorCopy(te.pos1, l->start);
+ VectorCopy(te.pos2, l->end);
l->color = -1;
l->lifetime = 1000 * cl_railtrail_time->value;
l->width = cl_railcore_width->integer;
l->rgba.u32 = railcore_color.u32;
}
-static void CL_RailSpiral( void ) {
+static void CL_RailSpiral(void)
+{
vec3_t move;
vec3_t vec;
float len;
@@ -1052,46 +1025,47 @@ static void CL_RailSpiral( void ) {
float d, c, s;
vec3_t dir;
- VectorCopy( te.pos1, move );
- VectorSubtract( te.pos2, te.pos1, vec );
- len = VectorNormalize( vec );
+ VectorCopy(te.pos1, move);
+ VectorSubtract(te.pos2, te.pos1, vec);
+ len = VectorNormalize(vec);
- MakeNormalVectors( vec, right, up );
+ MakeNormalVectors(vec, right, up);
- for( i=0 ; i<len ; i++ ) {
+ for (i = 0; i < len; i++) {
p = CL_AllocParticle();
if (!p)
return;
-
+
p->time = cl.time;
- VectorClear( p->accel );
+ VectorClear(p->accel);
d = i * 0.1;
- c = cos( d );
- s = sin( d );
+ c = cos(d);
+ s = sin(d);
- VectorScale( right, c, dir );
- VectorMA( dir, s, up, dir );
+ VectorScale(right, c, dir);
+ VectorMA(dir, s, up, dir);
p->alpha = 1.0;
- p->alphavel = -1.0 / ( cl_railtrail_time->value + frand() * 0.2 );
+ p->alphavel = -1.0 / (cl_railtrail_time->value + frand() * 0.2);
p->color = -1;
p->rgba.u32 = railspiral_color.u32;
- for( j=0 ; j<3 ; j++ ) {
+ for (j = 0; j < 3; j++) {
p->org[j] = move[j] + dir[j] * cl_railspiral_radius->value;
p->vel[j] = dir[j] * 6;
}
- VectorAdd( move, vec, move );
+ VectorAdd(move, vec, move);
}
}
-static void CL_RailTrail( void ) {
- if( !cl_railtrail_type->integer ) {
+static void CL_RailTrail(void)
+{
+ if (!cl_railtrail_type->integer) {
CL_OldRailTrail();
} else {
CL_RailCore();
- if( cl_railtrail_type->integer > 1 ) {
+ if (cl_railtrail_type->integer > 1) {
CL_RailSpiral();
}
}
@@ -1101,11 +1075,12 @@ static void CL_RailTrail( void ) {
#define CL_RailTrail CL_OldRailTrail
#endif
-static void dirtoangles( vec3_t angles ) {
- angles[0] = acos(te.dir[2])/M_PI*180;
+static void dirtoangles(vec3_t angles)
+{
+ angles[0] = acos(te.dir[2]) / M_PI * 180;
// PMM - fixed to correct for pitch of 0
if (te.dir[0])
- angles[1] = atan2(te.dir[1], te.dir[0])/M_PI*180;
+ angles[1] = atan2(te.dir[1], te.dir[0]) / M_PI * 180;
else if (te.dir[1] > 0)
angles[1] = 90;
else if (te.dir[1] < 0)
@@ -1121,16 +1096,15 @@ CL_ParseTEnt
*/
static const byte splash_color[] = {0x00, 0xe0, 0xb0, 0x50, 0xd0, 0xe0, 0xe8};
-void CL_ParseTEnt (void)
+void CL_ParseTEnt(void)
{
explosion_t *ex;
int r;
- switch (te.type)
- {
+ switch (te.type) {
case TE_BLOOD: // bullet hitting flesh
- if( !( cl_disable_particles->integer & NOPART_BLOOD ) ) {
- CL_ParticleEffect (te.pos1, te.dir, 0xe8, 60);
+ if (!(cl_disable_particles->integer & NOPART_BLOOD)) {
+ CL_ParticleEffect(te.pos1, te.dir, 0xe8, 60);
}
break;
@@ -1138,37 +1112,37 @@ void CL_ParseTEnt (void)
case TE_SPARKS:
case TE_BULLET_SPARKS:
if (te.type == TE_GUNSHOT)
- CL_ParticleEffect (te.pos1, te.dir, 0, 40);
+ CL_ParticleEffect(te.pos1, te.dir, 0, 40);
else
- CL_ParticleEffect (te.pos1, te.dir, 0xe0, 6);
+ CL_ParticleEffect(te.pos1, te.dir, 0xe0, 6);
if (te.type != TE_SPARKS) {
CL_SmokeAndFlash(te.pos1);
-
+
// impact sound
- r = rand()&15;
+ r = rand() & 15;
if (r == 1)
- S_StartSound (te.pos1, 0, 0, cl_sfx_ric1, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_ric1, 1, ATTN_NORM, 0);
else if (r == 2)
- S_StartSound (te.pos1, 0, 0, cl_sfx_ric2, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_ric2, 1, ATTN_NORM, 0);
else if (r == 3)
- S_StartSound (te.pos1, 0, 0, cl_sfx_ric3, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_ric3, 1, ATTN_NORM, 0);
}
break;
-
+
case TE_SCREEN_SPARKS:
case TE_SHIELD_SPARKS:
if (te.type == TE_SCREEN_SPARKS)
- CL_ParticleEffect (te.pos1, te.dir, 0xd0, 40);
+ CL_ParticleEffect(te.pos1, te.dir, 0xd0, 40);
else
- CL_ParticleEffect (te.pos1, te.dir, 0xb0, 40);
+ CL_ParticleEffect(te.pos1, te.dir, 0xb0, 40);
//FIXME : replace or remove this sound
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
-
+
case TE_SHOTGUN: // bullet hitting wall
- CL_ParticleEffect (te.pos1, te.dir, 0, 20);
+ CL_ParticleEffect(te.pos1, te.dir, 0, 20);
CL_SmokeAndFlash(te.pos1);
break;
@@ -1177,50 +1151,49 @@ void CL_ParseTEnt (void)
r = 0x00;
else
r = splash_color[te.color];
- CL_ParticleEffect (te.pos1, te.dir, r, te.count);
+ CL_ParticleEffect(te.pos1, te.dir, r, te.count);
- if (te.color == SPLASH_SPARKS)
- {
+ if (te.color == SPLASH_SPARKS) {
r = rand() & 3;
if (r == 0)
- S_StartSound (te.pos1, 0, 0, cl_sfx_spark5, 1, ATTN_STATIC, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_spark5, 1, ATTN_STATIC, 0);
else if (r == 1)
- S_StartSound (te.pos1, 0, 0, cl_sfx_spark6, 1, ATTN_STATIC, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_spark6, 1, ATTN_STATIC, 0);
else
- S_StartSound (te.pos1, 0, 0, cl_sfx_spark7, 1, ATTN_STATIC, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_spark7, 1, ATTN_STATIC, 0);
}
break;
case TE_LASER_SPARKS:
- CL_ParticleEffect2 (te.pos1, te.dir, te.color, te.count);
+ CL_ParticleEffect2(te.pos1, te.dir, te.color, te.count);
break;
- // RAFAEL
+ // RAFAEL
case TE_BLUEHYPERBLASTER:
- CL_BlasterParticles (te.pos1, te.dir);
+ CL_BlasterParticles(te.pos1, te.dir);
break;
case TE_BLASTER: // blaster hitting wall
case TE_BLASTER2: // green blaster hitting wall
case TE_FLECHETTE: // flechette
- ex = alloc_explosion ();
- VectorCopy (te.pos1, ex->ent.origin);
- dirtoangles( ex->ent.angles );
+ ex = alloc_explosion();
+ VectorCopy(te.pos1, ex->ent.origin);
+ dirtoangles(ex->ent.angles);
ex->type = ex_misc;
- ex->ent.flags = RF_FULLBRIGHT|RF_TRANSLUCENT;
- switch(te.type) {
+ ex->ent.flags = RF_FULLBRIGHT | RF_TRANSLUCENT;
+ switch (te.type) {
case TE_BLASTER:
- CL_BlasterParticles( te.pos1, te.dir );
+ CL_BlasterParticles(te.pos1, te.dir);
ex->lightcolor[0] = 1;
ex->lightcolor[1] = 1;
break;
case TE_BLASTER2:
- CL_BlasterParticles2 (te.pos1, te.dir, 0xd0);
+ CL_BlasterParticles2(te.pos1, te.dir, 0xd0);
ex->ent.skinnum = 1;
ex->lightcolor[1] = 1;
break;
case TE_FLECHETTE:
- CL_BlasterParticles2 (te.pos1, te.dir, 0x6f); // 75
+ CL_BlasterParticles2(te.pos1, te.dir, 0x6f); // 75
ex->ent.skinnum = 2;
ex->lightcolor[0] = 0.19;
ex->lightcolor[1] = 0.41;
@@ -1231,85 +1204,85 @@ void CL_ParseTEnt (void)
ex->light = 150;
ex->ent.model = cl_mod_explode;
ex->frames = 4;
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
-
+
case TE_RAILTRAIL: // railgun effect
- CL_RailTrail ();
- S_StartSound (te.pos2, 0, 0, cl_sfx_railg, 1, ATTN_NORM, 0);
+ CL_RailTrail();
+ S_StartSound(te.pos2, 0, 0, cl_sfx_railg, 1, ATTN_NORM, 0);
break;
case TE_GRENADE_EXPLOSION:
case TE_GRENADE_EXPLOSION_WATER:
- ex = plain_explosion ();
+ ex = plain_explosion();
ex->frames = 19;
ex->baseframe = 30;
- if( cl_disable_explosions->integer & NOEXP_GRENADE ) {
+ if (cl_disable_explosions->integer & NOEXP_GRENADE) {
ex->type = ex_light;
}
-
- if( !( cl_disable_particles->integer & NOPART_GRENADE_EXPLOSION ) ) {
- CL_ExplosionParticles( te.pos1 );
+
+ if (!(cl_disable_particles->integer & NOPART_GRENADE_EXPLOSION)) {
+ CL_ExplosionParticles(te.pos1);
}
if (te.type == TE_GRENADE_EXPLOSION_WATER)
- S_StartSound (te.pos1, 0, 0, cl_sfx_watrexp, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_watrexp, 1, ATTN_NORM, 0);
else
- S_StartSound (te.pos1, 0, 0, cl_sfx_grenexp, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_grenexp, 1, ATTN_NORM, 0);
break;
case TE_EXPLOSION2:
- ex = plain_explosion ();
+ ex = plain_explosion();
ex->frames = 19;
ex->baseframe = 30;
- CL_ExplosionParticles( te.pos1 );
- S_StartSound (te.pos1, 0, 0, cl_sfx_grenexp, 1, ATTN_NORM, 0);
+ CL_ExplosionParticles(te.pos1);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_grenexp, 1, ATTN_NORM, 0);
break;
- // RAFAEL
+ // RAFAEL
case TE_PLASMA_EXPLOSION:
plain_explosion();
- CL_ExplosionParticles (te.pos1);
- S_StartSound (te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
+ CL_ExplosionParticles(te.pos1);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
break;
case TE_ROCKET_EXPLOSION:
case TE_ROCKET_EXPLOSION_WATER:
ex = plain_explosion();
- if( cl_disable_explosions->integer & NOEXP_ROCKET ) {
+ if (cl_disable_explosions->integer & NOEXP_ROCKET) {
ex->type = ex_light;
}
- if( !( cl_disable_particles->integer & NOPART_ROCKET_EXPLOSION ) ) {
- CL_ExplosionParticles( te.pos1 );
+ if (!(cl_disable_particles->integer & NOPART_ROCKET_EXPLOSION)) {
+ CL_ExplosionParticles(te.pos1);
}
- if( te.type == TE_ROCKET_EXPLOSION_WATER )
- S_StartSound( te.pos1, 0, 0, cl_sfx_watrexp, 1, ATTN_NORM, 0 );
+ if (te.type == TE_ROCKET_EXPLOSION_WATER)
+ S_StartSound(te.pos1, 0, 0, cl_sfx_watrexp, 1, ATTN_NORM, 0);
else
- S_StartSound( te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0 );
+ S_StartSound(te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
break;
-
+
case TE_EXPLOSION1:
plain_explosion();
- CL_ExplosionParticles( te.pos1 );
- S_StartSound( te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0 );
+ CL_ExplosionParticles(te.pos1);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
break;
case TE_EXPLOSION1_NP: // PMM
plain_explosion();
- S_StartSound( te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0 );
+ S_StartSound(te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
break;
case TE_EXPLOSION1_BIG: // PMM
ex = plain_explosion();
ex->ent.model = cl_mod_explo4_big;
- S_StartSound( te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0 );
+ S_StartSound(te.pos1, 0, 0, cl_sfx_rockexp, 1, ATTN_NORM, 0);
break;
case TE_BFG_EXPLOSION:
- ex = alloc_explosion ();
- VectorCopy (te.pos1, ex->ent.origin);
+ ex = alloc_explosion();
+ VectorCopy(te.pos1, ex->ent.origin);
ex->type = ex_poly;
ex->ent.flags = RF_FULLBRIGHT;
ex->start = cl.servertime - CL_FRAMETIME;
@@ -1324,46 +1297,46 @@ void CL_ParseTEnt (void)
break;
case TE_BFG_BIGEXPLOSION:
- CL_BFGExplosionParticles (te.pos1);
+ CL_BFGExplosionParticles(te.pos1);
break;
case TE_BFG_LASER:
- CL_ParseLaser (0xd0d1d2d3);
+ CL_ParseLaser(0xd0d1d2d3);
break;
case TE_BUBBLETRAIL:
- CL_BubbleTrail (te.pos1, te.pos2);
+ CL_BubbleTrail(te.pos1, te.pos2);
break;
case TE_PARASITE_ATTACK:
case TE_MEDIC_CABLE_ATTACK:
- VectorClear( te.offset );
+ VectorClear(te.offset);
te.entity2 = 0;
- CL_ParseBeam (cl_mod_parasite_segment);
+ CL_ParseBeam(cl_mod_parasite_segment);
break;
case TE_BOSSTPORT: // boss teleporting to station
- CL_BigTeleportParticles (te.pos1);
- S_StartSound (te.pos1, 0, 0, S_RegisterSound ("misc/bigtele.wav"), 1, ATTN_NONE, 0);
+ CL_BigTeleportParticles(te.pos1);
+ S_StartSound(te.pos1, 0, 0, S_RegisterSound("misc/bigtele.wav"), 1, ATTN_NONE, 0);
break;
case TE_GRAPPLE_CABLE:
te.entity2 = 0;
- CL_ParseBeam (cl_mod_grapple_cable);
+ CL_ParseBeam(cl_mod_grapple_cable);
break;
- // RAFAEL
+ // RAFAEL
case TE_WELDING_SPARKS:
- CL_ParticleEffect2 (te.pos1, te.dir, te.color, te.count);
+ CL_ParticleEffect2(te.pos1, te.dir, te.color, te.count);
- ex = alloc_explosion ();
- VectorCopy (te.pos1, ex->ent.origin);
+ ex = alloc_explosion();
+ VectorCopy(te.pos1, ex->ent.origin);
ex->type = ex_flash;
// note to self
// we need a better no draw flag
ex->ent.flags = RF_BEAM;
ex->start = cl.servertime - CL_FRAMETIME;
- ex->light = 100 + (rand()%75);
+ ex->light = 100 + (rand() % 75);
ex->lightcolor[0] = 1.0;
ex->lightcolor[1] = 1.0;
ex->lightcolor[2] = 0.3;
@@ -1372,23 +1345,23 @@ void CL_ParseTEnt (void)
break;
case TE_GREENBLOOD:
- CL_ParticleEffect2 (te.pos1, te.dir, 0xdf, 30);
+ CL_ParticleEffect2(te.pos1, te.dir, 0xdf, 30);
break;
- // RAFAEL
+ // RAFAEL
case TE_TUNNEL_SPARKS:
- CL_ParticleEffect3 (te.pos1, te.dir, te.color, te.count);
+ CL_ParticleEffect3(te.pos1, te.dir, te.color, te.count);
break;
case TE_LIGHTNING:
- S_StartSound (NULL, te.entity1, CHAN_WEAPON, cl_sfx_lightning, 1, ATTN_NORM, 0);
- VectorClear( te.offset );
- CL_ParseBeam (cl_mod_lightning);
+ S_StartSound(NULL, te.entity1, CHAN_WEAPON, cl_sfx_lightning, 1, ATTN_NORM, 0);
+ VectorClear(te.offset);
+ CL_ParseBeam(cl_mod_lightning);
break;
case TE_DEBUGTRAIL:
- CL_DebugTrail (te.pos1, te.pos2);
+ CL_DebugTrail(te.pos1, te.pos2);
break;
case TE_PLAIN_EXPLOSION:
@@ -1407,23 +1380,23 @@ void CL_ParseTEnt (void)
case TE_HEATBEAM:
VectorSet(te.offset, 2, 7, -3);
- CL_ParsePlayerBeam (cl_mod_heatbeam);
+ CL_ParsePlayerBeam(cl_mod_heatbeam);
break;
case TE_MONSTER_HEATBEAM:
VectorClear(te.offset);
//CL_ParsePlayerBeam (cl_mod_monster_heatbeam);
- CL_ParsePlayerBeam (cl_mod_heatbeam); // FIXME?
+ CL_ParsePlayerBeam(cl_mod_heatbeam); // FIXME?
break;
case TE_HEATBEAM_SPARKS:
- CL_ParticleSteamEffect (te.pos1, te.dir, 0x8, 50, 60);
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ CL_ParticleSteamEffect(te.pos1, te.dir, 0x8, 50, 60);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
-
+
case TE_HEATBEAM_STEAM:
- CL_ParticleSteamEffect (te.pos1, te.dir, 0xE0, 20, 60);
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ CL_ParticleSteamEffect(te.pos1, te.dir, 0xE0, 20, 60);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
case TE_STEAM:
@@ -1431,54 +1404,54 @@ void CL_ParseTEnt (void)
break;
case TE_BUBBLETRAIL2:
- CL_BubbleTrail2 (te.pos1, te.pos2, 8);
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ CL_BubbleTrail2(te.pos1, te.pos2, 8);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
case TE_MOREBLOOD:
- CL_ParticleEffect (te.pos1, te.dir, 0xe8, 250);
+ CL_ParticleEffect(te.pos1, te.dir, 0xe8, 250);
break;
case TE_CHAINFIST_SMOKE:
- VectorSet( te.dir, 0, 0, 1 );
- CL_ParticleSmokeEffect (te.pos1, te.dir, 0, 20, 20);
+ VectorSet(te.dir, 0, 0, 1);
+ CL_ParticleSmokeEffect(te.pos1, te.dir, 0, 20, 20);
break;
case TE_ELECTRIC_SPARKS:
- CL_ParticleEffect (te.pos1, te.dir, 0x75, 40);
+ CL_ParticleEffect(te.pos1, te.dir, 0x75, 40);
//FIXME : replace or remove this sound
- S_StartSound (te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_lashit, 1, ATTN_NORM, 0);
break;
case TE_TRACKER_EXPLOSION:
#if USE_DLIGHTS
- CL_ColorFlash (te.pos1, 0, 150, -1, -1, -1);
+ CL_ColorFlash(te.pos1, 0, 150, -1, -1, -1);
#endif
- CL_ColorExplosionParticles (te.pos1, 0, 1);
- S_StartSound (te.pos1, 0, 0, cl_sfx_disrexp, 1, ATTN_NORM, 0);
+ CL_ColorExplosionParticles(te.pos1, 0, 1);
+ S_StartSound(te.pos1, 0, 0, cl_sfx_disrexp, 1, ATTN_NORM, 0);
break;
case TE_TELEPORT_EFFECT:
case TE_DBALL_GOAL:
- CL_TeleportParticles (te.pos1);
+ CL_TeleportParticles(te.pos1);
break;
case TE_WIDOWBEAMOUT:
- CL_ParseWidow ();
+ CL_ParseWidow();
break;
case TE_NUKEBLAST:
- CL_ParseNuke ();
+ CL_ParseNuke();
break;
case TE_WIDOWSPLASH:
- CL_WidowSplash ();
+ CL_WidowSplash();
break;
//PGM
//==============
default:
- Com_Error (ERR_DROP, "%s: bad type", __func__);
+ Com_Error(ERR_DROP, "%s: bad type", __func__);
}
}
@@ -1487,11 +1460,12 @@ void CL_ParseTEnt (void)
CL_AddTEnts
=================
*/
-void CL_AddTEnts (void) {
- CL_AddBeams ();
+void CL_AddTEnts(void)
+{
+ CL_AddBeams();
// PMM - draw plasma beams
- CL_AddPlayerBeams ();
- CL_AddExplosions ();
+ CL_AddPlayerBeams();
+ CL_AddExplosions();
// PMM - set up sustain
CL_ProcessSustain();
CL_AddLasers();
@@ -1502,7 +1476,8 @@ void CL_AddTEnts (void) {
CL_ClearTEnts
=================
*/
-void CL_ClearTEnts (void) {
+void CL_ClearTEnts(void)
+{
clear_beams();
clear_explosions();
clear_lasers();
@@ -1513,20 +1488,21 @@ void CL_ClearTEnts (void) {
}
-void CL_InitTEnts( void ) {
+void CL_InitTEnts(void)
+{
#if USE_REF == REF_GL
- cl_railtrail_type = Cvar_Get( "cl_railtrail_type", "0", 0 );
- cl_railtrail_time = Cvar_Get( "cl_railtrail_time", "1.0", 0 );
- cl_railcore_color = Cvar_Get( "cl_railcore_color", "red", 0 );
+ cl_railtrail_type = Cvar_Get("cl_railtrail_type", "0", 0);
+ cl_railtrail_time = Cvar_Get("cl_railtrail_time", "1.0", 0);
+ cl_railcore_color = Cvar_Get("cl_railcore_color", "red", 0);
cl_railcore_color->changed = cl_railcore_color_changed;
cl_railcore_color->generator = Com_Color_g;
- cl_railcore_color_changed( cl_railcore_color );
- cl_railcore_width = Cvar_Get( "cl_railcore_width", "2", 0 );
- cl_railspiral_color = Cvar_Get( "cl_railspiral_color", "blue", 0 );
+ cl_railcore_color_changed(cl_railcore_color);
+ cl_railcore_width = Cvar_Get("cl_railcore_width", "2", 0);
+ cl_railspiral_color = Cvar_Get("cl_railspiral_color", "blue", 0);
cl_railspiral_color->changed = cl_railspiral_color_changed;
cl_railspiral_color->generator = Com_Color_g;
- cl_railspiral_color_changed( cl_railspiral_color );
- cl_railspiral_radius = Cvar_Get( "cl_railspiral_radius", "3", 0 );
+ cl_railspiral_color_changed(cl_railspiral_color);
+ cl_railspiral_radius = Cvar_Get("cl_railspiral_radius", "3", 0);
#endif
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 13:13:04 +0000