what? I don't really know what I'm doing here.

This commit is contained in:
Thai Pangsakulyanont
2011-05-24 10:47:16 +07:00
31 changed files with 347 additions and 43 deletions
+2 -1
View File
@@ -13,7 +13,8 @@ public:
void Init();
/**
* @brief Play the sounds in question for the particular chart.
* @param nd the note data used for playing the ticks. */
* @param nd the note data used for playing the ticks.
* @param ps the player's state (and number) for Split Timing. */
void PlayTicks( const NoteData &nd, const PlayerState *ps );
/** @brief Stop playing the sounds. */
void StopPlaying();
+3 -3
View File
@@ -8,7 +8,7 @@
*
* As an example, use "StepMania" here, not "StepMania4".
*/
#define PRODUCT_FAMILY_BARE sm-ssc
#define PRODUCT_FAMILY_BARE StepMania
/**
* @brief A unique name for each application that you might want installed side-by-side with other applications.
@@ -16,7 +16,7 @@
* As an example, use "StepMania4" here, not "StepMania".
* It would cause a conflict with older versions such as StepMania 3.X.
*/
#define PRODUCT_ID_BARE sm-ssc
#define PRODUCT_ID_BARE StepMania 5
/**
* @brief Version info displayed to the user.
@@ -35,7 +35,7 @@
* </li></ul>
*/
#ifndef PRODUCT_VER_BARE
#define PRODUCT_VER_BARE v1.2.5
#define PRODUCT_VER_BARE v5.0 Preview 1
#endif
/**
+3 -3
View File
@@ -1,11 +1,11 @@
; Included by the NSIS installer script
; Don't forget to also change ProductInfo.h!
!define PRODUCT_FAMILY "sm-ssc"
!define PRODUCT_FAMILY "StepMania"
; see ProductInfo.h for use descriptions
!define PRODUCT_ID "sm-ssc"
!define PRODUCT_VER "v1.2.5"
!define PRODUCT_ID "StepMania"
!define PRODUCT_VER "v5.0 Preview 1"
!define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
!define PRODUCT_BITMAP "ssc"
-4
View File
@@ -341,10 +341,6 @@ public:
Steps *CreateSteps();
void InitSteps(Steps *pSteps);
/**
* @brief Retrieve the beat based on the specified time.
* @param fElapsedTime the amount of time since the Song started.
* @return the appropriate beat. */
/* [splittiming]
float SongGetBeatFromElapsedTime( float fElapsedTime ) const
{
+9
View File
@@ -19,6 +19,7 @@
#include "RageLog.h"
#include "NoteData.h"
#include "GameManager.h"
#include "SongManager.h"
#include "NoteDataUtil.h"
#include "NotesLoaderSSC.h"
#include "NotesLoaderSM.h"
@@ -468,6 +469,13 @@ public:
return 1;
}
static int UsesSplitTiming( T* p, lua_State *L )
{
Song *song = SONGMAN->GetSongFromSteps(p);
lua_pushboolean(L, p->m_Timing != song->m_SongTiming);
return 1;
}
LunaSteps()
{
@@ -486,6 +494,7 @@ public:
ADD_METHOD( IsAnEdit );
ADD_METHOD( IsAutogen );
ADD_METHOD( IsAPlayerEdit );
ADD_METHOD( UsesSplitTiming );
}
};
+2 -2
View File
@@ -1350,13 +1350,13 @@ public:
/**
* @brief Set the row to have the new Combo.
* @param iNoteRow the row to have the new Combo.
* @param iTicks the Combo.
* @param iCombo the Combo.
*/
void SetComboAtRow( int iNoteRow, int iCombo );
/**
* @brief Set the beat to have the new Combo.
* @param fBeat the beat to have the new Combo.
* @param iTicks the Combo.
* @param iCombo the Combo.
*/
void SetComboAtBeat( float fBeat, int iCombo ) { SetComboAtRow( BeatToNoteRow( fBeat ), iCombo ); }
/**