From 38aa07ce389a1cca1bada21d045072a9137b729e Mon Sep 17 00:00:00 2001 From: freem Date: Tue, 5 Aug 2014 13:49:05 -0500 Subject: [PATCH] Kyzentun: it's not your fault that our mapconv.exe is psychopathic --- src/NoteData.cpp | 13 ++----------- src/NoteData.h | 5 ----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/NoteData.cpp b/src/NoteData.cpp index d1287bfc84..00d0b35a70 100644 --- a/src/NoteData.cpp +++ b/src/NoteData.cpp @@ -1176,10 +1176,6 @@ void NoteData::LoadFromNode( const XNode* pNode ) FAIL_M("NoteData::LoadFromNode() not implemented"); } -// 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 void NoteData::AddATIToList(all_tracks_iterator* iter) const { m_atis.insert(iter); @@ -1207,7 +1203,6 @@ void NoteData::RemoveATIFromList(all_tracks_const_iterator* iter) const m_const_atis.erase(pos); } } -#endif void NoteData::RevalidateATIs(vector const& added_or_removed_tracks, bool added) { @@ -1294,9 +1289,9 @@ template } m_vCurrentIters.push_back( cur ); } -#ifndef WIN32 + m_pNoteData->AddATIToList(this); -#endif + Find( bReverse ); } @@ -1314,9 +1309,7 @@ NoteData::_all_tracks_iterator::_all_tracks_iterator( const _all_t COPY_OTHER( m_EndRow ) #undef COPY_OTHER { -#ifndef WIN32 m_pNoteData->AddATIToList(this); -#endif } template @@ -1324,9 +1317,7 @@ template { if(m_pNoteData != NULL) { -#ifndef WIN32 m_pNoteData->RemoveATIFromList(this); -#endif } } diff --git a/src/NoteData.h b/src/NoteData.h index f64af07c30..40033f1a2f 100644 --- a/src/NoteData.h +++ b/src/NoteData.h @@ -152,15 +152,10 @@ private: mutable set m_atis; mutable set m_const_atis; - // 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 void AddATIToList(all_tracks_iterator* iter) const; void AddATIToList(all_tracks_const_iterator* iter) const; void RemoveATIFromList(all_tracks_iterator* iter) const; void RemoveATIFromList(all_tracks_const_iterator* iter) const; -#endif public: void Init();