Fix some warnings and update hgignore so status is cleaner.
This commit is contained in:
@@ -28,8 +28,8 @@ Thumbs.db
|
||||
Docs/doxygen
|
||||
PBProject/build
|
||||
Xcode/build
|
||||
Xcode/stepmania.xcodeproj/xcuserdata
|
||||
Xcode/stepmania.xcodeproj/project.xcworkspace/xcuserdata
|
||||
*.xcodeproj/xcuserdata
|
||||
*.xcodeproj/project.xcworkspace/xcuserdata
|
||||
src/build-*
|
||||
src/Release-*
|
||||
src/libtomcrypt/build-*
|
||||
@@ -47,6 +47,10 @@ Themes/pump
|
||||
Themes/optical-release
|
||||
src/version.bin
|
||||
src/verstub.cpp
|
||||
Songs/*
|
||||
*.dmg
|
||||
.git
|
||||
*.smzip
|
||||
nsis_strings_temp.inc
|
||||
Data/SpeedMods.txt
|
||||
Program/StepMania*.lib
|
||||
|
||||
+2
-2
@@ -415,8 +415,8 @@ void GameCommand::LoadOne( const Command& cmd )
|
||||
if( cmd.m_vsArgs.size() == 3 )
|
||||
{
|
||||
m_bFadeMusic = true;
|
||||
m_fMusicFadeOutVolume = atof( cmd.m_vsArgs[1] );
|
||||
m_fMusicFadeOutSeconds = atof( cmd.m_vsArgs[2] );
|
||||
m_fMusicFadeOutVolume = (float)atof( cmd.m_vsArgs[1] );
|
||||
m_fMusicFadeOutSeconds = (float)atof( cmd.m_vsArgs[2] );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
|
||||
|
||||
int state = GETTING_SONG_INFO;
|
||||
const unsigned values = msd.GetNumValues();
|
||||
Steps* pNewNotes;
|
||||
Steps* pNewNotes = NULL;
|
||||
|
||||
for( unsigned i = 0; i < values; i++ )
|
||||
{
|
||||
@@ -1007,7 +1007,7 @@ bool SSCLoader::LoadEditFromFile( RString sEditFilePath, ProfileSlot slot, bool
|
||||
bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot, bool bAddStepsToSong )
|
||||
{
|
||||
Song* pSong = NULL;
|
||||
Steps* pNewNotes;
|
||||
Steps* pNewNotes = NULL;
|
||||
bool bSSCFormat = false;
|
||||
|
||||
for( unsigned i=0; i<msd.GetNumValues(); i++ )
|
||||
|
||||
@@ -2642,7 +2642,7 @@ void RageDisplay_Legacy::SetSphereEnvironmentMapping( TextureUnit tu, bool b )
|
||||
}
|
||||
}
|
||||
|
||||
GLint iCelTexture1, iCelTexture2 = NULL;
|
||||
GLint iCelTexture1, iCelTexture2 = 0;
|
||||
|
||||
void RageDisplay_Legacy::SetCelShaded( int stage )
|
||||
{
|
||||
|
||||
@@ -216,6 +216,7 @@ void ScreenDebugOverlay::Init()
|
||||
RString sPageName = (*p)->GetPageName();
|
||||
|
||||
DeviceInput di;
|
||||
di.x = di.y = NULL;
|
||||
switch( (*p)->GetType() )
|
||||
{
|
||||
case IDebugLine::all_screens:
|
||||
|
||||
Reference in New Issue
Block a user