blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-02-21 11:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added Q1 teleport entity event.

Browse source
This commit is contained in:
Knightmare66 2020-03-09 15:11:50 -04:00
parent f2d381eaf1
commit f8e43f0a4b
11 changed files with 71 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
3zb2/q_shared.h
View file

@ -1203,13 +1203,14 @@ typedef enum
EV_FALLFAR,
EV_PLAYER_TELEPORT,
EV_OTHER_TELEPORT,
//Knightmare added
EV_LOUDSTEP, //loud footstep from landing
EV_SLOSH, //Sloshing in ankle-deep water
EV_WADE, //wading or treading water
EV_WADE_MUD, //wading in mud
EV_CLIMB_LADDER //climbing ladder
//end Knightmare
// Knightmare added
EV_LOUDSTEP, // loud footstep from landing
EV_SLOSH, // Sloshing in ankle-deep water
EV_WADE, // wading or treading water
EV_WADE_MUD, // wading in mud
EV_CLIMB_LADDER, //climbing ladder
EV_PLAYER_TELEPORT_Q1 // Q1 teleport, sounds in rogue pak0.pak
// end Knightmare
} entity_event_t;

15
client/cl_event.c
View file

@ -221,11 +221,17 @@ void CL_EntityEvent (entity_state_t *ent)
switch (ent->event)
{
case EV_ITEM_RESPAWN:
S_StartSound (NULL, ent->number, CHAN_WEAPON, S_RegisterSound("items/respawn1.wav"), 1, ATTN_IDLE, 0);
// S_StartSound (NULL, ent->number, CHAN_WEAPON, S_RegisterSound("items/respawn1.wav"), 1, ATTN_IDLE, 0);
S_StartSound (NULL, ent->number, CHAN_WEAPON, clMedia.sfx_item_respawn, 1, ATTN_IDLE, 0);
CL_ItemRespawnParticles (ent->origin);
break;
case EV_PLAYER_TELEPORT:
S_StartSound (NULL, ent->number, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_IDLE, 0);
// S_StartSound (NULL, ent->number, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_IDLE, 0);
S_StartSound (NULL, ent->number, CHAN_WEAPON, clMedia.sfx_player_teleport, 1, ATTN_IDLE, 0);
CL_TeleportParticles (ent->origin);
break;
case EV_PLAYER_TELEPORT_Q1:
S_StartSound (NULL, ent->number, CHAN_WEAPON, clMedia.sfx_player_teleport_q1[rand()%6], 1, ATTN_IDLE, 0);
CL_TeleportParticles (ent->origin);
break;
case EV_FOOTSTEP:
@ -240,7 +246,8 @@ void CL_EntityEvent (entity_state_t *ent)
break;
//end Knightmare
case EV_FALLSHORT:
S_StartSound (NULL, ent->number, CHAN_AUTO, S_RegisterSound ("player/land1.wav"), 1, ATTN_NORM, 0);
// S_StartSound (NULL, ent->number, CHAN_AUTO, S_RegisterSound ("player/land1.wav"), 1, ATTN_NORM, 0);
S_StartSound (NULL, ent->number, CHAN_AUTO, clMedia.sfx_player_land, 1, ATTN_NORM, 0);
break;
case EV_FALL:
S_StartSound (NULL, ent->number, CHAN_AUTO, S_RegisterSound ("*fall2.wav"), 1, ATTN_NORM, 0);
@ -248,7 +255,7 @@ void CL_EntityEvent (entity_state_t *ent)
case EV_FALLFAR:
S_StartSound (NULL, ent->number, CHAN_AUTO, S_RegisterSound ("*fall1.wav"), 1, ATTN_NORM, 0);
break;
//Knightmare- more Lazarus sounds
// Knightmare- more Lazarus sounds
case EV_SLOSH:
S_StartSound (NULL, ent->number, CHAN_BODY, clMedia.sfx_slosh[rand()&3], 0.5, ATTN_NORM, 0);
break;

6
client/cl_lights.c
View file

@ -376,7 +376,8 @@ void CL_ParseMuzzleFlash (void)
dl->die = cl.time + 1.0;
//Knightmare changed
// S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("weapons/grenlf1a.wav"), 1, ATTN_NORM, 0);
S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_NORM, 0);
// S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_NORM, 0);
S_StartSound (NULL, i, CHAN_WEAPON, clMedia.sfx_player_teleport, 1, ATTN_NORM, 0);
CL_LogoutEffect (pl->current.origin, weapon);
break;
case MZ_LOGOUT:
@ -384,7 +385,8 @@ void CL_ParseMuzzleFlash (void)
dl->die = cl.time + 1.0;
//Knightmare changed
// S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("weapons/grenlf1a.wav"), 1, ATTN_NORM, 0);
S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_NORM, 0);
// S_StartSound (NULL, i, CHAN_WEAPON, S_RegisterSound("misc/tele1.wav"), 1, ATTN_NORM, 0);
S_StartSound (NULL, i, CHAN_WEAPON, clMedia.sfx_player_teleport, 1, ATTN_NORM, 0);
CL_LogoutEffect (pl->current.origin, weapon);
break;
case MZ_RESPAWN:

14
client/cl_tempent.c
View file

