actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix notesloaderbms.cpp for real this time

Browse Source
This commit is contained in:
Joe
2015-10-16 16:08:40 +01:00
parent 311601dc0d
commit 1ebf75c683
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderBMS.cpp
-9
View File
@@ -1111,11 +1111,6 @@ bool BMSChartReader::ReadNoteData()
TimingData td; TimingData td;
td.m_fBeat0OffsetInSeconds = out->m_Timing.m_fBeat0OffsetInSeconds; td.m_fBeat0OffsetInSeconds = out->m_Timing.m_fBeat0OffsetInSeconds;
<<<<<<< HEAD
=======
>>>>>>> abfff53c2b8aa3033ffa3bc5fc5d05088708067f
nd.SetNumTracks( tracks ); nd.SetNumTracks( tracks );
td.SetBPMAtRow( 0, currentBPM = initialBPM ); td.SetBPMAtRow( 0, currentBPM = initialBPM );
@@ -1770,8 +1765,4 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
<<<<<<< HEAD
*/ */
=======
*/
>>>>>>> abfff53c2b8aa3033ffa3bc5fc5d05088708067f