summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cgame/cg_local.h5
-rw-r--r--src/cgame/cg_main.c4
-rw-r--r--src/cgame/cg_weapons.c1
3 files changed, 0 insertions, 10 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 01308332..4b375d43 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1280,7 +1280,6 @@ typedef struct
qhandle_t humanBleedPS;
qhandle_t teslaZapTS;
- qhandle_t massDriverTS;
sfxHandle_t lCannonWarningSound;
sfxHandle_t lCannonWarningSound2;
@@ -1292,9 +1291,6 @@ typedef struct
qhandle_t healthCross3X;
qhandle_t healthCrossMedkit;
qhandle_t healthCrossPoisoned;
-
- qhandle_t squadMarkerH;
- qhandle_t squadMarkerV;
} cgMedia_t;
typedef struct
@@ -1741,7 +1737,6 @@ void CG_MissileHitWall( weapon_t weapon, weaponMode_t weaponMode, int cli
void CG_MissileHitPlayer( weapon_t weapon, weaponMode_t weaponMode, vec3_t origin, vec3_t dir, int entityNum, int charge );
void CG_Bullet( vec3_t origin, int sourceEntityNum, vec3_t normal, qboolean flesh, int fleshEntityNum );
void CG_ShotgunFire( entityState_t *es );
-void CG_MassDriverFire( entityState_t *es );
void CG_AddViewWeapon (playerState_t *ps);
void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent );
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index c4c47baa..3a591a37 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -853,10 +853,6 @@ static void CG_RegisterGraphics( void )
cgs.media.healthCrossMedkit = trap_R_RegisterShader( "ui/assets/neutral/cross_medkit.tga" );
cgs.media.healthCrossPoisoned = trap_R_RegisterShader( "ui/assets/neutral/cross_poison.tga" );
- // squad markers
- cgs.media.squadMarkerH = trap_R_RegisterShader( "ui/assets/neutral/squad_h" );
- cgs.media.squadMarkerV = trap_R_RegisterShader( "ui/assets/neutral/squad_v" );
-
cgs.media.upgradeClassIconShader = trap_R_RegisterShader( "icons/icona_upgrade.tga" );
cgs.media.balloonShader = trap_R_RegisterShader( "gfx/sprites/chatballoon" );
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index a4f8b667..63455c16 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -654,7 +654,6 @@ void CG_InitWeapons( void )
CG_RegisterWeapon( i );
cgs.media.level2ZapTS = CG_RegisterTrailSystem( "models/weapons/lev2zap/lightning" );
- cgs.media.massDriverTS = CG_RegisterTrailSystem( "models/weapons/mdriver/fireTS" );
}