diff --git a/src/k_kart.c b/src/k_kart.c index 236f35b0..9d73ff84 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3673,7 +3673,7 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd) || (i == fourthdisplayplayer && splitscreen > 2)) 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) <= 12288<mo->y-players[i].mo->y), player->mo->z-players[i].mo->z) <= 3072< 1) diff --git a/src/sounds.c b/src/sounds.c index ea9df112..75c0793c 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -820,131 +820,131 @@ sfxinfo_t S_sfx[NUMSFX] = // SRB2Kart - Engine sounds // Engine class A - {"krta00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krta12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krta12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class B - {"krtb00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtb12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtb12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class C - {"krtc00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtc12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtc12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class D - {"krtd00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtd12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtd12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class E - {"krte00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krte12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krte12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class F - {"krtf00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtf12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtf12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class G - {"krtg00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krtg12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krtg12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class H - {"krth00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krth12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krth12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // Engine class I - {"krti00", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti01", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti02", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti03", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti04", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti05", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti06", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti07", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti08", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti09", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti10", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti11", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, - {"krti12", false, 112, 0, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti00", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti01", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti02", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti03", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti04", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti05", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti06", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti07", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti08", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti09", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti10", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti11", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, + {"krti12", false, 48, 64, -1, NULL, 0, -1, -1, LUMPERROR}, // SRB2kart - Skin sounds {"kwin", false, 64, 96, -1, NULL, 0, SKSKWIN, -1, LUMPERROR},