summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_animmapobj.c53
-rw-r--r--src/cgame/cg_ents.c30
-rw-r--r--src/cgame/cg_event.c3
-rw-r--r--src/cgame/cg_weapons.c12
4 files changed, 47 insertions, 51 deletions
diff --git a/src/cgame/cg_animmapobj.c b/src/cgame/cg_animmapobj.c
index 46b64073..2fc98bc6 100644
--- a/src/cgame/cg_animmapobj.c
+++ b/src/cgame/cg_animmapobj.c
@@ -125,11 +125,12 @@ void CG_ModelDoor( centity_t *cent )
{
refEntity_t ent;
entityState_t *es;
- vec3_t mins, maxs, size;
+ vec3_t mins, maxs, size, rotSize;
vec3_t cMins, cMaxs, displacement;
vec3_t bMaxs, scale;
animation_t anim;
lerpFrame_t *lf = &cent->lerpFrame;
+ float temp;
es = &cent->currentState;
@@ -149,51 +150,11 @@ void CG_ModelDoor( centity_t *cent )
ent.skinNum = 0;
ent.hModel = cgs.gameModels[ es->modelindex ];
- if( es->eFlags & EF_NO_AUTO_SCALE )
- {
- //this door is being manually scaled
- VectorScale( ent.axis[ 0 ], es->origin2[ 0 ], ent.axis[ 0 ] );
- VectorScale( ent.axis[ 1 ], es->origin2[ 1 ], ent.axis[ 1 ] );
- VectorScale( ent.axis[ 2 ], es->origin2[ 2 ], ent.axis[ 2 ] );
- ent.nonNormalizedAxes = qtrue;
- }
- else
- {
- //automatically scale and position the model
- trap_R_ModelBounds( ent.hModel, mins, maxs );
-
- //average of mins and maxs
- VectorSubtract( maxs, mins, size );
- VectorScale( size, 0.5f, size );
-
- //set corrected bbox
- VectorCopy( size, cMaxs );
- VectorNegate( size, cMins );
-
- //calculate the displacement needed to align
- //the model with the centre of the brush
- VectorSubtract( cMins, mins, displacement );
-
- VectorCopy( es->angles2, bMaxs );
-
- //scale the axis and displacement by the ratio
- //of the brush to corrected bboxes
- scale[ 0 ] = bMaxs[ 0 ] / cMaxs[ 0 ];
- scale[ 1 ] = bMaxs[ 1 ] / cMaxs[ 1 ];
- scale[ 2 ] = bMaxs[ 2 ] / cMaxs[ 2 ];
-
- VectorScale( ent.axis[ 0 ], scale[ 0 ], ent.axis[ 0 ] );
- VectorScale( ent.axis[ 1 ], scale[ 1 ], ent.axis[ 1 ] );
- VectorScale( ent.axis[ 2 ], scale[ 2 ], ent.axis[ 2 ] );
- ent.nonNormalizedAxes = qtrue;
-
- displacement[ 0 ] = scale[ 0 ] * displacement[ 0 ];
- displacement[ 1 ] = scale[ 1 ] * displacement[ 1 ];
- displacement[ 2 ] = scale[ 2 ] * displacement[ 2 ];
-
- VectorAdd( ent.origin, displacement, ent.origin );
- VectorAdd( ent.oldorigin, displacement, ent.oldorigin );
- }
+ //scale the door
+ VectorScale( ent.axis[ 0 ], es->origin2[ 0 ], ent.axis[ 0 ] );
+ VectorScale( ent.axis[ 1 ], es->origin2[ 1 ], ent.axis[ 1 ] );
+ VectorScale( ent.axis[ 2 ], es->origin2[ 2 ], ent.axis[ 2 ] );
+ ent.nonNormalizedAxes = qtrue;
//setup animation
anim.firstFrame = es->powerups;
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index 6a1fa650..c7590ca0 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -323,6 +323,7 @@ static void CG_Missile( centity_t *cent )
vec3_t up;
float fraction;
int index;
+ qboolean switchBugWorkaround = qfalse;
s1 = &cent->currentState;
if( s1->weapon > WP_NUM_WEAPONS )
@@ -367,7 +368,7 @@ static void CG_Missile( centity_t *cent )
ent.rotation = 0;
ent.customShader = cgs.media.blasterShader;
trap_R_AddRefEntityToScene( &ent );
- return;
+ switchBugWorkaround = qtrue;
break;
case WP_PULSE_RIFLE:
@@ -376,7 +377,7 @@ static void CG_Missile( centity_t *cent )
ent.rotation = 0;
ent.customShader = cgs.media.plasmaBallShader;
trap_R_AddRefEntityToScene( &ent );
- return;
+ switchBugWorkaround = qtrue;
break;
case WP_LUCIFER_CANNON:
@@ -398,9 +399,27 @@ static void CG_Missile( centity_t *cent )
break;
+ case WP_HIVE:
+ //FIXME:
+ ent.reType = RT_SPRITE;
+ ent.radius = 4;
+ ent.rotation = 0;
+ ent.customShader = cgs.media.blasterShader;
+ trap_R_AddRefEntityToScene( &ent );
+ switchBugWorkaround = qtrue;
+ break;
+
+/* case WP_LOCKBLOB_LAUNCHER:
+ //FIXME:
+ break;*/
+
+/* case WP_POUNCE_UPG:
+ //FIXME:
+ break;*/
+
case WP_FLAMER:
//TA: don't actually display the missile (use the particle engine)
- return;
+ switchBugWorkaround = qtrue;
break;
default:
@@ -410,7 +429,7 @@ static void CG_Missile( centity_t *cent )
ent.renderfx = weapon->missileRenderfx | RF_NOSHADOW;
// convert direction of travel into axis
- if ( VectorNormalize2( s1->pos.trDelta, ent.axis[ 0 ] ) == 0 )
+ if( VectorNormalize2( s1->pos.trDelta, ent.axis[ 0 ] ) == 0 )
ent.axis[ 0 ][ 2 ] = 1;
// spin as it moves
@@ -420,6 +439,9 @@ static void CG_Missile( centity_t *cent )
RotateAroundDirection( ent.axis, s1->time );
}
+ if( switchBugWorkaround )
+ return;
+
// add to refresh list, possibly with quad glow
CG_AddRefEntityWithPowerups( &ent, s1->powerups, TEAM_FREE );
}
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 7d8f38c5..5907228a 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -111,6 +111,9 @@ static void CG_Obituary( entityState_t *ent )
case MOD_SLOWBLOB:
message = "should have visited a medical station";
break;
+ case MOD_SWARM:
+ message = "was hunted down by the swarm";
+ break;
default:
message = NULL;
break;
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index 343e359d..7fd3b627 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -1559,6 +1559,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
int duration;
vec3_t sprOrg;
vec3_t sprVel;
+ qboolean switchBugWorkaround = qfalse;
mark = 0;
radius = 32;
@@ -1576,7 +1577,6 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
switch( weapon )
{
- default:
case WP_TESLAGEN:
case WP_AREA_ZAP:
case WP_DIRECT_ZAP:
@@ -1672,8 +1672,18 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
spark, qfalse, qfalse );
}
break;
+
+ case WP_HIVE:
+ switchBugWorkaround = qtrue;
+ break;
+
+ default:
+ break;
}
+ if( switchBugWorkaround )
+ return;
+
if( sfx )
trap_S_StartSound( origin, ENTITYNUM_WORLD, CHAN_AUTO, sfx );
generated by cgit (git 2.34.1) at 2025-04-03 06:52:39 +0000