q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-22 03:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Several Changes. New type of breakables.

Browse source
This commit is contained in:
q3rally 2011-06-17 22:04:17 +00:00
parent 4403389e04
commit 3fb0d6c64d
5 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
engine/code/cgame/cg_event.c
View file

@ -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");

1
engine/code/game/bg_public.h
View file

@ -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,

4
engine/code/game/g_spawn.c
View file

@ -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},

27
engine/code/game/g_target.c
View file

@ -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;
}

16
q3rallycode.ppr
View file

@ -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