Reverted some changes that should not have been part of the merge from Midiman.

This commit is contained in:
Kyzentun
2014-08-28 05:53:37 -06:00
parent 04da3fb9c7
commit bedaf07e51
4 changed files with 10 additions and 18 deletions
+4 -5
View File
@@ -3181,13 +3181,12 @@ public:
{
vector<const Game*> aGames;
p->GetEnabledGames( aGames );
vector<RString> vsGames;
FOREACH( const Game*, aGames, g )
lua_createtable(L, aGames.size(), 0);
for(size_t i= 0; i < aGames.size(); ++i)
{
RString sGameName = (*g)->m_szName;
vsGames.push_back( sGameName );
lua_pushstring(L, aGames[i]->m_szName);
lua_rawseti(L, -2, i+1);
}
LuaHelpers::CreateTableFromArray<RString>( vsGames, L );
return 1;
}
-7
View File
@@ -1178,19 +1178,12 @@ void NoteData::LoadFromNode( const XNode* pNode )
void NoteData::AddATIToList(all_tracks_iterator* iter) const
{
// mapconv crashes on windows an apparently this function is the cause.
// So windows will still crash on courses that use transform mods until
// mapconv can be fixed. -Kyz
#ifndef WIN32
m_atis.insert(iter);
#endif
}
void NoteData::AddATIToList(all_tracks_const_iterator* iter) const
{
#ifndef WIN32
m_const_atis.insert(iter);
#endif
}
void NoteData::RemoveATIFromList(all_tracks_iterator* iter) const