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

Fix some warnings and update hgignore so status is cleaner.

Browse Source
This commit is contained in:
Colby Klein
2011-03-14 00:18:51 -07:00
parent 30553fec04
commit 4119d406a5
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgignore
+6 -2
View File
@@ -28,8 +28,8 @@ Thumbs.db
Docs/doxygen Docs/doxygen
PBProject/build PBProject/build
Xcode/build Xcode/build
Xcode/stepmania.xcodeproj/xcuserdata *.xcodeproj/xcuserdata
Xcode/stepmania.xcodeproj/project.xcworkspace/xcuserdata *.xcodeproj/project.xcworkspace/xcuserdata
src/build-* src/build-*
src/Release-* src/Release-*
src/libtomcrypt/build-* src/libtomcrypt/build-*
@@ -47,6 +47,10 @@ Themes/pump
Themes/optical-release Themes/optical-release
src/version.bin src/version.bin
src/verstub.cpp src/verstub.cpp
Songs/*
*.dmg
.git
*.smzip
nsis_strings_temp.inc nsis_strings_temp.inc
Data/SpeedMods.txt Data/SpeedMods.txt
Program/StepMania*.lib Program/StepMania*.lib
src/GameCommand.cpp
+2 -2
View File
@@ -415,8 +415,8 @@ void GameCommand::LoadOne( const Command& cmd )
if( cmd.m_vsArgs.size() == 3 ) if( cmd.m_vsArgs.size() == 3 )
{ {
m_bFadeMusic = true; m_bFadeMusic = true;
m_fMusicFadeOutVolume = atof( cmd.m_vsArgs[1] ); m_fMusicFadeOutVolume = (float)atof( cmd.m_vsArgs[1] );
m_fMusicFadeOutSeconds = atof( cmd.m_vsArgs[2] ); m_fMusicFadeOutSeconds = (float)atof( cmd.m_vsArgs[2] );
} }
} }
src/NotesLoaderSSC.cpp
+2 -2
View File
@@ -126,7 +126,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
int state = GETTING_SONG_INFO; int state = GETTING_SONG_INFO;
const unsigned values = msd.GetNumValues(); const unsigned values = msd.GetNumValues();
Steps* pNewNotes; Steps* pNewNotes = NULL;
for( unsigned i = 0; i < values; i++ ) 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 ) bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath, ProfileSlot slot, bool bAddStepsToSong )
{ {
Song* pSong = NULL; Song* pSong = NULL;
Steps* pNewNotes; Steps* pNewNotes = NULL;
bool bSSCFormat = false; bool bSSCFormat = false;
for( unsigned i=0; i<msd.GetNumValues(); i++ ) for( unsigned i=0; i<msd.GetNumValues(); i++ )
src/RageDisplay_Legacy.cpp
+1 -1
View File
@@ -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 ) void RageDisplay_Legacy::SetCelShaded( int stage )
{ {
src/ScreenDebugOverlay.cpp
+1
View File
@@ -216,6 +216,7 @@ void ScreenDebugOverlay::Init()
RString sPageName = (*p)->GetPageName(); RString sPageName = (*p)->GetPageName();
DeviceInput di; DeviceInput di;
di.x = di.y = NULL;
switch( (*p)->GetType() ) switch( (*p)->GetType() )
{ {
case IDebugLine::all_screens: case IDebugLine::all_screens: