diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp index 99d2a649c9a..a5844c063b8 100644 --- a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp +++ b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp @@ -210,22 +210,22 @@ AudioManager::~AudioManager() void AudioManager::init() { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\AudioSettings" ), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\AudioSettings", INI_LOAD_OVERWRITE, NULL); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Music" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Music" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Music", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Music", INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\SoundEffects" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\SoundEffects" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\SoundEffects", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\SoundEffects", INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Speech" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Speech" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Speech", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Speech", INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Voice" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Voice" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Voice", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Voice", INI_LOAD_OVERWRITE, NULL ); // do the miscellaneous sound files last so that we find the AudioEventRTS associated with the events. - ini.loadFileDirectory( AsciiString( "Data\\INI\\MiscAudio" ), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\MiscAudio", INI_LOAD_OVERWRITE, NULL); // determine if one of the music tracks exists. Since their now BIGd, one implies all. // If they don't exist, then attempt to load them from the CD. @@ -407,7 +407,7 @@ void AudioManager::getInfoForAudioEvent( const AudioEventRTS *eventToFindAndFill //------------------------------------------------------------------------------------------------- AudioHandle AudioManager::addAudioEvent(const AudioEventRTS *eventToAdd) { - if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == AsciiString("NoSound")) { + if (eventToAdd->getEventName().isEmpty() || eventToAdd->getEventName() == "NoSound") { return AHSV_NoSound; } diff --git a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp index 02f3552e9ab..1d8223a014c 100644 --- a/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp +++ b/Core/GameEngine/Source/Common/System/ArchiveFileSystem.cpp @@ -120,7 +120,7 @@ void ArchiveFileSystem::loadIntoDirectoryTree(ArchiveFile *archiveFile, Bool ove FilenameList filenameList; - archiveFile->getFileListInDirectory(AsciiString(""), AsciiString(""), AsciiString("*"), filenameList, TRUE); + archiveFile->getFileListInDirectory("", "", "*", filenameList, TRUE); FilenameListIter it = filenameList.begin(); diff --git a/Core/GameEngine/Source/GameClient/VideoPlayer.cpp b/Core/GameEngine/Source/GameClient/VideoPlayer.cpp index d79a7e26d4d..a756d3c4562 100644 --- a/Core/GameEngine/Source/GameClient/VideoPlayer.cpp +++ b/Core/GameEngine/Source/GameClient/VideoPlayer.cpp @@ -182,8 +182,8 @@ void VideoPlayer::init( void ) // Load this here so that WB doesn't have to link to BinkLib, costing us (potentially) // an extra license. INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Video" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Video" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Video", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Video", INI_LOAD_OVERWRITE, NULL ); } //============================================================================ diff --git a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp index f173050b636..e650c3c2723 100644 --- a/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp +++ b/Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp @@ -541,7 +541,7 @@ void FirewallHelperClass::flagNeedToRefresh(Bool flag) { OptionPreferences pref; - (pref)["FirewallNeedToRefresh"] = flag ? AsciiString("TRUE") : AsciiString("FALSE"); + (pref)["FirewallNeedToRefresh"] = flag ? "TRUE" : "FALSE"; pref.write(); } diff --git a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp index 747d3ec083e..20bc7e334b1 100644 --- a/Core/GameEngine/Source/GameNetwork/GameInfo.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameInfo.cpp @@ -301,7 +301,7 @@ void GameInfo::reset( void ) m_inGame = false; m_inProgress = false; m_gameID = 0; - m_mapName = AsciiString("NOMAP"); + m_mapName = "NOMAP"; m_mapMask = 0; m_seed = GetTickCount(); //GameClientRandomValue(0, INT_MAX - 1); m_useStats = TRUE; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp index b6cb5da0d82..5c566feb60d 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/LadderDefs.cpp @@ -444,7 +444,7 @@ void LadderList::loadLocalLadders( void ) AsciiString dirname; dirname.format("%sGeneralsOnline\\Ladders\\", TheGlobalData->getPath_UserData().str()); FilenameList filenameList; - TheFileSystem->getFileListInDirectory(dirname, AsciiString("*.ini"), filenameList, TRUE); + TheFileSystem->getFileListInDirectory(dirname, "*.ini", filenameList, TRUE); Int index = -1; diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp index 0e8c8ed2e33..81c8ebcc698 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp @@ -95,7 +95,7 @@ void StartDownloadingPatches( void ) } WindowLayout *layout; - layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DownloadMenu.wnd" ) ); + layout = TheWindowManager->winCreateLayout( "Menus/DownloadMenu.wnd" ); layout->runInit(); layout->hide( FALSE ); layout->bringForward(); @@ -233,10 +233,10 @@ static void startOnline( void ) UserPreferences::const_iterator it = pref.find("useProfiles"); if (it != pref.end() && it->second.compareNoCase("yes") == 0) #endif // ALLOW_NON_PROFILED_LOGIN - TheShell->push( AsciiString("Menus/GameSpyLoginProfile.wnd") ); + TheShell->push( "Menus/GameSpyLoginProfile.wnd" ); #ifdef ALLOW_NON_PROFILED_LOGIN else - TheShell->push( AsciiString("Menus/GameSpyLoginQuick.wnd") ); + TheShell->push( "Menus/GameSpyLoginQuick.wnd" ); #endif // ALLOW_NON_PROFILED_LOGIN } diff --git a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp index 90e344331d5..8c179202056 100644 --- a/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp +++ b/Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp @@ -506,7 +506,7 @@ void LANAPI::OnGameJoin( ReturnType ret, LANGameInfo *theGame ) if (ret == RET_OK) { LANbuttonPushed = true; - TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") ); + TheShell->push( "Menus/LanGameOptionsMenu.wnd" ); //lanUpdateSlotList(); LANPreferences pref; @@ -597,7 +597,7 @@ void LANAPI::OnGameCreate( ReturnType ret ) { LANbuttonPushed = true; - TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") ); + TheShell->push( "Menus/LanGameOptionsMenu.wnd" ); RequestLobbyLeave( false ); //RequestGameAnnounce( ); // can't do this here, since we don't have a map set diff --git a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp index 7bbe8325b43..d644725d483 100644 --- a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp +++ b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp @@ -167,7 +167,7 @@ void WebBrowser::init() { m_urlList = NULL; INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Webpages" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Webpages", INI_LOAD_OVERWRITE, NULL ); } /****************************************************************************** diff --git a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp index 2470d669125..bfd2bd094dc 100644 --- a/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp +++ b/Core/GameEngineDevice/Source/StdDevice/Common/StdBIGFileSystem.cpp @@ -210,7 +210,7 @@ void StdBIGFileSystem::closeAllFiles() { Bool StdBIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) { FilenameList filenameList; - TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE); + TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE); Bool actuallyAdded = FALSE; FilenameListIter it = filenameList.begin(); diff --git a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp index 95f9e7ef0e5..27491ab7583 100644 --- a/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp +++ b/Core/GameEngineDevice/Source/Win32Device/Common/Win32BIGFileSystem.cpp @@ -211,7 +211,7 @@ void Win32BIGFileSystem::closeAllFiles() { Bool Win32BIGFileSystem::loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite) { FilenameList filenameList; - TheLocalFileSystem->getFileListInDirectory(dir, AsciiString(""), fileMask, filenameList, TRUE); + TheLocalFileSystem->getFileListInDirectory(dir, "", fileMask, filenameList, TRUE); Bool actuallyAdded = FALSE; FilenameListIter it = filenameList.begin(); diff --git a/Core/Tools/Autorun/autorun.cpp b/Core/Tools/Autorun/autorun.cpp index c4b27b39f07..fefdd6ed6e4 100644 --- a/Core/Tools/Autorun/autorun.cpp +++ b/Core/Tools/Autorun/autorun.cpp @@ -2276,7 +2276,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Install" ), #else - AsciiString("Autorun:Install"), + "Autorun:Install", #endif TTButtonFontPtr ); @@ -2295,7 +2295,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Play" ), #else - AsciiString("Autorun:Play"), + "Autorun:Play", #endif TTButtonFontPtr ); /* @@ -2314,7 +2314,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Worldbuilder" ), #else - AsciiString("Autorun:Worldbuilder"), + "Autorun:Worldbuilder", #endif TTButtonFontPtr ); */ @@ -2333,7 +2333,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:CheckForUpdates" ), #else - AsciiString("Autorun:CheckForUpdates"), + "Autorun:CheckForUpdates", #endif TTButtonFontPtr ); } @@ -2351,7 +2351,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:ExploreCD" ), #else - AsciiString("Autorun:ExploreCD"), + "Autorun:ExploreCD", #endif TTButtonFontPtr ); // strcpy( next_button_name, ButtonImages[button_index] ); @@ -2372,7 +2372,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Website" ), #else - AsciiString("Autorun:Website"), + "Autorun:Website", #endif TTButtonFontPtr ); @@ -2395,7 +2395,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Uninstall" ), #else - AsciiString("Autorun:Uninstall"), + "Autorun:Uninstall", #endif TTButtonFontPtr ); @@ -2417,7 +2417,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Previews" ), #else - AsciiString("Autorun:Previews"), + "Autorun:Previews", #endif TTButtonFontPtr ); @@ -2434,7 +2434,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Help" ), #else - AsciiString("Autorun:Help"), + "Autorun:Help", #endif TTButtonFontPtr ); @@ -2451,7 +2451,7 @@ void MainWindow::Create_Buttons( HWND hWnd, RECT *dlg_rect ) #ifdef LEAN_AND_MEAN Locale_GetString( "Autorun:Cancel" ), #else - AsciiString("Autorun:Cancel"), + "Autorun:Cancel", #endif TTButtonFontPtr ); @@ -3856,7 +3856,7 @@ BOOL CALLBACK Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param Reformat_Volume_Name( PRODUCT_VOLUME_CD2, volume_to_match ); // result = Prompt_For_CD( window_handle, volume_to_match, IDS_INSERT_CDROM_WITH_VOLUME2, IDS_EXIT_MESSAGE2, &cd_drive ); - result = Prompt_For_CD( window_handle, volume_to_match, AsciiString("Autorun:InsertCDROMWithVolume2"), AsciiString("Autorun:ExitMessage2"), &cd_drive ); + result = Prompt_For_CD( window_handle, volume_to_match, "Autorun:InsertCDROMWithVolume2", "Autorun:ExitMessage2", &cd_drive ); } if ( result ) { @@ -3883,7 +3883,7 @@ BOOL CALLBACK Dialog_Box_Proc( HWND window_handle, UINT message, WPARAM w_param } else { - Error_Message( Main::hInstance, AsciiString("Autorun:Generals"), AsciiString("Autorun:CantFindExplorer"), GAME_WEBSITE ); + Error_Message( Main::hInstance, "Autorun:Generals", "Autorun:CantFindExplorer", GAME_WEBSITE ); } break; #endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h index ec6dd1e4426..e644defdf66 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -81,7 +81,7 @@ class ArmorTemplateSet inline Int getConditionsYesCount() const { return 1; } inline const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; } #if defined(RTS_DEBUG) - inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); } + inline AsciiString getDescription() const { return "ArmorTemplateSet"; } #endif void parseArmorTemplateSet( INI* ini ); diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h index 30af7e2edf2..c2e8ecefe69 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -138,7 +138,7 @@ class WeaponTemplateSet inline Int getConditionsYesCount() const { return 1; } inline const WeaponSetFlags& getNthConditionsYes(Int i) const { return m_types; } #if defined(RTS_DEBUG) - inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); } + inline AsciiString getDescription() const { return "ArmorTemplateSet"; } #endif }; diff --git a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp index e4a20be08cc..f8ce2dd61c3 100644 --- a/Generals/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameEngine.cpp @@ -394,7 +394,7 @@ void GameEngine::init() #if defined(RTS_DEBUG) // If we're in Debug, load the Debug settings as well. - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameDataDebug" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_OVERWRITE, NULL ); #endif // special-case: parse command-line parameters after loading global data @@ -421,8 +421,8 @@ void GameEngine::init() #endif // read the water settings from INI (must do prior to initing GameClient, apparently) - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Water" ), INI_LOAD_OVERWRITE, &xferCRC ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Water" ), INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, &xferCRC ); #ifdef DEBUG_CRC initSubsystem(TheDeepCRCSanityCheck, "TheDeepCRCSanityCheck", MSGNEW("GameEngineSubystem") DeepCRCSanityCheck, NULL); @@ -522,7 +522,7 @@ void GameEngine::init() } // load the initial shell screen - //TheShell->push( AsciiString("Menus/MainMenu.wnd") ); + //TheShell->push( "Menus/MainMenu.wnd" ); // This allows us to run a map from the command line if (TheGlobalData->m_initialFile.isEmpty() == FALSE) diff --git a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp index 8eee50b6fa4..b4f4592ed29 100644 --- a/Generals/Code/GameEngine/Source/Common/GameLOD.cpp +++ b/Generals/Code/GameEngine/Source/Common/GameLOD.cpp @@ -300,10 +300,10 @@ void GameLODManager::init(void) { INI ini; //Get Presets for each LOD level. - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameLOD" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameLOD", INI_LOAD_OVERWRITE, NULL ); //Get presets for each known hardware configuration - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameLODPresets"), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\GameLODPresets", INI_LOAD_OVERWRITE, NULL); //Get Presets for custom LOD level by pulling them out of initial globaldata (which should //have all settings already applied). diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index 04be1d230ed..75d8a31ec05 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -1766,7 +1766,7 @@ RecorderModeType RecorderClass::getMode() { ///< Show or Hide the Replay controls void RecorderClass::initControls() { - NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayControl.wnd:ParentReplayControl") ); + NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( "ReplayControl.wnd:ParentReplayControl" ); GameWindow *parentReplayControl = TheWindowManager->winGetWindowFromId( NULL, parentReplayControlID ); Bool show = (getMode() != RECORDERMODETYPE_PLAYBACK); diff --git a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp index 6a775a5e90c..c1cd2400a60 100644 --- a/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -743,7 +743,7 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver ) c->next = m_chunkStack; m_chunkStack = c; if (this->atEndOfFile()) { - return (AsciiString("")); + return AsciiString::TheEmptyString; } return m_contents.getName( c->id ); } @@ -779,7 +779,7 @@ AsciiString DataChunkInput::getChunkLabel( void ) { // TODO: Throw exception DEBUG_CRASH(("Bad.")); - return AsciiString(""); + return AsciiString::TheEmptyString; } return m_contents.getName( m_chunkStack->id ); diff --git a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp index ee1d58a3857..0d0229142d7 100644 --- a/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp +++ b/Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp @@ -636,7 +636,7 @@ SaveCode GameState::missionSave( void ) desc.format( format, TheGameText->fetch( campaign->m_campaignNameLabel ).str(), missionNumber ); // do an automatic mission save - return TheGameState->saveGame( AsciiString(""), desc, SAVE_FILE_TYPE_MISSION ); + return TheGameState->saveGame( "", desc, SAVE_FILE_TYPE_MISSION ); } diff --git a/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp b/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp index 5f4386420bd..796f2fcc90b 100644 --- a/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp +++ b/Generals/Code/GameEngine/Source/Common/TerrainTypes.cpp @@ -139,7 +139,7 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name ) terrain = newInstance(TerrainType); // copy default values from the default terrain entry - TerrainType *defaultTerrain = findTerrain( AsciiString( "DefaultTerrain" ) ); + TerrainType *defaultTerrain = findTerrain( "DefaultTerrain" ); if( defaultTerrain ) *terrain = *defaultTerrain; /* diff --git a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index 5c946d31c6f..8c75ab0f3da 100644 --- a/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/Generals/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -134,7 +134,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name ) newTemplate = newInstance(ThingTemplate); // if the default template is present, get it and copy over any data to the new template - const ThingTemplate *defaultT = findTemplate( AsciiString( "DefaultThingTemplate" ) ); + const ThingTemplate *defaultT = findTemplate( "DefaultThingTemplate" ); if( defaultT ) { @@ -276,7 +276,7 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name ) #ifdef LOAD_TEST_ASSETS if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING))) { - ThingTemplate *tmplate = newTemplate( AsciiString( "Un-namedTemplate" ) ); + ThingTemplate *tmplate = newTemplate( "Un-namedTemplate" ); // load the values tmplate->initForLTA( name ); diff --git a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp index 9289e313c80..7d132eae2b8 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Credits.cpp @@ -155,7 +155,7 @@ void CreditsManager::load(void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Credits" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Credits", INI_LOAD_OVERWRITE, NULL ); if(m_scrollRatePerFrames <=0) m_scrollRatePerFrames = 1; diff --git a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp index da880e3c54e..f2e86d0498c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Eva.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Eva.cpp @@ -182,7 +182,7 @@ void Eva::init() { // parse the INI here, etc. INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Eva" ), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\Eva", INI_LOAD_OVERWRITE, NULL); } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 2b79ac726bb..c08c490fc9c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -1039,11 +1039,11 @@ void ControlBar::init( void ) INI ini; m_sideSelectAnimateDown = FALSE; // load the command buttons - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\CommandButton" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\CommandButton" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\CommandButton", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\CommandButton", INI_LOAD_OVERWRITE, NULL ); // load the command sets - ini.loadFileDirectory( AsciiString( "Data\\INI\\CommandSet" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\CommandSet", INI_LOAD_OVERWRITE, NULL ); // post process step after loading the command buttons and command sets postProcessCommands(); @@ -1230,9 +1230,9 @@ void ControlBar::init( void ) m_radarAttackGlowWindow = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinUAttack")); - win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); win->winGetScreenPosition(&m_controlBarForegroundMarkerPos.x, &m_controlBarForegroundMarkerPos.y); - win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); win->winGetScreenPosition(&m_controlBarBackgroundMarkerPos.x,&m_controlBarBackgroundMarkerPos.y); if(!m_videoManager) @@ -1388,7 +1388,7 @@ void ControlBar::update( void ) { if (m_animateWindowManager->isFinished() && m_animateWindowManager->isReversed()) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window && !window->winIsHidden()) window->winHide(TRUE); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp index c9858ec4778..d15d40b7d2c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp @@ -224,7 +224,7 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m // if( controlID == buttonCommunicator && TheGameLogic->getGameMode() == GAME_INTERNET ) /* { - popupCommunicatorLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupCommunicator.wnd" ) ); + popupCommunicatorLayout = TheWindowManager->winCreateLayout( "Menus/PopupCommunicator.wnd" ); popupCommunicatorLayout->runInit(); popupCommunicatorLayout->hide( FALSE ); popupCommunicatorLayout->bringForward(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp index 04aace41dc3..fc8b35ad5f2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp @@ -103,7 +103,7 @@ void ControlBarResizer::init( void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\ControlBarResizer" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ControlBarResizer", INI_LOAD_OVERWRITE, NULL ); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 46e14bb6a00..6554aa87461 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -1007,8 +1007,8 @@ void ControlBarSchemeManager::init( void ) INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ControlBarScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ControlBarScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL ); // //Load the user modified control bar schemes // WIN32_FIND_DATA findData; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp index 9c55aecd5e6..75704c557da 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp @@ -358,7 +358,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonCommunicator = TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:PopupCommunicator") ); + buttonCommunicator = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" ); break; @@ -503,7 +503,7 @@ void ShowControlBar( Bool immediate ) TheControlBar->showSpecialPowerShortcut(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -538,7 +538,7 @@ void HideControlBar( Bool immediate ) TheControlBar->hideSpecialPowerShortcut(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -574,7 +574,7 @@ void ToggleControlBar( Bool immediate ) toggleReplayControls(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index 55fbfd98fff..91483cdfafb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -557,7 +557,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton, if(win) { - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); static ICoord2D lastOffset = { 0, 0 }; ICoord2D size, newSize, pos; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp index 13747434ecc..67357c600c2 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp @@ -62,7 +62,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne return NULL; } - GameWindow *parent = TheWindowManager->winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); + GameWindow *parent = TheWindowManager->winCreateFromScript( "Menus/MessageBox.wnd" ); TheWindowManager->winSetModal( parent ); TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves TheWindowManager->winSetFocus( parent ); @@ -104,19 +104,19 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne Int buttonX[3], buttonY[3]; //In the layout, buttonOk will be in the first button position - NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); + NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID); buttonOk->winGetPosition(&buttonX[0], &buttonY[0]); - NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); + NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID); //buttonNo in the second position - NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); + NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID); buttonNo->winGetPosition(&buttonX[1], &buttonY[1]); //and buttonCancel in the third - NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID); buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]); @@ -161,11 +161,11 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne } // Fill the text into the text boxes - NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextTitle" ) ); + NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextTitle" ); GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID); GadgetStaticTextSetText(staticTextTitle,titleString); - NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextMessage" ) ); + NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextMessage" ); GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID); GadgetStaticTextSetText(staticTextMessage,bodyString); @@ -261,10 +261,10 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); WindowExMessageBoxData *MsgBoxCallbacks = (WindowExMessageBoxData *)window->winGetUserData(); MessageBoxReturnType ret = MB_RETURN_CLOSE; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp index 12988daaa83..9311f81063e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp @@ -76,7 +76,7 @@ void ShowInGameChat( Bool immediate ) } else { - chatWindow = TheWindowManager->winCreateFromScript( AsciiString("InGameChat.wnd") ); + chatWindow = TheWindowManager->winCreateFromScript( "InGameChat.wnd" ); static NameKeyType textEntryChatID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:TextEntryChat" ); chatTextEntry = TheWindowManager->winGetWindowFromId( NULL, textEntryChatID ); @@ -338,7 +338,7 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, case GBM_SELECTED: { GameWindow *control = (GameWindow *)mData1; - static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "InGameChat.wnd:ButtonClear" ) ); + static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:ButtonClear" ); if (control && control->winGetWindowId() == buttonClearID) { if (chatTextEntry) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp index a5e4d2aa2af..dda3a72f769 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp @@ -89,12 +89,12 @@ static Bool pause = FALSE; void InGamePopupMessageInit( WindowLayout *layout, void *userData ) { - parentID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:InGamePopupMessageParent")); + parentID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:InGamePopupMessageParent"); parent = TheWindowManager->winGetWindowFromId(NULL, parentID); - staticTextMessageID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:StaticTextMessage")); + staticTextMessageID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:StaticTextMessage"); staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID); - buttonOkID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:ButtonOk")); + buttonOkID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:ButtonOk"); buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID); PopupMessageData *pMData = TheInGameUI->getPopupMessageData(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp index cbb8a8c5a07..133d11a1413 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp @@ -86,7 +86,7 @@ void CreditsMenuInit( WindowLayout *layout, void *userData ) TheCredits->load(); TheCredits->init(); - parentMainMenuID = TheNameKeyGenerator->nameToKey( AsciiString("CreditsMenu.wnd:ParentCreditsWindow") ); + parentMainMenuID = TheNameKeyGenerator->nameToKey( "CreditsMenu.wnd:ParentCreditsWindow" ); parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, parentMainMenuID ); @@ -99,7 +99,7 @@ void CreditsMenuInit( WindowLayout *layout, void *userData ) TheAudio->removeAudioEvent( AHSV_StopTheMusicFade ); - AudioEventRTS event( AsciiString( "Credits" ) ); + AudioEventRTS event( "Credits" ); event.setShouldFade( TRUE ); TheAudio->addAudioEvent( &event ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp index 886e92cd1ea..46446f8dbde 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp @@ -133,11 +133,11 @@ void DifficultySelectInit( WindowLayout *layout, void *userData ) buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); buttonCancelID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonCancel" ); buttonCancel = TheWindowManager->winGetWindowFromId( parent, buttonCancelID ); - radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonEasy") ); + radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonEasy" ); radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID ); - radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonMedium") ); + radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonMedium" ); radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID ); - radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonHard") ); + radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonHard" ); radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID ); s_AIDiff = DIFFICULTY_NORMAL; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp index 8b6d0e6820a..1c3ce0ea666 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp @@ -70,8 +70,8 @@ static GameWindow *buttonVotePlayer6Window = NULL; static GameWindow *buttonVotePlayer7Window = NULL; static void InitDisconnectWindow( void ) { - textEntryID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:TextEntry")); - textDisplayID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ListboxTextDisplay")); + textEntryID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:TextEntry"); + textDisplayID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ListboxTextDisplay"); textEntryWindow = TheWindowManager->winGetWindowFromId(NULL, textEntryID); textDisplayWindow = TheWindowManager->winGetWindowFromId(NULL, textDisplayID); @@ -81,16 +81,16 @@ static void InitDisconnectWindow( void ) { TheWindowManager->winSetFocus(textEntryWindow); } - buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonQuitGame")); + buttonQuitID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonQuitGame"); buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID); - buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer1")); - buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer2")); - buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer3")); - buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer4")); - buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer5")); - buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer6")); - buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer7")); + buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer1"); + buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer2"); + buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer3"); + buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer4"); + buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer5"); + buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer6"); + buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer7"); buttonVotePlayer1Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer1ID); buttonVotePlayer2Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer2ID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp index 5d27a4aadad..b04aeb377aa 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp @@ -126,7 +126,7 @@ static void showGameSpyQMUnderlyingGUIElements( Bool show ) } static void InitEstablishConnectionsDialog( void ) { - buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("EstablishConnectionsScreen.wnd:ButtonQuit") ); + buttonQuitID = TheNameKeyGenerator->nameToKey( "EstablishConnectionsScreen.wnd:ButtonQuit" ); buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp index 65d6d57e034..b11e6054990 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp @@ -67,7 +67,7 @@ static WindowLayout *gameInfoWindowLayout = NULL; void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin ) { if( !gameInfoWindowLayout ) - gameInfoWindowLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/GameInfoWindow.wnd" ) ); + gameInfoWindowLayout = TheWindowManager->winCreateLayout( "Menus/GameInfoWindow.wnd" ); gameInfoWindowLayout->runInit(); gameInfoWindowLayout->bringForward(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp index 7b160870117..1bc075b6f27 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp @@ -395,7 +395,7 @@ void KeyboardOptionsMenuInit( WindowLayout *layout, void *userData ) parentKeyboardOptionsMenu = TheWindowManager->winGetWindowFromId( NULL, parentKeyboardOptionsMenuID ); // get ids for our children controls - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("KeyboardOptionsMenu.wnd:ButtonBack") ); + buttonBackID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" ); buttonBack = TheWindowManager->winGetWindowFromId( parentKeyboardOptionsMenu, buttonBackID ); comboBoxCategoryListID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ComboBoxCategoryList" ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index ac415e02292..b884e58bdfd 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -615,15 +615,15 @@ void lanUpdateSlotList( void ) void InitLanGameGadgets( void ) { //Initialize the gadget IDs - parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryChat" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonEmote" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonSelectMap" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:MapWindow" ) ); + parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonStart" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryChat" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ); + listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonEmote" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonSelectMap" ); + windowMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:MapWindow" ); // Initialize the pointers to our gadgets parentLanGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentLanGameOptionsID ); @@ -1159,7 +1159,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m { //buttonBack->winEnable( false ); - mapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/LanMapSelectMenu.wnd" ) ); + mapSelectLayout = TheWindowManager->winCreateLayout( "Menus/LanMapSelectMenu.wnd" ); mapSelectLayout->runInit(); mapSelectLayout->hide( FALSE ); mapSelectLayout->bringForward(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index bfc8d63263c..9f654818804 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -367,20 +367,20 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData ) LANisShuttingDown = false; // get the ids for our controls - parentLanLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:LanLobbyMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonBack" ) ); - buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonClear" ) ); - buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonHost" ) ); - buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonJoin" ) ); - buttonDirectConnectID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonDirectConnect" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonEmote" ) ); - staticToolTipID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticToolTip" ) ); - textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryPlayerName" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryChat" ) ); - listboxPlayersID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxPlayers" ) ); - listboxChatWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ) ); - listboxGamesID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxGames" ) ); - staticTextGameInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticTextGameInfo" ) ); + parentLanLobbyID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:LanLobbyMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonBack" ); + buttonClearID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonClear" ); + buttonHostID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonHost" ); + buttonJoinID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonJoin" ); + buttonDirectConnectID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonDirectConnect" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonEmote" ); + staticToolTipID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticToolTip" ); + textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryPlayerName" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryChat" ); + listboxPlayersID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxPlayers" ); + listboxChatWindowID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ); + listboxGamesID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxGames" ); + staticTextGameInfoID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticTextGameInfo" ); // Get pointers to the window buttons @@ -786,7 +786,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, else if ( controlID == buttonJoinID ) { - //TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") ); + //TheShell->push( "Menus/LanGameOptionsMenu.wnd" ); int rowSelected = -1; GadgetListBoxGetSelected( listboxGames, &rowSelected ); @@ -822,7 +822,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, else if (controlID == buttonDirectConnectID) { TheLAN->RequestLobbyLeave( false ); - TheShell->push(AsciiString("Menus/NetworkDirectConnect.wnd")); + TheShell->push("Menus/NetworkDirectConnect.wnd"); } break; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp index 0fc2d8483bd..ff48c172f71 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp @@ -138,10 +138,10 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData ) } - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ListboxMap") ); - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:WinMapPreview") ); + buttonBack = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:WinMapPreview" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonUserMaps" ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index c6df2bd82e7..11d3090148a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -412,7 +412,7 @@ GameWindow *win = NULL; // Originally this label does not exist in the Main Menu. It can be copied from the Options Menu. static void initLabelVersion() { - NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:LabelVersion") ); + NameKeyType versionID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:LabelVersion" ); GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID ); if (labelVersion) @@ -449,40 +449,40 @@ void MainMenuInit( WindowLayout *layout, void *userData ) dropDownWindows[i] = NULL; // get ids for our windows - mainMenuID = TheNameKeyGenerator->nameToKey( AsciiString( "MainMenu.wnd:MainMenuParent" ) ); -// campaignID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCampaign") ); - skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") ); - onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") ); - networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") ); - optionsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOptions") ); - exitID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonExit") ); - motdID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMOTD") ); - worldBuilderID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonWorldBuilder") ); - getUpdateID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGetUpdate") ); - buttonTRAININGID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonTRAINING") ); - buttonUSAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSA") ); - buttonGLAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLA") ); - buttonChinaID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChina") ); - buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSARecentSave") ); - buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSALoadGame") ); - buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLARecentSave") ); - buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLALoadGame") ); - buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaRecentSave") ); - buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaLoadGame") ); - buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSinglePlayer") ); - buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiplayer") ); - buttonMultiBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiBack") ); - buttonSingleBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSingleBack") ); - buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplayBack") ); - buttonReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonReplay") ); - buttonLoadReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplay") ); - buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadGame") ); - buttonCreditsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCredits") ); - - buttonEasyID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonEasy") ); - buttonMediumID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMedium") ); - buttonHardID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonHard") ); - buttonDiffBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonDiffBack") ); + mainMenuID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuParent" ); +// campaignID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCampaign" ); + skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" ); + onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" ); + networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" ); + optionsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOptions" ); + exitID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonExit" ); + motdID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMOTD" ); + worldBuilderID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonWorldBuilder" ); + getUpdateID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGetUpdate" ); + buttonTRAININGID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonTRAINING" ); + buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" ); + buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" ); + buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" ); + buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSARecentSave" ); + buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSALoadGame" ); + buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLARecentSave" ); + buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLALoadGame" ); + buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaRecentSave" ); + buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaLoadGame" ); + buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSinglePlayer" ); + buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiplayer" ); + buttonMultiBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiBack" ); + buttonSingleBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSingleBack" ); + buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplayBack" ); + buttonReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonReplay" ); + buttonLoadReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplay" ); + buttonLoadID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadGame" ); + buttonCreditsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCredits" ); + + buttonEasyID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonEasy" ); + buttonMediumID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMedium" ); + buttonHardID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonHard" ); + buttonDiffBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonDiffBack" ); // get pointers to the window buttons parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, mainMenuID ); @@ -518,11 +518,11 @@ void MainMenuInit( WindowLayout *layout, void *userData ) buttonChinaRecentSave = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaRecentSaveID ); buttonChinaLoadGame = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaLoadGameID ); - dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") )); - dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder1") ) ); - dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder2") ) ); - dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder3") ) ); - dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder4") ) ); + dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" )); + dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder1" ) ); + dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder2" ) ); + dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder3" ) ); + dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder4" ) ); for(i = 1; i < DROPDOWN_COUNT; ++i) dropDownWindows[i]->winHide(TRUE); @@ -613,7 +613,7 @@ void MainMenuInit( WindowLayout *layout, void *userData ) //pendingDropDown =DROPDOWN_MAIN; - GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MainMenuRuler") ) ); + GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuRuler" ) ); if(rule) rule->winHide(TRUE); campaignSelected = FALSE; @@ -1245,7 +1245,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, if( control == buttonCampaign ) { buttonPushed = TRUE; - TheShell->push(AsciiString( "Menus/MapSelectMenu.wnd" )); + TheShell->push("Menus/MapSelectMenu.wnd"); // As soon as we have a campaign, add it in here!; } #ifdef TEST_COMPRESSION @@ -1350,7 +1350,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition"); - TheShell->push(AsciiString("Menus/SaveLoad.wnd")); + TheShell->push("Menus/SaveLoad.wnd"); } else if( controlID == buttonReplayID ) @@ -1361,7 +1361,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition"); - TheShell->push(AsciiString("Menus/ReplayMenu.wnd")); + TheShell->push("Menus/ReplayMenu.wnd"); } else if( controlID == skirmishID ) { @@ -1373,7 +1373,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, TheTransitionHandler->remove("MainMenuFactionSkirmish"); TheTransitionHandler->reverse("MainMenuSinglePlayerMenuBackSkirmish"); - TheShell->push( AsciiString("Menus/SkirmishGameOptionsMenu.wnd") ); + TheShell->push( "Menus/SkirmishGameOptionsMenu.wnd" ); TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_SKIRMISH_SELECTED]); } else if( controlID == onlineID ) @@ -1398,7 +1398,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuMultiPlayerMenuTransitionToNext"); - TheShell->push( AsciiString("Menus/LanLobbyMenu.wnd") ); + TheShell->push( "Menus/LanLobbyMenu.wnd" ); TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_NETWORK_SELECTED]); } @@ -1486,7 +1486,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showLogo = FALSE; showSide = SHOW_USA; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); @@ -1510,7 +1510,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showLogo = FALSE; showSide = SHOW_GLA; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); @@ -1535,7 +1535,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showSide = SHOW_CHINA; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp index 8f9ccf3c865..563f242a47c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp @@ -122,7 +122,7 @@ void SetDifficultyRadioButton( void ) { case DIFFICULTY_EASY: { - NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") ); + NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" ); GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID ); GadgetRadioSetSelection(radioButtonEasyAI, FALSE); s_AIDiff = DIFFICULTY_EASY; @@ -130,7 +130,7 @@ void SetDifficultyRadioButton( void ) } case DIFFICULTY_NORMAL: { - NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") ); + NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" ); GameWindow *radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID ); GadgetRadioSetSelection(radioButtonMediumAI, FALSE); s_AIDiff = DIFFICULTY_NORMAL; @@ -138,7 +138,7 @@ void SetDifficultyRadioButton( void ) } case DIFFICULTY_HARD: { - NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") ); + NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" ); GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID ); GadgetRadioSetSelection(radioButtonHardAI, FALSE); s_AIDiff = DIFFICULTY_HARD; @@ -188,10 +188,10 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData ) GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); TheWindowManager->winSetFocus( parent ); - NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") ); + NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" ); GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID ); - NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); + NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID ); @@ -324,12 +324,12 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ListboxMap") ); - radioButtonEasyAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") ); - radioButtonMediumAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") ); - radioButtonHardAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") ); + buttonBack = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" ); + radioButtonEasyAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" ); + radioButtonMediumAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" ); + radioButtonHardAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" ); break; } @@ -418,7 +418,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = true; // reset the campaign manager to empty if( TheCampaignManager ) - TheCampaignManager->setCampaign( AsciiString( "" ) ); + TheCampaignManager->setCampaign( "" ); // get text of the map to load const char *mapFname = (const char *)GadgetListBoxGetItemData( mapWindow, selected ); DEBUG_ASSERTCRASH(mapFname, ("No map item data")); @@ -457,7 +457,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, { //buttonPushed = true; GadgetListBoxSetSelected( control, rowSelected ); - NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); + NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID ); TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp index 0579a917f99..32cd126db54 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp @@ -262,12 +262,12 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData ) buttonPushed = false; isShuttingDown = false; TheShell->showShellMap(TRUE); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonBack" ) ); - buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonHost" ) ); - buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonJoin" ) ); - editPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:EditPlayerName" ) ); - comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ) ); - staticLocalIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:StaticLocalIP" ) ); + buttonBackID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonBack" ); + buttonHostID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonHost" ); + buttonJoinID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonJoin" ); + editPlayerNameID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:EditPlayerName" ); + comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ); + staticLocalIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:StaticLocalIP" ); buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID); buttonHost = TheWindowManager->winGetWindowFromId( NULL, buttonHostID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 60ff6cbcee2..8cffa3c435c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -1144,9 +1144,9 @@ static void saveOptions( void ) { TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay); if (TheGlobalData->m_firewallSendDelay) { - (*pref)["SendDelay"] = AsciiString("yes"); + (*pref)["SendDelay"] = "yes"; } else { - (*pref)["SendDelay"] = AsciiString("no"); + (*pref)["SendDelay"] = "no"; } } @@ -1169,36 +1169,36 @@ static void saveOptions( void ) } TheWritableGlobalData->m_useShadowVolumes = GadgetCheckBoxIsChecked( check3DShadows ); - (*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? "yes" : "no"; TheWritableGlobalData->m_useShadowDecals = GadgetCheckBoxIsChecked( check2DShadows ); - (*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? "yes" : "no"; TheWritableGlobalData->m_useCloudMap = GadgetCheckBoxIsChecked( checkCloudShadows ); - (*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? "yes" : "no"; TheWritableGlobalData->m_useLightMap = GadgetCheckBoxIsChecked( checkGroundLighting ); - (*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? "yes" : "no"; TheWritableGlobalData->m_showSoftWaterEdge = GadgetCheckBoxIsChecked( checkSmoothWater ); - (*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? AsciiString("yes") : AsciiString("no"); + (*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? "yes" : "no"; TheWritableGlobalData->m_useDrawModuleLOD = !GadgetCheckBoxIsChecked( checkExtraAnimations ); TheWritableGlobalData->m_useTreeSway = !TheWritableGlobalData->m_useDrawModuleLOD; //borrow same setting. - (*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? AsciiString("no") : AsciiString("yes"); + (*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? "no" : "yes"; TheWritableGlobalData->m_enableDynamicLOD = !GadgetCheckBoxIsChecked( checkNoDynamicLod ); - (*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? AsciiString("yes") : AsciiString("no"); + (*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? "yes" : "no"; // Never write this out //TheWritableGlobalData->m_useFpsLimit = !GadgetCheckBoxIsChecked( checkUnlockFps ); - //(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? AsciiString("yes") : AsciiString("no"); + //(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? "yes" : "no"; TheWritableGlobalData->m_enableBehindBuildingMarkers = GadgetCheckBoxIsChecked( checkBuildingOcclusion ); - (*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? AsciiString("yes") : AsciiString("no"); + (*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? "yes" : "no"; TheWritableGlobalData->m_useTrees = GadgetCheckBoxIsChecked( checkProps); - (*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? AsciiString("yes") : AsciiString("no"); + (*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? "yes" : "no"; //------------------------------------------------------------------------------------------------- // Particle Cap slider @@ -1295,7 +1295,7 @@ static void saveOptions( void ) //------------------------------------------------------------------------------------------------- // mouse mode TheWritableGlobalData->m_useAlternateMouse = GadgetCheckBoxIsChecked(checkAlternateMouse); - (*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? "yes" : "no"; // TheSuperHackers @todo Add combo box ? { @@ -1598,7 +1598,7 @@ static void cancelAdvancedOptions() // TheSuperHackers @tweak Now prints additional version information in the version label. static void initLabelVersion() { - NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:LabelVersion") ); + NameKeyType versionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LabelVersion" ); GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID ); if (labelVersion) @@ -1631,100 +1631,100 @@ void OptionsMenuInit( WindowLayout *layout, void *userData ) SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_OPENED); - comboBoxLANIPID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxIP" ) ); + comboBoxLANIPID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxIP" ); comboBoxLANIP = TheWindowManager->winGetWindowFromId( NULL, comboBoxLANIPID); - comboBoxOnlineIPID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxOnlineIP" ) ); + comboBoxOnlineIPID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxOnlineIP" ); comboBoxOnlineIP = TheWindowManager->winGetWindowFromId( NULL, comboBoxOnlineIPID); - checkAlternateMouseID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAlternateMouse" ) ); + checkAlternateMouseID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAlternateMouse" ); checkAlternateMouse = TheWindowManager->winGetWindowFromId( NULL, checkAlternateMouseID); - sliderScrollSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderScrollSpeed" ) ); + sliderScrollSpeedID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderScrollSpeed" ); sliderScrollSpeed = TheWindowManager->winGetWindowFromId( NULL, sliderScrollSpeedID); - comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxAntiAliasing" ) ); + comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxAntiAliasing" ); comboBoxAntiAliasing = TheWindowManager->winGetWindowFromId( NULL, comboBoxAntiAliasingID ); - comboBoxResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxResolution" ) ); + comboBoxResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxResolution" ); comboBoxResolution = TheWindowManager->winGetWindowFromId( NULL, comboBoxResolutionID ); - comboBoxDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxDetail" ) ); + comboBoxDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxDetail" ); comboBoxDetail = TheWindowManager->winGetWindowFromId( NULL, comboBoxDetailID ); - checkLanguageFilterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLanguageFilter" ) ); + checkLanguageFilterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLanguageFilter" ); checkLanguageFilter = TheWindowManager->winGetWindowFromId( NULL, checkLanguageFilterID ); - checkSendDelayID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSendDelay" ) ); + checkSendDelayID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSendDelay" ); checkSendDelay = TheWindowManager->winGetWindowFromId( NULL, checkSendDelayID); - buttonFirewallRefreshID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonFirewallRefresh" ) ); + buttonFirewallRefreshID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonFirewallRefresh" ); buttonFirewallRefresh = TheWindowManager->winGetWindowFromId( NULL, buttonFirewallRefreshID); - checkDrawAnchorID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxDrawAnchor" ) ); + checkDrawAnchorID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxDrawAnchor" ); checkDrawAnchor = TheWindowManager->winGetWindowFromId( NULL, checkDrawAnchorID); - checkMoveAnchorID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxMoveAnchor" ) ); + checkMoveAnchorID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxMoveAnchor" ); checkMoveAnchor = TheWindowManager->winGetWindowFromId( NULL, checkMoveAnchorID); // Replay camera - checkSaveCameraID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxSaveCamera" ) ); + checkSaveCameraID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxSaveCamera" ); checkSaveCamera = TheWindowManager->winGetWindowFromId( NULL, checkSaveCameraID ); - checkUseCameraID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxUseCamera" ) ); + checkUseCameraID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxUseCamera" ); checkUseCamera = TheWindowManager->winGetWindowFromId( NULL, checkUseCameraID ); // // Speakers and 3-D Audio -// checkAudioSurroundID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioSurround" ) ); +// checkAudioSurroundID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioSurround" ); // checkAudioSurround = TheWindowManager->winGetWindowFromId( NULL, checkAudioSurroundID ); -// checkAudioHardwareID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioHardware" ) ); +// checkAudioHardwareID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioHardware" ); // checkAudioHardware = TheWindowManager->winGetWindowFromId( NULL, checkAudioHardwareID ); // // Volume Controls - sliderMusicVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderMusicVolume" ) ); + sliderMusicVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderMusicVolume" ); sliderMusicVolume = TheWindowManager->winGetWindowFromId( NULL, sliderMusicVolumeID ); - sliderSFXVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderSFXVolume" ) ); + sliderSFXVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderSFXVolume" ); sliderSFXVolume = TheWindowManager->winGetWindowFromId( NULL, sliderSFXVolumeID ); - sliderVoiceVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderVoiceVolume" ) ); + sliderVoiceVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderVoiceVolume" ); sliderVoiceVolume = TheWindowManager->winGetWindowFromId( NULL, sliderVoiceVolumeID ); - sliderGammaID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderGamma" ) ); + sliderGammaID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderGamma" ); sliderGamma = TheWindowManager->winGetWindowFromId( NULL, sliderGammaID ); -// checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLowTextureDetail" ) ); +// checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLowTextureDetail" ); // checkBoxLowTextureDetail = TheWindowManager->winGetWindowFromId( NULL, checkBoxLowTextureDetailID ); - WinAdvancedDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ) ); + WinAdvancedDisplayID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ); WinAdvancedDisplay = TheWindowManager->winGetWindowFromId( NULL, WinAdvancedDisplayID ); - ButtonAdvancedAcceptID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceAccept" ) ); + ButtonAdvancedAcceptID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceAccept" ); ButtonAdvancedAccept = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedAcceptID ); - ButtonAdvancedCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceBack" ) ); + ButtonAdvancedCancelID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceBack" ); ButtonAdvancedCancel = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedCancelID ); - sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:LowResSlider" ) ); + sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LowResSlider" ); sliderTextureResolution = TheWindowManager->winGetWindowFromId( NULL, sliderTextureResolutionID ); - check3DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check3DShadows" ) ); + check3DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check3DShadows" ); check3DShadows = TheWindowManager->winGetWindowFromId( NULL, check3DShadowsID); - check2DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check2DShadows" ) ); + check2DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check2DShadows" ); check2DShadows = TheWindowManager->winGetWindowFromId( NULL, check2DShadowsID); - checkCloudShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckCloudShadows" ) ); + checkCloudShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckCloudShadows" ); checkCloudShadows = TheWindowManager->winGetWindowFromId( NULL, checkCloudShadowsID); - checkGroundLightingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckGroundLighting" ) ); + checkGroundLightingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckGroundLighting" ); checkGroundLighting = TheWindowManager->winGetWindowFromId( NULL, checkGroundLightingID); - checkSmoothWaterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSmoothWater" ) ); + checkSmoothWaterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSmoothWater" ); checkSmoothWater = TheWindowManager->winGetWindowFromId( NULL, checkSmoothWaterID); - checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckExtraAnimations" ) ); + checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckExtraAnimations" ); checkExtraAnimations = TheWindowManager->winGetWindowFromId( NULL, checkExtraAnimationsID); - checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckNoDynamicLOD" ) ); + checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckNoDynamicLOD" ); checkNoDynamicLod = TheWindowManager->winGetWindowFromId( NULL, checkNoDynamicLodID); - checkUnlockFpsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckUnlockFPS" ) ); + checkUnlockFpsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckUnlockFPS" ); checkUnlockFps = TheWindowManager->winGetWindowFromId( NULL, checkUnlockFpsID); - checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBehindBuilding" ) ); + checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBehindBuilding" ); checkBuildingOcclusion = TheWindowManager->winGetWindowFromId( NULL, checkBuildingOcclusionID); - checkPropsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckShowProps" ) ); + checkPropsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckShowProps" ); checkProps = TheWindowManager->winGetWindowFromId( NULL, checkPropsID); - sliderParticleCapID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ParticleCapSlider" ) ); + sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" ); sliderParticleCap = TheWindowManager->winGetWindowFromId( NULL, sliderParticleCapID ); WinAdvancedDisplay->winHide(TRUE); @@ -2197,10 +2197,10 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonBack") ); - buttonDefaults = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonDefaults") ); - buttonAccept = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonAccept") ); - buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonKeyboardOptions" ) ); + buttonBack = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" ); + buttonDefaults = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonDefaults" ); + buttonAccept = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAccept" ); + buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonKeyboardOptions" ); break; @@ -2318,7 +2318,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, } else if ( controlID == buttonKeyboardOptionsMenu ) { - TheShell->push( AsciiString( "Menus/KeyboardOptionsMenu.wnd" ) ); + TheShell->push( "Menus/KeyboardOptionsMenu.wnd" ); } else if(controlID == checkDrawAnchorID ) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp index a7bc28656aa..be6aaaee59b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp @@ -69,7 +69,7 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData ) TheWindowManager->winSetModal( parent ); // get ids for our children controls - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString("PopupCommunicator.wnd:ButtonOk") ); + buttonOkID = TheNameKeyGenerator->nameToKey( "PopupCommunicator.wnd:ButtonOk" ); buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp index ac8a8c08d1f..4d9081decac 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp @@ -306,39 +306,39 @@ void PopulateCustomLadderComboBox( void ) //------------------------------------------------------------------------------------------------- void PopupHostGameInit( WindowLayout *layout, void *userData ) { - parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ParentHostPopUp")); + parentPopupID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ParentHostPopUp"); parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID); - textEntryGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameName")); + textEntryGameNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameName"); textEntryGameName = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameNameID); UnicodeString name; name.translate(TheGameSpyInfo->getLocalName()); GadgetTextEntrySetText(textEntryGameName, name); - textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameDescription")); + textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameDescription"); textEntryGameDescription = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameDescriptionID); GadgetTextEntrySetText(textEntryGameDescription, UnicodeString::TheEmptyString); - textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryLadderPassword")); + textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryLadderPassword"); textEntryLadderPassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryLadderPasswordID); GadgetTextEntrySetText(textEntryLadderPassword, UnicodeString::TheEmptyString); - textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGamePassword")); + textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGamePassword"); textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID); GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString); - buttonCreateGameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCreateGame")); + buttonCreateGameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCreateGame"); buttonCreateGame = TheWindowManager->winGetWindowFromId(parentPopup, buttonCreateGameID); - buttonCancelID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCancel")); + buttonCancelID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCancel"); buttonCancel = TheWindowManager->winGetWindowFromId(parentPopup, buttonCancelID); - checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxAllowObservers")); + checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxAllowObservers"); checkBoxAllowObservers = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxAllowObserversID); CustomMatchPreferences customPref; GadgetCheckBoxSetChecked(checkBoxAllowObservers, customPref.allowsObservers()); - comboBoxLadderNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ComboBoxLadderName")); + comboBoxLadderNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ComboBoxLadderName"); comboBoxLadderName = TheWindowManager->winGetWindowFromId(parentPopup, comboBoxLadderNameID); if (comboBoxLadderName) GadgetComboBoxReset(comboBoxLadderName); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp index ab3c066ae58..c34c1966909 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp @@ -86,14 +86,14 @@ static void joinGame( AsciiString password ); //------------------------------------------------------------------------------------------------- void PopupJoinGameInit( WindowLayout *layout, void *userData ) { - parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:ParentJoinPopUp")); + parentPopupID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:ParentJoinPopUp"); parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID); - textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:TextEntryGamePassword")); + textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:TextEntryGamePassword"); textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID); GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString); - NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:StaticTextGameName")); + NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:StaticTextGameName"); GameWindow *staticTextGameName = TheWindowManager->winGetWindowFromId(parentPopup, staticTextGameNameID); GadgetStaticTextSetText(staticTextGameName, UnicodeString::TheEmptyString); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp index 5322a005fc1..30a86122e1e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp @@ -648,7 +648,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort()); if (linfo) { - WindowLayout *rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupLadderDetails.wnd")); + WindowLayout *rcLayout = TheWindowManager->winCreateLayout("Menus/PopupLadderDetails.wnd"); if (!rcLayout) break; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 3fffa9d0002..8ea39e4230d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -81,11 +81,11 @@ static NameKeyType buttonSaveLoad = NAMEKEY_INVALID; static void initGadgetsFullQuit( void ) { - buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonExit" ) ); - buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonRestart" ) ); - buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonReturn" ) ); - buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonOptions" ) ); - buttonSaveLoad = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonSaveLoad" ) ); + buttonExit = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonExit" ); + buttonRestart = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonRestart" ); + buttonReturn = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonReturn" ); + buttonOptions = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonOptions" ); + buttonSaveLoad = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonSaveLoad" ); buttonRestartWin = TheWindowManager->winGetWindowFromId( NULL, buttonRestart ); buttonSaveLoadWin = TheWindowManager->winGetWindowFromId( NULL, buttonSaveLoad ); @@ -95,10 +95,10 @@ static void initGadgetsFullQuit( void ) static void initGadgetsNoSaveQuit( void ) { - buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonExit" ) ); - buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonRestart" ) ); - buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonReturn" ) ); - buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonOptions" ) ); + buttonExit = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonExit" ); + buttonRestart = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonRestart" ); + buttonReturn = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonReturn" ); + buttonOptions = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonOptions" ); buttonSaveLoad = NAMEKEY_INVALID; buttonRestartWin = TheWindowManager->winGetWindowFromId( NULL, buttonRestart ); @@ -301,7 +301,7 @@ void ToggleQuitMenu() WindowLayout *optLayout = TheShell->getOptionsLayout(FALSE); GameWindow *optionsParent = optLayout->getFirstWindow(); DEBUG_ASSERTCRASH(optionsParent != NULL, ("Not able to get the options layout parent window")); - GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonBack" ) )); + GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" )); DEBUG_ASSERTCRASH(optionsBack != NULL, ("Not able to get the back button window from the options menu")); TheWindowManager->winSendSystemMsg(optLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)optionsBack, NULL); return; @@ -310,7 +310,7 @@ void ToggleQuitMenu() { GameWindow *saveLoadParent = saveLoadMenuLayout->getFirstWindow(); DEBUG_ASSERTCRASH(saveLoadParent != NULL, ("Not able to get the save/load layout parent window")); - GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( AsciiString( "PopupSaveLoad.wnd:ButtonBack" ) )); + GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( "PopupSaveLoad.wnd:ButtonBack" )); DEBUG_ASSERTCRASH(saveLoadBack != NULL, ("Not able to get the back button window from the save/load menu")); TheWindowManager->winSendSystemMsg(saveLoadMenuLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)saveLoadBack, NULL); saveLoadMenuLayout = NULL; @@ -362,7 +362,7 @@ void ToggleQuitMenu() { // we don't want to show the save load button. if(!noSaveLoadQuitMenuLayout) - noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitNoSave.wnd" ) ); + noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( "Menus/QuitNoSave.wnd" ); quitMenuLayout = noSaveLoadQuitMenuLayout; initGadgetsNoSaveQuit(); TheTransitionHandler->remove("QuitNoSave"); @@ -371,7 +371,7 @@ void ToggleQuitMenu() else { if(!fullQuitMenuLayout) - fullQuitMenuLayout= TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitMenu.wnd" ) ); + fullQuitMenuLayout= TheWindowManager->winCreateLayout( "Menus/QuitMenu.wnd" ); quitMenuLayout = fullQuitMenuLayout; initGadgetsFullQuit(); TheTransitionHandler->remove("QuitFull"); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index 65b999a6886..3571ff025de 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -373,12 +373,12 @@ void ReplayMenuInit( WindowLayout *layout, void *userData ) TheShell->showShellMap(TRUE); // get ids for our children controls - parentReplayMenuID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ParentReplayMenu") ); - buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonLoadReplay") ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonBack") ); - listboxReplayFilesID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ListboxReplayFiles") ); - buttonDeleteID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonDeleteReplay") ); - buttonCopyID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonCopyReplay") ); + parentReplayMenuID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ParentReplayMenu" ); + buttonLoadID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonLoadReplay" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonBack" ); + listboxReplayFilesID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ListboxReplayFiles" ); + buttonDeleteID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonDeleteReplay" ); + buttonCopyID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonCopyReplay" ); parentReplayMenu = TheWindowManager->winGetWindowFromId( NULL, parentReplayMenuID ); buttonLoad = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonLoadID ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index ce27b26372c..18d33cfaba9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -226,16 +226,16 @@ void ScoreScreenInit( WindowLayout *layout, void *userData ) buttonIsFinishCampaign = FALSE; //Store the keys so we have them later - parentID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ParentScoreScreen" ) ); - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonOk" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:TextEntryChat" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonEmote" ) ); - listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ) ); -// buttonRehostID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonRehost" ) ); - chatBoxBorderID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ChatBoxBorder" ) ); - buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonBuddy" ) ); - buttonContinueID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonContinue" ) ); - buttonSaveReplayID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonSaveReplay" ) ); + parentID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ParentScoreScreen" ); + buttonOkID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonOk" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:TextEntryChat" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonEmote" ); + listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ); +// buttonRehostID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonRehost" ); + chatBoxBorderID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ChatBoxBorder" ); + buttonBuddiesID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonBuddy" ); + buttonContinueID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonContinue" ); + buttonSaveReplayID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonSaveReplay" ); parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp index 5763f05bcf2..43b4bc6f62d 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp @@ -74,15 +74,15 @@ void SinglePlayerMenuInit( WindowLayout *layout, void *userData ) GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); TheWindowManager->winSetFocus( parent ); - NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") ); + NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" ); GameWindow *buttonNew = TheWindowManager->winGetWindowFromId( NULL, buttonNewID ); TheShell->registerWithAnimateManager(buttonNew, WIN_ANIMATION_SLIDE_LEFT, TRUE,1); - NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") ); + NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" ); GameWindow *buttonLoad = TheWindowManager->winGetWindowFromId( NULL, buttonLoadID ); TheShell->registerWithAnimateManager(buttonLoad, WIN_ANIMATION_SLIDE_LEFT, TRUE,200); - NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") ); + NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" ); GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID ); TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE,1); @@ -197,9 +197,9 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg { // get ids for our children controls - buttonNew = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") ); - buttonLoad = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") ); - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") ); + buttonNew = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" ); + buttonLoad = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" ); + buttonBack = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" ); break; @@ -237,7 +237,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg { // open up the map select menu - TheShell->push( AsciiString( "Menus/MapSelectMenu.wnd" ) ); + TheShell->push( "Menus/MapSelectMenu.wnd" ); buttonPushed = true; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index cd1a137a766..2cfd273c554 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -357,7 +357,7 @@ Bool SkirmishPreferences::write(void) setSlotList(); -// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed ); setInt("FPS", maxFPS); @@ -416,7 +416,7 @@ void reallyDoStart( void ) if (TheGameLogic->isInGame()) TheGameLogic->clearGameData(FALSE); - //NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); + //NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed ); DEBUG_LOG(("GameSpeedSlider was at %d", maxFPS)); @@ -1028,14 +1028,14 @@ static void handleTeamSelection(int index) void InitSkirmishGameGadgets( void ) { //Initialize the gadget IDs - parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ) ); - buttonExitID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ) ); - buttonResetID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonReset" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:MapWindow" ) ); - staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ) ); + parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ); + buttonExitID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonStart" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ); + buttonResetID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonReset" ); + windowMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:MapWindow" ); + staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ); // Initialize the pointers to our gadgets parentSkirmishGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentSkirmishGameOptionsID ); DEBUG_ASSERTCRASH(parentSkirmishGameOptions, ("Could not find the parentSkirmishGameOptions" )); @@ -1052,7 +1052,7 @@ void InitSkirmishGameGadgets( void ) staticTextGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, staticTextGameSpeedID ); DEBUG_ASSERTCRASH(staticTextGameSpeed, ("Could not find the staticTextGameSpeed")); - textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ) ); + textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ); textEntryPlayerName = TheWindowManager->winGetWindowFromId( NULL, textEntryPlayerNameID ); DEBUG_ASSERTCRASH(textEntryPlayerName, ("Could not find the textEntryPlayerName" )); @@ -1235,7 +1235,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData ) if (TheGameEngine->getQuitting()) return; - sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); + sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); sandboxOk = FALSE; doUpdateSlotList = FALSE; @@ -1318,7 +1318,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData ) //initSkirmishGameOptions(); // set up the game speed slider -// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int sliderPos = max(15,min(61,prefs.getInt("FPS", TheGlobalData->m_framesPerSecondLimit))); GadgetSliderSetPosition( sliderGameSpeed, sliderPos ); @@ -1551,7 +1551,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); -/// static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ) ); +/// static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ); if(buttonPushed) break; if ( controlID == buttonExitID ) @@ -1572,7 +1572,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned } // else if ( controlID == buttonResetFPSID ) // { -// static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); // GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); // GadgetSliderSetPosition( sliderGameSpeed, TheGlobalData->m_framesPerSecondLimit ); // } @@ -1580,7 +1580,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned { sandboxOk = FALSE; //buttonBack->winEnable( false ); - skirmishMapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/SkirmishMapSelectMenu.wnd" ) ); + skirmishMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/SkirmishMapSelectMenu.wnd" ); skirmishMapSelectLayout->runInit(); skirmishMapSelectLayout->hide( FALSE ); skirmishMapSelectLayout->bringForward(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp index 29060a32e1b..1bf54db904a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp @@ -264,13 +264,13 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData ) usesSystemMapDir = mmd->m_isOfficial; } - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:WinMapPreview") ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:WinMapPreview" ); winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID); - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ListboxMap") ); + buttonBack = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonUserMaps" ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index 67eee3d1d32..6da46946c03 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -166,20 +166,20 @@ void InitBuddyControls(Int type) buddyControls.isInit = FALSE; break; case BUDDY_WINDOW_BUDDIES: - buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) ); + buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" ); buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL, buddyControls.textEntryEditID); - buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) ); - buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) ); + buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" ); + buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ); buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxBuddiesID ); buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxChatID); GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString); buddyControls.isInit = TRUE; break; case BUDDY_WINDOW_DIPLOMACY: - buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:TextEntryChat" ) ); + buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:TextEntryChat" ); buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL, buddyControls.textEntryEditID); - buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddies" ) ); - buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddyChat" ) ); + buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddies" ); + buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddyChat" ); buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxBuddiesID ); buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxChatID); GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString); @@ -221,11 +221,11 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, GadgetListBoxSetSelected(control, rc->pos); if (itemType == ITEM_BUDDY) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); else if (itemType == ITEM_REQUEST) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd"); else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); rcMenu = rcLayout->getFirstWindow(); rcMenu->winGetLayout()->runInit(); rcMenu->winBringToTop(); @@ -708,20 +708,20 @@ void PopulateOldBuddyMessages(void) //------------------------------------------------------------------------------------------------- void WOLBuddyOverlayInit( WindowLayout *layout, void *userData ) { - parentID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddyMenuParent" ) ); - buttonHideID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonHide" ) ); - buttonAddBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonAdd" ) ); - buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonDelete" ) ); - //textEntryID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) ); - //listboxBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) ); - //listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) ); - buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonYes" ) ); - buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonNo" ) ); - radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ) ); - radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ) ); - parentBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddiesParent" ) ); - parentIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:IgnoreParent" ) ); - listboxIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxIgnore" ) ); + parentID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddyMenuParent" ); + buttonHideID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonHide" ); + buttonAddBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonAdd" ); + buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonDelete" ); + //textEntryID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" ); + //listboxBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" ); + //listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ); + buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonYes" ); + buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonNo" ); + radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ); + radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ); + parentBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddiesParent" ); + parentIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:IgnoreParent" ); + listboxIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxIgnore" ); parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); @@ -909,11 +909,11 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg, GadgetListBoxSetSelected(control, rc->pos); if (isBuddy) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); else if (isRequest) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd"); else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); rcMenu = rcLayout->getFirstWindow(); rcMenu->winGetLayout()->runInit(); rcMenu->winBringToTop(); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp index 2f59652adee..5767ddfa139 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp @@ -63,9 +63,9 @@ static GameWindow *buttonLobby = NULL; //------------------------------------------------------------------------------------------------- void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData ) { - parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ) ); - buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonLobby" ) ); + parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ); + buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonLobby" ); parentWOLCustomScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLCustomScoreID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); buttonLobby = TheWindowManager->winGetWindowFromId( NULL, buttonLobbyID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index ab56b662681..e0d0f03cc4f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -262,7 +262,7 @@ void WOLPositionStartSpots( void ) win = TheWindowManager->winGetWindowFromId(NULL, windowMapSelectMapID); // get the controls. - NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") ); + NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" ); GameWindow *listboxMap = TheWindowManager->winGetWindowFromId( NULL, listboxMapID ); if (listboxMap != NULL) { @@ -999,16 +999,16 @@ void InitWOLGameGadgets( void ) DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!")); //Initialize the gadget IDs - parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:MapWindow" ) ); - windowMapSelectMapID = TheNameKeyGenerator->nameToKey(AsciiString("WOLMapSelectMenu.wnd:WinMapPreview")); + parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonStart" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ); + listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ); + windowMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:MapWindow" ); + windowMapSelectMapID = TheNameKeyGenerator->nameToKey("WOLMapSelectMenu.wnd:WinMapPreview"); NameKeyType staticTextTitleID = NAMEKEY("GameSpyGameOptionsMenu.wnd:StaticTextGameName"); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp index 7e1b42a8770..48437a6f368 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp @@ -58,9 +58,9 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) TheShell->showShellMap(TRUE); // get ids for our children controls - parentWindowID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:LadderParent") ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:ButtonBack") ); - windowLadderID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:WindowLadder") ); + parentWindowID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:LadderParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:ButtonBack" ); + windowLadderID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:WindowLadder" ); parentWindow = TheWindowManager->winGetWindowFromId( NULL, parentWindowID ); buttonBack = TheWindowManager->winGetWindowFromId( parentWindow, buttonBackID ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index 411804f237e..a86b514f679 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -605,40 +605,40 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData ) gameListRefreshTime = 0; playerListRefreshTime = 0; - parentWOLLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ) ); + parentWOLLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ); parent = TheWindowManager->winGetWindowFromId(NULL, parentWOLLobbyID); - buttonBackID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBack")); + buttonBackID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBack"); buttonBack = TheWindowManager->winGetWindowFromId(parent, buttonBackID); - buttonHostID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonHost")); + buttonHostID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonHost"); buttonHost = TheWindowManager->winGetWindowFromId(parent, buttonHostID); - buttonRefreshID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonRefresh")); + buttonRefreshID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonRefresh"); buttonRefresh = TheWindowManager->winGetWindowFromId(parent, buttonRefreshID); - buttonJoinID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonJoin")); + buttonJoinID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonJoin"); buttonJoin = TheWindowManager->winGetWindowFromId(parent, buttonJoinID); buttonJoin->winEnable(FALSE); - buttonBuddyID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBuddy")); + buttonBuddyID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBuddy"); buttonBuddy = TheWindowManager->winGetWindowFromId(parent, buttonBuddyID); - buttonEmoteID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonEmote")); + buttonEmoteID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonEmote"); buttonEmote = TheWindowManager->winGetWindowFromId(parent, buttonEmoteID); - textEntryChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:TextEntryChat")); + textEntryChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:TextEntryChat"); textEntryChat = TheWindowManager->winGetWindowFromId(parent, textEntryChatID); - listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxPlayers")); + listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxPlayers"); listboxLobbyPlayers = TheWindowManager->winGetWindowFromId(parent, listboxLobbyPlayersID); listboxLobbyPlayers->winSetTooltipFunc(playerTooltip); - listboxLobbyChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxChat")); + listboxLobbyChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxChat"); listboxLobbyChat = TheWindowManager->winGetWindowFromId(parent, listboxLobbyChatID); TheGameSpyInfo->registerTextWindow(listboxLobbyChat); - comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ComboBoxGroupRooms")); + comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ComboBoxGroupRooms"); comboLobbyGroupRooms = TheWindowManager->winGetWindowFromId(parent, comboLobbyGroupRoomsID); GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString); @@ -1726,20 +1726,20 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, Bool isBuddy = FALSE; if (profileID <= 0) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNoProfileMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNoProfileMenu.wnd"); else { if (profileID == TheGameSpyInfo->getLocalProfileID()) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCLocalPlayerMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCLocalPlayerMenu.wnd"); } else if(TheGameSpyInfo->isBuddy(profileID)) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); isBuddy = TRUE; } else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); } if(!rcLayout) break; @@ -1792,7 +1792,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort()); if (linfo) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCGameDetailsMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCGameDetailsMenu.wnd"); if (!rcLayout) break; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp index c213bc989ee..59d80e4051e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp @@ -65,9 +65,9 @@ static GameWindow *listboxLocale = NULL; //------------------------------------------------------------------------------------------------- void WOLLocaleSelectInit( WindowLayout *layout, void *userData ) { - parentLocaleSelectID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ParentLocaleSelect" ) ); - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ButtonOk" ) ); - listboxLocaleID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ) ); + parentLocaleSelectID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ParentLocaleSelect" ); + buttonOkID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ButtonOk" ); + listboxLocaleID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ); parentLocaleSelect = TheWindowManager->winGetWindowFromId( NULL, parentLocaleSelectID ); buttonOk = TheWindowManager->winGetWindowFromId( NULL, buttonOkID); listboxLocale = TheWindowManager->winGetWindowFromId( NULL, listboxLocaleID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp index a3de7865caa..98d1d12fa5b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp @@ -135,7 +135,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData ) CustomMatchPreferences pref; Bool usesSystemMapDir = pref.usesSystemMapDir(); - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:WinMapPreview") ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WinMapPreview" ); winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID); const MapMetaData *mmd = TheMapCache->findMap(TheGameSpyGame->getMap()); @@ -144,9 +144,9 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData ) usesSystemMapDir = mmd->m_isOfficial; } - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") ); + buttonBack = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonUserMaps" ); winMapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp index f457b21553f..23b023b1562 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp @@ -59,8 +59,8 @@ static GameWindow *buttonCancel = NULL; //------------------------------------------------------------------------------------------------- void WOLMessageWindowInit( WindowLayout *layout, void *userData ) { - parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:WOLMessageWindowParent" ) ); - buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:ButtonCancel" ) ); + parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:WOLMessageWindowParent" ); + buttonCancelID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:ButtonCancel" ); parentWOLMessageWindow = TheWindowManager->winGetWindowFromId( NULL, parentWOLMessageWindowID ); buttonCancel = TheWindowManager->winGetWindowFromId( NULL, buttonCancelID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp index d7d8f205b09..784bbe3ffd1 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp @@ -60,9 +60,9 @@ static GameWindow *buttonQuickmatch = NULL; //------------------------------------------------------------------------------------------------- void WOLQMScoreScreenInit( WindowLayout *layout, void *userData ) { - parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonDisconnect" ) ); - buttonQuickmatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ) ); + parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonDisconnect" ); + buttonQuickmatchID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ); parentWOLQMScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLQMScoreID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); buttonQuickmatch = TheWindowManager->winGetWindowFromId( NULL, buttonQuickmatchID); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp index 2f4bb86cac8..cb202a734f1 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp @@ -59,13 +59,13 @@ GameWindow *progressTextWindow = NULL; //------------------------------------------------------------------------------------------------- void WOLStatusMenuInit( WindowLayout *layout, void *userData ) { - parentWOLStatusID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:WOLStatusMenuParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ButtonDisconnect" ) ); + parentWOLStatusID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:WOLStatusMenuParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ButtonDisconnect" ); parentWOLStatus = TheWindowManager->winGetWindowFromId( NULL, parentWOLStatusID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); progressTextWindow = TheWindowManager->winGetWindowFromId( NULL, - TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ListboxStatus" ) ) ); + TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ListboxStatus" ) ); // Show Menu layout->hide( FALSE ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 6acf402ef8c..0a011d40c6b 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -408,13 +408,13 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData ) //TheWOL->reset(); - parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBack" ) ); + parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBack" ); parentWOLWelcome = TheWindowManager->winGetWindowFromId( NULL, parentWOLWelcomeID ); buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID); buttonOptionsID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonOptions" ); buttonbuttonOptions = TheWindowManager->winGetWindowFromId( NULL, buttonOptionsID); - listboxInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:InfoListbox" ) ); + listboxInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:InfoListbox" ); listboxInfo = TheWindowManager->winGetWindowFromId( NULL, listboxInfoID); @@ -473,19 +473,19 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData ) //DEBUG_ASSERTCRASH(listboxInfo, ("No control found!")); - buttonQuickMatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ) ); + buttonQuickMatchID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ); buttonQuickMatch = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonQuickMatchID ); - buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ) ); + buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ); buttonLobby = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLobbyID ); - buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBuddies" ) ); + buttonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBuddies" ); buttonBuddies = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonBuddiesID ); - buttonMyInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonMyInfo" ) ); + buttonMyInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonMyInfo" ); buttonMyInfo = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonMyInfoID ); - buttonLadderID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonLadder" ) ); + buttonLadderID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonLadder" ); buttonLadder = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLadderID ); if (TheFirewallHelper == NULL) { @@ -863,7 +863,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg, } else if (controlID == buttonLadderID) { - TheShell->push(AsciiString("Menus/WOLLadderScreen.wnd")); + TheShell->push("Menus/WOLLadderScreen.wnd"); } break; } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp index 06bff14542a..8dcf8aa5813 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp @@ -132,10 +132,10 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData(); if( controlID == buttonOkID ) @@ -216,10 +216,10 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonCancel" ); WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData(); if( controlID == buttonOkID ) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index d80bb789d68..9a525800448 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -1386,7 +1386,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent, TheGlobalLanguageData->m_defaultWindowFont.bold) ); } else - window->winSetFont( winFindFont( AsciiString("Times New Roman"), 14, FALSE ) ); + window->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) ); return window; @@ -1618,9 +1618,9 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh GameWindow *trueParent = NULL; //Changed by Chris if(useLogo) - trueParent = winCreateFromScript( AsciiString("Menus/QuitMessageBox.wnd") ); + trueParent = winCreateFromScript( "Menus/QuitMessageBox.wnd" ); else - trueParent = winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); + trueParent = winCreateFromScript( "Menus/MessageBox.wnd" ); //Added By Chris AsciiString menuName; if(useLogo) @@ -2854,7 +2854,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget, TheGlobalLanguageData->m_defaultWindowFont.bold) ); } else - gadget->winSetFont( TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ) ); + gadget->winSetFont( TheWindowManager->winFindFont( "Times New Roman", 14, FALSE ) ); } // if we don't want to assign default colors/images get out of here @@ -3802,7 +3802,7 @@ Bool GameWindowManager::initTestGUI( void ) TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, 0 ); GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, 0 ); - window->winSetFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) ); + window->winSetFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) ); // make a listbox memset( &listData, 0, sizeof( ListboxData ) ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index 59282d711cd..deb9c35465a 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -394,7 +394,7 @@ void GameWindowTransitionsHandler::load(void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\WindowTransitions" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\WindowTransitions", INI_LOAD_OVERWRITE, NULL ); } diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 4aa40eb645d..0857283fed7 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -566,7 +566,7 @@ void IMEManager::init( void ) m_context = ImmCreateContext(); m_oldContext = ImmGetContext( ApplicationHWnd ); m_disabled = 0; - m_candidateWindow = TheWindowManager->winCreateFromScript( AsciiString("IMECandidateWindow.wnd")); + m_candidateWindow = TheWindowManager->winCreateFromScript( "IMECandidateWindow.wnd"); m_candidateWindow->winSetStatus(WIN_STATUS_ABOVE); if ( m_candidateWindow ) @@ -574,14 +574,14 @@ void IMEManager::init( void ) m_candidateWindow->winHide( TRUE ); // find text area window - NameKeyType id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:TextArea" ) ); + NameKeyType id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:TextArea" ); m_candidateTextArea = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); // find arrows - id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:UpArrow" ) ); + id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:UpArrow" ); m_candidateUpArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); - id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:DownArrow" ) ); + id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:DownArrow" ); m_candidateDownArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); @@ -593,7 +593,7 @@ void IMEManager::init( void ) } } - m_statusWindow = TheWindowManager->winCreateFromScript( AsciiString("IMEStatusWindow.wnd")); + m_statusWindow = TheWindowManager->winCreateFromScript( "IMEStatusWindow.wnd"); if ( m_statusWindow ) { diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 0c453dce3e9..755395afce9 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -370,22 +370,22 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) //No music in SinglePlayerLoadScreen // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/SinglePlayerLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/SinglePlayerLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); // Mission *mission = TheCampaignManager->getCurrentMission(); // Store the pointer to the progress bar on the loadscreen - m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ProgressLoad" ) )); + m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ProgressLoad" )); DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen")); GadgetProgressBarSetProgress(m_progressBar, 0 ); - m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:Percent" ) )); + m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:Percent" )); DEBUG_ASSERTCRASH(m_percent, ("Can't initialize the m_percent for the single player loadscreen")); GadgetStaticTextSetText(m_percent,UnicodeString(L"0%")); m_percent->winHide(TRUE); - m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ) )); + m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ObjectivesWin" )); DEBUG_ASSERTCRASH(m_objectiveWin, ("Can't initialize the m_objectiveWin for the single player loadscreen")); m_objectiveWin->winHide(TRUE); @@ -413,7 +413,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) GadgetStaticTextSetText(m_unitDesc[i],TheGameText->fetch(mission->m_unitNames[i])); m_unitDesc[i]->winHide(TRUE); } - m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ) )); + m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" )); DEBUG_ASSERTCRASH(m_location, ("Can't initialize the m_objectiveWin for the single player loadscreen")); m_location->winHide(TRUE); GadgetStaticTextSetText(m_location, TheGameText->fetch(mission->m_locationNameLabel)); @@ -425,34 +425,34 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = FALSE; /* - m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo1" ) )); + m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo1" )); DEBUG_ASSERTCRASH(m_cameoWindow1, ("Can't initialize the m_cameoWindow1 for the single player loadscreen")); m_cameoWindow1->winHide(TRUE); m_cameoWindow1->winEnable(FALSE); m_cameoWindow1->winSetEnabledImage(0, mission->m_cameoImage[0]); m_cameoWindow1->winSetDisabledImage(0, mission->m_cameoDisabledImage[0]); - m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo2" ) )); + m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo2" )); DEBUG_ASSERTCRASH(m_cameoWindow2, ("Can't initialize the m_cameoWindow2 for the single player loadscreen")); m_cameoWindow2->winHide(TRUE); m_cameoWindow2->winEnable(FALSE); m_cameoWindow2->winSetEnabledImage(0, mission->m_cameoImage[1]); m_cameoWindow2->winSetDisabledImage(0, mission->m_cameoDisabledImage[1]); - m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo3" ) )); + m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo3" )); DEBUG_ASSERTCRASH(m_cameoWindow3, ("Can't initialize the m_cameoWindow3 for the single player loadscreen")); m_cameoWindow3->winHide(TRUE); m_cameoWindow3->winEnable(FALSE); m_cameoWindow3->winSetEnabledImage(0, mission->m_cameoImage[2]); m_cameoWindow3->winSetDisabledImage(0, mission->m_cameoDisabledImage[2]); - m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHead" ) )); + m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHead" )); DEBUG_ASSERTCRASH(m_headMovie, ("Can't initialize the m_headMovie for the single player loadscreen")); m_headMovie->winHide(TRUE); - m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ) )); + m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" )); DEBUG_ASSERTCRASH(m_cameoFrame, ("Can't initialize the m_cameoFrame for the single player loadscreen")); m_cameoFrame->winHide(TRUE); - m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ) )); + m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" )); DEBUG_ASSERTCRASH(m_cameoText, ("Can't initialize the m_cameoText for the single player loadscreen")); */ @@ -626,13 +626,13 @@ void ShellGameLoadScreen::init( GameInfo *game ) // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ShellGameLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ShellGameLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the ShellGame loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); // Store the pointer to the progress bar on the loadscreen - m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:ProgressLoad" ) )); + m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:ProgressLoad" )); DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen")); GadgetProgressBarSetProgress(m_progressBar, 0 ); m_progressBar->winHide(TRUE); @@ -642,7 +642,7 @@ void ShellGameLoadScreen::init( GameInfo *game ) m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen")); TheWritableGlobalData->m_breakTheMovie = FALSE; - GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) )); + GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:StaticTextLegal" )); if(win) win->winHide(FALSE); firstLoad = FALSE; @@ -709,7 +709,7 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void ) void MultiPlayerLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MultiplayerLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MultiplayerLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); @@ -943,7 +943,7 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID); void GameSpyLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/GameSpyLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/GameSpyLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); @@ -1252,7 +1252,7 @@ MapTransferLoadScreen::~MapTransferLoadScreen( void ) void MapTransferLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MapTransferScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MapTransferScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the map transfer loadscreen")); if (!m_loadScreen) return; diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index 1ce45002459..d5fe8efa31c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -148,8 +148,8 @@ void Shell::init( void ) { INI ini; // Read from INI all the ShellMenuScheme - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); if( m_schemeManager ) m_schemeManager->init(); @@ -519,7 +519,7 @@ void Shell::showShell( Bool runInit ) if (!TheGlobalData->m_shellMapOn && m_screenCount == 0) //else - push( AsciiString("Menus/MainMenu.wnd") ); + push( "Menus/MainMenu.wnd" ); m_isShellActive = TRUE; } @@ -842,7 +842,7 @@ WindowLayout *Shell::getSaveLoadMenuLayout( void ) // if layout has not been created, create it now if( m_saveLoadMenuLayout == NULL ) - m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) ); + m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( "Menus/PopupSaveLoad.wnd" ); // sanity DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout") ); @@ -859,7 +859,7 @@ WindowLayout *Shell::getPopupReplayLayout( void ) // if layout has not been created, create it now if( m_popupReplayLayout == NULL ) - m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) ); + m_popupReplayLayout = TheWindowManager->winCreateLayout( "Menus/PopupReplay.wnd" ); // sanity DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout") ); @@ -876,7 +876,7 @@ WindowLayout *Shell::getOptionsLayout( Bool create ) // if layout has not been created, create it now if ((m_optionsLayout == NULL) && (create == TRUE)) { - m_optionsLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/OptionsMenu.wnd" ) ); + m_optionsLayout = TheWindowManager->winCreateLayout( "Menus/OptionsMenu.wnd" ); // sanity DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout") ); diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp index 82754f85253..1bcabcdc4b4 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp @@ -279,8 +279,8 @@ void ShellMenuSchemeManager::init( void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); } diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index 3facfcb7577..d4bf6b296a5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -1183,7 +1183,7 @@ InGameUI::~InGameUI() void InGameUI::init( void ) { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\InGameUI" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\InGameUI", INI_LOAD_OVERWRITE, NULL ); //override INI values with language localized values: if (TheGlobalLanguageData) @@ -3949,7 +3949,7 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex ) void InGameUI::createControlBar( void ) { - TheWindowManager->winCreateFromScript( AsciiString("ControlBar.wnd") ); + TheWindowManager->winCreateFromScript( "ControlBar.wnd" ); HideControlBar(); /* // hide all windows created from this layout @@ -3966,7 +3966,7 @@ void InGameUI::createControlBar( void ) void InGameUI::createReplayControl( void ) { - m_replayWindow = TheWindowManager->winCreateFromScript( AsciiString("ReplayControl.wnd") ); + m_replayWindow = TheWindowManager->winCreateFromScript( "ReplayControl.wnd" ); /* // hide all windows created from this layout @@ -4057,7 +4057,7 @@ void InGameUI::playCameoMovie( const AsciiString& movieName ) stopCameoMovie(); return; } - GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") )); + GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" )); WinInstanceData *winData = window->winGetInstanceData(); winData->setVideoBuffer(m_cameoVideoBuffer); // window->winHide(FALSE); @@ -4068,8 +4068,8 @@ void InGameUI::playCameoMovie( const AsciiString& movieName ) void InGameUI::stopCameoMovie( void ) { //RightHUD - //GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:CameoMovieWindow") )); - GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") )); + //GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoMovieWindow" )); + GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" )); // window->winHide(FALSE); WinInstanceData *winData = window->winGetInstanceData(); winData->setVideoBuffer(NULL); @@ -5101,7 +5101,7 @@ void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * po translate.translate(text); newFTD->m_text = translate; newFTD->m_dString->setText(translate); - newFTD->m_dString->setFont(TheWindowManager->winFindFont( AsciiString("Arial"), POINTSIZE, FALSE )); + newFTD->m_dString->setFont(TheWindowManager->winFindFont( "Arial", POINTSIZE, FALSE )); if(m_floatingTextTimeOut <= 0) newFTD->m_frameTimeOut = TheGameLogic->getFrame() + DEFAULT_FLOATING_TEXT_TIMEOUT; @@ -5266,7 +5266,7 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi if( pause ) TheGameLogic->setGamePaused(TRUE, pauseMusic); - m_popupMessageData->layout = TheWindowManager->winCreateLayout(AsciiString("InGamePopupMessage.wnd")); + m_popupMessageData->layout = TheWindowManager->winCreateLayout("InGamePopupMessage.wnd"); m_popupMessageData->layout->runInit(); } @@ -5719,7 +5719,7 @@ void InGameUI::resetIdleWorker( void ) void InGameUI::recreateControlBar( void ) { - GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd"))); + GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd")); deleteInstance(win); m_idleWorkerWin = NULL; diff --git a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 5cf797257e6..2ae572300fb 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -567,7 +567,7 @@ the Win32 version of the mouse (by preloading resources before D3D device is cre void Mouse::parseIni(void) { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Mouse" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Mouse", INI_LOAD_OVERWRITE, NULL ); } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp index 8a8fec3dfd1..41fcbb25783 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -158,7 +158,7 @@ static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } @@ -230,9 +230,9 @@ static Bool loadMap( AsciiString filename ) m_waypoints = NEW WaypointMap; - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); - file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); + file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); if (!file.parse(NULL)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -314,7 +314,7 @@ const char *const MapCache::m_mapCacheName = "MapCache.ini"; AsciiString MapCache::getMapDir() const { - return AsciiString("Maps"); + return "Maps"; } AsciiString MapCache::getUserMapDir() const @@ -326,7 +326,7 @@ AsciiString MapCache::getUserMapDir() const AsciiString MapCache::getMapExtension() const { - return AsciiString("map"); + return "map"; } void MapCache::writeCacheINI( const AsciiString &mapDir ) @@ -1254,7 +1254,7 @@ Image *getMapPreviewImage( AsciiString mapName ) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("MapPreview"), AsciiString::TheEmptyString, parseMapPreviewChunk ); + file.registerParser( "MapPreview", AsciiString::TheEmptyString, parseMapPreviewChunk ); if (!file.parse(NULL)) { DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info.")); deleteInstance(mapPreviewImage); diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index 2920179a63d..f0590f22b3f 100644 --- a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3223,7 +3223,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage Bool hide = false; if (TheWindowManager) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -3824,7 +3824,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage /* if (TheWindowManager && TheNameKeyGenerator) { - GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey(AsciiString("MOTD.wnd:MOTD"))); + GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey("MOTD.wnd:MOTD")); if (motd) motd->winHide(!motd->winIsHidden()); }*/ @@ -3873,7 +3873,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage Bool hide = false; if (TheWindowManager) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) diff --git a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index a4200dfefef..97ed8527e86 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -236,7 +236,7 @@ void CampaignManager::init( void ) { INI ini; // Read from INI all the CampaignManager - ini.loadFileDirectory( AsciiString( "Data\\INI\\Campaign" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Campaign", INI_LOAD_OVERWRITE, NULL ); } //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index 4e890d00b94..1ec4a0ca72c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -2963,7 +2963,7 @@ void ParticleSystemManager::init( void ) { /// Read INI data and build templates INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\ParticleSystem" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ParticleSystem", INI_LOAD_OVERWRITE, NULL ); // sanity, our lists must be empty!! for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i ) diff --git a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp index b00105ee372..03f3054a914 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp @@ -353,7 +353,7 @@ TerrainRoadType *TerrainRoadCollection::newRoad( AsciiString name ) road->friend_setBridge( FALSE ); // set defaults from the default road - TerrainRoadType *defaultRoad = findRoad( AsciiString( "DefaultRoad" ) ); + TerrainRoadType *defaultRoad = findRoad( "DefaultRoad" ); if( defaultRoad ) { @@ -389,7 +389,7 @@ TerrainRoadType *TerrainRoadCollection::newBridge( AsciiString name ) bridge->friend_setBridge( TRUE ); // set defaults from the default bridge - TerrainRoadType *defaultBridge = findBridge( AsciiString( "DefaultBridge" ) ); + TerrainRoadType *defaultBridge = findBridge( "DefaultBridge" ); if( defaultBridge ) { diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp index 1743e256135..3c8e496b294 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -296,7 +296,7 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v } } - file.registerParser( AsciiString("PlayerScriptsList"), info->label, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "PlayerScriptsList", info->label, ScriptList::ParseScriptsDataChunk ); if (!file.parse(NULL)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -514,9 +514,9 @@ void SidesList::prepareForMP_or_Skirmish(void) if (theInputStream.open(path)) { ChunkInputStream *pStrm = &theInputStream; DataChunkInput file( pStrm ); - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); - file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk ); - file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk ); + file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk ); if (!file.parse(this)) { DEBUG_LOG(("ERROR - Unable to read in skirmish scripts.")); return; @@ -816,10 +816,10 @@ Bool SidesList::validateSides() tdict->setAsciiString(TheKey_teamOwner, AsciiString::TheEmptyString); modified = true; } -// if (tdict->getType(NAMEKEY(AsciiString("teamAllies"))) != Dict::DICT_NONE) -// tdict->remove(NAMEKEY(AsciiString("teamAllies"))); -// if (tdict->getType(NAMEKEY(AsciiString("teamEnemies"))) != Dict::DICT_NONE) -// tdict->remove(NAMEKEY(AsciiString("teamEnemies"))); +// if (tdict->getType(NAMEKEY("teamAllies")) != Dict::DICT_NONE) +// tdict->remove(NAMEKEY("teamAllies")); +// if (tdict->getType(NAMEKEY("teamEnemies")) != Dict::DICT_NONE) +// tdict->remove(NAMEKEY("teamEnemies")); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 168f12307c2..88baf0b0ae7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -1272,7 +1272,7 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query ) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, parseWaypointDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, parseWaypointDataChunk ); if (!file.parse(this)) { DEBUG_CRASH(("Unable to read waypoint info.")); return false; diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 41b671c5fd5..b8b13754c63 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -522,7 +522,7 @@ void ScriptList::deleteGroup(ScriptGroup *pGrp) Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { Int i; - file.registerParser( AsciiString("ScriptList"), info->label, ScriptList::ParseScriptListDataChunk ); + file.registerParser( "ScriptList", info->label, ScriptList::ParseScriptListDataChunk ); DEBUG_ASSERTCRASH(s_numInReadList==0, ("Leftover scripts floating aroung.")); for (i=0; ireadLists[pInfo->numLists] = newInstance(ScriptList); Int cur = pInfo->numLists; pInfo->numLists++; - file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromListDataChunk ); - file.registerParser( AsciiString("ScriptGroup"), info->label, ScriptGroup::ParseGroupDataChunk ); + file.registerParser( "Script", info->label, Script::ParseScriptFromListDataChunk ); + file.registerParser( "ScriptGroup", info->label, ScriptGroup::ParseGroupDataChunk ); return file.parse(pInfo->readLists[cur]); } @@ -880,7 +880,7 @@ Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, pGroup->m_isGroupSubroutine= file.readByte(); } pList->addGroup(pGroup, AT_END); - file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromGroupDataChunk ); + file.registerParser( "Script", info->label, Script::ParseScriptFromGroupDataChunk ); return file.parse(pGroup); } @@ -1245,9 +1245,9 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version) if (version>=K_SCRIPT_DATA_VERSION_2) { pScript->m_delayEvaluationSeconds = file.readInt(); } - file.registerParser( AsciiString("OrCondition"), AsciiString("Script"), OrCondition::ParseOrConditionDataChunk ); - file.registerParser( AsciiString("ScriptAction"), AsciiString("Script"), ScriptAction::ParseActionDataChunk ); - file.registerParser( AsciiString("ScriptActionFalse"), AsciiString("Script"), ScriptAction::ParseActionFalseDataChunk ); + file.registerParser( "OrCondition", "Script", OrCondition::ParseOrConditionDataChunk ); + file.registerParser( "ScriptAction", "Script", ScriptAction::ParseActionDataChunk ); + file.registerParser( "ScriptActionFalse", "Script", ScriptAction::ParseActionFalseDataChunk ); if (! file.parse(pScript) ) { return NULL; @@ -1441,7 +1441,7 @@ Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo } else { pScript->setOrCondition(pOrCondition); } - file.registerParser( AsciiString("Condition"), info->label, Condition::ParseConditionDataChunk ); + file.registerParser( "Condition", info->label, Condition::ParseConditionDataChunk ); return file.parse(pOrCondition); } diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp index 45736d9d9e9..8865ffbf9e0 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp @@ -119,7 +119,7 @@ CrateTemplate *CrateSystem::newCrateTemplate( AsciiString name ) CrateTemplate *ct = newInstance(CrateTemplate); // if the default template is present, get it and copy over any data to the new template - const CrateTemplate *defaultCT = findCrateTemplate(AsciiString("DefaultCrate")); + const CrateTemplate *defaultCT = findCrateTemplate("DefaultCrate"); if(defaultCT) { *ct = *defaultCT; diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 44f527814d6..03321c2be2d 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -1421,7 +1421,7 @@ void GameLogic::startNewGame( Bool saveGame ) { ChunkInputStream *pStrm = &theInputStream; DataChunkInput file( pStrm ); - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); if (!file.parse(NULL)) { DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts.")); return; @@ -1980,7 +1980,7 @@ void GameLogic::startNewGame( Bool saveGame ) if (!TheGlobalData->m_headless) { if(TheShell->getScreenCount() == 0) - TheShell->push( AsciiString("Menus/MainMenu.wnd") ); + TheShell->push( "Menus/MainMenu.wnd" ); else if (TheShell->top()) { TheShell->top()->hide(FALSE); diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 6c58b9aa533..2e67453c025 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1442,7 +1442,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) // place the sound for putting a building down - static AudioEventRTS placeBuilding(AsciiString("PlaceBuilding")); + static AudioEventRTS placeBuilding("PlaceBuilding"); placeBuilding.setObjectID(constructorObject->getID()); TheAudio->addAudioEvent( &placeBuilding ); diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp index df613e5f181..6939d74029f 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/GameSpy.cpp @@ -256,7 +256,7 @@ void GameSpyChat::update( void ) { TheGameSpyThread->setShowLocaleSelect(false); WindowLayout *layout = NULL; - layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupLocaleSelect.wnd" ) ); + layout = TheWindowManager->winCreateLayout( "Menus/PopupLocaleSelect.wnd" ); layout->runInit(); layout->hide( FALSE ); layout->bringForward(); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp index 338fc8ca374..1a99fe9ac16 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp @@ -624,13 +624,13 @@ void W3DCommandBarBackgroundDraw( GameWindow *window, WinInstanceData *instData ControlBarSchemeManager *man = TheControlBar->getControlBarSchemeManager(); if(!man) return; - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey); static ICoord2D basePos; if(!win) { return; - //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); } TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y); ICoord2D pos, offset; @@ -649,13 +649,13 @@ void W3DCommandBarForegroundDraw( GameWindow *window, WinInstanceData *instData if(!man) return; - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey); static ICoord2D basePos; if(!win) { return; - //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); } TheControlBar->getForegroundMarkerPos(&basePos.x, &basePos.y); ICoord2D pos, offset; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp index 07e4dfa5bb0..6579e5d5955 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp @@ -916,9 +916,9 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData ) NameKeyType buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" ); NameKeyType buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" ); NameKeyType buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" ); - NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") ); - NameKeyType onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") ); - NameKeyType networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") ); + NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" ); + NameKeyType onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" ); + NameKeyType networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" ); GameWindow *button = TheWindowManager->winGetWindowFromId( parent, skirmishID ); if (button) @@ -984,7 +984,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData ) if(win) win->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw); - GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") )); + GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" )); Int x,y,width,height; clipRegionWin->winGetScreenPosition(&x, &y); clipRegionWin->winGetSize(&width, &height); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp index 82222740046..7fa36bca028 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp @@ -82,40 +82,40 @@ static void initBorders( void ) { borderPieces[ BORDER_CORNER_UL ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUL" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerUL" ); borderPieces[ BORDER_CORNER_UR ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUR" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerUR" ); borderPieces[ BORDER_CORNER_LL ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLL" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerLL" ); borderPieces[ BORDER_CORNER_LR ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLR" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerLR" ); borderPieces[ BORDER_VERTICAL_LEFT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderLeft" ) ); + TheMappedImageCollection->findImageByName( "BorderLeft" ); borderPieces[ BORDER_VERTICAL_LEFT_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderLeftShort" ) ); + TheMappedImageCollection->findImageByName( "BorderLeftShort" ); borderPieces[ BORDER_HORIZONTAL_TOP ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderTop" ) ); + TheMappedImageCollection->findImageByName( "BorderTop" ); borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderTopShort" ) ); + TheMappedImageCollection->findImageByName( "BorderTopShort" ); borderPieces[ BORDER_VERTICAL_RIGHT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderRight" ) ); + TheMappedImageCollection->findImageByName( "BorderRight" ); borderPieces[ BORDER_VERTICAL_RIGHT_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderRightShort" ) ); + TheMappedImageCollection->findImageByName( "BorderRightShort" ); borderPieces[ BORDER_HORIZONTAL_BOTTOM ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderBottom" ) ); + TheMappedImageCollection->findImageByName( "BorderBottom" ); borderPieces[ BORDER_HORIZONTAL_BOTTOM_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderBottomShort" ) ); + TheMappedImageCollection->findImageByName( "BorderBottomShort" ); bordersInit = TRUE; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index 90a1efd54cd..b4c8215d35a 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -772,7 +772,7 @@ void W3DDisplay::init( void ) TheGlobalLanguageData->m_nativeDebugDisplay.bold); } else - font=TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + font=TheFontLibrary->getFont( "FixedSys", 8, FALSE ); m_nativeDebugDisplay->setFont( font ); m_nativeDebugDisplay->setFontHeight( 13 ); @@ -891,7 +891,7 @@ void W3DDisplay::gatherDebugStats( void ) TheGlobalLanguageData->m_nativeDebugDisplay.bold); } else - font = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + font = TheFontLibrary->getFont( "FixedSys", 8, FALSE ); for (int i = 0; i < DisplayStringCount; i++) { @@ -907,7 +907,7 @@ void W3DDisplay::gatherDebugStats( void ) if (m_benchmarkDisplayString == NULL) { - GameFont *thisFont = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + GameFont *thisFont = TheFontLibrary->getFont( "FixedSys", 8, FALSE ); m_benchmarkDisplayString = TheDisplayStringManager->newDisplayString(); DEBUG_ASSERTCRASH( m_benchmarkDisplayString, ("Failed to create DisplayString") ); m_benchmarkDisplayString->setFont( thisFont ); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp index 9b5058abd4f..459fc1be20e 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp @@ -131,7 +131,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void ) TheGlobalLanguageData->m_defaultDisplayStringFont.bold) ); } else - newString->setFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) ); + newString->setFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) ); // link string to list link( newString ); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp index 129256c8013..b88d2319965 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp @@ -344,7 +344,7 @@ void W3DInGameUI::init( void ) // comment because we'll probably want to add this back in. /* // create the MOTD - GameWindow *motd = TheWindowManager->winCreateFromScript( AsciiString("MOTD.wnd") ); + GameWindow *motd = TheWindowManager->winCreateFromScript( "MOTD.wnd" ); if( motd ) { NameKeyType listboxTextID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:ListboxMOTD" ); diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp index 8a2066b5613..38eb63b4625 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp +++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp @@ -493,21 +493,21 @@ WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly): DataChunkInput file( pStrm ); if (logicalDataOnly) { - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); - file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); + file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); freeListOfMapObjects(); // just in case. - file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk ); + file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk ); PolygonTrigger::deleteTriggers(); // just in case. TheSidesList->emptySides(); - file.registerParser(AsciiString("SidesList"), AsciiString::TheEmptyString, SidesList::ParseSidesDataChunk ); + file.registerParser("SidesList", AsciiString::TheEmptyString, SidesList::ParseSidesDataChunk ); } else { - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseHeightMapDataChunk ); - file.registerParser( AsciiString("BlendTileData"), AsciiString::TheEmptyString, ParseBlendTileDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseHeightMapDataChunk ); + file.registerParser( "BlendTileData", AsciiString::TheEmptyString, ParseBlendTileDataChunk ); #ifdef EVAL_TILING_MODES - file.registerParser( AsciiString("FUNKY_TILING"), AsciiString::TheEmptyString, ParseFunkyTilingDataChunk ); + file.registerParser( "FUNKY_TILING", AsciiString::TheEmptyString, ParseFunkyTilingDataChunk ); #endif - file.registerParser( AsciiString("GlobalLighting"), AsciiString::TheEmptyString, ParseLightingDataChunk ); + file.registerParser( "GlobalLighting", AsciiString::TheEmptyString, ParseLightingDataChunk ); } if (!file.parse(this)) { throw(ERROR_CORRUPT_FILE_FORMAT); @@ -687,7 +687,7 @@ Bool WorldHeightMap::ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo Bool WorldHeightMap::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } diff --git a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index a69dbaf8873..f9f674f9305 100644 --- a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -1570,563 +1570,563 @@ void LayoutScheme::init( void ) const Image *image; // push button - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonEnabled" ); storeImageAndColor( BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonEnabledSelected" ); storeImageAndColor( BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonDisabled" ); storeImageAndColor( BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonDisabledSelected" ); storeImageAndColor( BUTTON_DISABLED_PUSHED, image, lightGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonHilite" ); storeImageAndColor( BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonHiliteSelected" ); storeImageAndColor( BUTTON_HILITE_PUSHED, image, yellow, white ); // radio button - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabled" ); storeImageAndColor( RADIO_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxUnselected" ); storeImageAndColor( RADIO_ENABLED_UNCHECKED_BOX, image, darkRed, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxSelected" ); storeImageAndColor( RADIO_ENABLED_CHECKED_BOX, image, blue, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabled" ); storeImageAndColor( RADIO_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxUnselected" ); storeImageAndColor( RADIO_DISABLED_UNCHECKED_BOX, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxSelected" ); storeImageAndColor( RADIO_DISABLED_CHECKED_BOX, image, darkGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHilite" ); storeImageAndColor( RADIO_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHiliteBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxUnselected" ); storeImageAndColor( RADIO_HILITE_UNCHECKED_BOX, image, darkGreen, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHiliteBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxSelected" ); storeImageAndColor( RADIO_HILITE_CHECKED_BOX, image, yellow, white ); // check box - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabled" ); storeImageAndColor( CHECK_BOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxUnselected" ); storeImageAndColor( CHECK_BOX_ENABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxSelected" ); storeImageAndColor( CHECK_BOX_ENABLED_CHECKED_BOX, image, blue, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabled" ); storeImageAndColor( CHECK_BOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxUnselected" ); storeImageAndColor( CHECK_BOX_DISABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxSelected" ); storeImageAndColor( CHECK_BOX_DISABLED_CHECKED_BOX, image, darkGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHilite" ); storeImageAndColor( CHECK_BOX_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHiliteBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxUnselected" ); storeImageAndColor( CHECK_BOX_HILITE_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHiliteBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxSelected" ); storeImageAndColor( CHECK_BOX_HILITE_CHECKED_BOX, image, yellow, white ); // horz slider - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledLeftEnd" ); storeImageAndColor( HSLIDER_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledRightEnd" ); storeImageAndColor( HSLIDER_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledRepeatingCenter" ); storeImageAndColor( HSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledLeftEnd" ); storeImageAndColor( HSLIDER_DISABLED_LEFT, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledRightEnd" ); storeImageAndColor( HSLIDER_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledRepeatingCenter" ); storeImageAndColor( HSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteLeftEnd" ); storeImageAndColor( HSLIDER_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteRightEnd" ); storeImageAndColor( HSLIDER_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteRepeatingCenter" ); storeImageAndColor( HSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabled" ); storeImageAndColor( HSLIDER_THUMB_ENABLED, image, lightRed, red ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabledSelected" ); storeImageAndColor( HSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabled" ); storeImageAndColor( HSLIDER_THUMB_DISABLED, image, darkGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabledSelected" ); storeImageAndColor( HSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbHilite" ); storeImageAndColor( HSLIDER_THUMB_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbHiliteSelected" ); storeImageAndColor( HSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue ); // vert slider - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledTopEnd" ); storeImageAndColor( VSLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledBottomEnd" ); storeImageAndColor( VSLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledRepeatingCenter" ); storeImageAndColor( VSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledTopEnd" ); storeImageAndColor( VSLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledBottomEnd" ); storeImageAndColor( VSLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledRepeatingCenter" ); storeImageAndColor( VSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteTopEnd" ); storeImageAndColor( VSLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteBottomEnd" ); storeImageAndColor( VSLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteRepeatingCenter" ); storeImageAndColor( VSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabled" ); storeImageAndColor( VSLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabledSelected" ); storeImageAndColor( VSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabled" ); storeImageAndColor( VSLIDER_THUMB_DISABLED, image, darkGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabledSelected" ); storeImageAndColor( VSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbHilite" ); storeImageAndColor( VSLIDER_THUMB_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbHiliteSelected" ); storeImageAndColor( VSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue ); // listbox - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( LISTBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( LISTBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( LISTBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" ); storeImageAndColor( LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" ); storeImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen ); // Combo Box //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( COMBOBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( COMBOBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( COMBOBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_LEFT, image, gray, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen ); // progress bar //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledLeftEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRightEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledLeftEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_LEFT, image, darkGray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRightEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteLeftEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRightEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); // static text //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextEnabled" ); storeImageAndColor( STATIC_TEXT_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextDisabled" ); storeImageAndColor( STATIC_TEXT_DISABLED, image, darkGray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextHilite" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextHilite" ); storeImageAndColor( STATIC_TEXT_HILITE, image, darkGreen, lightGreen ); // text entry - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" ); storeImageAndColor( TEXT_ENTRY_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" ); storeImageAndColor( TEXT_ENTRY_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" ); storeImageAndColor( TEXT_ENTRY_DISABLED_LEFT, image, gray, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" ); storeImageAndColor( TEXT_ENTRY_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" ); storeImageAndColor( TEXT_ENTRY_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" ); storeImageAndColor( TEXT_ENTRY_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); // Tab Control - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroEnabled" ); storeImageAndColor( TC_TAB_0_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroDisabled" ); storeImageAndColor( TC_TAB_0_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroHilite" ); storeImageAndColor( TC_TAB_0_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneEnabled" ); storeImageAndColor( TC_TAB_1_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneDisabled" ); storeImageAndColor( TC_TAB_1_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneHilite" ); storeImageAndColor( TC_TAB_1_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoEnabled" ); storeImageAndColor( TC_TAB_2_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoDisabled" ); storeImageAndColor( TC_TAB_2_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoHilite" ); storeImageAndColor( TC_TAB_2_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeEnabled" ); storeImageAndColor( TC_TAB_3_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeDisabled" ); storeImageAndColor( TC_TAB_3_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeHilite" ); storeImageAndColor( TC_TAB_3_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourEnabled" ); storeImageAndColor( TC_TAB_4_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourDisabled" ); storeImageAndColor( TC_TAB_4_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourHilite" ); storeImageAndColor( TC_TAB_4_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveEnabled" ); storeImageAndColor( TC_TAB_5_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveDisabled" ); storeImageAndColor( TC_TAB_5_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveHilite" ); storeImageAndColor( TC_TAB_5_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixEnabled" ); storeImageAndColor( TC_TAB_6_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixDisabled" ); storeImageAndColor( TC_TAB_6_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixHilite" ); storeImageAndColor( TC_TAB_6_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenEnabled" ); storeImageAndColor( TC_TAB_7_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenDisabled" ); storeImageAndColor( TC_TAB_7_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenHilite" ); storeImageAndColor( TC_TAB_7_HILITE, image, green, darkGreen ); storeImageAndColor( TAB_CONTROL_ENABLED, NULL, black, white ); @@ -2147,7 +2147,7 @@ void LayoutScheme::init( void ) m_hiliteText.borderColor = darkBlue; // default font - m_font = TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ); + m_font = TheWindowManager->winFindFont( "Times New Roman", 14, FALSE ); } // LayoutScheme::openDialog =================================================== diff --git a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp index f83132b42a3..c53bc119d51 100644 --- a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp @@ -108,7 +108,7 @@ void GroveTool::activate() void GroveTool::plantShrub( Coord3D *pos ) { // TODO: Determine when we can tell something is a shurubbery, and plant it here - jkmcd -// addObj(pos, AsciiString("Shrub")); +// addObj(pos, "Shrub"); } void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView) diff --git a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp index 0e218f1128e..7dc51c9a8de 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp @@ -111,7 +111,7 @@ void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld ScorchOptions::update(); } else { pView->snapPoint(&docPt); - MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("Scorch"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance(MapObject)(docPt, "Scorch", 0, 0, NULL, NULL ); pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR); pNew->setSelected(true); pNew->setIsScorch(); diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 44b8dbad835..1cfdb69b091 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -1372,12 +1372,12 @@ void ScriptDialog::OnLoad() m_firstTrigger = NULL; m_waypointBase = pDoc->getNextWaypointID(); m_maxWaypoint = m_waypointBase; - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); - file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk ); - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk ); - file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk ); - file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk ); + file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk ); + file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk ); if (!file.parse(this)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -1474,7 +1474,7 @@ void ScriptDialog::OnLoad() Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } diff --git a/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp b/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp index 9abdd6d4797..fe8584c2986 100644 --- a/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp @@ -131,7 +131,7 @@ BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult item.cchTextMax = sizeof(buffer)-2; m_textureTreeView.GetItem(&item); if (0==strcmp(buffer, DEFAULT)) { - TheTerrainRenderObject->updateMacroTexture(AsciiString("")); + TheTerrainRenderObject->updateMacroTexture(""); } else { TheTerrainRenderObject->updateMacroTexture(AsciiString(buffer)); } diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index e9327dfa982..78fd55aeec2 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -425,7 +425,7 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath) } FilenameList filenameList; - TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.*"), filenameList, TRUE); + TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), "*.*", filenameList, TRUE); if (filenameList.size() == 0) { return; diff --git a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp index ee7f4bb25a5..24568828216 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp @@ -119,14 +119,14 @@ void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor WaypointOptions::update(); } else { pView->snapPoint(&docPt); - MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); Int id = pDoc->getNextWaypointID(); AsciiString name = WaypointOptions::GenerateUniqueName(id); pNew->setSelected(true); pNew->setIsWaypoint(); pNew->setWaypointID(id); pNew->setWaypointName(name); - pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team")); + pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team"); AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew); pDoc->AddAndDoUndoable(pUndo); REF_PTR_RELEASE(pUndo); // belongs to pDoc now. @@ -166,7 +166,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld pObj = pickWaypoint(docPt); if (pObj == NULL) { pView->snapPoint(&docPt); - MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); Int id = pDoc->getNextWaypointID(); AsciiString name; name.format("Waypoint %d", id); @@ -174,7 +174,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld pNew->setIsWaypoint(); pNew->setWaypointID(id); pNew->setWaypointName(name); - pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team")); + pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team"); AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew); pDoc->AddAndDoUndoable(pUndo); REF_PTR_RELEASE(pUndo); // belongs to pDoc now. diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index a756f622f7d..577eedc7d4c 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -337,7 +337,7 @@ BOOL CWorldBuilderApp::InitInstance() TheFramePacer = new FramePacer(); #if defined(RTS_DEBUG) - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameDataDebug" ), INI_LOAD_MULTIFILE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_MULTIFILE, NULL ); #endif #ifdef DEBUG_CRASHING @@ -362,8 +362,8 @@ BOOL CWorldBuilderApp::InitInstance() CreateDirectory(buf, NULL); // read the water settings from INI (must do prior to initing GameClient, apparently) - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Water" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Water" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, NULL ); initSubsystem(TheGameText, CreateGameTextInterface()); initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science", "Data\\INI\\Science"); @@ -681,7 +681,7 @@ void CWorldBuilderApp::OnFileOpen() #endif CFileStatus status; - if (m_currentDirectory != AsciiString("")) try { + if (m_currentDirectory != "") try { if (CFile::GetStatus(m_currentDirectory.str(), status)) { if (status.m_attribute & CFile::directory) { ::SetCurrentDirectory(m_currentDirectory.str()); diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index c94bf3d688e..833e10e66c9 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -332,7 +332,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk ); if (!file.parse(this)) { throw(ERROR_CORRUPT_FILE_FORMAT); } diff --git a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp index 5a629797330..ec1855d77a5 100644 --- a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp @@ -305,8 +305,8 @@ void PlayerListDlg::OnNewplayer() newPlayerDict.setBool(TheKey_playerIsHuman, true); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); #ifdef NOT_IN_USE // auto-open the advanced prop editor @@ -859,8 +859,8 @@ void PlayerListDlg::OnAddskirmishplayers() newPlayerDict.setBool(TheKey_playerIsHuman, false); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); ensureValidPlayerName(&newPlayerDict); m_sides.addSide(&newPlayerDict); @@ -881,8 +881,8 @@ void PlayerListDlg::OnAddskirmishplayers() newPlayerDict.setBool(TheKey_playerIsHuman, false); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); ensureValidPlayerName(&newPlayerDict); m_sides.addSide(&newPlayerDict); @@ -903,8 +903,8 @@ void PlayerListDlg::OnAddskirmishplayers() newPlayerDict.setBool(TheKey_playerIsHuman, false); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); ensureValidPlayerName(&newPlayerDict); m_sides.addSide(&newPlayerDict); @@ -925,8 +925,8 @@ void PlayerListDlg::OnAddskirmishplayers() newPlayerDict.setBool(TheKey_playerIsHuman, false); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); ensureValidPlayerName(&newPlayerDict); m_sides.addSide(&newPlayerDict); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h index 9dccd0cf0e3..00204fa0ebd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -84,7 +84,7 @@ class ArmorTemplateSet inline Int getConditionsYesCount() const { return 1; } inline const ArmorSetFlags& getNthConditionsYes(Int i) const { return m_types; } #if defined(RTS_DEBUG) - inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); } + inline AsciiString getDescription() const { return "ArmorTemplateSet"; } #endif void parseArmorTemplateSet( INI* ini ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h index 75ad9b72df6..707d5fffc10 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -158,7 +158,7 @@ class WeaponTemplateSet inline Int getConditionsYesCount() const { return 1; } inline const WeaponSetFlags& getNthConditionsYes(Int i) const { return m_types; } #if defined(RTS_DEBUG) - inline AsciiString getDescription() const { return AsciiString("ArmorTemplateSet"); } + inline AsciiString getDescription() const { return "ArmorTemplateSet"; } #endif }; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp index 7c7418a6a52..186b54ac337 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp @@ -467,7 +467,7 @@ void GameEngine::init() #if defined(RTS_DEBUG) // If we're in Debug, load the Debug settings as well. - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameDataDebug" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_OVERWRITE, NULL ); #endif // special-case: parse command-line parameters after loading global data @@ -486,10 +486,10 @@ void GameEngine::init() } // read the water settings from INI (must do prior to initing GameClient, apparently) - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Water" ), INI_LOAD_OVERWRITE, &xferCRC ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Water" ), INI_LOAD_OVERWRITE, &xferCRC ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Weather" ), INI_LOAD_OVERWRITE, &xferCRC ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Weather" ), INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Default\\Weather", INI_LOAD_OVERWRITE, &xferCRC ); + ini.loadFileDirectory( "Data\\INI\\Weather", INI_LOAD_OVERWRITE, &xferCRC ); @@ -695,7 +695,7 @@ void GameEngine::init() } // load the initial shell screen - //TheShell->push( AsciiString("Menus/MainMenu.wnd") ); + //TheShell->push( "Menus/MainMenu.wnd" ); // This allows us to run a map from the command line if (TheGlobalData->m_initialFile.isEmpty() == FALSE) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp index 7a227a67f5b..4594265789b 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/GameLOD.cpp @@ -303,10 +303,10 @@ void GameLODManager::init(void) { INI ini; //Get Presets for each LOD level. - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameLOD" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameLOD", INI_LOAD_OVERWRITE, NULL ); //Get presets for each known hardware configuration - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameLODPresets"), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\GameLODPresets", INI_LOAD_OVERWRITE, NULL); //Get Presets for custom LOD level by pulling them out of initial globaldata (which should //have all settings already applied). diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index a9d064db434..a02e47e3c0e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -1769,7 +1769,7 @@ RecorderModeType RecorderClass::getMode() { ///< Show or Hide the Replay controls void RecorderClass::initControls() { - NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayControl.wnd:ParentReplayControl") ); + NameKeyType parentReplayControlID = TheNameKeyGenerator->nameToKey( "ReplayControl.wnd:ParentReplayControl" ); GameWindow *parentReplayControl = TheWindowManager->winGetWindowFromId( NULL, parentReplayControlID ); Bool show = (getMode() != RECORDERMODETYPE_PLAYBACK); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp index c1378ffeaf0..01bc174f2f0 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/DataChunk.cpp @@ -743,7 +743,7 @@ AsciiString DataChunkInput::openDataChunk(DataChunkVersionType *ver ) c->next = m_chunkStack; m_chunkStack = c; if (this->atEndOfFile()) { - return (AsciiString("")); + return AsciiString::TheEmptyString; } return m_contents.getName( c->id ); } @@ -779,7 +779,7 @@ AsciiString DataChunkInput::getChunkLabel( void ) { // TODO: Throw exception DEBUG_CRASH(("Bad.")); - return AsciiString(""); + return AsciiString::TheEmptyString; } return m_contents.getName( m_chunkStack->id ); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp index 5b6bd01a264..b8add65553e 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp @@ -636,7 +636,7 @@ SaveCode GameState::missionSave( void ) desc.format( format, TheGameText->fetch( campaign->m_campaignNameLabel ).str(), missionNumber ); // do an automatic mission save - return TheGameState->saveGame( AsciiString(""), desc, SAVE_FILE_TYPE_MISSION ); + return TheGameState->saveGame( "", desc, SAVE_FILE_TYPE_MISSION ); } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp b/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp index 150e3579a8f..43b5186f626 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/TerrainTypes.cpp @@ -139,7 +139,7 @@ TerrainType *TerrainTypeCollection::newTerrain( AsciiString name ) terrain = newInstance(TerrainType); // copy default values from the default terrain entry - TerrainType *defaultTerrain = findTerrain( AsciiString( "DefaultTerrain" ) ); + TerrainType *defaultTerrain = findTerrain( "DefaultTerrain" ); if( defaultTerrain ) *terrain = *defaultTerrain; /* diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp index 3a3f5a02a19..1aa09afad2f 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingFactory.cpp @@ -134,7 +134,7 @@ ThingTemplate *ThingFactory::newTemplate( const AsciiString& name ) newTemplate = newInstance(ThingTemplate); // if the default template is present, get it and copy over any data to the new template - const ThingTemplate *defaultT = findTemplate( AsciiString( "DefaultThingTemplate" ), FALSE ); + const ThingTemplate *defaultT = findTemplate( "DefaultThingTemplate", FALSE ); if( defaultT ) { @@ -276,7 +276,7 @@ ThingTemplate *ThingFactory::findTemplateInternal( const AsciiString& name, Bool #ifdef LOAD_TEST_ASSETS if (!strncmp(name.str(), TEST_STRING, strlen(TEST_STRING))) { - ThingTemplate *tmplate = newTemplate( AsciiString( "Un-namedTemplate" ) ); + ThingTemplate *tmplate = newTemplate( "Un-namedTemplate" ); // load the values tmplate->initForLTA( name ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp index ec6218e8b28..a26d9eee662 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Credits.cpp @@ -155,7 +155,7 @@ void CreditsManager::load(void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Credits" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Credits", INI_LOAD_OVERWRITE, NULL ); if(m_scrollRatePerFrames <=0) m_scrollRatePerFrames = 1; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp index bb5d863ed56..25b02f109a0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp @@ -254,7 +254,7 @@ void Eva::init() { // parse the INI here, etc. INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Eva" ), INI_LOAD_OVERWRITE, NULL); + ini.loadFileDirectory( "Data\\INI\\Eva", INI_LOAD_OVERWRITE, NULL); } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp index fdee657e029..d270e95daf2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ChallengeGenerals.cpp @@ -55,7 +55,7 @@ ChallengeGenerals::~ChallengeGenerals() void ChallengeGenerals::init( void ) { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\ChallengeMode" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ChallengeMode", INI_LOAD_OVERWRITE, NULL ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp index 9f7d0e10531..a526844127f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp @@ -1062,11 +1062,11 @@ void ControlBar::init( void ) INI ini; m_sideSelectAnimateDown = FALSE; // load the command buttons - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\CommandButton" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\CommandButton" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\CommandButton", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\CommandButton", INI_LOAD_OVERWRITE, NULL ); // load the command sets - ini.loadFileDirectory( AsciiString( "Data\\INI\\CommandSet" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\CommandSet", INI_LOAD_OVERWRITE, NULL ); // post process step after loading the command buttons and command sets postProcessCommands(); @@ -1253,9 +1253,9 @@ void ControlBar::init( void ) m_radarAttackGlowWindow = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinUAttack")); - win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); win->winGetScreenPosition(&m_controlBarForegroundMarkerPos.x, &m_controlBarForegroundMarkerPos.y); - win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); win->winGetScreenPosition(&m_controlBarBackgroundMarkerPos.x,&m_controlBarBackgroundMarkerPos.y); if(!m_videoManager) @@ -1411,7 +1411,7 @@ void ControlBar::update( void ) { if (m_animateWindowManager->isFinished() && m_animateWindowManager->isReversed()) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window && !window->winIsHidden()) window->winHide(TRUE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp index ab5ae384ad2..bd7a154d681 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp @@ -224,7 +224,7 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m // if( controlID == buttonCommunicator && TheGameLogic->getGameMode() == GAME_INTERNET ) /* { - popupCommunicatorLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupCommunicator.wnd" ) ); + popupCommunicatorLayout = TheWindowManager->winCreateLayout( "Menus/PopupCommunicator.wnd" ); popupCommunicatorLayout->runInit(); popupCommunicatorLayout->hide( FALSE ); popupCommunicatorLayout->bringForward(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp index 56594e991a9..2eee2dd5312 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp @@ -103,7 +103,7 @@ void ControlBarResizer::init( void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\ControlBarResizer" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ControlBarResizer", INI_LOAD_OVERWRITE, NULL ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp index 72018691d7a..c6be2fa7fad 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp @@ -1020,8 +1020,8 @@ void ControlBarSchemeManager::init( void ) INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ControlBarScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ControlBarScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ControlBarScheme", INI_LOAD_OVERWRITE, NULL ); // //Load the user modified control bar schemes // WIN32_FIND_DATA findData; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp index 964a93915a0..fef643087a1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp @@ -357,7 +357,7 @@ WindowMsgHandledType ControlBarSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonCommunicator = TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:PopupCommunicator") ); + buttonCommunicator = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PopupCommunicator" ); break; @@ -502,7 +502,7 @@ void ShowControlBar( Bool immediate ) TheControlBar->showSpecialPowerShortcut(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -537,7 +537,7 @@ void HideControlBar( Bool immediate ) TheControlBar->hideSpecialPowerShortcut(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -573,7 +573,7 @@ void ToggleControlBar( Bool immediate ) toggleReplayControls(); - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp index 2803730c0ac..8d2659db831 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp @@ -615,7 +615,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton, if(win) { - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); static ICoord2D lastOffset = { 0, 0 }; ICoord2D size, newSize, pos; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp index 158d9779e53..ec5c383e37e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp @@ -62,7 +62,7 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne return NULL; } - GameWindow *parent = TheWindowManager->winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); + GameWindow *parent = TheWindowManager->winCreateFromScript( "Menus/MessageBox.wnd" ); TheWindowManager->winSetModal( parent ); TheWindowManager->winSetFocus( NULL ); // make sure we lose focus from other windows even if we refuse focus ourselves TheWindowManager->winSetFocus( parent ); @@ -104,19 +104,19 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne Int buttonX[3], buttonY[3]; //In the layout, buttonOk will be in the first button position - NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); + NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); GameWindow *buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID); buttonOk->winGetPosition(&buttonX[0], &buttonY[0]); - NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); + NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); GameWindow *buttonYes = TheWindowManager->winGetWindowFromId(parent, buttonYesID); //buttonNo in the second position - NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); + NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); GameWindow *buttonNo = TheWindowManager->winGetWindowFromId(parent, buttonNoID); buttonNo->winGetPosition(&buttonX[1], &buttonY[1]); //and buttonCancel in the third - NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); GameWindow *buttonCancel = TheWindowManager->winGetWindowFromId(parent, buttonCancelID); buttonCancel->winGetPosition(&buttonX[2], &buttonY[2]); @@ -161,11 +161,11 @@ static GameWindow *gogoExMessageBox(Int x, Int y, Int width, Int height, Unsigne } // Fill the text into the text boxes - NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextTitle" ) ); + NameKeyType staticTextTitleID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextTitle" ); GameWindow *staticTextTitle = TheWindowManager->winGetWindowFromId(parent, staticTextTitleID); GadgetStaticTextSetText(staticTextTitle,titleString); - NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:StaticTextMessage" ) ); + NameKeyType staticTextMessageID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:StaticTextMessage" ); GameWindow *staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID); GadgetStaticTextSetText(staticTextMessage,bodyString); @@ -261,10 +261,10 @@ WindowMsgHandledType ExtendedMessageBoxSystem( GameWindow *window, UnsignedInt m { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); WindowExMessageBoxData *MsgBoxCallbacks = (WindowExMessageBoxData *)window->winGetUserData(); MessageBoxReturnType ret = MB_RETURN_CLOSE; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp index f462512cdf4..09336b14179 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp @@ -76,7 +76,7 @@ void ShowInGameChat( Bool immediate ) } else { - chatWindow = TheWindowManager->winCreateFromScript( AsciiString("InGameChat.wnd") ); + chatWindow = TheWindowManager->winCreateFromScript( "InGameChat.wnd" ); static NameKeyType textEntryChatID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:TextEntryChat" ); chatTextEntry = TheWindowManager->winGetWindowFromId( NULL, textEntryChatID ); @@ -338,7 +338,7 @@ WindowMsgHandledType InGameChatSystem( GameWindow *window, UnsignedInt msg, case GBM_SELECTED: { GameWindow *control = (GameWindow *)mData1; - static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "InGameChat.wnd:ButtonClear" ) ); + static NameKeyType buttonClearID = TheNameKeyGenerator->nameToKey( "InGameChat.wnd:ButtonClear" ); if (control && control->winGetWindowId() == buttonClearID) { if (chatTextEntry) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp index 83f4d87aac1..25726ad39cb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp @@ -89,12 +89,12 @@ static Bool pause = FALSE; void InGamePopupMessageInit( WindowLayout *layout, void *userData ) { - parentID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:InGamePopupMessageParent")); + parentID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:InGamePopupMessageParent"); parent = TheWindowManager->winGetWindowFromId(NULL, parentID); - staticTextMessageID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:StaticTextMessage")); + staticTextMessageID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:StaticTextMessage"); staticTextMessage = TheWindowManager->winGetWindowFromId(parent, staticTextMessageID); - buttonOkID = TheNameKeyGenerator->nameToKey(AsciiString("InGamePopupMessage.wnd:ButtonOk")); + buttonOkID = TheNameKeyGenerator->nameToKey("InGamePopupMessage.wnd:ButtonOk"); buttonOk = TheWindowManager->winGetWindowFromId(parent, buttonOkID); PopupMessageData *pMData = TheInGameUI->getPopupMessageData(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp index 1824892e77e..8a7ca7b216d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp @@ -338,25 +338,25 @@ void ChallengeMenuInit( WindowLayout *layout, void *userData ) TheShell->showShellMap(TRUE); // init window ids and pointers - parentID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ParentChallengeMenu") ); + parentID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ParentChallengeMenu" ); parentMenu = TheWindowManager->winGetWindowFromId( NULL, parentID ); - buttonPlayID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ButtonPlay") ); + buttonPlayID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ButtonPlay" ); buttonPlay = TheWindowManager->winGetWindowFromId( parentMenu, buttonPlayID ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:ButtonBack") ); + buttonBackID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:ButtonBack" ); buttonBack = TheWindowManager->winGetWindowFromId( parentMenu, buttonBackID ); - bioPortraitID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioPortrait") ); + bioPortraitID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioPortrait" ); bioPortrait = TheWindowManager->winGetWindowFromId( parentMenu, bioPortraitID ); - bioNameEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioNameEntry") ); + bioNameEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioNameEntry" ); bioLine1Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioNameEntryID ); // this window has been repurposed - bioDOBEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioDOBEntry") ); + bioDOBEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioDOBEntry" ); bioLine2Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioDOBEntryID ); // this window has been repurposed - bioBirthplaceEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioBirthplaceEntry") ); + bioBirthplaceEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioBirthplaceEntry" ); bioLine3Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioBirthplaceEntryID ); // this window has been repurposed - bioStrategyEntryID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:BioStrategyEntry") ); + bioStrategyEntryID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:BioStrategyEntry" ); bioLine4Entry = TheWindowManager->winGetWindowFromId( parentMenu, bioStrategyEntryID ); // this window has been repurposed - backdropID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:MainBackdrop") ); + backdropID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:MainBackdrop" ); backdrop = TheWindowManager->winGetWindowFromId( parentMenu, backdropID); - bioParentID = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeMenu.wnd:GeneralsBioParent") ); + bioParentID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:GeneralsBioParent" ); bioParent = TheWindowManager->winGetWindowFromId( parentMenu, bioParentID); AsciiString strButtonName; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp index f4b4fa23e6e..3a0087ded97 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp @@ -86,7 +86,7 @@ void CreditsMenuInit( WindowLayout *layout, void *userData ) TheCredits->load(); TheCredits->init(); - parentMainMenuID = TheNameKeyGenerator->nameToKey( AsciiString("CreditsMenu.wnd:ParentCreditsWindow") ); + parentMainMenuID = TheNameKeyGenerator->nameToKey( "CreditsMenu.wnd:ParentCreditsWindow" ); parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, parentMainMenuID ); @@ -99,7 +99,7 @@ void CreditsMenuInit( WindowLayout *layout, void *userData ) TheAudio->removeAudioEvent( AHSV_StopTheMusicFade ); - AudioEventRTS event( AsciiString( "Credits" ) ); + AudioEventRTS event( "Credits" ); event.setShouldFade( TRUE ); TheAudio->addAudioEvent( &event ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp index ea9a3641098..ae20452c8ee 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp @@ -133,11 +133,11 @@ void DifficultySelectInit( WindowLayout *layout, void *userData ) buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); buttonCancelID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:ButtonCancel" ); buttonCancel = TheWindowManager->winGetWindowFromId( parent, buttonCancelID ); - radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonEasy") ); + radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonEasy" ); radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID ); - radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonMedium") ); + radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonMedium" ); radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID ); - radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("DifficultySelect.wnd:RadioButtonHard") ); + radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "DifficultySelect.wnd:RadioButtonHard" ); radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID ); s_AIDiff = DIFFICULTY_NORMAL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp index 15b3aa1c458..c0b7f7097cb 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp @@ -69,8 +69,8 @@ static GameWindow *buttonVotePlayer6Window = NULL; static GameWindow *buttonVotePlayer7Window = NULL; static void InitDisconnectWindow( void ) { - textEntryID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:TextEntry")); - textDisplayID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ListboxTextDisplay")); + textEntryID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:TextEntry"); + textDisplayID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ListboxTextDisplay"); textEntryWindow = TheWindowManager->winGetWindowFromId(NULL, textEntryID); textDisplayWindow = TheWindowManager->winGetWindowFromId(NULL, textDisplayID); @@ -80,16 +80,16 @@ static void InitDisconnectWindow( void ) { TheWindowManager->winSetFocus(textEntryWindow); } - buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonQuitGame")); + buttonQuitID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonQuitGame"); buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID); - buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer1")); - buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer2")); - buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer3")); - buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer4")); - buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer5")); - buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer6")); - buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( AsciiString("DisconnectScreen.wnd:ButtonKickPlayer7")); + buttonVotePlayer1ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer1"); + buttonVotePlayer2ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer2"); + buttonVotePlayer3ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer3"); + buttonVotePlayer4ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer4"); + buttonVotePlayer5ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer5"); + buttonVotePlayer6ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer6"); + buttonVotePlayer7ID = TheNameKeyGenerator->nameToKey( "DisconnectScreen.wnd:ButtonKickPlayer7"); buttonVotePlayer1Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer1ID); buttonVotePlayer2Window = TheWindowManager->winGetWindowFromId(NULL, buttonVotePlayer2ID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp index ab8214c2ca2..c3c10fa3f65 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp @@ -126,7 +126,7 @@ static void showGameSpyQMUnderlyingGUIElements( Bool show ) } static void InitEstablishConnectionsDialog( void ) { - buttonQuitID = TheNameKeyGenerator->nameToKey( AsciiString("EstablishConnectionsScreen.wnd:ButtonQuit") ); + buttonQuitID = TheNameKeyGenerator->nameToKey( "EstablishConnectionsScreen.wnd:ButtonQuit" ); buttonQuitWindow = TheWindowManager->winGetWindowFromId(NULL, buttonQuitID); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp index 5f904f5ed96..3286091c8e8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp @@ -67,7 +67,7 @@ static WindowLayout *gameInfoWindowLayout = NULL; void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin ) { if( !gameInfoWindowLayout ) - gameInfoWindowLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/GameInfoWindow.wnd" ) ); + gameInfoWindowLayout = TheWindowManager->winCreateLayout( "Menus/GameInfoWindow.wnd" ); gameInfoWindowLayout->runInit(); gameInfoWindowLayout->bringForward(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp index 4d03d0836fc..9468c4500f5 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp @@ -395,7 +395,7 @@ void KeyboardOptionsMenuInit( WindowLayout *layout, void *userData ) parentKeyboardOptionsMenu = TheWindowManager->winGetWindowFromId( NULL, parentKeyboardOptionsMenuID ); // get ids for our children controls - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("KeyboardOptionsMenu.wnd:ButtonBack") ); + buttonBackID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ButtonBack" ); buttonBack = TheWindowManager->winGetWindowFromId( parentKeyboardOptionsMenu, buttonBackID ); comboBoxCategoryListID = TheNameKeyGenerator->nameToKey( "KeyboardOptionsMenu.wnd:ComboBoxCategoryList" ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 62050e0c396..45f5039eae1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -678,17 +678,17 @@ void lanUpdateSlotList( void ) void InitLanGameGadgets( void ) { //Initialize the gadget IDs - parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryChat" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonEmote" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ButtonSelectMap" ) ); - checkboxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ) ); - comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:ComboBoxStartingCash" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "LanGameOptionsMenu.wnd:MapWindow" ) ); + parentLanGameOptionsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:LanGameOptionsMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonStart" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryChat" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:TextEntryMapDisplay" ); + listboxChatWindowLanGameID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ListboxChatWindowLanGame" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonEmote" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ButtonSelectMap" ); + checkboxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ); + comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:ComboBoxStartingCash" ); + windowMapID = TheNameKeyGenerator->nameToKey( "LanGameOptionsMenu.wnd:MapWindow" ); // Initialize the pointers to our gadgets parentLanGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentLanGameOptionsID ); @@ -1262,7 +1262,7 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m { //buttonBack->winEnable( false ); - mapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/LanMapSelectMenu.wnd" ) ); + mapSelectLayout = TheWindowManager->winCreateLayout( "Menus/LanMapSelectMenu.wnd" ); mapSelectLayout->runInit(); mapSelectLayout->hide( FALSE ); mapSelectLayout->bringForward(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index 17d5fcd1ef6..e1bd2a9e424 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -367,20 +367,20 @@ void LanLobbyMenuInit( WindowLayout *layout, void *userData ) LANisShuttingDown = false; // get the ids for our controls - parentLanLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:LanLobbyMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonBack" ) ); - buttonClearID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonClear" ) ); - buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonHost" ) ); - buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonJoin" ) ); - buttonDirectConnectID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonDirectConnect" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ButtonEmote" ) ); - staticToolTipID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticToolTip" ) ); - textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryPlayerName" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:TextEntryChat" ) ); - listboxPlayersID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxPlayers" ) ); - listboxChatWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ) ); - listboxGamesID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:ListboxGames" ) ); - staticTextGameInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "LanLobbyMenu.wnd:StaticTextGameInfo" ) ); + parentLanLobbyID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:LanLobbyMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonBack" ); + buttonClearID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonClear" ); + buttonHostID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonHost" ); + buttonJoinID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonJoin" ); + buttonDirectConnectID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonDirectConnect" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ButtonEmote" ); + staticToolTipID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticToolTip" ); + textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryPlayerName" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:TextEntryChat" ); + listboxPlayersID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxPlayers" ); + listboxChatWindowID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxChatWindowLanLobby" ); + listboxGamesID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:ListboxGames" ); + staticTextGameInfoID = TheNameKeyGenerator->nameToKey( "LanLobbyMenu.wnd:StaticTextGameInfo" ); // Get pointers to the window buttons @@ -786,7 +786,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, else if ( controlID == buttonJoinID ) { - //TheShell->push( AsciiString("Menus/LanGameOptionsMenu.wnd") ); + //TheShell->push( "Menus/LanGameOptionsMenu.wnd" ); int rowSelected = -1; GadgetListBoxGetSelected( listboxGames, &rowSelected ); @@ -822,7 +822,7 @@ WindowMsgHandledType LanLobbyMenuSystem( GameWindow *window, UnsignedInt msg, else if (controlID == buttonDirectConnectID) { TheLAN->RequestLobbyLeave( false ); - TheShell->push(AsciiString("Menus/NetworkDirectConnect.wnd")); + TheShell->push("Menus/NetworkDirectConnect.wnd"); } break; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp index fe7af255077..537352824ca 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp @@ -138,10 +138,10 @@ void LanMapSelectMenuInit( WindowLayout *layout, void *userData ) } - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:ListboxMap") ); - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("LanMapSelectMenu.wnd:WinMapPreview") ); + buttonBack = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:ListboxMap" ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:WinMapPreview" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "LanMapSelectMenu.wnd:RadioButtonUserMaps" ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp index da3359cc1c5..b52054d4e5d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp @@ -279,7 +279,7 @@ void setupGameStart(AsciiString mapName, GameDifficulty diff) TheChallengeGenerals->setCurrentDifficulty(diff); campaignSelected = TRUE; - TheShell->push( AsciiString("Menus/ChallengeMenu.wnd") ); + TheShell->push( "Menus/ChallengeMenu.wnd" ); TheTransitionHandler->reverse("MainMenuDifficultyMenuTraining"); } else @@ -447,7 +447,7 @@ GameWindow *win = NULL; // Originally this label does not exist in the Main Menu. It can be copied from the Options Menu. static void initLabelVersion() { - NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:LabelVersion") ); + NameKeyType versionID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:LabelVersion" ); GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID ); if (labelVersion) @@ -484,41 +484,41 @@ void MainMenuInit( WindowLayout *layout, void *userData ) dropDownWindows[i] = NULL; // get ids for our windows - mainMenuID = TheNameKeyGenerator->nameToKey( AsciiString( "MainMenu.wnd:MainMenuParent" ) ); -// campaignID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCampaign") ); - skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") ); - onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") ); - networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") ); - optionsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOptions") ); - exitID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonExit") ); - motdID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMOTD") ); - worldBuilderID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonWorldBuilder") ); - getUpdateID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGetUpdate") ); -// buttonTRAININGID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonTRAINING") ); - buttonChallengeID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChallenge") ); - buttonUSAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSA") ); - buttonGLAID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLA") ); - buttonChinaID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChina") ); - buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSARecentSave") ); - buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonUSALoadGame") ); - buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLARecentSave") ); - buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonGLALoadGame") ); - buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaRecentSave") ); - buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonChinaLoadGame") ); - buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSinglePlayer") ); - buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiplayer") ); - buttonMultiBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMultiBack") ); - buttonSingleBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSingleBack") ); - buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplayBack") ); - buttonReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonReplay") ); - buttonLoadReplayID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadReplay") ); - buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonLoadGame") ); - buttonCreditsID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonCredits") ); - - buttonEasyID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonEasy") ); - buttonMediumID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonMedium") ); - buttonHardID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonHard") ); - buttonDiffBackID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonDiffBack") ); + mainMenuID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuParent" ); +// campaignID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCampaign" ); + skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" ); + onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" ); + networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" ); + optionsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOptions" ); + exitID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonExit" ); + motdID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMOTD" ); + worldBuilderID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonWorldBuilder" ); + getUpdateID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGetUpdate" ); +// buttonTRAININGID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonTRAINING" ); + buttonChallengeID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChallenge" ); + buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" ); + buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" ); + buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" ); + buttonUSARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSARecentSave" ); + buttonUSALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSALoadGame" ); + buttonGLARecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLARecentSave" ); + buttonGLALoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLALoadGame" ); + buttonChinaRecentSaveID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaRecentSave" ); + buttonChinaLoadGameID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChinaLoadGame" ); + buttonSinglePlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSinglePlayer" ); + buttonMultiPlayerID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiplayer" ); + buttonMultiBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMultiBack" ); + buttonSingleBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSingleBack" ); + buttonLoadReplayBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplayBack" ); + buttonReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonReplay" ); + buttonLoadReplayID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadReplay" ); + buttonLoadID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonLoadGame" ); + buttonCreditsID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonCredits" ); + + buttonEasyID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonEasy" ); + buttonMediumID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonMedium" ); + buttonHardID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonHard" ); + buttonDiffBackID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonDiffBack" ); // get pointers to the window buttons parentMainMenu = TheWindowManager->winGetWindowFromId( NULL, mainMenuID ); @@ -555,11 +555,11 @@ void MainMenuInit( WindowLayout *layout, void *userData ) buttonChinaRecentSave = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaRecentSaveID ); buttonChinaLoadGame = TheWindowManager->winGetWindowFromId( parentMainMenu, buttonChinaLoadGameID ); - dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") )); - dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder1") ) ); - dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder2") ) ); - dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder3") ) ); - dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder4") ) ); + dropDownWindows[DROPDOWN_SINGLE] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" )); + dropDownWindows[DROPDOWN_MULTIPLAYER] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder1" ) ); + dropDownWindows[DROPDOWN_MAIN] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder2" ) ); + dropDownWindows[DROPDOWN_LOADREPLAY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder3" ) ); + dropDownWindows[DROPDOWN_DIFFICULTY] = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder4" ) ); for(i = 1; i < DROPDOWN_COUNT; ++i) dropDownWindows[i]->winHide(TRUE); @@ -650,7 +650,7 @@ void MainMenuInit( WindowLayout *layout, void *userData ) //pendingDropDown =DROPDOWN_MAIN; - GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MainMenuRuler") ) ); + GameWindow *rule = TheWindowManager->winGetWindowFromId( parentMainMenu, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MainMenuRuler" ) ); if(rule) rule->winHide(TRUE); campaignSelected = FALSE; @@ -1307,7 +1307,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, if( control == buttonCampaign ) { buttonPushed = TRUE; - TheShell->push(AsciiString( "Menus/MapSelectMenu.wnd" )); + TheShell->push("Menus/MapSelectMenu.wnd"); // As soon as we have a campaign, add it in here!; } #ifdef TEST_COMPRESSION @@ -1423,7 +1423,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition"); - TheShell->push(AsciiString("Menus/SaveLoad.wnd")); + TheShell->push("Menus/SaveLoad.wnd"); } else if( controlID == buttonReplayID ) @@ -1434,7 +1434,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_LOADREPLAY]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuLoadReplayMenuBackTransition"); - TheShell->push(AsciiString("Menus/ReplayMenu.wnd")); + TheShell->push("Menus/ReplayMenu.wnd"); } else if( controlID == skirmishID ) { @@ -1457,7 +1457,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, checkCDBeforeCampaign(DIFFICULTY_NORMAL); break; #endif - TheShell->push( AsciiString("Menus/SkirmishGameOptionsMenu.wnd") ); + TheShell->push( "Menus/SkirmishGameOptionsMenu.wnd" ); TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_SKIRMISH_SELECTED]); } else if( controlID == onlineID ) @@ -1482,7 +1482,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = TRUE; dropDownWindows[DROPDOWN_MULTIPLAYER]->winHide(FALSE); TheTransitionHandler->reverse("MainMenuMultiPlayerMenuTransitionToNext"); - TheShell->push( AsciiString("Menus/LanLobbyMenu.wnd") ); + TheShell->push( "Menus/LanLobbyMenu.wnd" ); TheScriptEngine->signalUIInteract(TheShellHookNames[SHELL_SCRIPT_HOOK_MAIN_MENU_NETWORK_SELECTED]); } @@ -1594,7 +1594,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showSide = SHOW_USA; // launchChallengeMenu = FALSE; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); @@ -1622,7 +1622,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showSide = SHOW_GLA; // launchChallengeMenu = FALSE; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); @@ -1650,7 +1650,7 @@ WindowMsgHandledType MainMenuSystem( GameWindow *window, UnsignedInt msg, showSide = SHOW_CHINA; // launchChallengeMenu = FALSE; // WindowLayout *layout = NULL; -// layout = TheWindowManager->winCreateLayout( AsciiString( "Menus/DifficultySelect.wnd" ) ); +// layout = TheWindowManager->winCreateLayout( "Menus/DifficultySelect.wnd" ); // layout->runInit(); // layout->hide( FALSE ); // layout->bringForward(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp index b5884867b18..ca0cf4fe1f0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp @@ -122,7 +122,7 @@ void SetDifficultyRadioButton( void ) { case DIFFICULTY_EASY: { - NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") ); + NameKeyType radioButtonEasyAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" ); GameWindow *radioButtonEasyAI = TheWindowManager->winGetWindowFromId( parent, radioButtonEasyAIID ); GadgetRadioSetSelection(radioButtonEasyAI, FALSE); s_AIDiff = DIFFICULTY_EASY; @@ -130,7 +130,7 @@ void SetDifficultyRadioButton( void ) } case DIFFICULTY_NORMAL: { - NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") ); + NameKeyType radioButtonMediumAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" ); GameWindow *radioButtonMediumAI = TheWindowManager->winGetWindowFromId( parent, radioButtonMediumAIID ); GadgetRadioSetSelection(radioButtonMediumAI, FALSE); s_AIDiff = DIFFICULTY_NORMAL; @@ -138,7 +138,7 @@ void SetDifficultyRadioButton( void ) } case DIFFICULTY_HARD: { - NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") ); + NameKeyType radioButtonHardAIID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" ); GameWindow *radioButtonHardAI = TheWindowManager->winGetWindowFromId( parent, radioButtonHardAIID ); GadgetRadioSetSelection(radioButtonHardAI, FALSE); s_AIDiff = DIFFICULTY_HARD; @@ -188,10 +188,10 @@ void MapSelectMenuInit( WindowLayout *layout, void *userData ) GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); TheWindowManager->winSetFocus( parent ); - NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") ); + NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" ); GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID ); - NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); + NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID ); @@ -324,12 +324,12 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ListboxMap") ); - radioButtonEasyAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonEasyAI") ); - radioButtonMediumAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonMediumAI") ); - radioButtonHardAI = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:RadioButtonHardAI") ); + buttonBack = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ListboxMap" ); + radioButtonEasyAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonEasyAI" ); + radioButtonMediumAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonMediumAI" ); + radioButtonHardAI = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:RadioButtonHardAI" ); break; } @@ -418,7 +418,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, buttonPushed = true; // reset the campaign manager to empty if( TheCampaignManager ) - TheCampaignManager->setCampaign( AsciiString( "" ) ); + TheCampaignManager->setCampaign( "" ); // get text of the map to load const char *mapFname = (const char *)GadgetListBoxGetItemData( mapWindow, selected ); DEBUG_ASSERTCRASH(mapFname, ("No map item data")); @@ -457,7 +457,7 @@ WindowMsgHandledType MapSelectMenuSystem( GameWindow *window, UnsignedInt msg, { //buttonPushed = true; GadgetListBoxSetSelected( control, rowSelected ); - NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( AsciiString("MapSelectMenu.wnd:ButtonOK") ); + NameKeyType buttonOKID = TheNameKeyGenerator->nameToKey( "MapSelectMenu.wnd:ButtonOK" ); GameWindow *buttonOK = TheWindowManager->winGetWindowFromId( NULL, buttonOKID ); TheWindowManager->winSendSystemMsg( window, GBM_SELECTED, diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp index 1976e21aae4..5124c90b457 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp @@ -262,12 +262,12 @@ void NetworkDirectConnectInit( WindowLayout *layout, void *userData ) buttonPushed = false; isShuttingDown = false; TheShell->showShellMap(TRUE); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonBack" ) ); - buttonHostID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonHost" ) ); - buttonJoinID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ButtonJoin" ) ); - editPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:EditPlayerName" ) ); - comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ) ); - staticLocalIPID = TheNameKeyGenerator->nameToKey( AsciiString( "NetworkDirectConnect.wnd:StaticLocalIP" ) ); + buttonBackID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonBack" ); + buttonHostID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonHost" ); + buttonJoinID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ButtonJoin" ); + editPlayerNameID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:EditPlayerName" ); + comboboxRemoteIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:ComboboxRemoteIP" ); + staticLocalIPID = TheNameKeyGenerator->nameToKey( "NetworkDirectConnect.wnd:StaticLocalIP" ); buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID); buttonHost = TheWindowManager->winGetWindowFromId( NULL, buttonHostID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp index 180dad5cfbe..660911e951a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp @@ -1195,9 +1195,9 @@ static void saveOptions( void ) { TheWritableGlobalData->m_firewallSendDelay = GadgetCheckBoxIsChecked(checkSendDelay); if (TheGlobalData->m_firewallSendDelay) { - (*pref)["SendDelay"] = AsciiString("yes"); + (*pref)["SendDelay"] = "yes"; } else { - (*pref)["SendDelay"] = AsciiString("no"); + (*pref)["SendDelay"] = "no"; } } @@ -1220,39 +1220,39 @@ static void saveOptions( void ) } TheWritableGlobalData->m_useShadowVolumes = GadgetCheckBoxIsChecked( check3DShadows ); - (*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseShadowVolumes"] = TheWritableGlobalData->m_useShadowVolumes ? "yes" : "no"; TheWritableGlobalData->m_useShadowDecals = GadgetCheckBoxIsChecked( check2DShadows ); - (*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseShadowDecals"] = TheWritableGlobalData->m_useShadowDecals ? "yes" : "no"; TheWritableGlobalData->m_useCloudMap = GadgetCheckBoxIsChecked( checkCloudShadows ); - (*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseCloudMap"] = TheGlobalData->m_useCloudMap ? "yes" : "no"; TheWritableGlobalData->m_useLightMap = GadgetCheckBoxIsChecked( checkGroundLighting ); - (*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseLightMap"] = TheGlobalData->m_useLightMap ? "yes" : "no"; TheWritableGlobalData->m_showSoftWaterEdge = GadgetCheckBoxIsChecked( checkSmoothWater ); - (*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? AsciiString("yes") : AsciiString("no"); + (*pref)["ShowSoftWaterEdge"] = TheGlobalData->m_showSoftWaterEdge ? "yes" : "no"; TheWritableGlobalData->m_useDrawModuleLOD = !GadgetCheckBoxIsChecked( checkExtraAnimations ); TheWritableGlobalData->m_useTreeSway = !TheWritableGlobalData->m_useDrawModuleLOD; //borrow same setting. - (*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? AsciiString("no") : AsciiString("yes"); + (*pref)["ExtraAnimations"] = TheGlobalData->m_useDrawModuleLOD ? "no" : "yes"; TheWritableGlobalData->m_enableDynamicLOD = !GadgetCheckBoxIsChecked( checkNoDynamicLod ); - (*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? AsciiString("yes") : AsciiString("no"); + (*pref)["DynamicLOD"] = TheGlobalData->m_enableDynamicLOD ? "yes" : "no"; TheWritableGlobalData->m_useHeatEffects = GadgetCheckBoxIsChecked( checkHeatEffects ); - (*pref)["HeatEffects"] = TheGlobalData->m_useHeatEffects ? AsciiString("yes") : AsciiString("no"); + (*pref)["HeatEffects"] = TheGlobalData->m_useHeatEffects ? "yes" : "no"; // Never write this out //TheWritableGlobalData->m_useFpsLimit = !GadgetCheckBoxIsChecked( checkUnlockFps ); - //(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? AsciiString("yes") : AsciiString("no"); + //(*pref)["FPSLimit"] = TheGlobalData->m_useFpsLimit ? "yes" : "no"; TheWritableGlobalData->m_enableBehindBuildingMarkers = GadgetCheckBoxIsChecked( checkBuildingOcclusion ); - (*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? AsciiString("yes") : AsciiString("no"); + (*pref)["BuildingOcclusion"] = TheWritableGlobalData->m_enableBehindBuildingMarkers ? "yes" : "no"; TheWritableGlobalData->m_useTrees = GadgetCheckBoxIsChecked( checkProps); - (*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? AsciiString("yes") : AsciiString("no"); + (*pref)["ShowTrees"] = TheWritableGlobalData->m_useTrees ? "yes" : "no"; //------------------------------------------------------------------------------------------------- // Particle Cap slider @@ -1349,13 +1349,13 @@ static void saveOptions( void ) //------------------------------------------------------------------------------------------------- // mouse mode TheWritableGlobalData->m_useAlternateMouse = GadgetCheckBoxIsChecked(checkAlternateMouse); - (*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseAlternateMouse"] = TheWritableGlobalData->m_useAlternateMouse ? "yes" : "no"; TheWritableGlobalData->m_clientRetaliationModeEnabled = GadgetCheckBoxIsChecked(checkRetaliation); - (*pref)["Retaliation"] = TheWritableGlobalData->m_clientRetaliationModeEnabled? AsciiString("yes") : AsciiString("no"); + (*pref)["Retaliation"] = TheWritableGlobalData->m_clientRetaliationModeEnabled? "yes" : "no"; TheWritableGlobalData->m_doubleClickAttackMove = GadgetCheckBoxIsChecked( checkDoubleClickAttackMove ); - (*pref)["UseDoubleClickAttackMove"] = TheWritableGlobalData->m_doubleClickAttackMove ? AsciiString("yes") : AsciiString("no"); + (*pref)["UseDoubleClickAttackMove"] = TheWritableGlobalData->m_doubleClickAttackMove ? "yes" : "no"; // TheSuperHackers @todo Add combo box ? { @@ -1658,7 +1658,7 @@ static void cancelAdvancedOptions() // TheSuperHackers @tweak Now prints additional version information in the version label. static void initLabelVersion() { - NameKeyType versionID = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:LabelVersion") ); + NameKeyType versionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LabelVersion" ); GameWindow *labelVersion = TheWindowManager->winGetWindowFromId( NULL, versionID ); if (labelVersion) @@ -1691,107 +1691,107 @@ void OptionsMenuInit( WindowLayout *layout, void *userData ) SignalUIInteraction(SHELL_SCRIPT_HOOK_OPTIONS_OPENED); - comboBoxLANIPID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxIP" ) ); + comboBoxLANIPID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxIP" ); comboBoxLANIP = TheWindowManager->winGetWindowFromId( NULL, comboBoxLANIPID); - comboBoxOnlineIPID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxOnlineIP" ) ); + comboBoxOnlineIPID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxOnlineIP" ); comboBoxOnlineIP = TheWindowManager->winGetWindowFromId( NULL, comboBoxOnlineIPID); - checkAlternateMouseID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAlternateMouse" ) ); + checkAlternateMouseID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAlternateMouse" ); checkAlternateMouse = TheWindowManager->winGetWindowFromId( NULL, checkAlternateMouseID); - checkRetaliationID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Retaliation" ) ); + checkRetaliationID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Retaliation" ); checkRetaliation = TheWindowManager->winGetWindowFromId( NULL, checkRetaliationID); - checkDoubleClickAttackMoveID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckDoubleClickAttackMove" ) ); + checkDoubleClickAttackMoveID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckDoubleClickAttackMove" ); checkDoubleClickAttackMove = TheWindowManager->winGetWindowFromId( NULL, checkDoubleClickAttackMoveID ); - sliderScrollSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderScrollSpeed" ) ); + sliderScrollSpeedID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderScrollSpeed" ); sliderScrollSpeed = TheWindowManager->winGetWindowFromId( NULL, sliderScrollSpeedID); - comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxAntiAliasing" ) ); + comboBoxAntiAliasingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxAntiAliasing" ); comboBoxAntiAliasing = TheWindowManager->winGetWindowFromId( NULL, comboBoxAntiAliasingID ); - comboBoxResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxResolution" ) ); + comboBoxResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxResolution" ); comboBoxResolution = TheWindowManager->winGetWindowFromId( NULL, comboBoxResolutionID ); - comboBoxDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ComboBoxDetail" ) ); + comboBoxDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ComboBoxDetail" ); comboBoxDetail = TheWindowManager->winGetWindowFromId( NULL, comboBoxDetailID ); - checkLanguageFilterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLanguageFilter" ) ); + checkLanguageFilterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLanguageFilter" ); checkLanguageFilter = TheWindowManager->winGetWindowFromId( NULL, checkLanguageFilterID ); - checkSendDelayID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSendDelay" ) ); + checkSendDelayID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSendDelay" ); checkSendDelay = TheWindowManager->winGetWindowFromId( NULL, checkSendDelayID); - buttonFirewallRefreshID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonFirewallRefresh" ) ); + buttonFirewallRefreshID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonFirewallRefresh" ); buttonFirewallRefresh = TheWindowManager->winGetWindowFromId( NULL, buttonFirewallRefreshID); - checkDrawAnchorID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxDrawAnchor" ) ); + checkDrawAnchorID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxDrawAnchor" ); checkDrawAnchor = TheWindowManager->winGetWindowFromId( NULL, checkDrawAnchorID); - checkMoveAnchorID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxMoveAnchor" ) ); + checkMoveAnchorID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxMoveAnchor" ); checkMoveAnchor = TheWindowManager->winGetWindowFromId( NULL, checkMoveAnchorID); // Replay camera - checkSaveCameraID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxSaveCamera" ) ); + checkSaveCameraID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxSaveCamera" ); checkSaveCamera = TheWindowManager->winGetWindowFromId( NULL, checkSaveCameraID ); - checkUseCameraID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBoxUseCamera" ) ); + checkUseCameraID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBoxUseCamera" ); checkUseCamera = TheWindowManager->winGetWindowFromId( NULL, checkUseCameraID ); // // Speakers and 3-D Audio -// checkAudioSurroundID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioSurround" ) ); +// checkAudioSurroundID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioSurround" ); // checkAudioSurround = TheWindowManager->winGetWindowFromId( NULL, checkAudioSurroundID ); -// checkAudioHardwareID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckAudioHardware" ) ); +// checkAudioHardwareID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckAudioHardware" ); // checkAudioHardware = TheWindowManager->winGetWindowFromId( NULL, checkAudioHardwareID ); // // Volume Controls - sliderMusicVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderMusicVolume" ) ); + sliderMusicVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderMusicVolume" ); sliderMusicVolume = TheWindowManager->winGetWindowFromId( NULL, sliderMusicVolumeID ); - sliderSFXVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderSFXVolume" ) ); + sliderSFXVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderSFXVolume" ); sliderSFXVolume = TheWindowManager->winGetWindowFromId( NULL, sliderSFXVolumeID ); - sliderVoiceVolumeID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderVoiceVolume" ) ); + sliderVoiceVolumeID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderVoiceVolume" ); sliderVoiceVolume = TheWindowManager->winGetWindowFromId( NULL, sliderVoiceVolumeID ); - sliderGammaID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:SliderGamma" ) ); + sliderGammaID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:SliderGamma" ); sliderGamma = TheWindowManager->winGetWindowFromId( NULL, sliderGammaID ); -// checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckLowTextureDetail" ) ); +// checkBoxLowTextureDetailID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckLowTextureDetail" ); // checkBoxLowTextureDetail = TheWindowManager->winGetWindowFromId( NULL, checkBoxLowTextureDetailID ); - WinAdvancedDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ) ); + WinAdvancedDisplayID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:WinAdvancedDisplayOptions" ); WinAdvancedDisplay = TheWindowManager->winGetWindowFromId( NULL, WinAdvancedDisplayID ); - ButtonAdvancedAcceptID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceAccept" ) ); + ButtonAdvancedAcceptID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceAccept" ); ButtonAdvancedAccept = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedAcceptID ); - ButtonAdvancedCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonAdvanceBack" ) ); + ButtonAdvancedCancelID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAdvanceBack" ); ButtonAdvancedCancel = TheWindowManager->winGetWindowFromId( NULL, ButtonAdvancedCancelID ); - sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:LowResSlider" ) ); + sliderTextureResolutionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:LowResSlider" ); sliderTextureResolution = TheWindowManager->winGetWindowFromId( NULL, sliderTextureResolutionID ); - check3DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check3DShadows" ) ); + check3DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check3DShadows" ); check3DShadows = TheWindowManager->winGetWindowFromId( NULL, check3DShadowsID); - check2DShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:Check2DShadows" ) ); + check2DShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:Check2DShadows" ); check2DShadows = TheWindowManager->winGetWindowFromId( NULL, check2DShadowsID); - checkCloudShadowsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckCloudShadows" ) ); + checkCloudShadowsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckCloudShadows" ); checkCloudShadows = TheWindowManager->winGetWindowFromId( NULL, checkCloudShadowsID); - checkGroundLightingID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckGroundLighting" ) ); + checkGroundLightingID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckGroundLighting" ); checkGroundLighting = TheWindowManager->winGetWindowFromId( NULL, checkGroundLightingID); - checkSmoothWaterID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckSmoothWater" ) ); + checkSmoothWaterID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckSmoothWater" ); checkSmoothWater = TheWindowManager->winGetWindowFromId( NULL, checkSmoothWaterID); - checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckExtraAnimations" ) ); + checkExtraAnimationsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckExtraAnimations" ); checkExtraAnimations = TheWindowManager->winGetWindowFromId( NULL, checkExtraAnimationsID); - checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckNoDynamicLOD" ) ); + checkNoDynamicLodID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckNoDynamicLOD" ); checkNoDynamicLod = TheWindowManager->winGetWindowFromId( NULL, checkNoDynamicLodID); - checkHeatEffectsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckHeatEffects" ) ); + checkHeatEffectsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckHeatEffects" ); checkHeatEffects = TheWindowManager->winGetWindowFromId( NULL, checkHeatEffectsID); - checkUnlockFpsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckUnlockFPS" ) ); + checkUnlockFpsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckUnlockFPS" ); checkUnlockFps = TheWindowManager->winGetWindowFromId( NULL, checkUnlockFpsID); - checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckBehindBuilding" ) ); + checkBuildingOcclusionID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckBehindBuilding" ); checkBuildingOcclusion = TheWindowManager->winGetWindowFromId( NULL, checkBuildingOcclusionID); - checkPropsID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:CheckShowProps" ) ); + checkPropsID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:CheckShowProps" ); checkProps = TheWindowManager->winGetWindowFromId( NULL, checkPropsID); - sliderParticleCapID = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ParticleCapSlider" ) ); + sliderParticleCapID = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ParticleCapSlider" ); sliderParticleCap = TheWindowManager->winGetWindowFromId( NULL, sliderParticleCapID ); WinAdvancedDisplay->winHide(TRUE); @@ -2268,10 +2268,10 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, { // get ids for our children controls - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonBack") ); - buttonDefaults = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonDefaults") ); - buttonAccept = TheNameKeyGenerator->nameToKey( AsciiString("OptionsMenu.wnd:ButtonAccept") ); - buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonKeyboardOptions" ) ); + buttonBack = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" ); + buttonDefaults = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonDefaults" ); + buttonAccept = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonAccept" ); + buttonKeyboardOptionsMenu = TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonKeyboardOptions" ); break; @@ -2389,7 +2389,7 @@ WindowMsgHandledType OptionsMenuSystem( GameWindow *window, UnsignedInt msg, } else if ( controlID == buttonKeyboardOptionsMenu ) { - TheShell->push( AsciiString( "Menus/KeyboardOptionsMenu.wnd" ) ); + TheShell->push( "Menus/KeyboardOptionsMenu.wnd" ); } else if(controlID == checkDrawAnchorID ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp index 83bf8752344..d3b9be11bc0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp @@ -69,7 +69,7 @@ void PopupCommunicatorInit( WindowLayout *layout, void *userData ) TheWindowManager->winSetModal( parent ); // get ids for our children controls - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString("PopupCommunicator.wnd:ButtonOk") ); + buttonOkID = TheNameKeyGenerator->nameToKey( "PopupCommunicator.wnd:ButtonOk" ); buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp index ab790df9096..76a55a69e95 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp @@ -310,51 +310,51 @@ void PopulateCustomLadderComboBox( void ) //------------------------------------------------------------------------------------------------- void PopupHostGameInit( WindowLayout *layout, void *userData ) { - parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ParentHostPopUp")); + parentPopupID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ParentHostPopUp"); parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID); - textEntryGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameName")); + textEntryGameNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameName"); textEntryGameName = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameNameID); UnicodeString name; name.translate(TheGameSpyInfo->getLocalName()); GadgetTextEntrySetText(textEntryGameName, name); - textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGameDescription")); + textEntryGameDescriptionID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGameDescription"); textEntryGameDescription = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGameDescriptionID); GadgetTextEntrySetText(textEntryGameDescription, UnicodeString::TheEmptyString); - textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryLadderPassword")); + textEntryLadderPasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryLadderPassword"); textEntryLadderPassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryLadderPasswordID); GadgetTextEntrySetText(textEntryLadderPassword, UnicodeString::TheEmptyString); - textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:TextEntryGamePassword")); + textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:TextEntryGamePassword"); textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID); GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString); - buttonCreateGameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCreateGame")); + buttonCreateGameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCreateGame"); buttonCreateGame = TheWindowManager->winGetWindowFromId(parentPopup, buttonCreateGameID); - buttonCancelID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ButtonCancel")); + buttonCancelID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ButtonCancel"); buttonCancel = TheWindowManager->winGetWindowFromId(parentPopup, buttonCancelID); - checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxAllowObservers")); + checkBoxAllowObserversID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxAllowObservers"); checkBoxAllowObservers = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxAllowObserversID); CustomMatchPreferences customPref; GadgetCheckBoxSetChecked(checkBoxAllowObservers, customPref.allowsObservers()); - comboBoxLadderNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:ComboBoxLadderName")); + comboBoxLadderNameID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:ComboBoxLadderName"); comboBoxLadderName = TheWindowManager->winGetWindowFromId(parentPopup, comboBoxLadderNameID); if (comboBoxLadderName) GadgetComboBoxReset(comboBoxLadderName); PopulateCustomLadderComboBox(); - checkBoxUseStatsID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxUseStats")); + checkBoxUseStatsID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxUseStats"); checkBoxUseStats = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxUseStatsID); Bool usingStats = customPref.getUseStats(); GadgetCheckBoxSetChecked( checkBoxUseStats, usingStats ); // limit armies is disallowed in "use stats" games - checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey(AsciiString("PopupHostGame.wnd:CheckBoxLimitArmies")); + checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey("PopupHostGame.wnd:CheckBoxLimitArmies"); checkBoxLimitArmies = TheWindowManager->winGetWindowFromId(parentPopup, checkBoxLimitArmiesID); checkBoxLimitArmies->winEnable(! usingStats ); GadgetCheckBoxSetChecked( checkBoxLimitArmies, usingStats? FALSE : customPref.getFactionsLimited() ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp index ca4da664dff..efbba30770c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp @@ -86,14 +86,14 @@ static void joinGame( AsciiString password ); //------------------------------------------------------------------------------------------------- void PopupJoinGameInit( WindowLayout *layout, void *userData ) { - parentPopupID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:ParentJoinPopUp")); + parentPopupID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:ParentJoinPopUp"); parentPopup = TheWindowManager->winGetWindowFromId(NULL, parentPopupID); - textEntryGamePasswordID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:TextEntryGamePassword")); + textEntryGamePasswordID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:TextEntryGamePassword"); textEntryGamePassword = TheWindowManager->winGetWindowFromId(parentPopup, textEntryGamePasswordID); GadgetTextEntrySetText(textEntryGamePassword, UnicodeString::TheEmptyString); - NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey(AsciiString("PopupJoinGame.wnd:StaticTextGameName")); + NameKeyType staticTextGameNameID = TheNameKeyGenerator->nameToKey("PopupJoinGame.wnd:StaticTextGameName"); GameWindow *staticTextGameName = TheWindowManager->winGetWindowFromId(parentPopup, staticTextGameNameID); GadgetStaticTextSetText(staticTextGameName, UnicodeString::TheEmptyString); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp index ba85bf7c211..72389c9f9f4 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp @@ -648,7 +648,7 @@ WindowMsgHandledType RCGameDetailsMenuSystem( GameWindow *window, UnsignedInt ms const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort()); if (linfo) { - WindowLayout *rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/PopupLadderDetails.wnd")); + WindowLayout *rcLayout = TheWindowManager->winCreateLayout("Menus/PopupLadderDetails.wnd"); if (!rcLayout) break; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp index 2458fd2dfe8..2bf37bbfa12 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp @@ -81,11 +81,11 @@ static NameKeyType buttonSaveLoad = NAMEKEY_INVALID; static void initGadgetsFullQuit( void ) { - buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonExit" ) ); - buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonRestart" ) ); - buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonReturn" ) ); - buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonOptions" ) ); - buttonSaveLoad = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMenu.wnd:ButtonSaveLoad" ) ); + buttonExit = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonExit" ); + buttonRestart = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonRestart" ); + buttonReturn = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonReturn" ); + buttonOptions = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonOptions" ); + buttonSaveLoad = TheNameKeyGenerator->nameToKey( "QuitMenu.wnd:ButtonSaveLoad" ); buttonRestartWin = TheWindowManager->winGetWindowFromId( NULL, buttonRestart ); buttonSaveLoadWin = TheWindowManager->winGetWindowFromId( NULL, buttonSaveLoad ); @@ -95,10 +95,10 @@ static void initGadgetsFullQuit( void ) static void initGadgetsNoSaveQuit( void ) { - buttonExit = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonExit" ) ); - buttonRestart = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonRestart" ) ); - buttonReturn = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonReturn" ) ); - buttonOptions = TheNameKeyGenerator->nameToKey( AsciiString( "QuitNoSave.wnd:ButtonOptions" ) ); + buttonExit = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonExit" ); + buttonRestart = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonRestart" ); + buttonReturn = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonReturn" ); + buttonOptions = TheNameKeyGenerator->nameToKey( "QuitNoSave.wnd:ButtonOptions" ); buttonSaveLoad = NAMEKEY_INVALID; buttonRestartWin = TheWindowManager->winGetWindowFromId( NULL, buttonRestart ); @@ -301,7 +301,7 @@ void ToggleQuitMenu() WindowLayout *optLayout = TheShell->getOptionsLayout(FALSE); GameWindow *optionsParent = optLayout->getFirstWindow(); DEBUG_ASSERTCRASH(optionsParent != NULL, ("Not able to get the options layout parent window")); - GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( AsciiString( "OptionsMenu.wnd:ButtonBack" ) )); + GameWindow *optionsBack = TheWindowManager->winGetWindowFromId(optionsParent, TheNameKeyGenerator->nameToKey( "OptionsMenu.wnd:ButtonBack" )); DEBUG_ASSERTCRASH(optionsBack != NULL, ("Not able to get the back button window from the options menu")); TheWindowManager->winSendSystemMsg(optLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)optionsBack, NULL); return; @@ -310,7 +310,7 @@ void ToggleQuitMenu() { GameWindow *saveLoadParent = saveLoadMenuLayout->getFirstWindow(); DEBUG_ASSERTCRASH(saveLoadParent != NULL, ("Not able to get the save/load layout parent window")); - GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( AsciiString( "PopupSaveLoad.wnd:ButtonBack" ) )); + GameWindow *saveLoadBack = TheWindowManager->winGetWindowFromId(saveLoadParent, TheNameKeyGenerator->nameToKey( "PopupSaveLoad.wnd:ButtonBack" )); DEBUG_ASSERTCRASH(saveLoadBack != NULL, ("Not able to get the back button window from the save/load menu")); TheWindowManager->winSendSystemMsg(saveLoadMenuLayout->getFirstWindow(), GBM_SELECTED, (WindowMsgData)saveLoadBack, NULL); saveLoadMenuLayout = NULL; @@ -362,7 +362,7 @@ void ToggleQuitMenu() { // we don't want to show the save load button. if(!noSaveLoadQuitMenuLayout) - noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitNoSave.wnd" ) ); + noSaveLoadQuitMenuLayout = TheWindowManager->winCreateLayout( "Menus/QuitNoSave.wnd" ); quitMenuLayout = noSaveLoadQuitMenuLayout; initGadgetsNoSaveQuit(); TheTransitionHandler->remove("QuitNoSave"); @@ -371,7 +371,7 @@ void ToggleQuitMenu() else { if(!fullQuitMenuLayout) - fullQuitMenuLayout= TheWindowManager->winCreateLayout( AsciiString( "Menus/QuitMenu.wnd" ) ); + fullQuitMenuLayout= TheWindowManager->winCreateLayout( "Menus/QuitMenu.wnd" ); quitMenuLayout = fullQuitMenuLayout; initGadgetsFullQuit(); TheTransitionHandler->remove("QuitFull"); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp index 9a0d3751c2f..c73221d4873 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp @@ -373,12 +373,12 @@ void ReplayMenuInit( WindowLayout *layout, void *userData ) TheShell->showShellMap(TRUE); // get ids for our children controls - parentReplayMenuID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ParentReplayMenu") ); - buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonLoadReplay") ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonBack") ); - listboxReplayFilesID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ListboxReplayFiles") ); - buttonDeleteID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonDeleteReplay") ); - buttonCopyID = TheNameKeyGenerator->nameToKey( AsciiString("ReplayMenu.wnd:ButtonCopyReplay") ); + parentReplayMenuID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ParentReplayMenu" ); + buttonLoadID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonLoadReplay" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonBack" ); + listboxReplayFilesID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ListboxReplayFiles" ); + buttonDeleteID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonDeleteReplay" ); + buttonCopyID = TheNameKeyGenerator->nameToKey( "ReplayMenu.wnd:ButtonCopyReplay" ); parentReplayMenu = TheWindowManager->winGetWindowFromId( NULL, parentReplayMenuID ); buttonLoad = TheWindowManager->winGetWindowFromId( parentReplayMenu, buttonLoadID ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index 0387b8fcbbf..ae00310f840 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp @@ -267,19 +267,19 @@ void ScoreScreenInit( WindowLayout *layout, void *userData ) buttonIsFinishCampaign = FALSE; //Store the keys so we have them later - parentID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ParentScoreScreen" ) ); - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonOk" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:TextEntryChat" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonEmote" ) ); - listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ) ); - listboxAcademyWindowScoreScreenID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ListboxWarschoolAdvice" ) ); - staticTextAcademyTitleID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:StaticTextWarSchool" ) ); -// buttonRehostID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonRehost" ) ); - chatBoxBorderID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ChatBoxBorder" ) ); - buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonBuddy" ) ); - buttonContinueID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonContinue" ) ); - buttonSaveReplayID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:ButtonSaveReplay" ) ); - backdropID = TheNameKeyGenerator->nameToKey( AsciiString( "ScoreScreen.wnd:MainBackdrop" ) ); + parentID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ParentScoreScreen" ); + buttonOkID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonOk" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:TextEntryChat" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonEmote" ); + listboxChatWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxChatWindowScoreScreen" ); + listboxAcademyWindowScoreScreenID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ListboxWarschoolAdvice" ); + staticTextAcademyTitleID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:StaticTextWarSchool" ); +// buttonRehostID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonRehost" ); + chatBoxBorderID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ChatBoxBorder" ); + buttonBuddiesID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonBuddy" ); + buttonContinueID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonContinue" ); + buttonSaveReplayID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:ButtonSaveReplay" ); + backdropID = TheNameKeyGenerator->nameToKey( "ScoreScreen.wnd:MainBackdrop" ); parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); buttonOk = TheWindowManager->winGetWindowFromId( parent, buttonOkID ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp index 4c07b8cad86..e30311d80de 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp @@ -74,15 +74,15 @@ void SinglePlayerMenuInit( WindowLayout *layout, void *userData ) GameWindow *parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); TheWindowManager->winSetFocus( parent ); - NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") ); + NameKeyType buttonNewID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" ); GameWindow *buttonNew = TheWindowManager->winGetWindowFromId( NULL, buttonNewID ); TheShell->registerWithAnimateManager(buttonNew, WIN_ANIMATION_SLIDE_LEFT, TRUE,1); - NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") ); + NameKeyType buttonLoadID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" ); GameWindow *buttonLoad = TheWindowManager->winGetWindowFromId( NULL, buttonLoadID ); TheShell->registerWithAnimateManager(buttonLoad, WIN_ANIMATION_SLIDE_LEFT, TRUE,200); - NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") ); + NameKeyType buttonBackID = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" ); GameWindow *buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID ); TheShell->registerWithAnimateManager(buttonBack, WIN_ANIMATION_SLIDE_RIGHT, TRUE,1); @@ -197,9 +197,9 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg { // get ids for our children controls - buttonNew = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonNew") ); - buttonLoad = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonLoad") ); - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SinglePlayerMenu.wnd:ButtonBack") ); + buttonNew = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonNew" ); + buttonLoad = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonLoad" ); + buttonBack = TheNameKeyGenerator->nameToKey( "SinglePlayerMenu.wnd:ButtonBack" ); break; @@ -237,7 +237,7 @@ WindowMsgHandledType SinglePlayerMenuSystem( GameWindow *window, UnsignedInt msg { // open up the map select menu - TheShell->push( AsciiString( "Menus/MapSelectMenu.wnd" ) ); + TheShell->push( "Menus/MapSelectMenu.wnd" ); buttonPushed = true; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp index 7c658c17664..6c114b7bc61 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp @@ -368,7 +368,7 @@ Bool SkirmishPreferences::write(void) setSlotList(); -// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed ); setInt("FPS", maxFPS); @@ -427,7 +427,7 @@ void reallyDoStart( void ) if (TheGameLogic->isInGame()) TheGameLogic->clearGameData(FALSE); - //NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); + //NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int maxFPS = GadgetSliderGetPosition( sliderGameSpeed ); DEBUG_LOG(("GameSpeedSlider was at %d", maxFPS)); @@ -1075,16 +1075,16 @@ static void handleLimitSuperweaponsClick() void InitSkirmishGameGadgets( void ) { //Initialize the gadget IDs - parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ) ); - buttonExitID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ) ); - buttonResetID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonReset" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:MapWindow" ) ); - staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ) ); - checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ) ); - comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ComboBoxStartingCash" ) ); + parentSkirmishGameOptionsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SkirmishGameOptionsMenuParent" ); + buttonExitID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonStart" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryMapDisplay" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonSelectMap" ); + buttonResetID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonReset" ); + windowMapID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:MapWindow" ); + staticTextGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:StaticTextGameSpeed" ); + checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:CheckboxLimitSuperweapons" ); + comboBoxStartingCashID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ComboBoxStartingCash" ); // Initialize the pointers to our gadgets parentSkirmishGameOptions = TheWindowManager->winGetWindowFromId( NULL, parentSkirmishGameOptionsID ); @@ -1107,7 +1107,7 @@ void InitSkirmishGameGadgets( void ) DEBUG_ASSERTCRASH(comboBoxStartingCash, ("Could not find the comboBoxStartingCash")); PopulateStartingCashComboBox(comboBoxStartingCash, TheSkirmishGameInfo ); - textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ) ); + textEntryPlayerNameID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:TextEntryPlayerName" ); textEntryPlayerName = TheWindowManager->winGetWindowFromId( NULL, textEntryPlayerNameID ); DEBUG_ASSERTCRASH(textEntryPlayerName, ("Could not find the textEntryPlayerName" )); @@ -1311,7 +1311,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData ) stillNeedsToSetOptions = FALSE; - sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); + sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); sandboxOk = FALSE; doUpdateSlotList = FALSE; @@ -1397,7 +1397,7 @@ void SkirmishGameOptionsMenuInit( WindowLayout *layout, void *userData ) //initSkirmishGameOptions(); // set up the game speed slider -// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); Int sliderPos = max(15,min(61,prefs.getInt("FPS", TheGlobalData->m_framesPerSecondLimit))); GadgetSliderSetPosition( sliderGameSpeed, sliderPos ); @@ -1647,7 +1647,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); -/// static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ) ); +/// static NameKeyType buttonResetFPSID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:ButtonResetFPS" ); if(buttonPushed) break; if ( controlID == buttonExitID ) @@ -1668,7 +1668,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned } // else if ( controlID == buttonResetFPSID ) // { -// static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( AsciiString( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ) ); +// static NameKeyType sliderGameSpeedID = TheNameKeyGenerator->nameToKey( "SkirmishGameOptionsMenu.wnd:SliderGameSpeed" ); // GameWindow *sliderGameSpeed = TheWindowManager->winGetWindowFromId( parentSkirmishGameOptions, sliderGameSpeedID ); // GadgetSliderSetPosition( sliderGameSpeed, TheGlobalData->m_framesPerSecondLimit ); // } @@ -1676,7 +1676,7 @@ WindowMsgHandledType SkirmishGameOptionsMenuSystem( GameWindow *window, Unsigned { sandboxOk = FALSE; //buttonBack->winEnable( false ); - skirmishMapSelectLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/SkirmishMapSelectMenu.wnd" ) ); + skirmishMapSelectLayout = TheWindowManager->winCreateLayout( "Menus/SkirmishMapSelectMenu.wnd" ); skirmishMapSelectLayout->runInit(); skirmishMapSelectLayout->hide( FALSE ); skirmishMapSelectLayout->bringForward(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp index e6e428ba6e0..8d66cac120c 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp @@ -267,13 +267,13 @@ void SkirmishMapSelectMenuInit( WindowLayout *layout, void *userData ) usesSystemMapDir = mmd->m_isOfficial; } - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:WinMapPreview") ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:WinMapPreview" ); winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID); - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("SkirmishMapSelectMenu.wnd:ListboxMap") ); + buttonBack = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:ListboxMap" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "SkirmishMapSelectMenu.wnd:RadioButtonUserMaps" ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp index 6e7b4539543..166659a9500 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp @@ -166,20 +166,20 @@ void InitBuddyControls(Int type) buddyControls.isInit = FALSE; break; case BUDDY_WINDOW_BUDDIES: - buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) ); + buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" ); buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL, buddyControls.textEntryEditID); - buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) ); - buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) ); + buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" ); + buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ); buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxBuddiesID ); buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxChatID); GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString); buddyControls.isInit = TRUE; break; case BUDDY_WINDOW_DIPLOMACY: - buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:TextEntryChat" ) ); + buddyControls.textEntryEditID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:TextEntryChat" ); buddyControls.textEntryEdit = TheWindowManager->winGetWindowFromId(NULL, buddyControls.textEntryEditID); - buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddies" ) ); - buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "Diplomacy.wnd:ListboxBuddyChat" ) ); + buddyControls.listboxBuddiesID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddies" ); + buddyControls.listboxChatID = TheNameKeyGenerator->nameToKey( "Diplomacy.wnd:ListboxBuddyChat" ); buddyControls.listboxBuddies = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxBuddiesID ); buddyControls.listboxChat = TheWindowManager->winGetWindowFromId( NULL, buddyControls.listboxChatID); GadgetTextEntrySetText(buddyControls.textEntryEdit, UnicodeString::TheEmptyString); @@ -221,11 +221,11 @@ WindowMsgHandledType BuddyControlSystem( GameWindow *window, UnsignedInt msg, GadgetListBoxSetSelected(control, rc->pos); if (itemType == ITEM_BUDDY) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); else if (itemType == ITEM_REQUEST) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd"); else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); rcMenu = rcLayout->getFirstWindow(); rcMenu->winGetLayout()->runInit(); rcMenu->winBringToTop(); @@ -709,20 +709,20 @@ void PopulateOldBuddyMessages(void) //------------------------------------------------------------------------------------------------- void WOLBuddyOverlayInit( WindowLayout *layout, void *userData ) { - parentID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddyMenuParent" ) ); - buttonHideID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonHide" ) ); - buttonAddBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonAdd" ) ); - buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonDelete" ) ); - //textEntryID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:TextEntryChat" ) ); - //listboxBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddies" ) ); - //listboxChatID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ) ); - buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonYes" ) ); - buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ButtonNo" ) ); - radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ) ); - radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ) ); - parentBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:BuddiesParent" ) ); - parentIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:IgnoreParent" ) ); - listboxIgnoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLBuddyOverlay.wnd:ListboxIgnore" ) ); + parentID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddyMenuParent" ); + buttonHideID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonHide" ); + buttonAddBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonAdd" ); + buttonDeleteBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonDelete" ); + //textEntryID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:TextEntryChat" ); + //listboxBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddies" ); + //listboxChatID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxBuddyChat" ); + buttonAcceptBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonYes" ); + buttonDenyBuddyID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ButtonNo" ); + radioButtonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonBuddies" ); + radioButtonIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:RadioButtonIgnore" ); + parentBuddiesID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:BuddiesParent" ); + parentIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:IgnoreParent" ); + listboxIgnoreID = TheNameKeyGenerator->nameToKey( "WOLBuddyOverlay.wnd:ListboxIgnore" ); parent = TheWindowManager->winGetWindowFromId( NULL, parentID ); @@ -910,11 +910,11 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg, GadgetListBoxSetSelected(control, rc->pos); if (isBuddy) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); else if (isRequest) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddyRequestMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddyRequestMenu.wnd"); else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); rcMenu = rcLayout->getFirstWindow(); rcMenu->winGetLayout()->runInit(); rcMenu->winBringToTop(); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp index e35781f2383..359cac5d116 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp @@ -63,9 +63,9 @@ static GameWindow *buttonLobby = NULL; //------------------------------------------------------------------------------------------------- void WOLCustomScoreScreenInit( WindowLayout *layout, void *userData ) { - parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ) ); - buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomScoreScreen.wnd:ButtonLobby" ) ); + parentWOLCustomScoreID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:WOLCustomScoreScreenParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonDisconnect" ); + buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomScoreScreen.wnd:ButtonLobby" ); parentWOLCustomScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLCustomScoreID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); buttonLobby = TheWindowManager->winGetWindowFromId( NULL, buttonLobbyID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp index f8ded6ae935..d0de9eb5426 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp @@ -272,7 +272,7 @@ void WOLPositionStartSpots( void ) win = TheWindowManager->winGetWindowFromId(NULL, windowMapSelectMapID); // get the controls. - NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") ); + NameKeyType listboxMapID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" ); GameWindow *listboxMap = TheWindowManager->winGetWindowFromId( NULL, listboxMapID ); if (listboxMap != NULL) { @@ -1108,20 +1108,20 @@ void InitWOLGameGadgets( void ) DEBUG_ASSERTCRASH(pingImages[2], ("Can't find ping image!")); //Initialize the gadget IDs - parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonBack" ) ); - buttonStartID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonStart" ) ); - textEntryChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ) ); - textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ) ); - listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ) ); - buttonEmoteID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ) ); - buttonSelectMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ) ); - checkBoxUseStatsID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:CheckBoxUseStats" ) ); - windowMapID = TheNameKeyGenerator->nameToKey( AsciiString( "GameSpyGameOptionsMenu.wnd:MapWindow" ) ); - checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:CheckboxLimitSuperweapons")); - comboBoxStartingCashID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:ComboBoxStartingCash")); - checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:CheckBoxLimitArmies")); - windowMapSelectMapID = TheNameKeyGenerator->nameToKey(AsciiString("WOLMapSelectMenu.wnd:WinMapPreview")); + parentWOLGameSetupID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:GameSpyGameOptionsMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonBack" ); + buttonStartID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonStart" ); + textEntryChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryChat" ); + textEntryMapDisplayID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:TextEntryMapDisplay" ); + listboxGameSetupChatID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ListboxChatWindowGameSpyGameSetup" ); + buttonEmoteID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonEmote" ); + buttonSelectMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:ButtonSelectMap" ); + checkBoxUseStatsID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:CheckBoxUseStats" ); + windowMapID = TheNameKeyGenerator->nameToKey( "GameSpyGameOptionsMenu.wnd:MapWindow" ); + checkBoxLimitSuperweaponsID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:CheckboxLimitSuperweapons"); + comboBoxStartingCashID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:ComboBoxStartingCash"); + checkBoxLimitArmiesID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:CheckBoxLimitArmies"); + windowMapSelectMapID = TheNameKeyGenerator->nameToKey("WOLMapSelectMenu.wnd:WinMapPreview"); NameKeyType staticTextTitleID = NAMEKEY("GameSpyGameOptionsMenu.wnd:StaticTextGameName"); @@ -1158,7 +1158,7 @@ void InitWOLGameGadgets( void ) { checkBoxLimitSuperweapons->winEnable( false ); comboBoxStartingCash->winEnable( false ); - NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel")); + NameKeyType labelID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:StartingCashLabel"); TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } @@ -1169,7 +1169,7 @@ void InitWOLGameGadgets( void ) checkBoxLimitSuperweapons->winEnable( FALSE ); comboBoxStartingCash->winEnable( FALSE ); checkBoxLimitArmies->winEnable( FALSE ); - NameKeyType labelID = TheNameKeyGenerator->nameToKey(AsciiString("GameSpyGameOptionsMenu.wnd:StartingCashLabel")); + NameKeyType labelID = TheNameKeyGenerator->nameToKey("GameSpyGameOptionsMenu.wnd:StartingCashLabel"); TheWindowManager->winGetWindowFromId(parentWOLGameSetup, labelID)->winEnable( FALSE ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp index f8e9d3f1953..2e02bd29604 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp @@ -58,9 +58,9 @@ void WOLLadderScreenInit( WindowLayout *layout, void *userData ) TheShell->showShellMap(TRUE); // get ids for our children controls - parentWindowID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:LadderParent") ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:ButtonBack") ); - windowLadderID = TheNameKeyGenerator->nameToKey( AsciiString("WOLLadderScreen.wnd:WindowLadder") ); + parentWindowID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:LadderParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:ButtonBack" ); + windowLadderID = TheNameKeyGenerator->nameToKey( "WOLLadderScreen.wnd:WindowLadder" ); parentWindow = TheWindowManager->winGetWindowFromId( NULL, parentWindowID ); buttonBack = TheWindowManager->winGetWindowFromId( parentWindow, buttonBackID ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp index 597f79d5b22..35dde88d59e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp @@ -622,40 +622,40 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData ) gameListRefreshTime = 0; playerListRefreshTime = 0; - parentWOLLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ) ); + parentWOLLobbyID = TheNameKeyGenerator->nameToKey( "WOLCustomLobby.wnd:WOLLobbyMenuParent" ); parent = TheWindowManager->winGetWindowFromId(NULL, parentWOLLobbyID); - buttonBackID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBack")); + buttonBackID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBack"); buttonBack = TheWindowManager->winGetWindowFromId(parent, buttonBackID); - buttonHostID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonHost")); + buttonHostID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonHost"); buttonHost = TheWindowManager->winGetWindowFromId(parent, buttonHostID); - buttonRefreshID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonRefresh")); + buttonRefreshID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonRefresh"); buttonRefresh = TheWindowManager->winGetWindowFromId(parent, buttonRefreshID); - buttonJoinID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonJoin")); + buttonJoinID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonJoin"); buttonJoin = TheWindowManager->winGetWindowFromId(parent, buttonJoinID); buttonJoin->winEnable(FALSE); - buttonBuddyID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonBuddy")); + buttonBuddyID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonBuddy"); buttonBuddy = TheWindowManager->winGetWindowFromId(parent, buttonBuddyID); - buttonEmoteID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ButtonEmote")); + buttonEmoteID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ButtonEmote"); buttonEmote = TheWindowManager->winGetWindowFromId(parent, buttonEmoteID); - textEntryChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:TextEntryChat")); + textEntryChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:TextEntryChat"); textEntryChat = TheWindowManager->winGetWindowFromId(parent, textEntryChatID); - listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxPlayers")); + listboxLobbyPlayersID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxPlayers"); listboxLobbyPlayers = TheWindowManager->winGetWindowFromId(parent, listboxLobbyPlayersID); listboxLobbyPlayers->winSetTooltipFunc(playerTooltip); - listboxLobbyChatID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ListboxChat")); + listboxLobbyChatID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ListboxChat"); listboxLobbyChat = TheWindowManager->winGetWindowFromId(parent, listboxLobbyChatID); TheGameSpyInfo->registerTextWindow(listboxLobbyChat); - comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ComboBoxGroupRooms")); + comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey("WOLCustomLobby.wnd:ComboBoxGroupRooms"); comboLobbyGroupRooms = TheWindowManager->winGetWindowFromId(parent, comboLobbyGroupRoomsID); GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString); @@ -1744,20 +1744,20 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, Bool isBuddy = FALSE; if (profileID <= 0) - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNoProfileMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNoProfileMenu.wnd"); else { if (profileID == TheGameSpyInfo->getLocalProfileID()) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCLocalPlayerMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCLocalPlayerMenu.wnd"); } else if(TheGameSpyInfo->isBuddy(profileID)) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCBuddiesMenu.wnd"); isBuddy = TRUE; } else - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCNonBuddiesMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCNonBuddiesMenu.wnd"); } if(!rcLayout) break; @@ -1810,7 +1810,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg, const LadderInfo *linfo = TheLadderList->findLadder(theRoom->getLadderIP(), theRoom->getLadderPort()); if (linfo) { - rcLayout = TheWindowManager->winCreateLayout(AsciiString("Menus/RCGameDetailsMenu.wnd")); + rcLayout = TheWindowManager->winCreateLayout("Menus/RCGameDetailsMenu.wnd"); if (!rcLayout) break; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp index 1f5f34898b9..9c8aa8db08f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp @@ -65,9 +65,9 @@ static GameWindow *listboxLocale = NULL; //------------------------------------------------------------------------------------------------- void WOLLocaleSelectInit( WindowLayout *layout, void *userData ) { - parentLocaleSelectID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ParentLocaleSelect" ) ); - buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ButtonOk" ) ); - listboxLocaleID = TheNameKeyGenerator->nameToKey( AsciiString( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ) ); + parentLocaleSelectID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ParentLocaleSelect" ); + buttonOkID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ButtonOk" ); + listboxLocaleID = TheNameKeyGenerator->nameToKey( "PopupLocaleSelect.wnd:ListBoxLocaleSelect" ); parentLocaleSelect = TheWindowManager->winGetWindowFromId( NULL, parentLocaleSelectID ); buttonOk = TheWindowManager->winGetWindowFromId( NULL, buttonOkID); listboxLocale = TheWindowManager->winGetWindowFromId( NULL, listboxLocaleID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp index ab0dc39c6ef..fffd934564d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp @@ -135,7 +135,7 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData ) CustomMatchPreferences pref; Bool usesSystemMapDir = pref.usesSystemMapDir(); - winMapPreviewID = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:WinMapPreview") ); + winMapPreviewID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WinMapPreview" ); winMapPreview = TheWindowManager->winGetWindowFromId(parent, winMapPreviewID); const MapMetaData *mmd = TheMapCache->findMap(TheGameSpyGame->getMap()); @@ -148,9 +148,9 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData ) if( TheGameSpyInfo->getCurrentStagingRoom()->getUseStats() ) usesSystemMapDir = true; - buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonBack") ); - buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonOK") ); - listboxMap = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ListboxMap") ); + buttonBack = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonBack" ); + buttonOK = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ButtonOK" ); + listboxMap = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:ListboxMap" ); radioButtonSystemMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonSystemMaps" ); radioButtonUserMapsID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:RadioButtonUserMaps" ); winMapWindow = TheWindowManager->winGetWindowFromId( parent, listboxMap ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp index 4975dfa1a00..7eb372eb8c0 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp @@ -59,8 +59,8 @@ static GameWindow *buttonCancel = NULL; //------------------------------------------------------------------------------------------------- void WOLMessageWindowInit( WindowLayout *layout, void *userData ) { - parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:WOLMessageWindowParent" ) ); - buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLMessageWindow.wnd:ButtonCancel" ) ); + parentWOLMessageWindowID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:WOLMessageWindowParent" ); + buttonCancelID = TheNameKeyGenerator->nameToKey( "WOLMessageWindow.wnd:ButtonCancel" ); parentWOLMessageWindow = TheWindowManager->winGetWindowFromId( NULL, parentWOLMessageWindowID ); buttonCancel = TheWindowManager->winGetWindowFromId( NULL, buttonCancelID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp index 75113baa66b..94b1113afa1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp @@ -60,9 +60,9 @@ static GameWindow *buttonQuickmatch = NULL; //------------------------------------------------------------------------------------------------- void WOLQMScoreScreenInit( WindowLayout *layout, void *userData ) { - parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonDisconnect" ) ); - buttonQuickmatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ) ); + parentWOLQMScoreID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:WOLQMScoreScreenParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonDisconnect" ); + buttonQuickmatchID = TheNameKeyGenerator->nameToKey( "WOLQMScoreScreen.wnd:ButtonQuickMatch" ); parentWOLQMScore = TheWindowManager->winGetWindowFromId( NULL, parentWOLQMScoreID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); buttonQuickmatch = TheWindowManager->winGetWindowFromId( NULL, buttonQuickmatchID); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp index ff0c5c67793..e186969e79a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp @@ -59,13 +59,13 @@ GameWindow *progressTextWindow = NULL; //------------------------------------------------------------------------------------------------- void WOLStatusMenuInit( WindowLayout *layout, void *userData ) { - parentWOLStatusID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:WOLStatusMenuParent" ) ); - buttonDisconnectID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ButtonDisconnect" ) ); + parentWOLStatusID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:WOLStatusMenuParent" ); + buttonDisconnectID = TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ButtonDisconnect" ); parentWOLStatus = TheWindowManager->winGetWindowFromId( NULL, parentWOLStatusID ); buttonDisconnect = TheWindowManager->winGetWindowFromId( NULL, buttonDisconnectID); progressTextWindow = TheWindowManager->winGetWindowFromId( NULL, - TheNameKeyGenerator->nameToKey( AsciiString( "WOLStatusMenu.wnd:ListboxStatus" ) ) ); + TheNameKeyGenerator->nameToKey( "WOLStatusMenu.wnd:ListboxStatus" ) ); // Show Menu layout->hide( FALSE ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp index 2846e2b1562..4729001bf32 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp @@ -425,13 +425,13 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData ) //TheWOL->reset(); - parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ) ); - buttonBackID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBack" ) ); + parentWOLWelcomeID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:WOLWelcomeMenuParent" ); + buttonBackID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBack" ); parentWOLWelcome = TheWindowManager->winGetWindowFromId( NULL, parentWOLWelcomeID ); buttonBack = TheWindowManager->winGetWindowFromId( NULL, buttonBackID); buttonOptionsID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonOptions" ); buttonbuttonOptions = TheWindowManager->winGetWindowFromId( NULL, buttonOptionsID); - listboxInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:InfoListbox" ) ); + listboxInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:InfoListbox" ); listboxInfo = TheWindowManager->winGetWindowFromId( NULL, listboxInfoID); @@ -490,19 +490,19 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData ) //DEBUG_ASSERTCRASH(listboxInfo, ("No control found!")); - buttonQuickMatchID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ) ); + buttonQuickMatchID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonQuickMatch" ); buttonQuickMatch = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonQuickMatchID ); - buttonLobbyID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ) ); + buttonLobbyID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonCustomMatch" ); buttonLobby = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLobbyID ); - buttonBuddiesID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonBuddies" ) ); + buttonBuddiesID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonBuddies" ); buttonBuddies = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonBuddiesID ); - buttonMyInfoID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonMyInfo" ) ); + buttonMyInfoID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonMyInfo" ); buttonMyInfo = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonMyInfoID ); - buttonLadderID = TheNameKeyGenerator->nameToKey( AsciiString( "WOLWelcomeMenu.wnd:ButtonLadder" ) ); + buttonLadderID = TheNameKeyGenerator->nameToKey( "WOLWelcomeMenu.wnd:ButtonLadder" ); buttonLadder = TheWindowManager->winGetWindowFromId( parentWOLWelcome, buttonLadderID ); if (TheFirewallHelper == NULL) { @@ -880,7 +880,7 @@ WindowMsgHandledType WOLWelcomeMenuSystem( GameWindow *window, UnsignedInt msg, } else if (controlID == buttonLadderID) { - TheShell->push(AsciiString("Menus/WOLLadderScreen.wnd")); + TheShell->push("Menus/WOLLadderScreen.wnd"); } break; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp index 44e0af8d121..998f9daee59 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp @@ -132,10 +132,10 @@ WindowMsgHandledType MessageBoxSystem( GameWindow *window, UnsignedInt msg, { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "MessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "MessageBox.wnd:ButtonCancel" ); WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData(); if( controlID == buttonOkID ) @@ -216,10 +216,10 @@ WindowMsgHandledType QuitMessageBoxSystem( GameWindow *window, UnsignedInt msg, { GameWindow *control = (GameWindow *)mData1; Int controlID = control->winGetWindowId(); - static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonOk" ) ); - static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonYes" ) ); - static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonNo" ) ); - static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( AsciiString( "QuitMessageBox.wnd:ButtonCancel" ) ); + static NameKeyType buttonOkID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonOk" ); + static NameKeyType buttonYesID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonYes" ); + static NameKeyType buttonNoID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonNo" ); + static NameKeyType buttonCancelID = TheNameKeyGenerator->nameToKey( "QuitMessageBox.wnd:ButtonCancel" ); WindowMessageBoxData *MsgBoxCallbacks = (WindowMessageBoxData *)window->winGetUserData(); if( controlID == buttonOkID ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp index 523fc4de965..5596456e067 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp @@ -1386,7 +1386,7 @@ GameWindow *GameWindowManager::winCreate( GameWindow *parent, TheGlobalLanguageData->m_defaultWindowFont.bold) ); } else - window->winSetFont( winFindFont( AsciiString("Times New Roman"), 14, FALSE ) ); + window->winSetFont( winFindFont( "Times New Roman", 14, FALSE ) ); return window; @@ -1618,9 +1618,9 @@ GameWindow *GameWindowManager::gogoMessageBox(Int x, Int y, Int width, Int heigh GameWindow *trueParent = NULL; //Changed by Chris if(useLogo) - trueParent = winCreateFromScript( AsciiString("Menus/QuitMessageBox.wnd") ); + trueParent = winCreateFromScript( "Menus/QuitMessageBox.wnd" ); else - trueParent = winCreateFromScript( AsciiString("Menus/MessageBox.wnd") ); + trueParent = winCreateFromScript( "Menus/MessageBox.wnd" ); //Added By Chris AsciiString menuName; if(useLogo) @@ -2854,7 +2854,7 @@ void GameWindowManager::assignDefaultGadgetLook( GameWindow *gadget, TheGlobalLanguageData->m_defaultWindowFont.bold) ); } else - gadget->winSetFont( TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ) ); + gadget->winSetFont( TheWindowManager->winFindFont( "Times New Roman", 14, FALSE ) ); } // if we don't want to assign default colors/images get out of here @@ -3802,7 +3802,7 @@ Bool GameWindowManager::initTestGUI( void ) TheWindowManager->winMakeColor( 235, 105, 255, 255 ), -1, 0 ); GadgetListBoxAddEntryText( window, UnicodeString(L"Natural"), TheWindowManager->winMakeColor( 105, 205, 45, 255 ), -1, 0 ); - window->winSetFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) ); + window->winSetFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) ); // make a listbox memset( &listData, 0, sizeof( ListboxData ) ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp index 9f67add4db3..684b10dff8b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowTransitions.cpp @@ -394,7 +394,7 @@ void GameWindowTransitionsHandler::load(void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\WindowTransitions" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\WindowTransitions", INI_LOAD_OVERWRITE, NULL ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp index 748f1aa41c2..8ca208be057 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp @@ -566,7 +566,7 @@ void IMEManager::init( void ) m_context = ImmCreateContext(); m_oldContext = ImmGetContext( ApplicationHWnd ); m_disabled = 0; - m_candidateWindow = TheWindowManager->winCreateFromScript( AsciiString("IMECandidateWindow.wnd")); + m_candidateWindow = TheWindowManager->winCreateFromScript( "IMECandidateWindow.wnd"); m_candidateWindow->winSetStatus(WIN_STATUS_ABOVE); if ( m_candidateWindow ) @@ -574,14 +574,14 @@ void IMEManager::init( void ) m_candidateWindow->winHide( TRUE ); // find text area window - NameKeyType id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:TextArea" ) ); + NameKeyType id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:TextArea" ); m_candidateTextArea = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); // find arrows - id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:UpArrow" ) ); + id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:UpArrow" ); m_candidateUpArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); - id = TheNameKeyGenerator->nameToKey( AsciiString( "IMECandidateWindow.wnd:DownArrow" ) ); + id = TheNameKeyGenerator->nameToKey( "IMECandidateWindow.wnd:DownArrow" ); m_candidateDownArrow = TheWindowManager->winGetWindowFromId(m_candidateWindow, id); @@ -593,7 +593,7 @@ void IMEManager::init( void ) } } - m_statusWindow = TheWindowManager->winCreateFromScript( AsciiString("IMEStatusWindow.wnd")); + m_statusWindow = TheWindowManager->winCreateFromScript( "IMEStatusWindow.wnd"); if ( m_statusWindow ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp index 2613bcf6977..c05cace94a2 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp @@ -391,22 +391,22 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) //No music in SinglePlayerLoadScreen // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/SinglePlayerLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/SinglePlayerLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); // Mission *mission = TheCampaignManager->getCurrentMission(); // Store the pointer to the progress bar on the loadscreen - m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ProgressLoad" ) )); + m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ProgressLoad" )); DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen")); GadgetProgressBarSetProgress(m_progressBar, 0 ); - m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:Percent" ) )); + m_percent = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:Percent" )); DEBUG_ASSERTCRASH(m_percent, ("Can't initialize the m_percent for the single player loadscreen")); GadgetStaticTextSetText(m_percent,UnicodeString(L"0%")); m_percent->winHide(TRUE); - m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ObjectivesWin" ) )); + m_objectiveWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ObjectivesWin" )); DEBUG_ASSERTCRASH(m_objectiveWin, ("Can't initialize the m_objectiveWin for the single player loadscreen")); m_objectiveWin->winHide(TRUE); @@ -434,7 +434,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) GadgetStaticTextSetText(m_unitDesc[i],TheGameText->fetch(mission->m_unitNames[i])); m_unitDesc[i]->winHide(TRUE); } - m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" ) )); + m_location = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText3" )); DEBUG_ASSERTCRASH(m_location, ("Can't initialize the m_objectiveWin for the single player loadscreen")); m_location->winHide(TRUE); GadgetStaticTextSetText(m_location, TheGameText->fetch(mission->m_locationNameLabel)); @@ -446,34 +446,34 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) m_currentObjectiveLineCharacter = 0; m_finishedObjectiveText = FALSE; /* - m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo1" ) )); + m_cameoWindow1 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo1" )); DEBUG_ASSERTCRASH(m_cameoWindow1, ("Can't initialize the m_cameoWindow1 for the single player loadscreen")); m_cameoWindow1->winHide(TRUE); m_cameoWindow1->winEnable(FALSE); m_cameoWindow1->winSetEnabledImage(0, mission->m_cameoImage[0]); m_cameoWindow1->winSetDisabledImage(0, mission->m_cameoDisabledImage[0]); - m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo2" ) )); + m_cameoWindow2 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo2" )); DEBUG_ASSERTCRASH(m_cameoWindow2, ("Can't initialize the m_cameoWindow2 for the single player loadscreen")); m_cameoWindow2->winHide(TRUE); m_cameoWindow2->winEnable(FALSE); m_cameoWindow2->winSetEnabledImage(0, mission->m_cameoImage[1]); m_cameoWindow2->winSetDisabledImage(0, mission->m_cameoDisabledImage[1]); - m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowCameo3" ) )); + m_cameoWindow3 = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowCameo3" )); DEBUG_ASSERTCRASH(m_cameoWindow3, ("Can't initialize the m_cameoWindow3 for the single player loadscreen")); m_cameoWindow3->winHide(TRUE); m_cameoWindow3->winEnable(FALSE); m_cameoWindow3->winSetEnabledImage(0, mission->m_cameoImage[2]); m_cameoWindow3->winSetDisabledImage(0, mission->m_cameoDisabledImage[2]); - m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHead" ) )); + m_headMovie = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHead" )); DEBUG_ASSERTCRASH(m_headMovie, ("Can't initialize the m_headMovie for the single player loadscreen")); m_headMovie->winHide(TRUE); - m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" ) )); + m_cameoFrame = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:WindowHiliteCameo" )); DEBUG_ASSERTCRASH(m_cameoFrame, ("Can't initialize the m_cameoFrame for the single player loadscreen")); m_cameoFrame->winHide(TRUE); - m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" ) )); + m_cameoText = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:StaticTextCameoText" )); DEBUG_ASSERTCRASH(m_cameoText, ("Can't initialize the m_cameoText for the single player loadscreen")); */ @@ -508,7 +508,7 @@ void SinglePlayerLoadScreen::init( GameInfo *game ) // format the progress bar: USA to blue, GLA to green, China to red // and set the background image AsciiString campaignName = TheCampaignManager->getCurrentCampaign()->m_name; - GameWindow *backgroundWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ParentSinglePlayerLoadScreen" ) )); + GameWindow *backgroundWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "SinglePlayerLoadScreen.wnd:ParentSinglePlayerLoadScreen" )); if (campaignName.compareNoCase("USA") == 0) { backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_USA") ); @@ -854,7 +854,7 @@ void ChallengeLoadScreen::activatePieces( Int frame, const GeneralPersona *gener // m_overlayVsBackdrop->winSetEnabledImage( 0, TheMappedImageCollection->findImageByFilename(")) m_overlayVsBackdrop->winHide(FALSE); m_overlayVs->winHide(FALSE); - m_wndVideoManager->playMovie( m_overlayVs, AsciiString("VSSmall"), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME); + m_wndVideoManager->playMovie( m_overlayVs, "VSSmall", WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME); // "Verses" TheAudio->addAudioEvent( &eventVS ); @@ -922,7 +922,7 @@ void ChallengeLoadScreen::activatePiecesMinSpec(const GeneralPersona *generalPla m_overlayVsBackdrop->winHide(FALSE); m_overlayVsBackdrop->winHide(FALSE); m_overlayVs->winHide(FALSE); - m_wndVideoManager->playMovie( m_overlayVs, AsciiString("VSSmall"), WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME); + m_wndVideoManager->playMovie( m_overlayVs, "VSSmall", WINDOW_PLAY_MOVIE_SHOW_LAST_FRAME); } @@ -939,13 +939,13 @@ void ChallengeLoadScreen::init( GameInfo *game ) const GeneralPersona* generalOpponent = TheChallengeGenerals->getGeneralByGeneralName( mission->m_generalName ); // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ChallengeLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ChallengeLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); // Store the pointer to the progress bar on the loadscreen - m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ChallengeLoadScreen.wnd:ProgressLoad" ) )); + m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:ProgressLoad" )); DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen")); GadgetProgressBarSetProgress(m_progressBar, 0 ); @@ -971,68 +971,68 @@ void ChallengeLoadScreen::init( GameInfo *game ) } // init overlays - NameKeyType namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitLeft")); + NameKeyType namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitLeft"); m_portraitLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitRight"); m_portraitRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitMovieLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitMovieLeft"); m_portraitMovieLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:PortraitMovieRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:PortraitMovieRight"); m_portraitMovieRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); -// namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:ReticleCrosshairs")); +// namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:ReticleCrosshairs"); // m_overlayReticleCrosshairs = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); /* - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:OuterCircleLine")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:OuterCircleLine"); m_overlayReticleCircleLineOuter = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:InnerCircleLine")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:InnerCircleLine"); m_overlayReticleCircleLineInner = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); */ - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:CircleAlphaOuter")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:CircleAlphaOuter"); m_overlayReticleCircleAlphaOuter = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:CircleAlphaInner")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:CircleAlphaInner"); m_overlayReticleCircleAlphaInner = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:VersusBackdrop")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:VersusBackdrop"); m_overlayVsBackdrop = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:OverlayVs")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:OverlayVs"); m_overlayVs = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameLeft"); m_bioNameLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); -// namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBLeft")); +// namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBLeft"); // m_bioAgeLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceLeft"); m_bioBirthplaceLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyLeft"); m_bioStrategyLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BigNameEntryLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BigNameEntryLeft"); m_bioBigNameEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameEntryLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameEntryLeft"); m_bioNameEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); -// namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBEntryLeft")); +// namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBEntryLeft"); // m_bioAgeEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceEntryLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceEntryLeft"); m_bioBirthplaceEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyEntryLeft")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyEntryLeft"); m_bioStrategyEntryLeft = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameRight"); m_bioNameRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); -// namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBRight")); +// namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBRight"); // m_bioAgeRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceRight"); m_bioBirthplaceRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyRight"); m_bioStrategyRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BigNameEntryRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BigNameEntryRight"); m_bioBigNameEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioNameEntryRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioNameEntryRight"); m_bioNameEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); -// namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioDOBEntryRight")); +// namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioDOBEntryRight"); // m_bioAgeEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioBirthplaceEntryRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioBirthplaceEntryRight"); m_bioBirthplaceEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); - namekey = TheNameKeyGenerator->nameToKey( AsciiString("ChallengeLoadScreen.wnd:BioStrategyEntryRight")); + namekey = TheNameKeyGenerator->nameToKey( "ChallengeLoadScreen.wnd:BioStrategyEntryRight"); m_bioStrategyEntryRight = TheWindowManager->winGetWindowFromId( m_loadScreen, namekey ); @@ -1182,13 +1182,13 @@ void ShellGameLoadScreen::init( GameInfo *game ) // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/ShellGameLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ShellGameLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the ShellGame loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); // Store the pointer to the progress bar on the loadscreen - m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:ProgressLoad" ) )); + m_progressBar = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:ProgressLoad" )); DEBUG_ASSERTCRASH(m_progressBar, ("Can't initialize the progressbar for the single player loadscreen")); GadgetProgressBarSetProgress(m_progressBar, 0 ); m_progressBar->winHide(TRUE); @@ -1198,7 +1198,7 @@ void ShellGameLoadScreen::init( GameInfo *game ) m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen")); TheWritableGlobalData->m_breakTheMovie = FALSE; - GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) )); + GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "ShellGameLoadScreen.wnd:StaticTextLegal" )); if(win) win->winHide(FALSE); firstLoad = FALSE; @@ -1269,7 +1269,7 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void ) void MultiPlayerLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MultiplayerLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MultiplayerLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); @@ -1310,7 +1310,7 @@ void MultiPlayerLoadScreen::init( GameInfo *game ) m_portraitLocalGeneral->winSetEnabledImage( 0, portrait); m_featuresLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MultiplayerLoadScreen.wnd:LocalGeneralFeatures")); AsciiString features = pt->getGeneralFeatures(); - GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? AsciiString( "GUI:PlayerObserver" ) : pt->getGeneralFeatures() ) ); + GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? "GUI:PlayerObserver" : pt->getGeneralFeatures() ) ); m_nameLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "MultiplayerLoadScreen.wnd:LocalGeneralName")); GadgetStaticTextSetText( m_nameLocalGeneral, localName ); @@ -1542,7 +1542,7 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID); void GameSpyLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/GameSpyLoadScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/GameSpyLoadScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the Multiplayer loadscreen")); m_loadScreen->winHide(FALSE); m_loadScreen->winBringToTop(); @@ -1587,7 +1587,7 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum()); m_portraitLocalGeneral->winSetEnabledImage( 0, portrait); m_featuresLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:LocalGeneralFeatures")); AsciiString features = pt->getGeneralFeatures(); - GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? AsciiString( "GUI:PlayerObserver" ) : pt->getGeneralFeatures() ) ); + GadgetStaticTextSetText( m_featuresLocalGeneral, TheGameText->fetch( features.isEmpty() ? "GUI:PlayerObserver" : pt->getGeneralFeatures() ) ); m_nameLocalGeneral = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( "GameSpyLoadScreen.wnd:LocalGeneralName")); GadgetStaticTextSetText( m_nameLocalGeneral, localName ); @@ -1891,7 +1891,7 @@ MapTransferLoadScreen::~MapTransferLoadScreen( void ) void MapTransferLoadScreen::init( GameInfo *game ) { // create the layout of the load screen - m_loadScreen = TheWindowManager->winCreateFromScript( AsciiString( "Menus/MapTransferScreen.wnd" ) ); + m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/MapTransferScreen.wnd" ); DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the map transfer loadscreen")); if (!m_loadScreen) return; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp index b12a9eb363e..20299ecdd81 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp @@ -150,8 +150,8 @@ void Shell::init( void ) { INI ini; // Read from INI all the ShellMenuScheme - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); if( m_schemeManager ) m_schemeManager->init(); @@ -525,7 +525,7 @@ void Shell::showShell( Bool runInit ) Profile::StopRange("init"); #endif //else - push( AsciiString("Menus/MainMenu.wnd") ); + push( "Menus/MainMenu.wnd" ); } m_isShellActive = TRUE; } @@ -849,7 +849,7 @@ WindowLayout *Shell::getSaveLoadMenuLayout( void ) // if layout has not been created, create it now if( m_saveLoadMenuLayout == NULL ) - m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupSaveLoad.wnd" ) ); + m_saveLoadMenuLayout = TheWindowManager->winCreateLayout( "Menus/PopupSaveLoad.wnd" ); // sanity DEBUG_ASSERTCRASH( m_saveLoadMenuLayout, ("Unable to create save/load menu layout") ); @@ -866,7 +866,7 @@ WindowLayout *Shell::getPopupReplayLayout( void ) // if layout has not been created, create it now if( m_popupReplayLayout == NULL ) - m_popupReplayLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/PopupReplay.wnd" ) ); + m_popupReplayLayout = TheWindowManager->winCreateLayout( "Menus/PopupReplay.wnd" ); // sanity DEBUG_ASSERTCRASH( m_popupReplayLayout, ("Unable to create replay save menu layout") ); @@ -883,7 +883,7 @@ WindowLayout *Shell::getOptionsLayout( Bool create ) // if layout has not been created, create it now if ((m_optionsLayout == NULL) && (create == TRUE)) { - m_optionsLayout = TheWindowManager->winCreateLayout( AsciiString( "Menus/OptionsMenu.wnd" ) ); + m_optionsLayout = TheWindowManager->winCreateLayout( "Menus/OptionsMenu.wnd" ); // sanity DEBUG_ASSERTCRASH( m_optionsLayout, ("Unable to create options menu layout") ); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp index 795082bbba3..276f0f5e0da 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp @@ -279,8 +279,8 @@ void ShellMenuSchemeManager::init( void ) { INI ini; // Read from INI all the ControlBarSchemes - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\ShellMenuScheme" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ShellMenuScheme", INI_LOAD_OVERWRITE, NULL ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index c616deed95b..ac7277eda40 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -1213,7 +1213,7 @@ InGameUI::~InGameUI() void InGameUI::init( void ) { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\InGameUI" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\InGameUI", INI_LOAD_OVERWRITE, NULL ); //override INI values with language localized values: if (TheGlobalLanguageData) @@ -4103,7 +4103,7 @@ void InGameUI::expireHint( HintType type, UnsignedInt hintIndex ) void InGameUI::createControlBar( void ) { - TheWindowManager->winCreateFromScript( AsciiString("ControlBar.wnd") ); + TheWindowManager->winCreateFromScript( "ControlBar.wnd" ); HideControlBar(); /* // hide all windows created from this layout @@ -4120,7 +4120,7 @@ void InGameUI::createControlBar( void ) void InGameUI::createReplayControl( void ) { - m_replayWindow = TheWindowManager->winCreateFromScript( AsciiString("ReplayControl.wnd") ); + m_replayWindow = TheWindowManager->winCreateFromScript( "ReplayControl.wnd" ); /* // hide all windows created from this layout @@ -4211,7 +4211,7 @@ void InGameUI::playCameoMovie( const AsciiString& movieName ) stopCameoMovie(); return; } - GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") )); + GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" )); WinInstanceData *winData = window->winGetInstanceData(); winData->setVideoBuffer(m_cameoVideoBuffer); // window->winHide(FALSE); @@ -4222,8 +4222,8 @@ void InGameUI::playCameoMovie( const AsciiString& movieName ) void InGameUI::stopCameoMovie( void ) { //RightHUD - //GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:CameoMovieWindow") )); - GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString("ControlBar.wnd:RightHUD") )); + //GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:CameoMovieWindow" )); + GameWindow *window = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:RightHUD" )); // window->winHide(FALSE); WinInstanceData *winData = window->winGetInstanceData(); winData->setVideoBuffer(NULL); @@ -5274,7 +5274,7 @@ void InGameUI::DEBUG_addFloatingText(const AsciiString& text, const Coord3D * po translate.translate(text); newFTD->m_text = translate; newFTD->m_dString->setText(translate); - newFTD->m_dString->setFont(TheWindowManager->winFindFont( AsciiString("Arial"), POINTSIZE, FALSE )); + newFTD->m_dString->setFont(TheWindowManager->winFindFont( "Arial", POINTSIZE, FALSE )); if(m_floatingTextTimeOut <= 0) newFTD->m_frameTimeOut = TheGameLogic->getFrame() + DEFAULT_FLOATING_TEXT_TIMEOUT; @@ -5439,7 +5439,7 @@ void InGameUI::popupMessage( const AsciiString& identifier, Int x, Int y, Int wi if( pause ) TheGameLogic->setGamePaused(TRUE, pauseMusic); - m_popupMessageData->layout = TheWindowManager->winCreateLayout(AsciiString("InGamePopupMessage.wnd")); + m_popupMessageData->layout = TheWindowManager->winCreateLayout("InGamePopupMessage.wnd"); m_popupMessageData->layout->runInit(); } @@ -5892,7 +5892,7 @@ void InGameUI::resetIdleWorker( void ) void InGameUI::recreateControlBar( void ) { - GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd"))); + GameWindow *win = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd")); deleteInstance(win); m_idleWorkerWin = NULL; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp index 8321ab24691..27fa57927b1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp @@ -567,7 +567,7 @@ the Win32 version of the mouse (by preloading resources before D3D device is cre void Mouse::parseIni(void) { INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\Mouse" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Mouse", INI_LOAD_OVERWRITE, NULL ); } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp index 2d8c9dd65ac..a99f1cdc36f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp @@ -158,7 +158,7 @@ static Bool ParseObjectDataChunk(DataChunkInput &file, DataChunkInfo *info, void static Bool ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } @@ -230,9 +230,9 @@ static Bool loadMap( AsciiString filename ) m_waypoints = NEW WaypointMap; - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); - file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); + file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); if (!file.parse(NULL)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -314,7 +314,7 @@ const char *const MapCache::m_mapCacheName = "MapCache.ini"; AsciiString MapCache::getMapDir() const { - return AsciiString("Maps"); + return "Maps"; } AsciiString MapCache::getUserMapDir() const @@ -326,7 +326,7 @@ AsciiString MapCache::getUserMapDir() const AsciiString MapCache::getMapExtension() const { - return AsciiString("map"); + return "map"; } void MapCache::writeCacheINI( const AsciiString &mapDir ) @@ -1254,7 +1254,7 @@ Image *getMapPreviewImage( AsciiString mapName ) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("MapPreview"), AsciiString::TheEmptyString, parseMapPreviewChunk ); + file.registerParser( "MapPreview", AsciiString::TheEmptyString, parseMapPreviewChunk ); if (!file.parse(NULL)) { DEBUG_ASSERTCRASH(false,("Unable to read MapPreview info.")); deleteInstance(mapPreviewImage); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp index a4b56d395b9..c4056a6c926 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp @@ -3368,7 +3368,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage Bool hide = false; if (TheWindowManager) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) @@ -4210,7 +4210,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage /* if (TheWindowManager && TheNameKeyGenerator) { - GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey(AsciiString("MOTD.wnd:MOTD"))); + GameWindow *motd = TheWindowManager->winGetWindowFromId(NULL, (Int)TheNameKeyGenerator->nameToKey("MOTD.wnd:MOTD")); if (motd) motd->winHide(!motd->winIsHidden()); }*/ @@ -4259,7 +4259,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage Bool hide = false; if (TheWindowManager) { - Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent")); + Int id = (Int)TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"); GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id); if (window) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp index d6b3a3ded89..c04aadbe0e7 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp @@ -244,7 +244,7 @@ void CampaignManager::init( void ) { INI ini; // Read from INI all the CampaignManager - ini.loadFileDirectory( AsciiString( "Data\\INI\\Campaign" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Campaign", INI_LOAD_OVERWRITE, NULL ); } //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp index e3686a05a9e..4d413443d18 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp @@ -2865,7 +2865,7 @@ void ParticleSystemManager::init( void ) { /// Read INI data and build templates INI ini; - ini.loadFileDirectory( AsciiString( "Data\\INI\\ParticleSystem" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\ParticleSystem", INI_LOAD_OVERWRITE, NULL ); // sanity, our lists must be empty!! for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp index 3d05caf6b25..ceae1abd30e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainRoads.cpp @@ -353,7 +353,7 @@ TerrainRoadType *TerrainRoadCollection::newRoad( AsciiString name ) road->friend_setBridge( FALSE ); // set defaults from the default road - TerrainRoadType *defaultRoad = findRoad( AsciiString( "DefaultRoad" ) ); + TerrainRoadType *defaultRoad = findRoad( "DefaultRoad" ); if( defaultRoad ) { @@ -389,7 +389,7 @@ TerrainRoadType *TerrainRoadCollection::newBridge( AsciiString name ) bridge->friend_setBridge( TRUE ); // set defaults from the default bridge - TerrainRoadType *defaultBridge = findBridge( AsciiString( "DefaultBridge" ) ); + TerrainRoadType *defaultBridge = findBridge( "DefaultBridge" ); if( defaultBridge ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp index 99be0c21930..b3ffc1c6caa 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp @@ -296,7 +296,7 @@ Bool SidesList::ParseSidesDataChunk(DataChunkInput &file, DataChunkInfo *info, v } } - file.registerParser( AsciiString("PlayerScriptsList"), info->label, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "PlayerScriptsList", info->label, ScriptList::ParseScriptsDataChunk ); if (!file.parse(NULL)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -524,9 +524,9 @@ void SidesList::prepareForMP_or_Skirmish(void) if (theInputStream.open(path)) { ChunkInputStream *pStrm = &theInputStream; DataChunkInput file( pStrm ); - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); - file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk ); - file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk ); + file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk ); if (!file.parse(this)) { DEBUG_LOG(("ERROR - Unable to read in skirmish scripts.")); return; @@ -826,10 +826,10 @@ Bool SidesList::validateSides() tdict->setAsciiString(TheKey_teamOwner, AsciiString::TheEmptyString); modified = true; } -// if (tdict->getType(NAMEKEY(AsciiString("teamAllies"))) != Dict::DICT_NONE) -// tdict->remove(NAMEKEY(AsciiString("teamAllies"))); -// if (tdict->getType(NAMEKEY(AsciiString("teamEnemies"))) != Dict::DICT_NONE) -// tdict->remove(NAMEKEY(AsciiString("teamEnemies"))); +// if (tdict->getType(NAMEKEY("teamAllies")) != Dict::DICT_NONE) +// tdict->remove(NAMEKEY("teamAllies")); +// if (tdict->getType(NAMEKEY("teamEnemies")) != Dict::DICT_NONE) +// tdict->remove(NAMEKEY("teamEnemies")); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp index 0d4cff7dc14..5f4fba3f77d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp @@ -1272,7 +1272,7 @@ Bool TerrainLogic::loadMap( AsciiString filename, Bool query ) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, parseWaypointDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, parseWaypointDataChunk ); if (!file.parse(this)) { DEBUG_CRASH(("Unable to read waypoint info.")); return false; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index b768794a4bb..d9fd0166901 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -525,7 +525,7 @@ void ScriptList::deleteGroup(ScriptGroup *pGrp) Bool ScriptList::ParseScriptsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { Int i; - file.registerParser( AsciiString("ScriptList"), info->label, ScriptList::ParseScriptListDataChunk ); + file.registerParser( "ScriptList", info->label, ScriptList::ParseScriptListDataChunk ); DEBUG_ASSERTCRASH(s_numInReadList==0, ("Leftover scripts floating aroung.")); for (i=0; ireadLists[pInfo->numLists] = newInstance(ScriptList); Int cur = pInfo->numLists; pInfo->numLists++; - file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromListDataChunk ); - file.registerParser( AsciiString("ScriptGroup"), info->label, ScriptGroup::ParseGroupDataChunk ); + file.registerParser( "Script", info->label, Script::ParseScriptFromListDataChunk ); + file.registerParser( "ScriptGroup", info->label, ScriptGroup::ParseGroupDataChunk ); return file.parse(pInfo->readLists[cur]); } @@ -888,7 +888,7 @@ Bool ScriptGroup::ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, pGroup->m_isGroupSubroutine= file.readByte(); } pList->addGroup(pGroup, AT_END); - file.registerParser( AsciiString("Script"), info->label, Script::ParseScriptFromGroupDataChunk ); + file.registerParser( "Script", info->label, Script::ParseScriptFromGroupDataChunk ); return file.parse(pGroup); } @@ -1253,9 +1253,9 @@ Script *Script::ParseScript(DataChunkInput &file, unsigned short version) if (version>=K_SCRIPT_DATA_VERSION_2) { pScript->m_delayEvaluationSeconds = file.readInt(); } - file.registerParser( AsciiString("OrCondition"), AsciiString("Script"), OrCondition::ParseOrConditionDataChunk ); - file.registerParser( AsciiString("ScriptAction"), AsciiString("Script"), ScriptAction::ParseActionDataChunk ); - file.registerParser( AsciiString("ScriptActionFalse"), AsciiString("Script"), ScriptAction::ParseActionFalseDataChunk ); + file.registerParser( "OrCondition", "Script", OrCondition::ParseOrConditionDataChunk ); + file.registerParser( "ScriptAction", "Script", ScriptAction::ParseActionDataChunk ); + file.registerParser( "ScriptActionFalse", "Script", ScriptAction::ParseActionFalseDataChunk ); if (! file.parse(pScript) ) { return NULL; @@ -1449,7 +1449,7 @@ Bool OrCondition::ParseOrConditionDataChunk(DataChunkInput &file, DataChunkInfo } else { pScript->setOrCondition(pOrCondition); } - file.registerParser( AsciiString("Condition"), info->label, Condition::ParseConditionDataChunk ); + file.registerParser( "Condition", info->label, Condition::ParseConditionDataChunk ); return file.parse(pOrCondition); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp index e04166f564c..baf563ea463 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp @@ -119,7 +119,7 @@ CrateTemplate *CrateSystem::newCrateTemplate( AsciiString name ) CrateTemplate *ct = newInstance(CrateTemplate); // if the default template is present, get it and copy over any data to the new template - const CrateTemplate *defaultCT = findCrateTemplate(AsciiString("DefaultCrate")); + const CrateTemplate *defaultCT = findCrateTemplate("DefaultCrate"); if(defaultCT) { *ct = *defaultCT; diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp index 1275f07557d..a1d704c3bef 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp @@ -1583,7 +1583,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) { ChunkInputStream *pStrm = &theInputStream; DataChunkInput file( pStrm ); - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); if (!file.parse(NULL)) { DEBUG_LOG(("ERROR - Unable to read in multiplayer scripts.")); return; @@ -2270,7 +2270,7 @@ void GameLogic::startNewGame( Bool loadingSaveGame ) if (!TheGlobalData->m_headless) { if(TheShell->getScreenCount() == 0) - TheShell->push( AsciiString("Menus/MainMenu.wnd") ); + TheShell->push( "Menus/MainMenu.wnd" ); else if (TheShell->top()) { TheShell->top()->hide(FALSE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 8b18e615d13..814fd70de7e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -1470,7 +1470,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) // place the sound for putting a building down - static AudioEventRTS placeBuilding(AsciiString("PlaceBuilding")); + static AudioEventRTS placeBuilding("PlaceBuilding"); placeBuilding.setObjectID(constructorObject->getID()); TheAudio->addAudioEvent( &placeBuilding ); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp index 2992a4c9e07..5cf8d3c4f63 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp @@ -624,13 +624,13 @@ void W3DCommandBarBackgroundDraw( GameWindow *window, WinInstanceData *instData ControlBarSchemeManager *man = TheControlBar->getControlBarSchemeManager(); if(!man) return; - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey); static ICoord2D basePos; if(!win) { return; - //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); } TheControlBar->getBackgroundMarkerPos(&basePos.x, &basePos.y); ICoord2D pos, offset; @@ -649,13 +649,13 @@ void W3DCommandBarForegroundDraw( GameWindow *window, WinInstanceData *instData if(!man) return; - static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) ); + static NameKeyType winNamekey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" ); GameWindow *win = TheWindowManager->winGetWindowFromId(NULL,winNamekey); static ICoord2D basePos; if(!win) { return; - //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( AsciiString( "ControlBar.wnd:BackgroundMarker" ) )); + //win = TheWindowManager->winGetWindowFromId(NULL,TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" )); } TheControlBar->getForegroundMarkerPos(&basePos.x, &basePos.y); ICoord2D pos, offset; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp index 15f06725100..a81ccef2ac4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp @@ -916,9 +916,9 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData ) NameKeyType buttonUSAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonUSA" ); NameKeyType buttonGLAID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonGLA" ); NameKeyType buttonChinaID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonChina" ); - NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonSkirmish") ); - NameKeyType onlineID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonOnline") ); - NameKeyType networkID = TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:ButtonNetwork") ); + NameKeyType skirmishID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonSkirmish" ); + NameKeyType onlineID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonOnline" ); + NameKeyType networkID = TheNameKeyGenerator->nameToKey( "MainMenu.wnd:ButtonNetwork" ); GameWindow *button = TheWindowManager->winGetWindowFromId( parent, skirmishID ); if (button) @@ -984,7 +984,7 @@ void W3DMainMenuInit( WindowLayout *layout, void *userData ) if(win) win->winSetDrawFunc(W3DMainMenuButtonDropShadowDraw); - GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( AsciiString("MainMenu.wnd:MapBorder") )); + GameWindow *clipRegionWin = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( "MainMenu.wnd:MapBorder" )); Int x,y,width,height; clipRegionWin->winGetScreenPosition(&x, &y); clipRegionWin->winGetSize(&width, &height); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp index 385ef028139..dbabe8bfe58 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp @@ -82,40 +82,40 @@ static void initBorders( void ) { borderPieces[ BORDER_CORNER_UL ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUL" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerUL" ); borderPieces[ BORDER_CORNER_UR ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerUR" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerUR" ); borderPieces[ BORDER_CORNER_LL ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLL" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerLL" ); borderPieces[ BORDER_CORNER_LR ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderCornerLR" ) ); + TheMappedImageCollection->findImageByName( "BorderCornerLR" ); borderPieces[ BORDER_VERTICAL_LEFT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderLeft" ) ); + TheMappedImageCollection->findImageByName( "BorderLeft" ); borderPieces[ BORDER_VERTICAL_LEFT_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderLeftShort" ) ); + TheMappedImageCollection->findImageByName( "BorderLeftShort" ); borderPieces[ BORDER_HORIZONTAL_TOP ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderTop" ) ); + TheMappedImageCollection->findImageByName( "BorderTop" ); borderPieces[ BORDER_HORIZONTAL_TOP_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderTopShort" ) ); + TheMappedImageCollection->findImageByName( "BorderTopShort" ); borderPieces[ BORDER_VERTICAL_RIGHT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderRight" ) ); + TheMappedImageCollection->findImageByName( "BorderRight" ); borderPieces[ BORDER_VERTICAL_RIGHT_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderRightShort" ) ); + TheMappedImageCollection->findImageByName( "BorderRightShort" ); borderPieces[ BORDER_HORIZONTAL_BOTTOM ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderBottom" ) ); + TheMappedImageCollection->findImageByName( "BorderBottom" ); borderPieces[ BORDER_HORIZONTAL_BOTTOM_SHORT ] = - TheMappedImageCollection->findImageByName( AsciiString( "BorderBottomShort" ) ); + TheMappedImageCollection->findImageByName( "BorderBottomShort" ); bordersInit = TRUE; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp index 9ed1b12fd9a..08ea00f6394 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp @@ -822,7 +822,7 @@ void W3DDisplay::init( void ) TheGlobalLanguageData->m_nativeDebugDisplay.bold); } else - font=TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + font=TheFontLibrary->getFont( "FixedSys", 8, FALSE ); m_nativeDebugDisplay->setFont( font ); m_nativeDebugDisplay->setFontHeight( 13 ); @@ -941,7 +941,7 @@ void W3DDisplay::gatherDebugStats( void ) TheGlobalLanguageData->m_nativeDebugDisplay.bold); } else - font = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + font = TheFontLibrary->getFont( "FixedSys", 8, FALSE ); for (int i = 0; i < DisplayStringCount; i++) { @@ -957,7 +957,7 @@ void W3DDisplay::gatherDebugStats( void ) if (m_benchmarkDisplayString == NULL) { - GameFont *thisFont = TheFontLibrary->getFont( AsciiString("FixedSys"), 8, FALSE ); + GameFont *thisFont = TheFontLibrary->getFont( "FixedSys", 8, FALSE ); m_benchmarkDisplayString = TheDisplayStringManager->newDisplayString(); DEBUG_ASSERTCRASH( m_benchmarkDisplayString, ("Failed to create DisplayString") ); m_benchmarkDisplayString->setFont( thisFont ); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp index dc945b22e79..fe6294679b2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp @@ -131,7 +131,7 @@ DisplayString *W3DDisplayStringManager::newDisplayString( void ) TheGlobalLanguageData->m_defaultDisplayStringFont.bold) ); } else - newString->setFont( TheFontLibrary->getFont( AsciiString("Times New Roman"), 12, FALSE ) ); + newString->setFont( TheFontLibrary->getFont( "Times New Roman", 12, FALSE ) ); // link string to list link( newString ); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp index 7fc6c62f5fd..e221ed511a6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DInGameUI.cpp @@ -344,7 +344,7 @@ void W3DInGameUI::init( void ) // comment because we'll probably want to add this back in. /* // create the MOTD - GameWindow *motd = TheWindowManager->winCreateFromScript( AsciiString("MOTD.wnd") ); + GameWindow *motd = TheWindowManager->winCreateFromScript( "MOTD.wnd" ); if( motd ) { NameKeyType listboxTextID = TheNameKeyGenerator->nameToKey( "MOTD.wnd:ListboxMOTD" ); diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp index c5b6bddffd0..6fe09984913 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp @@ -495,21 +495,21 @@ WorldHeightMap::WorldHeightMap(ChunkInputStream *pStrm, Bool logicalDataOnly): DataChunkInput file( pStrm ); if (logicalDataOnly) { - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); - file.registerParser( AsciiString("WorldInfo"), AsciiString::TheEmptyString, ParseWorldDictDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseSizeOnlyInChunk ); + file.registerParser( "WorldInfo", AsciiString::TheEmptyString, ParseWorldDictDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); freeListOfMapObjects(); // just in case. - file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk ); + file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, PolygonTrigger::ParsePolygonTriggersDataChunk ); PolygonTrigger::deleteTriggers(); // just in case. TheSidesList->emptySides(); - file.registerParser(AsciiString("SidesList"), AsciiString::TheEmptyString, SidesList::ParseSidesDataChunk ); + file.registerParser("SidesList", AsciiString::TheEmptyString, SidesList::ParseSidesDataChunk ); } else { - file.registerParser( AsciiString("HeightMapData"), AsciiString::TheEmptyString, ParseHeightMapDataChunk ); - file.registerParser( AsciiString("BlendTileData"), AsciiString::TheEmptyString, ParseBlendTileDataChunk ); + file.registerParser( "HeightMapData", AsciiString::TheEmptyString, ParseHeightMapDataChunk ); + file.registerParser( "BlendTileData", AsciiString::TheEmptyString, ParseBlendTileDataChunk ); #ifdef EVAL_TILING_MODES - file.registerParser( AsciiString("FUNKY_TILING"), AsciiString::TheEmptyString, ParseFunkyTilingDataChunk ); + file.registerParser( "FUNKY_TILING", AsciiString::TheEmptyString, ParseFunkyTilingDataChunk ); #endif - file.registerParser( AsciiString("GlobalLighting"), AsciiString::TheEmptyString, ParseLightingDataChunk ); + file.registerParser( "GlobalLighting", AsciiString::TheEmptyString, ParseLightingDataChunk ); } if (!file.parse(this)) { @@ -848,7 +848,7 @@ Bool WorldHeightMap::ParseLightingDataChunk(DataChunkInput &file, DataChunkInfo Bool WorldHeightMap::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index dcd163c4612..5e828d1837e 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -1570,563 +1570,563 @@ void LayoutScheme::init( void ) const Image *image; // push button - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonEnabled" ); storeImageAndColor( BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonEnabledSelected" ); storeImageAndColor( BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonDisabled" ); storeImageAndColor( BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonDisabledSelected" ); storeImageAndColor( BUTTON_DISABLED_PUSHED, image, lightGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonHilite" ); storeImageAndColor( BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "PushButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "PushButtonHiliteSelected" ); storeImageAndColor( BUTTON_HILITE_PUSHED, image, yellow, white ); // radio button - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabled" ); storeImageAndColor( RADIO_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxUnselected" ); storeImageAndColor( RADIO_ENABLED_UNCHECKED_BOX, image, darkRed, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonEnabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonEnabledBoxSelected" ); storeImageAndColor( RADIO_ENABLED_CHECKED_BOX, image, blue, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabled" ); storeImageAndColor( RADIO_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxUnselected" ); storeImageAndColor( RADIO_DISABLED_UNCHECKED_BOX, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonDisabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonDisabledBoxSelected" ); storeImageAndColor( RADIO_DISABLED_CHECKED_BOX, image, darkGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHilite" ); storeImageAndColor( RADIO_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHiliteBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxUnselected" ); storeImageAndColor( RADIO_HILITE_UNCHECKED_BOX, image, darkGreen, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "RadioButtonHiliteBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "RadioButtonHiliteBoxSelected" ); storeImageAndColor( RADIO_HILITE_CHECKED_BOX, image, yellow, white ); // check box - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabled" ); storeImageAndColor( CHECK_BOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxUnselected" ); storeImageAndColor( CHECK_BOX_ENABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxEnabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxEnabledBoxSelected" ); storeImageAndColor( CHECK_BOX_ENABLED_CHECKED_BOX, image, blue, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabled" ); storeImageAndColor( CHECK_BOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabledBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxUnselected" ); storeImageAndColor( CHECK_BOX_DISABLED_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxDisabledBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxDisabledBoxSelected" ); storeImageAndColor( CHECK_BOX_DISABLED_CHECKED_BOX, image, darkGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHilite" ); storeImageAndColor( CHECK_BOX_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHiliteBoxUnselected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxUnselected" ); storeImageAndColor( CHECK_BOX_HILITE_UNCHECKED_BOX, image, WIN_COLOR_UNDEFINED, lightBlue ); - image = TheMappedImageCollection->findImageByName( AsciiString( "CheckBoxHiliteBoxSelected" ) ); + image = TheMappedImageCollection->findImageByName( "CheckBoxHiliteBoxSelected" ); storeImageAndColor( CHECK_BOX_HILITE_CHECKED_BOX, image, yellow, white ); // horz slider - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledLeftEnd" ); storeImageAndColor( HSLIDER_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledRightEnd" ); storeImageAndColor( HSLIDER_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledRepeatingCenter" ); storeImageAndColor( HSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderEnabledSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledLeftEnd" ); storeImageAndColor( HSLIDER_DISABLED_LEFT, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledRightEnd" ); storeImageAndColor( HSLIDER_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledRepeatingCenter" ); storeImageAndColor( HSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderDisabledSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteLeftEnd" ); storeImageAndColor( HSLIDER_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteRightEnd" ); storeImageAndColor( HSLIDER_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteRepeatingCenter" ); storeImageAndColor( HSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderHiliteSmallRepeatingCenter" ); storeImageAndColor( HSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabled" ); storeImageAndColor( HSLIDER_THUMB_ENABLED, image, lightRed, red ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbEnabledSelected" ); storeImageAndColor( HSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabled" ); storeImageAndColor( HSLIDER_THUMB_DISABLED, image, darkGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbDisabledSelected" ); storeImageAndColor( HSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbHilite" ); storeImageAndColor( HSLIDER_THUMB_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "HSliderThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "HSliderThumbHiliteSelected" ); storeImageAndColor( HSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue ); // vert slider - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledTopEnd" ); storeImageAndColor( VSLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledBottomEnd" ); storeImageAndColor( VSLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledRepeatingCenter" ); storeImageAndColor( VSLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderEnabledSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledTopEnd" ); storeImageAndColor( VSLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledBottomEnd" ); storeImageAndColor( VSLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledRepeatingCenter" ); storeImageAndColor( VSLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderDisabledSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteTopEnd" ); storeImageAndColor( VSLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteBottomEnd" ); storeImageAndColor( VSLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteRepeatingCenter" ); storeImageAndColor( VSLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderHiliteSmallRepeatingCenter" ); storeImageAndColor( VSLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabled" ); storeImageAndColor( VSLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbEnabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbEnabledSelected" ); storeImageAndColor( VSLIDER_THUMB_ENABLED_PUSHED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabled" ); storeImageAndColor( VSLIDER_THUMB_DISABLED, image, darkGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbDisabledSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbDisabledSelected" ); storeImageAndColor( VSLIDER_THUMB_DISABLED_PUSHED, image, black, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbHilite" ); storeImageAndColor( VSLIDER_THUMB_HILITE, image, green, lightGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderThumbHiliteSelected" ); storeImageAndColor( VSLIDER_THUMB_HILITE_PUSHED, image, blue, lightBlue ); // listbox - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( LISTBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( LISTBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( LISTBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" ); storeImageAndColor( LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" ); storeImageAndColor( LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" ); storeImageAndColor( LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" ); storeImageAndColor( LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" ); storeImageAndColor( LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen ); // Combo Box //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( COMBOBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( COMBOBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( COMBOBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, gray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_DROP_DOWN_BUTTON_HILITE_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_LEFT, image, gray, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_EDIT_BOX_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxEnabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_ENABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxDisabledSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_DISABLED_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHilite" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemLeftEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_LEFT, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRightEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ListBoxHiliteSelectedItemSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_HILITE_SELECTED_ITEM_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeUpButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeUpButtonHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_UP_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDownButtonHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDownButtonHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_DOWN_BUTTON_HILITE_PUSHED, image, white, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_TOP, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeEnabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_TOP, image, gray, darkGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeDisabledSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteTopEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteTopEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_TOP, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteBottomEnd" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteBottomEnd" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_BOTTOM, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeHiliteSmallRepeatingCenter" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbEnabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_ENABLED_PUSHED, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbDisabled" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_DISABLED_PUSHED, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHilite" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHilite" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "VSliderLargeThumbHiliteSelected" ) ); + image = TheMappedImageCollection->findImageByName( "VSliderLargeThumbHiliteSelected" ); storeImageAndColor( COMBOBOX_LISTBOX_SLIDER_THUMB_HILITE_PUSHED, image, white, darkGreen ); // progress bar //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledLeftEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRightEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarEnabledBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarEnabledBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_ENABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledLeftEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_LEFT, image, darkGray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRightEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_LEFT, image, lightGray, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarDisabledBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarDisabledBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_DISABLED_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteLeftEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRightEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarLeftEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_LEFT, image, yellow, white ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRightEnd" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "ProgressBarHiliteBarSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "ProgressBarHiliteBarSmallRepeatingCenter" ); storeImageAndColor( PROGRESS_BAR_HILITE_BAR_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); // static text //--------------------------------------------------------------------------- - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextEnabled" ); storeImageAndColor( STATIC_TEXT_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextDisabled" ); storeImageAndColor( STATIC_TEXT_DISABLED, image, darkGray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "StaticTextHilite" ) ); + image = TheMappedImageCollection->findImageByName( "StaticTextHilite" ); storeImageAndColor( STATIC_TEXT_HILITE, image, darkGreen, lightGreen ); // text entry - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledLeftEnd" ); storeImageAndColor( TEXT_ENTRY_ENABLED_LEFT, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRightEnd" ); storeImageAndColor( TEXT_ENTRY_ENABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_ENABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryEnabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryEnabledSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_ENABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledLeftEnd" ); storeImageAndColor( TEXT_ENTRY_DISABLED_LEFT, image, gray, black ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRightEnd" ); storeImageAndColor( TEXT_ENTRY_DISABLED_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_DISABLED_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryDisabledSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryDisabledSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_DISABLED_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteLeftEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteLeftEnd" ); storeImageAndColor( TEXT_ENTRY_HILITE_LEFT, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRightEnd" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRightEnd" ); storeImageAndColor( TEXT_ENTRY_HILITE_RIGHT, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_HILITE_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TextEntryHiliteSmallRepeatingCenter" ) ); + image = TheMappedImageCollection->findImageByName( "TextEntryHiliteSmallRepeatingCenter" ); storeImageAndColor( TEXT_ENTRY_HILITE_SMALL_CENTER, image, WIN_COLOR_UNDEFINED, WIN_COLOR_UNDEFINED ); // Tab Control - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroEnabled" ); storeImageAndColor( TC_TAB_0_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroDisabled" ); storeImageAndColor( TC_TAB_0_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlZeroHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlZeroHilite" ); storeImageAndColor( TC_TAB_0_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneEnabled" ); storeImageAndColor( TC_TAB_1_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneDisabled" ); storeImageAndColor( TC_TAB_1_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlOneHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlOneHilite" ); storeImageAndColor( TC_TAB_1_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoEnabled" ); storeImageAndColor( TC_TAB_2_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoDisabled" ); storeImageAndColor( TC_TAB_2_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlTwoHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlTwoHilite" ); storeImageAndColor( TC_TAB_2_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeEnabled" ); storeImageAndColor( TC_TAB_3_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeDisabled" ); storeImageAndColor( TC_TAB_3_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlThreeHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlThreeHilite" ); storeImageAndColor( TC_TAB_3_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourEnabled" ); storeImageAndColor( TC_TAB_4_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourDisabled" ); storeImageAndColor( TC_TAB_4_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFourHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFourHilite" ); storeImageAndColor( TC_TAB_4_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveEnabled" ); storeImageAndColor( TC_TAB_5_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveDisabled" ); storeImageAndColor( TC_TAB_5_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlFiveHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlFiveHilite" ); storeImageAndColor( TC_TAB_5_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixEnabled" ); storeImageAndColor( TC_TAB_6_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixDisabled" ); storeImageAndColor( TC_TAB_6_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSixHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSixHilite" ); storeImageAndColor( TC_TAB_6_HILITE, image, green, darkGreen ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenEnabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenEnabled" ); storeImageAndColor( TC_TAB_7_ENABLED, image, red, lightRed ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenDisabled" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenDisabled" ); storeImageAndColor( TC_TAB_7_DISABLED, image, gray, lightGray ); - image = TheMappedImageCollection->findImageByName( AsciiString( "TabControlSevenHilite" ) ); + image = TheMappedImageCollection->findImageByName( "TabControlSevenHilite" ); storeImageAndColor( TC_TAB_7_HILITE, image, green, darkGreen ); storeImageAndColor( TAB_CONTROL_ENABLED, NULL, black, white ); @@ -2147,7 +2147,7 @@ void LayoutScheme::init( void ) m_hiliteText.borderColor = darkBlue; // default font - m_font = TheWindowManager->winFindFont( AsciiString("Times New Roman"), 14, FALSE ); + m_font = TheWindowManager->winFindFont( "Times New Roman", 14, FALSE ); } // LayoutScheme::openDialog =================================================== diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp index 58f3fc97ab8..9a5e47225c9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp @@ -94,8 +94,8 @@ void CameraOptions::OnDropWaypointButton() // // MBL CNC3 INCURSION 10.29.2002 - Fix compile error w/ 10-15-2002 Drop // - // MapObject *pNew = new MapObject(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); - MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); + // MapObject *pNew = new MapObject(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); + MapObject *pNew = newInstance(MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); Int id = pDoc->getNextWaypointID(); AsciiString name = WaypointOptions::GenerateUniqueName(id); @@ -103,7 +103,7 @@ void CameraOptions::OnDropWaypointButton() pNew->setIsWaypoint(); pNew->setWaypointID(id); pNew->setWaypointName(name); - pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team")); + pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team"); AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew); pDoc->AddAndDoUndoable(pUndo); REF_PTR_RELEASE(pUndo); // belongs to pDoc now. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp index 6c989d09fd7..753714f4574 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp @@ -108,7 +108,7 @@ void GroveTool::activate() void GroveTool::plantShrub( Coord3D *pos ) { // TODO: Determine when we can tell something is a shurubbery, and plant it here - jkmcd -// addObj(pos, AsciiString("Shrub")); +// addObj(pos, "Shrub"); } void GroveTool::_plantGroveInBox(CPoint tl, CPoint br, WbView* pView) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp index 318a8c6e532..311897b00f0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp @@ -111,7 +111,7 @@ void ScorchTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld ScorchOptions::update(); } else { pView->snapPoint(&docPt); - MapObject *pNew = newInstance(MapObject)(docPt, AsciiString("Scorch"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance(MapObject)(docPt, "Scorch", 0, 0, NULL, NULL ); pNew->getProperties()->setAsciiString(TheKey_originalOwner, NEUTRAL_TEAM_INTERNAL_STR); pNew->setSelected(true); pNew->setIsScorch(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 001fd9c4395..c45f8ef396f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -1534,12 +1534,12 @@ void ScriptDialog::OnLoad() m_firstTrigger = NULL; m_waypointBase = pDoc->getNextWaypointID(); m_maxWaypoint = m_waypointBase; - file.registerParser( AsciiString("PlayerScriptsList"), AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); - file.registerParser( AsciiString("ObjectsList"), AsciiString::TheEmptyString, ParseObjectsDataChunk ); - file.registerParser( AsciiString("PolygonTriggers"), AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk ); - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk ); - file.registerParser( AsciiString("ScriptTeams"), AsciiString::TheEmptyString, ParseTeamsDataChunk ); - file.registerParser( AsciiString("ScriptsPlayers"), AsciiString::TheEmptyString, ParsePlayersDataChunk ); + file.registerParser( "PlayerScriptsList", AsciiString::TheEmptyString, ScriptList::ParseScriptsDataChunk ); + file.registerParser( "ObjectsList", AsciiString::TheEmptyString, ParseObjectsDataChunk ); + file.registerParser( "PolygonTriggers", AsciiString::TheEmptyString, ParsePolygonTriggersDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk ); + file.registerParser( "ScriptTeams", AsciiString::TheEmptyString, ParseTeamsDataChunk ); + file.registerParser( "ScriptsPlayers", AsciiString::TheEmptyString, ParsePlayersDataChunk ); if (!file.parse(this)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -1646,7 +1646,7 @@ void ScriptDialog::OnLoad() Bool ScriptDialog::ParseObjectsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData) { file.m_currentObject = NULL; - file.registerParser( AsciiString("Object"), info->label, ParseObjectDataChunk ); + file.registerParser( "Object", info->label, ParseObjectDataChunk ); return (file.parse(userData)); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp index cf5c6d77a85..47eef54dcb2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/SelectMacrotexture.cpp @@ -131,7 +131,7 @@ BOOL SelectMacrotexture::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult item.cchTextMax = sizeof(buffer)-2; m_textureTreeView.GetItem(&item); if (0==strcmp(buffer, DEFAULT)) { - TheTerrainRenderObject->updateMacroTexture(AsciiString("")); + TheTerrainRenderObject->updateMacroTexture(""); } else { TheTerrainRenderObject->updateMacroTexture(AsciiString(buffer)); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index d326723eb40..c1b902172c6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -426,7 +426,7 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath) } FilenameList filenameList; - TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.*"), filenameList, TRUE); + TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), "*.*", filenameList, TRUE); if (filenameList.size() == 0) { return; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp index c4fbb40316f..72a2506c656 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp @@ -119,14 +119,14 @@ void WaypointTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWor WaypointOptions::update(); } else { pView->snapPoint(&docPt); - MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); Int id = pDoc->getNextWaypointID(); AsciiString name = WaypointOptions::GenerateUniqueName(id); pNew->setSelected(true); pNew->setIsWaypoint(); pNew->setWaypointID(id); pNew->setWaypointName(name); - pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team")); + pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team"); AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew); pDoc->AddAndDoUndoable(pUndo); REF_PTR_RELEASE(pUndo); // belongs to pDoc now. @@ -166,7 +166,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld pObj = pickWaypoint(docPt); if (pObj == NULL) { pView->snapPoint(&docPt); - MapObject *pNew = newInstance( MapObject)(docPt, AsciiString("*Waypoints/Waypoint"), 0, 0, NULL, NULL ); + MapObject *pNew = newInstance( MapObject)(docPt, "*Waypoints/Waypoint", 0, 0, NULL, NULL ); Int id = pDoc->getNextWaypointID(); AsciiString name; name.format("Waypoint %d", id); @@ -174,7 +174,7 @@ void WaypointTool::mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld pNew->setIsWaypoint(); pNew->setWaypointID(id); pNew->setWaypointName(name); - pNew->getProperties()->setAsciiString(TheKey_originalOwner, AsciiString("team")); + pNew->getProperties()->setAsciiString(TheKey_originalOwner, "team"); AddObjectUndoable *pUndo = new AddObjectUndoable(pDoc, pNew); pDoc->AddAndDoUndoable(pUndo); REF_PTR_RELEASE(pUndo); // belongs to pDoc now. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index d4459af5500..8b01c80c837 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -349,7 +349,7 @@ BOOL CWorldBuilderApp::InitInstance() TheFramePacer = new FramePacer(); #if defined(RTS_DEBUG) - ini.loadFileDirectory( AsciiString( "Data\\INI\\GameDataDebug" ), INI_LOAD_MULTIFILE, NULL ); + ini.loadFileDirectory( "Data\\INI\\GameDataDebug", INI_LOAD_MULTIFILE, NULL ); #endif #ifdef DEBUG_CRASHING @@ -375,8 +375,8 @@ BOOL CWorldBuilderApp::InitInstance() CreateDirectory(buf, NULL); // read the water settings from INI (must do prior to initing GameClient, apparently) - ini.loadFileDirectory( AsciiString( "Data\\INI\\Default\\Water" ), INI_LOAD_OVERWRITE, NULL ); - ini.loadFileDirectory( AsciiString( "Data\\INI\\Water" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Default\\Water", INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\INI\\Water", INI_LOAD_OVERWRITE, NULL ); initSubsystem(TheGameText, CreateGameTextInterface()); initSubsystem(TheScienceStore, new ScienceStore(), "Data\\INI\\Default\\Science", "Data\\INI\\Science"); @@ -391,7 +391,7 @@ BOOL CWorldBuilderApp::InitInstance() TheScriptEngine->turnBreezeOff(); // stop the tree sway. // [2/11/2003] - ini.loadFileDirectory( AsciiString( "Data\\Scripts\\Scripts" ), INI_LOAD_OVERWRITE, NULL ); + ini.loadFileDirectory( "Data\\Scripts\\Scripts", INI_LOAD_OVERWRITE, NULL ); // need this before TheAudio in case we're running off of CD - TheAudio can try to open Music.big on the CD... initSubsystem(TheCDManager, CreateCDManager(), NULL); @@ -703,7 +703,7 @@ void CWorldBuilderApp::OnFileOpen() #endif CFileStatus status; - if (m_currentDirectory != AsciiString("")) try { + if (m_currentDirectory != "") try { if (CFile::GetStatus(m_currentDirectory.str(), status)) { if (status.m_attribute & CFile::directory) { ::SetCurrentDirectory(m_currentDirectory.str()); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index 4db400158f4..a2c5d7836c0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -334,7 +334,7 @@ void CWorldBuilderDoc::Serialize(CArchive& ar) DataChunkInput file( pStrm ); if (file.isValidFileType()) { // Backwards compatible files aren't valid data chunk files. // Read the waypoints. - file.registerParser( AsciiString("WaypointsList"), AsciiString::TheEmptyString, ParseWaypointDataChunk ); + file.registerParser( "WaypointsList", AsciiString::TheEmptyString, ParseWaypointDataChunk ); if (!file.parse(this)) { throw(ERROR_CORRUPT_FILE_FORMAT); } @@ -1291,7 +1291,7 @@ BOOL CWorldBuilderDoc::OnNewDocument() PolygonTrigger *pTrig = newInstance(PolygonTrigger)(4); ICoord3D loc; pTrig->setWaterArea(true); - pTrig->setTriggerName(AsciiString("Default Water")); + pTrig->setTriggerName("Default Water"); loc.x = -hi.borderWidth*MAP_XY_FACTOR; loc.y = -hi.borderWidth*MAP_XY_FACTOR; loc.z = TheGlobalData->m_waterPositionZ; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp index d9125debeba..a7e33d0ab9d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp @@ -305,8 +305,8 @@ void PlayerListDlg::OnNewplayer() newPlayerDict.setBool(TheKey_playerIsHuman, true); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, pnameu); newPlayerDict.setAsciiString(TheKey_playerFaction, addedPTName); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); #ifdef NOT_IN_USE // auto-open the advanced prop editor @@ -856,8 +856,8 @@ static void addSide(SidesList *sides, AsciiString faction, newPlayerDict.setBool(TheKey_playerIsHuman, false); newPlayerDict.setUnicodeString(TheKey_playerDisplayName, playerUStr); newPlayerDict.setAsciiString(TheKey_playerFaction, faction); - newPlayerDict.setAsciiString(TheKey_playerEnemies, AsciiString("")); - newPlayerDict.setAsciiString(TheKey_playerAllies, AsciiString("")); + newPlayerDict.setAsciiString(TheKey_playerEnemies, ""); + newPlayerDict.setAsciiString(TheKey_playerAllies, ""); ensureValidPlayerName(&newPlayerDict); sides->addSide(&newPlayerDict); diff --git a/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py b/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py new file mode 100644 index 00000000000..b65ab95d2e5 --- /dev/null +++ b/scripts/cpp/refactor_asciistring_unicodestring_instantiation.py @@ -0,0 +1,50 @@ +# Created with python 3.11.4 + +# This script applies basic formatting and cleanups to the various CPP files. +# Just run it. + +import glob +import os +import re + + +def fix_string(line: str, typename: str) -> str: + # Build a regex that allows arbitrary whitespace + pattern = rf"""{typename}\s*\(\s*"([^"]*)"\s*\)""" + # Replace typename( "value" ) -> "value" + return re.sub(pattern, r'"\1"', line) + + +def main(): + current_dir = os.path.dirname(os.path.abspath(__file__)) + root_dir = os.path.join(current_dir, "..", "..") + root_dir = os.path.normpath(root_dir) + core_dir = os.path.join(root_dir, "Core") + generals_dir = os.path.join(root_dir, "Generals") + generalsmd_dir = os.path.join(root_dir, "GeneralsMD") + utility_dir = os.path.join(root_dir, "Dependencies", "Utility") + fileNames = [] + for ext in ["*.cpp", "*.h", "*.inl"]: + fileNames.extend(glob.glob(os.path.join(core_dir, '**', ext), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generals_dir, '**', ext), recursive=True)) + fileNames.extend(glob.glob(os.path.join(generalsmd_dir, '**', ext), recursive=True)) + fileNames.extend(glob.glob(os.path.join(utility_dir, '**', ext), recursive=True)) + + for fileName in fileNames: + with open(fileName, 'r', encoding="cp1252") as file: + try: + lines = file.readlines() + except UnicodeDecodeError: + continue # Not good. + + with open(fileName, 'w', encoding="cp1252") as file: + for line in lines: + line = fix_string(line, 'AsciiString') + #line = fix_string(line, 'UnicodeString') + file.write(line) + + return + + +if __name__ == "__main__": + main()