Last bit of warnings for tonight.
This commit is contained in:
@@ -10,6 +10,8 @@
|
|||||||
#include "LuaManager.h"
|
#include "LuaManager.h"
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
|
|
||||||
|
int OptionToPreferredColumn( RString sOptionText );
|
||||||
|
|
||||||
REGISTER_ACTOR_CLASS( ModIconRow );
|
REGISTER_ACTOR_CLASS( ModIconRow );
|
||||||
|
|
||||||
ModIconRow::ModIconRow()
|
ModIconRow::ModIconRow()
|
||||||
|
|||||||
+6
-8
@@ -42,6 +42,9 @@
|
|||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
#include "AdjustSync.h"
|
#include "AdjustSync.h"
|
||||||
|
|
||||||
|
RString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides );
|
||||||
|
void TimingWindowSecondsInit( size_t /*TimingWindow*/ i, RString &sNameOut, float &defaultValueOut );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Helper class to ensure that each row is only judged once without taking too much memory.
|
* @brief Helper class to ensure that each row is only judged once without taking too much memory.
|
||||||
*/
|
*/
|
||||||
@@ -1323,14 +1326,9 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
|
|||||||
// Possibly fixed.
|
// Possibly fixed.
|
||||||
if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
|
if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
|
||||||
{
|
{
|
||||||
if( tn.subType == TapNote::hold_head_roll )
|
float factor = (tn.subType == TapNote::hold_head_roll ? 2 : 10.0f - 8.5f);
|
||||||
{
|
factor *= fLifeFraction;
|
||||||
m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, fLifeFraction * 2.0)));
|
m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, factor)));
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, fLifeFraction * 10.0 - 8.5)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,13 @@ using namespace RageDisplay_Legacy_Helpers;
|
|||||||
#define glFlush()
|
#define glFlush()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
RString GetInfoLog( GLhandleARB h );
|
||||||
|
GLhandleARB CompileShader( GLenum ShaderType, RString sFile, vector<RString> asDefines );
|
||||||
|
GLhandleARB LoadShader( GLenum ShaderType, RString sFile, vector<RString> asDefines );
|
||||||
|
void InitShaders();
|
||||||
|
void SetupExtensions();
|
||||||
|
void SetPixelMapForSurface( int glImageFormat, int glTexFormat, const RageSurfacePalette *palette );
|
||||||
|
|
||||||
//
|
//
|
||||||
// Globals
|
// Globals
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "UnlockManager.h"
|
#include "UnlockManager.h"
|
||||||
|
|
||||||
|
RString COLUMN_DIFFICULTY_NAME( size_t i );
|
||||||
|
RString COLUMN_STEPS_TYPE_NAME( size_t i );
|
||||||
|
|
||||||
static const char *HighScoresTypeNames[] = {
|
static const char *HighScoresTypeNames[] = {
|
||||||
"AllSteps",
|
"AllSteps",
|
||||||
"NonstopCourses",
|
"NonstopCourses",
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ struct PlayAfterLaunchInfo
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void InstallSmzipOsArg( const RString &sOsZipFile, PlayAfterLaunchInfo &out );
|
||||||
|
PlayAfterLaunchInfo DoInstalls( CommandLineActions::CommandLineArgs args );
|
||||||
|
|
||||||
static void Parse( const RString &sDir, PlayAfterLaunchInfo &out )
|
static void Parse( const RString &sDir, PlayAfterLaunchInfo &out )
|
||||||
{
|
{
|
||||||
vector<RString> vsDirParts;
|
vector<RString> vsDirParts;
|
||||||
|
|||||||
Reference in New Issue
Block a user