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

Make NotesWriterDWI also a namespace.

Browse Source
This commit is contained in:
Steve Checkoway
2006-11-04 23:36:11 +00:00
parent 0ed39a2f5e
commit 63bb4faf7d
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesWriterDWI.cpp
+9 -7
View File
@@ -11,8 +11,10 @@
#include "song.h" #include "song.h"
#include "Steps.h" #include "Steps.h"
static RString OptimizeDWIString( RString holds, RString taps );
/* Output is an angle bracket expression without angle brackets, eg. "468". */ /* Output is an angle bracket expression without angle brackets, eg. "468". */
RString NotesWriterDWI::NotesToDWIString( const TapNote tnCols[6] ) static RString NotesToDWIString( const TapNote tnCols[6] )
{ {
const char dirs[] = { '4', 'C', '2', '8', 'D', '6' }; const char dirs[] = { '4', 'C', '2', '8', 'D', '6' };
RString taps, holds, ret; RString taps, holds, ret;
@@ -84,7 +86,7 @@ RString NotesWriterDWI::NotesToDWIString( const TapNote tnCols[6] )
return '0';*/ return '0';*/
} }
RString NotesWriterDWI::NotesToDWIString( TapNote tnCol1, TapNote tnCol2, TapNote tnCol3, TapNote tnCol4, TapNote tnCol5, TapNote tnCol6 ) static RString NotesToDWIString( TapNote tnCol1, TapNote tnCol2, TapNote tnCol3, TapNote tnCol4, TapNote tnCol5, TapNote tnCol6 )
{ {
TapNote tnCols[6]; TapNote tnCols[6];
tnCols[0] = tnCol1; tnCols[0] = tnCol1;
@@ -96,12 +98,12 @@ RString NotesWriterDWI::NotesToDWIString( TapNote tnCol1, TapNote tnCol2, TapNot
return NotesToDWIString( tnCols ); return NotesToDWIString( tnCols );
} }
RString NotesWriterDWI::NotesToDWIString( TapNote tnCol1, TapNote tnCol2, TapNote tnCol3, TapNote tnCol4 ) static RString NotesToDWIString( TapNote tnCol1, TapNote tnCol2, TapNote tnCol3, TapNote tnCol4 )
{ {
return NotesToDWIString( tnCol1, TAP_EMPTY, tnCol2, tnCol3, TAP_EMPTY, tnCol4 ); return NotesToDWIString( tnCol1, TAP_EMPTY, tnCol2, tnCol3, TAP_EMPTY, tnCol4 );
} }
char NotesWriterDWI::OptimizeDWIPair( char c1, char c2 ) static char OptimizeDWIPair( char c1, char c2 )
{ {
typedef pair<char,char> cpair; typedef pair<char,char> cpair;
static map< cpair, char > joins; static map< cpair, char > joins;
@@ -136,7 +138,7 @@ char NotesWriterDWI::OptimizeDWIPair( char c1, char c2 )
return it->second; return it->second;
} }
RString NotesWriterDWI::OptimizeDWIString( RString holds, RString taps ) RString OptimizeDWIString( RString holds, RString taps )
{ {
/* First, sort the holds and taps in ASCII order. This puts 2468 first. /* First, sort the holds and taps in ASCII order. This puts 2468 first.
* This way 1379 combinations will always be found first, so we'll always * This way 1379 combinations will always be found first, so we'll always
@@ -189,7 +191,7 @@ RString NotesWriterDWI::OptimizeDWIString( RString holds, RString taps )
return ssprintf( "<%s>", ret.c_str() ); return ssprintf( "<%s>", ret.c_str() );
} }
void NotesWriterDWI::WriteDWINotesField( RageFile &f, const Steps &out, int start ) static void WriteDWINotesField( RageFile &f, const Steps &out, int start )
{ {
NoteData notedata; NoteData notedata;
out.GetNoteData( notedata ); out.GetNoteData( notedata );
@@ -311,7 +313,7 @@ void NotesWriterDWI::WriteDWINotesField( RageFile &f, const Steps &out, int star
} }
} }
bool NotesWriterDWI::WriteDWINotesTag( RageFile &f, const Steps &out ) static bool WriteDWINotesTag( RageFile &f, const Steps &out )
{ {
if( out.GetDifficulty() == DIFFICULTY_EDIT ) if( out.GetDifficulty() == DIFFICULTY_EDIT )
return false; // not supported by DWI return false; // not supported by DWI
stepmania/src/NotesWriterDWI.h
+1 -14
View File
@@ -3,22 +3,9 @@
#ifndef NOTES_WRITER_DWI_H #ifndef NOTES_WRITER_DWI_H
#define NOTES_WRITER_DWI_H #define NOTES_WRITER_DWI_H
#include "NoteTypes.h"
class RageFile;
class Song; class Song;
class Steps; namespace NotesWriterDWI
class NotesWriterDWI
{ {
RString NotesToDWIString( TapNote cNoteCol1, TapNote cNoteCol2, TapNote cNoteCol3, TapNote cNoteCol4, TapNote cNoteCol5, TapNote cNoteCol6 );
RString NotesToDWIString( TapNote cNoteCol1, TapNote cNoteCol2, TapNote cNoteCol3, TapNote cNoteCol4 );
void WriteDWINotesField( RageFile &f, const Steps &out, int start );
bool WriteDWINotesTag( RageFile &f, const Steps &out );
RString NotesToDWIString( const TapNote cNoteCols[6] );
RString OptimizeDWIString( RString holds, RString taps );
char OptimizeDWIPair( char c1, char c2 );
public:
bool Write( RString sPath, const Song &out ); bool Write( RString sPath, const Song &out );
}; };
stepmania/src/Song.cpp
+1 -2
View File
@@ -775,8 +775,7 @@ void Song::SaveToDWIFile()
if( IsAFile(sPath) ) if( IsAFile(sPath) )
FileCopy( sPath, sPath + ".old" ); FileCopy( sPath, sPath + ".old" );
NotesWriterDWI wr; NotesWriterDWI::Write(sPath, *this);
wr.Write(sPath, *this);
} }