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

Removed reverse_label_list (use label_list enumeration instead)

Browse source
This commit is contained in:
smallmodel 2023-08-19 15:48:29 +02:00
parent 2efeb7e972
commit 84adaa07e0
No known key found for this signature in database
GPG key ID: A96F163ED4891440
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
code/fgame/gamescript.cpp
View file

@ -207,8 +207,6 @@ bool StateScript::AddLabel( const_str label, unsigned char *pos, bool private_se
label_list.addKeyValue(STRING_NULL) = s;
}
reverse_label_list.AddObject( &s );
return true;
}
@ -263,22 +261,23 @@ const_str StateScript::NearestLabel( unsigned char *pos )
unsigned int offset = pos - m_Parent->m_ProgBuffer;
unsigned int bestOfs = 0;
const_str label = STRING_NULL;
con_set_enum< const_str, script_label_t > en = label_list;
con_set_enum< const_str, script_label_t >::Entry* entry;
for( int i = 1; i <= reverse_label_list.NumObjects(); i++ )
{
script_label_t *l = reverse_label_list.ObjectAt( i );
for (entry = en.NextElement(); entry; entry = en.NextElement()) {
const script_label_t& l = entry->value;
if( ( l->codepos - m_Parent->m_ProgBuffer ) >= bestOfs )
{
bestOfs = l->codepos - m_Parent->m_ProgBuffer;
if ((l.codepos - m_Parent->m_ProgBuffer) >= bestOfs)
{
bestOfs = l.codepos - m_Parent->m_ProgBuffer;
if( bestOfs > offset )
{
break;
}
if (bestOfs > offset)
{
break;
}
label = l->key;
}
label = l.key;
}
}
return label;