summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--depend12
-rw-r--r--entities.def37
-rw-r--r--src/cgame/cg_ents.c4
-rw-r--r--src/cgame/cg_local.h19
-rw-r--r--src/game/bg_public.h1
-rw-r--r--src/game/g_misc.c60
-rw-r--r--src/game/g_spawn.c2
8 files changed, 0 insertions, 136 deletions
diff --git a/Makefile b/Makefile
index 71dae080..2b87f789 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ CGOBJ = \
$(CGDIRNAME)/cg_consolecmds.o \
$(CGDIRNAME)/cg_buildable.o \
$(CGDIRNAME)/cg_animmapobj.o \
- $(CGDIRNAME)/cg_spriter.o \
$(CGDIRNAME)/cg_draw.o \
$(CGDIRNAME)/cg_drawtools.o \
$(CGDIRNAME)/cg_effects.o \
diff --git a/depend b/depend
index 27176b53..92cb5d62 100644
--- a/depend
+++ b/depend
@@ -317,10 +317,6 @@ releasei386-glibc/cgame/cg_snapshot.o: src/cgame/cg_snapshot.c src/cgame/cg_loca
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
-releasei386-glibc/cgame/cg_spriter.o: src/cgame/cg_spriter.c src/cgame/cg_local.h \
- src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
- src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
- src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
releasei386-glibc/cgame/cg_syscalls.o: src/cgame/cg_syscalls.c src/cgame/cg_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
@@ -421,10 +417,6 @@ debugi386-glibc/cgame/cg_snapshot.o: src/cgame/cg_snapshot.c src/cgame/cg_local.
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
-debugi386-glibc/cgame/cg_spriter.o: src/cgame/cg_spriter.c src/cgame/cg_local.h \
- src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
- src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
- src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
debugi386-glibc/cgame/cg_syscalls.o: src/cgame/cg_syscalls.c src/cgame/cg_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
@@ -525,10 +517,6 @@ qvm/cgame/cg_snapshot.asm: src/cgame/cg_snapshot.c src/cgame/cg_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
-qvm/cgame/cg_spriter.asm: src/cgame/cg_spriter.c src/cgame/cg_local.h \
- src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
- src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
- src/ui/ui_shared.h src/ui/keycodes.h ui/menudef.h
qvm/cgame/cg_syscalls.asm: src/cgame/cg_syscalls.c src/cgame/cg_local.h \
src/game/q_shared.h src/game/surfaceflags.h src/cgame/tr_types.h \
src/game/bg_public.h src/game/tremulous.h src/cgame/cg_public.h \
diff --git a/entities.def b/entities.def
index 1254ae7a..df331a0a 100644
--- a/entities.def
+++ b/entities.def
@@ -871,43 +871,6 @@ TRIGGER_TOGGLE: With this set triggering the entity disables the model altogethe
//=============================================================================
-/*QUAKED misc_spriter (1 .5 .25) (-16 -16 -16) (16 16 16) DISABLE_OVERDRAW AMBIENT_LIGHT SPAWN_DISABLED
-A simple particle system producing entity.
-
--------- KEYS --------
-angles: The direction the sprites will move in initially. angles is a vector of PITCH YAW ROLL. For example a value of "90 0 0" would emit sprites downwards. Special attention should be paid to the roll angle - this governs the rotation of the sprites. Setting this to 360 or greater will produce random rotations on the sprites.
-
-speed: The speed at which sprites are launched. This will remain constant unless acted upon by an acceleration (see below).
-
-acceleration: This is a vector that specifys the acceleration that sprites launched will be subject to. This is not a normalised vector, magnitude is incorporated.
-
-wait: The lifetime of sprites launched in 1000ths of a second.
-
-bounce: A value reflecting the proportion of velocity that is carried through by the sprite when it collides with a surface. e.g. 1.0 means all velocity is reflected, 0.5 means half. A value of 0.0 (or no bounce key at all) results in sprites that do not collide with brushes.
-
-alpha: Two numerical values giving the start and end alpha values for the sprites. e.g. a value "255 0" gives sprites that start 100% opaque and end up transparent.
-
-radius: Similar to alpha, this gives the start and end radii of the sprites. "16 64" will give sprites that start 16 units big and end up 64 units big.
-
-random: The angle about "angles" that the launch vector is randomised by. Maximum 180 degrees.
-
-count: The number of sprites to launch every second. Defaults to 1.
-
-targetShaderName: The full name of the shader to use for the sprites.
-
--------- SPAWNFLAGS --------
-DISABLE_OVERDRAW: This turns overdraw protection off. With overdraw protection on sprites too close to the client's viewport are culled to prevent excessive fps loss.
-
-AMBIENT_LIGHT: Sprites are rendered with the ambient light value, otherwise sprites are fullbright.
-
-SPAWN_DISABLED: Spawn disabled.
-
--------- NOTES --------
-Triggering this entity toggles it.
-*/
-
-//=============================================================================
-
/*QUAKED misc_particle_system (1 .5 .25) (-8 -8 -8) (8 8 8) SPAWN_DISABLED
A particle system entity.
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index d3672465..44779bf6 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -992,10 +992,6 @@ static void CG_AddCEntity( centity_t *cent )
CG_Speaker( cent );
break;
- case ET_SPRITER:
- CG_Spriter( cent );
- break;
-
case ET_PARTICLE_SYSTEM:
CG_ParticleSystemEntity( cent );
break;
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 61c15f95..69c6946b 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -523,7 +523,6 @@ typedef enum
LE_SPRITE_EXPLOSION,
LE_FRAGMENT,
LE_MOVE_SCALE_FADE,
- LE_SPRITER,
LE_FALL_SCALE_FADE,
LE_FADE_RGB,
LE_SCALE_FADE
@@ -581,12 +580,6 @@ typedef struct localEntity_s
refEntity_t refEntity;
- //TA: random stuff for cg_spriter.c
- vec3_t acceleration;
- float initAlp, finalAlp;
- float initRad, finalRad;
- qboolean overdraw;
- qboolean realLight;
unsigned int sortKey;
//TA: lightning bolt endpoint entities
@@ -1598,18 +1591,6 @@ void CG_HumanBuildableExplosion( vec3_t origin, vec3_t dir );
void CG_AlienBuildableExplosion( vec3_t origin, vec3_t dir );
//
-// cg_spriter.c
-//
-void CG_Spriter( centity_t *cent );
-void CG_LaunchSprite( const vec3_t p, const vec3_t vel, const vec3_t accel,
- float spread, float bounce,
- float initRad, float finalRad,
- float initAlp, float finalAlp,
- float rotation,
- int startTime, int shaderTime, int duration,
- qhandle_t hShader, qboolean overdraw, qboolean realLight );
-
-//
// cg_animmapobj.c
//
void CG_animMapObj( centity_t *cent );
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index a90bf0cc..07a27850 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -1226,7 +1226,6 @@ typedef enum
ET_GRAPPLE, // grapple hooked on wall
ET_CORPSE,
- ET_SPRITER,
ET_PARTICLE_SYSTEM,
ET_ANIMMAPOBJ,
ET_MODELDOOR,
diff --git a/src/game/g_misc.c b/src/game/g_misc.c
index 3c5314b4..99eff1ab 100644
--- a/src/game/g_misc.c
+++ b/src/game/g_misc.c
@@ -244,66 +244,6 @@ void SP_misc_portal_camera( gentity_t *ent )
/*
===============
-SP_use_spriter
-
-Use function for spriter
-===============
-*/
-void SP_use_spriter( gentity_t *self, gentity_t *other, gentity_t *activator )
-{
- //toggle EF_NODRAW
- self->s.eFlags ^= EF_NODRAW;
-}
-
-/*
-===============
-SP_spawn_spriter
-
-Spawn function for spriter
-===============
-*/
-void SP_misc_spriter( gentity_t *self )
-{
- G_SetOrigin( self, self->s.origin );
-
- //set a bunch of stuff to be visible client side
- VectorCopy( self->acceleration, self->s.origin2 );
-
- self->s.time = (int)self->speed;
- self->s.time2 = (int)self->wait;
- self->s.powerups = (int)self->random;
- self->s.angles2[ 0 ] = self->physicsBounce;
-
- self->s.modelindex = self->pos1[ 0 ];
- self->s.modelindex2 = self->pos1[ 1 ];
-
- self->s.legsAnim = self->pos2[ 0 ];
- self->s.torsoAnim = self->pos2[ 1 ];
-
- if( self->count > 0 )
- self->s.angles2[ 1 ] = ( 1000 / self->count );
- else
- self->s.angles2[ 1 ] = 1000;
-
- //add the shader to the client precache list
- self->s.weapon = G_ShaderIndex( self->targetShaderName );
-
-/* if( self->spawnflags & 1 )
- self->s.eFlags |= EF_OVERDRAW_OFF;*/
- if( self->spawnflags & ( 1 << 1 ) )
- self->s.eFlags |= EF_REAL_LIGHT;
- if( self->spawnflags & ( 1 << 2 ) )
- self->s.eFlags |= EF_NODRAW;
-
- self->use = SP_use_spriter;
-
- self->s.eType = ET_SPRITER;
-
- trap_LinkEntity( self );
-}
-
-/*
-===============
SP_use_particle_system
Use function for particle_system
diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c
index b737a8ab..eae5c724 100644
--- a/src/game/g_spawn.c
+++ b/src/game/g_spawn.c
@@ -215,7 +215,6 @@ void SP_shooter_plasma( gentity_t *ent );
void SP_shooter_grenade( gentity_t *ent );
//TA:
-void SP_misc_spriter( gentity_t *ent );
void SP_misc_particle_system( gentity_t *ent );
void SP_misc_anim_model( gentity_t *ent );
void SP_misc_light_flare( gentity_t *ent );
@@ -288,7 +287,6 @@ spawn_t spawns[ ] =
{ "misc_portal_surface", SP_misc_portal_surface },
{ "misc_portal_camera", SP_misc_portal_camera },
- { "misc_spriter", SP_misc_spriter },
{ "misc_particle_system", SP_misc_particle_system },
{ "misc_anim_model", SP_misc_anim_model },
{ "misc_light_flare", SP_misc_light_flare },
generated by cgit (git 2.34.1) at 2024-12-25 18:34:10 +0000