incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix dubs saving for only Sonic

Browse source 
Voice changing now does a two-pass check to make sure the given dub is both a thing and can be used by the skin
Prevents the annoying edgecase of Sonic and ONLY Sonic keeping dubs through games
This commit is contained in:
yamamama 2025-11-27 03:21:31 -05:00
parent 53490940f9
commit 7efa1c04f4
1 changed files with 79 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/d_netcmd.c
View file

@ -1909,6 +1909,7 @@ static void SendNameAndColor(UINT8 n)
if (!netgame)
{
INT32 foundskin;
kartvoicetype_e vid;
CleanupPlayerName(playernum, cv_playername[n].zstring);
strcpy(player_names[playernum], cv_playername[n].zstring);
@ -1936,14 +1937,50 @@ static void SendNameAndColor(UINT8 n)
SetPlayerSkin(playernum, cv_skin[n].string);
CV_StealthSet(&cv_skin[n], skins[cv_skin[n].value].name);
// Reset the voice to that of the skin's.
// Reset the voice.
if (prevskin != player->skin && skins[player->skin].voice)
{
strlcpy(voicebuf, DEH_KartVoiceName(skins[player->skin].voice->id), sizeof(voicebuf));
// Try getting the voice from our ID.
valuevoice = &skinvoices[player->voice_id];
if (valuevoice->parent != skins[player->skin].voice->parent)
{
// Parent mismatch 1; let's try the cvar.
if (cv_voice[n].string)
{
vid = R_FindIDForVoice(cv_voice[n].string);
if (vid == MAXSKINVOICES)
{
// No dice; use the skin.
valuevoice = skins[player->skin].voice;
}
else
{
if (skinvoices[vid].parent == skins[player->skin].voice->parent)
{
valuevoice = &skinvoices[vid];
}
else
{
// Parent mismatch... again.
valuevoice = skins[player->skin].voice;
}
}
}
else
{
// NULL string; default to the skin.
valuevoice = skins[player->skin].voice;
}
}
strlcpy(voicebuf, DEH_KartVoiceName(valuevoice->id), sizeof(voicebuf));
strlwr(voicebuf);
CV_StealthSet(&cv_voice[n], voicebuf);
cv_voice[n].value = (UINT16)skins[player->skin].voice->id;
cv_voice[n].value = (UINT16)valuevoice->id;
}
}
else
@ -1955,14 +1992,50 @@ static void SendNameAndColor(UINT8 n)
// will always be same as current
SetPlayerSkin(playernum, cv_skin[n].string);
// Reset the voice to that of the skin's.
// Reset the voice.
if (prevskin != player->skin && skins[player->skin].voice)
{
strlcpy(voicebuf, DEH_KartVoiceName(skins[player->skin].voice->id), sizeof(voicebuf));
// Try getting the voice from our ID.
valuevoice = &skinvoices[player->voice_id];
if (valuevoice->parent != skins[player->skin].voice->parent)
{
// Parent mismatch 1; let's try the cvar.
if (cv_voice[n].string)
{
vid = R_FindIDForVoice(cv_voice[n].string);
if (vid == MAXSKINVOICES)
{
// No dice; use the skin.
valuevoice = skins[player->skin].voice;
}
else
{
if (skinvoices[vid].parent == skins[player->skin].voice->parent)
{
valuevoice = &skinvoices[vid];
}
else
{
// Parent mismatch... again.
valuevoice = skins[player->skin].voice;
}
}
}
else
{
// NULL string; default to the skin.
valuevoice = skins[player->skin].voice;
}
}
strlcpy(voicebuf, DEH_KartVoiceName(valuevoice->id), sizeof(voicebuf));
strlwr(voicebuf);
CV_StealthSet(&cv_voice[n], voicebuf);
cv_voice[n].value = (UINT16)skins[player->skin].voice->id;
cv_voice[n].value = (UINT16)valuevoice->id;
}
}