@ -199,12 +199,24 @@ void CL_RegisterTEntSounds (void)
Com_sprintf (name, sizeof(name), "player/pl_ladder%i.wav", i+1);
clMedia.sfx_ladder[i] = S_RegisterSound (name);
}
// player loud step
clMedia.sfx_player_land = S_RegisterSound ("player/land1.wav");
// player teleport
clMedia.sfx_player_teleport = S_RegisterSound ("misc/tele1.wav");
// Q1 player teleport (in rogue pak0.pak)
for (i=0; i<5; i++) {
Com_sprintf (name, sizeof(name), "misc/r_tele%i.wav", i+1);
clMedia.sfx_player_teleport_q1[i] = S_RegisterSound (name);
}
// item respawn
clMedia.sfx_item_respawn = S_RegisterSound ("items/respawn1.wav");
// read footstep defintion file
if (cl_footstep_override->value)
ReadTextureSurfaceAssignments();
// end Lazarus footstep sounds
S_RegisterSound ("player/land1.wav");
// S_RegisterSound ("player/land1.wav");
S_RegisterSound ("player/fall2.wav");
S_RegisterSound ("player/fall1.wav");
}

4
client/client.h
View file

@ -928,6 +928,10 @@ typedef struct {
struct sfx_s *sfx_wade[4];
struct sfx_s *sfx_mud_wade[2];
struct sfx_s *sfx_ladder[4];
struct sfx_s *sfx_player_land;
struct sfx_s *sfx_player_teleport;
struct sfx_s *sfx_player_teleport_q1[5];
struct sfx_s *sfx_item_respawn;
struct model_s *mod_explode;
struct model_s *mod_smoke;

15
game/q_shared.h
View file

@ -1494,13 +1494,14 @@ typedef enum
EV_FALLFAR,
EV_PLAYER_TELEPORT,
EV_OTHER_TELEPORT,
//Knightmare added
EV_LOUDSTEP, //loud footstep from landing
EV_SLOSH, //Sloshing in ankle-deep water
EV_WADE, //wading or treading water
EV_WADE_MUD, //wading in mud
EV_CLIMB_LADDER //climbing ladder
//end Knightmare
// Knightmare added
EV_LOUDSTEP, // loud footstep from landing
EV_SLOSH, // Sloshing in ankle-deep water
EV_WADE, // wading or treading water
EV_WADE_MUD, // wading in mud
EV_CLIMB_LADDER, //climbing ladder
EV_PLAYER_TELEPORT_Q1 // Q1 teleport, sounds in rogue pak0.pak
// end Knightmare
} entity_event_t;

4
missionpack/g_mappack.c
View file

@ -21,7 +21,7 @@ void torch_think (edict_t *self)
self->nextthink = level.time + FRAMETIME;
}
void SP_light_torch (edict_t *self) //New function by Beel.
void SP_light_torch (edict_t *self) // New function by Beel.
{
self->movetype = MOVETYPE_NONE;
self->solid = SOLID_NOT;
@ -46,7 +46,7 @@ model=models/objects/fire/"
*/
void smallflame_think (edict_t *self)
{
if(self->s.frame >= 10) //was 5
if (self->s.frame >= 10) // was 5
self->s.frame = 0;
else
self->s.frame++;

2
missionpack/g_misc.c
View file

@ -4481,7 +4481,7 @@ void misc_gekk_writhe_think (edict_t *self)
}
}
//gib function
// gib function
void misc_gekk_writhe_use (edict_t *self, edict_t *other, edict_t *activator)
{
int damage = 20;

4
missionpack/g_monster.c
View file

@ -950,8 +950,12 @@ void monster_triggered_spawn (edict_t *self)
self->air_finished = level.time + 12;
// Knightmare- teleport effect for Q1 monsters
if (self->flags & FL_Q1_MONSTER) {
#ifdef KMQUAKE2_ENGINE_MOD
self->s.event = EV_PLAYER_TELEPORT_Q1;
#else
self->s.event = EV_PLAYER_TELEPORT;
Q1TeleportSounds(self);
#endif
}
// end Knightmare
gi.linkentity (self);

16
missionpack/q_shared.h
View file

@ -1310,14 +1310,14 @@ typedef enum
EV_FALLFAR,
EV_PLAYER_TELEPORT,
EV_OTHER_TELEPORT,
//Knightmare added
EV_LOUDSTEP, //loud footstep from landing
EV_SLOSH, //Sloshing in ankle-deep water
EV_WADE, //wading or treading water
EV_WADE_MUD, //wading in mud
EV_CLIMB_LADDER //climbing ladder
//end Knightmare
// Knightmare added
EV_LOUDSTEP, // loud footstep from landing
EV_SLOSH, // Sloshing in ankle-deep water
EV_WADE, // wading or treading water
EV_WADE_MUD, // wading in mud
EV_CLIMB_LADDER, //climbing ladder
EV_PLAYER_TELEPORT_Q1 // Q1 teleport, sounds in rogue pak0.pak
// end Knightmare
} entity_event_t;

15
zaero/q_shared.h
View file

@ -1077,13 +1077,14 @@ typedef enum
EV_FALLFAR,
EV_PLAYER_TELEPORT,
EV_OTHER_TELEPORT,
//Knightmare added
EV_LOUDSTEP, //loud footstep from landing
EV_SLOSH, //Sloshing in ankle-deep water
EV_WADE, //wading or treading water
EV_WADE_MUD, //wading in mud
EV_CLIMB_LADDER //climbing ladder
//end Knightmare
// Knightmare added
EV_LOUDSTEP, // loud footstep from landing
EV_SLOSH, // Sloshing in ankle-deep water
EV_WADE, // wading or treading water
EV_WADE_MUD, // wading in mud
EV_CLIMB_LADDER, //climbing ladder
EV_PLAYER_TELEPORT_Q1 // Q1 teleport, sounds in rogue pak0.pak
// end Knightmare
} entity_event_t;