Fixed implementations

This commit is contained in:
smallmodel 2024-06-10 23:40:34 +02:00
parent 445814b144
commit 79b0e6998d
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
2 changed files with 11 additions and 15 deletions

View file

@ -348,9 +348,9 @@ int ChannelNameTable::RegisterChannel(const char *name)
const char *ChannelNameTable::FindNameFromLookup(int index)
{
if (index < m_iNumChannels) {
return m_Channels[index].name;
} else {
if (index >= m_iNumChannels) {
return NULL;
}
return m_Channels[index].name;
}

View file

@ -182,24 +182,20 @@ qboolean skelChannelList_s::HasChannel(ChannelNameTable *nameTable, const char *
{
short int iGlobalChannel = nameTable->FindNameLookup(channelName);
if (iGlobalChannel >= 0) {
if (m_chanLocalFromGlobal && iGlobalChannel < m_numLocalFromGlobal) {
return (unsigned int)~m_chanLocalFromGlobal[iGlobalChannel] >> 31;
} else {
return qtrue;
}
} else {
return qfalse;
}
return iGlobalChannel >= 0 && LocalChannel(iGlobalChannel) >= 0;
}
const char *skelChannelList_s::ChannelName(ChannelNameTable *nameTable, int localChannelNum) const
{
if (localChannelNum >= 0 && localChannelNum < m_numChannels) {
return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
} else {
if (localChannelNum >= this->m_numChannels || localChannelNum < 0) {
return NULL;
}
if (m_chanGlobalFromLocal[localChannelNum] < 0) {
return 0;
}
return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
}
void Skel_ExtractFilePath(const char *path, char *dest)