|
From: Tapio V. <aa...@us...> - 2009-11-10 19:19:57
|
Module: performous
Branch: dance
Commit: 870eca0953a8b1b2078e27ba4a610308906528d5
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 10 21:16:51 2009 +0200
Added some prototypes to allow compilation to pass.
---
game/song.hh | 3 +++
game/songparser.hh | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/game/song.hh b/game/song.hh
index f02bf87..d74e483 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -40,6 +40,9 @@ class Song: boost::noncopyable {
int randomIdx; ///< sorting index used for random order
Notes notes; ///< notes for song (only used for singing)
TrackMap track_map; ///< guitar etc. notes for this song
+ // TODO: TEMPORARY TO ALLOW COMPILING
+ std::vector<std::map<int, Note> > d_notes; ///< dance notes
+ // ^
typedef std::vector<double> Beats;
Beats beats;
int noteMin, ///< lowest note
diff --git a/game/songparser.hh b/game/songparser.hh
index d17b147..5d1db07 100644
--- a/game/songparser.hh
+++ b/game/songparser.hh
@@ -94,6 +94,10 @@ class SongParser {
bool txtParseNote(std::string line);
bool iniCheck(std::vector<char> const& data);
void iniParse();
+ bool smCheck(std::vector<char> const& data);
+ void smParse();
+ bool smParseField(std::string& line);
+ bool smParseNote(std::string& line);
double m_prevtime;
unsigned int m_prevts;
unsigned int m_relativeShift;
|