Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-06 19:01:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed voicetype event

Browse source
This commit is contained in:
smallmodel 2023-10-14 13:30:20 +02:00
parent 1e94cdd8ca
commit 1a293420c0
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
code/fgame/actor.cpp
View file

@ -2993,14 +2993,7 @@ void Actor::ResolveVoiceType(void)
{
char validVoice[128];
if (mVoiceType == -1) {
int d = 3.0 * 0.99 * random();
if (m_Team == TEAM_AMERICAN) {
mVoiceType = gAmericanVoices[d][0];
} else {
mVoiceType = gGermanVoices[d][0];
}
} else {
if (mVoiceType != -1) {
if (m_Team == TEAM_AMERICAN) {
for (int i = 0; i < 3; i++) {
if (gAmericanVoices[i][0] == mVoiceType) {
@ -3014,10 +3007,6 @@ void Actor::ResolveVoiceType(void)
strcat(validVoice, " ");
}
Com_Printf("ERROR: Bad voice type %c. Valid American voicetypes are: %s\n", mVoiceType, validVoice);
mVoiceType = -1;
int d = 3.0 * 0.99 * random();
mVoiceType = gAmericanVoices[d][0];
} else {
for (int i = 0; i < 3; i++) {
if (gGermanVoices[i][0] == mVoiceType) {
@ -3031,9 +3020,17 @@ void Actor::ResolveVoiceType(void)
strcat(validVoice, " ");
}
Com_Printf("ERROR: Bad voice type %c. Valid German voicetypes are: %s\n", mVoiceType, validVoice);
mVoiceType = -1;
}
int d = 3.0 * 0.99 * random();
mVoiceType = -1;
}
if (mVoiceType == -1) {
int d = random() * 3.0 * 0.99;
if (m_Team == TEAM_AMERICAN) {
mVoiceType = gAmericanVoices[d][0];
} else {
mVoiceType = gGermanVoices[d][0];
}
}