From ca8e0c5137e4c953fdcb1525af236f89603fa5e8 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 29 Oct 2005 05:42:38 +0000 Subject: [PATCH] work around bad global constructor order in g++ x86 by not using PlayerNumber. Find a better way to handle this? --- stepmania/src/MemoryCardManager.cpp | 8 ++++---- stepmania/src/ProfileManager.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 2441bc7cd7..79e7634653 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -20,25 +20,25 @@ MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in static void MemoryCardOsMountPointInit( size_t /*PlayerNumber*/ i, CString &sNameOut, CString &defaultValueOut ) { - sNameOut = "MemoryCardOsMountPoint" + PlayerNumberToString( (PlayerNumber)i ); + sNameOut = ssprintf( "MemoryCardOsMountPointP%d", i+1 ); 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; } static void MemoryCardUsbPortInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut ) { - sNameOut = "MemoryCardUsbPort" + PlayerNumberToString( (PlayerNumber)i ); + sNameOut = ssprintf( "MemoryCardUsbPortP%d", i+1 ); defaultValueOut = -1; } static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, CString &sNameOut, int &defaultValueOut ) { - sNameOut = "MemoryCardUsbLevel" + PlayerNumberToString( (PlayerNumber)i ); + sNameOut = ssprintf( "MemoryCardUsbLevelP%d", i+1 ); defaultValueOut = -1; } diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index 42aed98a54..823cdcc7ce 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -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 ) { - sNameOut = "DefaultLocalProfileID" + PlayerNumberToString( (PlayerNumber)i ); + sNameOut = ssprintf( "DefaultLocalProfileIDP%d", i+1 ); defaultValueOut = ""; }