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

work around bad global constructor order in g++ x86 by not using PlayerNumber. Find a better way to handle this?

Browse Source
This commit is contained in:
Chris Danford
2005-10-29 05:42:38 +00:00
parent 9f0efb9cb0
commit ca8e0c5137
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MemoryCardManager.cpp
+4 -4
View File
@@ -20,25 +20,25 @@ MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in
static void MemoryCardOsMountPointInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut ) static void MemoryCardOsMountPointInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut )
{ {
sNameOut = "MemoryCardOsMountPoint" + PlayerNumberToString( (PlayerNumber)i ); sNameOut = ssprintf( "MemoryCardOsMountPointP%d", i+1 );
defaultValueOut = ""; defaultValueOut = "";
} }
static void MemoryCardUsbBusInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut ) static void MemoryCardUsbBusInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
{ {
sNameOut = "MemoryCardUsbBus" + PlayerNumberToString( (PlayerNumber)i ); sNameOut = ssprintf( "MemoryCardUsbBusP%d", i+1 );
defaultValueOut = -1; defaultValueOut = -1;
} }
static void MemoryCardUsbPortInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut ) static void MemoryCardUsbPortInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
{ {
sNameOut = "MemoryCardUsbPort" + PlayerNumberToString( (PlayerNumber)i ); sNameOut = ssprintf( "MemoryCardUsbPortP%d", i+1 );
defaultValueOut = -1; defaultValueOut = -1;
} }
static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut ) static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut )
{ {
sNameOut = "MemoryCardUsbLevel" + PlayerNumberToString( (PlayerNumber)i ); sNameOut = ssprintf( "MemoryCardUsbLevelP%d", i+1 );
defaultValueOut = -1; defaultValueOut = -1;
} }
stepmania/src/ProfileManager.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ ProfileManager* PROFILEMAN = NULL; // global and accessable from anywhere in our
static void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut ) static void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut )
{ {
sNameOut = "DefaultLocalProfileID" + PlayerNumberToString( (PlayerNumber)i ); sNameOut = ssprintf( "DefaultLocalProfileIDP%d", i+1 );
defaultValueOut = ""; defaultValueOut = "";
} }