summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_local.h3
-rw-r--r--src/cgame/cg_main.c13
-rw-r--r--src/cgame/cg_particles.c4
-rw-r--r--src/cgame/cg_players.c10
-rw-r--r--src/game/bg_misc.c40
-rw-r--r--src/game/bg_public.h3
6 files changed, 39 insertions, 34 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 6d062b1d..b9df770d 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1181,10 +1181,9 @@ typedef struct
qhandle_t sparkFlareShader;
//TA: media used for armour switching stuff
- qhandle_t helmetModel;
- qhandle_t helmetSkin;
//light armour
+ qhandle_t larmourHeadSkin;
qhandle_t larmourLegsSkin;
qhandle_t larmourTorsoSkin;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 249b86c9..da6b5cba 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -737,7 +737,7 @@ static void CG_RegisterGraphics( void )
cgs.media.greenBuildShader = trap_R_RegisterShader("gfx/2d/greenbuild" );
cgs.media.redBuildShader = trap_R_RegisterShader("gfx/2d/redbuild" );
cgs.media.noPowerShader = trap_R_RegisterShader("gfx/2d/nopower" );
- cgs.media.humanSpawningShader = trap_R_RegisterShader("models/buildables/replicator/rep_cyl" );
+ cgs.media.humanSpawningShader = trap_R_RegisterShader("models/buildables/telenode/rep_cyl" );
cgs.media.machinegunBrassModel = trap_R_RegisterModel( "models/weapons2/shells/m_shell.md3" );
cgs.media.shotgunBrassModel = trap_R_RegisterModel( "models/weapons2/shells/s_shell.md3" );
@@ -920,11 +920,9 @@ static void CG_RegisterClients( void )
trap_UpdateScreen( );
}
- cgs.media.helmetModel = trap_R_RegisterModel( "models/players/human_base/helmet.md3" );
- cgs.media.helmetSkin = trap_R_RegisterSkin( "models/players/human_base/helmet_default.skin" );
-
- cgs.media.larmourLegsSkin = trap_R_RegisterSkin( "models/players/sarge/lower_red.skin" );
- cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/sarge/upper_red.skin" );
+ cgs.media.larmourHeadSkin = trap_R_RegisterSkin( "models/players/trooper/head_light.skin" );
+ cgs.media.larmourLegsSkin = trap_R_RegisterSkin( "models/players/trooper/lower_light.skin" );
+ cgs.media.larmourTorsoSkin = trap_R_RegisterSkin( "models/players/trooper/upper_light.skin" );
cgs.media.jetpackModel = trap_R_RegisterModel( "models/players/human_base/jetpack.md3" );
cgs.media.jetpackFlashModel = trap_R_RegisterModel( "models/players/human_base/jetpack_flash.md3" );
@@ -1634,7 +1632,6 @@ void CG_AssetCache( void )
cgDC.Assets.sliderBar = trap_R_RegisterShaderNoMip( ASSET_SLIDER_BAR );
cgDC.Assets.sliderThumb = trap_R_RegisterShaderNoMip( ASSET_SLIDER_THUMB );
}
-//TA: FIXME: preliminary integration of CG TA UI stuff
/*
=================
@@ -1680,7 +1677,7 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum )
//TA: moved up for LoadHudMenu
String_Init( );
- //TA: FIXME: TA UI
+ //TA: TA UI
CG_AssetCache( );
CG_LoadHudMenu( ); // load new hud stuff
diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c
index a96ec8db..62405d10 100644
--- a/src/cgame/cg_particles.c
+++ b/src/cgame/cg_particles.c
@@ -1558,8 +1558,8 @@ static void CG_GarbageCollectParticleSystems( void )
ps->valid = qfalse;
//check systems where the parent cent has left the PVS
- //( centNum 0 - player entity, is always valid )
- if( ps->attachment.centValid && ps->attachment.centNum != 0 )
+ //( local player entity is always valid )
+ if( ps->attachment.centValid && ps->attachment.centNum != cg.clientNum )
{
if( !cg_entities[ ps->attachment.centNum ].valid )
ps->valid = qfalse;
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index e5e2ec28..dd62695a 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2040,16 +2040,12 @@ void CG_Player( centity_t *cent )
//
// add the head
//
+ head.hModel = ci->headModel;
+
if( held & ( 1 << UP_HELMET ) )
- {
- head.hModel = cgs.media.helmetModel;
- head.customSkin = cgs.media.helmetSkin;
- }
+ head.customSkin = cgs.media.larmourHeadSkin;
else
- {
- head.hModel = ci->headModel;
head.customSkin = ci->headSkin;
- }
if( !head.hModel )
return;
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 4eb0e9d9..185d58b7 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -22,10 +22,10 @@ buildableAttributes_t bg_buildableList[ ] =
{
{
BA_A_SPAWN, //int buildNum;
- "bioegg", //char *buildName;
+ "eggpod", //char *buildName;
"Egg", //char *humanName;
"team_alien_spawn", //char *entityName;
- { "models/buildables/bioegg/bioegg.md3", 0, 0, 0 },
+ { "models/buildables/eggpod/eggpod.md3", 0, 0, 0 },
{ -15, -15, -15 }, //vec3_t mins;
{ 15, 15, 15 }, //vec3_t maxs;
0.0f, //float zOffset;
@@ -229,7 +229,7 @@ buildableAttributes_t bg_buildableList[ ] =
"overmind", //char *buildName;
"Overmind", //char *humanName;
"team_alien_overmind", //char *entityName;
- { "models/buildables/hivemind/hivemind.md3", 0, 0, 0 },
+ { "models/buildables/overmind/overmind.md3", 0, 0, 0 },
{ -45, -45, -15 }, //vec3_t mins;
{ 45, 45, 95 }, //vec3_t maxs;
0.0f, //float zOffset;
@@ -294,10 +294,10 @@ buildableAttributes_t bg_buildableList[ ] =
},
{
BA_H_SPAWN, //int buildNum;
- "replicator", //char *buildName;
- "Replicator", //char *humanName;
+ "telenode", //char *buildName;
+ "Telenode", //char *humanName;
"team_human_spawn", //char *entityName;
- { "models/buildables/replicator/replicator.md3", 0, 0, 0 },
+ { "models/buildables/telenode/telenode.md3", 0, 0, 0 },
{ -40, -40, -4 }, //vec3_t mins;
{ 40, 40, 4 }, //vec3_t maxs;
0.0f, //float zOffset;
@@ -466,10 +466,10 @@ buildableAttributes_t bg_buildableList[ ] =
},
{
BA_H_ARMOURY, //int buildNum;
- "mcu", //char *buildName;
+ "arm", //char *buildName;
"Armoury", //char *humanName;
"team_human_armoury", //char *entityName;
- { "models/buildables/mcu/mcu.md3", 0, 0, 0 },
+ { "models/buildables/arm/arm.md3", 0, 0, 0 },
{ -40, -40, -13 }, //vec3_t mins;
{ 40, 40, 50 }, //vec3_t maxs;
0.0f, //float zOffset;
@@ -677,6 +677,9 @@ char *BG_FindModelsForBuildable( int bclass, int modelNum )
{
int i;
+ if( bg_buildableOverrideList[ bclass ].models[ modelNum ][ 0 ] != 0 )
+ return bg_buildableOverrideList[ bclass ].models[ modelNum ];
+
for( i = 0; i < bg_numBuildables; i++ )
{
if( bg_buildableList[ i ].buildNum == bclass )
@@ -701,10 +704,20 @@ void BG_FindBBoxForBuildable( int bclass, vec3_t mins, vec3_t maxs )
if( bg_buildableList[ i ].buildNum == bclass )
{
if( mins != NULL )
+ {
VectorCopy( bg_buildableList[ i ].mins, mins );
+
+ if( VectorLength( bg_buildableOverrideList[ bclass ].mins ) )
+ VectorCopy( bg_buildableOverrideList[ bclass ].mins, mins );
+ }
if( maxs != NULL )
+ {
VectorCopy( bg_buildableList[ i ].maxs, maxs );
+
+ if( VectorLength( bg_buildableOverrideList[ bclass ].maxs ) )
+ VectorCopy( bg_buildableOverrideList[ bclass ].maxs, maxs );
+ }
return;
}
@@ -726,6 +739,9 @@ float BG_FindZOffsetForBuildable( int bclass )
{
int i;
+ if( bg_buildableOverrideList[ bclass ].zOffset != 0.0f )
+ return bg_buildableOverrideList[ bclass ].zOffset;
+
for( i = 0; i < bg_numBuildables; i++ )
{
if( bg_buildableList[ i ].buildNum == bclass )
@@ -1780,7 +1796,6 @@ classAttributes_t bg_classList[ ] =
100.0f, //float stopSpeed;
170.0f, //float jumpMagnitude;
{ PCL_NONE, PCL_NONE, PCL_NONE }, //int children[ 3 ];
- 0, //int timetoevolve;
BMOFO_VALUE //int value;
},
{
@@ -1818,7 +1833,6 @@ classAttributes_t bg_classList[ ] =
100.0f, //float stopSpeed;
220.0f, //float jumpMagnitude;
{ PCL_NONE, PCL_NONE, PCL_NONE }, //int children[ 3 ];
- 0, //int timetoevolve;
0 //int value;
},
{
@@ -1833,7 +1847,7 @@ classAttributes_t bg_classList[ ] =
"bsuit", ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), { 0, 0, 0 }, { 0, 0, 0, },
{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 0.0f, 0, 0, 0, 0.0f, 0, 0, WP_NONE, 0.0f, 0,
- 0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0, 0
+ 0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0
}
};
@@ -3084,8 +3098,8 @@ weaponAttributes_t bg_weapons[ ] =
0, //int price;
( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
SLOT_WEAPON, //int slots;
- "venom", //char *weaponName;
- "Venom", //char *weaponHumanName;
+ "bite", //char *weaponName;
+ "Bite", //char *weaponHumanName;
0, //int quan;
0, //int clips;
0, //int maxClips;
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index d1216852..ade44adf 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -906,7 +906,6 @@ typedef struct
float jumpMagnitude;
int children[ 3 ];
- int timeToEvolve;
int value;
} classAttributes_t;
@@ -990,7 +989,7 @@ typedef struct
typedef struct
{
- char models[ MAX_QPATH ][ MAX_BUILDABLE_MODELS ];
+ char models[ MAX_BUILDABLE_MODELS ][ MAX_QPATH ];
vec3_t mins;
vec3_t maxs;
generated by cgit (git 2.34.1) at 2024-11-15 20:35:56 +0000