vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tossed and shell hitting player sound 

Made clash audiable from a bit further away
This commit is contained in:
Sryder13 2017-10-24 20:59:09 +01:00
parent 59d670f902
commit 436f7cb7c6
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/info.c
View File

@ -14392,7 +14392,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_FAKEITEM1, // spawnstate S_FAKEITEM1, // spawnstate
2, // spawnhealth 2, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -14419,7 +14419,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_BANANAITEM, // spawnstate S_BANANAITEM, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -14662,7 +14662,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_GREENITEM1, // spawnstate S_GREENITEM1, // spawnstate
7, // spawnhealth 7, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_tink, // attacksound sfx_tink, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -14824,7 +14824,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_REDITEM1, // spawnstate S_REDITEM1, // spawnstate
1, // spawnhealth 1, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -14851,7 +14851,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_REDITEM1, // spawnstate S_REDITEM1, // spawnstate
1, // spawnhealth 1, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate
@ -14905,7 +14905,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_BOMBAIR, // spawnstate S_BOMBAIR, // spawnstate
105, // spawnhealth 105, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_tossed, // seesound
8, // reactiontime 8, // reactiontime
sfx_None, // attacksound sfx_None, // attacksound
S_NULL, // painstate S_NULL, // painstate

2
src/k_kart.c
View File

@ -2029,6 +2029,8 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
P_SetTarget(&mo->target, player->mo); P_SetTarget(&mo->target, player->mo);
S_StartSound(player->mo, mo->info->seesound);
if (mo) if (mo)
{ {
angle_t fa = player->mo->angle>>ANGLETOFINESHIFT; angle_t fa = player->mo->angle>>ANGLETOFINESHIFT;

5
src/p_map.c
View File

@ -678,6 +678,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
// Player Damage // Player Damage
P_DamageMobj(thing, tmthing, tmthing->target, 1); P_DamageMobj(thing, tmthing, tmthing->target, 1);
if (tmthing->type == MT_GREENITEM || tmthing->type == MT_REDITEM || tmthing->type == MT_REDITEMDUD)
S_StartSound(thing, sfx_shelit);
// This Item Damage // This Item Damage
if (tmthing->eflags & MFE_VERTICALFLIP) if (tmthing->eflags & MFE_VERTICALFLIP)
@ -1095,6 +1097,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
// Player Damage // Player Damage
P_DamageMobj(tmthing, thing, thing->target, 1); P_DamageMobj(tmthing, thing, thing->target, 1);
if (thing->type == MT_GREENITEM || thing->type == MT_REDITEM || thing->type == MT_REDITEMDUD)
S_StartSound(tmthing, sfx_shelit);
// Other Item Damage // Other Item Damage
if (thing->eflags & MFE_VERTICALFLIP) if (thing->eflags & MFE_VERTICALFLIP)
thing->z -= thing->height; thing->z -= thing->height;

4
src/sounds.c
View File

@ -497,7 +497,9 @@ sfxinfo_t S_sfx[NUMSFX] =
{"mkitm7", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"mkitm7", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitm8", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"mkitm8", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"mkitmF", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"mkitmF", true, 72, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"clash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"clash", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"tossed", false,150, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"shelit", false, 64, 8, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart - Skin sounds // SRB2kart - Skin sounds
{"kwin", false, 64, 0, -1, NULL, 0, SKSWIN, -1, LUMPERROR}, {"kwin", false, 64, 0, -1, NULL, 0, SKSWIN, -1, LUMPERROR},

2
src/sounds.h
View File

@ -569,6 +569,8 @@ typedef enum
sfx_mkitm8, sfx_mkitm8,
sfx_mkitmF, sfx_mkitmF,
sfx_clash, sfx_clash,
sfx_tossed,
sfx_shelit,
sfx_kwin, sfx_kwin,
sfx_klose, sfx_klose,