diff --git a/engine/code/cgame/cg_event.c b/engine/code/cgame/cg_event.c index 4ae06460..291ea648 100644 --- a/engine/code/cgame/cg_event.c +++ b/engine/code/cgame/cg_event.c @@ -1391,11 +1391,6 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) { CG_ShowDebris( cent->lerpOrigin, es->eventParm, EV_EMIT_DEBRIS_GLASS ); break; - case EV_EARTHQUAKE: - DEBUGNAME("EV_EARTHQUAKE"); - CG_StartEarthquake((es->eventParm & 0x0F) + 1, ((1 + ((es->eventParm & 0xF0) >> 4)) * 2000) + 1000); - break; - case EV_EXPLOSION: DEBUGNAME("EV_EXPLOSION"); diff --git a/engine/code/game/bg_public.h b/engine/code/game/bg_public.h index 66b9756d..ec30c51d 100644 --- a/engine/code/game/bg_public.h +++ b/engine/code/game/bg_public.h @@ -626,7 +626,6 @@ typedef enum { EV_EMIT_DEBRIS_FLESH, // emit gibs EV_EMIT_DEBRIS_GLASS, // emite shards of glass - EV_EARTHQUAKE, EV_EXPLOSION, EV_PARTICLES_GRAVITY, EV_PARTICLES_LINEAR, diff --git a/engine/code/game/g_spawn.c b/engine/code/game/g_spawn.c index aba9edfe..765a9c39 100644 --- a/engine/code/game/g_spawn.c +++ b/engine/code/game/g_spawn.c @@ -175,8 +175,6 @@ void SP_target_kill (gentity_t *ent); void SP_target_position (gentity_t *ent); void SP_target_location (gentity_t *ent); void SP_target_push (gentity_t *ent); -void SP_target_debrisemitter (gentity_t *ent); -void SP_target_earthquake (gentity_t *ent); void SP_light (gentity_t *self); void SP_info_null (gentity_t *self); @@ -275,8 +273,6 @@ spawn_t spawns[] = { {"target_position", SP_target_position}, {"target_location", SP_target_location}, {"target_push", SP_target_push}, - {"target_debrisemitter", SP_target_debrisemitter}, - {"target_earthquake", SP_target_earthquake}, {"light", SP_light}, {"path_corner", SP_path_corner}, diff --git a/engine/code/game/g_target.c b/engine/code/game/g_target.c index 3c243c9c..bb7e1897 100644 --- a/engine/code/game/g_target.c +++ b/engine/code/game/g_target.c @@ -466,30 +466,3 @@ void SP_target_location( gentity_t *self ){ G_SetOrigin( self, self->s.origin ); } -//========================================================== - -/*QUAKED target_debrisemitter (.5 .5 .5) (-8 -8 -8) (8 8 8) DARK_DEBRIS -Emits chunks of debris. -If no spawnflag is set, the entity will emit light chunks of concrete -If the DARK_DEBRIS spawnflag is set, the entity will emit darker chunks of concrete -*/ - -void target_debrisemitter_use (gentity_t *self, gentity_t *other, gentity_t *activator) { - gentity_t *ent; - //G_AddEvent( self, EV_EMIT_DEBRIS, 0 ); //client doesn't respond to this for some reason.... - - if ( !self->count ) - self->count = 10; - - - if ( self->spawnflags & 1 ) - ent = G_TempEntity(self->s.origin, EV_EMIT_DEBRIS_DARK); - else - ent = G_TempEntity(self->s.origin, EV_EMIT_DEBRIS_NORMAL); - - ent->s.eventParm = self->count; -} - -void SP_target_debrisemitter (gentity_t *self) { - self->use = target_debrisemitter_use; -} diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 4588bed1..634e52fe 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -855,12 +855,24 @@ q3rallycode [Open project files] 0=engine\code\game\g_mover.c 1=engine\code\game\g_combat.c +2=engine\code\cgame\cg_event.c +3=engine\code\game\bg_public.h +4=engine\code\game\g_spawn.c [Selected Project Files] Main= -Selected=engine\code\game\g_combat.c +Selected=engine\code\game\g_spawn.c [engine\code\game\g_mover.c] TopLine=1817 Caret=21,1827 [engine\code\game\g_combat.c] -TopLine=1027 +TopLine=959 Caret=14,959 +[engine\code\cgame\cg_event.c] +TopLine=1380 +Caret=9,1392 +[engine\code\game\bg_public.h] +TopLine=615 +Caret=2,628 +[engine\code\game\g_spawn.c] +TopLine=164 +Caret=38,177