mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2025-01-12 04:41:17 +00:00
Merge branch 'engine-tweak' into 'master'
Engine tune-up See merge request KartKrew/Kart!45
This commit is contained in:
Sal
commit
ae7c4c44fa
3 changed files with 156 additions and 142 deletions
42
src/k_kart.c
42
src/k_kart.c
|
|
@ -3651,8 +3651,8 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
|
||||||
{
|
{
|
||||||
const INT32 numsnds = 13;
|
const INT32 numsnds = 13;
|
||||||
INT32 class = ((player->kartspeed-1)/3) + (3*((player->kartweight-1)/3)); // engine class number
|
INT32 class = ((player->kartspeed-1)/3) + (3*((player->kartweight-1)/3)); // engine class number
|
||||||
INT32 numcloseplayers = 0;
|
|
||||||
UINT8 volume = 255;
|
UINT8 volume = 255;
|
||||||
|
fixed_t volumedampen = 0;
|
||||||
INT32 targetsnd = 0;
|
INT32 targetsnd = 0;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
|
|
@ -3690,31 +3690,45 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
|
||||||
if (player->kartstuff[k_enginesnd] > 12)
|
if (player->kartstuff[k_enginesnd] > 12)
|
||||||
player->kartstuff[k_enginesnd] = 12;
|
player->kartstuff[k_enginesnd] = 12;
|
||||||
|
|
||||||
// Display player's engines are quieter
|
|
||||||
if ((player == &players[displayplayer])
|
|
||||||
|| (player == &players[secondarydisplayplayer] && splitscreen)
|
|
||||||
|| (player == &players[thirddisplayplayer] && splitscreen > 1)
|
|
||||||
|| (player == &players[fourthdisplayplayer] && splitscreen > 2))
|
|
||||||
volume = FixedDiv(volume<<FRACBITS, FixedSqrt(((splitscreen+1)*3)<<FRACBITS))>>FRACBITS;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
|
UINT8 thisvol = 0;
|
||||||
|
fixed_t dist;
|
||||||
|
|
||||||
if (!playeringame[i] || !players[i].mo || players[i].spectator || players[i].exiting)
|
if (!playeringame[i] || !players[i].mo || players[i].spectator || players[i].exiting)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ((i == displayplayer)
|
if ((i == displayplayer)
|
||||||
|| (i == secondarydisplayplayer && splitscreen)
|
|| (i == secondarydisplayplayer && splitscreen)
|
||||||
|| (i == thirddisplayplayer && splitscreen > 1)
|
|| (i == thirddisplayplayer && splitscreen > 1)
|
||||||
|| (i == fourthdisplayplayer && splitscreen > 2))
|
|| (i == fourthdisplayplayer && splitscreen > 2))
|
||||||
|
{
|
||||||
|
volumedampen += FRACUNIT; // We already know what this is gonna be, let's not waste our time.
|
||||||
continue;
|
continue;
|
||||||
if (P_AproxDistance(P_AproxDistance(player->mo->x-players[i].mo->x,
|
|
||||||
player->mo->y-players[i].mo->y), player->mo->z-players[i].mo->z) <= 3072<<FRACBITS) // engine sounds' approx. range
|
|
||||||
numcloseplayers++;
|
|
||||||
}
|
}
|
||||||
if (numcloseplayers > 1)
|
|
||||||
volume = FixedDiv(volume<<FRACBITS, FixedSqrt(numcloseplayers<<FRACBITS))>>FRACBITS;
|
dist = P_AproxDistance(P_AproxDistance(player->mo->x-players[i].mo->x,
|
||||||
|
player->mo->y-players[i].mo->y), player->mo->z-players[i].mo->z) / 2;
|
||||||
|
|
||||||
|
if (dist > 1536<<FRACBITS)
|
||||||
|
continue;
|
||||||
|
else if (dist < 160<<FRACBITS) // engine sounds' approx. range
|
||||||
|
thisvol = 255;
|
||||||
|
else
|
||||||
|
thisvol = (15 * (((160<<FRACBITS) - dist)>>FRACBITS)) / (((1536<<FRACBITS)-(160<<FRACBITS))>>(FRACBITS+4));
|
||||||
|
|
||||||
|
if (thisvol == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
volumedampen += (thisvol * 257); // 255 * 257 = FRACUNIT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (volumedampen > FRACUNIT)
|
||||||
|
volume = FixedDiv(volume<<FRACBITS, volumedampen)>>FRACBITS;
|
||||||
|
|
||||||
|
if (volume <= 0) // Might as well
|
||||||
|
return;
|
||||||
|
|
||||||
S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class*numsnds), volume);
|
S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class*numsnds), volume);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons
|
||||||
#if defined (_WIN32_WCE) || defined (DC) || defined (PSP) || defined(GP2X)
|
#if defined (_WIN32_WCE) || defined (DC) || defined (PSP) || defined(GP2X)
|
||||||
consvar_t cv_numChannels = {"snd_channels", "8", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_numChannels = {"snd_channels", "8", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#else
|
#else
|
||||||
consvar_t cv_numChannels = {"snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
@ -186,7 +186,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo)
|
||||||
}
|
}
|
||||||
else if (origin && channels[cnum].origin == origin
|
else if (origin && channels[cnum].origin == origin
|
||||||
&& channels[cnum].sfxinfo->name != sfxinfo->name
|
&& channels[cnum].sfxinfo->name != sfxinfo->name
|
||||||
&& channels[cnum].sfxinfo->pitch == SF_TOTALLYSINGLE && sfxinfo->pitch == SF_TOTALLYSINGLE)
|
&& (channels[cnum].sfxinfo->pitch & SF_TOTALLYSINGLE) && (sfxinfo->pitch & SF_TOTALLYSINGLE))
|
||||||
{
|
{
|
||||||
S_StopChannel(cnum);
|
S_StopChannel(cnum);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
238
src/sounds.c
238
src/sounds.c
|
|
@ -820,131 +820,131 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
|
|
||||||
// SRB2Kart - Engine sounds
|
// SRB2Kart - Engine sounds
|
||||||
// Engine class A
|
// Engine class A
|
||||||
{"krta00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krta12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krta12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class B
|
// Engine class B
|
||||||
{"krtb00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtb12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtb12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class C
|
// Engine class C
|
||||||
{"krtc00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtc12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtc12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class D
|
// Engine class D
|
||||||
{"krtd00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtd12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtd12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class E
|
// Engine class E
|
||||||
{"krte00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krte12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krte12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class F
|
// Engine class F
|
||||||
{"krtf00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtf12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtf12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class G
|
// Engine class G
|
||||||
{"krtg00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krtg12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krtg12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class H
|
// Engine class H
|
||||||
{"krth00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krth12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krth12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
// Engine class I
|
// Engine class I
|
||||||
{"krti00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti00", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti01", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti02", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti03", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti04", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti05", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti06", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti07", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti08", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti09", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti10", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti11", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
{"krti12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR},
|
{"krti12", false, 48, 65, -1, NULL, 0, -1, -1, LUMPERROR},
|
||||||
|
|
||||||
// SRB2kart - Skin sounds
|
// SRB2kart - Skin sounds
|
||||||
{"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR},
|
{"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR},
|
||||||
|
|
@ -955,8 +955,8 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
{"kattk2", false, 64, 96, -1, NULL, 0, SKSKATK2, -1, LUMPERROR},
|
{"kattk2", false, 64, 96, -1, NULL, 0, SKSKATK2, -1, LUMPERROR},
|
||||||
{"kbost1", false, 64, 96, -1, NULL, 0, SKSKBST1, -1, LUMPERROR},
|
{"kbost1", false, 64, 96, -1, NULL, 0, SKSKBST1, -1, LUMPERROR},
|
||||||
{"kbost2", false, 64, 96, -1, NULL, 0, SKSKBST2, -1, LUMPERROR},
|
{"kbost2", false, 64, 96, -1, NULL, 0, SKSKBST2, -1, LUMPERROR},
|
||||||
{"kslow", false, 128, 32, -1, NULL, 0, SKSKSLOW, -1, LUMPERROR},
|
{"kslow", false, 64, 32, -1, NULL, 0, SKSKSLOW, -1, LUMPERROR},
|
||||||
{"khitem", false, 64, 32, -1, NULL, 0, SKSKHITM, -1, LUMPERROR},
|
{"khitem", false, 128, 32, -1, NULL, 0, SKSKHITM, -1, LUMPERROR},
|
||||||
{"kgloat", false, 64, 48, -1, NULL, 0, SKSKPOWR, -1, LUMPERROR},
|
{"kgloat", false, 64, 48, -1, NULL, 0, SKSKPOWR, -1, LUMPERROR},
|
||||||
|
|
||||||
// skin sounds free slots to add sounds at run time (Boris HACK!!!)
|
// skin sounds free slots to add sounds at run time (Boris HACK!!!)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue