From 2912e9ae2e7c2beb31442d6f1f74707d3c840841 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 7 Apr 2026 23:20:09 -0500 Subject: [PATCH] refactor: nuke all widestrings and widechars everywhere --- targets/app/common/AppGameServices.cpp | 38 +- targets/app/common/AppGameServices.h | 36 +- targets/app/common/App_structs.h | 8 +- targets/app/common/ArchiveManager.cpp | 18 +- targets/app/common/ArchiveManager.h | 8 +- .../app/common/Audio/Consoles_SoundEngine.h | 14 +- targets/app/common/Audio/SoundEngine.cpp | 47 +- targets/app/common/Audio/SoundEngine.h | 14 +- targets/app/common/Audio/SoundNames.cpp | 396 +++--- targets/app/common/BannedListManager.cpp | 2 +- targets/app/common/BuildVer/BuildVer.h | 14 +- targets/app/common/Colours/ColourTable.cpp | 594 ++++----- targets/app/common/Colours/ColourTable.h | 8 +- targets/app/common/DLC/DLCAudioFile.cpp | 18 +- targets/app/common/DLC/DLCAudioFile.h | 10 +- targets/app/common/DLC/DLCCapeFile.cpp | 2 +- targets/app/common/DLC/DLCCapeFile.h | 2 +- targets/app/common/DLC/DLCColourTableFile.cpp | 2 +- targets/app/common/DLC/DLCColourTableFile.h | 2 +- targets/app/common/DLC/DLCFile.cpp | 10 +- targets/app/common/DLC/DLCFile.h | 12 +- targets/app/common/DLC/DLCGameRules.h | 2 +- targets/app/common/DLC/DLCGameRulesFile.cpp | 2 +- targets/app/common/DLC/DLCGameRulesFile.h | 2 +- targets/app/common/DLC/DLCGameRulesHeader.cpp | 4 +- targets/app/common/DLC/DLCGameRulesHeader.h | 18 +- .../app/common/DLC/DLCLocalisationFile.cpp | 2 +- targets/app/common/DLC/DLCLocalisationFile.h | 2 +- targets/app/common/DLC/DLCManager.cpp | 56 +- targets/app/common/DLC/DLCManager.h | 14 +- targets/app/common/DLC/DLCPack.cpp | 36 +- targets/app/common/DLC/DLCPack.h | 30 +- targets/app/common/DLC/DLCSkinFile.cpp | 44 +- targets/app/common/DLC/DLCSkinFile.h | 12 +- targets/app/common/DLC/DLCTextureFile.cpp | 10 +- targets/app/common/DLC/DLCTextureFile.h | 8 +- targets/app/common/DLC/DLCUIDataFile.cpp | 2 +- targets/app/common/DLC/DLCUIDataFile.h | 2 +- targets/app/common/DLCController.cpp | 68 +- targets/app/common/DLCController.h | 16 +- targets/app/common/Game.cpp | 58 +- targets/app/common/Game.h | 94 +- targets/app/common/GameMenuService.cpp | 4 +- targets/app/common/GameMenuService.h | 4 +- .../app/common/GameRules/GameRuleManager.cpp | 172 +-- .../app/common/GameRules/GameRuleManager.h | 12 +- .../ApplySchematicRuleDefinition.cpp | 22 +- .../ApplySchematicRuleDefinition.h | 8 +- .../LevelGeneration/BiomeOverride.cpp | 10 +- .../GameRules/LevelGeneration/BiomeOverride.h | 4 +- .../ConsoleGenerateStructure.cpp | 18 +- .../ConsoleGenerateStructure.h | 4 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 34 +- .../LevelGeneration/ConsoleSchematicFile.h | 4 +- .../LevelGenerationOptions.cpp | 136 +- .../LevelGeneration/LevelGenerationOptions.h | 86 +- .../LevelGeneration/LevelGenerators.cpp | 2 +- .../LevelGeneration/LevelGenerators.h | 2 +- .../LevelGeneration/StartFeature.cpp | 12 +- .../GameRules/LevelGeneration/StartFeature.h | 4 +- .../XboxStructureActionGenerateBox.cpp | 22 +- .../XboxStructureActionGenerateBox.h | 4 +- .../XboxStructureActionPlaceBlock.cpp | 12 +- .../XboxStructureActionPlaceBlock.h | 4 +- .../XboxStructureActionPlaceContainer.cpp | 10 +- .../XboxStructureActionPlaceContainer.h | 4 +- .../XboxStructureActionPlaceSpawner.cpp | 16 +- .../XboxStructureActionPlaceSpawner.h | 6 +- .../GameRules/LevelRules/LevelRules.cpp | 4 +- .../common/GameRules/LevelRules/LevelRules.h | 4 +- .../AddEnchantmentRuleDefinition.cpp | 6 +- .../AddEnchantmentRuleDefinition.h | 4 +- .../RuleDefinitions/AddItemRuleDefinition.cpp | 14 +- .../RuleDefinitions/AddItemRuleDefinition.h | 4 +- .../CollectItemRuleDefinition.cpp | 32 +- .../CollectItemRuleDefinition.h | 8 +- .../CompleteAllRuleDefinition.cpp | 10 +- .../CompleteAllRuleDefinition.h | 4 +- .../CompoundGameRuleDefinition.cpp | 8 +- .../RuleDefinitions/GameRuleDefinition.cpp | 38 +- .../RuleDefinitions/GameRuleDefinition.h | 12 +- .../RuleDefinitions/LevelRuleset.cpp | 6 +- .../LevelRules/RuleDefinitions/LevelRuleset.h | 4 +- .../NamedAreaRuleDefinition.cpp | 22 +- .../RuleDefinitions/NamedAreaRuleDefinition.h | 8 +- .../UpdatePlayerRuleDefinition.cpp | 20 +- .../UpdatePlayerRuleDefinition.h | 4 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 14 +- .../RuleDefinitions/UseTileRuleDefinition.h | 4 +- .../GameRules/LevelRules/Rules/GameRule.cpp | 14 +- .../GameRules/LevelRules/Rules/GameRule.h | 6 +- .../app/common/GameRules/WstringLookup.cpp | 14 +- targets/app/common/GameRules/WstringLookup.h | 10 +- targets/app/common/Game_XuiActions.cpp | 14 +- targets/app/common/IPlatformGame.h | 6 +- .../Leaderboards/LeaderboardManager.cpp | 6 +- .../common/Leaderboards/LeaderboardManager.h | 2 +- .../app/common/Localisation/StringTable.cpp | 34 +- targets/app/common/Localisation/StringTable.h | 12 +- targets/app/common/LocalizationManager.cpp | 636 ++++----- targets/app/common/LocalizationManager.h | 22 +- targets/app/common/MenuController.cpp | 4 +- targets/app/common/MenuController.h | 4 +- .../app/common/Network/GameNetworkManager.cpp | 24 +- .../app/common/Network/GameNetworkManager.h | 6 +- .../common/Network/NetworkPlayerInterface.h | 4 +- .../app/common/Network/NetworkPlayerQNet.cpp | 4 +- .../app/common/Network/NetworkPlayerQNet.h | 4 +- .../Network/PlatformNetworkManagerInterface.h | 4 +- .../Network/PlatformNetworkManagerStub.cpp | 16 +- .../Network/PlatformNetworkManagerStub.h | 4 +- targets/app/common/Network/QNetStubs.cpp | 4 +- targets/app/common/Network/SessionInfo.h | 2 +- targets/app/common/Network/Socket.cpp | 4 +- targets/app/common/NetworkController.cpp | 4 +- targets/app/common/SkinManager.cpp | 54 +- targets/app/common/SkinManager.h | 24 +- targets/app/common/Tutorial/FullTutorial.cpp | 40 +- .../app/common/Tutorial/Tasks/CraftTask.cpp | 2 +- targets/app/common/Tutorial/Tutorial.cpp | 20 +- targets/app/common/Tutorial/Tutorial.h | 14 +- .../app/common/Tutorial/TutorialMessage.cpp | 4 +- targets/app/common/Tutorial/TutorialMessage.h | 2 +- .../common/UI/All Platforms/ArchiveFile.cpp | 18 +- .../app/common/UI/All Platforms/ArchiveFile.h | 12 +- .../common/UI/All Platforms/IUIController.h | 2 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 14 +- .../UI/All Platforms/IUIScene_AnvilMenu.h | 6 +- .../All Platforms/IUIScene_CommandBlockMenu.h | 4 +- .../All Platforms/IUIScene_CraftingMenu.cpp | 52 +- .../UI/All Platforms/IUIScene_CraftingMenu.h | 14 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 28 +- .../UI/All Platforms/IUIScene_CreativeMenu.h | 4 +- .../common/UI/All Platforms/IUIScene_HUD.cpp | 2 +- .../common/UI/All Platforms/IUIScene_HUD.h | 8 +- .../UI/All Platforms/IUIScene_PauseMenu.cpp | 4 +- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 14 +- .../UI/All Platforms/IUIScene_TradingMenu.h | 6 +- .../app/common/UI/All Platforms/UIStructs.h | 18 +- .../common/UI/Components/UIComponent_Chat.cpp | 14 +- .../common/UI/Components/UIComponent_Chat.h | 2 +- .../Components/UIComponent_DebugUIConsole.cpp | 4 +- .../Components/UIComponent_DebugUIConsole.h | 2 +- .../UIComponent_DebugUIMarketingGuide.cpp | 4 +- .../UIComponent_DebugUIMarketingGuide.h | 4 +- .../common/UI/Components/UIComponent_Logo.cpp | 6 +- .../common/UI/Components/UIComponent_Logo.h | 2 +- .../Components/UIComponent_MenuBackground.cpp | 4 +- .../Components/UIComponent_MenuBackground.h | 2 +- .../UI/Components/UIComponent_Panorama.cpp | 6 +- .../UI/Components/UIComponent_Panorama.h | 4 +- .../UIComponent_PressStartToPlay.cpp | 14 +- .../Components/UIComponent_PressStartToPlay.h | 12 +- .../UI/Components/UIComponent_Tooltips.cpp | 24 +- .../UI/Components/UIComponent_Tooltips.h | 10 +- .../Components/UIComponent_TutorialPopup.cpp | 132 +- .../UI/Components/UIComponent_TutorialPopup.h | 18 +- .../app/common/UI/Components/UIScene_HUD.cpp | 65 +- .../app/common/UI/Components/UIScene_HUD.h | 64 +- targets/app/common/UI/Controls/UIControl.cpp | 18 +- targets/app/common/UI/Controls/UIControl.h | 2 +- .../app/common/UI/Controls/UIControl_Base.cpp | 58 +- .../app/common/UI/Controls/UIControl_Base.h | 11 +- .../Controls/UIControl_BeaconEffectButton.cpp | 4 +- .../UI/Controls/UIControl_BitmapIcon.cpp | 16 +- .../common/UI/Controls/UIControl_BitmapIcon.h | 2 +- .../common/UI/Controls/UIControl_Button.cpp | 14 +- .../app/common/UI/Controls/UIControl_Button.h | 2 +- .../UI/Controls/UIControl_ButtonList.cpp | 55 +- .../common/UI/Controls/UIControl_ButtonList.h | 6 +- .../common/UI/Controls/UIControl_CheckBox.cpp | 18 +- .../common/UI/Controls/UIControl_DLCList.cpp | 29 +- .../common/UI/Controls/UIControl_DLCList.h | 2 +- .../UI/Controls/UIControl_DynamicLabel.cpp | 22 +- .../UI/Controls/UIControl_DynamicLabel.h | 2 +- .../UI/Controls/UIControl_EnchantmentBook.cpp | 2 +- .../Controls/UIControl_EnchantmentButton.cpp | 38 +- .../UI/Controls/UIControl_EnchantmentButton.h | 6 +- .../UI/Controls/UIControl_HTMLLabel.cpp | 34 +- .../common/UI/Controls/UIControl_HTMLLabel.h | 2 +- .../common/UI/Controls/UIControl_Label.cpp | 12 +- .../UI/Controls/UIControl_LeaderboardList.cpp | 144 +- .../UI/Controls/UIControl_LeaderboardList.h | 12 +- .../UI/Controls/UIControl_PlayerList.cpp | 18 +- .../common/UI/Controls/UIControl_PlayerList.h | 2 +- .../Controls/UIControl_PlayerSkinPreview.cpp | 12 +- .../UI/Controls/UIControl_PlayerSkinPreview.h | 14 +- .../common/UI/Controls/UIControl_Progress.cpp | 16 +- .../common/UI/Controls/UIControl_SaveList.cpp | 80 +- .../common/UI/Controls/UIControl_SaveList.h | 16 +- .../common/UI/Controls/UIControl_Slider.cpp | 18 +- .../app/common/UI/Controls/UIControl_Slider.h | 4 +- .../common/UI/Controls/UIControl_SlotList.cpp | 6 +- .../Controls/UIControl_SpaceIndicatorBar.cpp | 18 +- .../UI/Controls/UIControl_TextInput.cpp | 18 +- .../UI/Controls/UIControl_TexturePackList.cpp | 42 +- .../UI/Controls/UIControl_TexturePackList.h | 4 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 46 +- .../Debug/UIScene_DebugCreateSchematic.h | 2 +- .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 54 +- .../UI/Scenes/Debug/UIScene_DebugOptions.h | 4 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 76 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.h | 2 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 34 +- .../UI/Scenes/Debug/UIScene_DebugSetCamera.h | 2 +- .../IUIScene_StartGame.cpp | 20 +- .../UIScene_CreateWorldMenu.cpp | 41 +- .../UIScene_CreateWorldMenu.h | 6 +- .../UIScene_DLCMainMenu.cpp | 4 +- .../UIScene_DLCMainMenu.h | 2 +- .../UIScene_DLCOffersMenu.cpp | 8 +- .../UIScene_DLCOffersMenu.h | 2 +- .../Frontend Menu screens/UIScene_EULA.cpp | 14 +- .../Frontend Menu screens/UIScene_EULA.h | 2 +- .../Frontend Menu screens/UIScene_Intro.cpp | 2 +- .../Frontend Menu screens/UIScene_Intro.h | 4 +- .../UIScene_JoinMenu.cpp | 32 +- .../Frontend Menu screens/UIScene_JoinMenu.h | 2 +- .../UIScene_LaunchMoreOptionsMenu.cpp | 21 +- .../UIScene_LaunchMoreOptionsMenu.h | 6 +- .../UIScene_LeaderboardsMenu.cpp | 72 +- .../UIScene_LeaderboardsMenu.h | 8 +- .../UIScene_LoadMenu.cpp | 32 +- .../Frontend Menu screens/UIScene_LoadMenu.h | 4 +- .../UIScene_LoadOrJoinMenu.cpp | 82 +- .../UIScene_LoadOrJoinMenu.h | 4 +- .../UIScene_MainMenu.cpp | 26 +- .../Frontend Menu screens/UIScene_MainMenu.h | 6 +- .../UIScene_NewUpdateMessage.cpp | 16 +- .../UIScene_NewUpdateMessage.h | 2 +- .../UIScene_SaveMessage.cpp | 2 +- .../UIScene_SaveMessage.h | 4 +- .../UIScene_TrialExitUpsell.cpp | 4 +- .../UIScene_TrialExitUpsell.h | 2 +- .../Help & Options/UIScene_ControlsMenu.cpp | 32 +- .../Help & Options/UIScene_ControlsMenu.h | 6 +- .../Scenes/Help & Options/UIScene_Credits.cpp | 216 ++- .../Scenes/Help & Options/UIScene_Credits.h | 8 +- .../UIScene_HelpAndOptionsMenu.cpp | 6 +- .../UIScene_HelpAndOptionsMenu.h | 2 +- .../Help & Options/UIScene_HowToPlay.cpp | 61 +- .../Scenes/Help & Options/UIScene_HowToPlay.h | 4 +- .../Help & Options/UIScene_HowToPlayMenu.cpp | 6 +- .../Help & Options/UIScene_HowToPlayMenu.h | 2 +- .../UIScene_LanguageSelector.cpp | 6 +- .../Help & Options/UIScene_LanguageSelector.h | 2 +- .../Help & Options/UIScene_ReinstallMenu.cpp | 6 +- .../Help & Options/UIScene_ReinstallMenu.h | 2 +- .../UIScene_SettingsAudioMenu.cpp | 18 +- .../UIScene_SettingsAudioMenu.h | 2 +- .../UIScene_SettingsControlMenu.cpp | 18 +- .../UIScene_SettingsControlMenu.h | 2 +- .../UIScene_SettingsGraphicsMenu.cpp | 18 +- .../UIScene_SettingsGraphicsMenu.h | 2 +- .../Help & Options/UIScene_SettingsMenu.cpp | 6 +- .../Help & Options/UIScene_SettingsMenu.h | 2 +- .../UIScene_SettingsOptionsMenu.cpp | 48 +- .../UIScene_SettingsOptionsMenu.h | 2 +- .../Help & Options/UIScene_SettingsUIMenu.cpp | 18 +- .../Help & Options/UIScene_SettingsUIMenu.h | 2 +- .../Help & Options/UIScene_SkinSelectMenu.cpp | 136 +- .../Help & Options/UIScene_SkinSelectMenu.h | 24 +- .../Containers/UIScene_AnvilMenu.cpp | 32 +- .../Containers/UIScene_AnvilMenu.h | 10 +- .../Containers/UIScene_BeaconMenu.cpp | 6 +- .../Containers/UIScene_BeaconMenu.h | 2 +- .../Containers/UIScene_BrewingStandMenu.cpp | 10 +- .../Containers/UIScene_BrewingStandMenu.h | 2 +- .../Containers/UIScene_ContainerMenu.cpp | 10 +- .../Containers/UIScene_ContainerMenu.h | 2 +- .../Containers/UIScene_CreativeMenu.cpp | 10 +- .../Containers/UIScene_CreativeMenu.h | 6 +- .../Containers/UIScene_DispenserMenu.cpp | 6 +- .../Containers/UIScene_DispenserMenu.h | 2 +- .../Containers/UIScene_EnchantingMenu.cpp | 6 +- .../Containers/UIScene_EnchantingMenu.h | 2 +- .../Containers/UIScene_FireworksMenu.cpp | 6 +- .../Containers/UIScene_FireworksMenu.h | 4 +- .../Containers/UIScene_FurnaceMenu.cpp | 10 +- .../Containers/UIScene_FurnaceMenu.h | 2 +- .../Containers/UIScene_HopperMenu.cpp | 6 +- .../Containers/UIScene_HopperMenu.h | 2 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 6 +- .../Containers/UIScene_HorseInventoryMenu.h | 6 +- .../Containers/UIScene_InventoryMenu.cpp | 28 +- .../Containers/UIScene_InventoryMenu.h | 6 +- .../Containers/UIScene_TradingMenu.cpp | 31 +- .../Containers/UIScene_TradingMenu.h | 18 +- .../UIScene_CraftingMenu.cpp | 28 +- .../UIScene_CraftingMenu.h | 20 +- .../UIScene_DeathMenu.cpp | 6 +- .../In-Game Menu Screens/UIScene_DeathMenu.h | 2 +- .../In-Game Menu Screens/UIScene_EndPoem.cpp | 86 +- .../In-Game Menu Screens/UIScene_EndPoem.h | 10 +- .../UIScene_InGameHostOptionsMenu.cpp | 6 +- .../UIScene_InGameHostOptionsMenu.h | 2 +- .../UIScene_InGameInfoMenu.cpp | 20 +- .../UIScene_InGameInfoMenu.h | 6 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 8 +- .../UIScene_InGamePlayerOptionsMenu.h | 4 +- .../UIScene_InGameSaveManagementMenu.cpp | 14 +- .../UIScene_InGameSaveManagementMenu.h | 2 +- .../UIScene_PauseMenu.cpp | 8 +- .../In-Game Menu Screens/UIScene_PauseMenu.h | 2 +- .../UIScene_SignEntryMenu.cpp | 14 +- .../UIScene_SignEntryMenu.h | 2 +- .../UIScene_TeleportMenu.cpp | 26 +- .../UIScene_TeleportMenu.h | 4 +- .../UI/Scenes/UIScene_ConnectingProgress.cpp | 10 +- .../UI/Scenes/UIScene_ConnectingProgress.h | 2 +- .../UI/Scenes/UIScene_FullscreenProgress.cpp | 30 +- .../UI/Scenes/UIScene_FullscreenProgress.h | 4 +- .../app/common/UI/Scenes/UIScene_Keyboard.cpp | 39 +- .../app/common/UI/Scenes/UIScene_Keyboard.h | 18 +- .../common/UI/Scenes/UIScene_MessageBox.cpp | 6 +- .../app/common/UI/Scenes/UIScene_MessageBox.h | 6 +- .../UI/Scenes/UIScene_QuadrantSignin.cpp | 16 +- .../common/UI/Scenes/UIScene_QuadrantSignin.h | 8 +- .../app/common/UI/Scenes/UIScene_Timer.cpp | 2 +- targets/app/common/UI/Scenes/UIScene_Timer.h | 2 +- targets/app/common/UI/UIController.cpp | 102 +- targets/app/common/UI/UIController.h | 22 +- targets/app/common/UI/UIFontData.cpp | 4 +- targets/app/common/UI/UIFontData.h | 2 +- targets/app/common/UI/UIScene.cpp | 67 +- targets/app/common/UI/UIScene.h | 14 +- targets/app/common/UI/UIString.cpp | 28 +- targets/app/common/UI/UIString.h | 16 +- targets/app/common/XboxStubs.cpp | 6 +- targets/app/linux/Iggy/include/iggy.h | 4 +- targets/app/linux/LinuxGame.cpp | 10 +- targets/app/linux/LinuxGame.h | 6 +- targets/app/linux/Linux_Minecraft.cpp | 40 - targets/app/windows/Iggy/include/iggy.h | 4 +- targets/app/windows/Windows64_App.cpp | 10 +- targets/app/windows/WindowsGame.h | 6 +- targets/app/windows/XML/ATGXmlParser.cpp | 30 +- targets/app/windows/XML/ATGXmlParser.h | 20 +- targets/app/windows/XML/xmlFilesCallback.h | 120 +- targets/java/include/java/Exceptions.h | 10 +- targets/java/include/java/File.h | 20 +- targets/java/include/java/FilenameFilter.h | 2 +- .../java/InputOutputStream/BufferedReader.h | 6 +- .../java/InputOutputStream/DataInput.h | 4 +- .../java/InputOutputStream/DataInputStream.h | 4 +- .../java/InputOutputStream/DataOutput.h | 6 +- .../java/InputOutputStream/DataOutputStream.h | 6 +- .../java/InputOutputStream/InputStream.h | 2 +- .../InputOutputStream/InputStreamReader.h | 2 +- .../include/java/InputOutputStream/Reader.h | 2 +- targets/java/include/java/System.h | 2 +- targets/java/src/File.cpp | 52 +- .../src/InputOutputStream/BufferedReader.cpp | 20 +- .../src/InputOutputStream/DataInputStream.cpp | 22 +- .../InputOutputStream/DataOutputStream.cpp | 6 +- .../src/InputOutputStream/FileInputStream.cpp | 2 +- .../InputOutputStream/FileOutputStream.cpp | 2 +- .../src/InputOutputStream/InputStream.cpp | 2 +- .../InputOutputStream/InputStreamReader.cpp | 4 +- targets/java/src/system.cpp | 2 +- targets/minecraft/Direction.cpp | 2 +- targets/minecraft/Direction.h | 2 +- targets/minecraft/Facing.cpp | 4 +- targets/minecraft/Facing.h | 2 +- targets/minecraft/GameTypes.h | 4 +- targets/minecraft/IGameServices.h | 40 +- targets/minecraft/SharedConstants.cpp | 22 +- targets/minecraft/SharedConstants.h | 8 +- targets/minecraft/client/BufferedImage.cpp | 60 +- targets/minecraft/client/BufferedImage.h | 6 +- targets/minecraft/client/ClientConstants.cpp | 6 +- targets/minecraft/client/ClientConstants.h | 2 +- targets/minecraft/client/DemoUser.cpp | 2 +- targets/minecraft/client/GuiMessage.cpp | 2 +- targets/minecraft/client/GuiMessage.h | 4 +- targets/minecraft/client/IMenuService.h | 4 +- targets/minecraft/client/KeyMapping.cpp | 2 +- targets/minecraft/client/KeyMapping.h | 4 +- targets/minecraft/client/Minecraft.cpp | 288 ++-- targets/minecraft/client/Minecraft.h | 58 +- targets/minecraft/client/Options.cpp | 254 ++-- targets/minecraft/client/Options.h | 28 +- targets/minecraft/client/ProgressRenderer.cpp | 6 +- targets/minecraft/client/ProgressRenderer.h | 6 +- targets/minecraft/client/User.cpp | 2 +- targets/minecraft/client/User.h | 8 +- targets/minecraft/client/gui/Button.cpp | 8 +- targets/minecraft/client/gui/Button.h | 8 +- targets/minecraft/client/gui/ChatScreen.cpp | 16 +- targets/minecraft/client/gui/ChatScreen.h | 6 +- .../minecraft/client/gui/ConfirmScreen.cpp | 16 +- targets/minecraft/client/gui/ConfirmScreen.h | 18 +- .../minecraft/client/gui/ControlsScreen.cpp | 10 +- targets/minecraft/client/gui/ControlsScreen.h | 4 +- .../client/gui/CreateWorldScreen.cpp | 110 +- .../minecraft/client/gui/CreateWorldScreen.h | 20 +- targets/minecraft/client/gui/DeathScreen.cpp | 8 +- targets/minecraft/client/gui/EditBox.cpp | 12 +- targets/minecraft/client/gui/EditBox.h | 10 +- targets/minecraft/client/gui/ErrorScreen.cpp | 6 +- targets/minecraft/client/gui/ErrorScreen.h | 6 +- targets/minecraft/client/gui/Font.cpp | 88 +- targets/minecraft/client/gui/Font.h | 36 +- targets/minecraft/client/gui/Gui.cpp | 82 +- targets/minecraft/client/gui/Gui.h | 12 +- targets/minecraft/client/gui/GuiComponent.cpp | 4 +- targets/minecraft/client/gui/GuiComponent.h | 4 +- .../minecraft/client/gui/InBedChatScreen.cpp | 8 +- .../minecraft/client/gui/InBedChatScreen.h | 2 +- .../client/gui/JoinMultiplayerScreen.cpp | 36 +- .../client/gui/JoinMultiplayerScreen.h | 4 +- .../minecraft/client/gui/MessageScreen.cpp | 2 +- targets/minecraft/client/gui/MessageScreen.h | 4 +- targets/minecraft/client/gui/Minimap.cpp | 8 +- .../minecraft/client/gui/NameEntryScreen.cpp | 20 +- .../minecraft/client/gui/NameEntryScreen.h | 10 +- .../minecraft/client/gui/OptionsScreen.cpp | 10 +- targets/minecraft/client/gui/OptionsScreen.h | 2 +- targets/minecraft/client/gui/PauseScreen.cpp | 22 +- .../client/gui/RenameWorldScreen.cpp | 8 +- .../minecraft/client/gui/RenameWorldScreen.h | 6 +- targets/minecraft/client/gui/Screen.cpp | 8 +- targets/minecraft/client/gui/Screen.h | 6 +- .../client/gui/SelectWorldScreen.cpp | 72 +- .../minecraft/client/gui/SelectWorldScreen.h | 10 +- targets/minecraft/client/gui/SlideButton.cpp | 2 +- targets/minecraft/client/gui/SlideButton.h | 2 +- targets/minecraft/client/gui/SmallButton.cpp | 6 +- targets/minecraft/client/gui/SmallButton.h | 6 +- .../client/gui/TradeSwitchButton.cpp | 2 +- .../client/gui/VideoSettingsScreen.cpp | 6 +- .../client/gui/VideoSettingsScreen.h | 2 +- .../gui/achievement/AchievementPopup.cpp | 10 +- .../client/gui/achievement/AchievementPopup.h | 4 +- .../gui/achievement/AchievementScreen.cpp | 4 +- .../client/gui/achievement/StatsScreen.cpp | 36 +- .../client/gui/achievement/StatsScreen.h | 8 +- .../gui/inventory/AbstractBeaconButton.cpp | 2 +- .../gui/inventory/AbstractContainerScreen.cpp | 54 +- .../gui/inventory/AbstractContainerScreen.h | 8 +- .../gui/inventory/BeaconCancelButton.cpp | 2 +- .../gui/inventory/BeaconConfirmButton.cpp | 2 +- .../gui/inventory/BeaconPowerButton.cpp | 4 +- .../client/gui/inventory/BeaconScreen.cpp | 8 +- .../client/gui/inventory/CraftingScreen.cpp | 2 +- .../gui/inventory/CreativeInventoryScreen.cpp | 6 +- .../gui/inventory/CreativeInventoryScreen.h | 2 +- .../gui/inventory/EnchantmentScreen.cpp | 38 +- .../client/gui/inventory/EnchantmentScreen.h | 6 +- .../client/gui/inventory/InventoryScreen.cpp | 2 +- .../client/gui/inventory/RepairScreen.cpp | 18 +- .../client/gui/inventory/TextEditScreen.cpp | 12 +- .../client/gui/inventory/TextEditScreen.h | 6 +- targets/minecraft/client/level/DemoLevel.cpp | 2 +- targets/minecraft/client/level/DemoLevel.h | 2 +- .../minecraft/client/model/OcelotModel.cpp | 18 +- .../client/model/dragon/DragonModel.cpp | 108 +- .../client/model/dragon/EnderCrystalModel.cpp | 6 +- targets/minecraft/client/model/geom/Cube.cpp | 2 +- targets/minecraft/client/model/geom/Cube.h | 4 +- targets/minecraft/client/model/geom/Model.cpp | 4 +- targets/minecraft/client/model/geom/Model.h | 6 +- .../minecraft/client/model/geom/ModelPart.cpp | 10 +- .../minecraft/client/model/geom/ModelPart.h | 8 +- .../client/multiplayer/ClientConnection.cpp | 110 +- .../client/multiplayer/ClientConnection.h | 6 +- .../client/multiplayer/ConnectScreen.cpp | 10 +- .../client/multiplayer/ConnectScreen.h | 2 +- .../client/multiplayer/DisconnectedScreen.cpp | 6 +- .../client/multiplayer/DisconnectedScreen.h | 4 +- .../multiplayer/MultiPlayerChunkCache.cpp | 6 +- .../multiplayer/MultiPlayerChunkCache.h | 4 +- .../client/multiplayer/MultiPlayerLevel.cpp | 6 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 6 +- .../multiplayer/MultiPlayerLocalPlayer.h | 2 +- .../minecraft/client/multiplayer/PlayerInfo.h | 4 +- .../multiplayer/ReceivingLevelScreen.cpp | 2 +- .../minecraft/client/particle/Particle.cpp | 4 +- targets/minecraft/client/particle/Particle.h | 2 +- .../client/particle/ParticleEngine.cpp | 2 +- .../client/particle/ParticleEngine.h | 2 +- .../minecraft/client/player/LocalPlayer.cpp | 14 +- targets/minecraft/client/player/LocalPlayer.h | 6 +- .../minecraft/client/player/RemotePlayer.cpp | 4 +- .../minecraft/client/player/RemotePlayer.h | 2 +- .../client/renderer/BossMobGuiInfo.cpp | 2 +- .../client/renderer/BossMobGuiInfo.h | 2 +- .../client/renderer/GameRenderer.cpp | 6 +- .../minecraft/client/renderer/HttpTexture.cpp | 2 +- .../minecraft/client/renderer/HttpTexture.h | 2 +- .../client/renderer/ItemInHandRenderer.cpp | 4 +- .../client/renderer/LevelRenderer.cpp | 78 +- .../minecraft/client/renderer/LevelRenderer.h | 6 +- .../minecraft/client/renderer/MemTexture.cpp | 2 +- .../minecraft/client/renderer/MemTexture.h | 2 +- .../minecraft/client/renderer/Textures.cpp | 550 ++++---- targets/minecraft/client/renderer/Textures.h | 44 +- .../client/renderer/entity/ArrowRenderer.cpp | 2 +- .../renderer/entity/EndermanRenderer.cpp | 2 +- .../client/renderer/entity/EntityRenderer.cpp | 6 +- .../client/renderer/entity/EntityRenderer.h | 6 +- .../renderer/entity/ExperienceOrbRenderer.cpp | 2 +- .../renderer/entity/FallingTileRenderer.cpp | 2 +- .../renderer/entity/FishingHookRenderer.cpp | 2 +- .../client/renderer/entity/HorseRenderer.cpp | 4 +- .../client/renderer/entity/HorseRenderer.h | 2 +- .../renderer/entity/HumanoidMobRenderer.cpp | 26 +- .../renderer/entity/HumanoidMobRenderer.h | 4 +- .../renderer/entity/ItemFrameRenderer.cpp | 2 +- .../client/renderer/entity/ItemRenderer.cpp | 16 +- .../client/renderer/entity/ItemRenderer.h | 2 +- .../renderer/entity/LivingEntityRenderer.cpp | 14 +- .../renderer/entity/LivingEntityRenderer.h | 4 +- .../renderer/entity/MinecartRenderer.cpp | 4 +- .../renderer/entity/PaintingRenderer.cpp | 2 +- .../client/renderer/entity/PlayerRenderer.cpp | 12 +- .../client/renderer/entity/PlayerRenderer.h | 4 +- .../client/renderer/entity/SheepRenderer.cpp | 2 +- .../texture/PreStitchedTextureMap.cpp | 1180 ++++++++--------- .../renderer/texture/PreStitchedTextureMap.h | 18 +- .../client/renderer/texture/SimpleIcon.cpp | 2 +- .../client/renderer/texture/SimpleIcon.h | 2 +- .../client/renderer/texture/StitchSlot.cpp | 10 +- .../client/renderer/texture/StitchSlot.h | 2 +- .../renderer/texture/StitchedTexture.cpp | 26 +- .../client/renderer/texture/StitchedTexture.h | 12 +- .../client/renderer/texture/Stitcher.cpp | 6 +- .../client/renderer/texture/Stitcher.h | 8 +- .../client/renderer/texture/Texture.cpp | 16 +- .../client/renderer/texture/Texture.h | 18 +- .../client/renderer/texture/TextureHolder.cpp | 6 +- .../client/renderer/texture/TextureHolder.h | 2 +- .../renderer/texture/TextureManager.cpp | 44 +- .../client/renderer/texture/TextureManager.h | 20 +- .../client/renderer/texture/TextureMap.cpp | 30 +- .../client/renderer/texture/TextureMap.h | 16 +- .../renderer/texture/custom/ClockTexture.cpp | 4 +- .../texture/custom/CompassTexture.cpp | 4 +- .../renderer/tileentity/MobSpawnerRenderer.h | 2 +- .../renderer/tileentity/SignRenderer.cpp | 10 +- .../renderer/tileentity/SkullTileRenderer.cpp | 4 +- .../renderer/tileentity/SkullTileRenderer.h | 2 +- .../tileentity/TileEntityRenderer.cpp | 2 +- .../renderer/tileentity/TileEntityRenderer.h | 6 +- .../client/resources/ResourceLocation.h | 8 +- .../client/skins/AbstractTexturePack.cpp | 68 +- .../client/skins/AbstractTexturePack.h | 46 +- .../minecraft/client/skins/DLCTexturePack.cpp | 80 +- .../minecraft/client/skins/DLCTexturePack.h | 34 +- .../client/skins/DefaultTexturePack.cpp | 18 +- .../client/skins/DefaultTexturePack.h | 6 +- .../client/skins/FileTexturePack.cpp | 4 +- .../minecraft/client/skins/FileTexturePack.h | 4 +- .../client/skins/FolderTexturePack.cpp | 16 +- .../client/skins/FolderTexturePack.h | 8 +- .../minecraft/client/skins/TexturePack.cpp | 8 +- targets/minecraft/client/skins/TexturePack.h | 28 +- .../client/skins/TexturePackRepository.cpp | 22 +- .../client/skins/TexturePackRepository.h | 8 +- .../minecraft/client/title/TitleScreen.cpp | 24 +- targets/minecraft/client/title/TitleScreen.h | 4 +- targets/minecraft/commands/AdminLogCommand.h | 4 +- targets/minecraft/commands/Command.cpp | 8 +- targets/minecraft/commands/Command.h | 8 +- .../minecraft/commands/CommandDispatcher.cpp | 2 +- targets/minecraft/commands/CommandSender.h | 4 +- .../commands/common/EffectCommand.cpp | 10 +- .../minecraft/commands/common/EffectCommand.h | 6 +- .../commands/common/EnchantItemCommand.cpp | 4 +- .../commands/common/GameModeCommand.cpp | 2 +- .../commands/common/GameModeCommand.h | 2 +- .../commands/common/GiveItemCommand.cpp | 8 +- .../commands/common/GiveItemCommand.h | 2 +- .../minecraft/commands/common/KillCommand.cpp | 2 +- .../minecraft/commands/common/TimeCommand.cpp | 2 +- .../commands/common/ToggleDownfallCommand.cpp | 2 +- targets/minecraft/locale/I18n.cpp | 4 +- targets/minecraft/locale/I18n.h | 4 +- targets/minecraft/locale/Language.cpp | 34 +- targets/minecraft/locale/Language.h | 10 +- targets/minecraft/network/Connection.cpp | 8 +- targets/minecraft/network/Connection.h | 2 +- .../network/packet/AddPaintingPacket.cpp | 2 +- .../network/packet/AddPaintingPacket.h | 2 +- .../network/packet/AddPlayerPacket.cpp | 2 +- .../network/packet/AddPlayerPacket.h | 2 +- .../minecraft/network/packet/ChatPacket.cpp | 12 +- targets/minecraft/network/packet/ChatPacket.h | 14 +- .../network/packet/ContainerOpenPacket.cpp | 8 +- .../network/packet/ContainerOpenPacket.h | 8 +- .../network/packet/CustomPayloadPacket.cpp | 20 +- .../network/packet/CustomPayloadPacket.h | 20 +- .../network/packet/LevelParticlesPacket.cpp | 6 +- .../network/packet/LevelParticlesPacket.h | 6 +- .../minecraft/network/packet/LoginPacket.cpp | 10 +- .../minecraft/network/packet/LoginPacket.h | 6 +- targets/minecraft/network/packet/Packet.cpp | 28 +- targets/minecraft/network/packet/Packet.h | 4 +- .../network/packet/PlayerAbilitiesPacket.cpp | 2 +- .../network/packet/PlayerAbilitiesPacket.h | 2 +- .../network/packet/PlayerInfoPacket.h | 4 +- .../network/packet/PreLoginPacket.cpp | 6 +- .../minecraft/network/packet/PreLoginPacket.h | 6 +- .../network/packet/RespawnPacket.cpp | 4 +- .../packet/SetDisplayObjectivePacket.cpp | 4 +- .../packet/SetDisplayObjectivePacket.h | 2 +- .../network/packet/SetObjectivePacket.cpp | 4 +- .../network/packet/SetObjectivePacket.h | 4 +- .../network/packet/SetPlayerTeamPacket.cpp | 12 +- .../network/packet/SetPlayerTeamPacket.h | 12 +- .../network/packet/SetScorePacket.cpp | 8 +- .../minecraft/network/packet/SetScorePacket.h | 6 +- .../network/packet/SignUpdatePacket.cpp | 2 +- .../network/packet/SignUpdatePacket.h | 4 +- .../packet/TextureAndGeometryChangePacket.cpp | 10 +- .../packet/TextureAndGeometryChangePacket.h | 4 +- .../packet/TextureAndGeometryPacket.cpp | 26 +- .../network/packet/TextureAndGeometryPacket.h | 8 +- .../network/packet/TextureChangePacket.cpp | 4 +- .../network/packet/TextureChangePacket.h | 4 +- .../network/packet/TexturePacket.cpp | 4 +- .../minecraft/network/packet/TexturePacket.h | 4 +- .../network/packet/UpdateAttributesPacket.cpp | 2 +- .../packet/UpdateGameRuleProgressPacket.cpp | 4 +- .../packet/UpdateGameRuleProgressPacket.h | 4 +- targets/minecraft/server/ConsoleInput.cpp | 2 +- targets/minecraft/server/ConsoleInput.h | 4 +- targets/minecraft/server/ConsoleInputSource.h | 6 +- targets/minecraft/server/MinecraftServer.cpp | 100 +- targets/minecraft/server/MinecraftServer.h | 28 +- targets/minecraft/server/PlayerList.cpp | 70 +- targets/minecraft/server/PlayerList.h | 22 +- targets/minecraft/server/ServerInterface.h | 34 +- targets/minecraft/server/ServerScoreboard.cpp | 6 +- targets/minecraft/server/ServerScoreboard.h | 6 +- targets/minecraft/server/Settings.cpp | 10 +- targets/minecraft/server/Settings.h | 12 +- .../commands/ServerCommandDispatcher.cpp | 4 +- .../server/commands/ServerCommandDispatcher.h | 4 +- targets/minecraft/server/level/DemoMode.cpp | 4 +- .../server/level/DerivedServerLevel.cpp | 2 +- .../server/level/DerivedServerLevel.h | 2 +- .../minecraft/server/level/PlayerChunkMap.cpp | 4 +- .../server/level/ServerChunkCache.cpp | 6 +- .../minecraft/server/level/ServerChunkCache.h | 4 +- .../minecraft/server/level/ServerLevel.cpp | 8 +- targets/minecraft/server/level/ServerLevel.h | 6 +- .../server/level/ServerLevelListener.cpp | 4 +- .../server/level/ServerLevelListener.h | 4 +- .../minecraft/server/level/ServerPlayer.cpp | 54 +- targets/minecraft/server/level/ServerPlayer.h | 12 +- .../minecraft/server/level/TrackedEntity.cpp | 4 +- .../server/network/PendingConnection.cpp | 12 +- .../server/network/PendingConnection.h | 8 +- .../server/network/PlayerConnection.cpp | 90 +- .../server/network/PlayerConnection.h | 14 +- .../server/network/ServerConnection.cpp | 8 +- .../server/network/ServerConnection.h | 8 +- targets/minecraft/sounds/SoundTypes.h | 190 +-- targets/minecraft/stats/Achievement.cpp | 22 +- targets/minecraft/stats/Achievement.h | 10 +- targets/minecraft/stats/Achievements.cpp | 118 +- targets/minecraft/stats/DescFormatter.h | 2 +- targets/minecraft/stats/DurangoStats.h | 22 +- targets/minecraft/stats/GeneralStat.cpp | 4 +- targets/minecraft/stats/GeneralStat.h | 4 +- targets/minecraft/stats/ItemStat.cpp | 2 +- targets/minecraft/stats/ItemStat.h | 2 +- targets/minecraft/stats/NumberFormatters.h | 20 +- targets/minecraft/stats/Stat.cpp | 32 +- targets/minecraft/stats/Stat.h | 16 +- targets/minecraft/stats/StatFormatter.h | 2 +- targets/minecraft/stats/Stats.cpp | 178 +-- targets/minecraft/stats/StatsCounter.cpp | 2 +- targets/minecraft/stats/StatsSyncer.h | 2 +- targets/minecraft/util/Hasher.cpp | 10 +- targets/minecraft/util/Hasher.h | 6 +- targets/minecraft/util/HtmlString.cpp | 20 +- targets/minecraft/util/HtmlString.h | 8 +- targets/minecraft/util/Mth.cpp | 26 +- targets/minecraft/util/Mth.h | 10 +- targets/minecraft/util/ProgressListener.h | 2 +- targets/minecraft/world/CompoundContainer.cpp | 6 +- targets/minecraft/world/CompoundContainer.h | 4 +- targets/minecraft/world/Container.h | 4 +- targets/minecraft/world/FlippedIcon.cpp | 2 +- targets/minecraft/world/FlippedIcon.h | 2 +- targets/minecraft/world/Icon.h | 2 +- targets/minecraft/world/IconRegister.h | 2 +- targets/minecraft/world/SimpleContainer.cpp | 10 +- targets/minecraft/world/SimpleContainer.h | 10 +- .../world/damageSource/CombatEntry.cpp | 4 +- .../world/damageSource/CombatEntry.h | 2 +- .../world/damageSource/DamageSource.cpp | 8 +- .../world/damageSource/DamageSource.h | 6 +- .../world/damageSource/EntityDamageSource.cpp | 8 +- .../world/damageSource/EntityDamageSource.h | 4 +- .../IndirectEntityDamageSource.cpp | 8 +- .../damageSource/IndirectEntityDamageSource.h | 4 +- targets/minecraft/world/effect/MobEffect.cpp | 12 +- targets/minecraft/world/effect/MobEffect.h | 2 +- .../world/effect/MobEffectInstance.cpp | 24 +- .../world/effect/MobEffectInstance.h | 2 +- targets/minecraft/world/entity/AgeableMob.cpp | 4 +- targets/minecraft/world/entity/Entity.cpp | 88 +- targets/minecraft/world/entity/Entity.h | 16 +- targets/minecraft/world/entity/EntityIO.cpp | 190 +-- targets/minecraft/world/entity/EntityIO.h | 20 +- .../minecraft/world/entity/ExperienceOrb.cpp | 12 +- .../minecraft/world/entity/HangingEntity.cpp | 28 +- targets/minecraft/world/entity/ItemFrame.cpp | 14 +- .../minecraft/world/entity/LivingEntity.cpp | 38 +- targets/minecraft/world/entity/Mob.cpp | 76 +- targets/minecraft/world/entity/Mob.h | 6 +- .../minecraft/world/entity/OwnableEntity.h | 2 +- targets/minecraft/world/entity/Painting.cpp | 58 +- targets/minecraft/world/entity/Painting.h | 6 +- .../world/entity/SyncedEntityData.cpp | 12 +- .../minecraft/world/entity/SyncedEntityData.h | 14 +- .../minecraft/world/entity/TamableAnimal.cpp | 18 +- .../minecraft/world/entity/TamableAnimal.h | 4 +- .../ai/attributes/AttributeModifier.cpp | 28 +- .../entity/ai/attributes/AttributeModifier.h | 8 +- .../entity/ai/attributes/RangedAttribute.h | 4 +- .../ai/attributes/ServersideAttributeMap.cpp | 4 +- .../world/entity/ai/village/Village.cpp | 102 +- .../world/entity/ai/village/Village.h | 12 +- .../world/entity/ai/village/Villages.cpp | 16 +- .../world/entity/ai/village/Villages.h | 4 +- .../minecraft/world/entity/ambient/Bat.cpp | 4 +- .../minecraft/world/entity/animal/Animal.cpp | 4 +- .../world/entity/animal/EntityHorse.cpp | 130 +- .../world/entity/animal/EntityHorse.h | 24 +- .../minecraft/world/entity/animal/Ocelot.cpp | 10 +- .../minecraft/world/entity/animal/Ocelot.h | 2 +- targets/minecraft/world/entity/animal/Pig.cpp | 4 +- .../minecraft/world/entity/animal/Sheep.cpp | 8 +- .../world/entity/animal/VillagerGolem.cpp | 4 +- .../minecraft/world/entity/animal/Wolf.cpp | 12 +- targets/minecraft/world/entity/animal/Wolf.h | 2 +- targets/minecraft/world/entity/boss/BossMob.h | 2 +- .../world/entity/boss/MultiEntityMobPart.cpp | 2 +- .../world/entity/boss/MultiEntityMobPart.h | 4 +- .../entity/boss/enderdragon/EnderDragon.cpp | 28 +- .../entity/boss/enderdragon/EnderDragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.cpp | 4 +- .../world/entity/boss/wither/WitherBoss.h | 2 +- targets/minecraft/world/entity/item/Boat.cpp | 2 +- targets/minecraft/world/entity/item/Boat.h | 2 +- .../world/entity/item/FallingTile.cpp | 50 +- .../world/entity/item/ItemEntity.cpp | 20 +- .../minecraft/world/entity/item/ItemEntity.h | 8 +- .../minecraft/world/entity/item/Minecart.cpp | 32 +- .../minecraft/world/entity/item/Minecart.h | 8 +- .../world/entity/item/MinecartContainer.cpp | 10 +- .../world/entity/item/MinecartContainer.h | 4 +- .../world/entity/item/MinecartFurnace.cpp | 12 +- .../world/entity/item/MinecartHopper.cpp | 4 +- .../world/entity/item/MinecartHopper.h | 4 +- .../world/entity/item/MinecartTNT.cpp | 4 +- .../minecraft/world/entity/item/PrimedTnt.cpp | 4 +- .../world/entity/monster/Creeper.cpp | 14 +- .../world/entity/monster/EnderMan.cpp | 8 +- .../minecraft/world/entity/monster/Ghast.cpp | 6 +- .../world/entity/monster/PigZombie.cpp | 4 +- .../monster/SharedMonsterAttributes.cpp | 28 +- .../world/entity/monster/Skeleton.cpp | 6 +- .../minecraft/world/entity/monster/Slime.cpp | 4 +- .../minecraft/world/entity/monster/Zombie.cpp | 14 +- .../world/entity/npc/ClientSideMerchant.cpp | 4 +- .../world/entity/npc/ClientSideMerchant.h | 6 +- .../minecraft/world/entity/npc/Villager.cpp | 20 +- targets/minecraft/world/entity/npc/Villager.h | 4 +- .../world/entity/player/Abilities.cpp | 38 +- .../world/entity/player/Inventory.cpp | 12 +- .../minecraft/world/entity/player/Inventory.h | 4 +- .../minecraft/world/entity/player/Player.cpp | 152 +-- .../minecraft/world/entity/player/Player.h | 36 +- .../world/entity/projectile/Arrow.cpp | 44 +- .../world/entity/projectile/Fireball.cpp | 26 +- .../projectile/FireworksRocketEntity.cpp | 12 +- .../world/entity/projectile/FishingHook.cpp | 24 +- .../world/entity/projectile/LargeFireball.cpp | 6 +- .../world/entity/projectile/Throwable.cpp | 32 +- .../world/entity/projectile/Throwable.h | 2 +- .../world/entity/projectile/ThrownPotion.cpp | 8 +- targets/minecraft/world/food/FoodData.cpp | 18 +- .../minecraft/world/inventory/AnimalChest.cpp | 4 +- .../minecraft/world/inventory/AnimalChest.h | 4 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- targets/minecraft/world/inventory/AnvilMenu.h | 4 +- .../world/inventory/CraftingContainer.cpp | 4 +- .../world/inventory/CraftingContainer.h | 4 +- .../world/inventory/EnchantmentContainer.cpp | 2 +- .../world/inventory/MerchantContainer.cpp | 4 +- .../world/inventory/MerchantContainer.h | 4 +- .../inventory/PlayerEnderChestContainer.cpp | 8 +- .../world/inventory/RepairContainer.cpp | 2 +- .../world/inventory/ResultContainer.cpp | 4 +- .../world/inventory/ResultContainer.h | 4 +- targets/minecraft/world/item/ArmorItem.cpp | 32 +- targets/minecraft/world/item/ArmorItem.h | 4 +- targets/minecraft/world/item/BowItem.cpp | 4 +- targets/minecraft/world/item/BowItem.h | 2 +- targets/minecraft/world/item/BucketItem.cpp | 2 +- targets/minecraft/world/item/ClockItem.cpp | 4 +- targets/minecraft/world/item/ClockItem.h | 2 +- targets/minecraft/world/item/CoalItem.cpp | 2 +- targets/minecraft/world/item/CompassItem.cpp | 4 +- targets/minecraft/world/item/CompassItem.h | 2 +- .../minecraft/world/item/DyePowderItem.cpp | 10 +- targets/minecraft/world/item/DyePowderItem.h | 2 +- targets/minecraft/world/item/EmptyMapItem.cpp | 2 +- .../world/item/EnchantedBookItem.cpp | 26 +- .../minecraft/world/item/EnchantedBookItem.h | 2 +- .../minecraft/world/item/FireChargeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 14 +- .../world/item/FireworksChargeItem.h | 2 +- .../minecraft/world/item/FireworksItem.cpp | 20 +- targets/minecraft/world/item/FireworksItem.h | 18 +- .../minecraft/world/item/FishingRodItem.cpp | 4 +- .../world/item/HangingEntityItem.cpp | 8 +- targets/minecraft/world/item/Item.cpp | 390 +++--- targets/minecraft/world/item/Item.h | 26 +- targets/minecraft/world/item/ItemInstance.cpp | 172 +-- targets/minecraft/world/item/ItemInstance.h | 18 +- targets/minecraft/world/item/MapItem.cpp | 20 +- targets/minecraft/world/item/PotionItem.cpp | 44 +- targets/minecraft/world/item/PotionItem.h | 10 +- targets/minecraft/world/item/Rarity.cpp | 10 +- targets/minecraft/world/item/Rarity.h | 4 +- .../minecraft/world/item/RecordingItem.cpp | 12 +- targets/minecraft/world/item/RecordingItem.h | 8 +- targets/minecraft/world/item/SkullItem.cpp | 14 +- targets/minecraft/world/item/SkullItem.h | 4 +- targets/minecraft/world/item/SpawnEggItem.cpp | 10 +- targets/minecraft/world/item/SpawnEggItem.h | 2 +- targets/minecraft/world/item/TileItem.cpp | 2 +- .../world/item/alchemy/PotionBrewing.cpp | 168 +-- .../world/item/alchemy/PotionBrewing.h | 34 +- .../world/item/crafting/ArmorRecipes.cpp | 38 +- .../world/item/crafting/ArmorRecipes.h | 2 +- .../world/item/crafting/ClothDyeRecipes.cpp | 76 +- .../world/item/crafting/FoodRecipes.cpp | 84 +- .../world/item/crafting/OreRecipes.cpp | 16 +- .../minecraft/world/item/crafting/Recipes.cpp | 1052 +++++++-------- .../minecraft/world/item/crafting/Recipes.h | 2 +- .../world/item/crafting/StructureRecipes.cpp | 146 +- .../world/item/crafting/ToolRecipes.cpp | 54 +- .../world/item/crafting/ToolRecipes.h | 2 +- .../world/item/crafting/WeaponRecipes.cpp | 58 +- .../world/item/crafting/WeaponRecipes.h | 2 +- .../world/item/enchantment/Enchantment.cpp | 14 +- .../world/item/enchantment/Enchantment.h | 6 +- .../item/enchantment/EnchantmentHelper.cpp | 20 +- .../minecraft/world/item/trading/Merchant.h | 2 +- .../world/item/trading/MerchantRecipe.cpp | 26 +- .../world/item/trading/MerchantRecipeList.cpp | 6 +- .../minecraft/world/level/BaseMobSpawner.cpp | 98 +- .../minecraft/world/level/BaseMobSpawner.h | 10 +- targets/minecraft/world/level/ChunkPos.cpp | 4 +- targets/minecraft/world/level/ChunkPos.h | 2 +- targets/minecraft/world/level/GameRules.cpp | 50 +- targets/minecraft/world/level/GameRules.h | 24 +- targets/minecraft/world/level/Level.cpp | 38 +- targets/minecraft/world/level/Level.h | 30 +- .../world/level/LevelConflictException.cpp | 2 +- .../world/level/LevelConflictException.h | 2 +- targets/minecraft/world/level/LevelListener.h | 6 +- .../minecraft/world/level/LevelSettings.cpp | 20 +- targets/minecraft/world/level/LevelSettings.h | 14 +- targets/minecraft/world/level/LevelType.cpp | 24 +- targets/minecraft/world/level/LevelType.h | 14 +- targets/minecraft/world/level/biome/Biome.cpp | 48 +- targets/minecraft/world/level/biome/Biome.h | 4 +- .../minecraft/world/level/chunk/ChunkSource.h | 4 +- .../world/level/chunk/LevelChunk.cpp | 8 +- .../world/level/chunk/ReadOnlyChunkCache.cpp | 4 +- .../world/level/chunk/ReadOnlyChunkCache.h | 4 +- .../chunk/storage/McRegionChunkStorage.cpp | 44 +- .../chunk/storage/McRegionChunkStorage.h | 4 +- .../world/level/chunk/storage/NbtSlotFile.cpp | 10 +- .../level/chunk/storage/OldChunkStorage.cpp | 148 +-- .../level/chunk/storage/RegionFileCache.cpp | 22 +- .../level/chunk/storage/RegionFileCache.h | 16 +- .../world/level/chunk/storage/ZoneFile.cpp | 4 +- .../level/chunk/storage/ZonedChunkStorage.cpp | 20 +- .../world/level/dimension/Dimension.cpp | 2 +- .../world/level/dimension/Dimension.h | 2 +- .../level/levelgen/CustomLevelSource.cpp | 4 +- .../world/level/levelgen/CustomLevelSource.h | 4 +- .../world/level/levelgen/FlatLevelSource.cpp | 4 +- .../world/level/levelgen/FlatLevelSource.h | 4 +- .../level/levelgen/HellFlatLevelSource.cpp | 6 +- .../level/levelgen/HellFlatLevelSource.h | 4 +- .../level/levelgen/HellRandomLevelSource.cpp | 6 +- .../level/levelgen/HellRandomLevelSource.h | 4 +- .../world/level/levelgen/LargeFeature.cpp | 2 +- .../world/level/levelgen/LargeFeature.h | 2 +- .../level/levelgen/RandomLevelSource.cpp | 4 +- .../world/level/levelgen/RandomLevelSource.h | 4 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 6 +- .../levelgen/TheEndLevelRandomLevelSource.h | 4 +- .../levelgen/feature/MonsterRoomFeature.cpp | 12 +- .../levelgen/feature/MonsterRoomFeature.h | 2 +- .../level/levelgen/flat/FlatGeneratorInfo.cpp | 34 +- .../level/levelgen/flat/FlatGeneratorInfo.h | 32 +- .../level/levelgen/flat/FlatLayerInfo.cpp | 8 +- .../world/level/levelgen/flat/FlatLayerInfo.h | 2 +- .../level/levelgen/structure/BoundingBox.cpp | 10 +- .../level/levelgen/structure/BoundingBox.h | 4 +- .../levelgen/structure/MineShaftFeature.cpp | 6 +- .../levelgen/structure/MineShaftFeature.h | 6 +- .../levelgen/structure/MineShaftPieces.cpp | 42 +- .../structure/NetherBridgeFeature.cpp | 2 +- .../levelgen/structure/NetherBridgeFeature.h | 2 +- .../levelgen/structure/NetherBridgePieces.cpp | 48 +- .../structure/RandomScatteredLargeFeature.cpp | 6 +- .../structure/RandomScatteredLargeFeature.h | 6 +- .../structure/ScatteredFeaturePieces.cpp | 58 +- .../levelgen/structure/StrongholdFeature.cpp | 10 +- .../levelgen/structure/StrongholdFeature.h | 10 +- .../levelgen/structure/StrongholdPieces.cpp | 80 +- .../levelgen/structure/StructureFeature.cpp | 6 +- .../levelgen/structure/StructureFeature.h | 2 +- .../levelgen/structure/StructureFeatureIO.cpp | 42 +- .../levelgen/structure/StructureFeatureIO.h | 16 +- .../structure/StructureFeatureSavedData.cpp | 10 +- .../structure/StructureFeatureSavedData.h | 6 +- .../levelgen/structure/StructurePiece.cpp | 16 +- .../levelgen/structure/StructureStart.cpp | 22 +- .../levelgen/structure/VillageFeature.cpp | 12 +- .../level/levelgen/structure/VillageFeature.h | 8 +- .../levelgen/structure/VillagePieces.cpp | 82 +- .../minecraft/world/level/pathfinder/Node.cpp | 4 +- .../minecraft/world/level/pathfinder/Node.h | 2 +- .../level/saveddata/MapItemSavedData.cpp | 32 +- .../world/level/saveddata/MapItemSavedData.h | 2 +- .../world/level/saveddata/SavedData.cpp | 2 +- .../world/level/saveddata/SavedData.h | 4 +- .../ConsoleSaveFileIO/ConsoleSaveFile.h | 4 +- .../ConsoleSaveFileConverter.cpp | 28 +- .../ConsoleSaveFileOriginal.cpp | 36 +- .../ConsoleSaveFileOriginal.h | 8 +- .../ConsoleSaveFileSplit.cpp | 70 +- .../ConsoleSaveFileIO/ConsoleSaveFileSplit.h | 14 +- .../ConsoleSaveFileIO/ConsoleSavePath.h | 8 +- .../storage/ConsoleSaveFileIO/FileHeader.cpp | 26 +- .../storage/ConsoleSaveFileIO/FileHeader.h | 16 +- .../world/level/storage/DerivedLevelData.cpp | 4 +- .../world/level/storage/DerivedLevelData.h | 4 +- .../level/storage/DirectoryLevelStorage.cpp | 80 +- .../level/storage/DirectoryLevelStorage.h | 14 +- .../storage/DirectoryLevelStorageSource.cpp | 32 +- .../storage/DirectoryLevelStorageSource.h | 20 +- .../world/level/storage/LevelData.cpp | 184 +-- .../minecraft/world/level/storage/LevelData.h | 14 +- .../world/level/storage/LevelStorage.cpp | 4 +- .../world/level/storage/LevelStorage.h | 8 +- .../storage/LevelStorageProfilerDecorator.cpp | 4 +- .../storage/LevelStorageProfilerDecorator.h | 4 +- .../world/level/storage/LevelStorageSource.h | 20 +- .../world/level/storage/LevelSummary.cpp | 8 +- .../world/level/storage/LevelSummary.h | 10 +- .../level/storage/McRegionLevelStorage.cpp | 4 +- .../level/storage/McRegionLevelStorage.h | 2 +- .../storage/McRegionLevelStorageSource.cpp | 12 +- .../storage/McRegionLevelStorageSource.h | 10 +- .../level/storage/MemoryLevelStorage.cpp | 6 +- .../world/level/storage/MemoryLevelStorage.h | 4 +- .../storage/MemoryLevelStorageSource.cpp | 20 +- .../level/storage/MemoryLevelStorageSource.h | 20 +- .../level/storage/MockedLevelStorage.cpp | 6 +- .../world/level/storage/MockedLevelStorage.h | 4 +- .../world/level/storage/SavedDataStorage.cpp | 28 +- .../world/level/storage/SavedDataStorage.h | 10 +- .../minecraft/world/level/tile/AnvilTile.cpp | 6 +- .../minecraft/world/level/tile/AnvilTile.h | 2 +- .../level/tile/BasePressurePlateTile.cpp | 2 +- .../world/level/tile/BasePressurePlateTile.h | 4 +- .../minecraft/world/level/tile/BedTile.cpp | 12 +- .../world/level/tile/BrewingStandTile.cpp | 2 +- .../minecraft/world/level/tile/CactusTile.cpp | 6 +- .../minecraft/world/level/tile/CakeTile.cpp | 8 +- .../minecraft/world/level/tile/CarrotTile.cpp | 2 +- .../world/level/tile/CauldronTile.cpp | 14 +- .../minecraft/world/level/tile/CauldronTile.h | 6 +- .../minecraft/world/level/tile/ChestTile.cpp | 2 +- .../minecraft/world/level/tile/CocoaTile.cpp | 4 +- .../minecraft/world/level/tile/CocoaTile.h | 2 +- .../world/level/tile/ColoredTile.cpp | 2 +- .../minecraft/world/level/tile/CoralTile.cpp | 2 +- .../minecraft/world/level/tile/CropTile.cpp | 2 +- .../world/level/tile/DaylightDetectorTile.cpp | 4 +- .../world/level/tile/DetectorRailTile.cpp | 4 +- .../world/level/tile/DispenserTile.cpp | 8 +- .../minecraft/world/level/tile/DoorTile.cpp | 8 +- targets/minecraft/world/level/tile/DoorTile.h | 2 +- .../world/level/tile/DropperTile.cpp | 8 +- .../world/level/tile/EnchantmentTableTile.cpp | 8 +- .../world/level/tile/EnchantmentTableTile.h | 6 +- .../world/level/tile/EnderChestTile.cpp | 2 +- .../minecraft/world/level/tile/FarmTile.cpp | 4 +- .../minecraft/world/level/tile/FenceTile.cpp | 2 +- .../minecraft/world/level/tile/FenceTile.h | 4 +- .../minecraft/world/level/tile/FireTile.cpp | 4 +- targets/minecraft/world/level/tile/FireTile.h | 4 +- .../world/level/tile/FurnaceTile.cpp | 8 +- .../minecraft/world/level/tile/GlassTile.cpp | 2 +- .../minecraft/world/level/tile/GrassTile.cpp | 8 +- .../world/level/tile/HalfTransparentTile.cpp | 2 +- .../world/level/tile/HalfTransparentTile.h | 4 +- .../world/level/tile/HayBlockTile.cpp | 4 +- .../minecraft/world/level/tile/HopperTile.cpp | 10 +- .../minecraft/world/level/tile/HopperTile.h | 8 +- .../world/level/tile/HugeMushroomTile.cpp | 14 +- .../world/level/tile/HugeMushroomTile.h | 6 +- .../minecraft/world/level/tile/IceTile.cpp | 2 +- .../world/level/tile/JukeboxTile.cpp | 18 +- .../minecraft/world/level/tile/LeafTile.cpp | 8 +- targets/minecraft/world/level/tile/LeafTile.h | 2 +- .../minecraft/world/level/tile/LiquidTile.cpp | 10 +- .../minecraft/world/level/tile/LiquidTile.h | 10 +- .../minecraft/world/level/tile/MelonTile.cpp | 4 +- .../minecraft/world/level/tile/MycelTile.cpp | 6 +- .../world/level/tile/NetherWartTile.cpp | 2 +- .../minecraft/world/level/tile/PortalTile.cpp | 2 +- .../minecraft/world/level/tile/PotatoTile.cpp | 2 +- .../world/level/tile/PoweredRailTile.cpp | 2 +- .../world/level/tile/PressurePlateTile.cpp | 2 +- .../world/level/tile/PressurePlateTile.h | 2 +- .../world/level/tile/PumpkinTile.cpp | 12 +- .../minecraft/world/level/tile/PumpkinTile.h | 4 +- .../world/level/tile/QuartzBlockTile.cpp | 22 +- .../world/level/tile/QuartzBlockTile.h | 10 +- .../minecraft/world/level/tile/RailTile.cpp | 2 +- .../world/level/tile/RedStoneDustTile.cpp | 10 +- .../world/level/tile/RedStoneDustTile.h | 10 +- .../world/level/tile/RedlightTile.cpp | 4 +- .../world/level/tile/SandStoneTile.cpp | 8 +- .../world/level/tile/SandStoneTile.h | 6 +- .../world/level/tile/SaplingPlantTile.cpp | 4 +- .../world/level/tile/SaplingPlantTile.h | 2 +- .../minecraft/world/level/tile/SkullTile.cpp | 6 +- .../minecraft/world/level/tile/SkullTile.h | 2 +- .../world/level/tile/SmoothStoneBrickTile.cpp | 8 +- .../world/level/tile/SmoothStoneBrickTile.h | 2 +- .../world/level/tile/StainedGlassBlock.cpp | 4 +- .../level/tile/StainedGlassPaneBlock.cpp | 6 +- .../minecraft/world/level/tile/StemTile.cpp | 4 +- targets/minecraft/world/level/tile/StemTile.h | 2 +- .../world/level/tile/StoneSlabTile.cpp | 4 +- .../world/level/tile/TallGrassPlantTile.cpp | 4 +- .../world/level/tile/TallGrassPlantTile.h | 2 +- .../level/tile/TheEndPortalFrameTile.cpp | 8 +- .../world/level/tile/TheEndPortalFrameTile.h | 2 +- .../world/level/tile/ThinFenceTile.cpp | 4 +- .../world/level/tile/ThinFenceTile.h | 6 +- targets/minecraft/world/level/tile/Tile.cpp | 380 +++--- targets/minecraft/world/level/tile/Tile.h | 22 +- .../minecraft/world/level/tile/TntTile.cpp | 6 +- .../world/level/tile/TopSnowTile.cpp | 2 +- .../minecraft/world/level/tile/TreeTile.cpp | 12 +- targets/minecraft/world/level/tile/TreeTile.h | 4 +- .../level/tile/WeightedPressurePlateTile.cpp | 2 +- .../level/tile/WeightedPressurePlateTile.h | 2 +- .../minecraft/world/level/tile/WoodTile.cpp | 6 +- targets/minecraft/world/level/tile/WoodTile.h | 2 +- .../world/level/tile/WorkbenchTile.cpp | 6 +- .../level/tile/entity/BeaconTileEntity.cpp | 22 +- .../level/tile/entity/BeaconTileEntity.h | 8 +- .../tile/entity/BrewingStandTileEntity.cpp | 26 +- .../tile/entity/BrewingStandTileEntity.h | 8 +- .../level/tile/entity/ChestTileEntity.cpp | 26 +- .../world/level/tile/entity/ChestTileEntity.h | 8 +- .../level/tile/entity/CommandBlockEntity.cpp | 28 +- .../level/tile/entity/CommandBlockEntity.h | 18 +- .../tile/entity/ComparatorTileEntity.cpp | 4 +- .../level/tile/entity/DispenserTileEntity.cpp | 22 +- .../level/tile/entity/DispenserTileEntity.h | 8 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.h | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 14 +- .../tile/entity/EnchantmentTableTileEntity.h | 8 +- .../level/tile/entity/FurnaceTileEntity.cpp | 34 +- .../level/tile/entity/FurnaceTileEntity.h | 8 +- .../level/tile/entity/HopperTileEntity.cpp | 26 +- .../level/tile/entity/HopperTileEntity.h | 8 +- .../tile/entity/MobSpawnerTileEntity.cpp | 4 +- .../level/tile/entity/MobSpawnerTileEntity.h | 2 +- .../level/tile/entity/MusicTileEntity.cpp | 4 +- .../tile/entity/PistonMovingTileEntity.cpp | 2 +- .../tile/entity/PistonPieceTileEntity.cpp | 20 +- .../level/tile/entity/SignTileEntity.cpp | 46 +- .../world/level/tile/entity/SignTileEntity.h | 8 +- .../level/tile/entity/SkullTileEntity.cpp | 18 +- .../world/level/tile/entity/SkullTileEntity.h | 6 +- .../level/tile/entity/TheEndPortalTile.cpp | 2 +- .../world/level/tile/entity/TileEntity.cpp | 64 +- .../world/level/tile/entity/TileEntity.h | 6 +- .../level/tile/piston/PistonBaseTile.cpp | 12 +- .../world/level/tile/piston/PistonBaseTile.h | 12 +- targets/minecraft/world/phys/AABB.cpp | 4 +- targets/minecraft/world/phys/AABB.h | 2 +- targets/minecraft/world/phys/Vec3.cpp | 4 +- targets/minecraft/world/phys/Vec3.h | 2 +- targets/minecraft/world/scores/Objective.cpp | 8 +- targets/minecraft/world/scores/Objective.h | 12 +- targets/minecraft/world/scores/PlayerTeam.cpp | 30 +- targets/minecraft/world/scores/PlayerTeam.h | 34 +- targets/minecraft/world/scores/Score.cpp | 4 +- targets/minecraft/world/scores/Score.h | 6 +- targets/minecraft/world/scores/Scoreboard.cpp | 42 +- targets/minecraft/world/scores/Scoreboard.h | 42 +- targets/minecraft/world/scores/Team.h | 6 +- .../world/scores/criteria/DummyCriteria.cpp | 4 +- .../world/scores/criteria/DummyCriteria.h | 6 +- .../world/scores/criteria/HealthCriteria.cpp | 2 +- .../world/scores/criteria/HealthCriteria.h | 2 +- .../scores/criteria/ObjectiveCriteria.cpp | 12 +- .../world/scores/criteria/ObjectiveCriteria.h | 4 +- targets/nbt/include/nbt/ByteArrayTag.h | 12 +- targets/nbt/include/nbt/ByteTag.h | 12 +- targets/nbt/include/nbt/CompoundTag.h | 70 +- targets/nbt/include/nbt/DoubleTag.h | 12 +- targets/nbt/include/nbt/EndTag.h | 6 +- targets/nbt/include/nbt/FloatTag.h | 12 +- targets/nbt/include/nbt/IntArrayTag.h | 12 +- targets/nbt/include/nbt/IntTag.h | 12 +- targets/nbt/include/nbt/ListTag.h | 18 +- targets/nbt/include/nbt/LongTag.h | 12 +- targets/nbt/include/nbt/ShortTag.h | 12 +- targets/nbt/include/nbt/StringTag.h | 8 +- targets/nbt/include/nbt/Tag.h | 16 +- targets/nbt/src/Tag.cpp | 48 +- targets/platform/C4JThread.cpp | 8 +- targets/platform/IPlatformLeaderboard.h | 2 +- targets/platform/IPlatformNetwork.h | 4 +- targets/platform/IPlatformSound.h | 10 +- targets/platform/IPlatformUIController.h | 2 +- targets/platform/NetTypes.h | 2 +- targets/platform/PlatformTypes.h | 8 +- targets/platform/XboxStubs.h | 6 +- targets/platform/input/IPlatformInput.h | 6 +- targets/platform/input/sdl2/SDL2Input.cpp | 4 +- targets/platform/input/sdl2/SDL2Input.h | 6 +- targets/platform/profile/IPlatformProfile.h | 2 +- targets/platform/profile/stub/StubProfile.cpp | 6 +- targets/platform/profile/stub/StubProfile.h | 2 +- targets/platform/renderer/IPlatformRenderer.h | 2 +- targets/platform/renderer/gl/GLRenderer.h | 2 +- targets/platform/renderer/gl/render_stubs.cpp | 2 +- targets/platform/storage/IPlatformStorage.h | 24 +- targets/platform/storage/stub/StubStorage.cpp | 20 +- targets/platform/storage/stub/StubStorage.h | 22 +- targets/platform/stubs.h | 4 +- .../XboxMedia/Media/xuiscene_DLCMain.h | 74 +- .../XboxMedia/Media/xuiscene_DLCMain_480.h | 64 +- .../XboxMedia/Media/xuiscene_DLCOffers.h | 122 +- .../XboxMedia/Media/xuiscene_DLCOffers_480.h | 100 +- .../Media/xuiscene_NewUpdateMessage.h | 4 +- .../Media/xuiscene_NewUpdateMessage_480.h | 4 +- .../XboxMedia/Media/xuiscene_anvil.h | 624 ++++----- .../XboxMedia/Media/xuiscene_anvil_480.h | 738 +++++------ .../XboxMedia/Media/xuiscene_anvil_small.h | 780 +++++------ .../resources/XboxMedia/Media/xuiscene_base.h | 352 ++--- .../XboxMedia/Media/xuiscene_base_480.h | 344 ++--- .../XboxMedia/Media/xuiscene_base_small.h | 160 +-- .../XboxMedia/Media/xuiscene_beacon.h | 812 ++++++------ .../XboxMedia/Media/xuiscene_brewingstand.h | 408 +++--- .../Media/xuiscene_brewingstand_480.h | 464 +++---- .../Media/xuiscene_brewingstand_Small.h | 340 ++--- .../resources/XboxMedia/Media/xuiscene_chat.h | 44 +- .../XboxMedia/Media/xuiscene_chat_480.h | 44 +- .../XboxMedia/Media/xuiscene_chat_small.h | 44 +- .../Media/xuiscene_connectingprogress.h | 44 +- .../Media/xuiscene_connectingprogress_480.h | 44 +- .../Media/xuiscene_connectingprogress_small.h | 44 +- .../XboxMedia/Media/xuiscene_container.h | 130 +- .../XboxMedia/Media/xuiscene_container_480.h | 238 ++-- .../Media/xuiscene_container_large_480.h | 346 ++--- .../Media/xuiscene_container_large_Small.h | 130 +- .../Media/xuiscene_container_small.h | 130 +- .../XboxMedia/Media/xuiscene_controls.h | 130 +- .../XboxMedia/Media/xuiscene_controls_480.h | 134 +- .../XboxMedia/Media/xuiscene_controls_small.h | 130 +- .../Media/xuiscene_craftingpanel_2x2.h | 394 +++--- .../Media/xuiscene_craftingpanel_2x2_480.h | 422 +++--- .../Media/xuiscene_craftingpanel_2x2_small.h | 386 +++--- .../Media/xuiscene_craftingpanel_3x3.h | 426 +++--- .../Media/xuiscene_craftingpanel_3x3_480.h | 422 +++--- .../Media/xuiscene_craftingpanel_3x3_small.h | 422 +++--- .../XboxMedia/Media/xuiscene_credits.h | 62 +- .../XboxMedia/Media/xuiscene_credits_480.h | 62 +- .../XboxMedia/Media/xuiscene_death.h | 8 +- .../XboxMedia/Media/xuiscene_death_480.h | 8 +- .../XboxMedia/Media/xuiscene_death_small.h | 8 +- .../XboxMedia/Media/xuiscene_debug.h | 12 +- .../XboxMedia/Media/xuiscene_debug_480.h | 10 +- .../Media/xuiscene_debug_item_editor.h | 24 +- .../Media/xuiscene_debug_schematic_create.h | 38 +- .../Media/xuiscene_debug_set_camera.h | 26 +- .../XboxMedia/Media/xuiscene_debug_small.h | 4 +- .../XboxMedia/Media/xuiscene_debugoverlay.h | 50 +- .../Media/xuiscene_debugoverlay_480.h | 26 +- .../XboxMedia/Media/xuiscene_debugtips.h | 4 +- .../XboxMedia/Media/xuiscene_debugtips_480.h | 4 +- .../Media/xuiscene_debugtips_small.h | 4 +- .../XboxMedia/Media/xuiscene_enchant.h | 406 +++--- .../XboxMedia/Media/xuiscene_enchant_480.h | 398 +++--- .../XboxMedia/Media/xuiscene_enchant_small.h | 432 +++--- .../XboxMedia/Media/xuiscene_fireworks.h | 332 ++--- .../Media/xuiscene_fullscreenprogress.h | 46 +- .../Media/xuiscene_fullscreenprogress_480.h | 46 +- .../Media/xuiscene_fullscreenprogress_small.h | 46 +- .../XboxMedia/Media/xuiscene_furnace.h | 90 +- .../XboxMedia/Media/xuiscene_furnace_480.h | 206 +-- .../XboxMedia/Media/xuiscene_furnace_Small.h | 122 +- .../XboxMedia/Media/xuiscene_helpandoptions.h | 50 +- .../Media/xuiscene_helpandoptions_480.h | 50 +- .../Media/xuiscene_helpandoptions_small.h | 50 +- .../XboxMedia/Media/xuiscene_hopper.h | 198 +-- .../XboxMedia/Media/xuiscene_hopper_480.h | 282 ++-- .../XboxMedia/Media/xuiscene_hopper_small.h | 198 +-- .../XboxMedia/Media/xuiscene_horse.h | 320 ++--- .../XboxMedia/Media/xuiscene_horse_480.h | 418 +++--- .../XboxMedia/Media/xuiscene_horse_small.h | 326 ++--- .../XboxMedia/Media/xuiscene_howtoplay.h | 146 +- .../XboxMedia/Media/xuiscene_howtoplay_480.h | 144 +- .../XboxMedia/Media/xuiscene_howtoplay_menu.h | 18 +- .../Media/xuiscene_howtoplay_menu_480.h | 10 +- .../Media/xuiscene_howtoplay_menu_small.h | 8 +- .../Media/xuiscene_howtoplay_small.h | 144 +- .../resources/XboxMedia/Media/xuiscene_hud.h | 124 +- .../XboxMedia/Media/xuiscene_hud_480.h | 124 +- .../XboxMedia/Media/xuiscene_hud_small.h | 124 +- .../Media/xuiscene_ingame_host_options.h | 12 +- .../Media/xuiscene_ingame_host_options_480.h | 12 +- .../xuiscene_ingame_host_options_small.h | 12 +- .../Media/xuiscene_ingame_player_options.h | 28 +- .../xuiscene_ingame_player_options_480.h | 28 +- .../xuiscene_ingame_player_options_small.h | 28 +- .../XboxMedia/Media/xuiscene_ingameinfo.h | 14 +- .../XboxMedia/Media/xuiscene_ingameinfo_480.h | 14 +- .../Media/xuiscene_ingameinfo_small.h | 16 +- .../XboxMedia/Media/xuiscene_intro.h | 12 +- .../XboxMedia/Media/xuiscene_intro_480.h | 12 +- .../XboxMedia/Media/xuiscene_inventory.h | 198 +-- .../XboxMedia/Media/xuiscene_inventory_480.h | 274 ++-- .../Media/xuiscene_inventory_creative.h | 1036 +++++++-------- .../Media/xuiscene_inventory_creative_480.h | 1016 +++++++------- .../Media/xuiscene_inventory_creative_small.h | 894 ++++++------- .../Media/xuiscene_inventory_small.h | 242 ++-- .../XboxMedia/Media/xuiscene_leaderboards.h | 34 +- .../Media/xuiscene_leaderboards_480.h | 34 +- .../XboxMedia/Media/xuiscene_load_settings.h | 74 +- .../Media/xuiscene_load_settings_480.h | 74 +- .../resources/XboxMedia/Media/xuiscene_main.h | 52 +- .../XboxMedia/Media/xuiscene_main_480.h | 52 +- .../XboxMedia/Media/xuiscene_multi_create.h | 70 +- .../Media/xuiscene_multi_create_480.h | 76 +- .../XboxMedia/Media/xuiscene_multi_gameinfo.h | 58 +- .../Media/xuiscene_multi_gameinfo_480.h | 56 +- .../XboxMedia/Media/xuiscene_multi_joinload.h | 92 +- .../Media/xuiscene_multi_joinload_480.h | 104 +- .../xuiscene_multi_launch_more_options.h | 36 +- .../xuiscene_multi_launch_more_options_480.h | 36 +- .../Media/xuiscene_partnernetpassword.h | 8 +- .../Media/xuiscene_partnernetpassword_480.h | 8 +- .../XboxMedia/Media/xuiscene_pause.h | 14 +- .../XboxMedia/Media/xuiscene_pause_480.h | 14 +- .../XboxMedia/Media/xuiscene_pause_small.h | 14 +- .../XboxMedia/Media/xuiscene_reinstall.h | 16 +- .../XboxMedia/Media/xuiscene_reinstall_480.h | 16 +- .../Media/xuiscene_reinstall_small.h | 16 +- .../XboxMedia/Media/xuiscene_savemessage.h | 8 +- .../Media/xuiscene_savemessage_480.h | 8 +- .../XboxMedia/Media/xuiscene_settings_All.h | 14 +- .../Media/xuiscene_settings_All_480.h | 14 +- .../Media/xuiscene_settings_All_small.h | 14 +- .../XboxMedia/Media/xuiscene_settings_Audio.h | 14 +- .../Media/xuiscene_settings_Audio_480.h | 14 +- .../Media/xuiscene_settings_Audio_small.h | 14 +- .../Media/xuiscene_settings_Control.h | 14 +- .../Media/xuiscene_settings_Control_480.h | 14 +- .../Media/xuiscene_settings_Control_small.h | 14 +- .../Media/xuiscene_settings_Graphics.h | 20 +- .../Media/xuiscene_settings_Graphics_480.h | 20 +- .../Media/xuiscene_settings_Graphics_small.h | 20 +- .../XboxMedia/Media/xuiscene_settings_UI.h | 26 +- .../Media/xuiscene_settings_UI_480.h | 26 +- .../Media/xuiscene_settings_UI_small.h | 26 +- .../Media/xuiscene_settings_options.h | 26 +- .../Media/xuiscene_settings_options_480.h | 26 +- .../Media/xuiscene_settings_options_small.h | 26 +- .../XboxMedia/Media/xuiscene_signentry.h | 16 +- .../XboxMedia/Media/xuiscene_signentry_480.h | 16 +- .../Media/xuiscene_signentry_small.h | 16 +- .../XboxMedia/Media/xuiscene_skinselect.h | 90 +- .../XboxMedia/Media/xuiscene_skinselect_480.h | 90 +- .../Media/xuiscene_skinselect_small.h | 84 +- .../XboxMedia/Media/xuiscene_socialpost.h | 14 +- .../XboxMedia/Media/xuiscene_socialpost_480.h | 14 +- .../Media/xuiscene_socialpost_small.h | 14 +- .../XboxMedia/Media/xuiscene_teleportmenu.h | 18 +- .../Media/xuiscene_teleportmenu_480.h | 18 +- .../Media/xuiscene_teleportmenu_small.h | 18 +- .../XboxMedia/Media/xuiscene_text_entry.h | 4 +- .../XboxMedia/Media/xuiscene_trading.h | 970 +++++++------- .../XboxMedia/Media/xuiscene_trading_480.h | 926 ++++++------- .../XboxMedia/Media/xuiscene_trading_small.h | 890 ++++++------- .../resources/XboxMedia/Media/xuiscene_trap.h | 106 +- .../XboxMedia/Media/xuiscene_trap_480.h | 190 +-- .../XboxMedia/Media/xuiscene_trap_small.h | 106 +- .../Media/xuiscene_trialexitupsell.h | 6 +- .../Media/xuiscene_trialexitupsell_480.h | 6 +- .../XboxMedia/Media/xuiscene_tutorialpopup.h | 12 +- .../Media/xuiscene_tutorialpopup_480.h | 12 +- .../Media/xuiscene_tutorialpopup_small.h | 12 +- .../resources/XboxMedia/Media/xuiscene_win.h | 8 +- .../XboxMedia/Media/xuiscene_win_480.h | 8 +- targets/util/StringHelpers.cpp | 109 +- targets/util/StringHelpers.h | 36 +- 1323 files changed, 23207 insertions(+), 23399 deletions(-) diff --git a/targets/app/common/AppGameServices.cpp b/targets/app/common/AppGameServices.cpp index 1795a00fb..e181f1b02 100644 --- a/targets/app/common/AppGameServices.cpp +++ b/targets/app/common/AppGameServices.cpp @@ -8,7 +8,7 @@ AppGameServices::AppGameServices(Game& game, IMenuService& menus) // -- Strings -- -const wchar_t* AppGameServices::getString(int id) { +const char* AppGameServices::getString(int id) { return Game::GetString(id); } @@ -61,23 +61,23 @@ LevelRuleset* AppGameServices::getGameRuleDefinitions() { // -- Texture cache -- -void AppGameServices::addMemoryTextureFile(const std::wstring& name, +void AppGameServices::addMemoryTextureFile(const std::string& name, std::uint8_t* data, unsigned int size) { game_.AddMemoryTextureFile(name, data, size); } -void AppGameServices::removeMemoryTextureFile(const std::wstring& name) { +void AppGameServices::removeMemoryTextureFile(const std::string& name) { game_.RemoveMemoryTextureFile(name); } -void AppGameServices::getMemFileDetails(const std::wstring& name, +void AppGameServices::getMemFileDetails(const std::string& name, std::uint8_t** data, unsigned int* size) { game_.GetMemFileDetails(name, data, size); } -bool AppGameServices::isFileInMemoryTextures(const std::wstring& name) { +bool AppGameServices::isFileInMemoryTextures(const std::string& name) { return game_.IsFileInMemoryTextures(name); } @@ -208,7 +208,7 @@ void AppGameServices::setTMSAction(int iPad, eTMSAction action) { // -- Skin / cape / animation -- -std::wstring AppGameServices::getPlayerSkinName(int iPad) { +std::string AppGameServices::getPlayerSkinName(int iPad) { return game_.GetPlayerSkinName(iPad); } @@ -216,7 +216,7 @@ std::uint32_t AppGameServices::getPlayerSkinId(int iPad) { return game_.GetPlayerSkinId(iPad); } -std::wstring AppGameServices::getPlayerCapeName(int iPad) { +std::string AppGameServices::getPlayerCapeName(int iPad) { return game_.GetPlayerCapeName(iPad); } @@ -259,11 +259,11 @@ unsigned int AppGameServices::getAnimOverrideBitmask( return game_.GetAnimOverrideBitmask(dwSkinID); } -std::uint32_t AppGameServices::getSkinIdFromPath(const std::wstring& skin) { +std::uint32_t AppGameServices::getSkinIdFromPath(const std::string& skin) { return Game::getSkinIdFromPath(skin); } -std::wstring AppGameServices::getSkinPathFromId(std::uint32_t skinId) { +std::string AppGameServices::getSkinPathFromId(std::uint32_t skinId) { return Game::getSkinPathFromId(skinId); } @@ -340,12 +340,12 @@ void AppGameServices::loadDefaultGameRules() { // -- Archive / resources -- -bool AppGameServices::hasArchiveFile(const std::wstring& filename) { +bool AppGameServices::hasArchiveFile(const std::string& filename) { return game_.hasArchiveFile(filename); } std::vector AppGameServices::getArchiveFile( - const std::wstring& filename) { + const std::string& filename) { return game_.getArchiveFile(filename); } @@ -355,11 +355,11 @@ int AppGameServices::getHTMLColour(eMinecraftColour colour) { return game_.GetHTMLColour(colour); } -std::wstring AppGameServices::getEntityName(EntityTypeId type) { +std::string AppGameServices::getEntityName(EntityTypeId type) { return game_.getEntityName(static_cast(type)); } -const wchar_t* AppGameServices::getGameRulesString(const std::wstring& key) { +const char* AppGameServices::getGameRulesString(const std::string& key) { return game_.GetGameRulesString(key); } @@ -371,10 +371,10 @@ unsigned int AppGameServices::createImageTextData(std::uint8_t* textMetadata, uiHostOptions, uiTexturePackId); } -std::wstring AppGameServices::getFilePath(std::uint32_t packId, - std::wstring filename, +std::string AppGameServices::getFilePath(std::uint32_t packId, + std::string filename, bool bAddDataFolder, - std::wstring mountPoint) { + std::string mountPoint) { return game_.getFilePath(packId, filename, bAddDataFolder, mountPoint); } @@ -413,7 +413,7 @@ void AppGameServices::debugPrintf(const char* msg) { // -- DLC -- -DLCSkinFile* AppGameServices::getDLCSkinFile(const std::wstring& name) { +DLCSkinFile* AppGameServices::getDLCSkinFile(const std::string& name) { return game_.m_dlcManager.getSkinFile(name); } bool AppGameServices::dlcNeedsCorruptCheck() { @@ -423,7 +423,7 @@ unsigned int AppGameServices::dlcCheckForCorrupt(bool showMessage) { return game_.m_dlcManager.checkForCorruptDLCAndAlert(showMessage); } bool AppGameServices::dlcReadDataFile(unsigned int& filesProcessed, - const std::wstring& path, + const std::string& path, DLCPack* pack, bool fromArchive) { return game_.m_dlcManager.readDLCDataFile(filesProcessed, path, pack, fromArchive); @@ -450,7 +450,7 @@ void AppGameServices::setLevelGenerationOptions(LevelGenerationOptions* levelGen // -- Shared data -- -std::vector& AppGameServices::getSkinNames() { +std::vector& AppGameServices::getSkinNames() { return game_.vSkinNames; } diff --git a/targets/app/common/AppGameServices.h b/targets/app/common/AppGameServices.h index 754b2c92a..51891379d 100644 --- a/targets/app/common/AppGameServices.h +++ b/targets/app/common/AppGameServices.h @@ -10,7 +10,7 @@ public: AppGameServices(Game& game, IMenuService& menus); // -- Strings -- - const wchar_t* getString(int id) override; + const char* getString(int id) override; // -- Debug settings -- bool debugSettingsOn() override; @@ -30,12 +30,12 @@ public: LevelRuleset* getGameRuleDefinitions() override; // -- Texture cache -- - void addMemoryTextureFile(const std::wstring& name, std::uint8_t* data, + void addMemoryTextureFile(const std::string& name, std::uint8_t* data, unsigned int size) override; - void removeMemoryTextureFile(const std::wstring& name) override; - void getMemFileDetails(const std::wstring& name, std::uint8_t** data, + void removeMemoryTextureFile(const std::string& name) override; + void getMemFileDetails(const std::string& name, std::uint8_t** data, unsigned int* size) override; - bool isFileInMemoryTextures(const std::wstring& name) override; + bool isFileInMemoryTextures(const std::string& name) override; // -- Player settings -- unsigned char getGameSettings(int iPad, int setting) override; @@ -86,9 +86,9 @@ public: void setTMSAction(int iPad, eTMSAction action) override; // -- Skin / cape / animation -- - std::wstring getPlayerSkinName(int iPad) override; + std::string getPlayerSkinName(int iPad) override; std::uint32_t getPlayerSkinId(int iPad) override; - std::wstring getPlayerCapeName(int iPad) override; + std::string getPlayerCapeName(int iPad) override; std::uint32_t getPlayerCapeId(int iPad) override; std::uint32_t getAdditionalModelPartsForPad(int iPad) override; void setAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* boxA, @@ -102,8 +102,8 @@ public: void setAnimOverrideBitmask(std::uint32_t dwSkinID, unsigned int bitmask) override; unsigned int getAnimOverrideBitmask(std::uint32_t dwSkinID) override; - std::uint32_t getSkinIdFromPath(const std::wstring& skin) override; - std::wstring getSkinPathFromId(std::uint32_t skinId) override; + std::uint32_t getSkinIdFromPath(const std::string& skin) override; + std::string getSkinPathFromId(std::uint32_t skinId) override; bool defaultCapeExists() override; bool isXuidNotch(PlayerUID xuid) override; bool isXuidDeadmau5(PlayerUID xuid) override; @@ -131,21 +131,21 @@ public: void loadDefaultGameRules() override; // -- Archive / resources -- - bool hasArchiveFile(const std::wstring& filename) override; + bool hasArchiveFile(const std::string& filename) override; std::vector getArchiveFile( - const std::wstring& filename) override; + const std::string& filename) override; // -- Strings / formatting / misc queries -- int getHTMLColour(eMinecraftColour colour) override; - std::wstring getEntityName(EntityTypeId type) override; - const wchar_t* getGameRulesString(const std::wstring& key) override; + std::string getEntityName(EntityTypeId type) override; + const char* getGameRulesString(const std::string& key) override; unsigned int createImageTextData(std::uint8_t* textMetadata, int64_t seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId) override; - std::wstring getFilePath(std::uint32_t packId, std::wstring filename, + std::string getFilePath(std::uint32_t packId, std::string filename, bool bAddDataFolder, - std::wstring mountPoint) override; + std::string mountPoint) override; char* getUniqueMapName() override; void setUniqueMapName(char* name) override; unsigned int getOpacityTimer(int iPad) override; @@ -157,11 +157,11 @@ public: void debugPrintf(const char* msg) override; // -- DLC -- - DLCSkinFile* getDLCSkinFile(const std::wstring& name) override; + DLCSkinFile* getDLCSkinFile(const std::string& name) override; bool dlcNeedsCorruptCheck() override; unsigned int dlcCheckForCorrupt(bool showMessage) override; bool dlcReadDataFile(unsigned int& filesProcessed, - const std::wstring& path, DLCPack* pack, + const std::string& path, DLCPack* pack, bool fromArchive) override; void dlcRemovePack(DLCPack* pack) override; @@ -173,7 +173,7 @@ public: void setLevelGenerationOptions(LevelGenerationOptions* levelGen) override; // -- Shared data -- - std::vector& getSkinNames() override; + std::vector& getSkinNames() override; std::vector& getTerrainFeatures() override; // -- Menu service -- diff --git a/targets/app/common/App_structs.h b/targets/app/common/App_structs.h index 4ffa65c1e..a128211e7 100644 --- a/targets/app/common/App_structs.h +++ b/targets/app/common/App_structs.h @@ -13,7 +13,7 @@ #include "platform/XboxStubs.h" typedef struct { - wchar_t* wchFilename; + char* wchFilename; eFileExtensionType eEXT; eTMSFileType eTMSType; std::uint8_t* pbData; @@ -150,8 +150,8 @@ typedef struct { uint64_t ullOfferID_Full; uint64_t ullOfferID_Trial; - wchar_t wchBanner[MAX_BANNERNAME_SIZE]; - wchar_t wchDataFile[MAX_BANNERNAME_SIZE]; + char wchBanner[MAX_BANNERNAME_SIZE]; + char wchDataFile[MAX_BANNERNAME_SIZE]; int iGender; int iConfig; unsigned int uiSortIndex; @@ -176,7 +176,7 @@ typedef struct _TMSPPRequest { // char szFilename[MAX_TMSFILENAME_SIZE]; int (*CallbackFunc)(void*, int, int, IPlatformStorage::PTMSPP_FILEDATA, const char* szFilename); - wchar_t wchFilename[MAX_TMSFILENAME_SIZE]; + char wchFilename[MAX_TMSFILENAME_SIZE]; void* lpCallbackParam; } TMSPPRequest; diff --git a/targets/app/common/ArchiveManager.cpp b/targets/app/common/ArchiveManager.cpp index 9ca8bf20a..6ad335052 100644 --- a/targets/app/common/ArchiveManager.cpp +++ b/targets/app/common/ArchiveManager.cpp @@ -16,18 +16,18 @@ ArchiveManager::ArchiveManager() : m_mediaArchive(nullptr), m_dwRequiredTexturePackID(0) {} void ArchiveManager::loadMediaArchive() { - std::wstring mediapath = L""; + std::string mediapath = ""; #if _WINDOWS64 - mediapath = L"Common\\Media\\MediaWindows64.arc"; + mediapath = "Common\\Media\\MediaWindows64.arc"; #elif __linux__ - mediapath = L"app/common/Media/MediaLinux.arc"; + mediapath = "app/common/Media/MediaLinux.arc"; #endif if (!mediapath.empty()) { #if defined(__linux__) - std::wstring exeDirW = PlatformFilesystem.getBasePath().wstring(); - std::wstring candidate = exeDirW + File::pathSeparator + mediapath; + std::string exeDirW = PlatformFilesystem.getBasePath().string(); + std::string candidate = exeDirW + File::pathSeparator + mediapath; if (File(candidate).exists()) { m_mediaArchive = new ArchiveFile(File(candidate)); } else { @@ -39,7 +39,7 @@ void ArchiveManager::loadMediaArchive() { } } -int ArchiveManager::getArchiveFileSize(const std::wstring& filename) { +int ArchiveManager::getArchiveFileSize(const std::string& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft && pMinecraft->skins) @@ -51,7 +51,7 @@ int ArchiveManager::getArchiveFileSize(const std::wstring& filename) { return m_mediaArchive->getFileSize(filename); } -bool ArchiveManager::hasArchiveFile(const std::wstring& filename) { +bool ArchiveManager::hasArchiveFile(const std::string& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft && pMinecraft->skins) @@ -64,7 +64,7 @@ bool ArchiveManager::hasArchiveFile(const std::wstring& filename) { } std::vector ArchiveManager::getArchiveFile( - const std::wstring& filename) { + const std::string& filename) { TexturePack* tPack = nullptr; Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft && pMinecraft->skins) @@ -102,7 +102,7 @@ void ArchiveManager::removeMemoryTPDFile(int iConfig) { } } -int ArchiveManager::getTPConfigVal(wchar_t* pwchDataFile) { return -1; } +int ArchiveManager::getTPConfigVal(char* pwchDataFile) { return -1; } bool ArchiveManager::isFileInTPD(int iConfig) { bool val = false; diff --git a/targets/app/common/ArchiveManager.h b/targets/app/common/ArchiveManager.h index cea9c01e5..1a4533738 100644 --- a/targets/app/common/ArchiveManager.h +++ b/targets/app/common/ArchiveManager.h @@ -17,9 +17,9 @@ public: void loadMediaArchive(); ArchiveFile* getMediaArchive() const { return m_mediaArchive; } - int getArchiveFileSize(const std::wstring& filename); - bool hasArchiveFile(const std::wstring& filename); - std::vector getArchiveFile(const std::wstring& filename); + int getArchiveFileSize(const std::string& filename); + bool hasArchiveFile(const std::string& filename); + std::vector getArchiveFile(const std::string& filename); // Texture Pack Data files (icon, banner, comparison shot & text) void addMemoryTPDFile(int iConfig, std::uint8_t* pbData, @@ -28,7 +28,7 @@ public: bool isFileInTPD(int iConfig); void getTPD(int iConfig, std::uint8_t** ppbData, unsigned int* pByteCount); int getTPDSize() { return m_MEM_TPD.size(); } - int getTPConfigVal(wchar_t* pwchDataFile); + int getTPConfigVal(char* pwchDataFile); void setRequiredTexturePackID(std::uint32_t texturePackId) { m_dwRequiredTexturePackID = texturePackId; diff --git a/targets/app/common/Audio/Consoles_SoundEngine.h b/targets/app/common/Audio/Consoles_SoundEngine.h index f26c680fb..9616dcfc2 100644 --- a/targets/app/common/Audio/Consoles_SoundEngine.h +++ b/targets/app/common/Audio/Consoles_SoundEngine.h @@ -33,7 +33,7 @@ public: virtual void destroy() = 0; virtual void play(int iSound, float x, float y, float z, float volume, float pitch) = 0; - virtual void playStreaming(const std::wstring& name, float x, float y, + virtual void playStreaming(const std::string& name, float x, float y, float z, float volume, float pitch, bool bMusicDelay = true) = 0; virtual void playUI(int iSound, float volume, float pitch) = 0; @@ -41,10 +41,10 @@ public: virtual void updateSystemMusicPlaying(bool isPlaying) = 0; virtual void updateSoundEffectVolume(float fVal) = 0; virtual void init(Options*) = 0; - virtual void add(const std::wstring& name, File* file) = 0; - virtual void addMusic(const std::wstring& name, File* file) = 0; - virtual void addStreaming(const std::wstring& name, File* file) = 0; - virtual char* ConvertSoundPathToName(const std::wstring& name, + virtual void add(const std::string& name, File* file) = 0; + virtual void addMusic(const std::string& name, File* file) = 0; + virtual void addStreaming(const std::string& name, File* file) = 0; + virtual char* ConvertSoundPathToName(const std::string& name, bool bConvertSpaces) = 0; virtual void playMusicTick() = 0; @@ -57,8 +57,8 @@ public: virtual void SetIsPlayingEndMusic(bool bVal); virtual void SetIsPlayingNetherMusic(bool bVal); - static const wchar_t* wchSoundNames[eSoundType_MAX]; - static const wchar_t* wchUISoundNames[eSFX_MAX]; + static const char* wchSoundNames[eSoundType_MAX]; + static const char* wchUISoundNames[eSFX_MAX]; public: void tick(); diff --git a/targets/app/common/Audio/SoundEngine.cpp b/targets/app/common/Audio/SoundEngine.cpp index 08bb3ebb2..9be84139d 100644 --- a/targets/app/common/Audio/SoundEngine.cpp +++ b/targets/app/common/Audio/SoundEngine.cpp @@ -117,13 +117,6 @@ char SoundEngine::m_szRedistName[] = {"redist64"}; // Linux specific functions #if defined(__linux__) -std::wstring stws(const char* utf8) { - size_t len = std::mbstowcs(nullptr, utf8, 0); - if (len == static_cast(-1)) return L""; - std::wstring result(len, L'\0'); - std::mbstowcs(&result[0], utf8, len); - return result; -} SoundEngine::SoundEngine() {} std::vector m_activeSounds; void SoundEngine::init(Options* pOptions) { @@ -179,7 +172,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, float pitch) { if (iSound == -1) return; char szId[256]; - wcstombs(szId, wchSoundNames[iSound], 255); + strncpy(szId, wchSoundNames[iSound], 255); for (int i = 0; szId[i]; i++) if (szId[i] == '.') szId[i] = '/'; @@ -245,9 +238,9 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, void SoundEngine::playUI(int iSound, float volume, float pitch) { char szIdentifier[256]; if (iSound >= eSFX_MAX) - wcstombs(szIdentifier, wchSoundNames[iSound], 255); + strncpy(szIdentifier, wchSoundNames[iSound], 255); else - wcstombs(szIdentifier, wchUISoundNames[iSound], 255); + strncpy(szIdentifier, wchUISoundNames[iSound], 255); for (int i = 0; szIdentifier[i]; i++) if (szIdentifier[i] == '.') szIdentifier[i] = '/'; std::string base = PlatformFilesystem.getBasePath().string() + "/"; @@ -341,12 +334,12 @@ int SoundEngine::getMusicID(int iDomain) { } } -int SoundEngine::getMusicID(const std::wstring& name) { +int SoundEngine::getMusicID(const std::string& name) { int iCD = 0; for (size_t i = 0; i < 12; i++) { - std::wstring fileNameW = stws(m_szStreamFileA[i + eStream_CD_1]); + std::string fileName = m_szStreamFileA[i + eStream_CD_1]; - if (name == fileNameW) { + if (name == fileName) { iCD = static_cast(i); break; } @@ -354,7 +347,7 @@ int SoundEngine::getMusicID(const std::wstring& name) { return iCD + m_iStream_CD_1; } -void SoundEngine::playStreaming(const std::wstring& name, float x, float y, +void SoundEngine::playStreaming(const std::string& name, float x, float y, float z, float volume, float pitch, bool bMusicDelay) { m_StreamingAudioInfo.x = x; @@ -1201,7 +1194,7 @@ void SoundEngine::destroy() {} #if defined(_DEBUG) void SoundEngine::GetSoundName(char* szSoundName, int iSound) { strcpy((char*)szSoundName, "Minecraft/"); - std::wstring name = wchSoundNames[iSound]; + std::string name = wchSoundNames[iSound]; char* SoundName = (char*)ConvertSoundPathToName(name); strcat((char*)szSoundName, SoundName); } @@ -1224,7 +1217,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, /* // if we are already playing loads of this sounds ignore this one if(CurrentSoundsPlaying[iSound+eSFX_MAX]>MAX_SAME_SOUNDS_PLAYING) { - // std::wstring name = wchSoundNames[iSound]; + // std::string name = wchSoundNames[iSound]; // char *SoundName = (char *)ConvertSoundPathToName(name); // app.DebugPrintf("Too many %s sounds playing!\n",SoundName); return; @@ -1236,9 +1229,9 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, strcpy((char*)szSoundName, "Minecraft/"); #if defined(DISTORTION_TEST) - std::wstring name = wchSoundNames[eSoundType_MOB_ENDERDRAGON_GROWL]; + std::string name = wchSoundNames[eSoundType_MOB_ENDERDRAGON_GROWL]; #else - std::wstring name = wchSoundNames[iSound]; + std::string name = wchSoundNames[iSound]; #endif char* SoundName = (char*)ConvertSoundPathToName(name); @@ -1272,7 +1265,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, ///////////////////////////////////////////// void SoundEngine::playUI(int iSound, float volume, float pitch) { U8 szSoundName[256]; - std::wstring name; + std::string name; // we have some game sounds played as UI sounds... // Not the best way to do this, but it seems to only be the portal sounds @@ -1331,7 +1324,7 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) { // playStreaming // ///////////////////////////////////////////// -void SoundEngine::playStreaming(const std::wstring& name, float x, float y, +void SoundEngine::playStreaming(const std::string& name, float x, float y, float z, float volume, float pitch, bool bMusicDelay) { // This function doesn't actually play a streaming sound, just sets states @@ -1462,10 +1455,10 @@ void SoundEngine::playMusicUpdate() { m_MusicType = eMusicType_Game; m_StreamingAudioInfo.bIs3D = false; - std::wstring& wstrSoundName = + std::string& wstrSoundName = dlcAudioFile->GetSoundName(m_musicID); char szName[255]; - wcstombs(szName, wstrSoundName.c_str(), 255); + strncpy(szName, wstrSoundName.c_str(), 255); std::string strFile = "TPACK:\\Data\\" + string(szName) + ".binka"; @@ -1508,7 +1501,7 @@ void SoundEngine::playMusicUpdate() { strcat((char*)m_szStreamName, ".binka"); } - // std::wstring name = + // std::string name = // m_szStreamFileA[m_musicID];char*SoundName=(char // *)ConvertSoundPathToName(name);strcat((char // *)szStreamName,SoundName); @@ -1910,14 +1903,14 @@ float SoundEngine::getMasterMusicVolume() { return m_MasterMusicVolume; } } -void SoundEngine::add(const std::wstring& name, File* file) {} +void SoundEngine::add(const std::string& name, File* file) {} -void SoundEngine::addMusic(const std::wstring& name, File* file) {} -void SoundEngine::addStreaming(const std::wstring& name, File* file) {} +void SoundEngine::addMusic(const std::string& name, File* file) {} +void SoundEngine::addStreaming(const std::string& name, File* file) {} bool SoundEngine::isStreamingWavebankReady() { return true; } // This is unused by the linux version, it'll need to be changed -char* SoundEngine::ConvertSoundPathToName(const std::wstring& name, +char* SoundEngine::ConvertSoundPathToName(const std::string& name, bool bConvertSpaces) { return nullptr; } diff --git a/targets/app/common/Audio/SoundEngine.h b/targets/app/common/Audio/SoundEngine.h index 659046f61..91b4ad585 100644 --- a/targets/app/common/Audio/SoundEngine.h +++ b/targets/app/common/Audio/SoundEngine.h @@ -105,7 +105,7 @@ public: #endif virtual void play(int iSound, float x, float y, float z, float volume, float pitch); - virtual void playStreaming(const std::wstring& name, float x, float y, + virtual void playStreaming(const std::string& name, float x, float y, float z, float volume, float pitch, bool bMusicDelay = true); virtual void playUI(int iSound, float volume, float pitch); @@ -117,14 +117,14 @@ public: virtual void tick(std::shared_ptr* players, float a); // 4J - updated to take array of local players // rather than single one - virtual void add(const std::wstring& name, File* file); - virtual void addMusic(const std::wstring& name, File* file); - virtual void addStreaming(const std::wstring& name, File* file); - virtual char* ConvertSoundPathToName(const std::wstring& name, + virtual void add(const std::string& name, File* file); + virtual void addMusic(const std::string& name, File* file); + virtual void addStreaming(const std::string& name, File* file); + virtual char* ConvertSoundPathToName(const std::string& name, bool bConvertSpaces = false); bool isStreamingWavebankReady(); // 4J Added int getMusicID(int iDomain); - int getMusicID(const std::wstring& name); + int getMusicID(const std::string& name); void SetStreamingSounds(int iOverworldMin, int iOverWorldMax, int iNetherMin, int iNetherMax, int iEndMin, int iEndMax, int iCD1); @@ -161,7 +161,7 @@ private: int m_StreamState; int m_MusicType; AUDIO_INFO m_StreamingAudioInfo; - std::wstring m_CDMusic; + std::string m_CDMusic; bool m_bSystemMusicPlaying; float m_MasterMusicVolume; float m_MasterEffectsVolume; diff --git a/targets/app/common/Audio/SoundNames.cpp b/targets/app/common/Audio/SoundNames.cpp index 63fe2f80d..5b4bbe127 100644 --- a/targets/app/common/Audio/SoundNames.cpp +++ b/targets/app/common/Audio/SoundNames.cpp @@ -1,228 +1,228 @@ #include "Consoles_SoundEngine.h" #include "minecraft/sounds/SoundTypes.h" -const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { - L"mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT - L"mob/chicken/chickenhurt", // eSoundType_MOB_CHICKEN_HURT - L"mob/chicken/chickenplop", // eSoundType_MOB_CHICKENPLOP - L"mob/cow/say", // eSoundType_MOB_COW_AMBIENT - L"mob/cow/hurt", // eSoundType_MOB_COW_HURT - L"mob/pig/pig", // eSoundType_MOB_PIG_AMBIENT - L"mob/pig/pigdeath", // eSoundType_MOB_PIG_DEATH - L"mob/sheep/sheep", // eSoundType_MOB_SHEEP_AMBIENT - L"mob/wolf/growl", // eSoundType_MOB_WOLF_GROWL - L"mob/wolf/whine", // eSoundType_MOB_WOLF_WHINE - L"mob/wolf/panting", // eSoundType_MOB_WOLF_PANTING - L"mob/wolf/bark", // eSoundType_MOB_WOLF_BARK - L"mob/wolf/hurt", // eSoundType_MOB_WOLF_HURT - L"mob/wolf/death", // eSoundType_MOB_WOLF_DEATH - L"mob/wolf/shake", // eSoundType_MOB_WOLF_SHAKE - L"mob/blaze/breathe", // eSoundType_MOB_BLAZE_BREATHE - L"mob/blaze/hit", // eSoundType_MOB_BLAZE_HURT - L"mob/blaze/death", // eSoundType_MOB_BLAZE_DEATH - L"mob/ghast/moan", // eSoundType_MOB_GHAST_MOAN - L"mob/ghast/scream", // eSoundType_MOB_GHAST_SCREAM - L"mob/ghast/death", // eSoundType_MOB_GHAST_DEATH - L"mob/ghast/fireball", // eSoundType_MOB_GHAST_FIREBALL - L"mob/ghast/charge", // eSoundType_MOB_GHAST_CHARGE - L"mob/endermen/idle", // eSoundType_MOB_ENDERMEN_IDLE - L"mob/endermen/hit", // eSoundType_MOB_ENDERMEN_HIT - L"mob/endermen/death", // eSoundType_MOB_ENDERMEN_DEATH - L"mob/endermen/portal", // eSoundType_MOB_ENDERMEN_PORTAL - L"mob/zombiepig/zpig", // eSoundType_MOB_ZOMBIEPIG_AMBIENT - L"mob/zombiepig/zpighurt", // eSoundType_MOB_ZOMBIEPIG_HURT - L"mob/zombiepig/zpigdeath", // eSoundType_MOB_ZOMBIEPIG_DEATH - L"mob/zombiepig/zpigangry", // eSoundType_MOB_ZOMBIEPIG_ZPIGANGRY - L"mob/silverfish/say", // eSoundType_MOB_SILVERFISH_AMBIENT, - L"mob/silverfish/hit", // eSoundType_MOB_SILVERFISH_HURT - L"mob/silverfish/kill", // eSoundType_MOB_SILVERFISH_DEATH, - L"mob/silverfish/step", // eSoundType_MOB_SILVERFISH_STEP, - L"mob/skeleton/skeleton", // eSoundType_MOB_SKELETON_AMBIENT, - L"mob/skeleton/skeletonhurt", // eSoundType_MOB_SKELETON_HURT, - L"mob/spider/spider", // eSoundType_MOB_SPIDER_AMBIENT, - L"mob/spider/spiderdeath", // eSoundType_MOB_SPIDER_DEATH, - L"mob/slime/slime", // eSoundType_MOB_SLIME, - L"mob/slime/slimeattack", // eSoundType_MOB_SLIME_ATTACK, - L"mob/creeper/creeper", // eSoundType_MOB_CREEPER_HURT, - L"mob/creeper/creeperdeath", // eSoundType_MOB_CREEPER_DEATH, - L"mob/zombie/zombie", // eSoundType_MOB_ZOMBIE_AMBIENT, - L"mob/zombie/zombiehurt", // eSoundType_MOB_ZOMBIE_HURT, - L"mob/zombie/zombiedeath", // eSoundType_MOB_ZOMBIE_DEATH, - L"mob/zombie/wood", // eSoundType_MOB_ZOMBIE_WOOD, - L"mob/zombie/woodbreak", // eSoundType_MOB_ZOMBIE_WOOD_BREAK, - L"mob/zombie/metal", // eSoundType_MOB_ZOMBIE_METAL, - L"mob/magmacube/big", // eSoundType_MOB_MAGMACUBE_BIG, - L"mob/magmacube/small", // eSoundType_MOB_MAGMACUBE_SMALL, - L"mob/cat/purr", // eSoundType_MOB_CAT_PURR - L"mob/cat/purreow", // eSoundType_MOB_CAT_PURREOW - L"mob/cat/meow", // eSoundType_MOB_CAT_MEOW +const char* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { + "mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT + "mob/chicken/chickenhurt", // eSoundType_MOB_CHICKEN_HURT + "mob/chicken/chickenplop", // eSoundType_MOB_CHICKENPLOP + "mob/cow/say", // eSoundType_MOB_COW_AMBIENT + "mob/cow/hurt", // eSoundType_MOB_COW_HURT + "mob/pig/pig", // eSoundType_MOB_PIG_AMBIENT + "mob/pig/pigdeath", // eSoundType_MOB_PIG_DEATH + "mob/sheep/sheep", // eSoundType_MOB_SHEEP_AMBIENT + "mob/wolf/growl", // eSoundType_MOB_WOLF_GROWL + "mob/wolf/whine", // eSoundType_MOB_WOLF_WHINE + "mob/wolf/panting", // eSoundType_MOB_WOLF_PANTING + "mob/wolf/bark", // eSoundType_MOB_WOLF_BARK + "mob/wolf/hurt", // eSoundType_MOB_WOLF_HURT + "mob/wolf/death", // eSoundType_MOB_WOLF_DEATH + "mob/wolf/shake", // eSoundType_MOB_WOLF_SHAKE + "mob/blaze/breathe", // eSoundType_MOB_BLAZE_BREATHE + "mob/blaze/hit", // eSoundType_MOB_BLAZE_HURT + "mob/blaze/death", // eSoundType_MOB_BLAZE_DEATH + "mob/ghast/moan", // eSoundType_MOB_GHAST_MOAN + "mob/ghast/scream", // eSoundType_MOB_GHAST_SCREAM + "mob/ghast/death", // eSoundType_MOB_GHAST_DEATH + "mob/ghast/fireball", // eSoundType_MOB_GHAST_FIREBALL + "mob/ghast/charge", // eSoundType_MOB_GHAST_CHARGE + "mob/endermen/idle", // eSoundType_MOB_ENDERMEN_IDLE + "mob/endermen/hit", // eSoundType_MOB_ENDERMEN_HIT + "mob/endermen/death", // eSoundType_MOB_ENDERMEN_DEATH + "mob/endermen/portal", // eSoundType_MOB_ENDERMEN_PORTAL + "mob/zombiepig/zpig", // eSoundType_MOB_ZOMBIEPIG_AMBIENT + "mob/zombiepig/zpighurt", // eSoundType_MOB_ZOMBIEPIG_HURT + "mob/zombiepig/zpigdeath", // eSoundType_MOB_ZOMBIEPIG_DEATH + "mob/zombiepig/zpigangry", // eSoundType_MOB_ZOMBIEPIG_ZPIGANGRY + "mob/silverfish/say", // eSoundType_MOB_SILVERFISH_AMBIENT, + "mob/silverfish/hit", // eSoundType_MOB_SILVERFISH_HURT + "mob/silverfish/kill", // eSoundType_MOB_SILVERFISH_DEATH, + "mob/silverfish/step", // eSoundType_MOB_SILVERFISH_STEP, + "mob/skeleton/skeleton", // eSoundType_MOB_SKELETON_AMBIENT, + "mob/skeleton/skeletonhurt", // eSoundType_MOB_SKELETON_HURT, + "mob/spider/spider", // eSoundType_MOB_SPIDER_AMBIENT, + "mob/spider/spiderdeath", // eSoundType_MOB_SPIDER_DEATH, + "mob/slime/slime", // eSoundType_MOB_SLIME, + "mob/slime/slimeattack", // eSoundType_MOB_SLIME_ATTACK, + "mob/creeper/creeper", // eSoundType_MOB_CREEPER_HURT, + "mob/creeper/creeperdeath", // eSoundType_MOB_CREEPER_DEATH, + "mob/zombie/zombie", // eSoundType_MOB_ZOMBIE_AMBIENT, + "mob/zombie/zombiehurt", // eSoundType_MOB_ZOMBIE_HURT, + "mob/zombie/zombiedeath", // eSoundType_MOB_ZOMBIE_DEATH, + "mob/zombie/wood", // eSoundType_MOB_ZOMBIE_WOOD, + "mob/zombie/woodbreak", // eSoundType_MOB_ZOMBIE_WOOD_BREAK, + "mob/zombie/metal", // eSoundType_MOB_ZOMBIE_METAL, + "mob/magmacube/big", // eSoundType_MOB_MAGMACUBE_BIG, + "mob/magmacube/small", // eSoundType_MOB_MAGMACUBE_SMALL, + "mob/cat/purr", // eSoundType_MOB_CAT_PURR + "mob/cat/purreow", // eSoundType_MOB_CAT_PURREOW + "mob/cat/meow", // eSoundType_MOB_CAT_MEOW // 4J-PB - correct the name of the event for hitting ocelots - L"mob/cat/hitt", // eSoundType_MOB_CAT_HITT - // L"mob.irongolem.throw", // - // eSoundType_MOB_IRONGOLEM_THROW L"mob.irongolem.hit", - //// eSoundType_MOB_IRONGOLEM_HIT L"mob.irongolem.death", - //// eSoundType_MOB_IRONGOLEM_DEATH L"mob.irongolem.walk", + "mob/cat/hitt", // eSoundType_MOB_CAT_HITT + // "mob.irongolem.throw", // + // eSoundType_MOB_IRONGOLEM_THROW "mob.irongolem.hit", + //// eSoundType_MOB_IRONGOLEM_HIT "mob.irongolem.death", + //// eSoundType_MOB_IRONGOLEM_DEATH "mob.irongolem.walk", //// eSoundType_MOB_IRONGOLEM_WALK - L"random/bow", // eSoundType_RANDOM_BOW, - L"random/bowhit", // eSoundType_RANDOM_BOW_HIT, - L"random/explode", // eSoundType_RANDOM_EXPLODE, - L"random/fizz", // eSoundType_RANDOM_FIZZ, - L"random/pop", // eSoundType_RANDOM_POP, - L"random/fuse", // eSoundType_RANDOM_FUSE, - L"random/drink", // eSoundType_RANDOM_DRINK, - L"random/eat", // eSoundType_RANDOM_EAT, - L"random/burp", // eSoundType_RANDOM_BURP, - L"random/splash", // eSoundType_RANDOM_SPLASH, - L"random/click", // eSoundType_RANDOM_CLICK, - L"random/glass", // eSoundType_RANDOM_GLASS, - L"random/orb", // eSoundType_RANDOM_ORB, - L"random/break", // eSoundType_RANDOM_BREAK, - L"random/chestopen", // eSoundType_RANDOM_CHEST_OPEN, - L"random/chestclosed", // eSoundType_RANDOM_CHEST_CLOSE, - L"random/door_open", // eSoundType_RANDOM_DOOR_OPEN, - L"random/door_close", // eSoundType_RANDOM_DOOR_CLOSE, - L"ambient/weather/rain", // eSoundType_AMBIENT_WEATHER_RAIN, - L"ambient/weather/thunder", // eSoundType_AMBIENT_WEATHER_THUNDER, - L"ambient/cave/cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!! - L"portal/portal", // eSoundType_PORTAL_PORTAL, - // 4J-PB - added a couple that were still using std::wstring - L"portal/trigger", // eSoundType_PORTAL_TRIGGER - L"portal/travel", // eSoundType_PORTAL_TRAVEL + "random/bow", // eSoundType_RANDOM_BOW, + "random/bowhit", // eSoundType_RANDOM_BOW_HIT, + "random/explode", // eSoundType_RANDOM_EXPLODE, + "random/fizz", // eSoundType_RANDOM_FIZZ, + "random/pop", // eSoundType_RANDOM_POP, + "random/fuse", // eSoundType_RANDOM_FUSE, + "random/drink", // eSoundType_RANDOM_DRINK, + "random/eat", // eSoundType_RANDOM_EAT, + "random/burp", // eSoundType_RANDOM_BURP, + "random/splash", // eSoundType_RANDOM_SPLASH, + "random/click", // eSoundType_RANDOM_CLICK, + "random/glass", // eSoundType_RANDOM_GLASS, + "random/orb", // eSoundType_RANDOM_ORB, + "random/break", // eSoundType_RANDOM_BREAK, + "random/chestopen", // eSoundType_RANDOM_CHEST_OPEN, + "random/chestclosed", // eSoundType_RANDOM_CHEST_CLOSE, + "random/door_open", // eSoundType_RANDOM_DOOR_OPEN, + "random/door_close", // eSoundType_RANDOM_DOOR_CLOSE, + "ambient/weather/rain", // eSoundType_AMBIENT_WEATHER_RAIN, + "ambient/weather/thunder", // eSoundType_AMBIENT_WEATHER_THUNDER, + "ambient/cave/cave", // eSoundType_CAVE_CAVE, DON'T USE FOR XBOX 360!!! + "portal/portal", // eSoundType_PORTAL_PORTAL, + // 4J-PB - added a couple that were still using std::string + "portal/trigger", // eSoundType_PORTAL_TRIGGER + "portal/travel", // eSoundType_PORTAL_TRAVEL - L"fire/ignite", // eSoundType_FIRE_IGNITE, - L"fire/fire", // eSoundType_FIRE_FIRE, - L"damage/hit", // eSoundType_DAMAGE_HURT, - L"damage/fallsmall", // eSoundType_DAMAGE_FALL_SMALL, - L"damage/fallbig", // eSoundType_DAMAGE_FALL_BIG, - L"note/harp", // eSoundType_NOTE_HARP, - L"note/bd", // eSoundType_NOTE_BD, - L"note/snare", // eSoundType_NOTE_SNARE, - L"note/hat", // eSoundType_NOTE_HAT, - L"note/bassattack", // eSoundType_NOTE_BASSATTACK, - L"tile/piston.in", // eSoundType_TILE_PISTON_IN, - L"tile/piston.out", // eSoundType_TILE_PISTON_OUT, - L"liquid/water", // eSoundType_LIQUID_WATER, - L"liquid/lavapop", // eSoundType_LIQUID_LAVA_POP, - L"liquid/lava", // eSoundType_LIQUID_LAVA, - L"step/stone", // eSoundType_STEP_STONE, - L"step/wood", // eSoundType_STEP_WOOD, - L"step/gravel", // eSoundType_STEP_GRAVEL, - L"step/grass", // eSoundType_STEP_GRASS, - L"step/metal", // eSoundType_STEP_METAL, - L"step/cloth", // eSoundType_STEP_CLOTH, - L"step/sand", // eSoundType_STEP_SAND, + "fire/ignite", // eSoundType_FIRE_IGNITE, + "fire/fire", // eSoundType_FIRE_FIRE, + "damage/hit", // eSoundType_DAMAGE_HURT, + "damage/fallsmall", // eSoundType_DAMAGE_FALL_SMALL, + "damage/fallbig", // eSoundType_DAMAGE_FALL_BIG, + "note/harp", // eSoundType_NOTE_HARP, + "note/bd", // eSoundType_NOTE_BD, + "note/snare", // eSoundType_NOTE_SNARE, + "note/hat", // eSoundType_NOTE_HAT, + "note/bassattack", // eSoundType_NOTE_BASSATTACK, + "tile/piston.in", // eSoundType_TILE_PISTON_IN, + "tile/piston.out", // eSoundType_TILE_PISTON_OUT, + "liquid/water", // eSoundType_LIQUID_WATER, + "liquid/lavapop", // eSoundType_LIQUID_LAVA_POP, + "liquid/lava", // eSoundType_LIQUID_LAVA, + "step/stone", // eSoundType_STEP_STONE, + "step/wood", // eSoundType_STEP_WOOD, + "step/gravel", // eSoundType_STEP_GRAVEL, + "step/grass", // eSoundType_STEP_GRASS, + "step/metal", // eSoundType_STEP_METAL, + "step/cloth", // eSoundType_STEP_CLOTH, + "step/sand", // eSoundType_STEP_SAND, // below this are the additional sounds from the second soundbank - L"mob/enderdragon/end", // eSoundType_MOB_ENDERDRAGON_END - L"mob/enderdragon/growl", // eSoundType_MOB_ENDERDRAGON_GROWL - L"mob/enderdragon/hit", // eSoundType_MOB_ENDERDRAGON_HIT - L"mob/enderdragon/wings", // eSoundType_MOB_ENDERDRAGON_MOVE - L"mob/irongolem/throw", // eSoundType_MOB_IRONGOLEM_THROW - L"mob/irongolem/hit", // eSoundType_MOB_IRONGOLEM_HIT - L"mob/irongolem/death", // eSoundType_MOB_IRONGOLEM_DEATH - L"mob/irongolem/walk", // eSoundType_MOB_IRONGOLEM_WALK + "mob/enderdragon/end", // eSoundType_MOB_ENDERDRAGON_END + "mob/enderdragon/growl", // eSoundType_MOB_ENDERDRAGON_GROWL + "mob/enderdragon/hit", // eSoundType_MOB_ENDERDRAGON_HIT + "mob/enderdragon/wings", // eSoundType_MOB_ENDERDRAGON_MOVE + "mob/irongolem/throw", // eSoundType_MOB_IRONGOLEM_THROW + "mob/irongolem/hit", // eSoundType_MOB_IRONGOLEM_HIT + "mob/irongolem/death", // eSoundType_MOB_IRONGOLEM_DEATH + "mob/irongolem/walk", // eSoundType_MOB_IRONGOLEM_WALK // TU14 - L"damage/thorns", // eSoundType_DAMAGE_THORNS - L"random/anvil_break", // eSoundType_RANDOM_ANVIL_BREAK - L"random/anvil_land", // eSoundType_RANDOM_ANVIL_LAND - L"random/anvil_use", // eSoundType_RANDOM_ANVIL_USE - L"mob/villager/haggle", // eSoundType_MOB_VILLAGER_HAGGLE - L"mob/villager/idle", // eSoundType_MOB_VILLAGER_IDLE - L"mob/villager/hit", // eSoundType_MOB_VILLAGER_HIT - L"mob/villager/death", // eSoundType_MOB_VILLAGER_DEATH - L"mob/villager/yes", // eSoundType_MOB_VILLAGER_YES - L"mob/villager/no", // eSoundType_MOB_VILLAGER_NO - L"mob/zombie/infect", // eSoundType_MOB_ZOMBIE_INFECT - L"mob/zombie/unfect", // eSoundType_MOB_ZOMBIE_UNFECT - L"mob/zombie/remedy", // eSoundType_MOB_ZOMBIE_REMEDY - L"step/snow", // eSoundType_STEP_SNOW - L"step/ladder", // eSoundType_STEP_LADDER - L"dig/cloth", // eSoundType_DIG_CLOTH - L"dig/grass", // eSoundType_DIG_GRASS - L"dig/gravel", // eSoundType_DIG_GRAVEL - L"dig/sand", // eSoundType_DIG_SAND - L"dig/snow", // eSoundType_DIG_SNOW - L"dig/stone", // eSoundType_DIG_STONE - L"dig/wood", // eSoundType_DIG_WOOD + "damage/thorns", // eSoundType_DAMAGE_THORNS + "random/anvil_break", // eSoundType_RANDOM_ANVIL_BREAK + "random/anvil_land", // eSoundType_RANDOM_ANVIL_LAND + "random/anvil_use", // eSoundType_RANDOM_ANVIL_USE + "mob/villager/haggle", // eSoundType_MOB_VILLAGER_HAGGLE + "mob/villager/idle", // eSoundType_MOB_VILLAGER_IDLE + "mob/villager/hit", // eSoundType_MOB_VILLAGER_HIT + "mob/villager/death", // eSoundType_MOB_VILLAGER_DEATH + "mob/villager/yes", // eSoundType_MOB_VILLAGER_YES + "mob/villager/no", // eSoundType_MOB_VILLAGER_NO + "mob/zombie/infect", // eSoundType_MOB_ZOMBIE_INFECT + "mob/zombie/unfect", // eSoundType_MOB_ZOMBIE_UNFECT + "mob/zombie/remedy", // eSoundType_MOB_ZOMBIE_REMEDY + "step/snow", // eSoundType_STEP_SNOW + "step/ladder", // eSoundType_STEP_LADDER + "dig/cloth", // eSoundType_DIG_CLOTH + "dig/grass", // eSoundType_DIG_GRASS + "dig/gravel", // eSoundType_DIG_GRAVEL + "dig/sand", // eSoundType_DIG_SAND + "dig/snow", // eSoundType_DIG_SNOW + "dig/stone", // eSoundType_DIG_STONE + "dig/wood", // eSoundType_DIG_WOOD // 1.6.4 - L"fireworks/launch", // eSoundType_FIREWORKS_LAUNCH, - L"fireworks/blast", // eSoundType_FIREWORKS_BLAST, - L"fireworks/blast_far", // eSoundType_FIREWORKS_BLAST_FAR, - L"fireworks/large_blast", // eSoundType_FIREWORKS_LARGE_BLAST, - L"fireworks/large_blast_far", // eSoundType_FIREWORKS_LARGE_BLAST_FAR, - L"fireworks/twinkle", // eSoundType_FIREWORKS_TWINKLE, - L"fireworks/twinkle_far", // eSoundType_FIREWORKS_TWINKLE_FAR, + "fireworks/launch", // eSoundType_FIREWORKS_LAUNCH, + "fireworks/blast", // eSoundType_FIREWORKS_BLAST, + "fireworks/blast_far", // eSoundType_FIREWORKS_BLAST_FAR, + "fireworks/large_blast", // eSoundType_FIREWORKS_LARGE_BLAST, + "fireworks/large_blast_far", // eSoundType_FIREWORKS_LARGE_BLAST_FAR, + "fireworks/twinkle", // eSoundType_FIREWORKS_TWINKLE, + "fireworks/twinkle_far", // eSoundType_FIREWORKS_TWINKLE_FAR, - L"mob/bat/idle", // eSoundType_MOB_BAT_IDLE, - L"mob/bat/hurt", // eSoundType_MOB_BAT_HURT, - L"mob/bat/death", // eSoundType_MOB_BAT_DEATH, - L"mob/bat/takeoff", // eSoundType_MOB_BAT_TAKEOFF, + "mob/bat/idle", // eSoundType_MOB_BAT_IDLE, + "mob/bat/hurt", // eSoundType_MOB_BAT_HURT, + "mob/bat/death", // eSoundType_MOB_BAT_DEATH, + "mob/bat/takeoff", // eSoundType_MOB_BAT_TAKEOFF, - L"mob/wither/spawn", // eSoundType_MOB_WITHER_SPAWN, - L"mob/wither/idle", // eSoundType_MOB_WITHER_IDLE, - L"mob/wither/hurt", // eSoundType_MOB_WITHER_HURT, - L"mob/wither/death", // eSoundType_MOB_WITHER_DEATH, - L"mob/wither/shoot", // eSoundType_MOB_WITHER_SHOOT, + "mob/wither/spawn", // eSoundType_MOB_WITHER_SPAWN, + "mob/wither/idle", // eSoundType_MOB_WITHER_IDLE, + "mob/wither/hurt", // eSoundType_MOB_WITHER_HURT, + "mob/wither/death", // eSoundType_MOB_WITHER_DEATH, + "mob/wither/shoot", // eSoundType_MOB_WITHER_SHOOT, - L"mob/cow/step", // eSoundType_MOB_COW_STEP, - L"mob/chicken/step", // eSoundType_MOB_CHICKEN_STEP, - L"mob/pig/step", // eSoundType_MOB_PIG_STEP, - L"mob/enderman/stare", // eSoundType_MOB_ENDERMAN_STARE, - L"mob/enderman/scream", // eSoundType_MOB_ENDERMAN_SCREAM, - L"mob/sheep/shear", // eSoundType_MOB_SHEEP_SHEAR, - L"mob/sheep/step", // eSoundType_MOB_SHEEP_STEP, - L"mob/skeleton.death", // eSoundType_MOB_SKELETON_DEATH, - L"mob/skeleton/step", // eSoundType_MOB_SKELETON_STEP, - L"mob/spider/step", // eSoundType_MOB_SPIDER_STEP, - L"mob/wolf/step", // eSoundType_MOB_WOLF_STEP, - L"mob/zombie/step", // eSoundType_MOB_ZOMBIE_STEP, + "mob/cow/step", // eSoundType_MOB_COW_STEP, + "mob/chicken/step", // eSoundType_MOB_CHICKEN_STEP, + "mob/pig/step", // eSoundType_MOB_PIG_STEP, + "mob/enderman/stare", // eSoundType_MOB_ENDERMAN_STARE, + "mob/enderman/scream", // eSoundType_MOB_ENDERMAN_SCREAM, + "mob/sheep/shear", // eSoundType_MOB_SHEEP_SHEAR, + "mob/sheep/step", // eSoundType_MOB_SHEEP_STEP, + "mob/skeleton.death", // eSoundType_MOB_SKELETON_DEATH, + "mob/skeleton/step", // eSoundType_MOB_SKELETON_STEP, + "mob/spider/step", // eSoundType_MOB_SPIDER_STEP, + "mob/wolf/step", // eSoundType_MOB_WOLF_STEP, + "mob/zombie/step", // eSoundType_MOB_ZOMBIE_STEP, - L"liquid/swim", // eSoundType_LIQUID_SWIM, + "liquid/swim", // eSoundType_LIQUID_SWIM, - L"mob/horse/land", // eSoundType_MOB_HORSE_LAND, - L"mob/horse/armor", // eSoundType_MOB_HORSE_ARMOR, - L"mob/horse/leather", // eSoundType_MOB_HORSE_LEATHER, - L"mob/horse/zombie.death", // eSoundType_MOB_HORSE_ZOMBIE_DEATH, - L"mob/horse/skeleton.death", // eSoundType_MOB_HORSE_SKELETON_DEATH, - L"mob/horse/donkey.death", // eSoundType_MOB_HORSE_DONKEY_DEATH, - L"mob/horse/death", // eSoundType_MOB_HORSE_DEATH, - L"mob/horse/zombie.hit", // eSoundType_MOB_HORSE_ZOMBIE_HIT, - L"mob/horse/skeleton.hit", // eSoundType_MOB_HORSE_SKELETON_HIT, - L"mob/horse/donkey.hit", // eSoundType_MOB_HORSE_DONKEY_HIT, - L"mob/horse/hit", // eSoundType_MOB_HORSE_HIT, - L"mob/horse/zombie.idle", // eSoundType_MOB_HORSE_ZOMBIE_IDLE, - L"mob/horse/skeleton.idle", // eSoundType_MOB_HORSE_SKELETON_IDLE, - L"mob/horse/donkey.idle", // eSoundType_MOB_HORSE_DONKEY_IDLE, - L"mob/horse/idle", // eSoundType_MOB_HORSE_IDLE, - L"mob/horse/donkey.angry", // eSoundType_MOB_HORSE_DONKEY_ANGRY, - L"mob/horse/angry", // eSoundType_MOB_HORSE_ANGRY, - L"mob/horse/gallop", // eSoundType_MOB_HORSE_GALLOP, - L"mob/horse/breathe", // eSoundType_MOB_HORSE_BREATHE, - L"mob/horse/wood", // eSoundType_MOB_HORSE_WOOD, - L"mob/horse/soft", // eSoundType_MOB_HORSE_SOFT, - L"mob/horse/jump", // eSoundType_MOB_HORSE_JUMP, + "mob/horse/land", // eSoundType_MOB_HORSE_LAND, + "mob/horse/armor", // eSoundType_MOB_HORSE_ARMOR, + "mob/horse/leather", // eSoundType_MOB_HORSE_LEATHER, + "mob/horse/zombie.death", // eSoundType_MOB_HORSE_ZOMBIE_DEATH, + "mob/horse/skeleton.death", // eSoundType_MOB_HORSE_SKELETON_DEATH, + "mob/horse/donkey.death", // eSoundType_MOB_HORSE_DONKEY_DEATH, + "mob/horse/death", // eSoundType_MOB_HORSE_DEATH, + "mob/horse/zombie.hit", // eSoundType_MOB_HORSE_ZOMBIE_HIT, + "mob/horse/skeleton.hit", // eSoundType_MOB_HORSE_SKELETON_HIT, + "mob/horse/donkey.hit", // eSoundType_MOB_HORSE_DONKEY_HIT, + "mob/horse/hit", // eSoundType_MOB_HORSE_HIT, + "mob/horse/zombie.idle", // eSoundType_MOB_HORSE_ZOMBIE_IDLE, + "mob/horse/skeleton.idle", // eSoundType_MOB_HORSE_SKELETON_IDLE, + "mob/horse/donkey.idle", // eSoundType_MOB_HORSE_DONKEY_IDLE, + "mob/horse/idle", // eSoundType_MOB_HORSE_IDLE, + "mob/horse/donkey.angry", // eSoundType_MOB_HORSE_DONKEY_ANGRY, + "mob/horse/angry", // eSoundType_MOB_HORSE_ANGRY, + "mob/horse/gallop", // eSoundType_MOB_HORSE_GALLOP, + "mob/horse/breathe", // eSoundType_MOB_HORSE_BREATHE, + "mob/horse/wood", // eSoundType_MOB_HORSE_WOOD, + "mob/horse/soft", // eSoundType_MOB_HORSE_SOFT, + "mob/horse/jump", // eSoundType_MOB_HORSE_JUMP, - L"mob/witch/idle", // eSoundType_MOB_WITCH_IDLE, <--- + "mob/witch/idle", // eSoundType_MOB_WITCH_IDLE, <--- // missing - L"mob/witch/hurt", // eSoundType_MOB_WITCH_HURT, <--- + "mob/witch/hurt", // eSoundType_MOB_WITCH_HURT, <--- // missing - L"mob/witch/death", // eSoundType_MOB_WITCH_DEATH, <--- + "mob/witch/death", // eSoundType_MOB_WITCH_DEATH, <--- // missing - L"mob/slime/big", // eSoundType_MOB_SLIME_BIG, - L"mob/slime/small", // eSoundType_MOB_SLIME_SMALL, + "mob/slime/big", // eSoundType_MOB_SLIME_BIG, + "mob/slime/small", // eSoundType_MOB_SLIME_SMALL, - L"eating", // eSoundType_EATING <--- missing - L"random/levelup", // eSoundType_RANDOM_LEVELUP + "eating", // eSoundType_EATING <--- missing + "random/levelup", // eSoundType_RANDOM_LEVELUP // 4J-PB - Some sounds were updated, but we can't do that for the 360 or we // have to do a new sound bank instead, we'll add the sounds as new ones and // change the code to reference them - L"fire/new_ignite", + "fire/new_ignite", }; -const wchar_t* ConsoleSoundEngine::wchUISoundNames[eSFX_MAX] = { - L"back", L"craft", L"craftfail", L"focus", L"press", L"scroll", +const char* ConsoleSoundEngine::wchUISoundNames[eSFX_MAX] = { + "back", "craft", "craftfail", "focus", "press", "scroll", }; diff --git a/targets/app/common/BannedListManager.cpp b/targets/app/common/BannedListManager.cpp index 216c1637b..fecd02beb 100644 --- a/targets/app/common/BannedListManager.cpp +++ b/targets/app/common/BannedListManager.cpp @@ -56,7 +56,7 @@ void BannedListManager::addLevel(int iPad, PlayerUID xuid, // 4J-PB - write to TMS++ now // bool - // bRes=PlatformStorage.WriteTMSFile(iPad,IPlatformStorage::eGlobalStorage_TitleUser,L"BannedList",(std::uint8_t*)pBannedList, + // bRes=PlatformStorage.WriteTMSFile(iPad,IPlatformStorage::eGlobalStorage_TitleUser,"BannedList",(std::uint8_t*)pBannedList, // dwDataBytes); delete[] pBannedList; diff --git a/targets/app/common/BuildVer/BuildVer.h b/targets/app/common/BuildVer/BuildVer.h index 546350dc5..9215df6c7 100644 --- a/targets/app/common/BuildVer/BuildVer.h +++ b/targets/app/common/BuildVer/BuildVer.h @@ -14,7 +14,7 @@ #define VER_FILEVERSION_STRING "1.6" #define VER_PRODUCTVERSION_STRING VER_FILEVERSION_STRING -#define VER_FILEVERSION_STRING_W L"1.6" +#define VER_FILEVERSION_STRING_W "1.6" #define VER_PRODUCTVERSION_STRING_W VER_FILEVERSION_STRING_W #define VER_FILEBETA_STR "" #undef VER_FILEVERSION @@ -27,25 +27,25 @@ #if (VER_PRODUCTBUILD < 10) #define VER_FILEBPAD "000" -#define VER_FILEBPAD_W L"000" +#define VER_FILEBPAD_W "000" #elif (VER_PRODUCTBUILD < 100) #define VER_FILEBPAD "00" -#define VER_FILEBPAD_W L"00" +#define VER_FILEBPAD_W "00" #elif (VER_PRODUCTBUILD < 1000) #define VER_FILEBPAD "0" -#define VER_FILEBPAD_W L"0" +#define VER_FILEBPAD_W "0" #else #define VER_FILEBPAD #define VER_FILEBPAD_W #endif -#define VER_WIDE_PREFIX(x) L##x +#define VER_WIDE_PREFIX(x) x #define VER_FILEVERSION_STR2(x, y) \ VER_FILEVERSION_STRING "." VER_FILEBPAD #x "." #y #define VER_FILEVERSION_STR2_W(x, y) \ - VER_FILEVERSION_STRING_W L"." VER_FILEBPAD_W VER_WIDE_PREFIX( \ - #x) L"." VER_WIDE_PREFIX(#y) + VER_FILEVERSION_STRING_W "." VER_FILEBPAD_W VER_WIDE_PREFIX( \ + #x) "." VER_WIDE_PREFIX(#y) #define VER_FILEVERSION_STR1(x, y) VER_FILEVERSION_STR2(x, y) #define VER_FILEVERSION_STR1_W(x, y) VER_FILEVERSION_STR2_W(x, y) diff --git a/targets/app/common/Colours/ColourTable.cpp b/targets/app/common/Colours/ColourTable.cpp index f8e7fe237..044e31b87 100644 --- a/targets/app/common/Colours/ColourTable.cpp +++ b/targets/app/common/Colours/ColourTable.cpp @@ -9,330 +9,330 @@ #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" -std::unordered_map +std::unordered_map ColourTable::s_colourNamesMap; -const wchar_t* ColourTable::ColourTableElements[eMinecraftColour_COUNT] = { - L"NOTSET", +const char* ColourTable::ColourTableElements[eMinecraftColour_COUNT] = { + "NOTSET", - L"Foliage_Evergreen", - L"Foliage_Birch", - L"Foliage_Default", - L"Foliage_Common", - L"Foliage_Ocean", - L"Foliage_Plains", - L"Foliage_Desert", - L"Foliage_ExtremeHills", - L"Foliage_Forest", - L"Foliage_Taiga", - L"Foliage_Swampland", - L"Foliage_River", - L"Foliage_Hell", - L"Foliage_Sky", - L"Foliage_FrozenOcean", - L"Foliage_FrozenRiver", - L"Foliage_IcePlains", - L"Foliage_IceMountains", - L"Foliage_MushroomIsland", - L"Foliage_MushroomIslandShore", - L"Foliage_Beach", - L"Foliage_DesertHills", - L"Foliage_ForestHills", - L"Foliage_TaigaHills", - L"Foliage_ExtremeHillsEdge", - L"Foliage_Jungle", - L"Foliage_JungleHills", + "Foliage_Evergreen", + "Foliage_Birch", + "Foliage_Default", + "Foliage_Common", + "Foliage_Ocean", + "Foliage_Plains", + "Foliage_Desert", + "Foliage_ExtremeHills", + "Foliage_Forest", + "Foliage_Taiga", + "Foliage_Swampland", + "Foliage_River", + "Foliage_Hell", + "Foliage_Sky", + "Foliage_FrozenOcean", + "Foliage_FrozenRiver", + "Foliage_IcePlains", + "Foliage_IceMountains", + "Foliage_MushroomIsland", + "Foliage_MushroomIslandShore", + "Foliage_Beach", + "Foliage_DesertHills", + "Foliage_ForestHills", + "Foliage_TaigaHills", + "Foliage_ExtremeHillsEdge", + "Foliage_Jungle", + "Foliage_JungleHills", - L"Grass_Common", - L"Grass_Ocean", - L"Grass_Plains", - L"Grass_Desert", - L"Grass_ExtremeHills", - L"Grass_Forest", - L"Grass_Taiga", - L"Grass_Swampland", - L"Grass_River", - L"Grass_Hell", - L"Grass_Sky", - L"Grass_FrozenOcean", - L"Grass_FrozenRiver", - L"Grass_IcePlains", - L"Grass_IceMountains", - L"Grass_MushroomIsland", - L"Grass_MushroomIslandShore", - L"Grass_Beach", - L"Grass_DesertHills", - L"Grass_ForestHills", - L"Grass_TaigaHills", - L"Grass_ExtremeHillsEdge", - L"Grass_Jungle", - L"Grass_JungleHills", + "Grass_Common", + "Grass_Ocean", + "Grass_Plains", + "Grass_Desert", + "Grass_ExtremeHills", + "Grass_Forest", + "Grass_Taiga", + "Grass_Swampland", + "Grass_River", + "Grass_Hell", + "Grass_Sky", + "Grass_FrozenOcean", + "Grass_FrozenRiver", + "Grass_IcePlains", + "Grass_IceMountains", + "Grass_MushroomIsland", + "Grass_MushroomIslandShore", + "Grass_Beach", + "Grass_DesertHills", + "Grass_ForestHills", + "Grass_TaigaHills", + "Grass_ExtremeHillsEdge", + "Grass_Jungle", + "Grass_JungleHills", - L"Water_Ocean", - L"Water_Plains", - L"Water_Desert", - L"Water_ExtremeHills", - L"Water_Forest", - L"Water_Taiga", - L"Water_Swampland", - L"Water_River", - L"Water_Hell", - L"Water_Sky", - L"Water_FrozenOcean", - L"Water_FrozenRiver", - L"Water_IcePlains", - L"Water_IceMountains", - L"Water_MushroomIsland", - L"Water_MushroomIslandShore", - L"Water_Beach", - L"Water_DesertHills", - L"Water_ForestHills", - L"Water_TaigaHills", - L"Water_ExtremeHillsEdge", - L"Water_Jungle", - L"Water_JungleHills", + "Water_Ocean", + "Water_Plains", + "Water_Desert", + "Water_ExtremeHills", + "Water_Forest", + "Water_Taiga", + "Water_Swampland", + "Water_River", + "Water_Hell", + "Water_Sky", + "Water_FrozenOcean", + "Water_FrozenRiver", + "Water_IcePlains", + "Water_IceMountains", + "Water_MushroomIsland", + "Water_MushroomIslandShore", + "Water_Beach", + "Water_DesertHills", + "Water_ForestHills", + "Water_TaigaHills", + "Water_ExtremeHillsEdge", + "Water_Jungle", + "Water_JungleHills", - L"Sky_Ocean", - L"Sky_Plains", - L"Sky_Desert", - L"Sky_ExtremeHills", - L"Sky_Forest", - L"Sky_Taiga", - L"Sky_Swampland", - L"Sky_River", - L"Sky_Hell", - L"Sky_Sky", - L"Sky_FrozenOcean", - L"Sky_FrozenRiver", - L"Sky_IcePlains", - L"Sky_IceMountains", - L"Sky_MushroomIsland", - L"Sky_MushroomIslandShore", - L"Sky_Beach", - L"Sky_DesertHills", - L"Sky_ForestHills", - L"Sky_TaigaHills", - L"Sky_ExtremeHillsEdge", - L"Sky_Jungle", - L"Sky_JungleHills", + "Sky_Ocean", + "Sky_Plains", + "Sky_Desert", + "Sky_ExtremeHills", + "Sky_Forest", + "Sky_Taiga", + "Sky_Swampland", + "Sky_River", + "Sky_Hell", + "Sky_Sky", + "Sky_FrozenOcean", + "Sky_FrozenRiver", + "Sky_IcePlains", + "Sky_IceMountains", + "Sky_MushroomIsland", + "Sky_MushroomIslandShore", + "Sky_Beach", + "Sky_DesertHills", + "Sky_ForestHills", + "Sky_TaigaHills", + "Sky_ExtremeHillsEdge", + "Sky_Jungle", + "Sky_JungleHills", - L"Tile_RedstoneDust", - L"Tile_RedstoneDustUnlit", - L"Tile_RedstoneDustLitMin", - L"Tile_RedstoneDustLitMax", - L"Tile_StemMin", - L"Tile_StemMax", - L"Tile_WaterLily", + "Tile_RedstoneDust", + "Tile_RedstoneDustUnlit", + "Tile_RedstoneDustLitMin", + "Tile_RedstoneDustLitMax", + "Tile_StemMin", + "Tile_StemMax", + "Tile_WaterLily", - L"Sky_Dawn_Dark", - L"Sky_Dawn_Bright", + "Sky_Dawn_Dark", + "Sky_Dawn_Bright", - L"Material_None", - L"Material_Grass", - L"Material_Sand", - L"Material_Cloth", - L"Material_Fire", - L"Material_Ice", - L"Material_Metal", - L"Material_Plant", - L"Material_Snow", - L"Material_Clay", - L"Material_Dirt", - L"Material_Stone", - L"Material_Water", - L"Material_Wood", - L"Material_Emerald", + "Material_None", + "Material_Grass", + "Material_Sand", + "Material_Cloth", + "Material_Fire", + "Material_Ice", + "Material_Metal", + "Material_Plant", + "Material_Snow", + "Material_Clay", + "Material_Dirt", + "Material_Stone", + "Material_Water", + "Material_Wood", + "Material_Emerald", - L"Particle_Note_00", - L"Particle_Note_01", - L"Particle_Note_02", - L"Particle_Note_03", - L"Particle_Note_04", - L"Particle_Note_05", - L"Particle_Note_06", - L"Particle_Note_07", - L"Particle_Note_08", - L"Particle_Note_09", - L"Particle_Note_10", - L"Particle_Note_11", - L"Particle_Note_12", - L"Particle_Note_13", - L"Particle_Note_14", - L"Particle_Note_15", - L"Particle_Note_16", - L"Particle_Note_17", - L"Particle_Note_18", - L"Particle_Note_19", - L"Particle_Note_20", - L"Particle_Note_21", - L"Particle_Note_22", - L"Particle_Note_23", - L"Particle_Note_24", + "Particle_Note_00", + "Particle_Note_01", + "Particle_Note_02", + "Particle_Note_03", + "Particle_Note_04", + "Particle_Note_05", + "Particle_Note_06", + "Particle_Note_07", + "Particle_Note_08", + "Particle_Note_09", + "Particle_Note_10", + "Particle_Note_11", + "Particle_Note_12", + "Particle_Note_13", + "Particle_Note_14", + "Particle_Note_15", + "Particle_Note_16", + "Particle_Note_17", + "Particle_Note_18", + "Particle_Note_19", + "Particle_Note_20", + "Particle_Note_21", + "Particle_Note_22", + "Particle_Note_23", + "Particle_Note_24", - L"Particle_NetherPortal", - L"Particle_EnderPortal", - L"Particle_Smoke", - L"Particle_Ender", + "Particle_NetherPortal", + "Particle_EnderPortal", + "Particle_Smoke", + "Particle_Ender", - L"Particle_Explode", - L"Particle_HugeExplosion", + "Particle_Explode", + "Particle_HugeExplosion", - L"Particle_DripWater", - L"Particle_DripLavaStart", - L"Particle_DripLavaEnd", + "Particle_DripWater", + "Particle_DripLavaStart", + "Particle_DripLavaEnd", - L"Particle_EnchantmentTable", - L"Particle_DragonBreathMin", - L"Particle_DragonBreathMax", - L"Particle_Suspend", + "Particle_EnchantmentTable", + "Particle_DragonBreathMin", + "Particle_DragonBreathMax", + "Particle_Suspend", - L"Particle_CritStart", // arrow in air - L"Particle_CritEnd", // arrow in air + "Particle_CritStart", // arrow in air + "Particle_CritEnd", // arrow in air - L"Effect_MovementSpeed", - L"Effect_MovementSlowDown", - L"Effect_DigSpeed", - L"Effect_DigSlowdown", - L"Effect_DamageBoost", - L"Effect_Heal", - L"Effect_Harm", - L"Effect_Jump", - L"Effect_Confusion", - L"Effect_Regeneration", - L"Effect_DamageResistance", - L"Effect_FireResistance", - L"Effect_WaterBreathing", - L"Effect_Invisiblity", - L"Effect_Blindness", - L"Effect_NightVision", - L"Effect_Hunger", - L"Effect_Weakness", - L"Effect_Poison", - L"Effect_Wither", - L"Effect_HealthBoost", - L"Effect_Absorption", - L"Effect_Saturation", + "Effect_MovementSpeed", + "Effect_MovementSlowDown", + "Effect_DigSpeed", + "Effect_DigSlowdown", + "Effect_DamageBoost", + "Effect_Heal", + "Effect_Harm", + "Effect_Jump", + "Effect_Confusion", + "Effect_Regeneration", + "Effect_DamageResistance", + "Effect_FireResistance", + "Effect_WaterBreathing", + "Effect_Invisiblity", + "Effect_Blindness", + "Effect_NightVision", + "Effect_Hunger", + "Effect_Weakness", + "Effect_Poison", + "Effect_Wither", + "Effect_HealthBoost", + "Effect_Absorption", + "Effect_Saturation", - L"Potion_BaseColour", + "Potion_BaseColour", - L"Mob_Creeper_Colour1", - L"Mob_Creeper_Colour2", - L"Mob_Skeleton_Colour1", - L"Mob_Skeleton_Colour2", - L"Mob_Spider_Colour1", - L"Mob_Spider_Colour2", - L"Mob_Zombie_Colour1", - L"Mob_Zombie_Colour2", - L"Mob_Slime_Colour1", - L"Mob_Slime_Colour2", - L"Mob_Ghast_Colour1", - L"Mob_Ghast_Colour2", - L"Mob_PigZombie_Colour1", - L"Mob_PigZombie_Colour2", - L"Mob_Enderman_Colour1", - L"Mob_Enderman_Colour2", - L"Mob_CaveSpider_Colour1", - L"Mob_CaveSpider_Colour2", - L"Mob_Silverfish_Colour1", - L"Mob_Silverfish_Colour2", - L"Mob_Blaze_Colour1", - L"Mob_Blaze_Colour2", - L"Mob_LavaSlime_Colour1", - L"Mob_LavaSlime_Colour2", - L"Mob_Pig_Colour1", - L"Mob_Pig_Colour2", - L"Mob_Sheep_Colour1", - L"Mob_Sheep_Colour2", - L"Mob_Cow_Colour1", - L"Mob_Cow_Colour2", - L"Mob_Chicken_Colour1", - L"Mob_Chicken_Colour2", - L"Mob_Squid_Colour1", - L"Mob_Squid_Colour2", - L"Mob_Wolf_Colour1", - L"Mob_Wolf_Colour2", - L"Mob_MushroomCow_Colour1", - L"Mob_MushroomCow_Colour2", - L"Mob_Ocelot_Colour1", - L"Mob_Ocelot_Colour2", - L"Mob_Villager_Colour1", - L"Mob_Villager_Colour2", - L"Mob_Bat_Colour1", - L"Mob_Bat_Colour2", - L"Mob_Witch_Colour1", - L"Mob_Witch_Colour2", - L"Mob_Horse_Colour1", - L"Mob_Horse_Colour2", + "Mob_Creeper_Colour1", + "Mob_Creeper_Colour2", + "Mob_Skeleton_Colour1", + "Mob_Skeleton_Colour2", + "Mob_Spider_Colour1", + "Mob_Spider_Colour2", + "Mob_Zombie_Colour1", + "Mob_Zombie_Colour2", + "Mob_Slime_Colour1", + "Mob_Slime_Colour2", + "Mob_Ghast_Colour1", + "Mob_Ghast_Colour2", + "Mob_PigZombie_Colour1", + "Mob_PigZombie_Colour2", + "Mob_Enderman_Colour1", + "Mob_Enderman_Colour2", + "Mob_CaveSpider_Colour1", + "Mob_CaveSpider_Colour2", + "Mob_Silverfish_Colour1", + "Mob_Silverfish_Colour2", + "Mob_Blaze_Colour1", + "Mob_Blaze_Colour2", + "Mob_LavaSlime_Colour1", + "Mob_LavaSlime_Colour2", + "Mob_Pig_Colour1", + "Mob_Pig_Colour2", + "Mob_Sheep_Colour1", + "Mob_Sheep_Colour2", + "Mob_Cow_Colour1", + "Mob_Cow_Colour2", + "Mob_Chicken_Colour1", + "Mob_Chicken_Colour2", + "Mob_Squid_Colour1", + "Mob_Squid_Colour2", + "Mob_Wolf_Colour1", + "Mob_Wolf_Colour2", + "Mob_MushroomCow_Colour1", + "Mob_MushroomCow_Colour2", + "Mob_Ocelot_Colour1", + "Mob_Ocelot_Colour2", + "Mob_Villager_Colour1", + "Mob_Villager_Colour2", + "Mob_Bat_Colour1", + "Mob_Bat_Colour2", + "Mob_Witch_Colour1", + "Mob_Witch_Colour2", + "Mob_Horse_Colour1", + "Mob_Horse_Colour2", - L"Armour_Default_Leather_Colour", - L"Under_Water_Clear_Colour", - L"Under_Lava_Clear_Colour", - L"In_Cloud_Base_Colour", + "Armour_Default_Leather_Colour", + "Under_Water_Clear_Colour", + "Under_Lava_Clear_Colour", + "In_Cloud_Base_Colour", - L"Under_Water_Fog_Colour", - L"Under_Lava_Fog_Colour", - L"In_Cloud_Fog_Colour", + "Under_Water_Fog_Colour", + "Under_Lava_Fog_Colour", + "In_Cloud_Fog_Colour", - L"Default_Fog_Colour", - L"Nether_Fog_Colour", - L"End_Fog_Colour", + "Default_Fog_Colour", + "Nether_Fog_Colour", + "End_Fog_Colour", - L"Sign_Text", - L"Map_Text", + "Sign_Text", + "Map_Text", - L"Leash_Light_Colour", - L"Leash_Dark_Colour", + "Leash_Light_Colour", + "Leash_Dark_Colour", - L"Fire_Overlay", + "Fire_Overlay", - L"HTMLColor_0", - L"HTMLColor_1", - L"HTMLColor_2", - L"HTMLColor_3", - L"HTMLColor_4", - L"HTMLColor_5", - L"HTMLColor_6", - L"HTMLColor_7", - L"HTMLColor_8", - L"HTMLColor_9", - L"HTMLColor_a", - L"HTMLColor_b", - L"HTMLColor_c", - L"HTMLColor_d", - L"HTMLColor_e", - L"HTMLColor_f", - L"HTMLColor_dark_0", - L"HTMLColor_dark_1", - L"HTMLColor_dark_2", - L"HTMLColor_dark_3", - L"HTMLColor_dark_4", - L"HTMLColor_dark_5", - L"HTMLColor_dark_6", - L"HTMLColor_dark_7", - L"HTMLColor_dark_8", - L"HTMLColor_dark_9", - L"HTMLColor_dark_a", - L"HTMLColor_dark_b", - L"HTMLColor_dark_c", - L"HTMLColor_dark_d", - L"HTMLColor_dark_e", - L"HTMLColor_dark_f", - L"HTMLColor_T1", - L"HTMLColor_T2", - L"HTMLColor_T3", - L"HTMLColor_Black", - L"HTMLColor_White", - L"Color_EnchantText", - L"Color_EnchantTextFocus", - L"Color_EnchantTextDisabled", - L"Color_RenamedItemTitle", + "HTMLColor_0", + "HTMLColor_1", + "HTMLColor_2", + "HTMLColor_3", + "HTMLColor_4", + "HTMLColor_5", + "HTMLColor_6", + "HTMLColor_7", + "HTMLColor_8", + "HTMLColor_9", + "HTMLColor_a", + "HTMLColor_b", + "HTMLColor_c", + "HTMLColor_d", + "HTMLColor_e", + "HTMLColor_f", + "HTMLColor_dark_0", + "HTMLColor_dark_1", + "HTMLColor_dark_2", + "HTMLColor_dark_3", + "HTMLColor_dark_4", + "HTMLColor_dark_5", + "HTMLColor_dark_6", + "HTMLColor_dark_7", + "HTMLColor_dark_8", + "HTMLColor_dark_9", + "HTMLColor_dark_a", + "HTMLColor_dark_b", + "HTMLColor_dark_c", + "HTMLColor_dark_d", + "HTMLColor_dark_e", + "HTMLColor_dark_f", + "HTMLColor_T1", + "HTMLColor_T2", + "HTMLColor_T3", + "HTMLColor_Black", + "HTMLColor_White", + "Color_EnchantText", + "Color_EnchantTextFocus", + "Color_EnchantTextDisabled", + "Color_RenamedItemTitle", }; void ColourTable::staticCtor() { for (unsigned int i = eMinecraftColour_NOT_SET; i < eMinecraftColour_COUNT; ++i) { s_colourNamesMap.insert( - std::unordered_map::value_type( + std::unordered_map::value_type( ColourTableElements[i], (eMinecraftColour)i)); } } @@ -359,7 +359,7 @@ void ColourTable::loadColoursFromData(std::uint8_t* pbData, int coloursCount = dis.readInt(); for (int i = 0; i < coloursCount; ++i) { - std::wstring colourId = dis.readUTF(); + std::string colourId = dis.readUTF(); int colourValue = dis.readInt(); setColour(colourId, colourValue); auto it = s_colourNamesMap.find(colourId); @@ -368,15 +368,15 @@ void ColourTable::loadColoursFromData(std::uint8_t* pbData, bais.reset(); } -void ColourTable::setColour(const std::wstring& colourName, int value) { +void ColourTable::setColour(const std::string& colourName, int value) { auto it = s_colourNamesMap.find(colourName); if (it != s_colourNamesMap.end()) { m_colourValues[(int)it->second] = value; } } -void ColourTable::setColour(const std::wstring& colourName, - const std::wstring& value) { +void ColourTable::setColour(const std::string& colourName, + const std::string& value) { setColour(colourName, fromHexWString(value)); } diff --git a/targets/app/common/Colours/ColourTable.h b/targets/app/common/Colours/ColourTable.h index 021e39c5c..dd8dcb1d7 100644 --- a/targets/app/common/Colours/ColourTable.h +++ b/targets/app/common/Colours/ColourTable.h @@ -9,8 +9,8 @@ class ColourTable { private: unsigned int m_colourValues[eMinecraftColour_COUNT]; - static const wchar_t* ColourTableElements[eMinecraftColour_COUNT]; - static std::unordered_map s_colourNamesMap; + static const char* ColourTableElements[eMinecraftColour_COUNT]; + static std::unordered_map s_colourNamesMap; public: static void staticCtor(); @@ -23,6 +23,6 @@ public: unsigned int getColor(eMinecraftColour id) { return getColour(id); } void loadColoursFromData(std::uint8_t* pbData, std::uint32_t dataLength); - void setColour(const std::wstring& colourName, int value); - void setColour(const std::wstring& colourName, const std::wstring& value); + void setColour(const std::string& colourName, int value); + void setColour(const std::string& colourName, const std::string& value); }; diff --git a/targets/app/common/DLC/DLCAudioFile.cpp b/targets/app/common/DLC/DLCAudioFile.cpp index c76b469ee..c1a83ce27 100644 --- a/targets/app/common/DLC/DLCAudioFile.cpp +++ b/targets/app/common/DLC/DLCAudioFile.cpp @@ -11,6 +11,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" #include "platform/XboxStubs.h" +#include "util/StringHelpers.h" #if defined(_WINDOWS64) #include "app/windows/XML/ATGXmlParser.h" #include "app/windows/XML/xmlFilesCallback.h" @@ -69,7 +70,7 @@ inline std::wstring ReadAudioParamString(const std::uint8_t* data, } } // namespace -DLCAudioFile::DLCAudioFile(const std::wstring& path) +DLCAudioFile::DLCAudioFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_Audio, path) { m_pbData = nullptr; m_dataBytes = 0; @@ -92,8 +93,7 @@ const wchar_t* DLCAudioFile::wchTypeNamesA[] = { L"CREDIT", }; -DLCAudioFile::EAudioParameterType DLCAudioFile::getParameterType( - const std::wstring& paramName) { +DLCAudioFile::EAudioParameterType DLCAudioFile::getParameterType(const std::wstring& paramName) { EAudioParameterType type = e_AudioParamType_Invalid; for (int i = 0; i < e_AudioParamType_Max; ++i) { @@ -107,7 +107,7 @@ DLCAudioFile::EAudioParameterType DLCAudioFile::getParameterType( } void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, - const std::wstring& value) { + const std::string& value) { switch (ptype) { case e_AudioParamType_Credit: // If this parameter exists, then mark // this as free @@ -136,14 +136,14 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, maximumChars = 35; break; } - std::wstring creditValue = value; + std::string creditValue = value; while (creditValue.length() > maximumChars) { unsigned int i = 1; while (i < creditValue.length() && (i + 1) <= maximumChars) { i++; } - int iLast = (int)creditValue.find_last_of(L" ", i); + int iLast = (int)creditValue.find_last_of(" ", i); switch (XGetLanguage()) { case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: @@ -151,7 +151,7 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, iLast = maximumChars; break; default: - iLast = (int)creditValue.find_last_of(L" ", i); + iLast = (int)creditValue.find_last_of(" ", i); break; } @@ -238,7 +238,7 @@ bool DLCAudioFile::processDLCDataFile(std::uint8_t* pbData, if (it != parameterMapping.end()) { addParameter(type, (EAudioParameterType)paramBuf.dwType, - ReadAudioParamString(pbTemp, 0)); + wstringtofilename(ReadAudioParamString(pbTemp, 0))); } pbTemp += AudioParamAdvance(paramBuf.dwWchCount); ReadAudioDlcStruct(¶mBuf, pbTemp); @@ -257,7 +257,7 @@ int DLCAudioFile::GetCountofType(DLCAudioFile::EAudioType eType) { return m_parameters[eType].size(); } -std::wstring& DLCAudioFile::GetSoundName(int iIndex) { +std::string& DLCAudioFile::GetSoundName(int iIndex) { int iWorldType = e_AudioType_Overworld; while (iIndex >= m_parameters[iWorldType].size()) { iIndex -= m_parameters[iWorldType].size(); diff --git a/targets/app/common/DLC/DLCAudioFile.h b/targets/app/common/DLC/DLCAudioFile.h index 642833b9d..c3bd403da 100644 --- a/targets/app/common/DLC/DLCAudioFile.h +++ b/targets/app/common/DLC/DLCAudioFile.h @@ -29,14 +29,14 @@ public: }; static const wchar_t* wchTypeNamesA[e_AudioParamType_Max]; - DLCAudioFile(const std::wstring& path); + DLCAudioFile(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); virtual std::uint8_t* getData(std::uint32_t& dataBytes); bool processDLCDataFile(std::uint8_t* pbData, std::uint32_t dataLength); int GetCountofType(DLCAudioFile::EAudioType ptype); - std::wstring& GetSoundName(int iIndex); + std::string& GetSoundName(int iIndex); private: using DLCFile::addParameter; @@ -44,13 +44,13 @@ private: std::uint8_t* m_pbData; std::uint32_t m_dataBytes; static const int CURRENT_AUDIO_VERSION_NUM = 1; - // std::unordered_map m_parameters; - std::vector m_parameters[e_AudioType_Max]; + // std::unordered_map m_parameters; + std::vector m_parameters[e_AudioType_Max]; // use the EAudioType to order these void addParameter(DLCAudioFile::EAudioType type, DLCAudioFile::EAudioParameterType ptype, - const std::wstring& value); + const std::string& value); DLCAudioFile::EAudioParameterType getParameterType( const std::wstring& paramName); }; diff --git a/targets/app/common/DLC/DLCCapeFile.cpp b/targets/app/common/DLC/DLCCapeFile.cpp index e4dba5d4c..bde677ee6 100644 --- a/targets/app/common/DLC/DLCCapeFile.cpp +++ b/targets/app/common/DLC/DLCCapeFile.cpp @@ -4,7 +4,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" -DLCCapeFile::DLCCapeFile(const std::wstring& path) +DLCCapeFile::DLCCapeFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_Cape, path) {} void DLCCapeFile::addData(std::uint8_t* pbData, std::uint32_t dataBytes) { diff --git a/targets/app/common/DLC/DLCCapeFile.h b/targets/app/common/DLC/DLCCapeFile.h index f90932d5b..5ac4995d2 100644 --- a/targets/app/common/DLC/DLCCapeFile.h +++ b/targets/app/common/DLC/DLCCapeFile.h @@ -6,7 +6,7 @@ class DLCCapeFile : public DLCFile { public: - DLCCapeFile(const std::wstring& path); + DLCCapeFile(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); }; diff --git a/targets/app/common/DLC/DLCColourTableFile.cpp b/targets/app/common/DLC/DLCColourTableFile.cpp index 96aee1ae4..af08ce99d 100644 --- a/targets/app/common/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/DLC/DLCColourTableFile.cpp @@ -8,7 +8,7 @@ #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" -DLCColourTableFile::DLCColourTableFile(const std::wstring& path) +DLCColourTableFile::DLCColourTableFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_ColourTable, path) { m_colourTable = nullptr; } diff --git a/targets/app/common/DLC/DLCColourTableFile.h b/targets/app/common/DLC/DLCColourTableFile.h index d66a9bd2f..c4a218ea9 100644 --- a/targets/app/common/DLC/DLCColourTableFile.h +++ b/targets/app/common/DLC/DLCColourTableFile.h @@ -11,7 +11,7 @@ private: ColourTable* m_colourTable; public: - DLCColourTableFile(const std::wstring& path); + DLCColourTableFile(const std::string& path); ~DLCColourTableFile(); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); diff --git a/targets/app/common/DLC/DLCFile.cpp b/targets/app/common/DLC/DLCFile.cpp index 2383b2954..378bb6403 100644 --- a/targets/app/common/DLC/DLCFile.cpp +++ b/targets/app/common/DLC/DLCFile.cpp @@ -5,17 +5,17 @@ #include "app/common/Minecraft_Macros.h" #include "app/common/DLC/DLCManager.h" -DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) { +DLCFile::DLCFile(DLCManager::EDLCType type, const std::string& path) { m_type = type; m_path = path; // store the id - bool dlcSkin = path.substr(0, 3).compare(L"dlc") == 0; + bool dlcSkin = path.substr(0, 3).compare("dlc") == 0; if (dlcSkin) { - std::wstring skinValue = path.substr(7, path.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); - std::wstringstream ss; + std::string skinValue = path.substr(7, path.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); + std::stringstream ss; ss << std::dec << skinValue.c_str(); ss >> m_dwSkinId; m_dwSkinId = MAKE_SKIN_BITMASK(true, m_dwSkinId); diff --git a/targets/app/common/DLC/DLCFile.h b/targets/app/common/DLC/DLCFile.h index 5e520bd86..2d0e2e0b5 100644 --- a/targets/app/common/DLC/DLCFile.h +++ b/targets/app/common/DLC/DLCFile.h @@ -7,15 +7,15 @@ class DLCFile { protected: DLCManager::EDLCType m_type; - std::wstring m_path; + std::string m_path; std::uint32_t m_dwSkinId; public: - DLCFile(DLCManager::EDLCType type, const std::wstring& path); + DLCFile(DLCManager::EDLCType type, const std::string& path); virtual ~DLCFile() {} DLCManager::EDLCType getType() { return m_type; } - std::wstring getPath() { return m_path; } + std::string getPath() { return m_path; } std::uint32_t getSkinID() { return m_dwSkinId; } virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes) {} @@ -24,11 +24,11 @@ public: return nullptr; } virtual void addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value) {} + const std::string& value) {} - virtual std::wstring getParameterAsString( + virtual std::string getParameterAsString( DLCManager::EDLCParameterType type) { - return L""; + return ""; } virtual bool getParameterAsBool(DLCManager::EDLCParameterType type) { return false; diff --git a/targets/app/common/DLC/DLCGameRules.h b/targets/app/common/DLC/DLCGameRules.h index 4a73f72c4..3be9a70ea 100644 --- a/targets/app/common/DLC/DLCGameRules.h +++ b/targets/app/common/DLC/DLCGameRules.h @@ -5,6 +5,6 @@ class DLCGameRules : public DLCFile { public: - DLCGameRules(DLCManager::EDLCType type, const std::wstring& path) + DLCGameRules(DLCManager::EDLCType type, const std::string& path) : DLCFile(type, path) {} }; \ No newline at end of file diff --git a/targets/app/common/DLC/DLCGameRulesFile.cpp b/targets/app/common/DLC/DLCGameRulesFile.cpp index eb90be010..f51da8400 100644 --- a/targets/app/common/DLC/DLCGameRulesFile.cpp +++ b/targets/app/common/DLC/DLCGameRulesFile.cpp @@ -3,7 +3,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCGameRules.h" -DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path) +DLCGameRulesFile::DLCGameRulesFile(const std::string& path) : DLCGameRules(DLCManager::e_DLCType_GameRules, path) { m_pbData = nullptr; m_dataBytes = 0; diff --git a/targets/app/common/DLC/DLCGameRulesFile.h b/targets/app/common/DLC/DLCGameRulesFile.h index 9679671e5..a35f9b1e5 100644 --- a/targets/app/common/DLC/DLCGameRulesFile.h +++ b/targets/app/common/DLC/DLCGameRulesFile.h @@ -10,7 +10,7 @@ private: std::uint32_t m_dataBytes; public: - DLCGameRulesFile(const std::wstring& path); + DLCGameRulesFile(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); virtual std::uint8_t* getData(std::uint32_t& dataBytes); diff --git a/targets/app/common/DLC/DLCGameRulesHeader.cpp b/targets/app/common/DLC/DLCGameRulesHeader.cpp index 8c00e32ec..e86ec21f7 100644 --- a/targets/app/common/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/DLC/DLCGameRulesHeader.cpp @@ -9,14 +9,14 @@ class StringTable; -DLCGameRulesHeader::DLCGameRulesHeader(const std::wstring& path) +DLCGameRulesHeader::DLCGameRulesHeader(const std::string& path) : DLCGameRules(DLCManager::e_DLCType_GameRulesHeader, path) { m_pbData = nullptr; m_dataBytes = 0; m_hasData = false; - m_grfPath = path.substr(0, path.length() - 4) + L".grf"; + m_grfPath = path.substr(0, path.length() - 4) + ".grf"; lgo = nullptr; } diff --git a/targets/app/common/DLC/DLCGameRulesHeader.h b/targets/app/common/DLC/DLCGameRulesHeader.h index 02e8443ee..fa82416c7 100644 --- a/targets/app/common/DLC/DLCGameRulesHeader.h +++ b/targets/app/common/DLC/DLCGameRulesHeader.h @@ -21,26 +21,26 @@ public: virtual std::uint32_t getRequiredTexturePackId() { return m_requiredTexturePackId; } - virtual std::wstring getDefaultSaveName() { return m_defaultSaveName; } - virtual const wchar_t* getWorldName() { return m_worldName.c_str(); } - virtual const wchar_t* getDisplayName() { return m_displayName.c_str(); } - virtual std::wstring getGrfPath() { return L"GameRules.grf"; } + virtual std::string getDefaultSaveName() { return m_defaultSaveName; } + virtual const char* getWorldName() { return m_worldName.c_str(); } + virtual const char* getDisplayName() { return m_displayName.c_str(); } + virtual std::string getGrfPath() { return "GameRules.grf"; } virtual void setRequiresTexturePack(bool x) { m_bRequiresTexturePack = x; } virtual void setRequiredTexturePackId(std::uint32_t x) { m_requiredTexturePackId = x; } - virtual void setDefaultSaveName(const std::wstring& x) { + virtual void setDefaultSaveName(const std::string& x) { m_defaultSaveName = x; } - virtual void setWorldName(const std::wstring& x) { m_worldName = x; } - virtual void setDisplayName(const std::wstring& x) { m_displayName = x; } - virtual void setGrfPath(const std::wstring& x) { m_grfPath = x; } + virtual void setWorldName(const std::string& x) { m_worldName = x; } + virtual void setDisplayName(const std::string& x) { m_displayName = x; } + virtual void setGrfPath(const std::string& x) { m_grfPath = x; } LevelGenerationOptions* lgo; public: - DLCGameRulesHeader(const std::wstring& path); + DLCGameRulesHeader(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); virtual std::uint8_t* getData(std::uint32_t& dataBytes); diff --git a/targets/app/common/DLC/DLCLocalisationFile.cpp b/targets/app/common/DLC/DLCLocalisationFile.cpp index b82884947..2c79dca26 100644 --- a/targets/app/common/DLC/DLCLocalisationFile.cpp +++ b/targets/app/common/DLC/DLCLocalisationFile.cpp @@ -4,7 +4,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/common/Localisation/StringTable.h" -DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) +DLCLocalisationFile::DLCLocalisationFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { m_strings = nullptr; } diff --git a/targets/app/common/DLC/DLCLocalisationFile.h b/targets/app/common/DLC/DLCLocalisationFile.h index 86a430282..b9787c6b6 100644 --- a/targets/app/common/DLC/DLCLocalisationFile.h +++ b/targets/app/common/DLC/DLCLocalisationFile.h @@ -11,7 +11,7 @@ private: StringTable* m_strings; public: - DLCLocalisationFile(const std::wstring& path); + DLCLocalisationFile(const std::string& path); DLCLocalisationFile( std::uint8_t* pbData, std::uint32_t dataBytes); // when we load in a texture pack details diff --git a/targets/app/common/DLC/DLCManager.cpp b/targets/app/common/DLC/DLCManager.cpp index b583b93ff..a592c0cc2 100644 --- a/targets/app/common/DLC/DLCManager.cpp +++ b/targets/app/common/DLC/DLCManager.cpp @@ -31,10 +31,10 @@ static const std::size_t DLC_WCHAR_BIN_SIZE = 2; #if WCHAR_MAX > 0xFFFF -// than sizeof(wchar_t) != DLC_WCHAR_BIN_SIZE -// e.g. Linux and all Posix/Unix systems with wchar_t beeing 4B/32bit +// than sizeof(char) != DLC_WCHAR_BIN_SIZE +// e.g. Linux and all Posix/Unix systems with char beeing 4B/32bit static_assert(sizeof(wchar_t) == 4, - "wchar_t is not 4bytes but larger than 2bytes ???"); + "char is not 4bytes but larger than 2bytes ???"); static inline std::wstring dlc_read_wstring(const void* data) { const std::uint16_t* p = static_cast(data); @@ -64,7 +64,7 @@ static inline std::wstring dlc_read_wstring(const void* data) { // just in case. static_assert(sizeof(wchar_t) == 2, "How did we get here? wide char smaller than 2 bytes"); -// perfectly fine scince wchar_t will be 2 bytes (UCS-2/UTF-16) +// perfectly fine scince char will be 2 bytes (UCS-2/UTF-16) #define DLC_WSTRING(ptr) std::wstring((wchar_t*)(ptr)) #endif @@ -86,13 +86,13 @@ void ReadDlcStruct(T* out, const std::uint8_t* data, unsigned int offset = 0) { std::memcpy(out, data + offset, sizeof(*out)); } -std::wstring getMountedDlcReadPath(const std::string& path) { - std::wstring readPath = convStringToWstring(path); +std::string getMountedDlcReadPath(const std::string& path) { + std::string readPath = path; #if defined(_WINDOWS64) const std::string mountedPath = PlatformStorage.GetMountedPath(path.c_str()); if (!mountedPath.empty()) { - readPath = convStringToWstring(mountedPath); + readPath = mountedPath; } #endif @@ -104,7 +104,7 @@ bool readOwnedDlcFile(const std::string& path, std::uint8_t** ppData, *ppData = nullptr; *pBytesRead = 0; - const std::wstring readPath = getMountedDlcReadPath(path); + const std::string readPath = getMountedDlcReadPath(path); const std::size_t fSize = PlatformFilesystem.fileSize(readPath); if (fSize == 0 || fSize > std::numeric_limits::max()) { return false; @@ -207,13 +207,13 @@ void DLCManager::LanguageChanged(void) { } } -DLCPack* DLCManager::getPack(const std::wstring& name) { +DLCPack* DLCManager::getPack(const std::string& name) { DLCPack* pack = nullptr; // uint32_t currentIndex = 0; DLCPack* currentPack = nullptr; for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { currentPack = *it; - std::wstring wsName = currentPack->getName(); + std::string wsName = currentPack->getName(); if (wsName.compare(name) == 0) { pack = currentPack; @@ -290,7 +290,7 @@ unsigned int DLCManager::getPackIndex(DLCPack* pack, bool& found, return foundIndex; } -unsigned int DLCManager::getPackIndexContainingSkin(const std::wstring& path, +unsigned int DLCManager::getPackIndexContainingSkin(const std::string& path, bool& found) { unsigned int foundIndex = 0; found = false; @@ -309,7 +309,7 @@ unsigned int DLCManager::getPackIndexContainingSkin(const std::wstring& path, return foundIndex; } -DLCPack* DLCManager::getPackContainingSkin(const std::wstring& path) { +DLCPack* DLCManager::getPackContainingSkin(const std::string& path) { DLCPack* foundPack = nullptr; for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { DLCPack* pack = *it; @@ -323,7 +323,7 @@ DLCPack* DLCManager::getPackContainingSkin(const std::wstring& path) { return foundPack; } -DLCSkinFile* DLCManager::getSkinFile(const std::wstring& path) { +DLCSkinFile* DLCManager::getSkinFile(const std::string& path) { DLCSkinFile* foundSkinfile = nullptr; for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { DLCPack* pack = *it; @@ -355,8 +355,8 @@ unsigned int DLCManager::checkForCorruptDLCAndAlert( uiIDA[0] = IDS_CONFIRM_OK; if (corruptDLCCount == 1 && firstCorruptPack != nullptr) { // pass in the pack format string - wchar_t wchFormat[132]; - swprintf(wchFormat, 132, L"%ls\n\n%%ls", + char wchFormat[132]; + snprintf(wchFormat, 132, "%s\n\n%%s", firstCorruptPack->getName().c_str()); IPlatformStorage::EMessageResult result = ui.RequestErrorMessage( @@ -375,18 +375,18 @@ unsigned int DLCManager::checkForCorruptDLCAndAlert( return corruptDLCCount; } -bool DLCManager::readDLCDataFile(unsigned int& dwFilesProcessed, - const std::wstring& path, DLCPack* pack, - bool fromArchive) { - return readDLCDataFile(dwFilesProcessed, - std::filesystem::path(path).string(), pack, - fromArchive); -} +// bool DLCManager::readDLCDataFile(unsigned int& dwFilesProcessed, +// const std::string& path, DLCPack* pack, +// bool fromArchive) { +// return readDLCDataFile(dwFilesProcessed, +// std::filesystem::path(path).string(), pack, +// fromArchive); +// } bool DLCManager::readDLCDataFile(unsigned int& dwFilesProcessed, const std::string& path, DLCPack* pack, bool fromArchive) { - std::wstring wPath = convStringToWstring(path); + std::string wPath = path; if (fromArchive && app.getArchiveFileSize(wPath) >= 0) { std::vector bytes = app.getArchiveFile(wPath); return processDLCDataFile(dwFilesProcessed, bytes.data(), bytes.size(), @@ -510,7 +510,7 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, new DLCPack(pack->getName(), pack->getLicenseMask()); } else if (type != e_DLCType_PackConfig) { dlcFile = - pack->addFile(type, DLC_DETAIL_WSTR(pbData, uiCurrentByte)); + pack->addFile(type, wstringtofilename(DLC_DETAIL_WSTR(pbData, uiCurrentByte))); } // Params @@ -527,14 +527,14 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, if (it != parameterMapping.end()) { if (type == e_DLCType_PackConfig) { - pack->addParameter(it->second, DLC_PARAM_WSTR(pbTemp, 0)); + pack->addParameter(it->second, wstringtofilename(DLC_PARAM_WSTR(pbTemp, 0))); } else { if (dlcFile != nullptr) dlcFile->addParameter(it->second, - DLC_PARAM_WSTR(pbTemp, 0)); + wstringtofilename(DLC_PARAM_WSTR(pbTemp, 0))); else if (dlcTexturePack != nullptr) dlcTexturePack->addParameter(it->second, - DLC_PARAM_WSTR(pbTemp, 0)); + wstringtofilename(DLC_PARAM_WSTR(pbTemp, 0))); } } pbTemp += DLC_PARAM_ADV(parBuf.dwWchCount); @@ -571,7 +571,7 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, switch (fileBuf.dwType) { case DLCManager::e_DLCType_Skin: app.vSkinNames.push_back( - DLC_DETAIL_WSTR(pbData, uiCurrentByte)); + wstringtofilename(DLC_DETAIL_WSTR(pbData, uiCurrentByte))); break; } diff --git a/targets/app/common/DLC/DLCManager.h b/targets/app/common/DLC/DLCManager.h index d651e4cfd..99b45803d 100644 --- a/targets/app/common/DLC/DLCManager.h +++ b/targets/app/common/DLC/DLCManager.h @@ -77,23 +77,23 @@ public: void removeAllPacks(void); void LanguageChanged(void); - DLCPack* getPack(const std::wstring& name); + DLCPack* getPack(const std::string& name); DLCPack* getPack(unsigned int index, EDLCType type = e_DLCType_All); unsigned int getPackIndex(DLCPack* pack, bool& found, EDLCType type = e_DLCType_All); DLCSkinFile* getSkinFile( - const std::wstring& path); // Will hunt all packs of type skin to find + const std::string& path); // Will hunt all packs of type skin to find // the right skinfile - DLCPack* getPackContainingSkin(const std::wstring& path); - unsigned int getPackIndexContainingSkin(const std::wstring& path, + DLCPack* getPackContainingSkin(const std::string& path); + unsigned int getPackIndexContainingSkin(const std::string& path, bool& found); unsigned int checkForCorruptDLCAndAlert(bool showMessage = true); - bool readDLCDataFile(unsigned int& dwFilesProcessed, - const std::wstring& path, DLCPack* pack, - bool fromArchive = false); + // bool readDLCDataFile(unsigned int& dwFilesProcessed, + // const std::wstring& path, DLCPack* pack, + // bool fromArchive = false); bool readDLCDataFile(unsigned int& dwFilesProcessed, const std::string& path, DLCPack* pack, bool fromArchive = false); diff --git a/targets/app/common/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp index 919d45f4f..27630c9e6 100644 --- a/targets/app/common/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -24,8 +24,8 @@ #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" -DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { - m_dataPath = L""; +DLCPack::DLCPack(const std::string& name, std::uint32_t dwLicenseMask) { + m_dataPath = ""; m_packName = name; m_dwLicenseMask = dwLicenseMask; m_ullFullOfferId = 0LL; @@ -55,7 +55,7 @@ DLCPack::~DLCPack() { // invalidates ALL of it's children. if (m_data) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Deleting data for DLC pack %ls\n", m_packName.c_str()); + printf("Deleting data for DLC pack %s\n", m_packName.c_str()); #endif // For the same reason, don't delete data pointer for any child pack as // it just points to a region within the parent pack that has already @@ -96,12 +96,12 @@ void DLCPack::addChildPack(DLCPack* childPack) { void DLCPack::setParentPack(DLCPack* parentPack) { m_parentPack = parentPack; } void DLCPack::addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value) { + const std::string& value) { switch (type) { case DLCManager::e_DLCParamType_PackId: { std::uint32_t packId = 0; - std::wstringstream ss; + std::stringstream ss; // 4J Stu - numbered using decimal to make it easier for // artists/people to number manually ss << std::dec << value.c_str(); @@ -112,7 +112,7 @@ void DLCPack::addParameter(DLCManager::EDLCParameterType type, case DLCManager::e_DLCParamType_PackVersion: { std::uint32_t version = 0; - std::wstringstream ss; + std::stringstream ss; // 4J Stu - numbered using decimal to make it easier for // artists/people to number manually ss << std::dec << value.c_str(); @@ -140,7 +140,7 @@ bool DLCPack::getParameterAsUInt(DLCManager::EDLCParameterType type, case DLCManager::e_DLCParamType_NetherParticleColour: case DLCManager::e_DLCParamType_EnchantmentTextColour: case DLCManager::e_DLCParamType_EnchantmentTextFocusColour: { - std::wstringstream ss; + std::stringstream ss; ss << std::hex << it->second.c_str(); ss >> param; } break; @@ -152,13 +152,13 @@ bool DLCPack::getParameterAsUInt(DLCManager::EDLCParameterType type, return false; } -DLCFile* DLCPack::addFile(DLCManager::EDLCType type, const std::wstring& path) { +DLCFile* DLCPack::addFile(DLCManager::EDLCType type, const std::string& path) { DLCFile* newFile = nullptr; switch (type) { case DLCManager::e_DLCType_Skin: { - std::vector splitPath = stringSplit(path, L'/'); - std::wstring strippedPath = splitPath.back(); + std::vector splitPath = stringSplit(path, '/'); + std::string strippedPath = splitPath.back(); newFile = new DLCSkinFile(strippedPath); @@ -170,8 +170,8 @@ DLCFile* DLCPack::addFile(DLCManager::EDLCType type, const std::wstring& path) { } } break; case DLCManager::e_DLCType_Cape: { - std::vector splitPath = stringSplit(path, L'/'); - std::wstring strippedPath = splitPath.back(); + std::vector splitPath = stringSplit(path, '/'); + std::string strippedPath = splitPath.back(); newFile = new DLCCapeFile(strippedPath); } break; case DLCManager::e_DLCType_Texture: @@ -208,13 +208,13 @@ DLCFile* DLCPack::addFile(DLCManager::EDLCType type, const std::wstring& path) { // MGH - added this comp func, as the embedded func in find_if was confusing the // PS3 compiler -static const std::wstring* g_pathCmpString = nullptr; +static const std::string* g_pathCmpString = nullptr; static bool pathCmp(DLCFile* val) { return (g_pathCmpString->compare(val->getPath()) == 0); } bool DLCPack::doesPackContainFile(DLCManager::EDLCType type, - const std::wstring& path) { + const std::string& path) { bool hasFile = false; if (type == DLCManager::e_DLCType_All) { for (DLCManager::EDLCType currentType = (DLCManager::EDLCType)0; @@ -253,7 +253,7 @@ DLCFile* DLCPack::getFile(DLCManager::EDLCType type, unsigned int index) { return file; } -DLCFile* DLCPack::getFile(DLCManager::EDLCType type, const std::wstring& path) { +DLCFile* DLCPack::getFile(DLCManager::EDLCType type, const std::string& path) { DLCFile* file = nullptr; if (type == DLCManager::e_DLCType_All) { for (DLCManager::EDLCType currentType = (DLCManager::EDLCType)0; @@ -298,7 +298,7 @@ unsigned int DLCPack::getDLCItemsCount( }; unsigned int DLCPack::getFileIndexAt(DLCManager::EDLCType type, - const std::wstring& path, bool& found) { + const std::string& path, bool& found) { if (type == DLCManager::e_DLCType_All) { app.DebugPrintf("Unimplemented\n"); #if !defined(__CONTENT_PACKAGE) @@ -323,7 +323,7 @@ unsigned int DLCPack::getFileIndexAt(DLCManager::EDLCType type, } bool DLCPack::hasPurchasedFile(DLCManager::EDLCType type, - const std::wstring& path) { + const std::string& path) { if (type == DLCManager::e_DLCType_All) { app.DebugPrintf("Unimplemented\n"); #if !defined(_CONTENT_PACKAGE) @@ -350,7 +350,7 @@ void DLCPack::UpdateLanguage() { // find the language file if (m_files[DLCManager::e_DLCType_LocalisationData].size() > 0) { DLCLocalisationFile* localisationFile = (DLCLocalisationFile*)getFile( - DLCManager::e_DLCType_LocalisationData, L"languages.loc"); + DLCManager::e_DLCType_LocalisationData, "languages.loc"); StringTable* strTable = localisationFile->getStringTable(); strTable->ReloadStringTable(); } diff --git a/targets/app/common/DLC/DLCPack.h b/targets/app/common/DLC/DLCPack.h index 5048e91cf..60c19d5bc 100644 --- a/targets/app/common/DLC/DLCPack.h +++ b/targets/app/common/DLC/DLCPack.h @@ -18,10 +18,10 @@ private: std::vector m_childPacks; DLCPack* m_parentPack; - std::unordered_map m_parameters; + std::unordered_map m_parameters; - std::wstring m_packName; - std::wstring m_dataPath; + std::string m_packName; + std::string m_dataPath; std::uint32_t m_dwLicenseMask; int m_dlcMountIndex; XCONTENTDEVICEID m_dlcDeviceID; @@ -34,10 +34,10 @@ private: m_data; // This pointer is for all the data used for this pack, so // deleting it invalidates ALL of it's children. public: - DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask); + DLCPack(const std::string& name, std::uint32_t dwLicenseMask); ~DLCPack(); - std::wstring getFullDataPath() { return m_dataPath; } + std::string getFullDataPath() { return m_dataPath; } void SetDataPointer(std::uint8_t* pbData) { m_data = pbData; } @@ -62,7 +62,7 @@ public: void setParentPack(DLCPack* parentPack); void addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value); + const std::string& value); bool getParameterAsUInt(DLCManager::EDLCParameterType type, unsigned int& param); @@ -71,38 +71,38 @@ public: } std::uint32_t getLicenseMask() { return m_dwLicenseMask; } - std::wstring getName() { return m_packName; } + std::string getName() { return m_packName; } void UpdateLanguage(); uint64_t getPurchaseOfferId() { return m_ullFullOfferId; } - DLCFile* addFile(DLCManager::EDLCType type, const std::wstring& path); + DLCFile* addFile(DLCManager::EDLCType type, const std::string& path); DLCFile* getFile(DLCManager::EDLCType type, unsigned int index); - DLCFile* getFile(DLCManager::EDLCType type, const std::wstring& path); + DLCFile* getFile(DLCManager::EDLCType type, const std::string& path); unsigned int getDLCItemsCount( DLCManager::EDLCType type = DLCManager::e_DLCType_All); unsigned int getFileIndexAt(DLCManager::EDLCType type, - const std::wstring& path, bool& found); + const std::string& path, bool& found); bool doesPackContainFile(DLCManager::EDLCType type, - const std::wstring& path); + const std::string& path); std::uint32_t GetPackID() { return m_packId; } unsigned int getSkinCount() { return getDLCItemsCount(DLCManager::e_DLCType_Skin); } - unsigned int getSkinIndexAt(const std::wstring& path, bool& found) { + unsigned int getSkinIndexAt(const std::string& path, bool& found) { return getFileIndexAt(DLCManager::e_DLCType_Skin, path, found); } - DLCSkinFile* getSkinFile(const std::wstring& path) { + DLCSkinFile* getSkinFile(const std::string& path) { return (DLCSkinFile*)getFile(DLCManager::e_DLCType_Skin, path); } DLCSkinFile* getSkinFile(unsigned int index) { return (DLCSkinFile*)getFile(DLCManager::e_DLCType_Skin, index); } - bool doesPackContainSkin(const std::wstring& path) { + bool doesPackContainSkin(const std::string& path) { return doesPackContainFile(DLCManager::e_DLCType_Skin, path); } - bool hasPurchasedFile(DLCManager::EDLCType type, const std::wstring& path); + bool hasPurchasedFile(DLCManager::EDLCType type, const std::string& path); }; diff --git a/targets/app/common/DLC/DLCSkinFile.cpp b/targets/app/common/DLC/DLCSkinFile.cpp index ed6aea4f1..be8c44cac 100644 --- a/targets/app/common/DLC/DLCSkinFile.cpp +++ b/targets/app/common/DLC/DLCSkinFile.cpp @@ -10,11 +10,11 @@ #include "minecraft/client/model/SkinBox.h" #include "platform/XboxStubs.h" -DLCSkinFile::DLCSkinFile(const std::wstring& path) +DLCSkinFile::DLCSkinFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { - m_displayName = L""; - m_themeName = L""; - m_cape = L""; + m_displayName = ""; + m_themeName = ""; + m_cape = ""; m_bIsFree = false; m_uiAnimOverrideBitmask = 0L; } @@ -24,13 +24,13 @@ void DLCSkinFile::addData(std::uint8_t* pbData, std::uint32_t dataBytes) { } void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value) { + const std::string& value) { switch (type) { case DLCManager::e_DLCParamType_DisplayName: { // 4J Stu - In skin pack 2, the name for Zap is mis-spelt with two // p's as Zapp dlcskin00000109.png - if (m_path.compare(L"dlcskin00000109.png") == 0) { - m_displayName = L"Zap"; + if (m_path.compare("dlcskin00000109.png") == 0) { + m_displayName = "Zap"; } else { m_displayName = value; } @@ -52,7 +52,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, { if (app.AlreadySeenCreditText(value)) break; // first add a blank string for spacing - app.AddCreditText(L""); + app.AddCreditText(""); int maximumChars = 55; @@ -72,14 +72,14 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, default: break; } - std::wstring creditValue = value; + std::string creditValue = value; while (creditValue.length() > maximumChars) { unsigned int i = 1; while (i < creditValue.length() && (i + 1) <= maximumChars) { i++; } - int iLast = (int)creditValue.find_last_of(L" ", i); + int iLast = (int)creditValue.find_last_of(" ", i); switch (XGetLanguage()) { case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: @@ -87,7 +87,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, iLast = maximumChars; break; default: - iLast = (int)creditValue.find_last_of(L" ", i); + iLast = (int)creditValue.find_last_of(" ", i); break; } @@ -106,25 +106,25 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, m_cape = value; break; case DLCManager::e_DLCParamType_Box: { - wchar_t wchBodyPart[10]; + char wchBodyPart[10]; SKIN_BOX* pSkinBox = new SKIN_BOX; memset(pSkinBox, 0, sizeof(SKIN_BOX)); - swscanf(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f", wchBodyPart, 10, + sscanf(value.c_str(), "%9ls%f%f%f%f%f%f%f%f", wchBodyPart, 10, &pSkinBox->fX, &pSkinBox->fY, &pSkinBox->fZ, &pSkinBox->fW, &pSkinBox->fH, &pSkinBox->fD, &pSkinBox->fU, &pSkinBox->fV); - if (wcscmp(wchBodyPart, L"HEAD") == 0) { + if (strcmp(wchBodyPart, "HEAD") == 0) { pSkinBox->ePart = eBodyPart_Head; - } else if (wcscmp(wchBodyPart, L"BODY") == 0) { + } else if (strcmp(wchBodyPart, "BODY") == 0) { pSkinBox->ePart = eBodyPart_Body; - } else if (wcscmp(wchBodyPart, L"ARM0") == 0) { + } else if (strcmp(wchBodyPart, "ARM0") == 0) { pSkinBox->ePart = eBodyPart_Arm0; - } else if (wcscmp(wchBodyPart, L"ARM1") == 0) { + } else if (strcmp(wchBodyPart, "ARM1") == 0) { pSkinBox->ePart = eBodyPart_Arm1; - } else if (wcscmp(wchBodyPart, L"LEG0") == 0) { + } else if (strcmp(wchBodyPart, "LEG0") == 0) { pSkinBox->ePart = eBodyPart_Leg0; - } else if (wcscmp(wchBodyPart, L"LEG1") == 0) { + } else if (strcmp(wchBodyPart, "LEG1") == 0) { pSkinBox->ePart = eBodyPart_Leg1; } @@ -132,7 +132,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, m_AdditionalBoxes.push_back(pSkinBox); } break; case DLCManager::e_DLCParamType_Anim: { - swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask, + sscanf(value.c_str(), "%X", &m_uiAnimOverrideBitmask, sizeof(unsigned int)); uint32_t skinId = app.getSkinIdFromPath(m_path); app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask); @@ -155,7 +155,7 @@ std::vector* DLCSkinFile::getAdditionalBoxes() { return &m_AdditionalBoxes; } -std::wstring DLCSkinFile::getParameterAsString( +std::string DLCSkinFile::getParameterAsString( DLCManager::EDLCParameterType type) { switch (type) { case DLCManager::e_DLCParamType_DisplayName: @@ -165,7 +165,7 @@ std::wstring DLCSkinFile::getParameterAsString( case DLCManager::e_DLCParamType_Cape: return m_cape; default: - return L""; + return ""; } } diff --git a/targets/app/common/DLC/DLCSkinFile.h b/targets/app/common/DLC/DLCSkinFile.h index ab925f7cd..4e4d12389 100644 --- a/targets/app/common/DLC/DLCSkinFile.h +++ b/targets/app/common/DLC/DLCSkinFile.h @@ -11,21 +11,21 @@ class DLCSkinFile : public DLCFile { private: - std::wstring m_displayName; - std::wstring m_themeName; - std::wstring m_cape; + std::string m_displayName; + std::string m_themeName; + std::string m_cape; unsigned int m_uiAnimOverrideBitmask; bool m_bIsFree; std::vector m_AdditionalBoxes; public: - DLCSkinFile(const std::wstring& path); + DLCSkinFile(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); virtual void addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value); + const std::string& value); - virtual std::wstring getParameterAsString( + virtual std::string getParameterAsString( DLCManager::EDLCParameterType type); virtual bool getParameterAsBool(DLCManager::EDLCParameterType type); std::vector* getAdditionalBoxes(); diff --git a/targets/app/common/DLC/DLCTextureFile.cpp b/targets/app/common/DLC/DLCTextureFile.cpp index 52c9f1ade..777bcedf5 100644 --- a/targets/app/common/DLC/DLCTextureFile.cpp +++ b/targets/app/common/DLC/DLCTextureFile.cpp @@ -3,10 +3,10 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -DLCTextureFile::DLCTextureFile(const std::wstring& path) +DLCTextureFile::DLCTextureFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_Texture, path) { m_bIsAnim = false; - m_animString = L""; + m_animString = ""; m_pbData = nullptr; m_dataBytes = 0; @@ -24,7 +24,7 @@ std::uint8_t* DLCTextureFile::getData(std::uint32_t& dataBytes) { } void DLCTextureFile::addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value) { + const std::string& value) { switch (type) { case DLCManager::e_DLCParamType_Anim: m_animString = value; @@ -36,13 +36,13 @@ void DLCTextureFile::addParameter(DLCManager::EDLCParameterType type, } } -std::wstring DLCTextureFile::getParameterAsString( +std::string DLCTextureFile::getParameterAsString( DLCManager::EDLCParameterType type) { switch (type) { case DLCManager::e_DLCParamType_Anim: return m_animString; default: - return L""; + return ""; } } diff --git a/targets/app/common/DLC/DLCTextureFile.h b/targets/app/common/DLC/DLCTextureFile.h index 015a2915c..39ba7deaa 100644 --- a/targets/app/common/DLC/DLCTextureFile.h +++ b/targets/app/common/DLC/DLCTextureFile.h @@ -8,21 +8,21 @@ class DLCTextureFile : public DLCFile { private: bool m_bIsAnim; - std::wstring m_animString; + std::string m_animString; std::uint8_t* m_pbData; std::uint32_t m_dataBytes; public: - DLCTextureFile(const std::wstring& path); + DLCTextureFile(const std::string& path); virtual void addData(std::uint8_t* pbData, std::uint32_t dataBytes); virtual std::uint8_t* getData(std::uint32_t& dataBytes); virtual void addParameter(DLCManager::EDLCParameterType type, - const std::wstring& value); + const std::string& value); - virtual std::wstring getParameterAsString( + virtual std::string getParameterAsString( DLCManager::EDLCParameterType type); virtual bool getParameterAsBool(DLCManager::EDLCParameterType type); }; diff --git a/targets/app/common/DLC/DLCUIDataFile.cpp b/targets/app/common/DLC/DLCUIDataFile.cpp index 63b2d4a41..b799b548c 100644 --- a/targets/app/common/DLC/DLCUIDataFile.cpp +++ b/targets/app/common/DLC/DLCUIDataFile.cpp @@ -4,7 +4,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/linux/LinuxGame.h" -DLCUIDataFile::DLCUIDataFile(const std::wstring& path) +DLCUIDataFile::DLCUIDataFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_UIData, path) { m_pbData = nullptr; m_dataBytes = 0; diff --git a/targets/app/common/DLC/DLCUIDataFile.h b/targets/app/common/DLC/DLCUIDataFile.h index 4f1fe7902..a55573872 100644 --- a/targets/app/common/DLC/DLCUIDataFile.h +++ b/targets/app/common/DLC/DLCUIDataFile.h @@ -11,7 +11,7 @@ private: bool m_canDeleteData; public: - DLCUIDataFile(const std::wstring& path); + DLCUIDataFile(const std::string& path); ~DLCUIDataFile(); using DLCFile::addData; diff --git a/targets/app/common/DLCController.cpp b/targets/app/common/DLCController.cpp index 093186e82..13bfa6cf7 100644 --- a/targets/app/common/DLCController.cpp +++ b/targets/app/common/DLCController.cpp @@ -37,7 +37,7 @@ std::unordered_map DLCController::MojangData; std::unordered_map DLCController::DLCTextures_PackID; std::unordered_map DLCController::DLCInfo_Trial; std::unordered_map DLCController::DLCInfo_Full; -std::unordered_map DLCController::DLCInfo_SkinName; +std::unordered_map DLCController::DLCInfo_SkinName; std::uint32_t DLCController::m_dwContentTypeA[e_Marketplace_MAX] = { XMARKETPLACE_OFFERING_TYPE_CONTENT, @@ -143,14 +143,14 @@ int DLCController::dlcMountedCallback(int iPad, std::uint32_t dwErr, if (pack != nullptr && pack->IsCorrupt()) { app.DebugPrintf( - "Pack '%ls' is corrupt, removing it from the DLC Manager.\n", + "Pack '%s' is corrupt, removing it from the DLC Manager.\n", CONTENT_DATA_DISPLAY_NAME(ContentData)); app.m_dlcManager.removePack(pack); pack = nullptr; } if (pack == nullptr) { - app.DebugPrintf("Pack \"%ls\" is not installed, so adding it\n", + app.DebugPrintf("Pack \"%s\" is not installed, so adding it\n", CONTENT_DATA_DISPLAY_NAME(ContentData)); #if defined(_WINDOWS64) @@ -169,7 +169,7 @@ int DLCController::dlcMountedCallback(int iPad, std::uint32_t dwErr, } } else { app.DebugPrintf( - "Pack \"%ls\" is already installed. Updating license to %u\n", + "Pack \"%s\" is already installed. Updating license to %u\n", CONTENT_DATA_DISPLAY_NAME(ContentData), dwLicenceMask); pack->SetDLCMountIndex(m_iTotalDLCInstalled); @@ -199,25 +199,25 @@ void DLCController::handleDLC(DLCPack* pack) { if (dwFilesProcessed == 0) app.m_dlcManager.removePack(pack); } -void DLCController::addCreditText(const wchar_t* lpStr) { - app.DebugPrintf("ADDING CREDIT - %ls\n", lpStr); +void DLCController::addCreditText(const char* lpStr) { + app.DebugPrintf("ADDING CREDIT - %s\n", lpStr); SCreditTextItemDef* pCreditStruct = new SCreditTextItemDef; pCreditStruct->m_eType = eSmallText; pCreditStruct->m_iStringID[0] = NO_TRANSLATED_STRING; pCreditStruct->m_iStringID[1] = NO_TRANSLATED_STRING; - pCreditStruct->m_Text = new wchar_t[wcslen(lpStr) + 1]; - wcscpy((wchar_t*)pCreditStruct->m_Text, lpStr); + pCreditStruct->m_Text = new char[strlen(lpStr) + 1]; + strcpy((char*)pCreditStruct->m_Text, lpStr); vDLCCredits.push_back(pCreditStruct); } -bool DLCController::alreadySeenCreditText(const std::wstring& wstemp) { +bool DLCController::alreadySeenCreditText(const std::string& wstemp) { for (unsigned int i = 0; i < m_vCreditText.size(); i++) { - std::wstring temp = m_vCreditText.at(i); + std::string temp = m_vCreditText.at(i); if (temp.compare(wstemp) == 0) { return true; } } - m_vCreditText.push_back((wchar_t*)wstemp.c_str()); + m_vCreditText.push_back((char*)wstemp.c_str()); return false; } @@ -230,12 +230,12 @@ SCreditTextItemDef* DLCController::getDLCCredits(int iIndex) { } #if defined(_WINDOWS64) -int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t DLCController::registerDLCData(char* pType, char* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, - wchar_t* pFirstSkin, + char* pFirstSkin, unsigned int uiSortIndex, int iConfig, - wchar_t* pDataFile) { + char* pDataFile) { int32_t hr = 0; DLC_INFO* pDLCData = new DLC_INFO; memset(pDLCData, 0, sizeof(DLC_INFO)); @@ -246,7 +246,7 @@ int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, pDLCData->uiSortIndex = uiSortIndex; pDLCData->iConfig = iConfig; - if (pBannerName != L"") { + if (pBannerName != "") { wcsncpy_s(pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE); } if (pDataFile[0] != 0) { @@ -254,18 +254,18 @@ int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, } if (pType != nullptr) { - if (wcscmp(pType, L"Skin") == 0) { + if (strcmp(pType, "Skin") == 0) { pDLCData->eDLCType = e_DLC_SkinPack; - } else if (wcscmp(pType, L"Gamerpic") == 0) { + } else if (strcmp(pType, "Gamerpic") == 0) { pDLCData->eDLCType = e_DLC_Gamerpics; - } else if (wcscmp(pType, L"Theme") == 0) { + } else if (strcmp(pType, "Theme") == 0) { pDLCData->eDLCType = e_DLC_Themes; - } else if (wcscmp(pType, L"Avatar") == 0) { + } else if (strcmp(pType, "Avatar") == 0) { pDLCData->eDLCType = e_DLC_AvatarItems; - } else if (wcscmp(pType, L"MashUpPack") == 0) { + } else if (strcmp(pType, "MashUpPack") == 0) { pDLCData->eDLCType = e_DLC_MashupPacks; DLCTextures_PackID[pDLCData->iConfig] = ullOfferID_Full; - } else if (wcscmp(pType, L"TexturePack") == 0) { + } else if (strcmp(pType, "TexturePack") == 0) { pDLCData->eDLCType = e_DLC_TexturePacks; DLCTextures_PackID[pDLCData->iConfig] = ullOfferID_Full; } @@ -278,12 +278,12 @@ int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, return hr; } #elif defined(__linux__) -int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t DLCController::registerDLCData(char* pType, char* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, - wchar_t* pFirstSkin, + char* pFirstSkin, unsigned int uiSortIndex, int iConfig, - wchar_t* pDataFile) { + char* pDataFile) { fprintf(stderr, "warning: DLCController::registerDLCData unimplemented for " "platform `__linux__`\n"); @@ -291,7 +291,7 @@ int32_t DLCController::registerDLCData(wchar_t* pType, wchar_t* pBannerName, } #endif -bool DLCController::getDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, +bool DLCController::getDLCFullOfferIDForSkinID(const std::string& FirstSkin, uint64_t* pullVal) { auto it = DLCInfo_SkinName.find(FirstSkin); if (it == DLCInfo_SkinName.end()) { @@ -585,7 +585,7 @@ unsigned int DLCController::addTMSPPFileTypeRequest(eDLCContentType eType, for (auto it = m_TMSPPDownloadQueue.begin(); it != m_TMSPPDownloadQueue.end(); ++it) { TMSPPRequest* pCurrent = *it; - if (wcscmp(pDLC->wchDataFile, + if (strcmp(pDLC->wchDataFile, pCurrent->wchFilename) == 0) { bAlreadyInQueue = true; break; @@ -603,7 +603,7 @@ unsigned int DLCController::addTMSPPFileTypeRequest(eDLCContentType eType, IPlatformStorage::TMS_FILETYPE_BINARY; memcpy(pTMSPPreq->wchFilename, pDLC->wchDataFile, - sizeof(wchar_t) * MAX_BANNERNAME_SIZE); + sizeof(char) * MAX_BANNERNAME_SIZE); pTMSPPreq->eType = e_DLC_TexturePackData; pTMSPPreq->eState = e_TMS_ContentState_Queued; m_bAllTMSContentRetrieved = false; @@ -623,7 +623,7 @@ unsigned int DLCController::addTMSPPFileTypeRequest(eDLCContentType eType, for (int i = 0; i < iCount; i++) { DLC_INFO* pDLC = getDLCInfoFullOffer(i); if (pDLC->eDLCType == eType) { - wchar_t* cString = pDLC->wchBanner; + char* cString = pDLC->wchBanner; { bool bPresent = app.IsFileInMemoryTextures(cString); @@ -632,7 +632,7 @@ unsigned int DLCController::addTMSPPFileTypeRequest(eDLCContentType eType, for (auto it = m_TMSPPDownloadQueue.begin(); it != m_TMSPPDownloadQueue.end(); ++it) { TMSPPRequest* pCurrent = *it; - if (wcscmp(pDLC->wchBanner, + if (strcmp(pDLC->wchBanner, pCurrent->wchFilename) == 0) { bAlreadyInQueue = true; break; @@ -650,13 +650,13 @@ unsigned int DLCController::addTMSPPFileTypeRequest(eDLCContentType eType, pTMSPPreq->eFileTypeVal = IPlatformStorage::TMS_FILETYPE_BINARY; memcpy(pTMSPPreq->wchFilename, pDLC->wchBanner, - sizeof(wchar_t) * MAX_BANNERNAME_SIZE); + sizeof(char) * MAX_BANNERNAME_SIZE); pTMSPPreq->eType = eType; pTMSPPreq->eState = e_TMS_ContentState_Queued; m_bAllTMSContentRetrieved = false; m_TMSPPDownloadQueue.push_back(pTMSPPreq); app.DebugPrintf( - "===m_TMSPPDownloadQueue Adding %ls, q size is " + "===m_TMSPPDownloadQueue Adding %s, q size is " "%d\n", pTMSPPreq->wchFilename, m_TMSPPDownloadQueue.size()); @@ -682,7 +682,7 @@ int DLCController::tmsPPFileReturned(void* pParam, int iPad, int iUserData, TMSPPRequest* pCurrent = *it; #if defined(_WINDOWS64) char szFile[MAX_TMSFILENAME_SIZE]; - wcstombs(szFile, pCurrent->wchFilename, MAX_TMSFILENAME_SIZE); + strncpy(szFile, pCurrent->wchFilename, MAX_TMSFILENAME_SIZE); if (strcmp(szFilename, szFile) == 0) #endif @@ -692,7 +692,7 @@ int DLCController::tmsPPFileReturned(void* pParam, int iPad, int iUserData, if (pFileData != nullptr) { switch (pCurrent->eType) { case e_DLC_TexturePackData: { - app.DebugPrintf("--- Got texturepack data %ls\n", + app.DebugPrintf("--- Got texturepack data %s\n", pCurrent->wchFilename); int iConfig = app.GetTPConfigVal(pCurrent->wchFilename); @@ -700,7 +700,7 @@ int DLCController::tmsPPFileReturned(void* pParam, int iPad, int iUserData, pFileData->size); } break; default: - app.DebugPrintf("--- Got image data - %ls\n", + app.DebugPrintf("--- Got image data - %s\n", pCurrent->wchFilename); app.AddMemoryTextureFile(pCurrent->wchFilename, pFileData->pbData, diff --git a/targets/app/common/DLCController.h b/targets/app/common/DLCController.h index c793de17f..fbec77634 100644 --- a/targets/app/common/DLCController.h +++ b/targets/app/common/DLCController.h @@ -36,10 +36,10 @@ public: int iPad); // DLC info registration - static int32_t registerDLCData(wchar_t*, wchar_t*, int, uint64_t, uint64_t, - wchar_t*, unsigned int, int, - wchar_t* pDataFile); - bool getDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, + static int32_t registerDLCData(char*, char*, int, uint64_t, uint64_t, + char*, unsigned int, int, + char* pDataFile); + bool getDLCFullOfferIDForSkinID(const std::string& FirstSkin, uint64_t* pullVal); bool getDLCFullOfferIDForPackID(const int iPackID, uint64_t* pullVal); DLC_INFO* getDLCInfoForTrialOfferID(uint64_t ullOfferID_Trial); @@ -77,8 +77,8 @@ public: const char* szFilename); // Credit text - void addCreditText(const wchar_t* lpStr); - bool alreadySeenCreditText(const std::wstring& wstemp); + void addCreditText(const char* lpStr); + bool alreadySeenCreditText(const std::string& wstemp); unsigned int getDLCCreditsCount(); SCreditTextItemDef* getDLCCredits(int iIndex); @@ -100,7 +100,7 @@ public: void setTickTMSDLCFiles(bool bVal) { m_bTickTMSDLCFiles = bVal; } // Public data needed by other parts - std::vector m_vCreditText; + std::vector m_vCreditText; std::uint8_t* m_pDLCFileBuffer; unsigned int m_dwDLCFileSize; @@ -113,7 +113,7 @@ public: static std::unordered_map DLCTextures_PackID; static std::unordered_map DLCInfo_Trial; static std::unordered_map DLCInfo_Full; - static std::unordered_map DLCInfo_SkinName; + static std::unordered_map DLCInfo_SkinName; static std::uint32_t m_dwContentTypeA[e_Marketplace_MAX]; private: diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 4c14b9bcd..88b29a8d1 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -175,9 +175,9 @@ void Game::DebugPrintf(int user, const char* szFormat, ...) { #endif } -const wchar_t* Game::GetString(int iID) { - // return L"Değişiklikler ve Yenilikler"; - // return L"ÕÕÕÕÖÖÖÖ"; +const char* Game::GetString(int iID) { + // return "Değişiklikler ve Yenilikler"; + // return "ÕÕÕÕÖÖÖÖ"; return app.m_localizationManager.getString(iID); } @@ -306,7 +306,7 @@ int Game::GetLocalPlayerCount(void) { // // we only attempt to install the cape once per launch of the // game m_bDefaultCapeInstallAttempted=true; // -// std::wstring wTemp=L"Default_Cape.png"; +// std::string wTemp="Default_Cape.png"; // bool bRes=app.IsFileInMemoryTextures(wTemp); // // if the file is not already in the memory textures, then read // it from TMS if(!bRes) @@ -317,7 +317,7 @@ int Game::GetLocalPlayerCount(void) { // birthday cape #ifdef _CONTENT_PACKAGE // IPlatformStorage::ETMSStatus eTMSStatus; // eTMSStatus=PlatformStorage.ReadTMSFile(PlatformProfile.GetPrimaryPad(),IPlatformStorage::eGlobalStorage_Title,IPlatformStorage::eTMS_FileType_Graphic, -// L"Default_Cape.png",&pBuffer, &dwSize); +// "Default_Cape.png",&pBuffer, &dwSize); // if(eTMSStatus==IPlatformStorage::ETMSStatus_Idle) // { // app.AddMemoryTextureFile(wTemp,pBuffer,dwSize); @@ -438,7 +438,7 @@ void Game::setLevelGenerationOptions( m_gameRules.setLevelGenerationOptions(levelGen); } -const wchar_t* Game::GetGameRulesString(const std::wstring& key) { +const char* Game::GetGameRulesString(const std::string& key) { return m_gameRules.GetGameRulesString(key); } @@ -453,7 +453,7 @@ const wchar_t* Game::GetGameRulesString(const std::wstring& key) { -std::wstring Game::getEntityName(eINSTANCEOF type) { +std::string Game::getEntityName(eINSTANCEOF type) { switch (type) { case eTYPE_WOLF: return app.GetString(IDS_WOLF); @@ -502,7 +502,7 @@ std::wstring Game::getEntityName(eINSTANCEOF type) { break; }; - return L""; + return ""; } // m_dwContentTypeA moved to DLCController @@ -511,18 +511,18 @@ std::wstring Game::getEntityName(eINSTANCEOF type) { -int32_t Game::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, - wchar_t* pSkin, wchar_t* pCape) { +int32_t Game::RegisterMojangData(char* pXuidName, PlayerUID xuid, + char* pSkin, char* pCape) { int32_t hr = 0; eXUID eTempXuid = eXUID_Undefined; MOJANG_DATA* pMojangData = nullptr; // ignore the names if we don't recognize them if (pXuidName != nullptr) { - if (wcscmp(pXuidName, L"XUID_NOTCH") == 0) { + if (strcmp(pXuidName, "XUID_NOTCH") == 0) { eTempXuid = eXUID_Notch; // might be needed for the apple at some point - } else if (wcscmp(pXuidName, L"XUID_DEADMAU5") == 0) { + } else if (strcmp(pXuidName, "XUID_DEADMAU5") == 0) { eTempXuid = eXUID_Deadmau5; // Needed for the deadmau5 ears } else { eTempXuid = eXUID_NoName; @@ -534,8 +534,8 @@ int32_t Game::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, memset(pMojangData, 0, sizeof(MOJANG_DATA)); pMojangData->eXuid = eTempXuid; - wcsncpy(pMojangData->wchSkin, pSkin, MAX_CAPENAME_SIZE); - wcsncpy(pMojangData->wchCape, pCape, MAX_CAPENAME_SIZE); + strncpy(pMojangData->wchSkin, pSkin, MAX_CAPENAME_SIZE); + strncpy(pMojangData->wchCape, pCape, MAX_CAPENAME_SIZE); DLCController::MojangData[xuid] = pMojangData; } @@ -546,13 +546,13 @@ MOJANG_DATA* Game::GetMojangDataForXuid(PlayerUID xuid) { return DLCController::MojangData[xuid]; } -int32_t Game::RegisterConfigValues(wchar_t* pType, int iValue) { +int32_t Game::RegisterConfigValues(char* pType, int iValue) { int32_t hr = 0; // #ifdef 0 // if(pType!=nullptr) // { - // if(wcscmp(pType,L"XboxOneTransfer")==0) + // if(strcmp(pType,"XboxOneTransfer")==0) // { // if(iValue>0) // { @@ -563,7 +563,7 @@ int32_t Game::RegisterConfigValues(wchar_t* pType, int iValue) { // app.m_bTransferSavesToXboxOne=false; // } // } - // else if(wcscmp(pType,L"TransferSlotCount")==0) + // else if(strcmp(pType,"TransferSlotCount")==0) // { // app.m_uiTransferSlotC=iValue; // } @@ -655,11 +655,11 @@ bool Game::IsLocalMultiplayerAvailable() { // (moved to manager class) -std::wstring Game::getFilePath(std::uint32_t packId, - std::wstring filename, +std::string Game::getFilePath(std::uint32_t packId, + std::string filename, bool bAddDataFolder, - std::wstring mountPoint) { - std::wstring path = + std::string mountPoint) { + std::string path = getRootPath(packId, true, bAddDataFolder, mountPoint) + filename; File f(path); if (f.exists()) { @@ -685,19 +685,19 @@ enum ETitleUpdateTexturePacks { }; #if defined(_WINDOWS64) -std::wstring titleUpdateTexturePackRoot = L"Windows64\\DLC\\"; +std::string titleUpdateTexturePackRoot = "Windows64\\DLC\\"; #else -std::wstring titleUpdateTexturePackRoot = L"CU\\DLC\\"; +std::string titleUpdateTexturePackRoot = "CU\\DLC\\"; #endif -std::wstring Game::getRootPath(std::uint32_t packId, +std::string Game::getRootPath(std::uint32_t packId, bool allowOverride, bool bAddDataFolder, - std::wstring mountPoint) { - std::wstring path = mountPoint; + std::string mountPoint) { + std::string path = mountPoint; if (allowOverride) { switch (packId) { case eTUTP_Halloween: - path = titleUpdateTexturePackRoot + L"Halloween Texture Pack"; + path = titleUpdateTexturePackRoot + "Halloween Texture Pack"; break; }; File folder(path); @@ -707,8 +707,8 @@ std::wstring Game::getRootPath(std::uint32_t packId, } if (bAddDataFolder) { - return path + L"\\Data\\"; + return path + "\\Data\\"; } else { - return path + L"\\"; + return path + "\\"; } } diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index ba7e61adb..f87d3cd04 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -73,7 +73,7 @@ public: typedef std::vector VNOTIFICATIONS; // storing skin files - delegated to SkinManager - std::vector& vSkinNames = m_skinManager.vSkinNames; + std::vector& vSkinNames = m_skinManager.vSkinNames; DLCManager m_dlcManager; SaveManager m_saveManager; BannedListManager m_bannedListManager; @@ -88,7 +88,7 @@ public: MenuController m_menuController; // storing credits text from the DLC - delegated to DLCController - std::vector& m_vCreditText = m_dlcController.m_vCreditText; + std::vector& m_vCreditText = m_dlcController.m_vCreditText; // In builds prior to TU5, the size of the GAME_SETTINGS struct was 204 // bytes. We added a few new values to the internal struct in TU5, and even @@ -168,7 +168,7 @@ public: } bool LoadEnchantingMenu(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, - const std::wstring& name) { + const std::string& name) { return m_menuController.loadEnchantingMenu(iPad, inventory, x, y, z, level, name); } bool LoadFurnaceMenu(int iPad, std::shared_ptr inventory, @@ -208,7 +208,7 @@ public: } bool LoadTradingMenu(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, - const std::wstring& name) { + const std::string& name) { return m_menuController.loadTradingMenu(iPad, inventory, trader, level, name); } @@ -241,7 +241,7 @@ public: m_gameSettingsManager.setSpecialTutorialCompletionFlag(iPad, index); } - static const wchar_t* GetString(int iID); + static const char* GetString(int iID); StringTable* getStringTable() const { return m_localizationManager.getStringTable(); } eGameMode GetGameMode() { return m_eGameMode; } @@ -363,13 +363,13 @@ public: unsigned char GetGameSettings(eGameSetting eVal) { return m_gameSettingsManager.getGameSettings(eVal); } - void SetPlayerSkin(int iPad, const std::wstring& name) { + void SetPlayerSkin(int iPad, const std::string& name) { m_skinManager.setPlayerSkin(iPad, name, GameSettingsA); } void SetPlayerSkin(int iPad, std::uint32_t dwSkinId) { m_skinManager.setPlayerSkin(iPad, dwSkinId, GameSettingsA); } - void SetPlayerCape(int iPad, const std::wstring& name) { + void SetPlayerCape(int iPad, const std::string& name) { m_skinManager.setPlayerCape(iPad, name, GameSettingsA); } void SetPlayerCape(int iPad, std::uint32_t dwCapeId) { @@ -432,13 +432,13 @@ public: } public: - std::wstring GetPlayerSkinName(int iPad) { + std::string GetPlayerSkinName(int iPad) { return m_skinManager.getPlayerSkinName(iPad, GameSettingsA); } std::uint32_t GetPlayerSkinId(int iPad) { return m_skinManager.getPlayerSkinId(iPad, GameSettingsA, m_dlcManager); } - std::wstring GetPlayerCapeName(int iPad) { + std::string GetPlayerCapeName(int iPad) { return m_skinManager.getPlayerCapeName(iPad, GameSettingsA); } std::uint32_t GetPlayerCapeId(int iPad) { @@ -523,7 +523,7 @@ public: #endif void SetDebugSequence(const char* pchSeq); // bool UploadFileToGlobalStorage(int iQuadrant, - // IPlatformStorage::eGlobalStorage eStorageFacility, std::wstring *wsFile ); + // IPlatformStorage::eGlobalStorage eStorageFacility, std::string *wsFile ); // Installed DLC - delegated to DLCController bool StartInstallDLCProcess(int iPad) { return m_dlcController.startInstallDLCProcess(iPad); } @@ -544,7 +544,7 @@ public: return DLCController::marketplaceCountsCallback(pParam, details, iPad); } - bool AlreadySeenCreditText(const std::wstring& wstemp) { + bool AlreadySeenCreditText(const std::string& wstemp) { return m_dlcController.alreadySeenCreditText(wstemp); } @@ -563,18 +563,18 @@ public: } bool isXuidDeadmau5(PlayerUID xuid); - void AddMemoryTextureFile(const std::wstring& wName, std::uint8_t* pbData, + void AddMemoryTextureFile(const std::string& wName, std::uint8_t* pbData, unsigned int byteCount) { m_skinManager.addMemoryTextureFile(wName, pbData, byteCount); } - void RemoveMemoryTextureFile(const std::wstring& wName) { + void RemoveMemoryTextureFile(const std::string& wName) { m_skinManager.removeMemoryTextureFile(wName); } - void GetMemFileDetails(const std::wstring& wName, std::uint8_t** ppbData, + void GetMemFileDetails(const std::string& wName, std::uint8_t** ppbData, unsigned int* pByteCount) { m_skinManager.getMemFileDetails(wName, ppbData, pByteCount); } - bool IsFileInMemoryTextures(const std::wstring& wName) { + bool IsFileInMemoryTextures(const std::string& wName) { return m_skinManager.isFileInMemoryTextures(wName); } @@ -593,7 +593,7 @@ public: m_archiveManager.getTPD(iConfig, ppbData, pByteCount); } int GetTPDSize() { return m_archiveManager.getTPDSize(); } - int GetTPConfigVal(wchar_t* pwchDataFile) { + int GetTPConfigVal(char* pwchDataFile) { return m_archiveManager.getTPConfigVal(pwchDataFile); } @@ -611,7 +611,7 @@ public: } // Add credits for DLC installed - delegated to DLCController - void AddCreditText(const wchar_t* lpStr) { m_dlcController.addCreditText(lpStr); } + void AddCreditText(const char* lpStr) { m_dlcController.addCreditText(lpStr); } private: std::unordered_map m_GTS_Files; @@ -665,13 +665,13 @@ public: } public: - int getArchiveFileSize(const std::wstring& filename) { + int getArchiveFileSize(const std::string& filename) { return m_archiveManager.getArchiveFileSize(filename); } - bool hasArchiveFile(const std::wstring& filename) { + bool hasArchiveFile(const std::string& filename) { return m_archiveManager.hasArchiveFile(filename); } - std::vector getArchiveFile(const std::wstring& filename) { + std::vector getArchiveFile(const std::string& filename) { return m_archiveManager.getArchiveFile(filename); } @@ -793,17 +793,17 @@ public: int GetHTMLFontSize(EHTMLFontSize size) { return m_localizationManager.getHTMLFontSize(size); } - std::wstring FormatHTMLString(int iPad, const std::wstring& desc, + std::string FormatHTMLString(int iPad, const std::string& desc, int shadowColour = 0xFFFFFFFF) { return m_localizationManager.formatHTMLString(iPad, desc, shadowColour); } - std::wstring GetActionReplacement(int iPad, unsigned char ucAction) { + std::string GetActionReplacement(int iPad, unsigned char ucAction) { return m_localizationManager.getActionReplacement(iPad, ucAction); } - std::wstring GetVKReplacement(unsigned int uiVKey) { + std::string GetVKReplacement(unsigned int uiVKey) { return m_localizationManager.getVKReplacement(uiVKey); } - std::wstring GetIconReplacement(unsigned int uiIcon) { + std::string GetIconReplacement(unsigned int uiIcon) { return m_localizationManager.getIconReplacement(uiIcon); } @@ -836,16 +836,16 @@ public: return m_terrainFeatureManager.getPosition(eType, pX, pZ); } - static int32_t RegisterMojangData(wchar_t*, PlayerUID, wchar_t*, wchar_t*); + static int32_t RegisterMojangData(char*, PlayerUID, char*, char*); MOJANG_DATA* GetMojangDataForXuid(PlayerUID xuid); - static int32_t RegisterConfigValues(wchar_t* pType, int iValue); + static int32_t RegisterConfigValues(char* pType, int iValue); - static int32_t RegisterDLCData(wchar_t* a, wchar_t* b, int c, uint64_t d, uint64_t e, - wchar_t* f, unsigned int g, int h, - wchar_t* pDataFile) { + static int32_t RegisterDLCData(char* a, char* b, int c, uint64_t d, uint64_t e, + char* f, unsigned int g, int h, + char* pDataFile) { return DLCController::registerDLCData(a, b, c, d, e, f, g, h, pDataFile); } - bool GetDLCFullOfferIDForSkinID(const std::wstring& FirstSkin, + bool GetDLCFullOfferIDForSkinID(const std::string& FirstSkin, uint64_t* pullVal) { return m_dlcController.getDLCFullOfferIDForSkinID(FirstSkin, pullVal); } @@ -971,7 +971,7 @@ public: LevelGenerationOptions* getLevelGenerationOptions() { return m_gameRules.getLevelGenerationOptions(); } - const wchar_t* GetGameRulesString(const std::wstring& key); + const char* GetGameRulesString(const std::string& key); // m_playerColours and m_playerGamePrivileges moved to NetworkController @@ -988,7 +988,7 @@ public: return m_networkController.getPlayerPrivileges(networkSmallId); } - std::wstring getEntityName(eINSTANCEOF type); + std::string getEntityName(eINSTANCEOF type); unsigned int AddDLCRequest(eDLCMarketplaceType eContentType, bool bPromote = false) { @@ -1053,11 +1053,11 @@ public: unsigned int& m_dwDLCFileSize = m_dlcController.m_dwDLCFileSize; std::uint8_t*& m_pDLCFileBuffer = m_dlcController.m_pDLCFileBuffer; - // static int CallbackReadXuidsFileFromTMS(void* lpParam, wchar_t + // static int CallbackReadXuidsFileFromTMS(void* lpParam, char // *wchFilename, int iPad, bool bResult, int iAction); static int - // CallbackDLCFileFromTMS(void* lpParam, wchar_t *wchFilename, int iPad, + // CallbackDLCFileFromTMS(void* lpParam, char *wchFilename, int iPad, // bool bResult, int iAction); static int - // CallbackBannedListFileFromTMS(void* lpParam, wchar_t *wchFilename, int + // CallbackBannedListFileFromTMS(void* lpParam, char *wchFilename, int // iPad, bool bResult, int iAction); // Storing additional model parts per skin texture @@ -1083,18 +1083,18 @@ public: return m_skinManager.getAnimOverrideBitmask(dwSkinID); } - static std::uint32_t getSkinIdFromPath(const std::wstring& skin) { + static std::uint32_t getSkinIdFromPath(const std::string& skin) { return SkinManager::getSkinIdFromPath(skin); } - static std::wstring getSkinPathFromId(std::uint32_t skinId) { + static std::string getSkinPathFromId(std::uint32_t skinId) { return SkinManager::getSkinPathFromId(skinId); } - int LoadLocalTMSFile(wchar_t* wchTMSFile) override = 0; - int LoadLocalTMSFile(wchar_t* wchTMSFile, + int LoadLocalTMSFile(char* wchTMSFile) override = 0; + int LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt) override = 0; void FreeLocalTMSFiles(eTMSFileType eType) override = 0; - int GetLocalTMSFileIndex(wchar_t* wchTMSFile, + int GetLocalTMSFileIndex(char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) override = 0; @@ -1133,25 +1133,25 @@ private: // 4J-PB - language and locale functions public: void LocaleAndLanguageInit() { m_localizationManager.localeAndLanguageInit(); } - void getLocale(std::vector& vecWstrLocales) { + void getLocale(std::vector& vecWstrLocales) { m_localizationManager.getLocale(vecWstrLocales); } - int get_eMCLang(wchar_t* pwchLocale) { + int get_eMCLang(char* pwchLocale) { return m_localizationManager.get_eMCLang(pwchLocale); } - int get_xcLang(wchar_t* pwchLocale) { + int get_xcLang(char* pwchLocale) { return m_localizationManager.get_xcLang(pwchLocale); } void SetTickTMSDLCFiles(bool bVal) { m_dlcController.setTickTMSDLCFiles(bVal); } - std::wstring getFilePath(std::uint32_t packId, std::wstring filename, + std::string getFilePath(std::uint32_t packId, std::string filename, bool bAddDataFolder, - std::wstring mountPoint = L"TPACK:"); + std::string mountPoint = "TPACK:"); private: - std::wstring getRootPath(std::uint32_t packId, bool allowOverride, - bool bAddDataFolder, std::wstring mountPoint); + std::string getRootPath(std::uint32_t packId, bool allowOverride, + bool bAddDataFolder, std::string mountPoint); public: #if defined(_WINDOWS64) diff --git a/targets/app/common/GameMenuService.cpp b/targets/app/common/GameMenuService.cpp index 3b4305841..a264ed789 100644 --- a/targets/app/common/GameMenuService.cpp +++ b/targets/app/common/GameMenuService.cpp @@ -14,7 +14,7 @@ bool GameMenuService::openCrafting2x2(int iPad, std::shared_ptr pla bool GameMenuService::openCrafting3x3(int iPad, std::shared_ptr player, int x, int y, int z) { return game_.LoadCrafting3x3Menu(iPad, player, x, y, z); } -bool GameMenuService::openEnchanting(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, const std::wstring& name) { +bool GameMenuService::openEnchanting(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, const std::string& name) { return game_.LoadEnchantingMenu(iPad, inventory, x, y, z, level, name); } bool GameMenuService::openFurnace(int iPad, std::shared_ptr inventory, std::shared_ptr furnace) { @@ -38,7 +38,7 @@ bool GameMenuService::openSign(int iPad, std::shared_ptr sign) { bool GameMenuService::openRepairing(int iPad, std::shared_ptr inventory, Level* level, int x, int y, int z) { return game_.LoadRepairingMenu(iPad, inventory, level, x, y, z); } -bool GameMenuService::openTrading(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, const std::wstring& name) { +bool GameMenuService::openTrading(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, const std::string& name) { return game_.LoadTradingMenu(iPad, inventory, trader, level, name); } bool GameMenuService::openCommandBlock(int iPad, std::shared_ptr commandBlock) { diff --git a/targets/app/common/GameMenuService.h b/targets/app/common/GameMenuService.h index cb056da7e..a864deb6e 100644 --- a/targets/app/common/GameMenuService.h +++ b/targets/app/common/GameMenuService.h @@ -18,7 +18,7 @@ public: int y, int z) override; bool openEnchanting(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, - const std::wstring& name) override; + const std::string& name) override; bool openFurnace(int iPad, std::shared_ptr inventory, std::shared_ptr furnace) override; bool openBrewingStand( @@ -35,7 +35,7 @@ public: Level* level, int x, int y, int z) override; bool openTrading(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, - const std::wstring& name) override; + const std::string& name) override; bool openCommandBlock( int iPad, std::shared_ptr commandBlock) override; bool openHopper(int iPad, std::shared_ptr inventory, diff --git a/targets/app/common/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp index 321596d45..9994fbd10 100644 --- a/targets/app/common/GameRules/GameRuleManager.cpp +++ b/targets/app/common/GameRules/GameRuleManager.cpp @@ -29,73 +29,73 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #include "strings.h" -const wchar_t* GameRuleManager::wchTagNameA[] = { - L"", // eGameRuleType_Root - L"MapOptions", // eGameRuleType_LevelGenerationOptions - L"ApplySchematic", // eGameRuleType_ApplySchematic - L"GenerateStructure", // eGameRuleType_GenerateStructure - L"GenerateBox", // eGameRuleType_GenerateBox - L"PlaceBlock", // eGameRuleType_PlaceBlock - L"PlaceContainer", // eGameRuleType_PlaceContainer - L"PlaceSpawner", // eGameRuleType_PlaceSpawner - L"BiomeOverride", // eGameRuleType_BiomeOverride - L"StartFeature", // eGameRuleType_StartFeature - L"AddItem", // eGameRuleType_AddItem - L"AddEnchantment", // eGameRuleType_AddEnchantment - L"LevelRules", // eGameRuleType_LevelRules - L"NamedArea", // eGameRuleType_NamedArea - L"UseTile", // eGameRuleType_UseTileRule - L"CollectItem", // eGameRuleType_CollectItemRule - L"CompleteAll", // eGameRuleType_CompleteAllRule - L"UpdatePlayer", // eGameRuleType_UpdatePlayerRule +const char* GameRuleManager::wchTagNameA[] = { + "", // eGameRuleType_Root + "MapOptions", // eGameRuleType_LevelGenerationOptions + "ApplySchematic", // eGameRuleType_ApplySchematic + "GenerateStructure", // eGameRuleType_GenerateStructure + "GenerateBox", // eGameRuleType_GenerateBox + "PlaceBlock", // eGameRuleType_PlaceBlock + "PlaceContainer", // eGameRuleType_PlaceContainer + "PlaceSpawner", // eGameRuleType_PlaceSpawner + "BiomeOverride", // eGameRuleType_BiomeOverride + "StartFeature", // eGameRuleType_StartFeature + "AddItem", // eGameRuleType_AddItem + "AddEnchantment", // eGameRuleType_AddEnchantment + "LevelRules", // eGameRuleType_LevelRules + "NamedArea", // eGameRuleType_NamedArea + "UseTile", // eGameRuleType_UseTileRule + "CollectItem", // eGameRuleType_CollectItemRule + "CompleteAll", // eGameRuleType_CompleteAllRule + "UpdatePlayer", // eGameRuleType_UpdatePlayerRule }; -const wchar_t* GameRuleManager::wchAttrNameA[] = { - L"descriptionName", // eGameRuleAttr_descriptionName - L"promptName", // eGameRuleAttr_promptName - L"dataTag", // eGameRuleAttr_dataTag - L"enchantmentId", // eGameRuleAttr_enchantmentId - L"enchantmentLevel", // eGameRuleAttr_enchantmentLevel - L"itemId", // eGameRuleAttr_itemId - L"quantity", // eGameRuleAttr_quantity - L"auxValue", // eGameRuleAttr_auxValue - L"slot", // eGameRuleAttr_slot - L"name", // eGameRuleAttr_name - L"food", // eGameRuleAttr_food - L"health", // eGameRuleAttr_health - L"tileId", // eGameRuleAttr_tileId - L"useCoords", // eGameRuleAttr_useCoords - L"seed", // eGameRuleAttr_seed - L"flatworld", // eGameRuleAttr_flatworld - L"filename", // eGameRuleAttr_filename - L"rot", // eGameRuleAttr_rot - L"data", // eGameRuleAttr_data - L"block", // eGameRuleAttr_block - L"entity", // eGameRuleAttr_entity - L"facing", // eGameRuleAttr_facing - L"edgeTile", // eGameRuleAttr_edgeTile - L"fillTile", // eGameRuleAttr_fillTile - L"skipAir", // eGameRuleAttr_skipAir - L"x", // eGameRuleAttr_x - L"x0", // eGameRuleAttr_x0 - L"x1", // eGameRuleAttr_x1 - L"y", // eGameRuleAttr_y - L"y0", // eGameRuleAttr_y0 - L"y1", // eGameRuleAttr_y1 - L"z", // eGameRuleAttr_z - L"z0", // eGameRuleAttr_z0 - L"z1", // eGameRuleAttr_z1 - L"chunkX", // eGameRuleAttr_chunkX - L"chunkZ", // eGameRuleAttr_chunkZ - L"yRot", // eGameRuleAttr_yRot - L"spawnX", // eGameRuleAttr_spawnX - L"spawnY", // eGameRuleAttr_spawnY - L"spawnZ", // eGameRuleAttr_spawnZ - L"orientation", - L"dimension", - L"topTileId", // eGameRuleAttr_topTileId - L"biomeId", // eGameRuleAttr_biomeId - L"feature", // eGameRuleAttr_feature +const char* GameRuleManager::wchAttrNameA[] = { + "descriptionName", // eGameRuleAttr_descriptionName + "promptName", // eGameRuleAttr_promptName + "dataTag", // eGameRuleAttr_dataTag + "enchantmentId", // eGameRuleAttr_enchantmentId + "enchantmentLevel", // eGameRuleAttr_enchantmentLevel + "itemId", // eGameRuleAttr_itemId + "quantity", // eGameRuleAttr_quantity + "auxValue", // eGameRuleAttr_auxValue + "slot", // eGameRuleAttr_slot + "name", // eGameRuleAttr_name + "food", // eGameRuleAttr_food + "health", // eGameRuleAttr_health + "tileId", // eGameRuleAttr_tileId + "useCoords", // eGameRuleAttr_useCoords + "seed", // eGameRuleAttr_seed + "flatworld", // eGameRuleAttr_flatworld + "filename", // eGameRuleAttr_filename + "rot", // eGameRuleAttr_rot + "data", // eGameRuleAttr_data + "block", // eGameRuleAttr_block + "entity", // eGameRuleAttr_entity + "facing", // eGameRuleAttr_facing + "edgeTile", // eGameRuleAttr_edgeTile + "fillTile", // eGameRuleAttr_fillTile + "skipAir", // eGameRuleAttr_skipAir + "x", // eGameRuleAttr_x + "x0", // eGameRuleAttr_x0 + "x1", // eGameRuleAttr_x1 + "y", // eGameRuleAttr_y + "y0", // eGameRuleAttr_y0 + "y1", // eGameRuleAttr_y1 + "z", // eGameRuleAttr_z + "z0", // eGameRuleAttr_z0 + "z1", // eGameRuleAttr_z1 + "chunkX", // eGameRuleAttr_chunkX + "chunkZ", // eGameRuleAttr_chunkZ + "yRot", // eGameRuleAttr_yRot + "spawnX", // eGameRuleAttr_spawnX + "spawnY", // eGameRuleAttr_spawnY + "spawnZ", // eGameRuleAttr_spawnZ + "orientation", + "dimension", + "topTileId", // eGameRuleAttr_topTileId + "biomeId", // eGameRuleAttr_biomeId + "feature", // eGameRuleAttr_feature }; GameRuleManager::GameRuleManager() { @@ -107,10 +107,10 @@ void GameRuleManager::loadGameRules(DLCPack* pack) { StringTable* strings = nullptr; if (pack->doesPackContainFile(DLCManager::e_DLCType_LocalisationData, - L"languages.loc")) { + "languages.loc")) { DLCLocalisationFile* localisationFile = (DLCLocalisationFile*)pack->getFile( - DLCManager::e_DLCType_LocalisationData, L"languages.loc"); + DLCManager::e_DLCType_LocalisationData, "languages.loc"); strings = localisationFile->getStringTable(); } @@ -231,7 +231,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions* lgo, uint8_t* dIn, dis2.read(bRuleFile); // 4J-JEV: I don't believe that the path-name is ever used. - // DLCGameRulesFile *dlcgr = new DLCGameRulesFile(L"__PLACEHOLDER__"); + // DLCGameRulesFile *dlcgr = new DLCGameRulesFile("__PLACEHOLDER__"); // dlcgr->addData(bRuleFile.data(),bRuleFile.size()); if (readRuleFile(lgo, bRuleFile.data(), bRuleFile.size(), strings)) { @@ -358,11 +358,11 @@ void GameRuleManager::writeRuleFile(DataOutputStream* dos) { dos->writeUTF(wchAttrNameA[i]); // Write schematic files. - std::unordered_map* files; + std::unordered_map* files; files = getLevelGenerationOptions()->getUnfinishedSchematicFiles(); dos->writeInt(files->size()); for (auto it = files->begin(); it != files->end(); it++) { - std::wstring filename = it->first; + std::string filename = it->first; ConsoleSchematicFile* file = it->second; ByteArrayOutputStream fileBaos; @@ -488,7 +488,7 @@ bool GameRuleManager::readRuleFile( // string lookup. unsigned int numStrings = contentDis->readInt(); - std::vector tagsAndAtts; + std::vector tagsAndAtts; for (unsigned int i = 0; i < numStrings; i++) tagsAndAtts.push_back(contentDis->readUTF()); @@ -525,7 +525,7 @@ bool GameRuleManager::readRuleFile( // subfile unsigned int numFiles = contentDis->readInt(); for (unsigned int i = 0; i < numFiles; i++) { - std::wstring sFilename = contentDis->readUTF(); + std::string sFilename = contentDis->readUTF(); int length = contentDis->readInt(); std::vector ba(length); @@ -550,13 +550,13 @@ bool GameRuleManager::readRuleFile( if (tagVal == ConsoleGameRules::eGameRuleType_LevelGenerationOptions) { rule = levelGenerator; levelGenAdded = true; - // m_levelGenerators.addLevelGenerator(L"",levelGenerator); + // m_levelGenerators.addLevelGenerator("",levelGenerator); lgoID = addLevelGenerationOptions(levelGenerator); levelGenerator->loadStringTable(strings); } else if (tagVal == ConsoleGameRules::eGameRuleType_LevelRules) { rule = gameRules; gameRulesAdded = true; - m_levelRules.addLevelRule(L"", gameRules); + m_levelRules.addLevelRule("", gameRules); levelGenerator->setRequiredGameRules(gameRules); gameRules->loadStringTable(strings); } @@ -593,20 +593,20 @@ LevelGenerationOptions* GameRuleManager::readHeader(DLCGameRulesHeader* grh) { } void GameRuleManager::readAttributes(DataInputStream* dis, - std::vector* tagsAndAtts, + std::vector* tagsAndAtts, GameRuleDefinition* rule) { int numAttrs = dis->readInt(); for (unsigned int att = 0; att < static_cast(numAttrs); ++att) { int attID = dis->readInt(); - std::wstring value = dis->readUTF(); + std::string value = dis->readUTF(); if (rule != nullptr) rule->addAttribute(tagsAndAtts->at(attID), value); } } void GameRuleManager::readChildren( - DataInputStream* dis, std::vector* tagsAndAtts, + DataInputStream* dis, std::vector* tagsAndAtts, std::unordered_map* tagIdMap, GameRuleDefinition* rule) { int numChildren = dis->readInt(); @@ -643,23 +643,23 @@ void GameRuleManager::processSchematicsLighting(LevelChunk* levelChunk) { void GameRuleManager::loadDefaultGameRules() { #if !defined(__linux__) #if defined(_WINDOWS64) - File packedTutorialFile(L"Windows64Media\\Tutorial\\Tutorial.pck"); + File packedTutorialFile("Windows64Media\\Tutorial\\Tutorial.pck"); if (!packedTutorialFile.exists()) - packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck"); + packedTutorialFile = File("Windows64\\Tutorial\\Tutorial.pck"); #else - File packedTutorialFile(L"Tutorial\\Tutorial.pck"); + File packedTutorialFile("Tutorial\\Tutorial.pck"); #endif if (loadGameRulesPack(&packedTutorialFile)) { m_levelGenerators.getLevelGenerators()->at(0)->setWorldName( app.GetString(IDS_PLAY_TUTORIAL)); - // m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(L"Tutorial"); + // m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName("Tutorial"); m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName( app.GetString(IDS_TUTORIALSAVENAME)); } #else - std::wstring fpTutorial = L"Tutorial.pck"; + std::string fpTutorial = "Tutorial.pck"; if (app.getArchiveFileSize(fpTutorial) >= 0) { - DLCPack* pack = new DLCPack(L"", 0xffffffff); + DLCPack* pack = new DLCPack("", 0xffffffff); uint32_t dwFilesProcessed = 0; if (app.m_dlcManager.readDLCDataFile(dwFilesProcessed, fpTutorial, pack, true)) { @@ -677,7 +677,7 @@ void GameRuleManager::loadDefaultGameRules() { bool GameRuleManager::loadGameRulesPack(File* path) { bool success = false; if (path->exists()) { - DLCPack* pack = new DLCPack(L"", 0xffffffff); + DLCPack* pack = new DLCPack("", 0xffffffff); unsigned int dwFilesProcessed = 0; if (app.m_dlcManager.readDLCDataFile(dwFilesProcessed, path->getPath(), pack)) { @@ -707,11 +707,11 @@ void GameRuleManager::setLevelGenerationOptions( m_currentLevelGenerationOptions->reset_start(); } -const wchar_t* GameRuleManager::GetGameRulesString(const std::wstring& key) { +const char* GameRuleManager::GetGameRulesString(const std::string& key) { if (m_currentGameRuleDefinitions != nullptr && !key.empty()) { return m_currentGameRuleDefinitions->getString(key); } else { - return L""; + return ""; } } diff --git a/targets/app/common/GameRules/GameRuleManager.h b/targets/app/common/GameRules/GameRuleManager.h index 674b836e7..140ca4b52 100644 --- a/targets/app/common/GameRules/GameRuleManager.h +++ b/targets/app/common/GameRules/GameRuleManager.h @@ -27,7 +27,7 @@ class DLCGameRulesHeader; class File; class LevelRuleset; -#define GAME_RULE_SAVENAME L"requiredGameRules.grf" +#define GAME_RULE_SAVENAME "requiredGameRules.grf" // 4J-JEV: #define LEVEL_GEN_ID int @@ -35,8 +35,8 @@ class LevelRuleset; class GameRuleManager { public: - static const wchar_t* wchTagNameA[ConsoleGameRules::eGameRuleType_Count]; - static const wchar_t* wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count]; + static const char* wchTagNameA[ConsoleGameRules::eGameRuleType_Count]; + static const char* wchAttrNameA[ConsoleGameRules::eGameRuleAttr_Count]; static const short version_number = 2; @@ -70,10 +70,10 @@ public: private: void readAttributes(DataInputStream* dis, - std::vector* tagsAndAtts, + std::vector* tagsAndAtts, GameRuleDefinition* rule); void readChildren( - DataInputStream* dis, std::vector* tagsAndAtts, + DataInputStream* dis, std::vector* tagsAndAtts, std::unordered_map* tagIdMap, GameRuleDefinition* rule); @@ -98,7 +98,7 @@ public: LevelGenerationOptions* getLevelGenerationOptions() { return m_currentLevelGenerationOptions; } - const wchar_t* GetGameRulesString(const std::wstring& key); + const char* GetGameRulesString(const std::string& key); // 4J-JEV: // Properly cleans-up and unloads the current set of gameRules. diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 372674e3a..e4f6d4c04 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -65,8 +65,8 @@ void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream* dos, } void ApplySchematicRuleDefinition::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"filename") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("filename") == 0) { m_schematicName = attributeValue; // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter // filename=%s\n",m_schematicName.c_str()); @@ -75,28 +75,28 @@ void ApplySchematicRuleDefinition::addAttribute( if (m_schematicName .substr(m_schematicName.length() - 4, m_schematicName.length()) - .compare(L".sch") != 0) { - m_schematicName.append(L".sch"); + .compare(".sch") != 0) { + m_schematicName.append(".sch"); } m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName); } - } else if (attributeName.compare(L"x") == 0) { + } else if (attributeName.compare("x") == 0) { m_location.x = fromWString(attributeValue); if (((int)std::abs(m_location.x)) % 2 != 0) m_location.x -= 1; // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter // x=%f\n",m_location->x); - } else if (attributeName.compare(L"y") == 0) { + } else if (attributeName.compare("y") == 0) { m_location.y = fromWString(attributeValue); if (((int)std::abs(m_location.y)) % 2 != 0) m_location.y -= 1; if (m_location.y < 0) m_location.y = 0; // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter // y=%f\n",m_location->y); - } else if (attributeName.compare(L"z") == 0) { + } else if (attributeName.compare("z") == 0) { m_location.z = fromWString(attributeValue); if (((int)std::abs(m_location.z)) % 2 != 0) m_location.z -= 1; // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter // z=%f\n",m_location->z); - } else if (attributeName.compare(L"rot") == 0) { + } else if (attributeName.compare("rot") == 0) { int degrees = fromWString(attributeValue); while (degrees < 0) degrees += 360; @@ -122,7 +122,7 @@ void ApplySchematicRuleDefinition::addAttribute( // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter // rot=%d\n",m_rotation); - } else if (attributeName.compare(L"dim") == 0) { + } else if (attributeName.compare("dim") == 0) { m_dimension = fromWString(attributeValue); if (m_dimension > 1 || m_dimension < -1) m_dimension = 0; // app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter @@ -173,7 +173,7 @@ void ApplySchematicRuleDefinition::processSchematic(AABB* chunkBox, std::min((double)Level::maxBuildHeight, m_locationBox->y1); #ifdef _DEBUG - app.DebugPrintf("Applying schematic %ls to chunk (%d,%d)\n", + app.DebugPrintf("Applying schematic %s to chunk (%d,%d)\n", m_schematicName.c_str(), chunk->x, chunk->z); #endif m_totalBlocksChanged += m_schematic->applyBlocksAndData( @@ -211,7 +211,7 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB* chunkBox, std::min((double)Level::maxBuildHeight, m_locationBox->y1); #ifdef _DEBUG - app.DebugPrintf("Applying schematic %ls to chunk (%d,%d)\n", + app.DebugPrintf("Applying schematic %s to chunk (%d,%d)\n", m_schematicName.c_str(), chunk->x, chunk->z); #endif m_totalBlocksChangedLighting += m_schematic->applyLighting( diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index 8de7747bf..1faad1f73 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -19,7 +19,7 @@ class GRFObject; class ApplySchematicRuleDefinition : public GameRuleDefinition { private: LevelGenerationOptions* m_levelGenOptions; - std::wstring m_schematicName; + std::string m_schematicName; ConsoleSchematicFile* m_schematic; Vec3 m_location; std::optional m_locationBox; @@ -41,8 +41,8 @@ public: } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); void processSchematic(AABB* chunkBox, LevelChunk* chunk); void processSchematicLighting(AABB* chunkBox, LevelChunk* chunk); @@ -52,7 +52,7 @@ public: bool isComplete() { return m_completed; } - std::wstring getSchematicName() { return m_schematicName; } + std::string getSchematicName() { return m_schematicName; } /** 4J-JEV: * This GameRuleDefinition contains limited game state. diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp index e466eb9b7..5e45f544b 100644 --- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp @@ -24,18 +24,18 @@ void BiomeOverride::writeAttributes(DataOutputStream* dos, dos->writeUTF(toWString(m_topTile)); } -void BiomeOverride::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"tileId") == 0) { +void BiomeOverride::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("tileId") == 0) { int value = fromWString(attributeValue); m_tile = value; app.DebugPrintf("BiomeOverride: Adding parameter tileId=%d\n", m_tile); - } else if (attributeName.compare(L"topTileId") == 0) { + } else if (attributeName.compare("topTileId") == 0) { int value = fromWString(attributeValue); m_topTile = value; app.DebugPrintf("BiomeOverride: Adding parameter topTileId=%d\n", m_topTile); - } else if (attributeName.compare(L"biomeId") == 0) { + } else if (attributeName.compare("biomeId") == 0) { int value = fromWString(attributeValue); m_biomeId = value; app.DebugPrintf("BiomeOverride: Adding parameter biomeId=%d\n", diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h index 014ac4107..fc3918291 100644 --- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h @@ -21,8 +21,8 @@ public: } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool isBiome(int id); void getTileValues(std::uint8_t& tile, std::uint8_t& topTile); diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 67ac87059..ceffe7f90 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -51,9 +51,9 @@ GameRuleDefinition* ConsoleGenerateStructure::addChild( m_actions.push_back((XboxStructureActionPlaceSpawner*)rule); } else { #ifndef _CONTENT_PACKAGE - wprintf( - L"ConsoleGenerateStructure: Attempted to add invalid child rule - " - L"%d\n", + printf( + "ConsoleGenerateStructure: Attempted to add invalid child rule - " + "%d\n", ruleType); #endif } @@ -78,29 +78,29 @@ void ConsoleGenerateStructure::writeAttributes(DataOutputStream* dos, } void ConsoleGenerateStructure::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"x") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("x") == 0) { int value = fromWString(attributeValue); m_x = value; app.DebugPrintf("ConsoleGenerateStructure: Adding parameter x=%d\n", m_x); - } else if (attributeName.compare(L"y") == 0) { + } else if (attributeName.compare("y") == 0) { int value = fromWString(attributeValue); m_y = value; app.DebugPrintf("ConsoleGenerateStructure: Adding parameter y=%d\n", m_y); - } else if (attributeName.compare(L"z") == 0) { + } else if (attributeName.compare("z") == 0) { int value = fromWString(attributeValue); m_z = value; app.DebugPrintf("ConsoleGenerateStructure: Adding parameter z=%d\n", m_z); - } else if (attributeName.compare(L"orientation") == 0) { + } else if (attributeName.compare("orientation") == 0) { int value = fromWString(attributeValue); orientation = value; app.DebugPrintf( "ConsoleGenerateStructure: Adding parameter orientation=%d\n", orientation); - } else if (attributeName.compare(L"dim") == 0) { + } else if (attributeName.compare("dim") == 0) { m_dimension = fromWString(attributeValue); if (m_dimension > 1 || m_dimension < -1) m_dimension = 0; app.DebugPrintf( diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h index e4bd1c208..9cb2008ab 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -33,8 +33,8 @@ public: ConsoleGameRules::EGameRuleType ruleType); virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); // StructurePiece virtual BoundingBox* getBoundingBox(); diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index 29b521f14..aee9d428c 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -131,7 +131,7 @@ void ConsoleSchematicFile::load(DataInputStream* dis) { // 4jcraft, fixed cast of templated List to get the tag list // and cast it to CompoundTag inside the loop CompoundTag* tag = NbtIo::read(dis); - ListTag* tileEntityTags = tag->getList(L"TileEntities"); + ListTag* tileEntityTags = tag->getList("TileEntities"); if (tileEntityTags != nullptr) { for (int i = 0; i < tileEntityTags->size(); i++) { CompoundTag* teTag = (CompoundTag*)tileEntityTags->get(i); @@ -152,23 +152,23 @@ void ConsoleSchematicFile::load(DataInputStream* dis) { // 4jcraft, fixed cast of templated List to get the tag list // and cast it to CompoundTag inside the loop - ListTag* entityTags = tag->getList(L"Entities"); + ListTag* entityTags = tag->getList("Entities"); if (entityTags != nullptr) { for (int i = 0; i < entityTags->size(); i++) { CompoundTag* eTag = (CompoundTag*)entityTags->get(i); - eINSTANCEOF type = EntityIO::getType(eTag->getString(L"id")); + eINSTANCEOF type = EntityIO::getType(eTag->getString("id")); // 4jcraft, same here - ListTag* pos = eTag->getList(L"Pos"); + ListTag* pos = eTag->getList("Pos"); double x = ((DoubleTag*)pos->get(0))->data; double y = ((DoubleTag*)pos->get(1))->data; double z = ((DoubleTag*)pos->get(2))->data; if (type == eTYPE_PAINTING || type == eTYPE_ITEM_FRAME) { - x = ((IntTag*)eTag->get(L"TileX"))->data; - y = ((IntTag*)eTag->get(L"TileY"))->data; - z = ((IntTag*)eTag->get(L"TileZ"))->data; + x = ((IntTag*)eTag->get("TileX"))->data; + y = ((IntTag*)eTag->get("TileY"))->data; + z = ((IntTag*)eTag->get("TileZ"))->data; } m_entities.push_back(std::pair( Vec3(x, y, z), (CompoundTag*)eTag->copy())); @@ -182,7 +182,7 @@ void ConsoleSchematicFile::save_tags(DataOutputStream* dos) { CompoundTag* tag = new CompoundTag(); ListTag* tileEntityTags = new ListTag(); - tag->put(L"TileEntities", tileEntityTags); + tag->put("TileEntities", tileEntityTags); for (auto it = m_tileEntities.begin(); it != m_tileEntities.end(); it++) { CompoundTag* cTag = new CompoundTag(); @@ -191,7 +191,7 @@ void ConsoleSchematicFile::save_tags(DataOutputStream* dos) { } ListTag* entityTags = new ListTag(); - tag->put(L"Entities", entityTags); + tag->put("Entities", entityTags); for (auto it = m_entities.begin(); it != m_entities.end(); it++) entityTags->add((CompoundTag*)(*it).second->copy()); @@ -708,7 +708,7 @@ void ConsoleSchematicFile::generateSchematicFile( CompoundTag tag; ListTag* tileEntitiesTag = - new ListTag(L"tileEntities"); + new ListTag("tileEntities"); int xc0 = xStart >> 4; int zc0 = zStart >> 4; @@ -738,12 +738,12 @@ void ConsoleSchematicFile::generateSchematicFile( delete tileEntities; } } - tag.put(L"TileEntities", tileEntitiesTag); + tag.put("TileEntities", tileEntitiesTag); AABB bb(xStart, yStart, zStart, xEnd, yEnd, zEnd); std::vector >* entities = level->getEntities(nullptr, &bb); - ListTag* entitiesTag = new ListTag(L"entities"); + ListTag* entitiesTag = new ListTag("entities"); for (auto it = entities->begin(); it != entities->end(); ++it) { std::shared_ptr e = *it; @@ -771,16 +771,16 @@ void ConsoleSchematicFile::generateSchematicFile( CompoundTag* eTag = new CompoundTag(); if (e->save(eTag)) { ListTag* pos = - (ListTag*)eTag->getList(L"Pos"); + (ListTag*)eTag->getList("Pos"); pos->get(0)->data -= xStart; pos->get(1)->data -= yStart; pos->get(2)->data -= zStart; if (e->instanceof(eTYPE_HANGING_ENTITY)) { - ((IntTag*)eTag->get(L"TileX"))->data -= xStart; - ((IntTag*)eTag->get(L"TileY"))->data -= yStart; - ((IntTag*)eTag->get(L"TileZ"))->data -= zStart; + ((IntTag*)eTag->get("TileX"))->data -= xStart; + ((IntTag*)eTag->get("TileY"))->data -= yStart; + ((IntTag*)eTag->get("TileZ"))->data -= zStart; } entitiesTag->add(eTag); @@ -788,7 +788,7 @@ void ConsoleSchematicFile::generateSchematicFile( } } - tag.put(L"Entities", entitiesTag); + tag.put("Entities", entitiesTag); if (dos != nullptr) NbtIo::write(&tag, dos); } diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h index fba4c63a4..7e638f17d 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -44,7 +44,7 @@ public: bool shouldDelete() { return m_refCount <= 0; } typedef struct _XboxSchematicInitParam { - wchar_t name[64]; + char name[64]; int startX; int startY; int startZ; @@ -56,7 +56,7 @@ public: Compression::ECompressionTypes compressionType; _XboxSchematicInitParam() { - memset(name, 0, 64 * (sizeof(wchar_t))); + memset(name, 0, 64 * (sizeof(char))); startX = startY = startZ = endX = endY = endZ = 0; bSaveMobs = false; compressionType = Compression::eCompressionType_None; diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 47e122d64..8abce74f1 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -37,12 +37,12 @@ #include "util/StringHelpers.h" JustGrSource::JustGrSource() { - m_displayName = L"Default_DisplayName"; - m_worldName = L"Default_WorldName"; - m_defaultSaveName = L"Default_DefaultSaveName"; + m_displayName = "Default_DisplayName"; + m_worldName = "Default_WorldName"; + m_defaultSaveName = "Default_DefaultSaveName"; m_bRequiresTexturePack = false; m_requiredTexturePackId = 0; - m_grfPath = L"__NO_GRF_PATH__"; + m_grfPath = "__NO_GRF_PATH__"; m_bRequiresBaseSave = false; } @@ -50,12 +50,12 @@ bool JustGrSource::requiresTexturePack() { return m_bRequiresTexturePack; } std::uint32_t JustGrSource::getRequiredTexturePackId() { return m_requiredTexturePackId; } -std::wstring JustGrSource::getDefaultSaveName() { return m_defaultSaveName; } -const wchar_t* JustGrSource::getWorldName() { return m_worldName.c_str(); } -const wchar_t* JustGrSource::getDisplayName() { return m_displayName.c_str(); } -std::wstring JustGrSource::getGrfPath() { return m_grfPath; } +std::string JustGrSource::getDefaultSaveName() { return m_defaultSaveName; } +const char* JustGrSource::getWorldName() { return m_worldName.c_str(); } +const char* JustGrSource::getDisplayName() { return m_displayName.c_str(); } +std::string JustGrSource::getGrfPath() { return m_grfPath; } bool JustGrSource::requiresBaseSave() { return m_bRequiresBaseSave; }; -std::wstring JustGrSource::getBaseSavePath() { return m_baseSavePath; }; +std::string JustGrSource::getBaseSavePath() { return m_baseSavePath; }; void JustGrSource::setRequiresTexturePack(bool x) { m_bRequiresTexturePack = x; @@ -63,13 +63,13 @@ void JustGrSource::setRequiresTexturePack(bool x) { void JustGrSource::setRequiredTexturePackId(std::uint32_t x) { m_requiredTexturePackId = x; } -void JustGrSource::setDefaultSaveName(const std::wstring& x) { +void JustGrSource::setDefaultSaveName(const std::string& x) { m_defaultSaveName = x; } -void JustGrSource::setWorldName(const std::wstring& x) { m_worldName = x; } -void JustGrSource::setDisplayName(const std::wstring& x) { m_displayName = x; } -void JustGrSource::setGrfPath(const std::wstring& x) { m_grfPath = x; } -void JustGrSource::setBaseSavePath(const std::wstring& x) { +void JustGrSource::setWorldName(const std::string& x) { m_worldName = x; } +void JustGrSource::setDisplayName(const std::string& x) { m_displayName = x; } +void JustGrSource::setGrfPath(const std::string& x) { m_grfPath = x; } +void JustGrSource::setBaseSavePath(const std::string& x) { m_baseSavePath = x; m_bRequiresBaseSave = true; } @@ -179,88 +179,88 @@ GameRuleDefinition* LevelGenerationOptions::addChild( m_features.push_back((StartFeature*)rule); } else { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"LevelGenerationOptions: Attempted to add invalid child rule - " - L"%d\n", + printf( + "LevelGenerationOptions: Attempted to add invalid child rule - " + "%d\n", ruleType); #endif } return rule; } -void LevelGenerationOptions::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"seed") == 0) { +void LevelGenerationOptions::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("seed") == 0) { m_seed = fromWString(attributeValue); app.DebugPrintf( "LevelGenerationOptions: Adding parameter m_seed=%I64d\n", m_seed); - } else if (attributeName.compare(L"spawnX") == 0) { + } else if (attributeName.compare("spawnX") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->x = value; app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnX=%d\n", value); - } else if (attributeName.compare(L"spawnY") == 0) { + } else if (attributeName.compare("spawnY") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->y = value; app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnY=%d\n", value); - } else if (attributeName.compare(L"spawnZ") == 0) { + } else if (attributeName.compare("spawnZ") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->z = value; app.DebugPrintf("LevelGenerationOptions: Adding parameter spawnZ=%d\n", value); - } else if (attributeName.compare(L"flatworld") == 0) { - if (attributeValue.compare(L"true") == 0) m_useFlatWorld = true; + } else if (attributeName.compare("flatworld") == 0) { + if (attributeValue.compare("true") == 0) m_useFlatWorld = true; app.DebugPrintf( "LevelGenerationOptions: Adding parameter flatworld=%s\n", m_useFlatWorld ? "true" : "false"); - } else if (attributeName.compare(L"saveName") == 0) { - std::wstring string(getString(attributeValue)); + } else if (attributeName.compare("saveName") == 0) { + std::string string(getString(attributeValue)); if (!string.empty()) setDefaultSaveName(string); else setDefaultSaveName(attributeValue); app.DebugPrintf( - "LevelGenerationOptions: Adding parameter saveName=%ls\n", + "LevelGenerationOptions: Adding parameter saveName=%s\n", getDefaultSaveName().c_str()); - } else if (attributeName.compare(L"worldName") == 0) { - std::wstring string(getString(attributeValue)); + } else if (attributeName.compare("worldName") == 0) { + std::string string(getString(attributeValue)); if (!string.empty()) setWorldName(string); else setWorldName(attributeValue); app.DebugPrintf( - "LevelGenerationOptions: Adding parameter worldName=%ls\n", + "LevelGenerationOptions: Adding parameter worldName=%s\n", getWorldName()); - } else if (attributeName.compare(L"displayName") == 0) { - std::wstring string(getString(attributeValue)); + } else if (attributeName.compare("displayName") == 0) { + std::string string(getString(attributeValue)); if (!string.empty()) setDisplayName(string); else setDisplayName(attributeValue); app.DebugPrintf( - "LevelGenerationOptions: Adding parameter displayName=%ls\n", + "LevelGenerationOptions: Adding parameter displayName=%s\n", getDisplayName()); - } else if (attributeName.compare(L"texturePackId") == 0) { + } else if (attributeName.compare("texturePackId") == 0) { setRequiredTexturePackId(fromWString(attributeValue)); setRequiresTexturePack(true); app.DebugPrintf( "LevelGenerationOptions: Adding parameter texturePackId=%0x\n", getRequiredTexturePackId()); - } else if (attributeName.compare(L"isTutorial") == 0) { - if (attributeValue.compare(L"true") == 0) setSrc(eSrc_tutorial); + } else if (attributeName.compare("isTutorial") == 0) { + if (attributeValue.compare("true") == 0) setSrc(eSrc_tutorial); app.DebugPrintf( "LevelGenerationOptions: Adding parameter isTutorial=%s\n", isTutorial() ? "true" : "false"); - } else if (attributeName.compare(L"baseSaveName") == 0) { + } else if (attributeName.compare("baseSaveName") == 0) { setBaseSavePath(attributeValue); app.DebugPrintf( - "LevelGenerationOptions: Adding parameter baseSaveName=%ls\n", + "LevelGenerationOptions: Adding parameter baseSaveName=%s\n", getBaseSavePath().c_str()); - } else if (attributeName.compare(L"hasBeenInCreative") == 0) { + } else if (attributeName.compare("hasBeenInCreative") == 0) { bool value = fromWString(attributeValue); m_bHasBeenInCreative = value; app.DebugPrintf( @@ -435,13 +435,13 @@ void LevelGenerationOptions::clearSchematics() { void LevelGenerationOptions::clearChunkRuleCache() { m_chunkRuleCache.clear(); } ConsoleSchematicFile* LevelGenerationOptions::loadSchematicFile( - const std::wstring& filename, std::uint8_t* pbData, + const std::string& filename, std::uint8_t* pbData, unsigned int dataLength) { // If we have already loaded this, just return auto it = m_schematics.find(filename); if (it != m_schematics.end()) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"We have already loaded schematic file %ls\n", + printf("We have already loaded schematic file %s\n", filename.c_str()); #endif it->second->incrementRefCount(); @@ -461,7 +461,7 @@ ConsoleSchematicFile* LevelGenerationOptions::loadSchematicFile( } ConsoleSchematicFile* LevelGenerationOptions::getSchematicFile( - const std::wstring& filename) { + const std::string& filename) { ConsoleSchematicFile* schematic = nullptr; // If we have already loaded this, just return auto it = m_schematics.find(filename); @@ -472,7 +472,7 @@ ConsoleSchematicFile* LevelGenerationOptions::getSchematicFile( } void LevelGenerationOptions::releaseSchematicFile( - const std::wstring& filename) { + const std::string& filename) { // 4J Stu - We don't want to delete them when done, but probably want to // keep a set of active schematics for the current world // auto it = m_schematics.find(filename); @@ -492,9 +492,9 @@ void LevelGenerationOptions::loadStringTable(StringTable* table) { m_stringTable = table; } -const wchar_t* LevelGenerationOptions::getString(const std::wstring& key) { +const char* LevelGenerationOptions::getString(const std::string& key) { if (m_stringTable == nullptr) { - return L""; + return ""; } else { return m_stringTable->getString(key); } @@ -527,19 +527,19 @@ bool LevelGenerationOptions::isFeatureChunk( return isFeature; } -std::unordered_map* +std::unordered_map* LevelGenerationOptions::getUnfinishedSchematicFiles() { // Clean schematic rules. - std::unordered_set usedFiles = - std::unordered_set(); + std::unordered_set usedFiles = + std::unordered_set(); for (auto it = m_schematicRules.begin(); it != m_schematicRules.end(); it++) if (!(*it)->isComplete()) usedFiles.insert((*it)->getSchematicName()); // Clean schematic files. - std::unordered_map* out = - new std::unordered_map(); + std::unordered_map* out = + new std::unordered_map(); for (auto it = usedFiles.begin(); it != usedFiles.end(); it++) - out->insert(std::pair( + out->insert(std::pair( *it, getSchematicFile(*it))); return out; @@ -594,7 +594,7 @@ int LevelGenerationOptions::onPackMounted(int iPad, uint32_t dwErr, if (!dlcFile->getGrfPath().empty()) { File grf(app.getFilePath(lgo->m_parentDLCPack->GetPackID(), dlcFile->getGrfPath(), true, - L"WPACK:")); + "WPACK:")); if (grf.exists()) { uint32_t dwFileSize = grf.length(); if (dwFileSize > 0) { @@ -620,7 +620,7 @@ int LevelGenerationOptions::onPackMounted(int iPad, uint32_t dwErr, } if (lgo->requiresBaseSave() && !lgo->getBaseSavePath().empty()) { File save(app.getFilePath(lgo->m_parentDLCPack->GetPackID(), - lgo->getBaseSavePath(), true, L"WPACK:")); + lgo->getBaseSavePath(), true, "WPACK:")); if (save.exists()) { std::size_t dwFileSize = PlatformFilesystem.fileSize(save.getPath()); @@ -679,7 +679,7 @@ bool LevelGenerationOptions::requiresTexturePack() { std::uint32_t LevelGenerationOptions::getRequiredTexturePackId() { return info()->getRequiredTexturePackId(); } -std::wstring LevelGenerationOptions::getDefaultSaveName() { +std::string LevelGenerationOptions::getDefaultSaveName() { switch (getSrc()) { case eSrc_fromSave: return getString(info()->getDefaultSaveName()); @@ -690,9 +690,9 @@ std::wstring LevelGenerationOptions::getDefaultSaveName() { default: break; } - return L""; + return ""; } -const wchar_t* LevelGenerationOptions::getWorldName() { +const char* LevelGenerationOptions::getWorldName() { switch (getSrc()) { case eSrc_fromSave: return getString(info()->getWorldName()); @@ -703,28 +703,28 @@ const wchar_t* LevelGenerationOptions::getWorldName() { default: break; } - return L""; + return ""; } -const wchar_t* LevelGenerationOptions::getDisplayName() { +const char* LevelGenerationOptions::getDisplayName() { switch (getSrc()) { case eSrc_fromSave: return getString(info()->getDisplayName()); case eSrc_fromDLC: return getString(info()->getDisplayName()); case eSrc_tutorial: - return L""; + return ""; default: break; } - return L""; + return ""; } -std::wstring LevelGenerationOptions::getGrfPath() { +std::string LevelGenerationOptions::getGrfPath() { return info()->getGrfPath(); } bool LevelGenerationOptions::requiresBaseSave() { return info()->requiresBaseSave(); } -std::wstring LevelGenerationOptions::getBaseSavePath() { +std::string LevelGenerationOptions::getBaseSavePath() { return info()->getBaseSavePath(); } @@ -736,19 +736,19 @@ void LevelGenerationOptions::setRequiresTexturePack(bool x) { void LevelGenerationOptions::setRequiredTexturePackId(std::uint32_t x) { info()->setRequiredTexturePackId(x); } -void LevelGenerationOptions::setDefaultSaveName(const std::wstring& x) { +void LevelGenerationOptions::setDefaultSaveName(const std::string& x) { info()->setDefaultSaveName(x); } -void LevelGenerationOptions::setWorldName(const std::wstring& x) { +void LevelGenerationOptions::setWorldName(const std::string& x) { info()->setWorldName(x); } -void LevelGenerationOptions::setDisplayName(const std::wstring& x) { +void LevelGenerationOptions::setDisplayName(const std::string& x) { info()->setDisplayName(x); } -void LevelGenerationOptions::setGrfPath(const std::wstring& x) { +void LevelGenerationOptions::setGrfPath(const std::string& x) { info()->setGrfPath(x); } -void LevelGenerationOptions::setBaseSavePath(const std::wstring& x) { +void LevelGenerationOptions::setBaseSavePath(const std::string& x) { info()->setBaseSavePath(x); } diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h index cf70675e8..0c0fdbfa3 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -35,20 +35,20 @@ public: virtual ~GrSource() {} virtual bool requiresTexturePack() = 0; virtual std::uint32_t getRequiredTexturePackId() = 0; - virtual std::wstring getDefaultSaveName() = 0; - virtual const wchar_t* getWorldName() = 0; - virtual const wchar_t* getDisplayName() = 0; - virtual std::wstring getGrfPath() = 0; + virtual std::string getDefaultSaveName() = 0; + virtual const char* getWorldName() = 0; + virtual const char* getDisplayName() = 0; + virtual std::string getGrfPath() = 0; virtual bool requiresBaseSave() = 0; - virtual std::wstring getBaseSavePath() = 0; + virtual std::string getBaseSavePath() = 0; virtual void setRequiresTexturePack(bool) = 0; virtual void setRequiredTexturePackId(std::uint32_t) = 0; - virtual void setDefaultSaveName(const std::wstring&) = 0; - virtual void setWorldName(const std::wstring&) = 0; - virtual void setDisplayName(const std::wstring&) = 0; - virtual void setGrfPath(const std::wstring&) = 0; - virtual void setBaseSavePath(const std::wstring&) = 0; + virtual void setDefaultSaveName(const std::string&) = 0; + virtual void setWorldName(const std::string&) = 0; + virtual void setDisplayName(const std::string&) = 0; + virtual void setGrfPath(const std::string&) = 0; + virtual void setBaseSavePath(const std::string&) = 0; virtual bool ready() = 0; @@ -57,32 +57,32 @@ public: class JustGrSource : public GrSource { protected: - std::wstring m_worldName; - std::wstring m_displayName; - std::wstring m_defaultSaveName; + std::string m_worldName; + std::string m_displayName; + std::string m_defaultSaveName; bool m_bRequiresTexturePack; std::uint32_t m_requiredTexturePackId; - std::wstring m_grfPath; - std::wstring m_baseSavePath; + std::string m_grfPath; + std::string m_baseSavePath; bool m_bRequiresBaseSave; public: virtual bool requiresTexturePack(); virtual std::uint32_t getRequiredTexturePackId(); - virtual std::wstring getDefaultSaveName(); - virtual const wchar_t* getWorldName(); - virtual const wchar_t* getDisplayName(); - virtual std::wstring getGrfPath(); + virtual std::string getDefaultSaveName(); + virtual const char* getWorldName(); + virtual const char* getDisplayName(); + virtual std::string getGrfPath(); virtual bool requiresBaseSave(); - virtual std::wstring getBaseSavePath(); + virtual std::string getBaseSavePath(); virtual void setRequiresTexturePack(bool x); virtual void setRequiredTexturePackId(std::uint32_t x); - virtual void setDefaultSaveName(const std::wstring& x); - virtual void setWorldName(const std::wstring& x); - virtual void setDisplayName(const std::wstring& x); - virtual void setGrfPath(const std::wstring& x); - virtual void setBaseSavePath(const std::wstring& x); + virtual void setDefaultSaveName(const std::string& x); + virtual void setWorldName(const std::string& x); + virtual void setDisplayName(const std::string& x); + virtual void setGrfPath(const std::string& x); + virtual void setBaseSavePath(const std::string& x); virtual bool ready(); @@ -151,22 +151,22 @@ public: bool requiresTexturePack(); std::uint32_t getRequiredTexturePackId(); - std::wstring getDefaultSaveName(); - const wchar_t* getWorldName(); - const wchar_t* getDisplayName(); - std::wstring getGrfPath(); + std::string getDefaultSaveName(); + const char* getWorldName(); + const char* getDisplayName(); + std::string getGrfPath(); bool requiresBaseSave(); - std::wstring getBaseSavePath(); + std::string getBaseSavePath(); void setGrSource(GrSource* grs); void setRequiresTexturePack(bool x); void setRequiredTexturePackId(std::uint32_t x); - void setDefaultSaveName(const std::wstring& x); - void setWorldName(const std::wstring& x); - void setDisplayName(const std::wstring& x); - void setGrfPath(const std::wstring& x); - void setBaseSavePath(const std::wstring& x); + void setDefaultSaveName(const std::string& x); + void setWorldName(const std::string& x); + void setDisplayName(const std::string& x); + void setGrfPath(const std::string& x); + void setBaseSavePath(const std::string& x); bool ready(); @@ -188,7 +188,7 @@ private: std::vector m_structureRules; bool m_bHaveMinY; int m_minY; - std::unordered_map m_schematics; + std::unordered_map m_schematics; std::unordered_map m_chunkRuleCache; std::vector m_biomeOverrides; @@ -213,8 +213,8 @@ public: virtual void getChildren(std::vector* children); virtual GameRuleDefinition* addChild( ConsoleGameRules::EGameRuleType ruleType); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); int64_t getLevelSeed(); int getLevelHasBeenInCreative(); @@ -231,13 +231,13 @@ private: void clearSchematics(); public: - ConsoleSchematicFile* loadSchematicFile(const std::wstring& filename, + ConsoleSchematicFile* loadSchematicFile(const std::string& filename, std::uint8_t* pbData, unsigned int dataLength); public: - ConsoleSchematicFile* getSchematicFile(const std::wstring& filename); - void releaseSchematicFile(const std::wstring& filename); + ConsoleSchematicFile* getSchematicFile(const std::string& filename); + void releaseSchematicFile(const std::string& filename); bool requiresGameRules(); void setRequiredGameRules(LevelRuleset* rules); @@ -250,9 +250,9 @@ public: int* orientation = nullptr); void loadStringTable(StringTable* table); - const wchar_t* getString(const std::wstring& key); + const char* getString(const std::string& key); - std::unordered_map* + std::unordered_map* getUnfinishedSchematicFiles(); void loadBaseSaveData(); diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp index d54debef9..2fad35ae8 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp @@ -6,7 +6,7 @@ LevelGenerators::LevelGenerators() {} -void LevelGenerators::addLevelGenerator(const std::wstring& displayName, +void LevelGenerators::addLevelGenerator(const std::string& displayName, LevelGenerationOptions* generator) { if (!displayName.empty()) generator->setDisplayName(displayName); m_levelGenerators.push_back(generator); diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h index 383e0c25b..48cf8e914 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.h @@ -14,7 +14,7 @@ private: public: LevelGenerators(); - void addLevelGenerator(const std::wstring& displayName, + void addLevelGenerator(const std::string& displayName, LevelGenerationOptions* generator); void removeLevelGenerator(LevelGenerationOptions* generator); diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp index 225048439..fae469360 100644 --- a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp @@ -27,22 +27,22 @@ void StartFeature::writeAttributes(DataOutputStream* dos, dos->writeUTF(toWString(m_orientation)); } -void StartFeature::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"chunkX") == 0) { +void StartFeature::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("chunkX") == 0) { int value = fromWString(attributeValue); m_chunkX = value; app.DebugPrintf("StartFeature: Adding parameter chunkX=%d\n", m_chunkX); - } else if (attributeName.compare(L"chunkZ") == 0) { + } else if (attributeName.compare("chunkZ") == 0) { int value = fromWString(attributeValue); m_chunkZ = value; app.DebugPrintf("StartFeature: Adding parameter chunkZ=%d\n", m_chunkZ); - } else if (attributeName.compare(L"orientation") == 0) { + } else if (attributeName.compare("orientation") == 0) { int value = fromWString(attributeValue); m_orientation = value; app.DebugPrintf("StartFeature: Adding parameter orientation=%d\n", m_orientation); - } else if (attributeName.compare(L"feature") == 0) { + } else if (attributeName.compare("feature") == 0) { int value = fromWString(attributeValue); m_feature = (StructureFeature::EFeatureTypes)value; app.DebugPrintf("StartFeature: Adding parameter feature=%d\n", diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/GameRules/LevelGeneration/StartFeature.h index c5716be6e..de40a5ac2 100644 --- a/targets/app/common/GameRules/LevelGeneration/StartFeature.h +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h @@ -20,8 +20,8 @@ public: } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature, diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 051d7419c..e956b4bcb 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -40,51 +40,51 @@ void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream* dos, } void XboxStructureActionGenerateBox::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"x0") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("x0") == 0) { int value = fromWString(attributeValue); m_x0 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter x0=%d\n", m_x0); - } else if (attributeName.compare(L"y0") == 0) { + } else if (attributeName.compare("y0") == 0) { int value = fromWString(attributeValue); m_y0 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter y0=%d\n", m_y0); - } else if (attributeName.compare(L"z0") == 0) { + } else if (attributeName.compare("z0") == 0) { int value = fromWString(attributeValue); m_z0 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter z0=%d\n", m_z0); - } else if (attributeName.compare(L"x1") == 0) { + } else if (attributeName.compare("x1") == 0) { int value = fromWString(attributeValue); m_x1 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter x1=%d\n", m_x1); - } else if (attributeName.compare(L"y1") == 0) { + } else if (attributeName.compare("y1") == 0) { int value = fromWString(attributeValue); m_y1 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter y1=%d\n", m_y1); - } else if (attributeName.compare(L"z1") == 0) { + } else if (attributeName.compare("z1") == 0) { int value = fromWString(attributeValue); m_z1 = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter z1=%d\n", m_z1); - } else if (attributeName.compare(L"edgeTile") == 0) { + } else if (attributeName.compare("edgeTile") == 0) { int value = fromWString(attributeValue); m_edgeTile = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter edgeTile=%d\n", m_edgeTile); - } else if (attributeName.compare(L"fillTile") == 0) { + } else if (attributeName.compare("fillTile") == 0) { int value = fromWString(attributeValue); m_fillTile = value; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter fillTile=%d\n", m_fillTile); - } else if (attributeName.compare(L"skipAir") == 0) { - if (attributeValue.compare(L"true") == 0) m_skipAir = true; + } else if (attributeName.compare("skipAir") == 0) { + if (attributeValue.compare("true") == 0) m_skipAir = true; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter skipAir=%s\n", m_skipAir ? "true" : "false"); diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index 41c058abc..7eee4ccf0 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h @@ -25,8 +25,8 @@ public: virtual int getEndZ() { return m_z1; } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool generateBoxInLevel(StructurePiece* structure, Level* level, BoundingBox* chunkBB); diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index e9c20b361..d1c19298f 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -30,29 +30,29 @@ void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream* dos, } void XboxStructureActionPlaceBlock::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"x") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("x") == 0) { int value = fromWString(attributeValue); m_x = value; app.DebugPrintf( "XboxStructureActionPlaceBlock: Adding parameter x=%d\n", m_x); - } else if (attributeName.compare(L"y") == 0) { + } else if (attributeName.compare("y") == 0) { int value = fromWString(attributeValue); m_y = value; app.DebugPrintf( "XboxStructureActionPlaceBlock: Adding parameter y=%d\n", m_y); - } else if (attributeName.compare(L"z") == 0) { + } else if (attributeName.compare("z") == 0) { int value = fromWString(attributeValue); m_z = value; app.DebugPrintf( "XboxStructureActionPlaceBlock: Adding parameter z=%d\n", m_z); - } else if (attributeName.compare(L"block") == 0) { + } else if (attributeName.compare("block") == 0) { int value = fromWString(attributeValue); m_tile = value; app.DebugPrintf( "XboxStructureActionPlaceBlock: Adding parameter block=%d\n", m_tile); - } else if (attributeName.compare(L"data") == 0) { + } else if (attributeName.compare("data") == 0) { int value = fromWString(attributeValue); m_data = value; app.DebugPrintf( diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index ccf3e961d..e217a9fa2 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h @@ -24,8 +24,8 @@ public: virtual int getEndZ() { return m_z; } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool placeBlockInLevel(StructurePiece* structure, Level* level, BoundingBox* chunkBB); diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 8dfb354cd..1c94d8997 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -45,9 +45,9 @@ GameRuleDefinition* XboxStructureActionPlaceContainer::addChild( m_items.push_back((AddItemRuleDefinition*)rule); } else { #ifndef _CONTENT_PACKAGE - wprintf( - L"XboxStructureActionPlaceContainer: Attempted to add invalid " - L"child rule - %d\n", + printf( + "XboxStructureActionPlaceContainer: Attempted to add invalid " + "child rule - %d\n", ruleType); #endif } @@ -55,8 +55,8 @@ GameRuleDefinition* XboxStructureActionPlaceContainer::addChild( } void XboxStructureActionPlaceContainer::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"facing") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("facing") == 0) { int value = fromWString(attributeValue); m_data = value; app.DebugPrintf( diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index bb15f2630..e5735d057 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -31,8 +31,8 @@ public: // virtual void writeAttributes(DataOutputStream *dos, uint32_t // numAttributes); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool placeContainerInLevel(StructurePiece* structure, Level* level, BoundingBox* chunkBB); diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 31512bd14..2934b68b7 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -15,7 +15,7 @@ XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { m_tile = Tile::mobSpawner_Id; - m_entityId = L"Pig"; + m_entityId = "Pig"; } XboxStructureActionPlaceSpawner::~XboxStructureActionPlaceSpawner() {} @@ -29,12 +29,12 @@ void XboxStructureActionPlaceSpawner::writeAttributes(DataOutputStream* dos, } void XboxStructureActionPlaceSpawner::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"entity") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("entity") == 0) { m_entityId = attributeValue; #ifndef _CONTENT_PACKAGE - wprintf( - L"XboxStructureActionPlaceSpawner: Adding parameter entity=%ls\n", + printf( + "XboxStructureActionPlaceSpawner: Adding parameter entity=%s\n", m_entityId.c_str()); #endif } else { @@ -64,9 +64,9 @@ bool XboxStructureActionPlaceSpawner::placeSpawnerInLevel( level->getTileEntity(worldX, worldY, worldZ)); #ifndef _CONTENT_PACKAGE - wprintf( - L"XboxStructureActionPlaceSpawner - placing a %ls spawner at " - L"(%d,%d,%d)\n", + printf( + "XboxStructureActionPlaceSpawner - placing a %s spawner at " + "(%d,%d,%d)\n", m_entityId.c_str(), worldX, worldY, worldZ); #endif if (entity != nullptr) { diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index 5fc9e989c..7c0b7abeb 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -12,7 +12,7 @@ class GRFObject; class XboxStructureActionPlaceSpawner : public XboxStructureActionPlaceBlock { private: - std::wstring m_entityId; + std::string m_entityId; public: XboxStructureActionPlaceSpawner(); @@ -23,8 +23,8 @@ public: } virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool placeSpawnerInLevel(StructurePiece* structure, Level* level, BoundingBox* chunkBB); diff --git a/targets/app/common/GameRules/LevelRules/LevelRules.cpp b/targets/app/common/GameRules/LevelRules/LevelRules.cpp index c79dc4649..84e0f7b04 100644 --- a/targets/app/common/GameRules/LevelRules/LevelRules.cpp +++ b/targets/app/common/GameRules/LevelRules/LevelRules.cpp @@ -2,10 +2,10 @@ LevelRules::LevelRules() {} -void LevelRules::addLevelRule(const std::wstring& displayName, +void LevelRules::addLevelRule(const std::string& displayName, std::uint8_t* pbData, unsigned int dataLength) {} -void LevelRules::addLevelRule(const std::wstring& displayName, +void LevelRules::addLevelRule(const std::string& displayName, LevelRuleset* rootRule) {} void LevelRules::removeLevelRule(LevelRuleset* removing) { diff --git a/targets/app/common/GameRules/LevelRules/LevelRules.h b/targets/app/common/GameRules/LevelRules/LevelRules.h index f12e7548b..a1b456cf3 100644 --- a/targets/app/common/GameRules/LevelRules/LevelRules.h +++ b/targets/app/common/GameRules/LevelRules/LevelRules.h @@ -9,9 +9,9 @@ class LevelRules { public: LevelRules(); - void addLevelRule(const std::wstring& displayName, std::uint8_t* pbData, + void addLevelRule(const std::string& displayName, std::uint8_t* pbData, unsigned int dataLength); - void addLevelRule(const std::wstring& displayName, LevelRuleset* rootRule); + void addLevelRule(const std::string& displayName, LevelRuleset* rootRule); void removeLevelRule(LevelRuleset* removing); }; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 5e7e4472d..61a1336f2 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -32,8 +32,8 @@ void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream* dos, } void AddEnchantmentRuleDefinition::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"enchantmentId") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("enchantmentId") == 0) { int value = fromWString(attributeValue); if (value < 0) value = 0; if (value >= 256) value = 255; @@ -41,7 +41,7 @@ void AddEnchantmentRuleDefinition::addAttribute( app.DebugPrintf( "AddEnchantmentRuleDefinition: Adding parameter enchantmentId=%d\n", m_enchantmentId); - } else if (attributeName.compare(L"enchantmentLevel") == 0) { + } else if (attributeName.compare("enchantmentLevel") == 0) { int value = fromWString(attributeValue); if (value < 0) value = 0; m_enchantmentLevel = value; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index ba4b9b488..cc69dd8de 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -22,8 +22,8 @@ public: virtual void writeAttributes(DataOutputStream*, unsigned int numAttrs); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool enchantItem(std::shared_ptr item); }; \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index eb3805c4c..2503523bd 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -55,29 +55,29 @@ GameRuleDefinition* AddItemRuleDefinition::addChild( return rule; } -void AddItemRuleDefinition::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"itemId") == 0) { +void AddItemRuleDefinition::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("itemId") == 0) { int value = fromWString(attributeValue); m_itemId = value; // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter // itemId=%d\n",m_itemId); - } else if (attributeName.compare(L"quantity") == 0) { + } else if (attributeName.compare("quantity") == 0) { int value = fromWString(attributeValue); m_quantity = value; // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter // quantity=%d\n",m_quantity); - } else if (attributeName.compare(L"auxValue") == 0) { + } else if (attributeName.compare("auxValue") == 0) { int value = fromWString(attributeValue); m_auxValue = value; // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter // auxValue=%d\n",m_auxValue); - } else if (attributeName.compare(L"dataTag") == 0) { + } else if (attributeName.compare("dataTag") == 0) { int value = fromWString(attributeValue); m_dataTag = value; // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter // dataTag=%d\n",m_dataTag); - } else if (attributeName.compare(L"slot") == 0) { + } else if (attributeName.compare("slot") == 0) { int value = fromWString(attributeValue); m_slot = value; // app.DebugPrintf(2,"AddItemRuleDefinition: Adding parameter diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index 3bc21d700..b2391c6f5 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -31,8 +31,8 @@ public: virtual GameRuleDefinition* addChild( ConsoleGameRules::EGameRuleType ruleType); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); bool addItemToContainer(std::shared_ptr container, int slotId); }; \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index f1ae569f7..93bf813c6 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -34,16 +34,16 @@ void CollectItemRuleDefinition::writeAttributes(DataOutputStream* dos, } void CollectItemRuleDefinition::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"itemId") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("itemId") == 0) { m_itemId = fromWString(attributeValue); app.DebugPrintf("CollectItemRule: Adding parameter itemId=%d\n", m_itemId); - } else if (attributeName.compare(L"auxValue") == 0) { + } else if (attributeName.compare("auxValue") == 0) { m_auxValue = fromWString(attributeValue); app.DebugPrintf("CollectItemRule: Adding parameter m_auxValue=%d\n", m_auxValue); - } else if (attributeName.compare(L"quantity") == 0) { + } else if (attributeName.compare("quantity") == 0) { m_quantity = fromWString(attributeValue); app.DebugPrintf("CollectItemRule: Adding parameter m_quantity=%d\n", m_quantity); @@ -55,7 +55,7 @@ void CollectItemRuleDefinition::addAttribute( int CollectItemRuleDefinition::getGoal() { return m_quantity; } int CollectItemRuleDefinition::getProgress(GameRule* rule) { - GameRule::ValueType value = rule->getParameter(L"iQuantity"); + GameRule::ValueType value = rule->getParameter("iQuantity"); return value.i; } @@ -63,7 +63,7 @@ void CollectItemRuleDefinition::populateGameRule( GameRulesInstance::EGameRulesInstanceType type, GameRule* rule) { GameRule::ValueType value; value.i = 0; - rule->setParameter(L"iQuantity", value); + rule->setParameter("iQuantity", value); GameRuleDefinition::populateGameRule(type, rule); } @@ -75,9 +75,9 @@ bool CollectItemRuleDefinition::onCollectItem( item->getAuxValue() == m_auxValue && item->get4JData() == m_4JDataValue) { if (!getComplete(rule)) { - GameRule::ValueType value = rule->getParameter(L"iQuantity"); + GameRule::ValueType value = rule->getParameter("iQuantity"); int quantityCollected = (value.i += item->count); - rule->setParameter(L"iQuantity", value); + rule->setParameter("iQuantity", value); statusChanged = true; @@ -102,20 +102,20 @@ bool CollectItemRuleDefinition::onCollectItem( return statusChanged; } -std::wstring CollectItemRuleDefinition::generateXml( +std::string CollectItemRuleDefinition::generateXml( std::shared_ptr item) { // 4J Stu - This should be kept in sync with the GameRulesDefinition.xsd - std::wstring xml = L""; + std::string xml = ""; if (item != nullptr) { - xml = L"(item->id) + - L"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" " - L"promptName=\"OPTIONAL\""; + xml = "(item->id) + + "\" quantity=\"SET\" descriptionName=\"OPTIONAL\" " + "promptName=\"OPTIONAL\""; if (item->getAuxValue() != 0) xml += - L" auxValue=\"" + toWString(item->getAuxValue()) + L"\""; + " auxValue=\"" + toWString(item->getAuxValue()) + "\""; if (item->get4JData() != 0) - xml += L" dataTag=\"" + toWString(item->get4JData()) + L"\""; - xml += L"/>\n"; + xml += " dataTag=\"" + toWString(item->get4JData()) + "\""; + xml += "/>\n"; } return xml; } \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index 2bd8567f0..4f956078c 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -27,8 +27,8 @@ public: } virtual void writeAttributes(DataOutputStream*, unsigned int numAttributes); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); virtual int getGoal(); virtual int getProgress(GameRule* rule); @@ -41,8 +41,8 @@ public: bool onCollectItem(GameRule* rule, std::shared_ptr item); - static std::wstring generateXml(std::shared_ptr item); + static std::string generateXml(std::shared_ptr item); private: - // static std::wstring generateXml(CollectItemRuleDefinition *ruleDef); + // static std::string generateXml(CollectItemRuleDefinition *ruleDef); }; \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 8eae45405..70b001ab2 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -66,12 +66,12 @@ void CompleteAllRuleDefinition::updateStatus(GameRule* rule) { goal); } -std::wstring CompleteAllRuleDefinition::generateDescriptionString( - const std::wstring& description, void* data, int dataLength) { +std::string CompleteAllRuleDefinition::generateDescriptionString( + const std::string& description, void* data, int dataLength) { PacketData* values = (PacketData*)data; - std::wstring newDesc = description; + std::string newDesc = description; newDesc = - replaceAll(newDesc, L"{*progress*}", toWString(values->progress)); - newDesc = replaceAll(newDesc, L"{*goal*}", toWString(values->goal)); + replaceAll(newDesc, "{*progress*}", toWString(values->progress)); + newDesc = replaceAll(newDesc, "{*goal*}", toWString(values->goal)); return newDesc; } \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index f32212ea2..ef10f3721 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -25,8 +25,8 @@ public: virtual bool onCollectItem(GameRule* rule, std::shared_ptr item); - static std::wstring generateDescriptionString( - const std::wstring& description, void* data, int dataLength); + static std::string generateDescriptionString( + const std::string& description, void* data, int dataLength); private: void updateStatus(GameRule* rule); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 0e3b3e54a..b3cde7a2e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -47,9 +47,9 @@ GameRuleDefinition* CompoundGameRuleDefinition::addChild( rule = new UpdatePlayerRuleDefinition(); } else { #ifndef _CONTENT_PACKAGE - wprintf( - L"CompoundGameRuleDefinition: Attempted to add invalid child rule " - L"- %d\n", + printf( + "CompoundGameRuleDefinition: Attempted to add invalid child rule " + "- %d\n", ruleType); #endif } @@ -70,7 +70,7 @@ void CompoundGameRuleDefinition::populateGameRule( value.isPointer = true; // Somehow add the newRule to the current rule - rule->setParameter(L"rule" + toWString(i), value); + rule->setParameter("rule" + toWString(i), value); ++i; } GameRuleDefinition::populateGameRule(type, rule); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 7ea580b34..51c083dca 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -20,8 +20,8 @@ class Connection; GameRuleDefinition::GameRuleDefinition() { - m_descriptionId = L""; - m_promptId = L""; + m_descriptionId = ""; + m_promptId = ""; m_4JDataValue = 0; } @@ -65,35 +65,35 @@ void GameRuleDefinition::getChildren( GameRuleDefinition* GameRuleDefinition::addChild( ConsoleGameRules::EGameRuleType ruleType) { #ifndef _CONTENT_PACKAGE - wprintf(L"GameRuleDefinition: Attempted to add invalid child rule - %d\n", + printf("GameRuleDefinition: Attempted to add invalid child rule - %d\n", ruleType); #endif return nullptr; } -void GameRuleDefinition::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"descriptionName") == 0) { +void GameRuleDefinition::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("descriptionName") == 0) { m_descriptionId = attributeValue; #ifndef _CONTENT_PACKAGE - wprintf(L"GameRuleDefinition: Adding parameter descriptionId=%ls\n", + printf("GameRuleDefinition: Adding parameter descriptionId=%s\n", m_descriptionId.c_str()); #endif - } else if (attributeName.compare(L"promptName") == 0) { + } else if (attributeName.compare("promptName") == 0) { m_promptId = attributeValue; #ifndef _CONTENT_PACKAGE - wprintf(L"GameRuleDefinition: Adding parameter m_promptId=%ls\n", + printf("GameRuleDefinition: Adding parameter m_promptId=%s\n", m_promptId.c_str()); #endif - } else if (attributeName.compare(L"dataTag") == 0) { + } else if (attributeName.compare("dataTag") == 0) { m_4JDataValue = fromWString(attributeValue); app.DebugPrintf( "GameRuleDefinition: Adding parameter m_4JDataValue=%d\n", m_4JDataValue); } else { #ifndef _CONTENT_PACKAGE - wprintf( - L"GameRuleDefinition: Attempted to add invalid attribute: %ls\n", + printf( + "GameRuleDefinition: Attempted to add invalid attribute: %s\n", attributeName.c_str()); #endif } @@ -103,20 +103,20 @@ void GameRuleDefinition::populateGameRule( GameRulesInstance::EGameRulesInstanceType type, GameRule* rule) { GameRule::ValueType value; value.b = false; - rule->setParameter(L"bComplete", value); + rule->setParameter("bComplete", value); } bool GameRuleDefinition::getComplete(GameRule* rule) { GameRule::ValueType value; - value = rule->getParameter(L"bComplete"); + value = rule->getParameter("bComplete"); return value.b; } void GameRuleDefinition::setComplete(GameRule* rule, bool val) { GameRule::ValueType value; - value = rule->getParameter(L"bComplete"); + value = rule->getParameter("bComplete"); value.b = val; - rule->setParameter(L"bComplete", value); + rule->setParameter("bComplete", value); } std::vector* GameRuleDefinition::enumerate() { @@ -151,10 +151,10 @@ GameRulesInstance* GameRuleDefinition::generateNewGameRulesInstance( return manager; } -std::wstring GameRuleDefinition::generateDescriptionString( - ConsoleGameRules::EGameRuleType defType, const std::wstring& description, +std::string GameRuleDefinition::generateDescriptionString( + ConsoleGameRules::EGameRuleType defType, const std::string& description, void* data, int dataLength) { - std::wstring formatted = description; + std::string formatted = description; switch (defType) { case ConsoleGameRules::eGameRuleType_CompleteAllRule: formatted = CompleteAllRuleDefinition::generateDescriptionString( diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 706914467..71a43fa2e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -25,8 +25,8 @@ private: protected: // These attributes should map to those in the XSD GameRuleType - std::wstring m_descriptionId; - std::wstring m_promptId; + std::string m_descriptionId; + std::string m_promptId; int m_4JDataValue; public: @@ -47,8 +47,8 @@ public: virtual GameRuleDefinition* addChild( ConsoleGameRules::EGameRuleType ruleType); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); virtual void populateGameRule( GameRulesInstance::EGameRulesInstanceType type, GameRule* rule); @@ -80,8 +80,8 @@ public: static GameRulesInstance* generateNewGameRulesInstance( GameRulesInstance::EGameRulesInstanceType type, LevelRuleset* rules, Connection* connection); - static std::wstring generateDescriptionString( + static std::string generateDescriptionString( ConsoleGameRules::EGameRuleType defType, - const std::wstring& description, void* data = nullptr, + const std::string& description, void* data = nullptr, int dataLength = 0); }; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index 96e85c8ca..fe50e6dff 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -37,15 +37,15 @@ void LevelRuleset::loadStringTable(StringTable* table) { m_stringTable = table; } -const wchar_t* LevelRuleset::getString(const std::wstring& key) { +const char* LevelRuleset::getString(const std::string& key) { if (m_stringTable == nullptr) { - return L""; + return ""; } else { return m_stringTable->getString(key); } } -AABB* LevelRuleset::getNamedArea(const std::wstring& areaName) { +AABB* LevelRuleset::getNamedArea(const std::string& areaName) { AABB* area = nullptr; for (auto it = m_areas.begin(); it != m_areas.end(); ++it) { if ((*it)->getName().compare(areaName) == 0) { diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index 52e70174e..4eaedd7b8 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -28,9 +28,9 @@ public: } void loadStringTable(StringTable* table); - const wchar_t* getString(const std::wstring& key); + const char* getString(const std::string& key); - AABB* getNamedArea(const std::wstring& areaName); + AABB* getNamedArea(const std::string& areaName); StringTable* getStringTable() { return m_stringTable; } }; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 28e46d186..170c2c6f3 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -9,7 +9,7 @@ #include "java/InputOutputStream/DataOutputStream.h" NamedAreaRuleDefinition::NamedAreaRuleDefinition() { - m_name = L""; + m_name = ""; m_area = AABB(0, 0, 0, 0, 0, 0); } @@ -35,37 +35,37 @@ void NamedAreaRuleDefinition::writeAttributes(DataOutputStream* dos, dos->writeUTF(toWString(m_area.z1)); } -void NamedAreaRuleDefinition::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"name") == 0) { +void NamedAreaRuleDefinition::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("name") == 0) { m_name = attributeValue; #ifndef _CONTENT_PACKAGE - wprintf(L"NamedAreaRuleDefinition: Adding parameter name=%ls\n", + printf("NamedAreaRuleDefinition: Adding parameter name=%s\n", m_name.c_str()); #endif - } else if (attributeName.compare(L"x0") == 0) { + } else if (attributeName.compare("x0") == 0) { m_area.x0 = fromWString(attributeValue); app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter x0=%f\n", m_area.x0); - } else if (attributeName.compare(L"y0") == 0) { + } else if (attributeName.compare("y0") == 0) { m_area.y0 = fromWString(attributeValue); if (m_area.y0 < 0) m_area.y0 = 0; app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter y0=%f\n", m_area.y0); - } else if (attributeName.compare(L"z0") == 0) { + } else if (attributeName.compare("z0") == 0) { m_area.z0 = fromWString(attributeValue); app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter z0=%f\n", m_area.z0); - } else if (attributeName.compare(L"x1") == 0) { + } else if (attributeName.compare("x1") == 0) { m_area.x1 = fromWString(attributeValue); app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter x1=%f\n", m_area.x1); - } else if (attributeName.compare(L"y1") == 0) { + } else if (attributeName.compare("y1") == 0) { m_area.y1 = fromWString(attributeValue); if (m_area.y1 < 0) m_area.y1 = 0; app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter y1=%f\n", m_area.y1); - } else if (attributeName.compare(L"z1") == 0) { + } else if (attributeName.compare("z1") == 0) { m_area.z1 = fromWString(attributeValue); app.DebugPrintf("NamedAreaRuleDefinition: Adding parameter z1=%f\n", m_area.z1); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index 19c5c87fa..b20e209c9 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -8,7 +8,7 @@ class NamedAreaRuleDefinition : public GameRuleDefinition { private: - std::wstring m_name; + std::string m_name; AABB m_area; public: @@ -21,9 +21,9 @@ public: return ConsoleGameRules::eGameRuleType_NamedArea; } - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); AABB* getArea() { return &m_area; } - std::wstring getName() { return m_name; } + std::string getName() { return m_name; } }; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 58dfecb6c..f4b38a3f7 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -74,9 +74,9 @@ GameRuleDefinition* UpdatePlayerRuleDefinition::addChild( m_items.push_back((AddItemRuleDefinition*)rule); } else { #ifndef _CONTENT_PACKAGE - wprintf( - L"UpdatePlayerRuleDefinition: Attempted to add invalid child rule " - L"- %d\n", + printf( + "UpdatePlayerRuleDefinition: Attempted to add invalid child rule " + "- %d\n", ruleType); #endif } @@ -84,38 +84,38 @@ GameRuleDefinition* UpdatePlayerRuleDefinition::addChild( } void UpdatePlayerRuleDefinition::addAttribute( - const std::wstring& attributeName, const std::wstring& attributeValue) { - if (attributeName.compare(L"spawnX") == 0) { + const std::string& attributeName, const std::string& attributeValue) { + if (attributeName.compare("spawnX") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->x = value; app.DebugPrintf( "UpdatePlayerRuleDefinition: Adding parameter spawnX=%d\n", value); - } else if (attributeName.compare(L"spawnY") == 0) { + } else if (attributeName.compare("spawnY") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->y = value; app.DebugPrintf( "UpdatePlayerRuleDefinition: Adding parameter spawnY=%d\n", value); - } else if (attributeName.compare(L"spawnZ") == 0) { + } else if (attributeName.compare("spawnZ") == 0) { if (m_spawnPos == nullptr) m_spawnPos = new Pos(); int value = fromWString(attributeValue); m_spawnPos->z = value; app.DebugPrintf( "UpdatePlayerRuleDefinition: Adding parameter spawnZ=%d\n", value); - } else if (attributeName.compare(L"health") == 0) { + } else if (attributeName.compare("health") == 0) { int value = fromWString(attributeValue); m_health = value; m_bUpdateHealth = true; app.DebugPrintf( "UpdatePlayerRuleDefinition: Adding parameter health=%d\n", value); - } else if (attributeName.compare(L"food") == 0) { + } else if (attributeName.compare("food") == 0) { int value = fromWString(attributeValue); m_food = value; m_bUpdateFood = true; app.DebugPrintf( "UpdatePlayerRuleDefinition: Adding parameter health=%d\n", value); - } else if (attributeName.compare(L"yRot") == 0) { + } else if (attributeName.compare("yRot") == 0) { float value = fromWString(attributeValue); m_yRot = value; m_bUpdateYRot = true; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index f529dd355..bb6943a31 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -34,8 +34,8 @@ public: virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttributes); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); virtual void postProcessPlayer(std::shared_ptr player); }; \ No newline at end of file diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index a47b7e6b4..8f18a0e56 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -31,24 +31,24 @@ void UseTileRuleDefinition::writeAttributes(DataOutputStream* dos, dos->writeUTF(toWString(m_coordinates.z)); } -void UseTileRuleDefinition::addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue) { - if (attributeName.compare(L"tileId") == 0) { +void UseTileRuleDefinition::addAttribute(const std::string& attributeName, + const std::string& attributeValue) { + if (attributeName.compare("tileId") == 0) { m_tileId = fromWString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter tileId=%d\n", m_tileId); - } else if (attributeName.compare(L"useCoords") == 0) { + } else if (attributeName.compare("useCoords") == 0) { m_useCoords = fromWString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter useCoords=%s\n", m_useCoords ? "true" : "false"); - } else if (attributeName.compare(L"x") == 0) { + } else if (attributeName.compare("x") == 0) { m_coordinates.x = fromWString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter x=%d\n", m_coordinates.x); - } else if (attributeName.compare(L"y") == 0) { + } else if (attributeName.compare("y") == 0) { m_coordinates.y = fromWString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter y=%d\n", m_coordinates.y); - } else if (attributeName.compare(L"z") == 0) { + } else if (attributeName.compare("z") == 0) { m_coordinates.z = fromWString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter z=%d\n", m_coordinates.z); diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index eb72a020b..273398dd8 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -23,8 +23,8 @@ public: virtual void writeAttributes(DataOutputStream* dos, unsigned int numAttributes); - virtual void addAttribute(const std::wstring& attributeName, - const std::wstring& attributeValue); + virtual void addAttribute(const std::string& attributeName, + const std::string& attributeValue); virtual bool onUseTile(GameRule* rule, int tileId, int x, int y, int z); }; diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp index ce9750da4..4c933a1e3 100644 --- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp @@ -29,10 +29,10 @@ GameRule::~GameRule() { } } -GameRule::ValueType GameRule::getParameter(const std::wstring& parameterName) { +GameRule::ValueType GameRule::getParameter(const std::string& parameterName) { if (m_parameters.find(parameterName) == m_parameters.end()) { #ifndef _CONTENT_PACKAGE - wprintf(L"WARNING: Parameter %ls was not set before being fetched\n", + printf("WARNING: Parameter %s was not set before being fetched\n", parameterName.c_str()); assert(0); #endif @@ -40,15 +40,15 @@ GameRule::ValueType GameRule::getParameter(const std::wstring& parameterName) { return m_parameters[parameterName]; } -void GameRule::setParameter(const std::wstring& parameterName, +void GameRule::setParameter(const std::string& parameterName, ValueType value) { if (m_parameters.find(parameterName) == m_parameters.end()) { #ifndef _CONTENT_PACKAGE - wprintf(L"Adding parameter %ls to GameRule\n", parameterName.c_str()); + printf("Adding parameter %s to GameRule\n", parameterName.c_str()); #endif } else { #ifndef _CONTENT_PACKAGE - wprintf(L"Setting parameter %ls for GameRule\n", parameterName.c_str()); + printf("Setting parameter %s for GameRule\n", parameterName.c_str()); #endif } m_parameters[parameterName] = value; @@ -67,7 +67,7 @@ void GameRule::write(DataOutputStream* dos) { // Find required parameters. dos->writeInt(m_parameters.size()); for (auto it = m_parameters.begin(); it != m_parameters.end(); it++) { - std::wstring pName = (*it).first; + std::string pName = (*it).first; ValueType vType = (*it).second; dos->writeUTF((*it).first); @@ -83,7 +83,7 @@ void GameRule::write(DataOutputStream* dos) { void GameRule::read(DataInputStream* dis) { int savedParams = dis->readInt(); for (int i = 0; i < savedParams; i++) { - std::wstring pNames = dis->readUTF(); + std::string pNames = dis->readUTF(); ValueType vType = getParameter(pNames); diff --git a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h b/targets/app/common/GameRules/LevelRules/Rules/GameRule.h index 193dcc2e2..cfa390d6a 100644 --- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h +++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.h @@ -40,7 +40,7 @@ private: Connection* m_connection; public: - typedef std::unordered_map stringValueMapType; + typedef std::unordered_map stringValueMapType; stringValueMapType m_parameters; // These are the members of this rule that // maintain it's state @@ -50,8 +50,8 @@ public: Connection* getConnection() { return m_connection; } - ValueType getParameter(const std::wstring& parameterName); - void setParameter(const std::wstring& parameterName, ValueType value); + ValueType getParameter(const std::string& parameterName); + void setParameter(const std::string& parameterName, ValueType value); GameRuleDefinition* getGameRuleDefinition(); // All the hooks go here diff --git a/targets/app/common/GameRules/WstringLookup.cpp b/targets/app/common/GameRules/WstringLookup.cpp index dc0a4113f..41e82b0c1 100644 --- a/targets/app/common/GameRules/WstringLookup.cpp +++ b/targets/app/common/GameRules/WstringLookup.cpp @@ -5,7 +5,7 @@ WstringLookup::WstringLookup() { numIDs = 0; } -std::wstring WstringLookup::lookup(unsigned int id) { +std::string WstringLookup::lookup(unsigned int id) { // TODO // if (id > currentMaxID) // throw error @@ -13,10 +13,10 @@ std::wstring WstringLookup::lookup(unsigned int id) { return int2str.at(id); } -unsigned int WstringLookup::lookup(std::wstring str) { +unsigned int WstringLookup::lookup(std::string str) { if (str2int.find(str) == str2int.end()) { - std::pair p = - std::pair(str, numIDs); + std::pair p = + std::pair(str, numIDs); str2int.insert(p); int2str.push_back(str); @@ -27,13 +27,13 @@ unsigned int WstringLookup::lookup(std::wstring str) { } } -void WstringLookup::getTable(std::wstring** lookup, unsigned int* len) { +void WstringLookup::getTable(std::string** lookup, unsigned int* len) { // Outputs - std::wstring* out_lookup; + std::string* out_lookup; unsigned int out_len; // Fill lookup. - out_lookup = new std::wstring[int2str.size()]; + out_lookup = new std::string[int2str.size()]; for (unsigned int i = 0; i < numIDs; i++) out_lookup[i] = int2str.at(i); out_len = numIDs; diff --git a/targets/app/common/GameRules/WstringLookup.h b/targets/app/common/GameRules/WstringLookup.h index 798eef5e2..921250020 100644 --- a/targets/app/common/GameRules/WstringLookup.h +++ b/targets/app/common/GameRules/WstringLookup.h @@ -7,15 +7,15 @@ class WstringLookup { private: unsigned int numIDs; - std::unordered_map str2int; - std::vector int2str; + std::unordered_map str2int; + std::vector int2str; public: WstringLookup(); - std::wstring lookup(unsigned int id); + std::string lookup(unsigned int id); - unsigned int lookup(std::wstring); + unsigned int lookup(std::string); - void getTable(std::wstring** lookup, unsigned int* len); + void getTable(std::string** lookup, unsigned int* len); }; diff --git a/targets/app/common/Game_XuiActions.cpp b/targets/app/common/Game_XuiActions.cpp index e959e2a36..909b0fdd9 100644 --- a/targets/app/common/Game_XuiActions.cpp +++ b/targets/app/common/Game_XuiActions.cpp @@ -996,7 +996,7 @@ void Game::HandleXuiActions(void) { eStream_Overworld_Calm1, eStream_Overworld_piano3, eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); - pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, + pMinecraft->soundEngine->playStreaming("", 0, 0, 0, 1, 1); const unsigned int result = @@ -1050,8 +1050,8 @@ void Game::HandleXuiActions(void) { // change the minecraft player name Minecraft::GetInstance()->user->name = - convStringToWstring(PlatformProfile.GetGamertag( - PlatformProfile.GetPrimaryPad())); + PlatformProfile.GetGamertag( + PlatformProfile.GetPrimaryPad()); bool success = g_NetworkManager.JoinGameFromInviteInfo( inviteData->dwUserIndex, // dwUserIndex @@ -1258,7 +1258,7 @@ void Game::HandleXuiActions(void) { uiIDA[1] = IDS_EXIT_GAME; // pass in the gamertag format std::string - wchar_t wchFormat[40]; + char wchFormat[40]; INetworkPlayer* player = g_NetworkManager.GetLocalPlayerByUserIndex(i); @@ -1266,7 +1266,7 @@ void Game::HandleXuiActions(void) { // banned this level and decided not to unban then we may // have left the game by now if (player) { - swprintf(wchFormat, 40, L"%ls\n\n%%ls", + snprintf(wchFormat, 40, "%s\n\n%%s", player->GetOnlineName()); IPlatformStorage::EMessageResult result = @@ -1303,7 +1303,7 @@ void Game::HandleXuiActions(void) { // do we have a license? if (pDLCPack && pDLCPack->hasPurchasedFile( - DLCManager::e_DLCType_Texture, L"")) { + DLCManager::e_DLCType_Texture, "")) { purchased = true; } } @@ -1312,7 +1312,7 @@ void Game::HandleXuiActions(void) { // to this if (pMinecraft->skins->getSelected()->hasAudio()) { Minecraft::GetInstance()->soundEngine->playStreaming( - L"", 0, 0, 0, 1, 1); + "", 0, 0, 0, 1, 1); } } break; diff --git a/targets/app/common/IPlatformGame.h b/targets/app/common/IPlatformGame.h index 9335d33f1..033c3c26e 100644 --- a/targets/app/common/IPlatformGame.h +++ b/targets/app/common/IPlatformGame.h @@ -20,11 +20,11 @@ public: virtual void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0, bool bCallback = false) = 0; - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile) = 0; - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile, + virtual int LoadLocalTMSFile(char* wchTMSFile) = 0; + virtual int LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt) = 0; virtual void FreeLocalTMSFiles(eTMSFileType eType) = 0; - virtual int GetLocalTMSFileIndex(wchar_t* wchTMSFile, + virtual int GetLocalTMSFileIndex(char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) = 0; }; diff --git a/targets/app/common/Leaderboards/LeaderboardManager.cpp b/targets/app/common/Leaderboards/LeaderboardManager.cpp index a43f3a7d4..894293a8f 100644 --- a/targets/app/common/Leaderboards/LeaderboardManager.cpp +++ b/targets/app/common/Leaderboards/LeaderboardManager.cpp @@ -3,8 +3,8 @@ #include "app/linux/LinuxGame.h" #include "util/StringHelpers.h" -const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { - L"Friends", L"MyScore", L"TopRank"}; +const std::string LeaderboardManager::filterNames[eNumFilterModes] = { + "Friends", "MyScore", "TopRank"}; void LeaderboardManager::DeleteInstance() { delete m_instance; @@ -84,7 +84,7 @@ void LeaderboardManager::printStats(ReadView& view) { ReadScore score = view.m_queries[i]; app.DebugPrintf("\tname='%s'\n", - wstringtofilename(std::wstring(score.m_name)).c_str()); + score.m_name.c_str()); app.DebugPrintf("\trank='%i'\n", score.m_rank); app.DebugPrintf("\tstatsData=["); diff --git a/targets/app/common/Leaderboards/LeaderboardManager.h b/targets/app/common/Leaderboards/LeaderboardManager.h index fd7d665e2..6c65ec98b 100644 --- a/targets/app/common/Leaderboards/LeaderboardManager.h +++ b/targets/app/common/Leaderboards/LeaderboardManager.h @@ -6,7 +6,7 @@ class LeaderboardManager : public IPlatformLeaderboard { public: - static const std::wstring filterNames[eNumFilterModes]; + static const std::string filterNames[eNumFilterModes]; LeaderboardManager(); virtual ~LeaderboardManager() {} diff --git a/targets/app/common/Localisation/StringTable.cpp b/targets/app/common/Localisation/StringTable.cpp index 262f7cd26..2c14c763b 100644 --- a/targets/app/common/Localisation/StringTable.cpp +++ b/targets/app/common/Localisation/StringTable.cpp @@ -32,17 +32,17 @@ void StringTable::ProcessStringTableData(void) { int versionNumber = dis.readInt(); int languagesCount = dis.readInt(); - std::vector > langSizeMap; + std::vector > langSizeMap; for (int i = 0; i < languagesCount; ++i) { - std::wstring langId = dis.readUTF(); + std::string langId = dis.readUTF(); int langSize = dis.readInt(); langSizeMap.push_back( - std::vector >::value_type(langId, + std::vector >::value_type(langId, langSize)); } - std::vector locales; + std::vector locales; app.getLocale(locales); bool foundLang = false; @@ -56,7 +56,7 @@ void StringTable::ProcessStringTableData(void) { for (auto it = langSizeMap.begin(); it != langSizeMap.end(); ++it) { if (it->first.compare(*it_locales) == 0) { - app.DebugPrintf("StringTable:: Found language '%ls'.\n", + app.DebugPrintf("StringTable:: Found language '%s'.\n", it_locales->c_str()); dataSize = it->second; foundLang = true; @@ -67,7 +67,7 @@ void StringTable::ProcessStringTableData(void) { } if (!foundLang) - app.DebugPrintf("StringTable:: Can't find language '%ls'.\n", + app.DebugPrintf("StringTable:: Can't find language '%s'.\n", it_locales->c_str()); } @@ -89,7 +89,7 @@ void StringTable::ProcessStringTableData(void) { if (langVersion > 0) // integers rather than std::wstrings as keys. isStatic = dis2.readBoolean(); - std::wstring langId = dis2.readUTF(); + std::string langId = dis2.readUTF(); int totalStrings = dis2.readInt(); app.DebugPrintf("IsStatic=%d totalStrings = %d\n", isStatic ? 1 : 0, @@ -97,11 +97,11 @@ void StringTable::ProcessStringTableData(void) { if (!isStatic) { for (int i = 0; i < totalStrings; ++i) { - std::wstring stringId = dis2.readUTF(); - std::wstring stringValue = dis2.readUTF(); + std::string stringId = dis2.readUTF(); + std::string stringValue = dis2.readUTF(); m_stringsMap.insert( - std::unordered_map::value_type( + std::unordered_map::value_type( stringId, stringValue)); } } else { @@ -134,11 +134,11 @@ void StringTable::getData(std::uint8_t** ppData, unsigned int* pSize) { *pSize = src.size(); } -const wchar_t* StringTable::getString(const std::wstring& id) { +const char* StringTable::getString(const std::string& id) { #ifndef _CONTENT_PACKAGE if (isStatic) { assert(0); - return L""; + return ""; } #endif @@ -147,21 +147,21 @@ const wchar_t* StringTable::getString(const std::wstring& id) { if (it != m_stringsMap.end()) { return it->second.c_str(); } else { - return L""; + return ""; } } -const wchar_t* StringTable::getString(int id) { +const char* StringTable::getString(int id) { #ifndef _CONTENT_PACKAGE if (!isStatic) { assert(0); - return L""; + return ""; } #endif if (id < m_stringsVec.size()) { - const wchar_t* pwchString = m_stringsVec.at(id).c_str(); + const char* pwchString = m_stringsVec.at(id).c_str(); return pwchString; } else - return L""; + return ""; } diff --git a/targets/app/common/Localisation/StringTable.h b/targets/app/common/Localisation/StringTable.h index 74094af31..52b6ea04d 100644 --- a/targets/app/common/Localisation/StringTable.h +++ b/targets/app/common/Localisation/StringTable.h @@ -11,8 +11,8 @@ class StringTable { private: bool isStatic; - std::unordered_map m_stringsMap; - std::vector m_stringsVec; + std::unordered_map m_stringsMap; + std::vector m_stringsVec; std::vector src; @@ -60,12 +60,12 @@ public: void getData(std::uint8_t** ppData, unsigned int* pSize); - const wchar_t* getString(const std::wstring& id); - const wchar_t* getString(int id); + const char* getString(const std::string& id); + const char* getString(int id); - // static const wchar_t* m_wchLocaleCode[LOCALE_COUNT]; + // static const char* m_wchLocaleCode[LOCALE_COUNT]; private: - // std::wstring getLangId(uint32_t dwLanguage=0); + // std::string getLangId(uint32_t dwLanguage=0); void ProcessStringTableData(void); }; diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index c17f068a8..761d1c628 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -75,7 +75,7 @@ void LocalizationManager::loadStringTable(ArchiveFile* mediaArchive) { // we need to unload the current std::string table, this is a reload delete m_stringTable; } - std::wstring localisationFile = L"languages.loc"; + std::string localisationFile = "languages.loc"; if (mediaArchive->hasFile(localisationFile)) { std::vector locFile = mediaArchive->getFile(localisationFile); @@ -87,7 +87,7 @@ void LocalizationManager::loadStringTable(ArchiveFile* mediaArchive) { } } -const wchar_t* LocalizationManager::getString(int iID) const { +const char* LocalizationManager::getString(int iID) const { return m_stringTable->getString(iID); } @@ -183,154 +183,154 @@ int LocalizationManager::getHTMLFontSize(EHTMLFontSize size) { return s_iHTMLFontSizesA[size]; } -std::wstring LocalizationManager::formatHTMLString( - int iPad, const std::wstring& desc, int shadowColour /*= 0xFFFFFFFF*/) { - std::wstring text(desc); +std::string LocalizationManager::formatHTMLString( + int iPad, const std::string& desc, int shadowColour /*= 0xFFFFFFFF*/) { + std::string text(desc); - wchar_t replacements[64]; - text = replaceAll(text, L"{*B*}", L"
"); - swprintf(replacements, 64, L"", + char replacements[64]; + text = replaceAll(text, "{*B*}", "
"); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_T1)); - text = replaceAll(text, L"{*T1*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*T1*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_T2)); - text = replaceAll(text, L"{*T2*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*T2*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_T3)); - text = replaceAll(text, L"{*T3*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*T3*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_Black)); - text = replaceAll(text, L"{*ETB*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*ETB*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_White)); - text = replaceAll(text, L"{*ETW*}", replacements); - text = replaceAll(text, L"{*EF*}", L""); + text = replaceAll(text, "{*ETW*}", replacements); + text = replaceAll(text, "{*EF*}", ""); - swprintf(replacements, 64, L"", + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_0), shadowColour); - text = replaceAll(text, L"{*C0*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C0*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_1), shadowColour); - text = replaceAll(text, L"{*C1*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C1*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_2), shadowColour); - text = replaceAll(text, L"{*C2*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C2*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_3), shadowColour); - text = replaceAll(text, L"{*C3*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C3*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_4), shadowColour); - text = replaceAll(text, L"{*C4*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C4*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_5), shadowColour); - text = replaceAll(text, L"{*C5*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C5*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_6), shadowColour); - text = replaceAll(text, L"{*C6*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C6*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_7), shadowColour); - text = replaceAll(text, L"{*C7*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C7*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_8), shadowColour); - text = replaceAll(text, L"{*C8*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C8*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_9), shadowColour); - text = replaceAll(text, L"{*C9*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*C9*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_a), shadowColour); - text = replaceAll(text, L"{*CA*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*CA*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_b), shadowColour); - text = replaceAll(text, L"{*CB*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*CB*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_c), shadowColour); - text = replaceAll(text, L"{*CC*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*CC*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_d), shadowColour); - text = replaceAll(text, L"{*CD*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*CD*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_e), shadowColour); - text = replaceAll(text, L"{*CE*}", replacements); - swprintf(replacements, 64, L"", + text = replaceAll(text, "{*CE*}", replacements); + snprintf(replacements, 64, "", getHTMLColour(eHTMLColor_f), shadowColour); - text = replaceAll(text, L"{*CF*}", replacements); + text = replaceAll(text, "{*CF*}", replacements); // Swap for southpaw. if (app.GetGameSettings(iPad, eGameSetting_ControlSouthPaw)) { text = - replaceAll(text, L"{*CONTROLLER_ACTION_MOVE*}", + replaceAll(text, "{*CONTROLLER_ACTION_MOVE*}", getActionReplacement(iPad, MINECRAFT_ACTION_LOOK_RIGHT)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_LOOK*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_LOOK*}", getActionReplacement(iPad, MINECRAFT_ACTION_RIGHT)); - text = replaceAll(text, L"{*CONTROLLER_MENU_NAVIGATE*}", + text = replaceAll(text, "{*CONTROLLER_MENU_NAVIGATE*}", getVKReplacement(VK_PAD_RTHUMB_LEFT)); } else { - text = replaceAll(text, L"{*CONTROLLER_ACTION_MOVE*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_MOVE*}", getActionReplacement(iPad, MINECRAFT_ACTION_RIGHT)); text = - replaceAll(text, L"{*CONTROLLER_ACTION_LOOK*}", + replaceAll(text, "{*CONTROLLER_ACTION_LOOK*}", getActionReplacement(iPad, MINECRAFT_ACTION_LOOK_RIGHT)); - text = replaceAll(text, L"{*CONTROLLER_MENU_NAVIGATE*}", + text = replaceAll(text, "{*CONTROLLER_MENU_NAVIGATE*}", getVKReplacement(VK_PAD_LTHUMB_LEFT)); } - text = replaceAll(text, L"{*CONTROLLER_ACTION_JUMP*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_JUMP*}", getActionReplacement(iPad, MINECRAFT_ACTION_JUMP)); text = - replaceAll(text, L"{*CONTROLLER_ACTION_SNEAK*}", + replaceAll(text, "{*CONTROLLER_ACTION_SNEAK*}", getActionReplacement(iPad, MINECRAFT_ACTION_SNEAK_TOGGLE)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_USE*}", getActionReplacement(iPad, MINECRAFT_ACTION_USE)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_ACTION*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_ACTION*}", getActionReplacement(iPad, MINECRAFT_ACTION_ACTION)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_LEFT_SCROLL*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_LEFT_SCROLL*}", getActionReplacement(iPad, MINECRAFT_ACTION_LEFT_SCROLL)); text = - replaceAll(text, L"{*CONTROLLER_ACTION_RIGHT_SCROLL*}", + replaceAll(text, "{*CONTROLLER_ACTION_RIGHT_SCROLL*}", getActionReplacement(iPad, MINECRAFT_ACTION_RIGHT_SCROLL)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_INVENTORY*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_INVENTORY*}", getActionReplacement(iPad, MINECRAFT_ACTION_INVENTORY)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_CRAFTING*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_CRAFTING*}", getActionReplacement(iPad, MINECRAFT_ACTION_CRAFTING)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_DROP*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_DROP*}", getActionReplacement(iPad, MINECRAFT_ACTION_DROP)); text = replaceAll( - text, L"{*CONTROLLER_ACTION_CAMERA*}", + text, "{*CONTROLLER_ACTION_CAMERA*}", getActionReplacement(iPad, MINECRAFT_ACTION_RENDER_THIRD_PERSON)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_MENU_PAGEDOWN*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_MENU_PAGEDOWN*}", getActionReplacement(iPad, ACTION_MENU_PAGEDOWN)); text = - replaceAll(text, L"{*CONTROLLER_ACTION_DISMOUNT*}", + replaceAll(text, "{*CONTROLLER_ACTION_DISMOUNT*}", getActionReplacement(iPad, MINECRAFT_ACTION_SNEAK_TOGGLE)); - text = replaceAll(text, L"{*CONTROLLER_VK_A*}", getVKReplacement(VK_PAD_A)); - text = replaceAll(text, L"{*CONTROLLER_VK_B*}", getVKReplacement(VK_PAD_B)); - text = replaceAll(text, L"{*CONTROLLER_VK_X*}", getVKReplacement(VK_PAD_X)); - text = replaceAll(text, L"{*CONTROLLER_VK_Y*}", getVKReplacement(VK_PAD_Y)); - text = replaceAll(text, L"{*CONTROLLER_VK_LB*}", + text = replaceAll(text, "{*CONTROLLER_VK_A*}", getVKReplacement(VK_PAD_A)); + text = replaceAll(text, "{*CONTROLLER_VK_B*}", getVKReplacement(VK_PAD_B)); + text = replaceAll(text, "{*CONTROLLER_VK_X*}", getVKReplacement(VK_PAD_X)); + text = replaceAll(text, "{*CONTROLLER_VK_Y*}", getVKReplacement(VK_PAD_Y)); + text = replaceAll(text, "{*CONTROLLER_VK_LB*}", getVKReplacement(VK_PAD_LSHOULDER)); - text = replaceAll(text, L"{*CONTROLLER_VK_RB*}", + text = replaceAll(text, "{*CONTROLLER_VK_RB*}", getVKReplacement(VK_PAD_RSHOULDER)); - text = replaceAll(text, L"{*CONTROLLER_VK_LS*}", + text = replaceAll(text, "{*CONTROLLER_VK_LS*}", getVKReplacement(VK_PAD_LTHUMB_UP)); - text = replaceAll(text, L"{*CONTROLLER_VK_RS*}", + text = replaceAll(text, "{*CONTROLLER_VK_RS*}", getVKReplacement(VK_PAD_RTHUMB_UP)); - text = replaceAll(text, L"{*CONTROLLER_VK_LT*}", + text = replaceAll(text, "{*CONTROLLER_VK_LT*}", getVKReplacement(VK_PAD_LTRIGGER)); - text = replaceAll(text, L"{*CONTROLLER_VK_RT*}", + text = replaceAll(text, "{*CONTROLLER_VK_RT*}", getVKReplacement(VK_PAD_RTRIGGER)); - text = replaceAll(text, L"{*ICON_SHANK_01*}", + text = replaceAll(text, "{*ICON_SHANK_01*}", getIconReplacement(XZP_ICON_SHANK_01)); - text = replaceAll(text, L"{*ICON_SHANK_03*}", + text = replaceAll(text, "{*ICON_SHANK_03*}", getIconReplacement(XZP_ICON_SHANK_03)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_UP*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_DPAD_UP*}", getActionReplacement(iPad, MINECRAFT_ACTION_DPAD_UP)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_DPAD_DOWN*}", getActionReplacement(iPad, MINECRAFT_ACTION_DPAD_DOWN)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_DPAD_RIGHT*}", getActionReplacement(iPad, MINECRAFT_ACTION_DPAD_RIGHT)); - text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}", + text = replaceAll(text, "{*CONTROLLER_ACTION_DPAD_LEFT*}", getActionReplacement(iPad, MINECRAFT_ACTION_DPAD_LEFT)); std::uint32_t dwLanguage = XGetLanguage(); @@ -338,64 +338,64 @@ std::wstring LocalizationManager::formatHTMLString( case XC_LANGUAGE_KOREAN: case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: - text = replaceAll(text, L" ", L""); + text = replaceAll(text, " ", ""); break; } return text; } -std::wstring LocalizationManager::getActionReplacement( +std::string LocalizationManager::getActionReplacement( int iPad, unsigned char ucAction) { unsigned int input = PlatformInput.GetGameJoypadMaps( PlatformInput.GetJoypadMapVal(iPad), ucAction); - std::wstring replacement = L""; + std::string replacement = ""; if (input & _360_JOY_BUTTON_A) - replacement = L"ButtonA"; + replacement = "ButtonA"; else if (input & _360_JOY_BUTTON_B) - replacement = L"ButtonB"; + replacement = "ButtonB"; else if (input & _360_JOY_BUTTON_X) - replacement = L"ButtonX"; + replacement = "ButtonX"; else if (input & _360_JOY_BUTTON_Y) - replacement = L"ButtonY"; + replacement = "ButtonY"; else if ((input & _360_JOY_BUTTON_LSTICK_UP) || (input & _360_JOY_BUTTON_LSTICK_DOWN) || (input & _360_JOY_BUTTON_LSTICK_LEFT) || (input & _360_JOY_BUTTON_LSTICK_RIGHT)) { - replacement = L"ButtonLeftStick"; + replacement = "ButtonLeftStick"; } else if ((input & _360_JOY_BUTTON_RSTICK_LEFT) || (input & _360_JOY_BUTTON_RSTICK_RIGHT) || (input & _360_JOY_BUTTON_RSTICK_UP) || (input & _360_JOY_BUTTON_RSTICK_DOWN)) { - replacement = L"ButtonRightStick"; + replacement = "ButtonRightStick"; } else if (input & _360_JOY_BUTTON_DPAD_LEFT) - replacement = L"ButtonDpadL"; + replacement = "ButtonDpadL"; else if (input & _360_JOY_BUTTON_DPAD_RIGHT) - replacement = L"ButtonDpadR"; + replacement = "ButtonDpadR"; else if (input & _360_JOY_BUTTON_DPAD_UP) - replacement = L"ButtonDpadU"; + replacement = "ButtonDpadU"; else if (input & _360_JOY_BUTTON_DPAD_DOWN) - replacement = L"ButtonDpadD"; + replacement = "ButtonDpadD"; else if (input & _360_JOY_BUTTON_LT) - replacement = L"ButtonLeftTrigger"; + replacement = "ButtonLeftTrigger"; else if (input & _360_JOY_BUTTON_RT) - replacement = L"ButtonRightTrigger"; + replacement = "ButtonRightTrigger"; else if (input & _360_JOY_BUTTON_RB) - replacement = L"ButtonRightBumper"; + replacement = "ButtonRightBumper"; else if (input & _360_JOY_BUTTON_LB) - replacement = L"ButtonLeftBumper"; + replacement = "ButtonLeftBumper"; else if (input & _360_JOY_BUTTON_BACK) - replacement = L"ButtonBack"; + replacement = "ButtonBack"; else if (input & _360_JOY_BUTTON_START) - replacement = L"ButtonStart"; + replacement = "ButtonStart"; else if (input & _360_JOY_BUTTON_RTHUMB) - replacement = L"ButtonRS"; + replacement = "ButtonRS"; else if (input & _360_JOY_BUTTON_LTHUMB) - replacement = L"ButtonLS"; + replacement = "ButtonLS"; - wchar_t string[128]; + char string[128]; #if defined(_WIN64) int size = 45; @@ -404,39 +404,39 @@ std::wstring LocalizationManager::getActionReplacement( int size = 45; #endif - swprintf(string, 128, - L"", + snprintf(string, 128, + "", replacement.c_str(), size, size); return string; } -std::wstring LocalizationManager::getVKReplacement(unsigned int uiVKey) { - std::wstring replacement = L""; +std::string LocalizationManager::getVKReplacement(unsigned int uiVKey) { + std::string replacement = ""; switch (uiVKey) { case VK_PAD_A: - replacement = L"ButtonA"; + replacement = "ButtonA"; break; case VK_PAD_B: - replacement = L"ButtonB"; + replacement = "ButtonB"; break; case VK_PAD_X: - replacement = L"ButtonX"; + replacement = "ButtonX"; break; case VK_PAD_Y: - replacement = L"ButtonY"; + replacement = "ButtonY"; break; case VK_PAD_LSHOULDER: - replacement = L"ButtonLeftBumper"; + replacement = "ButtonLeftBumper"; break; case VK_PAD_RSHOULDER: - replacement = L"ButtonRightBumper"; + replacement = "ButtonRightBumper"; break; case VK_PAD_LTRIGGER: - replacement = L"ButtonLeftTrigger"; + replacement = "ButtonLeftTrigger"; break; case VK_PAD_RTRIGGER: - replacement = L"ButtonRightTrigger"; + replacement = "ButtonRightTrigger"; break; case VK_PAD_LTHUMB_UP: case VK_PAD_LTHUMB_DOWN: @@ -446,7 +446,7 @@ std::wstring LocalizationManager::getVKReplacement(unsigned int uiVKey) { case VK_PAD_LTHUMB_UPRIGHT: case VK_PAD_LTHUMB_DOWNRIGHT: case VK_PAD_LTHUMB_DOWNLEFT: - replacement = L"ButtonLeftStick"; + replacement = "ButtonLeftStick"; break; case VK_PAD_RTHUMB_UP: case VK_PAD_RTHUMB_DOWN: @@ -456,12 +456,12 @@ std::wstring LocalizationManager::getVKReplacement(unsigned int uiVKey) { case VK_PAD_RTHUMB_UPRIGHT: case VK_PAD_RTHUMB_DOWNRIGHT: case VK_PAD_RTHUMB_DOWNLEFT: - replacement = L"ButtonRightStick"; + replacement = "ButtonRightStick"; break; default: break; } - wchar_t string[128]; + char string[128]; #if defined(_WIN64) int size = 45; @@ -470,15 +470,15 @@ std::wstring LocalizationManager::getVKReplacement(unsigned int uiVKey) { int size = 45; #endif - swprintf(string, 128, - L"", + snprintf(string, 128, + "", replacement.c_str(), size, size); return string; } -std::wstring LocalizationManager::getIconReplacement(unsigned int uiIcon) { - wchar_t string[128]; +std::string LocalizationManager::getIconReplacement(unsigned int uiIcon) { + char string[128]; #if defined(_WIN64) int size = 33; @@ -487,11 +487,11 @@ std::wstring LocalizationManager::getIconReplacement(unsigned int uiIcon) { int size = 33; #endif - swprintf(string, 128, - L"", + snprintf(string, 128, + "", size, size); - std::wstring result = L""; + std::string result = ""; switch (uiIcon) { case XZP_ICON_SHANK_01: result = string; @@ -506,7 +506,7 @@ std::wstring LocalizationManager::getIconReplacement(unsigned int uiIcon) { } void LocalizationManager::getLocale( - std::vector& vecWstrLocales) { + std::vector& vecWstrLocales) { std::vector locales; const unsigned int systemLanguage = XGetLanguage(); @@ -662,201 +662,201 @@ void LocalizationManager::getLocale( } } -int LocalizationManager::get_eMCLang(wchar_t* pwchLocale) { +int LocalizationManager::get_eMCLang(char* pwchLocale) { return m_eMCLangA[pwchLocale]; } -int LocalizationManager::get_xcLang(wchar_t* pwchLocale) { +int LocalizationManager::get_xcLang(char* pwchLocale) { return m_xcLangA[pwchLocale]; } void LocalizationManager::localeAndLanguageInit() { - m_localeA[eMCLang_zhCHT] = L"zh-CHT"; - m_localeA[eMCLang_csCS] = L"cs-CS"; - m_localeA[eMCLang_laLAS] = L"la-LAS"; - m_localeA[eMCLang_null] = L"en-EN"; - m_localeA[eMCLang_enUS] = L"en-US"; - m_localeA[eMCLang_enGB] = L"en-GB"; - m_localeA[eMCLang_enIE] = L"en-IE"; - m_localeA[eMCLang_enAU] = L"en-AU"; - m_localeA[eMCLang_enNZ] = L"en-NZ"; - m_localeA[eMCLang_enCA] = L"en-CA"; - m_localeA[eMCLang_jaJP] = L"ja-JP"; - m_localeA[eMCLang_deDE] = L"de-DE"; - m_localeA[eMCLang_deAT] = L"de-AT"; - m_localeA[eMCLang_frFR] = L"fr-FR"; - m_localeA[eMCLang_frCA] = L"fr-CA"; - m_localeA[eMCLang_esES] = L"es-ES"; - m_localeA[eMCLang_esMX] = L"es-MX"; - m_localeA[eMCLang_itIT] = L"it-IT"; - m_localeA[eMCLang_koKR] = L"ko-KR"; - m_localeA[eMCLang_ptPT] = L"pt-PT"; - m_localeA[eMCLang_ptBR] = L"pt-BR"; - m_localeA[eMCLang_ruRU] = L"ru-RU"; - m_localeA[eMCLang_nlNL] = L"nl-NL"; - m_localeA[eMCLang_fiFI] = L"fi-FI"; - m_localeA[eMCLang_svSV] = L"sv-SV"; - m_localeA[eMCLang_daDA] = L"da-DA"; - m_localeA[eMCLang_noNO] = L"no-NO"; - m_localeA[eMCLang_plPL] = L"pl-PL"; - m_localeA[eMCLang_trTR] = L"tr-TR"; - m_localeA[eMCLang_elEL] = L"el-EL"; - m_localeA[eMCLang_zhSG] = L"zh-SG"; - m_localeA[eMCLang_zhCN] = L"zh-CN"; - m_localeA[eMCLang_zhHK] = L"zh-HK"; - m_localeA[eMCLang_zhTW] = L"zh-TW"; - m_localeA[eMCLang_nlBE] = L"nl-BE"; - m_localeA[eMCLang_daDK] = L"da-DK"; - m_localeA[eMCLang_frBE] = L"fr-BE"; - m_localeA[eMCLang_frCH] = L"fr-CH"; - m_localeA[eMCLang_deCH] = L"de-CH"; - m_localeA[eMCLang_nbNO] = L"nb-NO"; - m_localeA[eMCLang_enGR] = L"en-GR"; - m_localeA[eMCLang_enHK] = L"en-HK"; - m_localeA[eMCLang_enSA] = L"en-SA"; - m_localeA[eMCLang_enHU] = L"en-HU"; - m_localeA[eMCLang_enIN] = L"en-IN"; - m_localeA[eMCLang_enIL] = L"en-IL"; - m_localeA[eMCLang_enSG] = L"en-SG"; - m_localeA[eMCLang_enSK] = L"en-SK"; - m_localeA[eMCLang_enZA] = L"en-ZA"; - m_localeA[eMCLang_enCZ] = L"en-CZ"; - m_localeA[eMCLang_enAE] = L"en-AE"; - m_localeA[eMCLang_esAR] = L"es-AR"; - m_localeA[eMCLang_esCL] = L"es-CL"; - m_localeA[eMCLang_esCO] = L"es-CO"; - m_localeA[eMCLang_esUS] = L"es-US"; - m_localeA[eMCLang_svSE] = L"sv-SE"; - m_localeA[eMCLang_csCZ] = L"cs-CZ"; - m_localeA[eMCLang_elGR] = L"el-GR"; - m_localeA[eMCLang_nnNO] = L"nn-NO"; - m_localeA[eMCLang_skSK] = L"sk-SK"; - m_localeA[eMCLang_hans] = L"zh-HANS"; - m_localeA[eMCLang_hant] = L"zh-HANT"; + m_localeA[eMCLang_zhCHT] = "zh-CHT"; + m_localeA[eMCLang_csCS] = "cs-CS"; + m_localeA[eMCLang_laLAS] = "la-LAS"; + m_localeA[eMCLang_null] = "en-EN"; + m_localeA[eMCLang_enUS] = "en-US"; + m_localeA[eMCLang_enGB] = "en-GB"; + m_localeA[eMCLang_enIE] = "en-IE"; + m_localeA[eMCLang_enAU] = "en-AU"; + m_localeA[eMCLang_enNZ] = "en-NZ"; + m_localeA[eMCLang_enCA] = "en-CA"; + m_localeA[eMCLang_jaJP] = "ja-JP"; + m_localeA[eMCLang_deDE] = "de-DE"; + m_localeA[eMCLang_deAT] = "de-AT"; + m_localeA[eMCLang_frFR] = "fr-FR"; + m_localeA[eMCLang_frCA] = "fr-CA"; + m_localeA[eMCLang_esES] = "es-ES"; + m_localeA[eMCLang_esMX] = "es-MX"; + m_localeA[eMCLang_itIT] = "it-IT"; + m_localeA[eMCLang_koKR] = "ko-KR"; + m_localeA[eMCLang_ptPT] = "pt-PT"; + m_localeA[eMCLang_ptBR] = "pt-BR"; + m_localeA[eMCLang_ruRU] = "ru-RU"; + m_localeA[eMCLang_nlNL] = "nl-NL"; + m_localeA[eMCLang_fiFI] = "fi-FI"; + m_localeA[eMCLang_svSV] = "sv-SV"; + m_localeA[eMCLang_daDA] = "da-DA"; + m_localeA[eMCLang_noNO] = "no-NO"; + m_localeA[eMCLang_plPL] = "pl-PL"; + m_localeA[eMCLang_trTR] = "tr-TR"; + m_localeA[eMCLang_elEL] = "el-EL"; + m_localeA[eMCLang_zhSG] = "zh-SG"; + m_localeA[eMCLang_zhCN] = "zh-CN"; + m_localeA[eMCLang_zhHK] = "zh-HK"; + m_localeA[eMCLang_zhTW] = "zh-TW"; + m_localeA[eMCLang_nlBE] = "nl-BE"; + m_localeA[eMCLang_daDK] = "da-DK"; + m_localeA[eMCLang_frBE] = "fr-BE"; + m_localeA[eMCLang_frCH] = "fr-CH"; + m_localeA[eMCLang_deCH] = "de-CH"; + m_localeA[eMCLang_nbNO] = "nb-NO"; + m_localeA[eMCLang_enGR] = "en-GR"; + m_localeA[eMCLang_enHK] = "en-HK"; + m_localeA[eMCLang_enSA] = "en-SA"; + m_localeA[eMCLang_enHU] = "en-HU"; + m_localeA[eMCLang_enIN] = "en-IN"; + m_localeA[eMCLang_enIL] = "en-IL"; + m_localeA[eMCLang_enSG] = "en-SG"; + m_localeA[eMCLang_enSK] = "en-SK"; + m_localeA[eMCLang_enZA] = "en-ZA"; + m_localeA[eMCLang_enCZ] = "en-CZ"; + m_localeA[eMCLang_enAE] = "en-AE"; + m_localeA[eMCLang_esAR] = "es-AR"; + m_localeA[eMCLang_esCL] = "es-CL"; + m_localeA[eMCLang_esCO] = "es-CO"; + m_localeA[eMCLang_esUS] = "es-US"; + m_localeA[eMCLang_svSE] = "sv-SE"; + m_localeA[eMCLang_csCZ] = "cs-CZ"; + m_localeA[eMCLang_elGR] = "el-GR"; + m_localeA[eMCLang_nnNO] = "nn-NO"; + m_localeA[eMCLang_skSK] = "sk-SK"; + m_localeA[eMCLang_hans] = "zh-HANS"; + m_localeA[eMCLang_hant] = "zh-HANT"; - m_eMCLangA[L"zh-CHT"] = eMCLang_zhCHT; - m_eMCLangA[L"cs-CS"] = eMCLang_csCS; - m_eMCLangA[L"la-LAS"] = eMCLang_laLAS; - m_eMCLangA[L"en-EN"] = eMCLang_null; - m_eMCLangA[L"en-US"] = eMCLang_enUS; - m_eMCLangA[L"en-GB"] = eMCLang_enGB; - m_eMCLangA[L"en-IE"] = eMCLang_enIE; - m_eMCLangA[L"en-AU"] = eMCLang_enAU; - m_eMCLangA[L"en-NZ"] = eMCLang_enNZ; - m_eMCLangA[L"en-CA"] = eMCLang_enCA; - m_eMCLangA[L"ja-JP"] = eMCLang_jaJP; - m_eMCLangA[L"de-DE"] = eMCLang_deDE; - m_eMCLangA[L"de-AT"] = eMCLang_deAT; - m_eMCLangA[L"fr-FR"] = eMCLang_frFR; - m_eMCLangA[L"fr-CA"] = eMCLang_frCA; - m_eMCLangA[L"es-ES"] = eMCLang_esES; - m_eMCLangA[L"es-MX"] = eMCLang_esMX; - m_eMCLangA[L"it-IT"] = eMCLang_itIT; - m_eMCLangA[L"ko-KR"] = eMCLang_koKR; - m_eMCLangA[L"pt-PT"] = eMCLang_ptPT; - m_eMCLangA[L"pt-BR"] = eMCLang_ptBR; - m_eMCLangA[L"ru-RU"] = eMCLang_ruRU; - m_eMCLangA[L"nl-NL"] = eMCLang_nlNL; - m_eMCLangA[L"fi-FI"] = eMCLang_fiFI; - m_eMCLangA[L"sv-SV"] = eMCLang_svSV; - m_eMCLangA[L"da-DA"] = eMCLang_daDA; - m_eMCLangA[L"no-NO"] = eMCLang_noNO; - m_eMCLangA[L"pl-PL"] = eMCLang_plPL; - m_eMCLangA[L"tr-TR"] = eMCLang_trTR; - m_eMCLangA[L"el-EL"] = eMCLang_elEL; - m_eMCLangA[L"zh-SG"] = eMCLang_zhSG; - m_eMCLangA[L"zh-CN"] = eMCLang_zhCN; - m_eMCLangA[L"zh-HK"] = eMCLang_zhHK; - m_eMCLangA[L"zh-TW"] = eMCLang_zhTW; - m_eMCLangA[L"nl-BE"] = eMCLang_nlBE; - m_eMCLangA[L"da-DK"] = eMCLang_daDK; - m_eMCLangA[L"fr-BE"] = eMCLang_frBE; - m_eMCLangA[L"fr-CH"] = eMCLang_frCH; - m_eMCLangA[L"de-CH"] = eMCLang_deCH; - m_eMCLangA[L"nb-NO"] = eMCLang_nbNO; - m_eMCLangA[L"en-GR"] = eMCLang_enGR; - m_eMCLangA[L"en-HK"] = eMCLang_enHK; - m_eMCLangA[L"en-SA"] = eMCLang_enSA; - m_eMCLangA[L"en-HU"] = eMCLang_enHU; - m_eMCLangA[L"en-IN"] = eMCLang_enIN; - m_eMCLangA[L"en-IL"] = eMCLang_enIL; - m_eMCLangA[L"en-SG"] = eMCLang_enSG; - m_eMCLangA[L"en-SK"] = eMCLang_enSK; - m_eMCLangA[L"en-ZA"] = eMCLang_enZA; - m_eMCLangA[L"en-CZ"] = eMCLang_enCZ; - m_eMCLangA[L"en-AE"] = eMCLang_enAE; - m_eMCLangA[L"es-AR"] = eMCLang_esAR; - m_eMCLangA[L"es-CL"] = eMCLang_esCL; - m_eMCLangA[L"es-CO"] = eMCLang_esCO; - m_eMCLangA[L"es-US"] = eMCLang_esUS; - m_eMCLangA[L"sv-SE"] = eMCLang_svSE; - m_eMCLangA[L"cs-CZ"] = eMCLang_csCZ; - m_eMCLangA[L"el-GR"] = eMCLang_elGR; - m_eMCLangA[L"nn-NO"] = eMCLang_nnNO; - m_eMCLangA[L"sk-SK"] = eMCLang_skSK; - m_eMCLangA[L"zh-HANS"] = eMCLang_hans; - m_eMCLangA[L"zh-HANT"] = eMCLang_hant; + m_eMCLangA["zh-CHT"] = eMCLang_zhCHT; + m_eMCLangA["cs-CS"] = eMCLang_csCS; + m_eMCLangA["la-LAS"] = eMCLang_laLAS; + m_eMCLangA["en-EN"] = eMCLang_null; + m_eMCLangA["en-US"] = eMCLang_enUS; + m_eMCLangA["en-GB"] = eMCLang_enGB; + m_eMCLangA["en-IE"] = eMCLang_enIE; + m_eMCLangA["en-AU"] = eMCLang_enAU; + m_eMCLangA["en-NZ"] = eMCLang_enNZ; + m_eMCLangA["en-CA"] = eMCLang_enCA; + m_eMCLangA["ja-JP"] = eMCLang_jaJP; + m_eMCLangA["de-DE"] = eMCLang_deDE; + m_eMCLangA["de-AT"] = eMCLang_deAT; + m_eMCLangA["fr-FR"] = eMCLang_frFR; + m_eMCLangA["fr-CA"] = eMCLang_frCA; + m_eMCLangA["es-ES"] = eMCLang_esES; + m_eMCLangA["es-MX"] = eMCLang_esMX; + m_eMCLangA["it-IT"] = eMCLang_itIT; + m_eMCLangA["ko-KR"] = eMCLang_koKR; + m_eMCLangA["pt-PT"] = eMCLang_ptPT; + m_eMCLangA["pt-BR"] = eMCLang_ptBR; + m_eMCLangA["ru-RU"] = eMCLang_ruRU; + m_eMCLangA["nl-NL"] = eMCLang_nlNL; + m_eMCLangA["fi-FI"] = eMCLang_fiFI; + m_eMCLangA["sv-SV"] = eMCLang_svSV; + m_eMCLangA["da-DA"] = eMCLang_daDA; + m_eMCLangA["no-NO"] = eMCLang_noNO; + m_eMCLangA["pl-PL"] = eMCLang_plPL; + m_eMCLangA["tr-TR"] = eMCLang_trTR; + m_eMCLangA["el-EL"] = eMCLang_elEL; + m_eMCLangA["zh-SG"] = eMCLang_zhSG; + m_eMCLangA["zh-CN"] = eMCLang_zhCN; + m_eMCLangA["zh-HK"] = eMCLang_zhHK; + m_eMCLangA["zh-TW"] = eMCLang_zhTW; + m_eMCLangA["nl-BE"] = eMCLang_nlBE; + m_eMCLangA["da-DK"] = eMCLang_daDK; + m_eMCLangA["fr-BE"] = eMCLang_frBE; + m_eMCLangA["fr-CH"] = eMCLang_frCH; + m_eMCLangA["de-CH"] = eMCLang_deCH; + m_eMCLangA["nb-NO"] = eMCLang_nbNO; + m_eMCLangA["en-GR"] = eMCLang_enGR; + m_eMCLangA["en-HK"] = eMCLang_enHK; + m_eMCLangA["en-SA"] = eMCLang_enSA; + m_eMCLangA["en-HU"] = eMCLang_enHU; + m_eMCLangA["en-IN"] = eMCLang_enIN; + m_eMCLangA["en-IL"] = eMCLang_enIL; + m_eMCLangA["en-SG"] = eMCLang_enSG; + m_eMCLangA["en-SK"] = eMCLang_enSK; + m_eMCLangA["en-ZA"] = eMCLang_enZA; + m_eMCLangA["en-CZ"] = eMCLang_enCZ; + m_eMCLangA["en-AE"] = eMCLang_enAE; + m_eMCLangA["es-AR"] = eMCLang_esAR; + m_eMCLangA["es-CL"] = eMCLang_esCL; + m_eMCLangA["es-CO"] = eMCLang_esCO; + m_eMCLangA["es-US"] = eMCLang_esUS; + m_eMCLangA["sv-SE"] = eMCLang_svSE; + m_eMCLangA["cs-CZ"] = eMCLang_csCZ; + m_eMCLangA["el-GR"] = eMCLang_elGR; + m_eMCLangA["nn-NO"] = eMCLang_nnNO; + m_eMCLangA["sk-SK"] = eMCLang_skSK; + m_eMCLangA["zh-HANS"] = eMCLang_hans; + m_eMCLangA["zh-HANT"] = eMCLang_hant; - m_xcLangA[L"zh-CHT"] = XC_LOCALE_CHINA; - m_xcLangA[L"cs-CS"] = XC_LOCALE_CHINA; - m_xcLangA[L"en-EN"] = XC_LOCALE_UNITED_STATES; - m_xcLangA[L"en-US"] = XC_LOCALE_UNITED_STATES; - m_xcLangA[L"en-GB"] = XC_LOCALE_GREAT_BRITAIN; - m_xcLangA[L"en-IE"] = XC_LOCALE_IRELAND; - m_xcLangA[L"en-AU"] = XC_LOCALE_AUSTRALIA; - m_xcLangA[L"en-NZ"] = XC_LOCALE_NEW_ZEALAND; - m_xcLangA[L"en-CA"] = XC_LOCALE_CANADA; - m_xcLangA[L"ja-JP"] = XC_LOCALE_JAPAN; - m_xcLangA[L"de-DE"] = XC_LOCALE_GERMANY; - m_xcLangA[L"de-AT"] = XC_LOCALE_AUSTRIA; - m_xcLangA[L"fr-FR"] = XC_LOCALE_FRANCE; - m_xcLangA[L"fr-CA"] = XC_LOCALE_CANADA; - m_xcLangA[L"es-ES"] = XC_LOCALE_SPAIN; - m_xcLangA[L"es-MX"] = XC_LOCALE_MEXICO; - m_xcLangA[L"it-IT"] = XC_LOCALE_ITALY; - m_xcLangA[L"ko-KR"] = XC_LOCALE_KOREA; - m_xcLangA[L"pt-PT"] = XC_LOCALE_PORTUGAL; - m_xcLangA[L"pt-BR"] = XC_LOCALE_BRAZIL; - m_xcLangA[L"ru-RU"] = XC_LOCALE_RUSSIAN_FEDERATION; - m_xcLangA[L"nl-NL"] = XC_LOCALE_NETHERLANDS; - m_xcLangA[L"fi-FI"] = XC_LOCALE_FINLAND; - m_xcLangA[L"sv-SV"] = XC_LOCALE_SWEDEN; - m_xcLangA[L"da-DA"] = XC_LOCALE_DENMARK; - m_xcLangA[L"no-NO"] = XC_LOCALE_NORWAY; - m_xcLangA[L"pl-PL"] = XC_LOCALE_POLAND; - m_xcLangA[L"tr-TR"] = XC_LOCALE_TURKEY; - m_xcLangA[L"el-EL"] = XC_LOCALE_GREECE; - m_xcLangA[L"la-LAS"] = XC_LOCALE_LATIN_AMERICA; - m_xcLangA[L"zh-SG"] = XC_LOCALE_SINGAPORE; - m_xcLangA[L"Zh-CN"] = XC_LOCALE_CHINA; - m_xcLangA[L"zh-HK"] = XC_LOCALE_HONG_KONG; - m_xcLangA[L"zh-TW"] = XC_LOCALE_TAIWAN; - m_xcLangA[L"nl-BE"] = XC_LOCALE_BELGIUM; - m_xcLangA[L"da-DK"] = XC_LOCALE_DENMARK; - m_xcLangA[L"fr-BE"] = XC_LOCALE_BELGIUM; - m_xcLangA[L"fr-CH"] = XC_LOCALE_SWITZERLAND; - m_xcLangA[L"de-CH"] = XC_LOCALE_SWITZERLAND; - m_xcLangA[L"nb-NO"] = XC_LOCALE_NORWAY; - m_xcLangA[L"en-GR"] = XC_LOCALE_GREECE; - m_xcLangA[L"en-HK"] = XC_LOCALE_HONG_KONG; - m_xcLangA[L"en-SA"] = XC_LOCALE_SAUDI_ARABIA; - m_xcLangA[L"en-HU"] = XC_LOCALE_HUNGARY; - m_xcLangA[L"en-IN"] = XC_LOCALE_INDIA; - m_xcLangA[L"en-IL"] = XC_LOCALE_ISRAEL; - m_xcLangA[L"en-SG"] = XC_LOCALE_SINGAPORE; - m_xcLangA[L"en-SK"] = XC_LOCALE_SLOVAK_REPUBLIC; - m_xcLangA[L"en-ZA"] = XC_LOCALE_SOUTH_AFRICA; - m_xcLangA[L"en-CZ"] = XC_LOCALE_CZECH_REPUBLIC; - m_xcLangA[L"en-AE"] = XC_LOCALE_UNITED_ARAB_EMIRATES; - m_xcLangA[L"ja-IP"] = XC_LOCALE_JAPAN; - m_xcLangA[L"es-AR"] = XC_LOCALE_ARGENTINA; - m_xcLangA[L"es-CL"] = XC_LOCALE_CHILE; - m_xcLangA[L"es-CO"] = XC_LOCALE_COLOMBIA; - m_xcLangA[L"es-US"] = XC_LOCALE_UNITED_STATES; - m_xcLangA[L"sv-SE"] = XC_LOCALE_SWEDEN; - m_xcLangA[L"cs-CZ"] = XC_LOCALE_CZECH_REPUBLIC; - m_xcLangA[L"el-GR"] = XC_LOCALE_GREECE; - m_xcLangA[L"sk-SK"] = XC_LOCALE_SLOVAK_REPUBLIC; - m_xcLangA[L"zh-HANS"] = XC_LOCALE_CHINA; - m_xcLangA[L"zh-HANT"] = XC_LOCALE_CHINA; + m_xcLangA["zh-CHT"] = XC_LOCALE_CHINA; + m_xcLangA["cs-CS"] = XC_LOCALE_CHINA; + m_xcLangA["en-EN"] = XC_LOCALE_UNITED_STATES; + m_xcLangA["en-US"] = XC_LOCALE_UNITED_STATES; + m_xcLangA["en-GB"] = XC_LOCALE_GREAT_BRITAIN; + m_xcLangA["en-IE"] = XC_LOCALE_IRELAND; + m_xcLangA["en-AU"] = XC_LOCALE_AUSTRALIA; + m_xcLangA["en-NZ"] = XC_LOCALE_NEW_ZEALAND; + m_xcLangA["en-CA"] = XC_LOCALE_CANADA; + m_xcLangA["ja-JP"] = XC_LOCALE_JAPAN; + m_xcLangA["de-DE"] = XC_LOCALE_GERMANY; + m_xcLangA["de-AT"] = XC_LOCALE_AUSTRIA; + m_xcLangA["fr-FR"] = XC_LOCALE_FRANCE; + m_xcLangA["fr-CA"] = XC_LOCALE_CANADA; + m_xcLangA["es-ES"] = XC_LOCALE_SPAIN; + m_xcLangA["es-MX"] = XC_LOCALE_MEXICO; + m_xcLangA["it-IT"] = XC_LOCALE_ITALY; + m_xcLangA["ko-KR"] = XC_LOCALE_KOREA; + m_xcLangA["pt-PT"] = XC_LOCALE_PORTUGAL; + m_xcLangA["pt-BR"] = XC_LOCALE_BRAZIL; + m_xcLangA["ru-RU"] = XC_LOCALE_RUSSIAN_FEDERATION; + m_xcLangA["nl-NL"] = XC_LOCALE_NETHERLANDS; + m_xcLangA["fi-FI"] = XC_LOCALE_FINLAND; + m_xcLangA["sv-SV"] = XC_LOCALE_SWEDEN; + m_xcLangA["da-DA"] = XC_LOCALE_DENMARK; + m_xcLangA["no-NO"] = XC_LOCALE_NORWAY; + m_xcLangA["pl-PL"] = XC_LOCALE_POLAND; + m_xcLangA["tr-TR"] = XC_LOCALE_TURKEY; + m_xcLangA["el-EL"] = XC_LOCALE_GREECE; + m_xcLangA["la-LAS"] = XC_LOCALE_LATIN_AMERICA; + m_xcLangA["zh-SG"] = XC_LOCALE_SINGAPORE; + m_xcLangA["Zh-CN"] = XC_LOCALE_CHINA; + m_xcLangA["zh-HK"] = XC_LOCALE_HONG_KONG; + m_xcLangA["zh-TW"] = XC_LOCALE_TAIWAN; + m_xcLangA["nl-BE"] = XC_LOCALE_BELGIUM; + m_xcLangA["da-DK"] = XC_LOCALE_DENMARK; + m_xcLangA["fr-BE"] = XC_LOCALE_BELGIUM; + m_xcLangA["fr-CH"] = XC_LOCALE_SWITZERLAND; + m_xcLangA["de-CH"] = XC_LOCALE_SWITZERLAND; + m_xcLangA["nb-NO"] = XC_LOCALE_NORWAY; + m_xcLangA["en-GR"] = XC_LOCALE_GREECE; + m_xcLangA["en-HK"] = XC_LOCALE_HONG_KONG; + m_xcLangA["en-SA"] = XC_LOCALE_SAUDI_ARABIA; + m_xcLangA["en-HU"] = XC_LOCALE_HUNGARY; + m_xcLangA["en-IN"] = XC_LOCALE_INDIA; + m_xcLangA["en-IL"] = XC_LOCALE_ISRAEL; + m_xcLangA["en-SG"] = XC_LOCALE_SINGAPORE; + m_xcLangA["en-SK"] = XC_LOCALE_SLOVAK_REPUBLIC; + m_xcLangA["en-ZA"] = XC_LOCALE_SOUTH_AFRICA; + m_xcLangA["en-CZ"] = XC_LOCALE_CZECH_REPUBLIC; + m_xcLangA["en-AE"] = XC_LOCALE_UNITED_ARAB_EMIRATES; + m_xcLangA["ja-IP"] = XC_LOCALE_JAPAN; + m_xcLangA["es-AR"] = XC_LOCALE_ARGENTINA; + m_xcLangA["es-CL"] = XC_LOCALE_CHILE; + m_xcLangA["es-CO"] = XC_LOCALE_COLOMBIA; + m_xcLangA["es-US"] = XC_LOCALE_UNITED_STATES; + m_xcLangA["sv-SE"] = XC_LOCALE_SWEDEN; + m_xcLangA["cs-CZ"] = XC_LOCALE_CZECH_REPUBLIC; + m_xcLangA["el-GR"] = XC_LOCALE_GREECE; + m_xcLangA["sk-SK"] = XC_LOCALE_SLOVAK_REPUBLIC; + m_xcLangA["zh-HANS"] = XC_LOCALE_CHINA; + m_xcLangA["zh-HANT"] = XC_LOCALE_CHINA; } diff --git a/targets/app/common/LocalizationManager.h b/targets/app/common/LocalizationManager.h index ad98c8e4a..d84689f75 100644 --- a/targets/app/common/LocalizationManager.h +++ b/targets/app/common/LocalizationManager.h @@ -19,13 +19,13 @@ public: void localeAndLanguageInit(); void loadStringTable(ArchiveFile* mediaArchive); - const wchar_t* getString(int iID) const; + const char* getString(int iID) const; - std::wstring formatHTMLString(int iPad, const std::wstring& desc, + std::string formatHTMLString(int iPad, const std::string& desc, int shadowColour = 0xFFFFFFFF); - std::wstring getActionReplacement(int iPad, unsigned char ucAction); - std::wstring getVKReplacement(unsigned int uiVKey); - std::wstring getIconReplacement(unsigned int uiIcon); + std::string getActionReplacement(int iPad, unsigned char ucAction); + std::string getVKReplacement(unsigned int uiVKey); + std::string getIconReplacement(unsigned int uiIcon); int getHTMLColour(eMinecraftColour colour); int getHTMLColor(eMinecraftColour colour) { return getHTMLColour(colour); } @@ -34,9 +34,9 @@ public: void initialiseTips(); int getNextTip(); - void getLocale(std::vector& vecWstrLocales); - int get_eMCLang(wchar_t* pwchLocale); - int get_xcLang(wchar_t* pwchLocale); + void getLocale(std::vector& vecWstrLocales); + int get_eMCLang(char* pwchLocale); + int get_xcLang(char* pwchLocale); StringTable* getStringTable() const { return m_stringTable; } @@ -45,9 +45,9 @@ private: StringTable* m_stringTable; - std::unordered_map m_localeA; - std::unordered_map m_eMCLangA; - std::unordered_map m_xcLangA; + std::unordered_map m_localeA; + std::unordered_map m_eMCLangA; + std::unordered_map m_xcLangA; static const int MAX_TIPS_GAMETIP = 50; static const int MAX_TIPS_TRIVIATIP = 20; diff --git a/targets/app/common/MenuController.cpp b/targets/app/common/MenuController.cpp index 6089184fd..f4cfed459 100644 --- a/targets/app/common/MenuController.cpp +++ b/targets/app/common/MenuController.cpp @@ -179,7 +179,7 @@ bool MenuController::loadFireworksMenu(int iPad, bool MenuController::loadEnchantingMenu(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, - const std::wstring& name) { + const std::string& name) { bool success = true; EnchantingScreenInput* initData = new EnchantingScreenInput(); @@ -335,7 +335,7 @@ bool MenuController::loadRepairingMenu(int iPad, bool MenuController::loadTradingMenu(int iPad, std::shared_ptr inventory, std::shared_ptr trader, - Level* level, const std::wstring& name) { + Level* level, const std::string& name) { bool success = true; TradingScreenInput* initData = new TradingScreenInput(); diff --git a/targets/app/common/MenuController.h b/targets/app/common/MenuController.h index 8c2b74f5c..a5f157a63 100644 --- a/targets/app/common/MenuController.h +++ b/targets/app/common/MenuController.h @@ -35,7 +35,7 @@ public: bool bNavigateBack = false); bool loadEnchantingMenu(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, - const std::wstring& name); + const std::string& name); bool loadFurnaceMenu(int iPad, std::shared_ptr inventory, std::shared_ptr furnace); bool loadBrewingStandMenu( @@ -55,7 +55,7 @@ public: Level* level, int x, int y, int z); bool loadTradingMenu(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, - const std::wstring& name); + const std::string& name); bool loadHopperMenu(int iPad, std::shared_ptr inventory, std::shared_ptr hopper); bool loadHopperMenu(int iPad, std::shared_ptr inventory, diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp index 5374abdb8..2a9dce74d 100644 --- a/targets/app/common/Network/GameNetworkManager.cpp +++ b/targets/app/common/Network/GameNetworkManager.cpp @@ -146,16 +146,16 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, if (param->levelGen->requiresBaseSave() && !param->levelGen->getBaseSavePath().empty()) { #if defined(_WINDOWS64) - std::wstring fileRoot = - L"Windows64Media\\Tutorial\\" + + std::string fileRoot = + "Windows64Media\\Tutorial\\" + param->levelGen->getBaseSavePath(); File root(fileRoot); if (!root.exists()) - fileRoot = L"Windows64\\Tutorial\\" + + fileRoot = "Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath(); #else - std::wstring fileRoot = - L"Tutorial\\" + param->levelGen->getBaseSavePath(); + std::string fileRoot = + "Tutorial\\" + param->levelGen->getBaseSavePath(); #endif File grf(fileRoot); if (grf.exists()) { @@ -402,7 +402,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, Socket::addIncomingSocket(socket); connection->send(std::shared_ptr(new PreLoginPacket( - convStringToWstring(PlatformProfile.GetGamertag(idx))))); + PlatformProfile.GetGamertag(idx)))); createdConnections.push_back(connection); @@ -717,8 +717,8 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void* pParam, Minecraft::GetInstance()->clearConnectionFailed(); // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad())); + Minecraft::GetInstance()->user->name = + PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad()); bool success = g_NetworkManager.JoinGameFromInviteInfo( iPad, // dwUserIndex @@ -1026,13 +1026,13 @@ bool CGameNetworkManager::SystemFlagGet(INetworkPlayer* pNetworkPlayer, return s_pPlatformNetworkManager->SystemFlagGet(pNetworkPlayer, index); } -std::wstring CGameNetworkManager::GatherStats() { +std::string CGameNetworkManager::GatherStats() { return s_pPlatformNetworkManager->GatherStats(); } void CGameNetworkManager::renderQueueMeter() {} -std::wstring CGameNetworkManager::GatherRTTStats() { +std::string CGameNetworkManager::GatherRTTStats() { return s_pPlatformNetworkManager->GatherRTTStats(); } @@ -1379,8 +1379,8 @@ void CGameNetworkManager::HandleInviteWhenInMenus( g_NetworkManager.SetLocalGame(false); // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad())); + Minecraft::GetInstance()->user->name = + PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad()); bool success = g_NetworkManager.JoinGameFromInviteInfo( userIndex, localUsersMask, pInviteInfo); diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h index 834487b71..9389b3f98 100644 --- a/targets/app/common/Network/GameNetworkManager.h +++ b/targets/app/common/Network/GameNetworkManager.h @@ -60,7 +60,7 @@ public: INetworkPlayer* GetPlayerByIndex(int playerIndex); INetworkPlayer* GetPlayerByXuid(PlayerUID xuid); INetworkPlayer* GetPlayerBySmallId(unsigned char smallId); - std::wstring GetDisplayNameByGamertag(std::wstring gamertag); + std::string GetDisplayNameByGamertag(std::string gamertag); INetworkPlayer* GetHostPlayer(); void RegisterPlayerChangedCallback( int iPad, @@ -149,9 +149,9 @@ public: // Debug output - std::wstring GatherStats(); + std::string GatherStats(); void renderQueueMeter(); - std::wstring GatherRTTStats(); + std::string GatherRTTStats(); // GUI debug output diff --git a/targets/app/common/Network/NetworkPlayerInterface.h b/targets/app/common/Network/NetworkPlayerInterface.h index 19163b7d5..219942e68 100644 --- a/targets/app/common/Network/NetworkPlayerInterface.h +++ b/targets/app/common/Network/NetworkPlayerInterface.h @@ -32,8 +32,8 @@ public: virtual int GetUserIndex() = 0; virtual void SetSocket(Socket* pSocket) = 0; virtual Socket* GetSocket() = 0; - virtual const wchar_t* GetOnlineName() = 0; - virtual std::wstring GetDisplayName() = 0; + virtual const char* GetOnlineName() = 0; + virtual std::string GetDisplayName() = 0; virtual unsigned long long GetUID() = 0; virtual void SentChunkPacket() = 0; virtual int GetTimeSinceLastChunkPacket_ms() = 0; diff --git a/targets/app/common/Network/NetworkPlayerQNet.cpp b/targets/app/common/Network/NetworkPlayerQNet.cpp index a086f86fe..be89cbda0 100644 --- a/targets/app/common/Network/NetworkPlayerQNet.cpp +++ b/targets/app/common/Network/NetworkPlayerQNet.cpp @@ -88,11 +88,11 @@ Socket* NetworkPlayerQNet::GetSocket() { return m_pSocket; } PlayerUID NetworkPlayerQNet::GetUID() { return m_qnetPlayer->GetXuid(); } -const wchar_t* NetworkPlayerQNet::GetOnlineName() { +const char* NetworkPlayerQNet::GetOnlineName() { return m_qnetPlayer->GetGamertag(); } -std::wstring NetworkPlayerQNet::GetDisplayName() { +std::string NetworkPlayerQNet::GetDisplayName() { return m_qnetPlayer->GetGamertag(); } diff --git a/targets/app/common/Network/NetworkPlayerQNet.h b/targets/app/common/Network/NetworkPlayerQNet.h index db2cdd720..65d961848 100644 --- a/targets/app/common/Network/NetworkPlayerQNet.h +++ b/targets/app/common/Network/NetworkPlayerQNet.h @@ -39,8 +39,8 @@ public: virtual int GetUserIndex(); virtual void SetSocket(Socket* pSocket); virtual Socket* GetSocket(); - virtual const wchar_t* GetOnlineName(); - virtual std::wstring GetDisplayName(); + virtual const char* GetOnlineName(); + virtual std::string GetDisplayName(); virtual PlayerUID GetUID(); virtual void SentChunkPacket(); virtual int GetTimeSinceLastChunkPacket_ms(); diff --git a/targets/app/common/Network/PlatformNetworkManagerInterface.h b/targets/app/common/Network/PlatformNetworkManagerInterface.h index 83f792714..069747bd1 100644 --- a/targets/app/common/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h @@ -114,8 +114,8 @@ public: virtual void SystemFlagSet(INetworkPlayer* pNetworkPlayer, int index) = 0; virtual bool SystemFlagGet(INetworkPlayer* pNetworkPlayer, int index) = 0; - virtual std::wstring GatherStats() = 0; - virtual std::wstring GatherRTTStats() = 0; + virtual std::string GatherStats() = 0; + virtual std::string GatherRTTStats() = 0; private: virtual void SetSessionTexturePackParentId(int id) = 0; diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp index 1c87f8347..62bd9c69e 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp @@ -78,7 +78,7 @@ void IPlatformNetworkStub::NotifyPlayerJoined(IQNetPlayer* pQNetPlayer) { g_NetworkManager.CreateSocket(networkPlayer, localPlayer); } - app.DebugPrintf("Player 0x%p \"%ls\" joined; %s; voice %i; camera %i.\n", + app.DebugPrintf("Player 0x%p \"%s\" joined; %s; voice %i; camera %i.\n", pQNetPlayer, pQNetPlayer->GetGamertag(), pszDescription, (int)pQNetPlayer->HasVoice(), (int)pQNetPlayer->HasCamera()); @@ -297,7 +297,7 @@ void IPlatformNetworkStub::UpdateAndSetGameSessionData( // ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID(); // // char *temp; - // temp = (char *)wstringtofilename( + // temp = (char *)wstring_to_string( // pNetworkPlayer->GetOnlineName() ); // memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE); // } @@ -430,20 +430,20 @@ bool IPlatformNetworkStub::SystemFlagGet(INetworkPlayer* pNetworkPlayer, return false; } -std::wstring IPlatformNetworkStub::GatherStats() { return L""; } +std::string IPlatformNetworkStub::GatherStats() { return ""; } -std::wstring IPlatformNetworkStub::GatherRTTStats() { - std::wstring stats(L"Rtt: "); +std::string IPlatformNetworkStub::GatherRTTStats() { + std::string stats("Rtt: "); - wchar_t stat[32]; + char stat[32]; for (unsigned int i = 0; i < GetPlayerCount(); ++i) { IQNetPlayer* pQNetPlayer = ((NetworkPlayerQNet*)GetPlayerByIndex(i))->GetQNetPlayer(); if (!pQNetPlayer->IsLocal()) { - memset(stat, 0, 32 * sizeof(wchar_t)); - swprintf(stat, 32, L"%d: %d/", i, pQNetPlayer->GetCurrentRtt()); + memset(stat, 0, 32 * sizeof(char)); + snprintf(stat, 32, "%d: %d/", i, pQNetPlayer->GetCurrentRtt()); stats.append(stat); } } diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h index 572326b58..9f1f15ca5 100644 --- a/targets/app/common/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/Network/PlatformNetworkManagerStub.h @@ -138,8 +138,8 @@ private: float m_lastPlayerEventTimeStart; public: - std::wstring GatherStats(); - std::wstring GatherRTTStats(); + std::string GatherStats(); + std::string GatherRTTStats(); private: std::vector friendsSessions[XUSER_MAX_COUNT]; diff --git a/targets/app/common/Network/QNetStubs.cpp b/targets/app/common/Network/QNetStubs.cpp index 2149d630a..6243e7eb1 100644 --- a/targets/app/common/Network/QNetStubs.cpp +++ b/targets/app/common/Network/QNetStubs.cpp @@ -17,8 +17,8 @@ bool IQNetPlayer::IsHost() { return this == &IQNet::m_player[0]; } bool IQNetPlayer::IsGuest() { return false; } bool IQNetPlayer::IsLocal() { return true; } PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; } -const wchar_t* IQNetPlayer::GetGamertag() { - static const wchar_t* name = L"stub"; +const char* IQNetPlayer::GetGamertag() { + static const char* name = "stub"; return name; } int IQNetPlayer::GetSessionIndex() { return 0; } diff --git a/targets/app/common/Network/SessionInfo.h b/targets/app/common/Network/SessionInfo.h index bf8b7f1a6..51c02e051 100644 --- a/targets/app/common/Network/SessionInfo.h +++ b/targets/app/common/Network/SessionInfo.h @@ -23,7 +23,7 @@ typedef struct _GameSessionData { class FriendSessionInfo { public: SessionID sessionId; - wchar_t* displayLabel; + char* displayLabel; unsigned char displayLabelLength; unsigned char displayLabelViewableStartIndex; GameSessionData data; diff --git a/targets/app/common/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp index 7fc736b95..691e29d2e 100644 --- a/targets/app/common/Network/Socket.cpp +++ b/targets/app/common/Network/Socket.cpp @@ -490,7 +490,7 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags( NON_QNET_SENDDATA_ACK_REQUIRED); if (m_queueIdx == SOCKET_SERVER_END) { - // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n", + // printf( "Sent %u bytes of data from \"%s\" to \"%s\"\n", // buffer.dwDataSize, // hostPlayer->GetGamertag(), // m_socket->networkPlayer->GetGamertag()); @@ -506,7 +506,7 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags( // doWork()\n",queueSize); g_NetworkManager.DoWork(); // } } else { - // printf( "Sent %u bytes of data from \"%ls\" to \"%ls\"\n", + // printf( "Sent %u bytes of data from \"%s\" to \"%s\"\n", // buffer.dwDataSize, // m_socket->networkPlayer->GetGamertag(), // hostPlayer->GetGamertag()); diff --git a/targets/app/common/NetworkController.cpp b/targets/app/common/NetworkController.cpp index 257bef7da..e7ed1acbf 100644 --- a/targets/app/common/NetworkController.cpp +++ b/targets/app/common/NetworkController.cpp @@ -425,7 +425,7 @@ int NetworkController::exitAndJoinFromInviteSaveDialogReturned( Minecraft::GetInstance()->skins->getSelected(); DLCPack* pDLCPack = tPack->getDLCPack(); if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, - L"")) { + "")) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; @@ -484,7 +484,7 @@ int NetworkController::exitAndJoinFromInviteAndSaveReturned( TexturePack* tPack = Minecraft::GetInstance()->skins->getSelected(); DLCPack* pDLCPack = tPack->getDLCPack(); if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, - L"")) { + "")) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; diff --git a/targets/app/common/SkinManager.cpp b/targets/app/common/SkinManager.cpp index e104a5443..c5c2e0282 100644 --- a/targets/app/common/SkinManager.cpp +++ b/targets/app/common/SkinManager.cpp @@ -25,7 +25,7 @@ SkinManager::SkinManager() : m_xuidNotch(INVALID_XUID) { } } -void SkinManager::setPlayerSkin(int iPad, const std::wstring& name, +void SkinManager::setPlayerSkin(int iPad, const std::string& name, GAME_SETTINGS** gameSettingsA) { std::uint32_t skinId = getSkinIdFromPath(name); setPlayerSkin(iPad, skinId, gameSettingsA); @@ -43,7 +43,7 @@ void SkinManager::setPlayerSkin(int iPad, std::uint32_t dwSkinId, dwSkinId); } -std::wstring SkinManager::getPlayerSkinName(int iPad, +std::string SkinManager::getPlayerSkinName(int iPad, GAME_SETTINGS** gameSettingsA) { return getSkinPathFromId(gameSettingsA[iPad]->dwSelectedSkin); } @@ -54,10 +54,10 @@ std::uint32_t SkinManager::getPlayerSkinId(int iPad, DLCPack* Pack = nullptr; DLCSkinFile* skinFile = nullptr; std::uint32_t dwSkin = gameSettingsA[iPad]->dwSelectedSkin; - wchar_t chars[256]; + char chars[256]; if (GET_IS_DLC_SKIN_FROM_BITMASK(dwSkin)) { - swprintf(chars, 256, L"dlcskin%08d.png", + snprintf(chars, 256, "dlcskin%08d.png", GET_DLC_SKIN_ID_FROM_BITMASK(dwSkin)); Pack = dlcManager.getPackContainingSkin(chars); @@ -85,7 +85,7 @@ std::uint32_t SkinManager::getAdditionalModelParts(int iPad) { return m_dwAdditionalModelParts[iPad]; } -void SkinManager::setPlayerCape(int iPad, const std::wstring& name, +void SkinManager::setPlayerCape(int iPad, const std::string& name, GAME_SETTINGS** gameSettingsA) { std::uint32_t capeId = Player::getCapeIdFromPath(name); setPlayerCape(iPad, capeId, gameSettingsA); @@ -103,7 +103,7 @@ void SkinManager::setPlayerCape(int iPad, std::uint32_t dwCapeId, dwCapeId); } -std::wstring SkinManager::getPlayerCapeName(int iPad, +std::string SkinManager::getPlayerCapeName(int iPad, GAME_SETTINGS** gameSettingsA) { return Player::getCapePathFromId(gameSettingsA[iPad]->dwSelectedCape); } @@ -157,10 +157,10 @@ void SkinManager::validateFavoriteSkins(int iPad, unsigned int uiCount = getPlayerFavoriteSkinsCount(iPad, gameSettingsA); unsigned int uiValidSkin = 0; - wchar_t chars[256]; + char chars[256]; for (unsigned int i = 0; i < uiCount; i++) { - swprintf(chars, 256, L"dlcskin%08d.png", + snprintf(chars, 256, "dlcskin%08d.png", getPlayerFavoriteSkin(iPad, i, gameSettingsA)); DLCPack* pDLCPack = dlcManager.getPackContainingSkin(chars); @@ -168,7 +168,7 @@ void SkinManager::validateFavoriteSkins(int iPad, if (pDLCPack != nullptr) { DLCSkinFile* pSkinFile = pDLCPack->getSkinFile(chars); - if (pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Skin, L"") || + if (pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Skin, "") || (pSkinFile && pSkinFile->isFree())) { gameSettingsA[iPad]->uiFavoriteSkinA[uiValidSkin++] = gameSettingsA[iPad]->uiFavoriteSkinA[i]; @@ -194,7 +194,7 @@ bool SkinManager::isXuidDeadmau5(PlayerUID xuid) { return app.isXuidDeadmau5(xuid); } -void SkinManager::addMemoryTextureFile(const std::wstring& wName, +void SkinManager::addMemoryTextureFile(const std::string& wName, std::uint8_t* pbData, unsigned int byteCount) { std::lock_guard lock(csMemFilesLock); @@ -202,7 +202,7 @@ void SkinManager::addMemoryTextureFile(const std::wstring& wName, auto it = m_MEM_Files.find(wName); if (it != m_MEM_Files.end()) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Incrementing the memory texture file count for %ls\n", + printf("Incrementing the memory texture file count for %s\n", wName.c_str()); #endif pData = (*it).second; @@ -226,20 +226,20 @@ void SkinManager::addMemoryTextureFile(const std::wstring& wName, m_MEM_Files[wName] = pData; } -void SkinManager::removeMemoryTextureFile(const std::wstring& wName) { +void SkinManager::removeMemoryTextureFile(const std::string& wName) { std::lock_guard lock(csMemFilesLock); auto it = m_MEM_Files.find(wName); if (it != m_MEM_Files.end()) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Decrementing the memory texture file count for %ls\n", + printf("Decrementing the memory texture file count for %s\n", wName.c_str()); #endif PMEMDATA pData = (*it).second; --pData->ucRefCount; if (pData->ucRefCount <= 0) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Erasing the memory texture file data for %ls\n", + printf("Erasing the memory texture file data for %s\n", wName.c_str()); #endif delete pData; @@ -249,7 +249,7 @@ void SkinManager::removeMemoryTextureFile(const std::wstring& wName) { } bool SkinManager::defaultCapeExists() { - std::wstring wTex = L"Special_Cape.png"; + std::string wTex = "Special_Cape.png"; bool val = false; { @@ -261,7 +261,7 @@ bool SkinManager::defaultCapeExists() { return val; } -bool SkinManager::isFileInMemoryTextures(const std::wstring& wName) { +bool SkinManager::isFileInMemoryTextures(const std::string& wName) { bool val = false; { @@ -273,7 +273,7 @@ bool SkinManager::isFileInMemoryTextures(const std::wstring& wName) { return val; } -void SkinManager::getMemFileDetails(const std::wstring& wName, +void SkinManager::getMemFileDetails(const std::string& wName, std::uint8_t** ppbData, unsigned int* pByteCount) { std::lock_guard lock(csMemFilesLock); @@ -410,17 +410,17 @@ void SkinManager::setAnimOverrideBitmask(std::uint32_t dwSkinID, dwSkinID, uiAnimOverrideBitmask)); } -std::uint32_t SkinManager::getSkinIdFromPath(const std::wstring& skin) { +std::uint32_t SkinManager::getSkinIdFromPath(const std::string& skin) { bool dlcSkin = false; unsigned int skinId = 0; if (skin.size() >= 14) { - dlcSkin = skin.substr(0, 3).compare(L"dlc") == 0; + dlcSkin = skin.substr(0, 3).compare("dlc") == 0; - std::wstring skinValue = skin.substr(7, skin.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); + std::string skinValue = skin.substr(7, skin.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); - std::wstringstream ss; + std::stringstream ss; if (dlcSkin) ss << std::dec << skinValue.c_str(); else @@ -432,19 +432,19 @@ std::uint32_t SkinManager::getSkinIdFromPath(const std::wstring& skin) { return skinId; } -std::wstring SkinManager::getSkinPathFromId(std::uint32_t skinId) { - wchar_t chars[256]; +std::string SkinManager::getSkinPathFromId(std::uint32_t skinId) { + char chars[256]; if (GET_IS_DLC_SKIN_FROM_BITMASK(skinId)) { - swprintf(chars, 256, L"dlcskin%08d.png", + snprintf(chars, 256, "dlcskin%08d.png", GET_DLC_SKIN_ID_FROM_BITMASK(skinId)); } else { std::uint32_t ugcSkinIndex = GET_UGC_SKIN_ID_FROM_BITMASK(skinId); std::uint32_t defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(skinId); if (ugcSkinIndex == 0) { - swprintf(chars, 256, L"defskin%08X.png", defaultSkinIndex); + snprintf(chars, 256, "defskin%08X.png", defaultSkinIndex); } else { - swprintf(chars, 256, L"ugcskin%08X.png", ugcSkinIndex); + snprintf(chars, 256, "ugcskin%08X.png", ugcSkinIndex); } } return chars; diff --git a/targets/app/common/SkinManager.h b/targets/app/common/SkinManager.h index eb92265cf..6336f0d87 100644 --- a/targets/app/common/SkinManager.h +++ b/targets/app/common/SkinManager.h @@ -18,20 +18,20 @@ public: SkinManager(); // Skin get/set (require GameSettingsA pointer from Game) - void setPlayerSkin(int iPad, const std::wstring& name, + void setPlayerSkin(int iPad, const std::string& name, GAME_SETTINGS** gameSettingsA); void setPlayerSkin(int iPad, std::uint32_t dwSkinId, GAME_SETTINGS** gameSettingsA); - std::wstring getPlayerSkinName(int iPad, GAME_SETTINGS** gameSettingsA); + std::string getPlayerSkinName(int iPad, GAME_SETTINGS** gameSettingsA); std::uint32_t getPlayerSkinId(int iPad, GAME_SETTINGS** gameSettingsA, DLCManager& dlcManager); // Cape get/set - void setPlayerCape(int iPad, const std::wstring& name, + void setPlayerCape(int iPad, const std::string& name, GAME_SETTINGS** gameSettingsA); void setPlayerCape(int iPad, std::uint32_t dwCapeId, GAME_SETTINGS** gameSettingsA); - std::wstring getPlayerCapeName(int iPad, GAME_SETTINGS** gameSettingsA); + std::string getPlayerCapeName(int iPad, GAME_SETTINGS** gameSettingsA); std::uint32_t getPlayerCapeId(int iPad, GAME_SETTINGS** gameSettingsA); // Favorite skins @@ -65,8 +65,8 @@ public: unsigned int getAnimOverrideBitmask(std::uint32_t dwSkinID); // Skin path <-> id conversion (static) - static std::uint32_t getSkinIdFromPath(const std::wstring& skin); - static std::wstring getSkinPathFromId(std::uint32_t skinId); + static std::uint32_t getSkinIdFromPath(const std::string& skin); + static std::string getSkinPathFromId(std::uint32_t skinId); // Default cape bool defaultCapeExists(); @@ -76,15 +76,15 @@ public: bool isXuidDeadmau5(PlayerUID xuid); // Memory texture files for player skins - void addMemoryTextureFile(const std::wstring& wName, std::uint8_t* pbData, + void addMemoryTextureFile(const std::string& wName, std::uint8_t* pbData, unsigned int byteCount); - void removeMemoryTextureFile(const std::wstring& wName); - void getMemFileDetails(const std::wstring& wName, std::uint8_t** ppbData, + void removeMemoryTextureFile(const std::string& wName); + void getMemFileDetails(const std::string& wName, std::uint8_t** ppbData, unsigned int* pByteCount); - bool isFileInMemoryTextures(const std::wstring& wName); + bool isFileInMemoryTextures(const std::string& wName); // storing skin files - std::vector vSkinNames; + std::vector vSkinNames; // per-player additional model parts std::uint32_t m_dwAdditionalModelParts[XUSER_MAX_COUNT]; @@ -93,7 +93,7 @@ private: PlayerUID m_xuidNotch; // Memory texture files - std::unordered_map m_MEM_Files; + std::unordered_map m_MEM_Files; std::mutex csMemFilesLock; // Additional model parts/skin boxes per skin id diff --git a/targets/app/common/Tutorial/FullTutorial.cpp b/targets/app/common/Tutorial/FullTutorial.cpp index 079f85dec..b7ef2a036 100644 --- a/targets/app/common/Tutorial/FullTutorial.cpp +++ b/targets/app/common/Tutorial/FullTutorial.cpp @@ -291,7 +291,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"tutorialArea"); + app.getGameRuleDefinitions()->getNamedArea("tutorialArea"); if (area != nullptr) { std::vector* areaConstraints = new std::vector(); @@ -507,7 +507,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"minecartArea"); + app.getGameRuleDefinitions()->getNamedArea("minecartArea"); if (area != nullptr) { addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, @@ -525,7 +525,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"boatArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("boatArea"); if (area != nullptr) { addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, @@ -543,7 +543,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"fishingArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("fishingArea"); if (area != nullptr) { addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, @@ -562,7 +562,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"pistonBridgeArea"); + app.getGameRuleDefinitions()->getNamedArea("pistonBridgeArea"); if (area != nullptr) { addHint( e_Tutorial_State_Gameplay, @@ -581,7 +581,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"pistonArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("pistonArea"); if (area != nullptr) { eTutorial_State redstoneAndPistonStates[] = { e_Tutorial_State_Gameplay}; @@ -636,7 +636,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"portalArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("portalArea"); if (area != nullptr) { eTutorial_State portalStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -681,7 +681,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"creativeArea"); + app.getGameRuleDefinitions()->getNamedArea("creativeArea"); if (area != nullptr) { eTutorial_State creativeStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -719,7 +719,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) new ProcedureCompoundTask(this); AABB* exitArea = - app.getGameRuleDefinitions()->getNamedArea(L"creativeExitArea"); + app.getGameRuleDefinitions()->getNamedArea("creativeExitArea"); if (exitArea != nullptr) { std::vector* creativeExitAreaConstraints = new std::vector(); @@ -757,7 +757,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"brewingArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("brewingArea"); if (area != nullptr) { eTutorial_State brewingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -820,7 +820,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"enchantingArea"); + app.getGameRuleDefinitions()->getNamedArea("enchantingArea"); if (area != nullptr) { eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -870,7 +870,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"anvilArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("anvilArea"); if (area != nullptr) { eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -919,7 +919,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"tradingArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("tradingArea"); if (area != nullptr) { eTutorial_State tradingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -967,7 +967,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"fireworksArea"); + app.getGameRuleDefinitions()->getNamedArea("fireworksArea"); if (area != nullptr) { eTutorial_State fireworkStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1004,7 +1004,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"beaconArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("beaconArea"); if (area != nullptr) { eTutorial_State beaconStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1041,7 +1041,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"hopperArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("hopperArea"); if (area != nullptr) { eTutorial_State hopperStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1091,7 +1091,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"enderchestArea"); + app.getGameRuleDefinitions()->getNamedArea("enderchestArea"); if (area != nullptr) { eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1128,7 +1128,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"farmingArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("farmingArea"); if (area != nullptr) { eTutorial_State farmingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1196,7 +1196,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) */ if (app.getGameRuleDefinitions() != nullptr) { AABB* area = - app.getGameRuleDefinitions()->getNamedArea(L"breedingArea"); + app.getGameRuleDefinitions()->getNamedArea("breedingArea"); if (area != nullptr) { eTutorial_State breedingStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( @@ -1257,7 +1257,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) * */ if (app.getGameRuleDefinitions() != nullptr) { - AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"golemArea"); + AABB* area = app.getGameRuleDefinitions()->getNamedArea("golemArea"); if (area != nullptr) { eTutorial_State golemStates[] = {e_Tutorial_State_Gameplay}; AddGlobalConstraint(new ChangeStateConstraint( diff --git a/targets/app/common/Tutorial/Tasks/CraftTask.cpp b/targets/app/common/Tutorial/Tasks/CraftTask.cpp index 6af9a997d..d4d8a0a49 100644 --- a/targets/app/common/Tutorial/Tasks/CraftTask.cpp +++ b/targets/app/common/Tutorial/Tasks/CraftTask.cpp @@ -55,7 +55,7 @@ CraftTask::~CraftTask() { void CraftTask::onCrafted(std::shared_ptr item) { #ifndef _CONTENT_PACKAGE - wprintf(L"CraftTask::onCrafted - %ls\n", item->toString().c_str()); + printf("CraftTask::onCrafted - %s\n", item->toString().c_str()); #endif bool itemFound = false; for (int i = 0; i < m_numItems; ++i) { diff --git a/targets/app/common/Tutorial/Tutorial.cpp b/targets/app/common/Tutorial/Tutorial.cpp index e477c1ae4..549bd5f6f 100644 --- a/targets/app/common/Tutorial/Tutorial.cpp +++ b/targets/app/common/Tutorial/Tutorial.cpp @@ -2442,27 +2442,27 @@ bool Tutorial::setMessage(PopupMessageDetails* message) { if (!message->m_replaceCurrent) lastMessageTime = time_util::clock::now(); - std::wstring text; + std::string text; if (!message->m_messageString.empty()) { text = message->m_messageString; } else { auto it = messages.find(message->m_messageId); if (it != messages.end() && it->second != nullptr) { TutorialMessage* messageString = it->second; - text = std::wstring(messageString->getMessageForDisplay()); + text = std::string(messageString->getMessageForDisplay()); // 4J Stu - Quick fix for boat tutorial being incorrect if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { - text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}", - L"{*CONTROLLER_ACTION_DISMOUNT*}"); + text = replaceAll(text, "{*CONTROLLER_ACTION_USE*}", + "{*CONTROLLER_ACTION_DISMOUNT*}"); } } else { - text = std::wstring(app.GetString(message->m_messageId)); + text = std::string(app.GetString(message->m_messageId)); // 4J Stu - Quick fix for boat tutorial being incorrect if (message->m_messageId == IDS_TUTORIAL_TASK_BOAT_OVERVIEW) { - text = replaceAll(text, L"{*CONTROLLER_ACTION_USE*}", - L"{*CONTROLLER_ACTION_DISMOUNT*}"); + text = replaceAll(text, "{*CONTROLLER_ACTION_USE*}", + "{*CONTROLLER_ACTION_DISMOUNT*}"); } } } @@ -2477,7 +2477,7 @@ bool Tutorial::setMessage(PopupMessageDetails* message) { } } - std::wstring title; + std::string title; TutorialPopupInfo popupInfo; popupInfo.interactScene = m_UIScene; popupInfo.desc = text.c_str(); @@ -2488,7 +2488,7 @@ bool Tutorial::setMessage(PopupMessageDetails* message) { popupInfo.tutorial = this; if (!message->m_titleString.empty() || message->m_titleId > 0) { if (message->m_titleString.empty()) - title = std::wstring(app.GetString(message->m_titleId)); + title = std::string(app.GetString(message->m_titleId)); else title = message->m_titleString; @@ -2541,7 +2541,7 @@ bool Tutorial::setMessage(TutorialHint* hint, PopupMessageDetails* message) { return messageShown; } -bool Tutorial::setMessage(const std::wstring& messageString, int icon, +bool Tutorial::setMessage(const std::string& messageString, int icon, int auxValue) { PopupMessageDetails* message = new PopupMessageDetails(); message->m_messageString = messageString; diff --git a/targets/app/common/Tutorial/Tutorial.h b/targets/app/common/Tutorial/Tutorial.h index 5070d5ea5..5de42d941 100644 --- a/targets/app/common/Tutorial/Tutorial.h +++ b/targets/app/common/Tutorial/Tutorial.h @@ -47,9 +47,9 @@ public: int m_messageId; int m_promptId; int m_titleId; - std::wstring m_messageString; - std::wstring m_promptString; - std::wstring m_titleString; + std::string m_messageString; + std::string m_promptString; + std::string m_titleString; int m_icon; int m_iAuxVal; bool m_allowFade; @@ -62,9 +62,9 @@ public: m_messageId = -1; m_promptId = -1; m_titleId = -1; - m_messageString = L""; - m_promptString = L""; - m_titleString = L""; + m_messageString = ""; + m_promptString = ""; + m_titleString = ""; m_icon = TUTORIAL_NO_ICON; m_iAuxVal = 0; m_allowFade = true; @@ -161,7 +161,7 @@ public: bool setMessage(PopupMessageDetails* message); bool setMessage(TutorialHint* hint, PopupMessageDetails* message); - bool setMessage(const std::wstring& message, int icon, int auxValue); + bool setMessage(const std::string& message, int icon, int auxValue); void showTutorialPopup(bool show); diff --git a/targets/app/common/Tutorial/TutorialMessage.cpp b/targets/app/common/Tutorial/TutorialMessage.cpp index 7403dac4a..2f3e0f10a 100644 --- a/targets/app/common/Tutorial/TutorialMessage.cpp +++ b/targets/app/common/Tutorial/TutorialMessage.cpp @@ -14,8 +14,8 @@ bool TutorialMessage::canDisplay() { return !limitRepeats || (timesShown < numRepeats); } -const wchar_t* TutorialMessage::getMessageForDisplay() { - if (!canDisplay()) return L""; +const char* TutorialMessage::getMessageForDisplay() { + if (!canDisplay()) return ""; if (limitRepeats) ++timesShown; diff --git a/targets/app/common/Tutorial/TutorialMessage.h b/targets/app/common/Tutorial/TutorialMessage.h index c4327e311..ba00cf5ea 100644 --- a/targets/app/common/Tutorial/TutorialMessage.h +++ b/targets/app/common/Tutorial/TutorialMessage.h @@ -18,5 +18,5 @@ public: unsigned char numRepeats = TUTORIAL_MESSAGE_DEFAULT_SHOW); bool canDisplay(); - const wchar_t* getMessageForDisplay(); + const char* getMessageForDisplay(); }; diff --git a/targets/app/common/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/UI/All Platforms/ArchiveFile.cpp index 932cfe514..445dcd085 100644 --- a/targets/app/common/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/UI/All Platforms/ArchiveFile.cpp @@ -30,7 +30,7 @@ void ArchiveFile::_readHeader(DataInputStream* dis) { meta->isCompressed = false; m_index.insert( - std::pair(meta->filename, meta)); + std::pair(meta->filename, meta)); } } @@ -39,9 +39,7 @@ ArchiveFile::ArchiveFile(File file) { m_sourcefile = file; app.DebugPrintf("Loading archive file...\n"); #if !defined(_CONTENT_PACKAGE) - char buf[256]; - wcstombs(buf, file.getPath().c_str(), 256); - app.DebugPrintf("archive file - %s\n", buf); + app.DebugPrintf("archive file - %s\n", file.getPath().c_str()); #endif if (!file.exists()) { @@ -75,8 +73,8 @@ ArchiveFile::ArchiveFile(File file) { ArchiveFile::~ArchiveFile() { delete m_cachedData; } -std::vector* ArchiveFile::getFileList() { - std::vector* out = new std::vector(); +std::vector* ArchiveFile::getFileList() { + std::vector* out = new std::vector(); for (auto it = m_index.begin(); it != m_index.end(); it++) @@ -85,21 +83,21 @@ std::vector* ArchiveFile::getFileList() { return out; } -bool ArchiveFile::hasFile(const std::wstring& filename) { +bool ArchiveFile::hasFile(const std::string& filename) { return m_index.find(filename) != m_index.end(); } -int ArchiveFile::getFileSize(const std::wstring& filename) { +int ArchiveFile::getFileSize(const std::string& filename) { return hasFile(filename) ? m_index.at(filename)->filesize : -1; } -std::vector ArchiveFile::getFile(const std::wstring& filename) { +std::vector ArchiveFile::getFile(const std::string& filename) { std::vector out; auto it = m_index.find(filename); if (it == m_index.end()) { app.DebugPrintf("Couldn't find file in archive\n"); - app.DebugPrintf("Failed to find file '%ls' in archive\n", + app.DebugPrintf("Failed to find file '%s' in archive\n", filename.c_str()); #if !defined(_CONTENT_PACKAGE) assert(0); diff --git a/targets/app/common/UI/All Platforms/ArchiveFile.h b/targets/app/common/UI/All Platforms/ArchiveFile.h index ea51958b3..7c038eb11 100644 --- a/targets/app/common/UI/All Platforms/ArchiveFile.h +++ b/targets/app/common/UI/All Platforms/ArchiveFile.h @@ -16,14 +16,14 @@ protected: std::uint8_t* m_cachedData; typedef struct _MetaData { - std::wstring filename; + std::string filename; int ptr; int filesize; bool isCompressed; } MetaData, *PMetaData; - std::unordered_map m_index; + std::unordered_map m_index; public: void _readHeader(DataInputStream* dis); @@ -31,8 +31,8 @@ public: ArchiveFile(File file); ~ArchiveFile(); - std::vector* getFileList(); - bool hasFile(const std::wstring& filename); - int getFileSize(const std::wstring& filename); - std::vector getFile(const std::wstring& filename); + std::vector* getFileList(); + bool hasFile(const std::string& filename); + int getFileSize(const std::string& filename); + std::vector getFile(const std::string& filename); }; diff --git a/targets/app/common/UI/All Platforms/IUIController.h b/targets/app/common/UI/All Platforms/IUIController.h index 210788677..9bbd292b8 100644 --- a/targets/app/common/UI/All Platforms/IUIController.h +++ b/targets/app/common/UI/All Platforms/IUIController.h @@ -55,7 +55,7 @@ public: virtual void DisplayGamertag(unsigned int iPad, bool show) = 0; virtual void SetSelectedItem(unsigned int iPad, - const std::wstring& name) = 0; + const std::string& name) = 0; virtual void UpdateSelectedItemPos(unsigned int iPad) = 0; virtual void HandleDLCMountingComplete() = 0; diff --git a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp index 094ad37fa..6a4d6d9c2 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -24,7 +24,7 @@ IUIScene_AnvilMenu::IUIScene_AnvilMenu() { m_inventory = nullptr; m_repairMenu = nullptr; - m_itemName = L""; + m_itemName = ""; } IUIScene_AbstractContainerMenu::ESceneSection @@ -171,7 +171,7 @@ bool IUIScene_AnvilMenu::IsSectionSlotList(ESceneSection eSection) { void IUIScene_AnvilMenu::handleTick() { Minecraft* pMinecraft = Minecraft::GetInstance(); bool canAfford = true; - std::wstring m_costString = L""; + std::string m_costString = ""; if (m_repairMenu->cost > 0) { if (m_repairMenu->cost >= 40 && @@ -181,9 +181,9 @@ void IUIScene_AnvilMenu::handleTick() { } else if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem()) { // Do nothing } else { - const wchar_t* costString = app.GetString(IDS_REPAIR_COST); - wchar_t temp[256]; - swprintf(temp, 256, costString, m_repairMenu->cost); + const char* costString = app.GetString(IDS_REPAIR_COST); + char temp[256]; + snprintf(temp, 256, costString, m_repairMenu->cost); m_costString = temp; if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT) ->mayPickup(std::dynamic_pointer_cast( @@ -206,7 +206,7 @@ void IUIScene_AnvilMenu::updateItemName() { if (slot != nullptr && slot->hasItem()) { if (!slot->getItem()->hasCustomHoverName() && m_itemName.compare(slot->getItem()->getHoverName()) == 0) { - m_itemName = L""; + m_itemName = ""; } } @@ -232,7 +232,7 @@ void IUIScene_AnvilMenu::slotChanged(AbstractContainerMenu* container, int slotIndex, std::shared_ptr item) { if (slotIndex == AnvilMenu::INPUT_SLOT) { - m_itemName = item == nullptr ? L"" : item->getHoverName(); + m_itemName = item == nullptr ? "" : item->getHoverName(); setEditNameValue(m_itemName); setEditNameEditable(item != nullptr); if (item != nullptr) { diff --git a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h index cb63ae2ef..4994363f8 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_AnvilMenu.h @@ -22,7 +22,7 @@ class IUIScene_AnvilMenu protected: std::shared_ptr m_inventory; AnvilMenu* m_repairMenu; - std::wstring m_itemName; + std::string m_itemName; protected: IUIScene_AnvilMenu(); @@ -40,9 +40,9 @@ protected: // Anvil only virtual void handleEditNamePressed() = 0; - virtual void setEditNameValue(const std::wstring& name) = 0; + virtual void setEditNameValue(const std::string& name) = 0; virtual void setEditNameEditable(bool enabled) = 0; - virtual void setCostLabel(const std::wstring& label, bool canAfford) = 0; + virtual void setCostLabel(const std::string& label, bool canAfford) = 0; virtual void showCross(bool show) = 0; void updateItemName(); diff --git a/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h index d2d1ecd14..2c106f76b 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CommandBlockMenu.h @@ -13,8 +13,8 @@ public: protected: void ConfirmButtonClicked(); - virtual std::wstring GetCommand() = 0; - virtual void SetCommand(std::wstring command) = 0; + virtual std::string GetCommand() = 0; + virtual void SetCommand(std::string command) = 0; virtual int GetPad() = 0; private: diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index c415b9e8c..7cafffa2b 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -44,14 +44,14 @@ Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping9GridA Recipy::eGroupType_Decoration, }; -const wchar_t* IUIScene_CraftingMenu::m_GroupIconNameA[m_iMaxGroup3x3] = { - L"Structures", // Recipy::eGroupType_Structure, - L"Tools", // Recipy::eGroupType_Tool, - L"Food", // Recipy::eGroupType_Food, - L"Armour", // Recipy::eGroupType_Armour, - L"Mechanisms", // Recipy::eGroupType_Mechanism, - L"Transport", // Recipy::eGroupType_Transport, - L"Decoration", // Recipy::eGroupType_Decoration, +const char* IUIScene_CraftingMenu::m_GroupIconNameA[m_iMaxGroup3x3] = { + "Structures", // Recipy::eGroupType_Structure, + "Tools", // Recipy::eGroupType_Tool, + "Food", // Recipy::eGroupType_Food, + "Armour", // Recipy::eGroupType_Armour, + "Mechanisms", // Recipy::eGroupType_Mechanism, + "Transport", // Recipy::eGroupType_Transport, + "Decoration", // Recipy::eGroupType_Decoration, }; IUIScene_CraftingMenu::_eGroupTab @@ -120,7 +120,7 @@ IUIScene_CraftingMenu::IUIScene_CraftingMenu() { m_iIngredientsC = 0; } -const wchar_t* IUIScene_CraftingMenu::GetGroupNameText(int iGroupType) { +const char* IUIScene_CraftingMenu::GetGroupNameText(int iGroupType) { switch (iGroupType) { case ShapedRecipy::eGroupType_Tool: return app.GetString(IDS_GROUPNAME_TOOLS); @@ -228,7 +228,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { } // play a sound // pMinecraft->soundEngine->playUI( - // L"random.pop", 1.0f, 1.0f); + // "random.pop", 1.0f, 1.0f); ui.PlayUISFX(eSFX_Craft); } } else if (CanBeMadeA[m_iCurrentSlotHIndex].iCount != 0) { @@ -271,7 +271,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { // play a sound // pMinecraft->soundEngine->playUI( - // L"random.pop", 1.0f, 1.0f); + // "random.pop", 1.0f, 1.0f); ui.PlayUISFX(eSFX_Craft); if (pTempItemInst->id != Item::fireworksCharge_Id && @@ -412,7 +412,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) { } } else { // pMinecraft->soundEngine->playUI( - // L"btn.back", 1.0f, 1.0f); + // "btn.back", 1.0f, 1.0f); ui.PlayUISFX(eSFX_CraftFail); } } @@ -641,7 +641,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable() { { if (m_pPlayer->inventory->items[k] != nullptr) { - std::wstring itemstring=m_pPlayer->inventory->items[k]->toString(); + std::string itemstring=m_pPlayer->inventory->items[k]->toString(); //printf("--- Player has "); OutputDebugStringW(itemstring.c_str()); @@ -665,7 +665,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable() { // pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(nullptr); // if (pTempItemInst != nullptr) // { - // std::wstring + // std::string // itemstring=pTempItemInst->toString(); // // printf("Recipe [%d] = ",i); @@ -875,7 +875,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable() { } else { app.DebugPrintf("Need more H slots - "); #if !defined(_CONTENT_PACKAGE) - fwprintf( + fprintf( stderr, app.GetString(pTempItemInst->getDescriptionId())); #endif @@ -972,7 +972,7 @@ void IUIScene_CraftingMenu::UpdateHighlight() { // special case for the torch coal/charcoal int id = pTempItemInstAdditional->getDescriptionId(); - const wchar_t* itemstring; + const char* itemstring; switch (id) { case IDS_TILE_TORCH: { @@ -1000,7 +1000,7 @@ void IUIScene_CraftingMenu::UpdateHighlight() { setItemText(itemstring); } else { - setItemText(L""); + setItemText(""); } UpdateDescriptionText(bCanBeMade); DisplayIngredients(); @@ -1308,8 +1308,8 @@ void IUIScene_CraftingMenu::UpdateDescriptionText(bool bCanBeMade) { if (iIDSString >= 0) { // this is an html control now, so set the font size and colour - // std::wstring wsText=app.GetString(iIDSString); - std::wstring wsText = + // std::string wsText=app.GetString(iIDSString); + std::string wsText = app.FormatHTMLString(getPad(), app.GetString(iIDSString)); // 12 for splitscreen, 14 for normal @@ -1318,24 +1318,24 @@ void IUIScene_CraftingMenu::UpdateDescriptionText(bool bCanBeMade) { !PlatformRenderer.IsWidescreen())) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"

", + char startTags[64]; + snprintf(startTags, 64, "

", app.GetHTMLColour(eHTMLColor_Black)); - wsText = startTags + wsText + L"

"; + wsText = startTags + wsText + "

"; setDescriptionText(wsText.c_str()); } else { /// Missing string! #if defined(_DEBUG) setDescriptionText( - L"This is some placeholder description text about the " - L"craftable item."); + "This is some placeholder description text about the " + "craftable item."); #else - setDescriptionText(L""); + setDescriptionText(""); #endif } } else { - setDescriptionText(L""); + setDescriptionText(""); } } diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h index a6ee67e14..f0d893e94 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.h @@ -52,12 +52,12 @@ protected: int iVSlotIndexA[3]; // index of the v slots currently displayed - static const wchar_t* m_GroupIconNameA[m_iMaxGroup3x3]; + static const char* m_GroupIconNameA[m_iMaxGroup3x3]; static Recipy::_eGroupType m_GroupTypeMapping4GridA[m_iMaxGroup2x2]; static Recipy::_eGroupType m_GroupTypeMapping9GridA[m_iMaxGroup3x3]; Recipy::_eGroupType* m_pGroupA; - static const wchar_t* m_GroupTabNameA[3]; + static const char* m_GroupTabNameA[3]; static _eGroupTab m_GroupTabBkgMapping2x2A[m_iMaxGroup2x2]; static _eGroupTab m_GroupTabBkgMapping3x3A[m_iMaxGroup3x3]; _eGroupTab* m_pGroupTabA; @@ -76,7 +76,7 @@ public: IUIScene_CraftingMenu(); protected: - const wchar_t* GetGroupNameText(int iGroupType); + const char* GetGroupNameText(int iGroupType); void CheckRecipesAvailable(); void UpdateHighlight(); @@ -111,12 +111,12 @@ protected: int iPad, int index, std::shared_ptr item) = 0; virtual void setIngredientDescriptionRedBox(int index, bool show) = 0; virtual void setIngredientDescriptionText(int index, - const wchar_t* text) = 0; + const char* text) = 0; virtual void setShowCraftHSlot(int iIndex, bool show) = 0; virtual void showTabHighlight(int iIndex, bool show) = 0; - virtual void setGroupText(const wchar_t* text) = 0; - virtual void setDescriptionText(const wchar_t* text) = 0; - virtual void setItemText(const wchar_t* text) = 0; + virtual void setGroupText(const char* text) = 0; + virtual void setDescriptionText(const char* text) = 0; + virtual void setItemText(const char* text) = 0; virtual void scrollDescriptionUp() = 0; virtual void scrollDescriptionDown() = 0; virtual void updateHighlightAndScrollPositions() = 0; diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp index e9de2ec6c..02e81b9b6 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -552,7 +552,7 @@ void IUIScene_CreativeMenu::staticCtor() { std::shared_ptr( new ItemInstance(Item::sword_diamond_Id, 1, 0)); debugSword->enchant(Enchantment::damageBonus, 50); - debugSword->setHoverName(L"Sword of Debug"); + debugSword->setHoverName("Sword of Debug"); list->push_back(debugSword); } #endif @@ -827,7 +827,7 @@ void IUIScene_CreativeMenu::staticCtor() { ECreative_Inventory_Groups blocksGroup[] = { eCreativeInventory_BuildingBlocks}; specs[eCreativeInventoryTab_BuildingBlocks] = new TabSpec( - L"Structures", IDS_GROUPNAME_BUILDING_BLOCKS, 1, blocksGroup); + "Structures", IDS_GROUPNAME_BUILDING_BLOCKS, 1, blocksGroup); #if !defined(_CONTENT_PACKAGE) ECreative_Inventory_Groups decorationsGroup[] = { @@ -835,41 +835,41 @@ void IUIScene_CreativeMenu::staticCtor() { ECreative_Inventory_Groups debugDecorationsGroup[] = { eCreativeInventory_ArtToolsDecorations}; specs[eCreativeInventoryTab_Decorations] = - new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, + new TabSpec("Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup, 0, nullptr, 1, debugDecorationsGroup); #else ECreative_Inventory_Groups decorationsGroup[] = { eCreativeInventory_Decoration}; specs[eCreativeInventoryTab_Decorations] = new TabSpec( - L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup); + "Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup); #endif ECreative_Inventory_Groups redAndTranGroup[] = { eCreativeInventory_Transport, eCreativeInventory_Redstone}; specs[eCreativeInventoryTab_RedstoneAndTransport] = - new TabSpec(L"RedstoneAndTransport", + new TabSpec("RedstoneAndTransport", IDS_GROUPNAME_REDSTONE_AND_TRANSPORT, 2, redAndTranGroup); ECreative_Inventory_Groups materialsGroup[] = { eCreativeInventory_Materials}; specs[eCreativeInventoryTab_Materials] = - new TabSpec(L"Materials", IDS_GROUPNAME_MATERIALS, 1, materialsGroup); + new TabSpec("Materials", IDS_GROUPNAME_MATERIALS, 1, materialsGroup); ECreative_Inventory_Groups foodGroup[] = {eCreativeInventory_Food}; specs[eCreativeInventoryTab_Food] = - new TabSpec(L"Food", IDS_GROUPNAME_FOOD, 1, foodGroup); + new TabSpec("Food", IDS_GROUPNAME_FOOD, 1, foodGroup); // 4jcraft #ifdef ENABLE_JAVA_GUIS ECreative_Inventory_Groups searchGroup[] = {eCreativeInventory_Search}; specs[eCreativeInventoryTab_Search] = - new TabSpec(L"Search Items", IDS_GROUPNAME_SEARCH, 1, searchGroup); + new TabSpec("Search Items", IDS_GROUPNAME_SEARCH, 1, searchGroup); #endif ECreative_Inventory_Groups toolsGroup[] = { eCreativeInventory_ToolsArmourWeapons}; specs[eCreativeInventoryTab_ToolsWeaponsArmor] = - new TabSpec(L"Tools", IDS_GROUPNAME_TOOLS_WEAPONS_ARMOR, 1, toolsGroup); + new TabSpec("Tools", IDS_GROUPNAME_TOOLS_WEAPONS_ARMOR, 1, toolsGroup); ECreative_Inventory_Groups brewingGroup[] = { eCreativeInventory_Brewing, eCreativeInventory_Potions_Level2_Extended, @@ -881,12 +881,12 @@ void IUIScene_CreativeMenu::staticCtor() { // if(!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { specs[eCreativeInventoryTab_Brewing] = - new TabSpec(L"Brewing", IDS_GROUPNAME_POTIONS_480, 5, brewingGroup); + new TabSpec("Brewing", IDS_GROUPNAME_POTIONS_480, 5, brewingGroup); } // else // { // specs[eCreativeInventoryTab_Brewing] = new - // TabSpec(L"icon_brewing.png", IDS_GROUPNAME_POTIONS, 1, brewingGroup, 4, + // TabSpec("icon_brewing.png", IDS_GROUPNAME_POTIONS, 1, brewingGroup, 4, // potionsGroup); // } @@ -895,12 +895,12 @@ void IUIScene_CreativeMenu::staticCtor() { ECreative_Inventory_Groups debugMiscGroup[] = { eCreativeInventory_ArtToolsMisc}; specs[eCreativeInventoryTab_Misc] = - new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, + new TabSpec("Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, nullptr, 1, debugMiscGroup); #else ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc}; specs[eCreativeInventoryTab_Misc] = - new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup); + new TabSpec("Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup); #endif } @@ -956,7 +956,7 @@ void IUIScene_CreativeMenu::ScrollBar(UIVec2D pointerPos) { // 4J JEV - Tab Spec Struct IUIScene_CreativeMenu::TabSpec::TabSpec( - const wchar_t* icon, int descriptionId, int staticGroupsCount, + const char* icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups* staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups* dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups* debugGroups /*= nullptr*/) diff --git a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h index 711177cef..1b40ac0cc 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.h @@ -68,7 +68,7 @@ public: static const int MAX_SIZE = rows * columns; // 4J JEV - Images - const wchar_t* m_icon; + const char* m_icon; const int m_descriptionId; const int m_staticGroupsCount; ECreative_Inventory_Groups* m_staticGroupsA; @@ -84,7 +84,7 @@ public: unsigned int m_debugItems; public: - TabSpec(const wchar_t* icon, int descriptionId, int staticGroupsCount, + TabSpec(const char* icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups* staticGroups, int dynamicGroupsCount = 0, ECreative_Inventory_Groups* dynamicGroups = nullptr, diff --git a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp index a3557158c..dc64e747a 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_HUD.cpp @@ -50,7 +50,7 @@ IUIScene_HUD::IUIScene_HUD() { m_showDragonHealth = false; m_ticksWithNoBoss = 0; m_uiSelectedItemOpacityCountDown = 0; - m_displayName = L""; + m_displayName = ""; m_lastShowDisplayName = true; m_bRidingHorse = true; m_horseHealth = 1; diff --git a/targets/app/common/UI/All Platforms/IUIScene_HUD.h b/targets/app/common/UI/All Platforms/IUIScene_HUD.h index 897bc6028..c45da06fc 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_HUD.h +++ b/targets/app/common/UI/All Platforms/IUIScene_HUD.h @@ -34,7 +34,7 @@ protected: unsigned int m_uiSelectedItemOpacityCountDown; - std::wstring m_displayName; + std::string m_displayName; IUIScene_HUD(); @@ -65,12 +65,12 @@ protected: virtual void SetFoodSaturationLevel(int iSaturation) = 0; virtual void SetDragonHealth(float health) = 0; - virtual void SetDragonLabel(const std::wstring& label) = 0; + virtual void SetDragonLabel(const std::string& label) = 0; virtual void ShowDragonHealth(bool show) = 0; virtual void HideSelectedLabel() = 0; - virtual void SetDisplayName(const std::wstring& displayName) = 0; + virtual void SetDisplayName(const std::string& displayName) = 0; virtual void SetTooltipsEnabled(bool bEnabled) = 0; @@ -81,7 +81,7 @@ protected: virtual void SetHealthAbsorb(int healthAbsorb) = 0; - virtual void SetSelectedLabel(const std::wstring& label) = 0; + virtual void SetSelectedLabel(const std::string& label) = 0; virtual void ShowDisplayName(bool show) = 0; public: diff --git a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp index 2a106b1f8..b6dd3b624 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -66,7 +66,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned( pDLCTexPack ->getDLCInfoParentPack(); // tPack->getDLCPack(); if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, - L"")) { + "")) { unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; @@ -226,7 +226,7 @@ int IUIScene_PauseMenu::SaveWorldThreadProc(void* lpParameter) { Minecraft* pMinecraft = Minecraft::GetInstance(); - // wprintf(L"Loading world on thread\n"); + // printf("Loading world on thread\n"); app.SetGameStarted(false); diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp index 31cebcfc9..a21ddffd7 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -249,13 +249,13 @@ void IUIScene_TradingMenu::updateDisplay() { MerchantRecipe* activeRecipe = m_activeOffers.at(selectedShopItem).first; - std::wstring wsTemp; + std::string wsTemp; // 4J-PB - need to get the villager type here wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM); - wsTemp = replaceAll(wsTemp, L"{*VILLAGER_TYPE*}", + wsTemp = replaceAll(wsTemp, "{*VILLAGER_TYPE*}", m_merchant->getDisplayName()); - int iPos = wsTemp.find(L"%s"); + int iPos = wsTemp.find("%s"); wsTemp.replace(iPos, 2, activeRecipe->getSellItem()->getHoverName()); @@ -276,12 +276,12 @@ void IUIScene_TradingMenu::updateDisplay() { if (buyAItem != nullptr) setRequest1Name(buyAItem->getHoverName()); else - setRequest1Name(L""); + setRequest1Name(""); if (buyBItem != nullptr) setRequest2Name(buyBItem->getHoverName()); else - setRequest2Name(L""); + setRequest2Name(""); bool canMake = true; @@ -313,8 +313,8 @@ void IUIScene_TradingMenu::updateDisplay() { if (canMake) iA = IDS_TOOLTIPS_TRADE; } else { setTitle(m_merchant->getDisplayName()); - setRequest1Name(L""); - setRequest2Name(L""); + setRequest1Name(""); + setRequest2Name(""); setRequest1RedBox(false); setRequest2RedBox(false); setRequest1Item(nullptr); diff --git a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h index 2d5b01a26..a326e5aa7 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h +++ b/targets/app/common/UI/All Platforms/IUIScene_TradingMenu.h @@ -44,9 +44,9 @@ protected: virtual void showScrollRightArrow(bool show) = 0; virtual void showScrollLeftArrow(bool show) = 0; virtual void moveSelector(bool right) = 0; - virtual void setRequest1Name(const std::wstring& name) = 0; - virtual void setRequest2Name(const std::wstring& name) = 0; - virtual void setTitle(const std::wstring& name) = 0; + virtual void setRequest1Name(const std::string& name) = 0; + virtual void setRequest2Name(const std::string& name) = 0; + virtual void setTitle(const std::string& name) = 0; virtual void setRequest1RedBox(bool show) = 0; virtual void setRequest2RedBox(bool show) = 0; diff --git a/targets/app/common/UI/All Platforms/UIStructs.h b/targets/app/common/UI/All Platforms/UIStructs.h index 1e5cf5b7b..32a1f1950 100644 --- a/targets/app/common/UI/All Platforms/UIStructs.h +++ b/targets/app/common/UI/All Platforms/UIStructs.h @@ -81,7 +81,7 @@ typedef struct _EnchantingScreenInput { int z; int iPad; bool bSplitscreen; - std::wstring name; + std::string name; } EnchantingScreenInput; // Furnace @@ -276,7 +276,7 @@ typedef struct _LaunchMoreOptionsMenuInitData { uint32_t dwTexturePack; - std::wstring seed; + std::string seed; int worldSize; bool bDisableSaving; @@ -312,7 +312,7 @@ typedef struct _LaunchMoreOptionsMenuInitData { dwTexturePack = 0; worldSize = 3; - seed = L""; + seed = ""; bDisableSaving = false; currentWorldSize = e_worldSize_Unknown; @@ -352,8 +352,8 @@ class UIScene; class Tutorial; typedef struct _TutorialPopupInfo { UIScene* interactScene; - const wchar_t* desc; - const wchar_t* title; + const char* desc; + const char* title; int icon; int iAuxVal /* = 0 */; bool isFoil /* = false */; @@ -363,8 +363,8 @@ typedef struct _TutorialPopupInfo { _TutorialPopupInfo() { interactScene = nullptr; - desc = L""; - title = L""; + desc = ""; + title = ""; icon = -1; iAuxVal = 0; isFoil = false; @@ -383,7 +383,7 @@ typedef struct _SignInInfo { // Credits struct SCreditTextItemDef { - const wchar_t* m_Text; // Should contain string, optionally with %s to add + const char* m_Text; // Should contain string, optionally with %s to add // in translated string ... e.g. "Andy West - %s" int m_iStringID[2]; // May be NO_TRANSLATED_STRING if we do not require to // add any translated string. @@ -401,7 +401,7 @@ typedef struct _MessageBoxInfo { void* lpParam; // C4JStringTable *pStringTable; // 4J Stu - We don't need this for our // internal message boxes - wchar_t* pwchFormatString; + char* pwchFormatString; unsigned int dwFocusButton; } MessageBoxInfo; diff --git a/targets/app/common/UI/Components/UIComponent_Chat.cpp b/targets/app/common/UI/Components/UIComponent_Chat.cpp index 284ff6328..b72ea71e7 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/UI/Components/UIComponent_Chat.cpp @@ -23,14 +23,14 @@ UIComponent_Chat::UIComponent_Chat(int iPad, void* initData, initialiseMovie(); for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { - m_labelChatText[i].init(L""); + m_labelChatText[i].init(""); } - m_labelJukebox.init(L""); + m_labelJukebox.init(""); addTimer(0, 100); } -std::wstring UIComponent_Chat::getMoviePath() { +std::string UIComponent_Chat::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -41,12 +41,12 @@ std::wstring UIComponent_Chat::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: m_bSplitscreen = true; - return L"ComponentChatSplit"; + return "ComponentChatSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: m_bSplitscreen = false; - return L"ComponentChat"; + return "ComponentChat"; break; } } @@ -70,7 +70,7 @@ void UIComponent_Chat::handleTimerComplete(int id) { } else { m_controlLabelBackground[i].setOpacity(0); m_labelChatText[i].setOpacity(0); - m_labelChatText[i].setLabel(L""); + m_labelChatText[i].setLabel(""); } } if (pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true; @@ -80,7 +80,7 @@ void UIComponent_Chat::handleTimerComplete(int id) { for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { m_controlLabelBackground[i].setOpacity(0); m_labelChatText[i].setOpacity(0); - m_labelChatText[i].setLabel(L""); + m_labelChatText[i].setLabel(""); } m_labelJukebox.setOpacity(0); } diff --git a/targets/app/common/UI/Components/UIComponent_Chat.h b/targets/app/common/UI/Components/UIComponent_Chat.h index 9e7173c64..9e72a38b0 100644 --- a/targets/app/common/UI/Components/UIComponent_Chat.h +++ b/targets/app/common/UI/Components/UIComponent_Chat.h @@ -52,7 +52,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_Chat; } diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp index f3f7eecc2..703662818 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.cpp @@ -14,8 +14,8 @@ UIComponent_DebugUIConsole::UIComponent_DebugUIConsole(int iPad, void* initData, m_bTextChanged = false; } -std::wstring UIComponent_DebugUIConsole::getMoviePath() { - return L"DebugUIConsoleComponent"; +std::string UIComponent_DebugUIConsole::getMoviePath() { + return "DebugUIConsoleComponent"; } void UIComponent_DebugUIConsole::tick() { diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h index 4cf695149..075c86ce3 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIConsole.h @@ -36,7 +36,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_DebugUIConsole; } diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index e77fadb7b..21d50ba9e 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -27,6 +27,6 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide( m_funcSetPlatform, 1, value); } -std::wstring UIComponent_DebugUIMarketingGuide::getMoviePath() { - return L"DebugUIMarketingGuide"; +std::string UIComponent_DebugUIMarketingGuide::getMoviePath() { + return "DebugUIMarketingGuide"; } diff --git a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h index 55712fe17..cf45d8a71 100644 --- a/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -17,7 +17,7 @@ private: IggyName m_funcSetPlatform; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcSetPlatform, L"SetPlatform") + UI_MAP_NAME(m_funcSetPlatform, "SetPlatform") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -26,7 +26,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { diff --git a/targets/app/common/UI/Components/UIComponent_Logo.cpp b/targets/app/common/UI/Components/UIComponent_Logo.cpp index 2a2c89357..57d5165e4 100644 --- a/targets/app/common/UI/Components/UIComponent_Logo.cpp +++ b/targets/app/common/UI/Components/UIComponent_Logo.cpp @@ -11,7 +11,7 @@ UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, initialiseMovie(); } -std::wstring UIComponent_Logo::getMoviePath() { +std::string UIComponent_Logo::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -21,11 +21,11 @@ std::wstring UIComponent_Logo::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: - return L"ComponentLogoSplit"; + return "ComponentLogoSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: - return L"ComponentLogo"; + return "ComponentLogo"; break; } } \ No newline at end of file diff --git a/targets/app/common/UI/Components/UIComponent_Logo.h b/targets/app/common/UI/Components/UIComponent_Logo.h index 0a7b4a674..2f2803556 100644 --- a/targets/app/common/UI/Components/UIComponent_Logo.h +++ b/targets/app/common/UI/Components/UIComponent_Logo.h @@ -13,7 +13,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_Logo; } diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp index 2fb371239..7ad96e0f3 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.cpp @@ -18,7 +18,7 @@ UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData, initialiseMovie(); } -std::wstring UIComponent_MenuBackground::getMoviePath() { +std::string UIComponent_MenuBackground::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -38,7 +38,7 @@ std::wstring UIComponent_MenuBackground::getMoviePath() { // We use the fullscreen one even in splitscreen, just draw different parts // of it - return L"MenuBackground"; + return "MenuBackground"; } void UIComponent_MenuBackground::render(S32 width, S32 height, diff --git a/targets/app/common/UI/Components/UIComponent_MenuBackground.h b/targets/app/common/UI/Components/UIComponent_MenuBackground.h index 4baa123ca..5daaff3a6 100644 --- a/targets/app/common/UI/Components/UIComponent_MenuBackground.h +++ b/targets/app/common/UI/Components/UIComponent_MenuBackground.h @@ -18,7 +18,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_MenuBackground; } diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/UI/Components/UIComponent_Panorama.cpp index 6c964b4ef..154e5c15f 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/UI/Components/UIComponent_Panorama.cpp @@ -29,7 +29,7 @@ UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData, while (!m_hasTickedOnce) tick(); } -std::wstring UIComponent_Panorama::getMoviePath() { +std::string UIComponent_Panorama::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -40,12 +40,12 @@ std::wstring UIComponent_Panorama::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: m_bSplitscreen = true; - return L"PanoramaSplit"; + return "PanoramaSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: m_bSplitscreen = false; - return L"Panorama"; + return "Panorama"; break; } } diff --git a/targets/app/common/UI/Components/UIComponent_Panorama.h b/targets/app/common/UI/Components/UIComponent_Panorama.h index 13d4a5e33..fafc1c914 100644 --- a/targets/app/common/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/UI/Components/UIComponent_Panorama.h @@ -21,7 +21,7 @@ private: protected: IggyName m_funcShowPanoramaDay; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcShowPanoramaDay, L"ShowPanoramaDay"); + UI_MAP_NAME(m_funcShowPanoramaDay, "ShowPanoramaDay"); UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -29,7 +29,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_Panorama; } diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp index 6460c46dc..4eb7ec5c2 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.cpp @@ -21,10 +21,10 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { m_showingPressStart[i] = false; } - m_trialTimer = L""; - m_autosaveTimer = L""; + m_trialTimer = ""; + m_autosaveTimer = ""; - m_labelTrialTimer.init(L""); + m_labelTrialTimer.init(""); m_labelTrialTimer.setVisible(false); // 4J-JEV: This object is persistent, so this string needs to be able to @@ -36,8 +36,8 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, m_playerDisplayName.setVisible(false); } -std::wstring UIComponent_PressStartToPlay::getMoviePath() { - return L"PressStartToPlay"; +std::string UIComponent_PressStartToPlay::getMoviePath() { + return "PressStartToPlay"; } void UIComponent_PressStartToPlay::handleReload() { @@ -98,7 +98,7 @@ void UIComponent_PressStartToPlay::showPressStart(int iPad, bool show) { } } -void UIComponent_PressStartToPlay::setTrialTimer(const std::wstring& label) { +void UIComponent_PressStartToPlay::setTrialTimer(const std::string& label) { m_trialTimer = label; if (!ui.IsExpectingOrReloadingSkin() && hasMovie()) { m_labelTrialTimer.setLabel(label); @@ -112,7 +112,7 @@ void UIComponent_PressStartToPlay::showTrialTimer(bool show) { } } -void UIComponent_PressStartToPlay::setAutosaveTimer(const std::wstring& label) { +void UIComponent_PressStartToPlay::setAutosaveTimer(const std::string& label) { m_autosaveTimer = label; if (!ui.IsExpectingOrReloadingSkin() && hasMovie()) { m_labelTrialTimer.setLabel(label); diff --git a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h index 14d434132..d59340d6c 100644 --- a/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/UI/Components/UIComponent_PressStartToPlay.h @@ -20,8 +20,8 @@ private: bool m_showingAutosaveTimer; bool m_showingTrialTimer; bool m_showingPressStart[XUSER_MAX_COUNT]; - std::wstring m_trialTimer; - std::wstring m_autosaveTimer; + std::string m_trialTimer; + std::string m_autosaveTimer; protected: UIControl_Label m_labelTrialTimer, m_labelPressStart, m_playerDisplayName; @@ -36,7 +36,7 @@ protected: UI_MAP_ELEMENT(m_labelPressStart, "PressStartLabel") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcShowController, L"ShowController"); + UI_MAP_NAME(m_funcShowController, "ShowController"); UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -45,7 +45,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_PressStartToPlay; } @@ -64,9 +64,9 @@ public: virtual void handleTimerComplete(int id); void showPressStart(int iPad, bool show); - void setTrialTimer(const std::wstring& label); + void setTrialTimer(const std::string& label); void showTrialTimer(bool show); - void setAutosaveTimer(const std::wstring& label); + void setAutosaveTimer(const std::string& label); void showAutosaveTimer(bool show); void showSaveIcon(bool show); void showPlayerDisplayName(bool show); diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp index 4a0bfe67b..44c7c6f51 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.cpp @@ -28,7 +28,7 @@ UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, initialiseMovie(); } -std::wstring UIComponent_Tooltips::getMoviePath() { +std::string UIComponent_Tooltips::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -39,12 +39,12 @@ std::wstring UIComponent_Tooltips::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: m_bSplitscreen = true; - return L"ToolTipsSplit"; + return "ToolTipsSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: m_bSplitscreen = false; - return L"ToolTips"; + return "ToolTips"; break; } } @@ -245,7 +245,7 @@ void UIComponent_Tooltips::SetEnableTooltips(bool bVal) {} void UIComponent_Tooltips::ShowTooltip(unsigned int tooltip, bool show) { if (show != m_tooltipValues[tooltip].show) { - _SetTooltip(tooltip, L"", show); + _SetTooltip(tooltip, "", show); _Relayout(); } } @@ -280,9 +280,9 @@ bool UIComponent_Tooltips::_SetTooltip(unsigned int iToolTip, int iTextID) { if (iTextID > -1) _SetTooltip(iToolTip, iTextID, true); else if (iTextID == -2) - _SetTooltip(iToolTip, L"", true); + _SetTooltip(iToolTip, "", true); else - _SetTooltip(iToolTip, L"", false); + _SetTooltip(iToolTip, "", false); } return changed; } @@ -300,14 +300,12 @@ void UIComponent_Tooltips::_SetTooltip(unsigned int iToolTipId, UIString label, value[0].type = IGGY_DATATYPE_number; value[0].number = iToolTipId; - const std::u16string convLabel = wstring_to_u16string(label.getString()); + value[1].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - value[1].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; - - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[1].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[1].string8 = stringVal; value[2].type = IGGY_DATATYPE_boolean; value[2].boolval = show; diff --git a/targets/app/common/UI/Components/UIComponent_Tooltips.h b/targets/app/common/UI/Components/UIComponent_Tooltips.h index 943c81f82..b0bc2ea15 100644 --- a/targets/app/common/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/UI/Components/UIComponent_Tooltips.h @@ -40,13 +40,13 @@ protected: m_funcUpdateLayout; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcSetTooltip, L"SetToolTip") - UI_MAP_NAME(m_funcSetOpacity, L"SetOpacity") - UI_MAP_NAME(m_funcSetABSwap, L"SetABSwap") - UI_MAP_NAME(m_funcUpdateLayout, L"UpdateLayout") + UI_MAP_NAME(m_funcSetTooltip, "SetToolTip") + UI_MAP_NAME(m_funcSetOpacity, "SetOpacity") + UI_MAP_NAME(m_funcSetABSwap, "SetABSwap") + UI_MAP_NAME(m_funcUpdateLayout, "UpdateLayout") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual F64 getSafeZoneHalfWidth(); diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp index 055133911..a20cc72a3 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp @@ -38,13 +38,13 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData, m_bSplitscreenGamertagVisible = false; m_iconType = e_ICON_TYPE_IGGY; - m_labelDescription.init(L""); + m_labelDescription.init(""); // 4jcraft added m_tutorial = nullptr; } -std::wstring UIComponent_TutorialPopup::getMoviePath() { +std::string UIComponent_TutorialPopup::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -54,11 +54,11 @@ std::wstring UIComponent_TutorialPopup::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: - return L"TutorialPopupSplit"; + return "TutorialPopupSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: - return L"TutorialPopup"; + return "TutorialPopup"; break; } } @@ -102,13 +102,13 @@ void UIComponent_TutorialPopup::SetTutorialDescription( // 4jcraft added m_tutorial = info->tutorial; - std::wstring parsed = + std::string parsed = _SetIcon(info->icon, info->iAuxVal, info->isFoil, info->desc); parsed = _SetImage(parsed); parsed = ParseDescription(m_iPad, parsed); if (parsed.empty()) { - _SetDescription(info->interactScene, L"", L"", info->allowFade, + _SetDescription(info->interactScene, "", "", info->allowFade, info->isReminder); } else { _SetDescription(info->interactScene, parsed, info->title, @@ -159,8 +159,8 @@ void UIComponent_TutorialPopup::handleTimerComplete(int id) { } void UIComponent_TutorialPopup::_SetDescription(UIScene* interactScene, - const std::wstring& desc, - const std::wstring& title, + const std::string& desc, + const std::string& title, bool allowFade, bool isReminder) { m_interactScene = interactScene; @@ -195,30 +195,30 @@ void UIComponent_TutorialPopup::_SetDescription(UIScene* interactScene, m_bAllowFade = allowFade; if (isReminder) { - std::wstring text(app.GetString(IDS_TUTORIAL_REMINDER)); + std::string text(app.GetString(IDS_TUTORIAL_REMINDER)); text.append(desc); stripWhitespaceForHtml(text); // set the text colour - wchar_t formatting[40]; + char formatting[40]; // 4J Stu - Don't set HTML font size, that's set at design time in // flash - // swprintf(formatting, 40, L"",app.GetHTMLColour(eHTMLColor_White),m_textFontSize); - swprintf(formatting, 40, L"", + snprintf(formatting, 40, "", app.GetHTMLColour(eHTMLColor_White)); text = formatting + text; m_labelDescription.setLabel(text, true); } else { - std::wstring text(desc); + std::string text(desc); stripWhitespaceForHtml(text); // set the text colour - wchar_t formatting[40]; + char formatting[40]; // 4J Stu - Don't set HTML font size, that's set at design time in // flash - // swprintf(formatting, 40, L"",app.GetHTMLColour(eHTMLColor_White),m_textFontSize); - swprintf(formatting, 40, L"", + snprintf(formatting, 40, "", app.GetHTMLColour(eHTMLColor_White)); text = formatting + text; @@ -247,10 +247,10 @@ void UIComponent_TutorialPopup::_SetDescription(UIScene* interactScene, } } -std::wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, +std::string UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, - const wchar_t* desc) { - std::wstring temp(desc); + const char* desc) { + std::string temp(desc); bool isFixedIcon = false; @@ -261,18 +261,18 @@ std::wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, std::shared_ptr(new ItemInstance(icon, 1, iAuxVal)); } else { m_iconItem = nullptr; - std::wstring openTag(L"{*ICON*}"); - std::wstring closeTag(L"{*/ICON*}"); + std::string openTag("{*ICON*}"); + std::string closeTag("{*/ICON*}"); int iconTagStartPos = (int)temp.find(openTag); int iconStartPos = iconTagStartPos + (int)openTag.length(); if (iconTagStartPos > 0 && iconStartPos < (int)temp.length()) { int iconEndPos = (int)temp.find(closeTag, iconStartPos); if (iconEndPos > iconStartPos && iconEndPos < (int)temp.length()) { - std::wstring id = + std::string id = temp.substr(iconStartPos, iconEndPos - iconStartPos); - std::vector idAndAux = stringSplit(id, L':'); + std::vector idAndAux = stringSplit(id, ':'); int iconId = fromWString(idAndAux[0]); @@ -286,63 +286,63 @@ std::wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, temp.replace(iconTagStartPos, iconEndPos - iconTagStartPos + closeTag.length(), - L""); + ""); } } // remove any icon text - else if (temp.find(L"{*CraftingTableIcon*}") != std::wstring::npos) { + else if (temp.find("{*CraftingTableIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::workBench_Id, 1, 0)); - } else if (temp.find(L"{*SticksIcon*}") != std::wstring::npos) { + } else if (temp.find("{*SticksIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::stick_Id, 1, 0)); - } else if (temp.find(L"{*PlanksIcon*}") != std::wstring::npos) { + } else if (temp.find("{*PlanksIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenShovelIcon*}") != std::wstring::npos) { + } else if (temp.find("{*WoodenShovelIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::shovel_wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenHatchetIcon*}") != std::wstring::npos) { + } else if (temp.find("{*WoodenHatchetIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::hatchet_wood_Id, 1, 0)); - } else if (temp.find(L"{*WoodenPickaxeIcon*}") != std::wstring::npos) { + } else if (temp.find("{*WoodenPickaxeIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::pickAxe_wood_Id, 1, 0)); - } else if (temp.find(L"{*FurnaceIcon*}") != std::wstring::npos) { + } else if (temp.find("{*FurnaceIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::furnace_Id, 1, 0)); - } else if (temp.find(L"{*WoodenDoorIcon*}") != std::wstring::npos) { + } else if (temp.find("{*WoodenDoorIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::door_wood, 1, 0)); - } else if (temp.find(L"{*TorchIcon*}") != std::wstring::npos) { + } else if (temp.find("{*TorchIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::torch_Id, 1, 0)); - } else if (temp.find(L"{*BoatIcon*}") != std::wstring::npos) { + } else if (temp.find("{*BoatIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::boat_Id, 1, 0)); - } else if (temp.find(L"{*FishingRodIcon*}") != std::wstring::npos) { + } else if (temp.find("{*FishingRodIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::fishingRod_Id, 1, 0)); - } else if (temp.find(L"{*FishIcon*}") != std::wstring::npos) { + } else if (temp.find("{*FishIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::fish_raw_Id, 1, 0)); - } else if (temp.find(L"{*MinecartIcon*}") != std::wstring::npos) { + } else if (temp.find("{*MinecartIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Item::minecart_Id, 1, 0)); - } else if (temp.find(L"{*RailIcon*}") != std::wstring::npos) { + } else if (temp.find("{*RailIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::rail_Id, 1, 0)); - } else if (temp.find(L"{*PoweredRailIcon*}") != std::wstring::npos) { + } else if (temp.find("{*PoweredRailIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::goldenRail_Id, 1, 0)); - } else if (temp.find(L"{*StructuresIcon*}") != std::wstring::npos) { + } else if (temp.find("{*StructuresIcon*}") != std::string::npos) { isFixedIcon = true; setupIconHolder(e_ICON_TYPE_STRUCTURES); - } else if (temp.find(L"{*ToolsIcon*}") != std::wstring::npos) { + } else if (temp.find("{*ToolsIcon*}") != std::string::npos) { isFixedIcon = true; setupIconHolder(e_ICON_TYPE_TOOLS); - } else if (temp.find(L"{*StoneIcon*}") != std::wstring::npos) { + } else if (temp.find("{*StoneIcon*}") != std::string::npos) { m_iconItem = std::shared_ptr( new ItemInstance(Tile::stone_Id, 1, 0)); } else { @@ -356,36 +356,36 @@ std::wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, return temp; } -std::wstring UIComponent_TutorialPopup::_SetImage(std::wstring& desc) { +std::string UIComponent_TutorialPopup::_SetImage(std::string& desc) { // 4J Stu - Unused return desc; } -std::wstring UIComponent_TutorialPopup::ParseDescription(int iPad, - std::wstring& text) { - text = replaceAll(text, L"{*CraftingTableIcon*}", L""); - text = replaceAll(text, L"{*SticksIcon*}", L""); - text = replaceAll(text, L"{*PlanksIcon*}", L""); - text = replaceAll(text, L"{*WoodenShovelIcon*}", L""); - text = replaceAll(text, L"{*WoodenHatchetIcon*}", L""); - text = replaceAll(text, L"{*WoodenPickaxeIcon*}", L""); - text = replaceAll(text, L"{*FurnaceIcon*}", L""); - text = replaceAll(text, L"{*WoodenDoorIcon*}", L""); - text = replaceAll(text, L"{*TorchIcon*}", L""); - text = replaceAll(text, L"{*MinecartIcon*}", L""); - text = replaceAll(text, L"{*BoatIcon*}", L""); - text = replaceAll(text, L"{*FishingRodIcon*}", L""); - text = replaceAll(text, L"{*FishIcon*}", L""); - text = replaceAll(text, L"{*RailIcon*}", L""); - text = replaceAll(text, L"{*PoweredRailIcon*}", L""); - text = replaceAll(text, L"{*StructuresIcon*}", L""); - text = replaceAll(text, L"{*ToolsIcon*}", L""); - text = replaceAll(text, L"{*StoneIcon*}", L""); +std::string UIComponent_TutorialPopup::ParseDescription(int iPad, + std::string& text) { + text = replaceAll(text, "{*CraftingTableIcon*}", ""); + text = replaceAll(text, "{*SticksIcon*}", ""); + text = replaceAll(text, "{*PlanksIcon*}", ""); + text = replaceAll(text, "{*WoodenShovelIcon*}", ""); + text = replaceAll(text, "{*WoodenHatchetIcon*}", ""); + text = replaceAll(text, "{*WoodenPickaxeIcon*}", ""); + text = replaceAll(text, "{*FurnaceIcon*}", ""); + text = replaceAll(text, "{*WoodenDoorIcon*}", ""); + text = replaceAll(text, "{*TorchIcon*}", ""); + text = replaceAll(text, "{*MinecartIcon*}", ""); + text = replaceAll(text, "{*BoatIcon*}", ""); + text = replaceAll(text, "{*FishingRodIcon*}", ""); + text = replaceAll(text, "{*FishIcon*}", ""); + text = replaceAll(text, "{*RailIcon*}", ""); + text = replaceAll(text, "{*PoweredRailIcon*}", ""); + text = replaceAll(text, "{*StructuresIcon*}", ""); + text = replaceAll(text, "{*ToolsIcon*}", ""); + text = replaceAll(text, "{*StoneIcon*}", ""); bool exitScreenshot = false; - size_t pos = text.find(L"{*EXIT_PICTURE*}"); - if (pos != std::wstring::npos) exitScreenshot = true; - text = replaceAll(text, L"{*EXIT_PICTURE*}", L""); + size_t pos = text.find("{*EXIT_PICTURE*}"); + if (pos != std::string::npos) exitScreenshot = true; + text = replaceAll(text, "{*EXIT_PICTURE*}", ""); m_controlExitScreenshot.setVisible(exitScreenshot); /* #define MINECRAFT_ACTION_RENDER_DEBUG ACTION_INGAME_13 diff --git a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h index 42411e7d7..eecb81729 100644 --- a/targets/app/common/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/UI/Components/UIComponent_TutorialPopup.h @@ -70,11 +70,11 @@ protected: UI_MAP_ELEMENT(m_controlIconHolder, "IconHolder") UI_MAP_ELEMENT(m_controlExitScreenshot, "ExitScreenShot") - UI_MAP_NAME(m_funcAdjustLayout, L"AdjustLayout") - UI_MAP_NAME(m_funcSetupIconHolder, L"SetupIconHolder") + UI_MAP_NAME(m_funcAdjustLayout, "AdjustLayout") + UI_MAP_NAME(m_funcSetupIconHolder, "SetupIconHolder") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIComponent_TutorialPopup; } @@ -112,13 +112,13 @@ protected: void handleTimerComplete(int id); private: - void _SetDescription(UIScene* interactScene, const std::wstring& desc, - const std::wstring& title, bool allowFade, + void _SetDescription(UIScene* interactScene, const std::string& desc, + const std::string& title, bool allowFade, bool isReminder); - std::wstring _SetIcon(int icon, int iAuxVal, bool isFoil, - const wchar_t* desc); - std::wstring _SetImage(std::wstring& desc); - std::wstring ParseDescription(int iPad, std::wstring& text); + std::string _SetIcon(int icon, int iAuxVal, bool isFoil, + const char* desc); + std::string _SetImage(std::string& desc); + std::string ParseDescription(int iPad, std::string& text); void UpdateInteractScenePosition(bool visible); void setupIconHolder(EIcons icon); diff --git a/targets/app/common/UI/Components/UIScene_HUD.cpp b/targets/app/common/UI/Components/UIScene_HUD.cpp index fade0599f..9a3bd4044 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/UI/Components/UIScene_HUD.cpp @@ -32,17 +32,17 @@ UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer) initialiseMovie(); SetDragonLabel(app.GetString(IDS_BOSS_ENDERDRAGON_HEALTH)); - SetSelectedLabel(L""); + SetSelectedLabel(""); for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { - m_labelChatText[i].init(L""); + m_labelChatText[i].init(""); } - m_labelJukebox.init(L""); + m_labelJukebox.init(""); addTimer(0, 100); } -std::wstring UIScene_HUD::getMoviePath() { +std::string UIScene_HUD::getMoviePath() { switch (m_parentLayer->getViewport()) { case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP: case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM: @@ -53,12 +53,12 @@ std::wstring UIScene_HUD::getMoviePath() { case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT: case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT: m_bSplitscreen = true; - return L"HUDSplit"; + return "HUDSplit"; break; case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN: default: m_bSplitscreen = false; - return L"HUD"; + return "HUD"; break; } } @@ -225,7 +225,7 @@ void UIScene_HUD::handleReload() { m_showDragonHealth = false; m_ticksWithNoBoss = 0; m_uiSelectedItemOpacityCountDown = 0; - m_displayName = L""; + m_displayName = ""; m_lastShowDisplayName = true; m_bRidingHorse = true; m_horseHealth = 1; @@ -239,12 +239,12 @@ void UIScene_HUD::handleReload() { m_labelDisplayName.setVisible(m_lastShowDisplayName); SetDragonLabel(BossMobGuiInfo::name); - SetSelectedLabel(L""); + SetSelectedLabel(""); for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { - m_labelChatText[i].init(L""); + m_labelChatText[i].init(""); } - m_labelJukebox.init(L""); + m_labelJukebox.init(""); int iGuiScale; Minecraft* pMinecraft = Minecraft::GetInstance(); @@ -539,15 +539,14 @@ void UIScene_HUD::SetDragonHealth(float health) { } } -void UIScene_HUD::SetDragonLabel(const std::wstring& label) { +void UIScene_HUD::SetDragonLabel(const std::string& label) { IggyDataValue result; IggyDataValue value[1]; - const std::u16string convLabel = wstring_to_u16string(label); - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetDragonLabel, 1, value); @@ -568,7 +567,7 @@ void UIScene_HUD::ShowDragonHealth(bool show) { } } -void UIScene_HUD::SetSelectedLabel(const std::wstring& label) { +void UIScene_HUD::SetSelectedLabel(const std::string& label) { // 4J Stu - Timing here is kept the same as on Xbox360, even though we do it // differently now and do the fade out in Flash rather than directly setting // opacity @@ -578,12 +577,11 @@ void UIScene_HUD::SetSelectedLabel(const std::wstring& label) { IggyDataValue result; IggyDataValue value[1]; - const std::u16string convLabel = wstring_to_u16string(label); - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetSelectedLabel, 1, value); @@ -748,13 +746,13 @@ void UIScene_HUD::handleTimerComplete(int id) { m_labelChatText[i].setOpacity(opacity); m_labelChatText[i].setLabel(pGui->getMessagesCount(m_iPad) ? pGui->getMessage(m_iPad, i) - : L""); + : ""); anyVisible = true; } else { m_controlLabelBackground[i].setOpacity(0); m_labelChatText[i].setOpacity(0); - m_labelChatText[i].setLabel(L""); + m_labelChatText[i].setLabel(""); } } if (pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true; @@ -764,7 +762,7 @@ void UIScene_HUD::handleTimerComplete(int id) { for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { m_controlLabelBackground[i].setOpacity(0); m_labelChatText[i].setOpacity(0); - m_labelChatText[i].setLabel(L""); + m_labelChatText[i].setLabel(""); } m_labelJukebox.setOpacity(0); } @@ -811,18 +809,17 @@ void UIScene_HUD::ShowDisplayName(bool show) { m_labelDisplayName.setVisible(show); } -void UIScene_HUD::SetDisplayName(const std::wstring& displayName) { +void UIScene_HUD::SetDisplayName(const std::string& displayName) { if (displayName.compare(m_displayName) != 0) { m_displayName = displayName; IggyDataValue result; IggyDataValue value[1]; - IggyStringUTF16 stringVal; - const std::u16string convName = wstring_to_u16string(displayName); - stringVal.string = convName.c_str(); - stringVal.length = convName.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(displayName.c_str()); + stringVal.length = displayName.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetDisplayName, 1, value); diff --git a/targets/app/common/UI/Components/UIScene_HUD.h b/targets/app/common/UI/Components/UIScene_HUD.h index ec38ace0f..33e30f98a 100644 --- a/targets/app/common/UI/Components/UIScene_HUD.h +++ b/targets/app/common/UI/Components/UIScene_HUD.h @@ -69,43 +69,43 @@ protected: UI_MAP_ELEMENT(m_labelDisplayName, "LabelGamertag") - UI_MAP_NAME(m_funcLoadHud, L"LoadHud") - UI_MAP_NAME(m_funcSetExpBarProgress, L"SetExpBarProgress") - UI_MAP_NAME(m_funcSetPlayerLevel, L"SetPlayerLevel") - UI_MAP_NAME(m_funcSetActiveSlot, L"SetActiveSlot") + UI_MAP_NAME(m_funcLoadHud, "LoadHud") + UI_MAP_NAME(m_funcSetExpBarProgress, "SetExpBarProgress") + UI_MAP_NAME(m_funcSetPlayerLevel, "SetPlayerLevel") + UI_MAP_NAME(m_funcSetActiveSlot, "SetActiveSlot") - UI_MAP_NAME(m_funcSetHealth, L"SetHealth") - UI_MAP_NAME(m_funcSetFood, L"SetFood") - UI_MAP_NAME(m_funcSetAir, L"SetAir") - UI_MAP_NAME(m_funcSetArmour, L"SetArmour") + UI_MAP_NAME(m_funcSetHealth, "SetHealth") + UI_MAP_NAME(m_funcSetFood, "SetFood") + UI_MAP_NAME(m_funcSetAir, "SetAir") + UI_MAP_NAME(m_funcSetArmour, "SetArmour") - UI_MAP_NAME(m_funcShowHealth, L"ShowHealth") - UI_MAP_NAME(m_funcShowHorseHealth, L"ShowHorseHealth") - UI_MAP_NAME(m_funcShowFood, L"ShowFood") - UI_MAP_NAME(m_funcShowAir, L"ShowAir") - UI_MAP_NAME(m_funcShowArmour, L"ShowArmour") - UI_MAP_NAME(m_funcShowExpbar, L"ShowExpBar") + UI_MAP_NAME(m_funcShowHealth, "ShowHealth") + UI_MAP_NAME(m_funcShowHorseHealth, "ShowHorseHealth") + UI_MAP_NAME(m_funcShowFood, "ShowFood") + UI_MAP_NAME(m_funcShowAir, "ShowAir") + UI_MAP_NAME(m_funcShowArmour, "ShowArmour") + UI_MAP_NAME(m_funcShowExpbar, "ShowExpBar") - UI_MAP_NAME(m_funcSetRegenerationEffect, L"SetRegenerationEffect") - UI_MAP_NAME(m_funcSetFoodSaturationLevel, L"SetFoodSaturationLevel") + UI_MAP_NAME(m_funcSetRegenerationEffect, "SetRegenerationEffect") + UI_MAP_NAME(m_funcSetFoodSaturationLevel, "SetFoodSaturationLevel") - UI_MAP_NAME(m_funcSetDragonHealth, L"SetDragonHealth") - UI_MAP_NAME(m_funcSetDragonLabel, L"SetDragonLabel") - UI_MAP_NAME(m_funcShowDragonHealth, L"ShowDragonHealthBar") + UI_MAP_NAME(m_funcSetDragonHealth, "SetDragonHealth") + UI_MAP_NAME(m_funcSetDragonLabel, "SetDragonLabel") + UI_MAP_NAME(m_funcShowDragonHealth, "ShowDragonHealthBar") - UI_MAP_NAME(m_funcSetSelectedLabel, L"SetSelectedLabel") - UI_MAP_NAME(m_funcHideSelectedLabel, L"HideSelectedLabel") + UI_MAP_NAME(m_funcSetSelectedLabel, "SetSelectedLabel") + UI_MAP_NAME(m_funcHideSelectedLabel, "HideSelectedLabel") - UI_MAP_NAME(m_funcRepositionHud, L"RepositionHud") - UI_MAP_NAME(m_funcSetDisplayName, L"SetGamertag") + UI_MAP_NAME(m_funcRepositionHud, "RepositionHud") + UI_MAP_NAME(m_funcSetDisplayName, "SetGamertag") - UI_MAP_NAME(m_funcSetTooltipsEnabled, L"SetTooltipsEnabled") + UI_MAP_NAME(m_funcSetTooltipsEnabled, "SetTooltipsEnabled") - UI_MAP_NAME(m_funcSetRidingHorse, L"SetRidingHorse") - UI_MAP_NAME(m_funcSetHorseHealth, L"SetHorseHealth") - UI_MAP_NAME(m_funcSetHorseJumpBarProgress, L"SetHorseJumpBarProgress") + UI_MAP_NAME(m_funcSetRidingHorse, "SetRidingHorse") + UI_MAP_NAME(m_funcSetHorseHealth, "SetHorseHealth") + UI_MAP_NAME(m_funcSetHorseJumpBarProgress, "SetHorseJumpBarProgress") - UI_MAP_NAME(m_funcSetHealthAbsorb, L"SetHealthAbsorb") + UI_MAP_NAME(m_funcSetHealthAbsorb, "SetHealthAbsorb") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -117,7 +117,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual EUIScene getSceneType() { return eUIScene_HUD; } @@ -163,12 +163,12 @@ private: void SetFoodSaturationLevel(int iSaturation); void SetDragonHealth(float health); - void SetDragonLabel(const std::wstring& label); + void SetDragonLabel(const std::string& label); void ShowDragonHealth(bool show); void HideSelectedLabel(); - void SetDisplayName(const std::wstring& displayName); + void SetDisplayName(const std::string& displayName); void SetTooltipsEnabled(bool bEnabled); @@ -179,7 +179,7 @@ private: void SetHealthAbsorb(int healthAbsorb); public: - void SetSelectedLabel(const std::wstring& label); + void SetSelectedLabel(const std::string& label); void ShowDisplayName(bool show); void handleGameTick(); diff --git a/targets/app/common/UI/Controls/UIControl.cpp b/targets/app/common/UI/Controls/UIControl.cpp index f7227d1da..691216a3e 100644 --- a/targets/app/common/UI/Controls/UIControl.cpp +++ b/targets/app/common/UI/Controls/UIControl.cpp @@ -32,12 +32,12 @@ bool UIControl::setupControl(UIScene* scene, IggyValuePath* parent, IggyValuePathMakeNameRef(&m_iggyPath, parent, controlName.c_str()); m_isValid = res ? true : false; - m_nameXPos = registerFastName(L"x"); - m_nameYPos = registerFastName(L"y"); - m_nameWidth = registerFastName(L"width"); - m_nameHeight = registerFastName(L"height"); - m_funcSetAlpha = registerFastName(L"SetControlAlpha"); - m_nameVisible = registerFastName(L"visible"); + m_nameXPos = registerFastName("x"); + m_nameYPos = registerFastName("y"); + m_nameWidth = registerFastName("width"); + m_nameHeight = registerFastName("height"); + m_funcSetAlpha = registerFastName("SetControlAlpha"); + m_nameVisible = registerFastName("visible"); if (m_isValid) { IggyDatatype controlType = IGGY_DATATYPE__invalid_request; @@ -77,7 +77,7 @@ void UIControl::ReInit() { IggyDataValue value[2]; IggyStringUTF8 stringVal; - stringVal.string = (char*)m_controlName.c_str(); + stringVal.string = const_cast((char*)m_controlName.c_str()); stringVal.length = m_controlName.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -113,7 +113,7 @@ void UIControl::setOpacity(float percent) { IggyDataValue value[2]; IggyStringUTF8 stringVal; - stringVal.string = (char*)m_controlName.c_str(); + stringVal.string = const_cast((char*)m_controlName.c_str()); stringVal.length = m_controlName.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -156,6 +156,6 @@ bool UIControl::getVisible() { return bVisible; } -IggyName UIControl::registerFastName(const std::wstring& name) { +IggyName UIControl::registerFastName(const std::string& name) { return m_parentScene->registerFastName(name); } diff --git a/targets/app/common/UI/Controls/UIControl.h b/targets/app/common/UI/Controls/UIControl.h index fd8d57ab3..0c1c73133 100644 --- a/targets/app/common/UI/Controls/UIControl.h +++ b/targets/app/common/UI/Controls/UIControl.h @@ -94,5 +94,5 @@ public: virtual bool hasFocus() { return false; } protected: - IggyName registerFastName(const std::wstring& name); + IggyName registerFastName(const std::string& name); }; diff --git a/targets/app/common/UI/Controls/UIControl_Base.cpp b/targets/app/common/UI/Controls/UIControl_Base.cpp index 633dda49c..0476a6ea5 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/UI/Controls/UIControl_Base.cpp @@ -22,10 +22,10 @@ bool UIControl_Base::setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName) { bool success = UIControl::setupControl(scene, parent, controlName); - m_setLabelFunc = registerFastName(L"SetLabel"); - m_initFunc = registerFastName(L"Init"); - m_funcGetLabel = registerFastName(L"GetLabel"); - m_funcCheckLabelWidths = registerFastName(L"CheckLabelWidths"); + m_setLabelFunc = registerFastName("SetLabel"); + m_initFunc = registerFastName("Init"); + m_funcGetLabel = registerFastName("GetLabel"); + m_funcCheckLabelWidths = registerFastName("CheckLabelWidths"); return success; } @@ -34,20 +34,17 @@ void UIControl_Base::tick() { UIControl::tick(); if (m_label.needsUpdating() || m_bLabelChanged) { - // app.DebugPrintf("Calling SetLabel - '%ls'\n", m_label.c_str()); + // app.DebugPrintf("Calling SetLabel - '%s'\n", m_label.c_str()); m_bLabelChanged = false; - const std::u16string convLabel = - wstring_to_u16string(m_label.getString()); - IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(m_label.getString().c_str()); + stringVal.length = m_label.getString().length(); + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), @@ -66,17 +63,14 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force) { if (m_bLabelChanged && instant) { m_bLabelChanged = false; - const std::u16string convLabel = - wstring_to_u16string(m_label.getString()); - IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(m_label.getString().c_str()); + stringVal.length = m_label.getString().length(); + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), @@ -84,34 +78,30 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force) { } } -const wchar_t* UIControl_Base::getLabel() { +const char* UIControl_Base::getLabel() { IggyDataValue result; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, nullptr); - if (result.type == IGGY_DATATYPE_string_UTF16) { - m_label = u16string_to_wstring(result.string16.string); + if (result.type == IGGY_DATATYPE_string_UTF8) { + m_label = result.string8.string; } return m_label.c_str(); } void UIControl_Base::setAllPossibleLabels(int labelCount, - wchar_t labels[][256]) { + char labels[][256]) { IggyDataValue result; IggyDataValue* value = new IggyDataValue[labelCount]; - IggyStringUTF16* stringVal = new IggyStringUTF16[labelCount]; - - std::vector conv; - conv.reserve(labelCount); + IggyStringUTF8* stringVal = new IggyStringUTF8[labelCount]; for (int i = 0; i < labelCount; ++i) { - conv.push_back(wstring_to_u16string(labels[i])); - stringVal[i].string = conv[i].c_str(); - stringVal[i].length = (S32)conv[i].length(); - value[i].type = IGGY_DATATYPE_string_UTF16; - value[i].string16 = stringVal[i]; + stringVal[i].string = const_cast(labels[i]); + stringVal[i].length = strlen(labels[i]); + value[i].type = IGGY_DATATYPE_string_UTF8; + value[i].string8 = stringVal[i]; } IggyResult out = IggyPlayerCallMethodRS( diff --git a/targets/app/common/UI/Controls/UIControl_Base.h b/targets/app/common/UI/Controls/UIControl_Base.h index 5864e86e8..3c64dc5bb 100644 --- a/targets/app/common/UI/Controls/UIControl_Base.h +++ b/targets/app/common/UI/Controls/UIControl_Base.h @@ -31,12 +31,13 @@ public: virtual void setLabel(UIString label, bool instant = false, bool force = false); - // virtual void setLabel(std::wstring label, bool instant = false, bool - // force = false) { this->setLabel(UIString::CONSTANT(label), instant, - // force); } + // virtual void setLabel(std::string label, bool instant = false, + // bool force = false) { + // this->setLabel(UIString(label), instant, force); + // } - const wchar_t* getLabel(); - virtual void setAllPossibleLabels(int labelCount, wchar_t labels[][256]); + const char* getLabel(); + virtual void setAllPossibleLabels(int labelCount, char labels[][256]); int getId() { return m_id; } virtual bool hasFocus(); diff --git a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp index 87e8ea1b5..0d05bee90 100644 --- a/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -19,8 +19,8 @@ bool UIControl_BeaconEffectButton::setupControl( UIScene* scene, IggyValuePath* parent, const std::string& controlName) { bool success = UIControl::setupControl(scene, parent, controlName); - m_funcChangeState = registerFastName(L"ChangeState"); - m_funcSetIcon = registerFastName(L"SetIcon"); + m_funcChangeState = registerFastName("ChangeState"); + m_funcSetIcon = registerFastName("SetIcon"); return success; } diff --git a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp index d80955019..0142039b1 100644 --- a/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.cpp @@ -14,22 +14,20 @@ bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_funcSetTextureName = registerFastName(L"SetTextureName"); + m_funcSetTextureName = registerFastName("SetTextureName"); return success; } -void UIControl_BitmapIcon::setTextureName(const std::wstring& iconName) { +void UIControl_BitmapIcon::setTextureName(const std::string& iconName) { IggyDataValue result; IggyDataValue value[1]; - const std::u16string convName = wstring_to_u16string(iconName); - - IggyStringUTF16 stringVal; - stringVal.string = convName.c_str(); - stringVal.length = convName.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(iconName.c_str()); + stringVal.length = iconName.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetTextureName, 1, value); diff --git a/targets/app/common/UI/Controls/UIControl_BitmapIcon.h b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h index 8a455b1f5..452ce45ee 100644 --- a/targets/app/common/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/app/common/UI/Controls/UIControl_BitmapIcon.h @@ -19,5 +19,5 @@ public: virtual bool setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName); - void setTextureName(const std::wstring& iconName); + void setTextureName(const std::string& iconName); }; \ No newline at end of file diff --git a/targets/app/common/UI/Controls/UIControl_Button.cpp b/targets/app/common/UI/Controls/UIControl_Button.cpp index 99965b371..1419a1bda 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/UI/Controls/UIControl_Button.cpp @@ -18,7 +18,7 @@ bool UIControl_Button::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Button specific initialisers - m_funcEnableButton = registerFastName(L"EnableButton"); + m_funcEnableButton = registerFastName("EnableButton"); return success; } @@ -27,16 +27,14 @@ void UIControl_Button::init(UIString label, int id) { m_label = label; m_id = id; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[2]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = id; diff --git a/targets/app/common/UI/Controls/UIControl_Button.h b/targets/app/common/UI/Controls/UIControl_Button.h index f595550bf..2f5abee9c 100644 --- a/targets/app/common/UI/Controls/UIControl_Button.h +++ b/targets/app/common/UI/Controls/UIControl_Button.h @@ -23,7 +23,7 @@ public: const std::string& controlName); void init(UIString label, int id); - // void init(const std::wstring &label, int id) { + // void init(const std::string &label, int id) { // init(UIString::CONSTANT(label), id); } virtual void ReInit(); diff --git a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp index 6c77ce52e..54e6bb157 100644 --- a/targets/app/common/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.cpp @@ -22,13 +22,13 @@ bool UIControl_ButtonList::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_addNewItemFunc = registerFastName(L"addNewItem"); - m_removeAllItemsFunc = registerFastName(L"removeAllItems"); - m_funcHighlightItem = registerFastName(L"HighlightItem"); - m_funcRemoveItem = registerFastName(L"RemoveItem"); - m_funcSetButtonLabel = registerFastName(L"SetButtonLabel"); - m_funcSetTouchFocus = registerFastName(L"SetTouchFocus"); - m_funcCanTouchTrigger = registerFastName(L"CanTouchTrigger"); + m_addNewItemFunc = registerFastName("addNewItem"); + m_removeAllItemsFunc = registerFastName("removeAllItems"); + m_funcHighlightItem = registerFastName("HighlightItem"); + m_funcRemoveItem = registerFastName("RemoveItem"); + m_funcSetButtonLabel = registerFastName("SetButtonLabel"); + m_funcSetTouchFocus = registerFastName("SetTouchFocus"); + m_funcCanTouchTrigger = registerFastName("CanTouchTrigger"); return success; } @@ -65,16 +65,12 @@ void UIControl_ButtonList::addItem(const std::string& label) { addItem(label, m_itemCount); } -void UIControl_ButtonList::addItem(const std::wstring& label) { - addItem(label, m_itemCount); -} - void UIControl_ButtonList::addItem(const std::string& label, int data) { IggyDataValue result; IggyDataValue value[2]; IggyStringUTF8 stringVal; - stringVal.string = (char*)label.c_str(); + stringVal.string = const_cast((char*)label.c_str()); stringVal.length = (S32)label.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -88,27 +84,6 @@ void UIControl_ButtonList::addItem(const std::string& label, int data) { ++m_itemCount; } -void UIControl_ButtonList::addItem(const std::wstring& label, int data) { - IggyDataValue result; - IggyDataValue value[2]; - - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; - - value[1].type = IGGY_DATATYPE_number; - value[1].number = data; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_addNewItemFunc, 2, value); - - ++m_itemCount; -} - void UIControl_ButtonList::removeItem(int index) { IggyDataValue result; IggyDataValue value[1]; @@ -140,20 +115,18 @@ void UIControl_ButtonList::updateChildFocus(int iChild) { } void UIControl_ButtonList::setButtonLabel(int iButtonId, - const std::wstring& label) { + const std::string& label) { IggyDataValue result; IggyDataValue value[2]; value[0].type = IGGY_DATATYPE_number; value[0].number = iButtonId; - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[1].type = IGGY_DATATYPE_string_UTF16; - value[1].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[1].type = IGGY_DATATYPE_string_UTF8; + value[1].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetButtonLabel, 2, value); diff --git a/targets/app/common/UI/Controls/UIControl_ButtonList.h b/targets/app/common/UI/Controls/UIControl_ButtonList.h index 313a6b287..e1f164916 100644 --- a/targets/app/common/UI/Controls/UIControl_ButtonList.h +++ b/targets/app/common/UI/Controls/UIControl_ButtonList.h @@ -33,11 +33,11 @@ public: void clearList(); - void addItem(const std::wstring& label); void addItem(const std::string& label); + // void addItem(const std::wstring& label); - void addItem(const std::wstring& label, int data); void addItem(const std::string& label, int data); + // void addItem(const std::wstring& label, int data); void removeItem(int index); @@ -48,7 +48,7 @@ public: void updateChildFocus(int iChild); - void setButtonLabel(int iButtonId, const std::wstring& label); + void setButtonLabel(int iButtonId, const std::string& label); }; class UIControl_DynamicButtonList : public UIControl_ButtonList { diff --git a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp index 6ec876a55..2b5956013 100644 --- a/targets/app/common/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/UI/Controls/UIControl_CheckBox.cpp @@ -19,9 +19,9 @@ bool UIControl_CheckBox::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // CheckBox specific initialisers - m_checkedProp = registerFastName(L"Checked"); - m_funcEnable = registerFastName(L"EnableCheckBox"); - m_funcSetCheckBox = registerFastName(L"SetCheckBox"); + m_checkedProp = registerFastName("Checked"); + m_funcEnable = registerFastName("EnableCheckBox"); + m_funcSetCheckBox = registerFastName("SetCheckBox"); m_bEnabled = true; @@ -33,16 +33,14 @@ void UIControl_CheckBox::init(UIString label, int id, bool checked) { m_id = id; m_bChecked = checked; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[3]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = (int)id; diff --git a/targets/app/common/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/UI/Controls/UIControl_DLCList.cpp index 3ce5ae42f..a1d7b083e 100644 --- a/targets/app/common/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/UI/Controls/UIControl_DLCList.cpp @@ -17,7 +17,7 @@ bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, UIControl_ButtonList::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_funcShowTick = registerFastName(L"ShowTick"); + m_funcShowTick = registerFastName("ShowTick"); return success; } @@ -28,7 +28,7 @@ void UIControl_DLCList::addItem(const std::string& label, bool showTick, IggyDataValue value[3]; IggyStringUTF8 stringVal; - stringVal.string = (char*)label.c_str(); + stringVal.string = const_cast(label.c_str()); stringVal.length = (S32)label.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -45,31 +45,6 @@ void UIControl_DLCList::addItem(const std::string& label, bool showTick, ++m_itemCount; } -void UIControl_DLCList::addItem(const std::wstring& label, bool showTick, - int iId) { - IggyDataValue result; - IggyDataValue value[3]; - - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = (S32)convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; - - value[1].type = IGGY_DATATYPE_number; - value[1].number = iId; - - value[2].type = IGGY_DATATYPE_boolean; - value[2].boolval = showTick; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_addNewItemFunc, 3, value); - - ++m_itemCount; -} - void UIControl_DLCList::showTick(int iId, bool showTick) { IggyDataValue result; IggyDataValue value[2]; diff --git a/targets/app/common/UI/Controls/UIControl_DLCList.h b/targets/app/common/UI/Controls/UIControl_DLCList.h index 63cdb375c..9b2ebf1bc 100644 --- a/targets/app/common/UI/Controls/UIControl_DLCList.h +++ b/targets/app/common/UI/Controls/UIControl_DLCList.h @@ -20,6 +20,6 @@ public: using UIControl_ButtonList::addItem; void addItem(const std::string& label, bool showTick, int iId); - void addItem(const std::wstring& label, bool showTick, int iId); + // void addItem(const std::wstring& label, bool showTick, int iId); void showTick(int iId, bool showTick); }; diff --git a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp index 1c4aac7a9..9e78ba8a1 100644 --- a/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.cpp @@ -18,26 +18,24 @@ bool UIControl_DynamicLabel::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Label specific initialisers - m_funcAddText = registerFastName(L"AddText"); - m_funcTouchScroll = registerFastName(L"TouchScroll"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); + m_funcAddText = registerFastName("AddText"); + m_funcTouchScroll = registerFastName("TouchScroll"); + m_funcGetRealWidth = registerFastName("GetRealWidth"); + m_funcGetRealHeight = registerFastName("GetRealHeight"); return success; } -void UIControl_DynamicLabel::addText(const std::wstring& text, +void UIControl_DynamicLabel::addText(const std::string& text, bool bLastEntry) { - const std::u16string convText = wstring_to_u16string(text); - IggyDataValue result; IggyDataValue value[2]; - IggyStringUTF16 stringVal; - stringVal.string = convText.c_str(); - stringVal.length = convText.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(text.c_str()); + stringVal.length = text.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_boolean; value[1].boolval = bLastEntry; diff --git a/targets/app/common/UI/Controls/UIControl_DynamicLabel.h b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h index 987c589cd..eaa15c650 100644 --- a/targets/app/common/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/app/common/UI/Controls/UIControl_DynamicLabel.h @@ -23,7 +23,7 @@ public: virtual bool setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName); - virtual void addText(const std::wstring& text, bool bLastEntry); + virtual void addText(const std::string& text, bool bLastEntry); virtual void ReInit(); diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp index bedd10491..072919ad4 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp @@ -57,7 +57,7 @@ void UIControl_EnchantmentBook::render(IggyCustomDrawCallbackRegion* region) { Minecraft* pMinecraft = Minecraft::GetInstance(); int tex = pMinecraft->textures->loadTexture( - TN_ITEM_BOOK); // 4J was L"/1_2_2/item/book.png" + TN_ITEM_BOOK); // 4J was "/1_2_2/item/book.png" pMinecraft->textures->bind(tex); glRotatef(20, 1, 0, 0); diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp index 706539071..ccd57d319 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp @@ -28,7 +28,7 @@ UIControl_EnchantmentButton::UIControl_EnchantmentButton() { m_index = 0; m_lastState = eState_Inactive; m_lastCost = 0; - m_enchantmentString = L""; + m_enchantmentString = ""; m_bHasFocus = false; m_textColour = app.GetHTMLColour(eTextColor_Enchant); @@ -43,7 +43,7 @@ bool UIControl_EnchantmentButton::setupControl(UIScene* scene, bool success = UIControl_Button::setupControl(scene, parent, controlName); // Button specific initialisers - m_funcChangeState = registerFastName(L"ChangeState"); + m_funcChangeState = registerFastName("ChangeState"); return success; } @@ -110,7 +110,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion* region) { glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.1f); Minecraft* pMinecraft = Minecraft::GetInstance(); - std::wstring line = toWString(cost); + std::string line = toWString(cost); Font* font = pMinecraft->altFont; // int col = 0x685E4A; unsigned int col = m_textColour; @@ -176,7 +176,7 @@ void UIControl_EnchantmentButton::updateState() { if (cost == 0) { // Dark background state = eState_Inactive; - setLabel(L""); + setLabel(""); } if (state != m_lastState) { @@ -202,26 +202,26 @@ UIControl_EnchantmentButton::EnchantmentNames UIControl_EnchantmentButton::EnchantmentNames::instance; UIControl_EnchantmentButton::EnchantmentNames::EnchantmentNames() { - std::wstring allWords = - L"the elder scrolls klaatu berata niktu xyzzy bless curse light " - L"darkness fire air earth water hot dry cold wet ignite snuff embiggen " - L"twist shorten stretch fiddle destroy imbue galvanize enchant free " - L"limited range of towards inside sphere cube self other ball mental " - L"physical grow shrink demon elemental spirit animal creature beast " - L"humanoid undead fresh stale "; - std::wistringstream iss(allWords); - std::copy(std::istream_iterator >(iss), - std::istream_iterator >(), + std::string allWords = + "the elder scrolls klaatu berata niktu xyzzy bless curse light " + "darkness fire air earth water hot dry cold wet ignite snuff embiggen " + "twist shorten stretch fiddle destroy imbue galvanize enchant free " + "limited range of towards inside sphere cube self other ball mental " + "physical grow shrink demon elemental spirit animal creature beast " + "humanoid undead fresh stale "; + std::istringstream iss(allWords); + std::copy(std::istream_iterator >(iss), + std::istream_iterator >(), std::back_inserter(words)); } -std::wstring UIControl_EnchantmentButton::EnchantmentNames::getRandomName() { +std::string UIControl_EnchantmentButton::EnchantmentNames::getRandomName() { int wordCount = random.nextInt(2) + 3; - std::wstring word = L""; + std::string word = ""; for (int i = 0; i < wordCount; i++) { - if (i > 0) word += L" "; + if (i > 0) word += " "; word += words[random.nextInt(words.size())]; } return word; diff --git a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h index ffacbf700..26363f586 100644 --- a/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/UI/Controls/UIControl_EnchantmentButton.h @@ -24,7 +24,7 @@ private: EState m_lastState; int m_lastCost; int m_index; - std::wstring m_enchantmentString; + std::string m_enchantmentString; bool m_bHasFocus; IggyName m_funcChangeState; @@ -37,12 +37,12 @@ private: private: Random random; - std::vector words; + std::vector words; EnchantmentNames(); public: - std::wstring getRandomName(); + std::string getRandomName(); }; public: diff --git a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp index 52e2d887b..57f25b015 100644 --- a/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.cpp @@ -17,10 +17,10 @@ bool UIControl_HTMLLabel::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Label specific initialisers - m_funcStartAutoScroll = registerFastName(L"StartAutoScroll"); - m_funcTouchScroll = registerFastName(L"TouchScroll"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); + m_funcStartAutoScroll = registerFastName("StartAutoScroll"); + m_funcTouchScroll = registerFastName("TouchScroll"); + m_funcGetRealWidth = registerFastName("GetRealWidth"); + m_funcGetRealHeight = registerFastName("GetRealHeight"); return success; } @@ -36,23 +36,23 @@ void UIControl_HTMLLabel::ReInit() { UIControl_Base::ReInit(); // Don't set the label, HTML sizes will have changed. Let the scene update // us. - init(L""); + init(""); } -void UIControl_HTMLLabel::setLabel(const std::string& label) { - IggyDataValue result; - IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF8; - IggyStringUTF8 stringVal; +// void UIControl_HTMLLabel::setLabel(const std::string& label) { +// IggyDataValue result; +// IggyDataValue value[1]; +// value[0].type = IGGY_DATATYPE_string_UTF8; +// IggyStringUTF8 stringVal; - stringVal.string = (char*)label.c_str(); - stringVal.length = label.length(); - value[0].string8 = stringVal; +// stringVal.string = const_cast((char*)label.c_str()); +// stringVal.length = label.length(); +// value[0].string8 = stringVal; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_setLabelFunc, 1, value); -} +// IggyResult out = +// IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, +// getIggyValuePath(), m_setLabelFunc, 1, value); +// } void UIControl_HTMLLabel::SetupTouch() {} diff --git a/targets/app/common/UI/Controls/UIControl_HTMLLabel.h b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h index eb2d4319c..7a988f703 100644 --- a/targets/app/common/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/app/common/UI/Controls/UIControl_HTMLLabel.h @@ -28,7 +28,7 @@ public: virtual void ReInit(); using UIControl_Base::setLabel; - void setLabel(const std::string& label); + // void setLabel(const std::string& label); virtual void SetupTouch(); diff --git a/targets/app/common/UI/Controls/UIControl_Label.cpp b/targets/app/common/UI/Controls/UIControl_Label.cpp index 81d14ebd8..128eb7a99 100644 --- a/targets/app/common/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/UI/Controls/UIControl_Label.cpp @@ -25,16 +25,16 @@ bool UIControl_Label::setupControl(UIScene* scene, IggyValuePath* parent, void UIControl_Label::init(UIString label) { m_label = label; - const std::u16string convLabel = wstring_to_u16string(label.getString()); + const std::string labelString = label.getString(); IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(labelString.c_str()); + stringVal.length = labelString.length(); + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_initFunc, 1, value); diff --git a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp index cae041698..745d6eeb3 100644 --- a/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.cpp @@ -18,11 +18,11 @@ bool UIControl_LeaderboardList::setupControl(UIScene* scene, bool success = UIControl_Base::setupControl(scene, parent, controlName); // UIControl_LeaderboardList specific initialisers - m_funcInitLeaderboard = registerFastName(L"InitLeaderboard"); - m_funcAddDataSet = registerFastName(L"AddDataSet"); - m_funcResetLeaderboard = registerFastName(L"ResetLeaderboard"); - m_funcSetupTitles = registerFastName(L"SetupTitles"); - m_funcSetColumnIcon = registerFastName(L"SetColumnIcon"); + m_funcInitLeaderboard = registerFastName("InitLeaderboard"); + m_funcAddDataSet = registerFastName("AddDataSet"); + m_funcResetLeaderboard = registerFastName("ResetLeaderboard"); + m_funcSetupTitles = registerFastName("SetupTitles"); + m_funcSetColumnIcon = registerFastName("SetColumnIcon"); return success; } @@ -51,26 +51,22 @@ void UIControl_LeaderboardList::clearList() { m_funcResetLeaderboard, 0, nullptr); } -void UIControl_LeaderboardList::setupTitles(const std::wstring& rank, - const std::wstring& gamertag) { +void UIControl_LeaderboardList::setupTitles(const std::string& rank, + const std::string& gamertag) { IggyDataValue result; IggyDataValue value[2]; - const std::u16string convRank = wstring_to_u16string(rank); + IggyStringUTF8 stringVal0; + stringVal0.string = const_cast(rank.c_str()); + stringVal0.length = rank.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal0; - IggyStringUTF16 stringVal0; - stringVal0.string = convRank.c_str(); - stringVal0.length = convRank.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal0; - - const std::u16string convGamertag = wstring_to_u16string(gamertag); - - IggyStringUTF16 stringVal1; - stringVal1.string = convGamertag.c_str(); - stringVal1.length = convGamertag.length(); - value[1].type = IGGY_DATATYPE_string_UTF16; - value[1].string16 = stringVal1; + IggyStringUTF8 stringVal1; + stringVal1.string = const_cast(gamertag.c_str()); + stringVal1.length = gamertag.length(); + value[1].type = IGGY_DATATYPE_string_UTF8; + value[1].string8 = stringVal1; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, @@ -110,11 +106,11 @@ void UIControl_LeaderboardList::setColumnIcon(int iColumn, int iType) { } void UIControl_LeaderboardList::addDataSet( - bool bLast, int iId, int iRank, const std::wstring& gamertag, - bool bDisplayMessage, const std::wstring& col0, const std::wstring& col1, - const std::wstring& col2, const std::wstring& col3, - const std::wstring& col4, const std::wstring& col5, - const std::wstring& col6) { + bool bLast, int iId, int iRank, const std::string& gamertag, + bool bDisplayMessage, const std::string& col0, const std::string& col1, + const std::string& col2, const std::string& col3, + const std::string& col4, const std::string& col5, + const std::string& col6) { IggyDataValue result; IggyDataValue value[12]; @@ -127,95 +123,79 @@ void UIControl_LeaderboardList::addDataSet( value[2].type = IGGY_DATATYPE_number; value[2].number = iRank; - const std::u16string convGamertag = wstring_to_u16string(gamertag); - - IggyStringUTF16 stringVal0; - stringVal0.string = convGamertag.c_str(); - stringVal0.length = convGamertag.length(); - value[3].type = IGGY_DATATYPE_string_UTF16; - value[3].string16 = stringVal0; + IggyStringUTF8 stringVal0; + stringVal0.string = const_cast(gamertag.c_str()); + stringVal0.length = gamertag.length(); + value[3].type = IGGY_DATATYPE_string_UTF8; + value[3].string8 = stringVal0; value[4].type = IGGY_DATATYPE_boolean; value[4].boolval = bDisplayMessage; - const std::u16string convCol0 = wstring_to_u16string(col0); - - IggyStringUTF16 stringVal1; - stringVal1.string = convCol0.c_str(); - stringVal1.length = convCol0.length(); - value[5].type = IGGY_DATATYPE_string_UTF16; - value[5].string16 = stringVal1; + IggyStringUTF8 stringVal1; + stringVal1.string = const_cast(col0.c_str()); + stringVal1.length = col0.length(); + value[5].type = IGGY_DATATYPE_string_UTF8; + value[5].string8 = stringVal1; if (col1.empty()) { value[6].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol1 = wstring_to_u16string(col1); - - IggyStringUTF16 stringVal2; - stringVal2.string = convCol1.c_str(); - stringVal2.length = convCol1.length(); - value[6].type = IGGY_DATATYPE_string_UTF16; - value[6].string16 = stringVal2; + IggyStringUTF8 stringVal2; + stringVal2.string = const_cast(col1.c_str()); + stringVal2.length = col1.length(); + value[6].type = IGGY_DATATYPE_string_UTF8; + value[6].string8 = stringVal2; } if (col2.empty()) { value[7].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol2 = wstring_to_u16string(col2); - - IggyStringUTF16 stringVal3; - stringVal3.string = convCol2.c_str(); - stringVal3.length = convCol2.length(); - value[7].type = IGGY_DATATYPE_string_UTF16; - value[7].string16 = stringVal3; + IggyStringUTF8 stringVal3; + stringVal3.string = const_cast(col2.c_str()); + stringVal3.length = col2.length(); + value[7].type = IGGY_DATATYPE_string_UTF8; + value[7].string8 = stringVal3; } if (col3.empty()) { value[8].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol3 = wstring_to_u16string(col3); - - IggyStringUTF16 stringVal4; - stringVal4.string = convCol3.c_str(); - stringVal4.length = convCol3.length(); - value[8].type = IGGY_DATATYPE_string_UTF16; - value[8].string16 = stringVal4; + IggyStringUTF8 stringVal4; + stringVal4.string = const_cast(col3.c_str()); + stringVal4.length = col3.length(); + value[8].type = IGGY_DATATYPE_string_UTF8; + value[8].string8 = stringVal4; } if (col4.empty()) { value[9].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol4 = wstring_to_u16string(col4); - - IggyStringUTF16 stringVal5; - stringVal5.string = convCol4.c_str(); - stringVal5.length = convCol4.length(); - value[9].type = IGGY_DATATYPE_string_UTF16; - value[9].string16 = stringVal5; + IggyStringUTF8 stringVal5; + stringVal5.string = const_cast(col4.c_str()); + stringVal5.length = col4.length(); + value[9].type = IGGY_DATATYPE_string_UTF8; + value[9].string8 = stringVal5; } if (col5.empty()) { value[10].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol5 = wstring_to_u16string(col5); - - IggyStringUTF16 stringVal6; - stringVal6.string = convCol5.c_str(); - stringVal6.length = convCol5.length(); - value[10].type = IGGY_DATATYPE_string_UTF16; - value[10].string16 = stringVal6; + IggyStringUTF8 stringVal6; + stringVal6.string = const_cast(col5.c_str()); + stringVal6.length = col5.length(); + value[10].type = IGGY_DATATYPE_string_UTF8; + value[10].string8 = stringVal6; } if (col6.empty()) { value[11].type = IGGY_DATATYPE_null; } else { - const std::u16string convCol6 = wstring_to_u16string(col6); - - IggyStringUTF16 stringVal7; - stringVal7.string = convCol6.c_str(); - stringVal7.length = convCol6.length(); - value[11].type = IGGY_DATATYPE_string_UTF16; - value[11].string16 = stringVal7; + IggyStringUTF8 stringVal7; + stringVal7.string = const_cast(col6.c_str()); + stringVal7.length = col6.length(); + value[11].type = IGGY_DATATYPE_string_UTF8; + value[11].string8 = stringVal7; } IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, diff --git a/targets/app/common/UI/Controls/UIControl_LeaderboardList.h b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h index d6a1feb56..dd6acf80f 100644 --- a/targets/app/common/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/app/common/UI/Controls/UIControl_LeaderboardList.h @@ -44,13 +44,13 @@ public: void clearList(); - void setupTitles(const std::wstring& rank, const std::wstring& gamertag); + void setupTitles(const std::string& rank, const std::string& gamertag); void initLeaderboard(int iFirstFocus, int iTotalEntries, int iNumColumns); void setColumnIcon(int iColumn, int iType); void addDataSet(bool bLast, int iId, int iRank, - const std::wstring& gamertag, bool bDisplayMessage, - const std::wstring& col0, const std::wstring& col1, - const std::wstring& col2, const std::wstring& col3, - const std::wstring& col4, const std::wstring& col5, - const std::wstring& col6); + const std::string& gamertag, bool bDisplayMessage, + const std::string& col0, const std::string& col1, + const std::string& col2, const std::string& col3, + const std::string& col4, const std::string& col5, + const std::string& col6); }; \ No newline at end of file diff --git a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp index 80bb89d99..4151d193e 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.cpp @@ -17,24 +17,22 @@ bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, UIControl_ButtonList::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_funcSetPlayerIcon = registerFastName(L"SetPlayerIcon"); - m_funcSetVOIPIcon = registerFastName(L"SetVOIPIcon"); + m_funcSetPlayerIcon = registerFastName("SetPlayerIcon"); + m_funcSetVOIPIcon = registerFastName("SetVOIPIcon"); return success; } -void UIControl_PlayerList::addItem(const std::wstring& label, int iPlayerIcon, +void UIControl_PlayerList::addItem(const std::string& label, int iPlayerIcon, int iVOIPIcon) { IggyDataValue result; IggyDataValue value[4]; - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = (S32)convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = (S32)label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = m_itemCount; diff --git a/targets/app/common/UI/Controls/UIControl_PlayerList.h b/targets/app/common/UI/Controls/UIControl_PlayerList.h index ab2a7a954..a9941b8c8 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerList.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerList.h @@ -19,7 +19,7 @@ public: const std::string& controlName); using UIControl_ButtonList::addItem; - void addItem(const std::wstring& label, int iPlayerIcon, int iVOIPIcon); + void addItem(const std::string& label, int iPlayerIcon, int iVOIPIcon); void setPlayerIcon(int iId, int iPlayerIcon); void setVOIPIcon(int iId, int iVOIPIcon); }; \ No newline at end of file diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp index 664ba290d..7c0714642 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -45,9 +45,9 @@ UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview() { m_fScreenHeight = (float)pMinecraft->height_phys; m_fRawHeight = (float)ssc.rawHeight; - m_customTextureUrl = L"default"; + m_customTextureUrl = "default"; m_backupTexture = TN_MOB_CHAR; - m_capeTextureUrl = L""; + m_capeTextureUrl = ""; m_yRot = 0; m_xRot = 0; @@ -114,7 +114,7 @@ void UIControl_PlayerSkinPreview::tick() { } } -void UIControl_PlayerSkinPreview::SetTexture(const std::wstring& url, +void UIControl_PlayerSkinPreview::SetTexture(const std::string& url, TEXTURE_NAME backupTexture) { m_customTextureUrl = url; m_backupTexture = backupTexture; @@ -375,7 +375,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, }*/ // additionalRendering(mob, a); - if (bindTexture(m_capeTextureUrl, L"")) { + if (bindTexture(m_capeTextureUrl, "")) { glPushMatrix(); glTranslatef(0, 0, 2 / 16.0f); @@ -483,7 +483,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer* renderer, double x, model->holdingLeftHand = false; } -bool UIControl_PlayerSkinPreview::bindTexture(const std::wstring& urlTexture, +bool UIControl_PlayerSkinPreview::bindTexture(const std::string& urlTexture, int backupTexture) { Textures* t = Minecraft::GetInstance()->textures; @@ -501,7 +501,7 @@ bool UIControl_PlayerSkinPreview::bindTexture(const std::wstring& urlTexture, } bool UIControl_PlayerSkinPreview::bindTexture( - const std::wstring& urlTexture, const std::wstring& backupTexture) { + const std::string& urlTexture, const std::string& backupTexture) { Textures* t = Minecraft::GetInstance()->textures; // 4J-PB - no http textures on the xbox, mem textures instead diff --git a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h index 6f07238bf..76f2a683b 100644 --- a/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.h @@ -34,9 +34,9 @@ private: bool m_bDirty; float m_fScale, m_fAlpha; - std::wstring m_customTextureUrl; + std::string m_customTextureUrl; TEXTURE_NAME m_backupTexture; - std::wstring m_capeTextureUrl; + std::string m_capeTextureUrl; unsigned int m_uiAnimOverrideBitmask; float m_fScreenWidth, m_fScreenHeight; @@ -75,9 +75,9 @@ public: void render(IggyCustomDrawCallbackRegion* region); - void SetTexture(const std::wstring& url, + void SetTexture(const std::string& url, TEXTURE_NAME backupTexture = TN_MOB_CHAR); - void SetCapeTexture(const std::wstring& url) { m_capeTextureUrl = url; } + void SetCapeTexture(const std::string& url) { m_capeTextureUrl = url; } void ResetRotation() { m_xRot = 0; m_yRot = 0; @@ -110,7 +110,7 @@ public: private: void render(EntityRenderer* renderer, double x, double y, double z, float rot, float a); - bool bindTexture(const std::wstring& urlTexture, int backupTexture); - bool bindTexture(const std::wstring& urlTexture, - const std::wstring& backupTexture); + bool bindTexture(const std::string& urlTexture, int backupTexture); + bool bindTexture(const std::string& urlTexture, + const std::string& backupTexture); }; diff --git a/targets/app/common/UI/Controls/UIControl_Progress.cpp b/targets/app/common/UI/Controls/UIControl_Progress.cpp index 7f2a28fd8..e8d5cb48a 100644 --- a/targets/app/common/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/UI/Controls/UIControl_Progress.cpp @@ -24,8 +24,8 @@ bool UIControl_Progress::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Progress specific initialisers - m_setProgressFunc = registerFastName(L"setProgress"); - m_showBarFunc = registerFastName(L"ShowBar"); + m_setProgressFunc = registerFastName("setProgress"); + m_showBarFunc = registerFastName("ShowBar"); return success; } @@ -38,16 +38,14 @@ void UIControl_Progress::init(UIString label, int id, int min, int max, m_max = max; m_current = current; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, diff --git a/targets/app/common/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/UI/Controls/UIControl_SaveList.cpp index 64c8346a2..e583f60db 100644 --- a/targets/app/common/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SaveList.cpp @@ -17,46 +17,32 @@ bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, UIControl_ButtonList::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_funcSetTextureName = registerFastName(L"SetTextureName"); + m_funcSetTextureName = registerFastName("SetTextureName"); return success; } -void UIControl_SaveList::addItem(const std::wstring& label) { - addItem(label, L""); -} - void UIControl_SaveList::addItem(const std::string& label) { - addItem(label, L""); -} - -void UIControl_SaveList::addItem(const std::wstring& label, int data) { - addItem(label, L"", data); + addItem(label, ""); } void UIControl_SaveList::addItem(const std::string& label, int data) { - addItem(label, L"", data); + addItem(label, "", data); } void UIControl_SaveList::addItem(const std::string& label, - const std::wstring& iconName) { - addItem(label, iconName, m_itemCount); - ++m_itemCount; -} - -void UIControl_SaveList::addItem(const std::wstring& label, - const std::wstring& iconName) { + const std::string& iconName) { addItem(label, iconName, m_itemCount); ++m_itemCount; } void UIControl_SaveList::addItem(const std::string& label, - const std::wstring& iconName, int data) { + const std::string& iconName, int data) { IggyDataValue result; IggyDataValue value[3]; IggyStringUTF8 stringVal; - stringVal.string = (char*)label.c_str(); + stringVal.string = const_cast((char*)label.c_str()); stringVal.length = (S32)label.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -64,60 +50,28 @@ void UIControl_SaveList::addItem(const std::string& label, value[1].type = IGGY_DATATYPE_number; value[1].number = m_itemCount; - const std::u16string convName = wstring_to_u16string(iconName); - - IggyStringUTF16 stringVal2; - stringVal2.string = convName.c_str(); - stringVal2.length = convName.length(); - value[2].type = IGGY_DATATYPE_string_UTF16; - value[2].string16 = stringVal2; + IggyStringUTF8 stringVal2; + stringVal2.string = const_cast(iconName.c_str()); + stringVal2.length = iconName.length(); + value[2].type = IGGY_DATATYPE_string_UTF8; + value[2].string8 = stringVal2; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_addNewItemFunc, 3, value); } -void UIControl_SaveList::addItem(const std::wstring& label, - const std::wstring& iconName, int data) { - IggyDataValue result; - IggyDataValue value[3]; - - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = (S32)convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; - - value[1].type = IGGY_DATATYPE_number; - value[1].number = m_itemCount; - - const std::u16string convName = wstring_to_u16string(iconName); - - IggyStringUTF16 stringVal2; - stringVal2.string = convName.c_str(); - stringVal2.length = convName.length(); - value[2].type = IGGY_DATATYPE_string_UTF16; - value[2].string16 = stringVal2; - IggyResult out = - IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, - getIggyValuePath(), m_addNewItemFunc, 3, value); -} - -void UIControl_SaveList::setTextureName(int iId, const std::wstring& iconName) { +void UIControl_SaveList::setTextureName(int iId, const std::string& iconName) { IggyDataValue result; IggyDataValue value[2]; value[0].type = IGGY_DATATYPE_number; value[0].number = iId; - const std::u16string convName = wstring_to_u16string(iconName); - - IggyStringUTF16 stringVal; - stringVal.string = convName.c_str(); - stringVal.length = convName.length(); - value[1].type = IGGY_DATATYPE_string_UTF16; - value[1].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(iconName.c_str()); + stringVal.length = iconName.length(); + value[1].type = IGGY_DATATYPE_string_UTF8; + value[1].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetTextureName, 2, value); diff --git a/targets/app/common/UI/Controls/UIControl_SaveList.h b/targets/app/common/UI/Controls/UIControl_SaveList.h index 457943027..1ceca021a 100644 --- a/targets/app/common/UI/Controls/UIControl_SaveList.h +++ b/targets/app/common/UI/Controls/UIControl_SaveList.h @@ -20,19 +20,19 @@ public: using UIControl_ButtonList::addItem; - void addItem(const std::wstring& label); void addItem(const std::string& label); + // void addItem(const std::wstring& label); - void addItem(const std::wstring& label, int data); void addItem(const std::string& label, int data); + // void addItem(const std::wstring& label, int data); - void addItem(const std::string& label, const std::wstring& iconName); - void addItem(const std::wstring& label, const std::wstring& iconName); - void setTextureName(int iId, const std::wstring& iconName); + void addItem(const std::string& label, const std::string& iconName); + // void addItem(const std::string& label, const std::wstring& iconName); + void setTextureName(int iId, const std::string& iconName); private: - void addItem(const std::string& label, const std::wstring& iconName, - int data); - void addItem(const std::wstring& label, const std::wstring& iconName, + void addItem(const std::string& label, const std::string& iconName, int data); + // void addItem(const std::string& label, const std::string& iconName, + // int data); }; \ No newline at end of file diff --git a/targets/app/common/UI/Controls/UIControl_Slider.cpp b/targets/app/common/UI/Controls/UIControl_Slider.cpp index 055d9d1b3..1c54934c8 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/UI/Controls/UIControl_Slider.cpp @@ -26,8 +26,8 @@ bool UIControl_Slider::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Slider specific initialisers - m_funcSetRelativeSliderPos = registerFastName(L"SetRelativeSliderPos"); - m_funcGetRealWidth = registerFastName(L"GetRealWidth"); + m_funcSetRelativeSliderPos = registerFastName("SetRelativeSliderPos"); + m_funcGetRealWidth = registerFastName("GetRealWidth"); return success; } @@ -40,16 +40,14 @@ void UIControl_Slider::init(UIString label, int id, int min, int max, m_max = max; m_current = current; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[5]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = (int)id; @@ -102,7 +100,7 @@ S32 UIControl_Slider::GetRealWidth() { } void UIControl_Slider::setAllPossibleLabels(int labelCount, - wchar_t labels[][256]) { + char labels[][256]) { m_allPossibleLabels.clear(); for (unsigned int i = 0; i < labelCount; ++i) { m_allPossibleLabels.push_back(labels[i]); diff --git a/targets/app/common/UI/Controls/UIControl_Slider.h b/targets/app/common/UI/Controls/UIControl_Slider.h index 5eeab750a..9481fa15c 100644 --- a/targets/app/common/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/UI/Controls/UIControl_Slider.h @@ -22,7 +22,7 @@ private: int m_max; int m_current; - std::vector m_allPossibleLabels; + std::vector m_allPossibleLabels; // 4J-TomK - function for setting slider position on touch IggyName m_funcSetRelativeSliderPos; @@ -38,7 +38,7 @@ public: void handleSliderMove(int newValue); void SetSliderTouchPos(float fTouchPos); - virtual void setAllPossibleLabels(int labelCount, wchar_t labels[][256]); + virtual void setAllPossibleLabels(int labelCount, char labels[][256]); S32 GetRealWidth(); virtual void ReInit(); diff --git a/targets/app/common/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/UI/Controls/UIControl_SlotList.cpp index 4308839e6..9e46bd740 100644 --- a/targets/app/common/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/UI/Controls/UIControl_SlotList.cpp @@ -16,9 +16,9 @@ bool UIControl_SlotList::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_addSlotFunc = registerFastName(L"addSlot"); - m_setRedBoxFunc = registerFastName(L"SetSlotRedBox"); - m_setHighlightFunc = registerFastName(L"SetSlotHighlight"); + m_addSlotFunc = registerFastName("addSlot"); + m_setRedBoxFunc = registerFastName("SetSlotRedBox"); + m_setHighlightFunc = registerFastName("SetSlotHighlight"); m_lastHighlighted = 0; diff --git a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp index 8f1256647..3ea91d2e4 100644 --- a/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -25,9 +25,9 @@ bool UIControl_SpaceIndicatorBar::setupControl(UIScene* scene, bool success = UIControl_Base::setupControl(scene, parent, controlName); // Progress specific initialisers - m_setSaveSizeFunc = registerFastName(L"setSaveGameSize"); - m_setTotalSizeFunc = registerFastName(L"setTotalSize"); - m_setSaveGameOffsetFunc = registerFastName(L"setSaveGameOffset"); + m_setSaveSizeFunc = registerFastName("setSaveGameSize"); + m_setTotalSizeFunc = registerFastName("setTotalSize"); + m_setSaveGameOffsetFunc = registerFastName("setSaveGameOffset"); return success; } @@ -39,16 +39,14 @@ void UIControl_SpaceIndicatorBar::init(UIString label, int id, int64_t min, m_min = min; m_max = max; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, diff --git a/targets/app/common/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/UI/Controls/UIControl_TextInput.cpp index b8704ad8b..98156e1fd 100644 --- a/targets/app/common/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/UI/Controls/UIControl_TextInput.cpp @@ -18,9 +18,9 @@ bool UIControl_TextInput::setupControl(UIScene* scene, IggyValuePath* parent, bool success = UIControl_Base::setupControl(scene, parent, controlName); // TextInput specific initialisers - m_textName = registerFastName(L"text"); - m_funcChangeState = registerFastName(L"ChangeState"); - m_funcSetCharLimit = registerFastName(L"SetCharLimit"); + m_textName = registerFastName("text"); + m_funcChangeState = registerFastName("ChangeState"); + m_funcSetCharLimit = registerFastName("SetCharLimit"); return success; } @@ -29,16 +29,14 @@ void UIControl_TextInput::init(UIString label, int id) { m_label = label; m_id = id; - const std::u16string convLabel = wstring_to_u16string(label.getString()); - IggyDataValue result; IggyDataValue value[2]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.getString().c_str()); + stringVal.length = label.getString().length(); + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = id; diff --git a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp index 3194f5d1a..a91292bee 100644 --- a/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.cpp @@ -20,31 +20,29 @@ bool UIControl_TexturePackList::setupControl(UIScene* scene, bool success = UIControl_Base::setupControl(scene, parent, controlName); // SlotList specific initialisers - m_addPackFunc = registerFastName(L"addPack"); - m_clearSlotsFunc = registerFastName(L"removeAllItems"); - m_funcSelectSlot = registerFastName(L"SelectSlot"); - m_funcEnableSelector = registerFastName(L"EnableSelector"); - m_funcSetTouchFocus = registerFastName(L"SetTouchFocus"); - m_funcCanTouchTrigger = registerFastName(L"CanTouchTrigger"); - m_funcGetRealHeight = registerFastName(L"GetRealHeight"); + m_addPackFunc = registerFastName("addPack"); + m_clearSlotsFunc = registerFastName("removeAllItems"); + m_funcSelectSlot = registerFastName("SelectSlot"); + m_funcEnableSelector = registerFastName("EnableSelector"); + m_funcSetTouchFocus = registerFastName("SetTouchFocus"); + m_funcCanTouchTrigger = registerFastName("CanTouchTrigger"); + m_funcGetRealHeight = registerFastName("GetRealHeight"); return success; } -void UIControl_TexturePackList::init(const std::wstring& label, int id) { +void UIControl_TexturePackList::init(const std::string& label, int id) { m_label = label; m_id = id; - const std::u16string convLabel = wstring_to_u16string(label); - IggyDataValue result; IggyDataValue value[2]; - value[0].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].string16 = stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = id; @@ -54,20 +52,18 @@ void UIControl_TexturePackList::init(const std::wstring& label, int id) { } void UIControl_TexturePackList::addPack(int id, - const std::wstring& textureName) { - const std::u16string convName = wstring_to_u16string(textureName); - + const std::string& textureName) { IggyDataValue result; IggyDataValue value[2]; value[0].type = IGGY_DATATYPE_number; value[0].number = id; - value[1].type = IGGY_DATATYPE_string_UTF16; - IggyStringUTF16 stringVal; + value[1].type = IGGY_DATATYPE_string_UTF8; + IggyStringUTF8 stringVal; - stringVal.string = convName.c_str(); - stringVal.length = convName.length(); - value[1].string16 = stringVal; + stringVal.string = const_cast(textureName.c_str()); + stringVal.length = textureName.length(); + value[1].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_addPackFunc, 2, value); diff --git a/targets/app/common/UI/Controls/UIControl_TexturePackList.h b/targets/app/common/UI/Controls/UIControl_TexturePackList.h index e687ec630..de7dab64a 100644 --- a/targets/app/common/UI/Controls/UIControl_TexturePackList.h +++ b/targets/app/common/UI/Controls/UIControl_TexturePackList.h @@ -24,9 +24,9 @@ public: virtual bool setupControl(UIScene* scene, IggyValuePath* parent, const std::string& controlName); - void init(const std::wstring& label, int id); + void init(const std::string& label, int id); - void addPack(int id, const std::wstring& textureName); + void addPack(int id, const std::string& textureName); void selectSlot(int id); void clearSlots(); diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 21bfdb274..cddc30b87 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -30,33 +30,33 @@ UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, // Setup all the Iggy references we need for this scene initialiseMovie(); - m_labelTitle.init(L"Name"); - m_labelStartX.init(L"StartX"); - m_labelStartY.init(L"StartY"); - m_labelStartZ.init(L"StartZ"); - m_labelEndX.init(L"EndX"); - m_labelEndY.init(L"EndY"); - m_labelEndZ.init(L"EndZ"); + m_labelTitle.init("Name"); + m_labelStartX.init("StartX"); + m_labelStartY.init("StartY"); + m_labelStartZ.init("StartZ"); + m_labelEndX.init("EndX"); + m_labelEndY.init("EndY"); + m_labelEndZ.init("EndZ"); - m_textInputStartX.init(L"", eControl_StartX); - m_textInputStartY.init(L"", eControl_StartY); - m_textInputStartZ.init(L"", eControl_StartZ); - m_textInputEndX.init(L"", eControl_EndX); - m_textInputEndY.init(L"", eControl_EndY); - m_textInputEndZ.init(L"", eControl_EndZ); - m_textInputName.init(L"", eControl_Name); + m_textInputStartX.init("", eControl_StartX); + m_textInputStartY.init("", eControl_StartY); + m_textInputStartZ.init("", eControl_StartZ); + m_textInputEndX.init("", eControl_EndX); + m_textInputEndY.init("", eControl_EndY); + m_textInputEndZ.init("", eControl_EndZ); + m_textInputName.init("", eControl_Name); - m_checkboxSaveMobs.init(L"Save Mobs", eControl_SaveMobs, false); - m_checkboxUseCompression.init(L"Use Compression", eControl_UseCompression, + m_checkboxSaveMobs.init("Save Mobs", eControl_SaveMobs, false); + m_checkboxUseCompression.init("Use Compression", eControl_UseCompression, false); - m_buttonCreate.init(L"Create", eControl_Create); + m_buttonCreate.init("Create", eControl_Create); m_data = new ConsoleSchematicFile::XboxSchematicInitParam(); } -std::wstring UIScene_DebugCreateSchematic::getMoviePath() { - return L"DebugCreateSchematic"; +std::string UIScene_DebugCreateSchematic::getMoviePath() { + return "DebugCreateSchematic"; } void UIScene_DebugCreateSchematic::handleInput(int iPad, int key, bool repeat, @@ -130,7 +130,7 @@ void UIScene_DebugCreateSchematic::handlePress(F64 controlId, F64 childId) { case eControl_EndZ: m_keyboardCallbackControl = (eControls)((int)controlId); PlatformInput.RequestKeyboard( - L"Enter something", L"", 0, 25, + "Enter something", "", 0, 25, [this](bool bRes) -> int { return handleKeyboardComplete(bRes); }, @@ -157,16 +157,16 @@ void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, int UIScene_DebugCreateSchematic::handleKeyboardComplete(bool bRes) { const char* text = PlatformInput.GetText(); if (text[0] != '\0') { - std::wstring value = convStringToWstring(text); + std::string value = text; int iVal = 0; if (!value.empty()) iVal = fromWString(value); switch (m_keyboardCallbackControl) { case eControl_Name: m_textInputName.setLabel(value); if (!value.empty()) { - swprintf(m_data->name, 64, L"%ls", value.c_str()); + snprintf(m_data->name, 64, "%s", value.c_str()); } else { - swprintf(m_data->name, 64, L"schematic"); + snprintf(m_data->name, 64, "schematic"); } break; case eControl_StartX: diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index 198852cae..8cfeb20da 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -68,7 +68,7 @@ protected: UI_MAP_ELEMENT(m_labelTitle, "LabelTitle") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index f9efe3f44..673ff8e1a 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -11,31 +11,31 @@ class UILayer; -const wchar_t* +const char* UIScene_DebugOptionsMenu::m_DebugCheckboxTextA[eDebugSetting_Max + 1] = { - L"Load Saves From Local Folder Mode", - L"Write Saves To Local Folder Mode", - L"Freeze Players", // L"Not Used", - L"Display Safe Area", - L"Mobs don't attack", - L"Freeze Time", - L"Disable Weather", - L"Craft Anything", - L"Use DPad for debug", - L"Mobs don't tick", - L"Art tools", // L"Instant Mine", - L"Show UI Console", - L"Distributable Save", - L"Debug Leaderboards", - L"Height-Water Maps", - L"Superflat Nether", - // L"Light/Dark background", - L"More lightning when thundering", - L"Biome override", - // L"Go To End", - L"Go To Overworld", - L"Unlock All DLC", // L"Toggle Font", - L"Show Marketing Guide", + "Load Saves From Local Folder Mode", + "Write Saves To Local Folder Mode", + "Freeze Players", // "Not Used", + "Display Safe Area", + "Mobs don't attack", + "Freeze Time", + "Disable Weather", + "Craft Anything", + "Use DPad for debug", + "Mobs don't tick", + "Art tools", // "Instant Mine", + "Show UI Console", + "Distributable Save", + "Debug Leaderboards", + "Height-Water Maps", + "Superflat Nether", + // "Light/Dark background", + "More lightning when thundering", + "Biome override", + // "Go To End", + "Go To Overworld", + "Unlock All DLC", // "Toggle Font", + "Show Marketing Guide", }; UIScene_DebugOptionsMenu::UIScene_DebugOptionsMenu(int iPad, void* initData, @@ -51,15 +51,15 @@ UIScene_DebugOptionsMenu::UIScene_DebugOptionsMenu(int iPad, void* initData, m_iTotalCheckboxElements < eDebugSetting_Max && m_iTotalCheckboxElements < 21; ++m_iTotalCheckboxElements) { - std::wstring label(m_DebugCheckboxTextA[m_iTotalCheckboxElements]); + std::string label(m_DebugCheckboxTextA[m_iTotalCheckboxElements]); m_checkboxes[m_iTotalCheckboxElements].init( label, m_iTotalCheckboxElements, (uiDebugBitmask & (1 << m_iTotalCheckboxElements)) ? true : false); } } -std::wstring UIScene_DebugOptionsMenu::getMoviePath() { - return L"DebugOptionsMenu"; +std::string UIScene_DebugOptionsMenu::getMoviePath() { + return "DebugOptionsMenu"; } void UIScene_DebugOptionsMenu::handleInput(int iPad, int key, bool repeat, diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h index 70dd20462..6aedef022 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -11,7 +11,7 @@ class UILayer; class UIScene_DebugOptionsMenu : public UIScene { private: - static const wchar_t* m_DebugCheckboxTextA[eDebugSetting_Max + 1]; + static const char* m_DebugCheckboxTextA[eDebugSetting_Max + 1]; int m_iTotalCheckboxElements; @@ -46,7 +46,7 @@ protected: UI_MAP_ELEMENT(m_checkboxes[20], "checkbox21") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index a169bbf51..40a9c1de6 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -48,26 +48,26 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData, initialiseMovie(); Minecraft* pMinecraft = Minecraft::GetInstance(); - wchar_t TempString[256]; - swprintf(TempString, 256, L"Set fov (%d)", + char TempString[256]; + snprintf(TempString, 256, "Set fov (%d)", (int)pMinecraft->gameRenderer->GetFovVal()); m_sliderFov.init(TempString, eControl_FOV, 0, 100, (int)pMinecraft->gameRenderer->GetFovVal()); float currentTime = pMinecraft->level->getLevelData()->getGameTime() % 24000; - swprintf((wchar_t*)TempString, 256, L"Set time (unsafe) (%d)", + snprintf((char*)TempString, 256, "Set time (unsafe) (%d)", (int)currentTime); m_sliderTime.init(TempString, eControl_Time, 0, 240, currentTime / 100); - m_buttonRain.init(L"Toggle Rain", eControl_Rain); - m_buttonThunder.init(L"Toggle Thunder", eControl_Thunder); - m_buttonSchematic.init(L"Create Schematic", eControl_Schematic); - m_buttonResetTutorial.init(L"Reset profile tutorial progress", + m_buttonRain.init("Toggle Rain", eControl_Rain); + m_buttonThunder.init("Toggle Thunder", eControl_Thunder); + m_buttonSchematic.init("Create Schematic", eControl_Schematic); + m_buttonResetTutorial.init("Reset profile tutorial progress", eControl_ResetTutorial); - m_buttonSetCamera.init(L"Set camera", eControl_SetCamera); - m_buttonSetDay.init(L"Set Day", eControl_SetDay); - m_buttonSetNight.init(L"Set Night", eControl_SetNight); + m_buttonSetCamera.init("Set camera", eControl_SetCamera); + m_buttonSetDay.init("Set Day", eControl_SetDay); + m_buttonSetNight.init("Set Night", eControl_SetNight); m_buttonListItems.init(eControl_Items); @@ -97,51 +97,51 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData, } m_buttonListMobs.init(eControl_Mobs); - m_buttonListMobs.addItem(L"Chicken"); + m_buttonListMobs.addItem("Chicken"); m_mobFactories.push_back(eTYPE_CHICKEN); - m_buttonListMobs.addItem(L"Cow"); + m_buttonListMobs.addItem("Cow"); m_mobFactories.push_back(eTYPE_COW); - m_buttonListMobs.addItem(L"Pig"); + m_buttonListMobs.addItem("Pig"); m_mobFactories.push_back(eTYPE_PIG); - m_buttonListMobs.addItem(L"Sheep"); + m_buttonListMobs.addItem("Sheep"); m_mobFactories.push_back(eTYPE_SHEEP); - m_buttonListMobs.addItem(L"Squid"); + m_buttonListMobs.addItem("Squid"); m_mobFactories.push_back(eTYPE_SQUID); - m_buttonListMobs.addItem(L"Wolf"); + m_buttonListMobs.addItem("Wolf"); m_mobFactories.push_back(eTYPE_WOLF); - m_buttonListMobs.addItem(L"Creeper"); + m_buttonListMobs.addItem("Creeper"); m_mobFactories.push_back(eTYPE_CREEPER); - m_buttonListMobs.addItem(L"Ghast"); + m_buttonListMobs.addItem("Ghast"); m_mobFactories.push_back(eTYPE_GHAST); - m_buttonListMobs.addItem(L"Pig Zombie"); + m_buttonListMobs.addItem("Pig Zombie"); m_mobFactories.push_back(eTYPE_PIGZOMBIE); - m_buttonListMobs.addItem(L"Skeleton"); + m_buttonListMobs.addItem("Skeleton"); m_mobFactories.push_back(eTYPE_SKELETON); - m_buttonListMobs.addItem(L"Slime"); + m_buttonListMobs.addItem("Slime"); m_mobFactories.push_back(eTYPE_SLIME); - m_buttonListMobs.addItem(L"Spider"); + m_buttonListMobs.addItem("Spider"); m_mobFactories.push_back(eTYPE_SPIDER); - m_buttonListMobs.addItem(L"Zombie"); + m_buttonListMobs.addItem("Zombie"); m_mobFactories.push_back(eTYPE_ZOMBIE); - m_buttonListMobs.addItem(L"Enderman"); + m_buttonListMobs.addItem("Enderman"); m_mobFactories.push_back(eTYPE_ENDERMAN); - m_buttonListMobs.addItem(L"Silverfish"); + m_buttonListMobs.addItem("Silverfish"); m_mobFactories.push_back(eTYPE_SILVERFISH); - m_buttonListMobs.addItem(L"Cave Spider"); + m_buttonListMobs.addItem("Cave Spider"); m_mobFactories.push_back(eTYPE_CAVESPIDER); - m_buttonListMobs.addItem(L"Mooshroom"); + m_buttonListMobs.addItem("Mooshroom"); m_mobFactories.push_back(eTYPE_MUSHROOMCOW); - m_buttonListMobs.addItem(L"Snow Golem"); + m_buttonListMobs.addItem("Snow Golem"); m_mobFactories.push_back(eTYPE_SNOWMAN); - m_buttonListMobs.addItem(L"Ender Dragon"); + m_buttonListMobs.addItem("Ender Dragon"); m_mobFactories.push_back(eTYPE_ENDERDRAGON); - m_buttonListMobs.addItem(L"Blaze"); + m_buttonListMobs.addItem("Blaze"); m_mobFactories.push_back(eTYPE_BLAZE); - m_buttonListMobs.addItem(L"Magma Cube"); + m_buttonListMobs.addItem("Magma Cube"); m_mobFactories.push_back(eTYPE_LAVASLIME); } -std::wstring UIScene_DebugOverlay::getMoviePath() { return L"DebugMenu"; } +std::string UIScene_DebugOverlay::getMoviePath() { return "DebugMenu"; } void UIScene_DebugOverlay::customDraw(IggyCustomDrawCallbackRegion* region) { Minecraft* pMinecraft = Minecraft::GetInstance(); @@ -150,8 +150,8 @@ void UIScene_DebugOverlay::customDraw(IggyCustomDrawCallbackRegion* region) { return; int itemId = -1; - // 4jcraft TODO: UB on our platform since this casts char16_t* to wchar_t* - swscanf((wchar_t*)region->name, L"item_%d", &itemId); + // 4jcraft TODO: UB on our platform since this casts char16_t* to char* + sscanf((char*)region->name, "item_%d", &itemId); if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == nullptr) { app.DebugPrintf("This is not the control we are looking for\n"); @@ -276,9 +276,9 @@ void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue) { MinecraftServer::SetTime(currentValue * 100); pMinecraft->level->getLevelData()->setGameTime(currentValue * 100); - wchar_t TempString[256]; + char TempString[256]; float currentTime = currentValue * 100; - swprintf(TempString, 256, L"Set time (unsafe) (%d)", + snprintf(TempString, 256, "Set time (unsafe) (%d)", (int)currentTime); m_sliderTime.setLabel(TempString); } break; @@ -286,8 +286,8 @@ void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue) { Minecraft* pMinecraft = Minecraft::GetInstance(); pMinecraft->gameRenderer->SetFovVal((float)currentValue); - wchar_t TempString[256]; - swprintf(TempString, 256, L"Set fov (%d)", (int)currentValue); + char TempString[256]; + snprintf(TempString, 256, "Set fov (%d)", (int)currentValue); m_sliderFov.setLabel(TempString); } break; }; diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h index db1f3cf06..c331ce0b9 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -67,7 +67,7 @@ protected: UI_MAP_ELEMENT(m_buttonSetCamera, "setCamera") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void customDraw(IggyCustomDrawCallbackRegion* region); diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 5d77ae589..730e86c4e 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -49,37 +49,37 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData, currentPosition->m_elev = pMinecraft->localplayers[playerNo]->xRot; } - wchar_t TempString[256]; + char TempString[256]; - swprintf(TempString, 256, L"%f", currentPosition->m_camX); + snprintf(TempString, 256, "%f", currentPosition->m_camX); m_textInputX.init(TempString, eControl_CamX); - swprintf(TempString, 256, L"%f", currentPosition->m_camY); + snprintf(TempString, 256, "%f", currentPosition->m_camY); m_textInputY.init(TempString, eControl_CamY); - swprintf(TempString, 256, L"%f", currentPosition->m_camZ); + snprintf(TempString, 256, "%f", currentPosition->m_camZ); m_textInputZ.init(TempString, eControl_CamZ); - swprintf(TempString, 256, L"%f", currentPosition->m_yRot); + snprintf(TempString, 256, "%f", currentPosition->m_yRot); m_textInputYRot.init(TempString, eControl_YRot); - swprintf(TempString, 256, L"%f", currentPosition->m_elev); + snprintf(TempString, 256, "%f", currentPosition->m_elev); m_textInputElevation.init(TempString, eControl_Elevation); - m_checkboxLockPlayer.init(L"Lock Player", eControl_LockPlayer, + m_checkboxLockPlayer.init("Lock Player", eControl_LockPlayer, app.GetFreezePlayers()); - m_buttonTeleport.init(L"Teleport", eControl_Teleport); + m_buttonTeleport.init("Teleport", eControl_Teleport); - m_labelTitle.init(L"Set Camera Position"); - m_labelCamX.init(L"CamX"); - m_labelCamY.init(L"CamY"); - m_labelCamZ.init(L"CamZ"); - m_labelYRotElev.init(L"Y-Rot & Elevation (Degs)"); + m_labelTitle.init("Set Camera Position"); + m_labelCamX.init("CamX"); + m_labelCamY.init("CamY"); + m_labelCamZ.init("CamZ"); + m_labelYRotElev.init("Y-Rot & Elevation (Degs)"); } -std::wstring UIScene_DebugSetCamera::getMoviePath() { - return L"DebugSetCamera"; +std::string UIScene_DebugSetCamera::getMoviePath() { + return "DebugSetCamera"; } void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat, @@ -119,7 +119,7 @@ void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId) { case eControl_Elevation: m_keyboardCallbackControl = (eControls)((int)controlId); PlatformInput.RequestKeyboard( - L"Enter something", L"", 0, 25, + "Enter something", "", 0, 25, [this](bool bRes) -> int { return handleKeyboardComplete(bRes); }, @@ -140,7 +140,7 @@ void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, int UIScene_DebugSetCamera::handleKeyboardComplete(bool bRes) { const char* text = PlatformInput.GetText(); if (text[0] != '\0') { - std::wstring value = convStringToWstring(text); + std::string value = text; double val = 0; if (!value.empty()) val = fromWString(value); switch (m_keyboardCallbackControl) { diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 693130c97..061f00481 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -63,7 +63,7 @@ protected: UI_MAP_ELEMENT(m_labelYRotElev, "LabelYRotElev") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 022f2a29b..9fc4d9e3e 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -45,8 +45,8 @@ void IUIScene_StartGame::HandleDLCMountingComplete() { std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - wchar_t imageName[64]; - swprintf(imageName, 64, L"tpack%08x", tp->getId()); + char imageName[64]; + snprintf(imageName, 64, "tpack%08x", tp->getId()); registerSubstitutionTexture(imageName, imageData, imageBytes); m_texturePackList.addPack(i, imageName); } @@ -148,9 +148,9 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index) { StringTable* pStringTable = new StringTable(pbFileData, dwFileBytes); m_texturePackTitle.SetText( - pStringTable->getString(L"IDS_DISPLAY_NAME")); + pStringTable->getString("IDS_DISPLAY_NAME")); m_texturePackDescription.SetText( - pStringTable->getString(L"IDS_TP_DESCRIPTION")); + pStringTable->getString("IDS_TP_DESCRIPTION")); } app.GetFileFromTPD(eTPDFileType_Icon, pbData, dwBytes, &pbFileData, @@ -179,23 +179,23 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index) { // if(imageBytes > 0 && imageData) //{ - // registerSubstitutionTexture(L"texturePackIcon", imageData, + // registerSubstitutionTexture("texturePackIcon", imageData, // imageBytes); - // m_bitmapTexturePackIcon.setTextureName(L"texturePackIcon"); + // m_bitmapTexturePackIcon.setTextureName("texturePackIcon"); // } - wchar_t imageName[64]; - swprintf(imageName, 64, L"tpack%08x", tp->getId()); + char imageName[64]; + snprintf(imageName, 64, "tpack%08x", tp->getId()); m_bitmapTexturePackIcon.setTextureName(imageName); imageData = tp->getPackComparison(imageBytes); if (imageBytes > 0 && imageData) { - swprintf(imageName, 64, L"texturePackComparison%08x", tp->getId()); + snprintf(imageName, 64, "texturePackComparison%08x", tp->getId()); registerSubstitutionTexture(imageName, imageData, imageBytes); m_bitmapComparison.setTextureName(imageName); } else { - m_bitmapComparison.setTextureName(L""); + m_bitmapComparison.setTextureName(""); } } } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index e353b9026..4e90a5ab0 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -58,7 +58,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, initialiseMovie(); m_worldName = app.GetString(IDS_DEFAULT_WORLD_NAME); - m_seed = L""; + m_seed = ""; m_iPad = iPad; @@ -76,11 +76,11 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, m_texturePackList.init(app.GetString(IDS_DLC_MENU_TEXTUREPACKS), eControl_TexturePackList); - m_labelTexturePackName.init(L""); - m_labelTexturePackDescription.init(L""); + m_labelTexturePackName.init(""); + m_labelTexturePackDescription.init(""); - wchar_t TempString[256]; - swprintf(TempString, 256, L"%ls: %ls", app.GetString(IDS_SLIDER_DIFFICULTY), + char TempString[256]; + snprintf(TempString, 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings( m_iPad, eGameSetting_Difficulty)])); m_sliderDifficulty.init( @@ -193,11 +193,11 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void* initData, std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - wchar_t imageName[64]; - swprintf(imageName, 64, L"tpack%08x", tp->getId()); + char imageName[64]; + snprintf(imageName, 64, "tpack%08x", tp->getId()); registerSubstitutionTexture(imageName, imageData, imageBytes); m_texturePackList.addPack(i, imageName); - app.DebugPrintf("Adding texture pack %ls at %d\n", imageName, + app.DebugPrintf("Adding texture pack %s at %d\n", imageName, i); } } @@ -275,8 +275,8 @@ void UIScene_CreateWorldMenu::updateComponents() { m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); } -std::wstring UIScene_CreateWorldMenu::getMoviePath() { - return L"CreateWorldMenu"; +std::string UIScene_CreateWorldMenu::getMoviePath() { + return "CreateWorldMenu"; } UIControl* UIScene_CreateWorldMenu::GetMainPanel() { @@ -359,8 +359,7 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId) { m_bIgnoreInput = false; // 4J HEG - No reason to set value if keyboard was cancelled if (bRes) { - std::wstring str = - convStringToWstring(PlatformInput.GetText()); + std::string str = PlatformInput.GetText(); if (!str.empty()) { m_editWorldName.setLabel(str); m_worldName = std::move(str); @@ -472,7 +471,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { // do we have a license? if (m_pDLCPack && - !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { + !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, "")) { // no // We need to allow people to use a trial texture pack if they are @@ -511,14 +510,14 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow() { } void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_Difficulty: m_sliderDifficulty.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_Difficulty, value); - swprintf(TempString, 256, L"%ls: %ls", + snprintf(TempString, 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[value])); m_sliderDifficulty.setLabel(TempString); @@ -702,18 +701,18 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, app.ClearTerrainFeaturePosition(); // create the world and launch - std::wstring wWorldName = pClass->m_worldName; + std::string wWorldName = pClass->m_worldName; PlatformStorage.ResetSaveData(); // Make our next save default to the name of the level - PlatformStorage.SetSaveTitle((wchar_t*)wWorldName.c_str()); + PlatformStorage.SetSaveTitle((char*)wWorldName.c_str()); - std::wstring wSeed; + std::string wSeed; if (!pClass->m_MoreOptionsParams.seed.empty()) { wSeed = pClass->m_MoreOptionsParams.seed; } else { // random - wSeed = L""; + wSeed = ""; } // start the game @@ -729,8 +728,8 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, // Check if the input string contains a numerical value bool isNumber = true; for (unsigned int i = 0; i < len; ++i) { - if (wSeed.at(i) < L'0' || wSeed.at(i) > L'9') { - if (!(i == 0 && wSeed.at(i) == L'-')) { + if (wSeed.at(i) < '0' || wSeed.at(i) > '9') { + if (!(i == 0 && wSeed.at(i) == '-')) { isNumber = false; break; } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index 099081bcd..ee1237adb 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -36,8 +36,8 @@ private: static int m_iDifficultyTitleSettingA[4]; - std::wstring m_worldName; - std::wstring m_seed; + std::string m_worldName; + std::string m_seed; UIControl m_controlMainPanel; UIControl_Label m_labelWorldName; @@ -86,7 +86,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleTimerComplete(int id); virtual void handleGainFocus(bool navBack); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 69c000834..f028964d1 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -27,7 +27,7 @@ UIScene_DLCMainMenu::UIScene_DLCMainMenu(int iPad, void* initData, m_buttonListOffers.init(eControl_OffersList); if (m_loadedResolution == eSceneResolution_1080) { - m_labelXboxStore.init(L""); + m_labelXboxStore.init(""); } } @@ -37,7 +37,7 @@ UIScene_DLCMainMenu::~UIScene_DLCMainMenu() { app.SetLiveLinkRequired(false); } -std::wstring UIScene_DLCMainMenu::getMoviePath() { return L"DLCMainMenu"; } +std::string UIScene_DLCMainMenu::getMoviePath() { return "DLCMainMenu"; } void UIScene_DLCMainMenu::updateTooltips() { ui.SetTooltips(m_iPad, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index 1467af02a..c216c32ff 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -45,7 +45,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 2e2431ca1..c02b8a636 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -38,14 +38,14 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData, m_labelOffers.init(app.GetString(IDS_DOWNLOADABLE_CONTENT_OFFERS)); m_buttonListOffers.init(eControl_OffersList); - m_labelHTMLSellText.init(L" "); - m_labelPriceTag.init(L" "); + m_labelHTMLSellText.init(" "); + m_labelPriceTag.init(" "); m_bHasPurchased = false; m_bIsSelected = false; if (m_loadedResolution == eSceneResolution_1080) { - m_labelXboxStore.init(L""); + m_labelXboxStore.init(""); } } @@ -66,7 +66,7 @@ int UIScene_DLCOffersMenu::ExitDLCOffersMenu( return 0; } -std::wstring UIScene_DLCOffersMenu::getMoviePath() { return L"DLCOffersMenu"; } +std::string UIScene_DLCOffersMenu::getMoviePath() { return "DLCOffersMenu"; } void UIScene_DLCOffersMenu::updateTooltips() { int iA = -1; diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index a2dc9c4f3..584bb262f 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -53,7 +53,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 85cdd36cd..f54343940 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -27,14 +27,14 @@ UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer) m_buttonConfirm.init(app.GetString(IDS_TOOLTIPS_ACCEPT), eControl_Confirm); - std::wstring EULA = L""; + std::string EULA = ""; - std::vector paragraphs; + std::vector paragraphs; int lastIndex = 0; - for (int index = EULA.find(L"\r\n", lastIndex, 2); - index != std::wstring::npos; - index = EULA.find(L"\r\n", lastIndex, 2)) { - paragraphs.push_back(EULA.substr(lastIndex, index - lastIndex) + L" "); + for (int index = EULA.find("\r\n", lastIndex, 2); + index != std::string::npos; + index = EULA.find("\r\n", lastIndex, 2)) { + paragraphs.push_back(EULA.substr(lastIndex, index - lastIndex) + " "); lastIndex = index + 2; } paragraphs.push_back(EULA.substr(lastIndex, EULA.length() - lastIndex)); @@ -63,7 +63,7 @@ UIScene_EULA::~UIScene_EULA() { m_parentLayer->removeComponent(eUIComponent_Logo); } -std::wstring UIScene_EULA::getMoviePath() { return L"EULA"; } +std::string UIScene_EULA::getMoviePath() { return "EULA"; } void UIScene_EULA::updateTooltips() { ui.SetTooltips(DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index 645cb0a68..84172be8b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -36,7 +36,7 @@ public: virtual void updateTooltips(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 08a72f7fa..66c74e7e3 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -45,7 +45,7 @@ UIScene_Intro::UIScene_Intro(int iPad, void* initData, UILayer* parentLayer) m_funcSetIntroPlatform, 3, value); } -std::wstring UIScene_Intro::getMoviePath() { return L"Intro"; } +std::string UIScene_Intro::getMoviePath() { return "Intro"; } void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index 7334886dc..473342785 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -18,7 +18,7 @@ private: IggyName m_funcSetIntroPlatform; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcSetIntroPlatform, L"SetIntroPlatform") + UI_MAP_NAME(m_funcSetIntroPlatform, "SetIntroPlatform") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -30,7 +30,7 @@ public: virtual bool hasFocus(int iPad) { return bHasFocus; } protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 68f768a4f..b846bb591 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -4,10 +4,7 @@ #include #include -#include "platform/PlatformTypes.h" -#include "platform/profile/profile.h" #include "app/common/App_Defines.h" -#include "minecraft/GameEnums.h" #include "app/common/Network/GameNetworkManager.h" #include "app/common/Network/SessionInfo.h" #include "app/common/UI/All Platforms/UIStructs.h" @@ -18,9 +15,12 @@ #include "app/common/UI/UIScene.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" +#include "minecraft/GameEnums.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/level/LevelSettings.h" +#include "platform/PlatformTypes.h" +#include "platform/profile/profile.h" #include "strings.h" #define UPDATE_PLAYERS_TIMER_ID 0 @@ -54,9 +54,8 @@ void UIScene_JoinMenu::tick() { if (!m_friendInfoRequestIssued) { ui.NavigateToScene(m_iPad, eUIScene_Timer); g_NetworkManager.GetFullFriendSessionInfo( - m_selectedSession, [this](bool success) { - friendSessionUpdated(success, this); - }); + m_selectedSession, + [this](bool success) { friendSessionUpdated(success, this); }); m_friendInfoRequestIssued = true; } @@ -221,8 +220,8 @@ void UIScene_JoinMenu::friendSessionUpdated(bool success, void* pParam) { } } -int UIScene_JoinMenu::ErrorDialogReturned(void* pParam, int iPad, - const IPlatformStorage::EMessageResult) { +int UIScene_JoinMenu::ErrorDialogReturned( + void* pParam, int iPad, const IPlatformStorage::EMessageResult) { UIScene_JoinMenu* scene = (UIScene_JoinMenu*)pParam; ui.NavigateBack(scene->m_iPad); @@ -234,7 +233,7 @@ void UIScene_JoinMenu::updateComponents() { m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, true); } -std::wstring UIScene_JoinMenu::getMoviePath() { return L"JoinMenu"; } +std::string UIScene_JoinMenu::getMoviePath() { return "JoinMenu"; } void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { @@ -387,8 +386,9 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { bool pccAllowed = true; bool pccFriendsAllowed = true; - PlatformProfile.AllowedPlayerCreatedContent( - PlatformProfile.GetPrimaryPad(), false, &pccAllowed, &pccFriendsAllowed); + PlatformProfile.AllowedPlayerCreatedContent(PlatformProfile.GetPrimaryPad(), + false, &pccAllowed, + &pccFriendsAllowed); if (!pccAllowed && !pccFriendsAllowed) noUGC = true; if (noUGC) { @@ -465,14 +465,14 @@ void UIScene_JoinMenu::handleTimerComplete(int id) { if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playersList.SetText(i, L"WWWWWWWWWWWWWWWW"); + playersList.SetText(i, "WWWWWWWWWWWWWWWW"); } else #endif { - playersList.SetText( - i, convStringToWstring( - m_selectedSession->data.szPlayers[i]) - .c_str()); + playersList + .SetText(i, + m_selectedSession->data.szPlayers[i]) + .c_str(); } } else { // Leave the loop when we hit the first nullptr player diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index c77044633..67f2121ed 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -81,7 +81,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index aa6e82ad5..444d53517 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -200,21 +200,21 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu( // set the default text #if defined(_LARGE_WORLDS) - std::wstring wsText = L""; + std::string wsText = ""; if (m_params->bGenerateOptions) { wsText = app.GetString(IDS_GAMEOPTION_SEED); } else { wsText = app.GetString(IDS_GAMEOPTION_ONLINE); } #else - std::wstring wsText = app.GetString(IDS_GAMEOPTION_ONLINE); + std::string wsText = app.GetString(IDS_GAMEOPTION_ONLINE); #endif EHTMLFontSize size = eHTMLSize_Normal; if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); wsText = startTags + wsText; if (m_tabIndex == TAB_WORLD_OPTIONS) @@ -254,8 +254,8 @@ void UIScene_LaunchMoreOptionsMenu::updateComponents() { // #endif } -std::wstring UIScene_LaunchMoreOptionsMenu::getMoviePath() { - return L"LaunchMoreOptionsMenu"; +std::string UIScene_LaunchMoreOptionsMenu::getMoviePath() { + return "LaunchMoreOptionsMenu"; } void UIScene_LaunchMoreOptionsMenu::tick() { @@ -497,13 +497,13 @@ void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, #endif }; - std::wstring wsText = app.GetString(stringId); + std::string wsText = app.GetString(stringId); EHTMLFontSize size = eHTMLSize_Normal; if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); wsText = startTags + wsText; @@ -552,8 +552,7 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId) { [this](bool bRes) -> int { // 4J HEG - No reason to set value if keyboard was cancelled if (bRes) { - std::wstring str = - convStringToWstring(PlatformInput.GetText()); + std::string str = PlatformInput.GetText(); m_editSeed.setLabel(str); m_params->seed = std::move(str); } diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 43069d299..228865ead 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -131,8 +131,8 @@ private: "CheckboxResizeType") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcChangeTab, L"ChangeTab") - UI_MAP_NAME(m_funcSetMenuType, L"SetMenuType") + UI_MAP_NAME(m_funcChangeTab, "ChangeTab") + UI_MAP_NAME(m_funcSetMenuType, "SetMenuType") UI_END_MAP_ELEMENTS_AND_NAMES() LaunchMoreOptionsMenuInitData* m_params; @@ -151,7 +151,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void tick(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 65ecfd09b..ed50aee4d 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -121,13 +121,13 @@ UIScene_LeaderboardsMenu::UIScene_LeaderboardsMenu(int iPad, void* initData, SetLeaderboardHeader(); m_currentFilter = IPlatformLeaderboard::eFM_Friends; - wchar_t filterBuffer[40]; - swprintf(filterBuffer, 40, L"%ls%ls", app.GetString(IDS_LEADERBOARD_FILTER), + char filterBuffer[40]; + snprintf(filterBuffer, 40, "%s%s", app.GetString(IDS_LEADERBOARD_FILTER), app.GetString(IDS_LEADERBOARD_FILTER_FRIENDS)); m_labelFilter.init(filterBuffer); - wchar_t entriesBuffer[40]; - swprintf(entriesBuffer, 40, L"%ls%i", + char entriesBuffer[40]; + snprintf(entriesBuffer, 40, "%s%i", app.GetString(IDS_LEADERBOARD_ENTRIES), 0); m_labelEntries.init(entriesBuffer); @@ -154,8 +154,8 @@ void UIScene_LeaderboardsMenu::updateComponents() { m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); } -std::wstring UIScene_LeaderboardsMenu::getMoviePath() { - return L"LeaderboardMenu"; +std::string UIScene_LeaderboardsMenu::getMoviePath() { + return "LeaderboardMenu"; } void UIScene_LeaderboardsMenu::tick() { @@ -294,24 +294,24 @@ void UIScene_LeaderboardsMenu::handleInput(int iPad, int key, bool repeat, switch (m_currentFilter) { case IPlatformLeaderboard::eFM_Friends: { m_currentFilter = IPlatformLeaderboard::eFM_MyScore; - wchar_t filterBuffer[40]; - swprintf(filterBuffer, 40, L"%ls%ls", + char filterBuffer[40]; + snprintf(filterBuffer, 40, "%s%s", app.GetString(IDS_LEADERBOARD_FILTER), app.GetString(IDS_LEADERBOARD_FILTER_MYSCORE)); m_labelFilter.setLabel(filterBuffer); } break; case IPlatformLeaderboard::eFM_MyScore: { m_currentFilter = IPlatformLeaderboard::eFM_TopRank; - wchar_t filterBuffer[40]; - swprintf(filterBuffer, 40, L"%ls%ls", + char filterBuffer[40]; + snprintf(filterBuffer, 40, "%s%s", app.GetString(IDS_LEADERBOARD_FILTER), app.GetString(IDS_LEADERBOARD_FILTER_OVERALL)); m_labelFilter.setLabel(filterBuffer); } break; case IPlatformLeaderboard::eFM_TopRank: { m_currentFilter = IPlatformLeaderboard::eFM_Friends; - wchar_t filterBuffer[40]; - swprintf(filterBuffer, 40, L"%ls%ls", + char filterBuffer[40]; + snprintf(filterBuffer, 40, "%s%s", app.GetString(IDS_LEADERBOARD_FILTER), app.GetString(IDS_LEADERBOARD_FILTER_FRIENDS)); m_labelFilter.setLabel(filterBuffer); @@ -445,12 +445,12 @@ bool UIScene_LeaderboardsMenu::RetrieveStats() { m_leaderboard.m_entries[entryIndex].m_row = entryIndex; m_leaderboard.m_entries[entryIndex].m_rank = entryIndex + 1; - swprintf( + snprintf( m_leaderboard.m_entries[entryIndex].m_wcRank, 12, - L"12345678"); //(int)m_leaderboard.m_entries[entryIndex].m_rank); + "12345678"); //(int)m_leaderboard.m_entries[entryIndex].m_rank); - swprintf(m_leaderboard.m_entries[entryIndex].m_gamerTag, 17, - L"WWWWWWWWWWWWWWWW"); + snprintf(m_leaderboard.m_entries[entryIndex].m_gamerTag, 17, + "WWWWWWWWWWWWWWWW"); // m_leaderboard.m_entries[entryIndex].m_locale = (entryIndex % 37) // + 1; @@ -464,13 +464,13 @@ bool UIScene_LeaderboardsMenu::RetrieveStats() { if (!isDistanceLeaderboard) { m_leaderboard.m_entries[entryIndex].m_columns[i] = USHRT_MAX; - swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], - 12, L"%u", + snprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], + 12, "%u", m_leaderboard.m_entries[entryIndex].m_columns[i]); } else { m_leaderboard.m_entries[entryIndex].m_columns[i] = UINT_MAX; - swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], - 12, L"%.1fkm", + snprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], + 12, "%.1fkm", ((float)m_leaderboard.m_entries[entryIndex] .m_columns[i]) / 100.f / 1000.f); @@ -626,7 +626,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( leaderboardEntry->m_rank = statsRow->m_rank; unsigned int displayRank = leaderboardEntry->m_rank; if (displayRank > 9999999) displayRank = 9999999; - swprintf(leaderboardEntry->m_wcRank, 12, L"%u", displayRank); + snprintf(leaderboardEntry->m_wcRank, 12, "%u", displayRank); leaderboardEntry->m_idsErrorMessage = statsRow->m_idsErrorMessage; @@ -650,16 +650,16 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( } memcpy(leaderboardEntry->m_gamerTag, statsRow->m_name.data(), - statsRow->m_name.size() * sizeof(wchar_t)); + statsRow->m_name.size() * sizeof(char)); // Copy the other columns for (unsigned int i = 0; i < statsRow->m_statsSize; i++) { leaderboardEntry->m_columns[i] = statsRow->m_statsData[i]; - memset(leaderboardEntry->m_wcColumns[i], 0, 12 * sizeof(wchar_t)); + memset(leaderboardEntry->m_wcColumns[i], 0, 12 * sizeof(char)); if (!isDistanceLeaderboard) { unsigned int displayValue = leaderboardEntry->m_columns[i]; if (displayValue > 99999) displayValue = 99999; - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%u", displayValue); + snprintf(leaderboardEntry->m_wcColumns[i], 12, "%u", displayValue); } else { // check how many digits we have int iDigitC = 0; @@ -673,15 +673,15 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry( } if (iDigitC < 4) { // m - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%um", + snprintf(leaderboardEntry->m_wcColumns[i], 12, "%um", leaderboardEntry->m_columns[i]); } else if (iDigitC < 8) { // km with a .X - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", + snprintf(leaderboardEntry->m_wcColumns[i], 12, "%.1fkm", ((float)leaderboardEntry->m_columns[i]) / 1000.f); } else { // bigger than that, so no decimal point - swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", + snprintf(leaderboardEntry->m_wcColumns[i], 12, "%.0fkm", ((float)leaderboardEntry->m_columns[i]) / 1000.f); } } @@ -697,20 +697,20 @@ void UIScene_LeaderboardsMenu::PopulateLeaderboard( app.GetString(IDS_LEADERBOARD_GAMERTAG)); // Update entries display - wchar_t entriesBuffer[40]; + char entriesBuffer[40]; if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - swprintf(entriesBuffer, 40, L"%ls12345678", + snprintf(entriesBuffer, 40, "%s12345678", app.GetString(IDS_LEADERBOARD_ENTRIES)); } else { - swprintf(entriesBuffer, 40, L"%ls%i", + snprintf(entriesBuffer, 40, "%s%i", app.GetString(IDS_LEADERBOARD_ENTRIES), m_leaderboard.m_totalEntryCount); } m_labelEntries.setLabel(entriesBuffer); - m_labelInfo.setLabel(L""); + m_labelInfo.setLabel(""); m_labelInfo.setVisible(false); m_listEntries.initLeaderboard( @@ -734,8 +734,8 @@ void UIScene_LeaderboardsMenu::PopulateLeaderboard( true, // 4J-JEV: Has error message to display. - app.GetString(idsErrorMessage), L"", L"", L"", L"", L"", - L""); + app.GetString(idsErrorMessage), "", "", "", "", "", + ""); } else { m_listEntries.addDataSet( isLast, m_leaderboard.m_entries[i].m_row, @@ -759,11 +759,11 @@ void UIScene_LeaderboardsMenu::PopulateLeaderboard( } } } else { - m_listEntries.setupTitles(L"", L""); + m_listEntries.setupTitles("", ""); // Update entries display (to zero) - wchar_t entriesBuffer[40]; - swprintf(entriesBuffer, 40, L"%ls0", + char entriesBuffer[40]; + snprintf(entriesBuffer, 40, "%s0", app.GetString(IDS_LEADERBOARD_ENTRIES)); m_labelEntries.setLabel(entriesBuffer); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index f43436509..396304e39 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -55,11 +55,11 @@ private: unsigned int m_row; // Row identifier for passing to Iggy as a unique identifier unsigned int m_rank; - wchar_t m_wcRank[12]; - wchar_t m_gamerTag[XUSER_NAME_SIZE + 1]; + char m_wcRank[12]; + char m_gamerTag[XUSER_NAME_SIZE + 1]; // int m_locale; unsigned int m_columns[7]; - wchar_t m_wcColumns[7][12]; + char m_wcColumns[7][12]; bool m_bPlayer; // Is the player bool m_bOnline; // Is online bool m_bFriend; // Is friend @@ -132,7 +132,7 @@ private: int GetEntryStartIndex(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void tick(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 6e3fb18c2..71015957d 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -71,7 +71,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, LoadMenuInitData* params = (LoadMenuInitData*)initData; // m_labelGameName.init(app.GetString(IDS_WORLD_NAME)); - m_labelSeed.init(L""); + m_labelSeed.init(""); m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL)); m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL), @@ -82,12 +82,12 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, m_texturePackList.init(app.GetString(IDS_DLC_MENU_TEXTUREPACKS), eControl_TexturePackList); - m_labelTexturePackName.init(L""); - m_labelTexturePackDescription.init(L""); + m_labelTexturePackName.init(""); + m_labelTexturePackDescription.init(""); m_CurrentDifficulty = app.GetGameSettings(m_iPad, eGameSetting_Difficulty); - wchar_t TempString[256]; - swprintf(TempString, 256, L"%ls: %ls", app.GetString(IDS_SLIDER_DIFFICULTY), + char TempString[256]; + snprintf(TempString, 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings( m_iPad, eGameSetting_Difficulty)])); m_sliderDifficulty.init( @@ -187,8 +187,8 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - wchar_t textureName[64]; - swprintf(textureName, 64, L"loadsave"); + char textureName[64]; + snprintf(textureName, 64, "loadsave"); registerSubstitutionTexture(textureName, imageData, imageBytes); m_bitmapIcon.setTextureName(textureName); } @@ -223,8 +223,8 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void* initData, std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - wchar_t imageName[64]; - swprintf(imageName, 64, L"tpack%08x", tp->getId()); + char imageName[64]; + snprintf(imageName, 64, "tpack%08x", tp->getId()); registerSubstitutionTexture(imageName, imageData, imageBytes); m_texturePackList.addPack(i, imageName); } @@ -256,7 +256,7 @@ void UIScene_LoadMenu::updateComponents() { } } -std::wstring UIScene_LoadMenu::getMoviePath() { return L"LoadMenu"; } +std::string UIScene_LoadMenu::getMoviePath() { return "LoadMenu"; } UIControl* UIScene_LoadMenu::GetMainPanel() { return &m_controlMainPanel; } @@ -300,12 +300,12 @@ void UIScene_LoadMenu::tick() { // #endif if (szSeed[0] != 0) { - wchar_t TempString[256]; - swprintf(TempString, 256, L"%ls: %hs", app.GetString(IDS_SEED), + char TempString[256]; + snprintf(TempString, 256, "%s: %hs", app.GetString(IDS_SEED), szSeed); m_labelSeed.setLabel(TempString); } else { - m_labelSeed.setLabel(L""); + m_labelSeed.setLabel(""); } // Setup all the text and checkboxes to match what the game was saved @@ -608,7 +608,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { // do we have a license? if (m_pDLCPack && - !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { + !m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, "")) { // no // We need to allow people to use a trial texture pack if they are @@ -667,14 +667,14 @@ void UIScene_LoadMenu::StartSharedLaunchFlow() { } void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_Difficulty: m_sliderDifficulty.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_Difficulty, value); - swprintf(TempString, 256, L"%ls: %ls", + snprintf(TempString, 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[value])); m_sliderDifficulty.setLabel(TempString); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 837e68c12..96a3ebff3 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -81,7 +81,7 @@ private: std::uint8_t* m_pbThumbnailData; unsigned int m_uiThumbnailSize; - std::wstring m_thumbnailName; + std::string m_thumbnailName; bool m_bRebuildTouchBoxes; @@ -101,7 +101,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 6e668360f..a45cf9f2f 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -33,7 +33,7 @@ #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize = 0L; -std::wstring UIScene_LoadOrJoinMenu::m_wstrStageText = L""; +std::string UIScene_LoadOrJoinMenu::m_wstrStageText = ""; bool UIScene_LoadOrJoinMenu::m_bSaveTransferRunning = false; #endif @@ -315,9 +315,9 @@ void UIScene_LoadOrJoinMenu::handleGainFocus(bool navBack) { if (m_bMultiplayerAllowed) { #if TO_BE_IMPLEMENTED HXUICLASS hClassFullscreenProgress = - XuiFindClass(L"CScene_FullscreenProgress"); + XuiFindClass("CScene_FullscreenProgress"); HXUICLASS hClassConnectingProgress = - XuiFindClass(L"CScene_ConnectingProgress"); + XuiFindClass("CScene_ConnectingProgress"); // If we are navigating back from a full screen progress scene, then // that means a connection attempt failed @@ -350,8 +350,8 @@ void UIScene_LoadOrJoinMenu::handleLoseFocus() { killTimer(JOIN_LOAD_ONLINE_TIMER_ID); } -std::wstring UIScene_LoadOrJoinMenu::getMoviePath() { - return L"LoadOrJoinMenu"; +std::string UIScene_LoadOrJoinMenu::getMoviePath() { + return "LoadOrJoinMenu"; } void UIScene_LoadOrJoinMenu::tick() { @@ -397,7 +397,7 @@ void UIScene_LoadOrJoinMenu::tick() { m_iSaveDetailsCount = m_pSaveDetails->iSaveC; for (unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i) { m_buttonListSaves.addItem( - m_pSaveDetails->SaveInfoA[i].UTF8SaveTitle, L""); + m_pSaveDetails->SaveInfoA[i].UTF8SaveTitle, ""); m_saveDetails[i].saveId = i; memcpy(m_saveDetails[i].UTF8SaveName, @@ -449,9 +449,9 @@ void UIScene_LoadOrJoinMenu::tick() { MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 // string, // in char's (= bytes), including end-of-string \0 - (wchar_t*)u16Message, // destination buffer + (char*)u16Message, // destination buffer MAX_SAVEFILENAME_LENGTH // size of destination buffer, in - // wchar_t's + // char's ); #else std::uint32_t srcmax, dstmax; @@ -470,14 +470,14 @@ void UIScene_LoadOrJoinMenu::tick() { #endif if (m_saveDetails[m_iRequestingThumbnailId].pbThumbnailData) { registerSubstitutionTexture( - (wchar_t*)u16Message, + (char*)u16Message, m_saveDetails[m_iRequestingThumbnailId].pbThumbnailData, m_saveDetails[m_iRequestingThumbnailId] .dwThumbnailSize); } m_buttonListSaves.setTextureName( m_iRequestingThumbnailId + m_iDefaultButtonsC, - (wchar_t*)u16Message); + (char*)u16Message); ++m_iRequestingThumbnailId; if (m_iRequestingThumbnailId < @@ -564,7 +564,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() { if (app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) { uiSaveC = 0; - File savesDir(L"Saves"); + File savesDir("Saves"); if (savesDir.exists()) { m_saves = savesDir.listFiles(); uiSaveC = (unsigned int)m_saves->size(); @@ -578,13 +578,13 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() { AddDefaultButtons(); for (unsigned int i = 0; i < listItems; i++) { - std::wstring wName = m_saves->at(i)->getName(); - wchar_t* name = new wchar_t[wName.size() + 1]; + std::string wName = m_saves->at(i)->getName(); + char* name = new char[wName.size() + 1]; for (unsigned int j = 0; j < wName.size(); ++j) { name[j] = wName[j]; } name[wName.size()] = 0; - m_buttonListSaves.addItem(name, L""); + m_buttonListSaves.addItem(name, ""); } m_bSavesDisplayed = true; m_bAllLoaded = true; @@ -644,7 +644,7 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons() { } // 4J-JEV: For debug. Ignore worlds with no name. - const wchar_t* wstr = levelGen->getWorldName(); + const char* wstr = levelGen->getWorldName(); m_buttonListSaves.addItem(wstr); m_generators.push_back(levelGen); @@ -658,8 +658,8 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons() { std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - wchar_t imageName[64]; - swprintf(imageName, 64, L"tpack%08x", tp->getId()); + char imageName[64]; + snprintf(imageName, 64, "tpack%08x", tp->getId()); registerSubstitutionTexture(imageName, imageData, imageBytes); m_buttonListSaves.setTextureName( m_buttonListSaves.getItemCount() - 1, imageName); @@ -1017,7 +1017,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex) { void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions* levelGen) { // Load data from disc - // File saveFile( L"Tutorial\\Tutorial" ); + // File saveFile( "Tutorial\\Tutorial" ); // LoadSaveFromDisk(&saveFile); // clear out the app's terrain features list @@ -1159,7 +1159,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { it < m_currentSessions->end(); ++it) { FriendSessionInfo* sessionInfo = *it; - wchar_t textureName[64] = L"\0"; + char textureName[64] = "\0"; // Is this a default game or a texture pack game? if (sessionInfo->data.texturePackParentId != 0) { @@ -1184,7 +1184,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { &imageData, &tpdImageBytes); imageBytes = static_cast(tpdImageBytes); if (imageBytes > 0 && imageData) { - swprintf(textureName, 64, L"%ls", + snprintf(textureName, 64, "%s", sessionInfo->displayLabel); registerSubstitutionTexture(textureName, imageData, imageBytes); @@ -1192,7 +1192,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { } else { imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - swprintf(textureName, 64, L"%ls", + snprintf(textureName, 64, "%s", sessionInfo->displayLabel); registerSubstitutionTexture(textureName, imageData, imageBytes); @@ -1207,7 +1207,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { std::uint8_t* imageData = tp->getPackIcon(imageBytes); if (imageBytes > 0 && imageData) { - swprintf(textureName, 64, L"%ls", + snprintf(textureName, 64, "%s", sessionInfo->displayLabel); registerSubstitutionTexture(textureName, imageData, imageBytes); @@ -1341,8 +1341,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk( #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() { - wchar_t wFileName[128]; - mbstowcs( + char wFileName[128]; + strncpy( wFileName, app.getRemoteStorage()->getLocalFilename(), strlen(app.getRemoteStorage()->getLocalFilename()) + 1); // plus null File cloudFile(wFileName); @@ -1350,8 +1350,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() { PlatformStorage.ResetSaveData(); // Make our next save default to the name of the level - wchar_t wSaveName[128]; - mbstowcs( + char wSaveName[128]; + strncpy( wSaveName, app.getRemoteStorage()->getSaveNameUTF8(), strlen(app.getRemoteStorage()->getSaveNameUTF8()) + 1); // plus null PlatformStorage.SetSaveTitle(wSaveName); @@ -1480,17 +1480,17 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned( { pClass->m_bIgnoreInput = true; // bring up a keyboard - wchar_t wSaveName[128]; + char wSaveName[128]; // CD - Fix - We must memset the SaveName - memset(wSaveName, 0, 128 * sizeof(wchar_t)); - mbstowcs( + memset(wSaveName, 0, 128 * sizeof(char)); + strncpy( wSaveName, pClass ->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC] .UTF8SaveName, strlen(pClass->m_saveDetails->UTF8SaveName) + 1); // plus null - wchar_t* ptr = wSaveName; + char* ptr = wSaveName; PlatformInput.RequestKeyboard( app.GetString(IDS_RENAME_WORLD_TITLE), wSaveName, 0, 25, [pClass](bool bRes) -> int { @@ -1638,7 +1638,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { bool bAbortCalled = false; Minecraft* pMinecraft = Minecraft::GetInstance(); bool bSaveFileCreated = false; - wchar_t wSaveName[128]; + char wSaveName[128]; // get the save file size pMinecraft->progressRenderer->progressStagePercentage(0); @@ -1702,7 +1702,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { // Make our next save default to the name of the level const char* pNameUTF8 = app.getRemoteStorage()->getSaveNameUTF8(); - mbstowcs(wSaveName, pNameUTF8, + strncpy(wSaveName, pNameUTF8, strlen(pNameUTF8) + 1); // plus null PlatformStorage.SetSaveTitle(wSaveName); std::uint8_t* pbThumbnailData = nullptr; @@ -1755,8 +1755,8 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { // we can't cancel here, we need the saves info so we can delete // the file if (pClass->m_saveTransferDownloadCancelled) { - wchar_t wcTemp[256]; - swprintf( + char wcTemp[256]; + snprintf( wcTemp, 256, app.GetString( IDS_CANCEL)); // MGH - should change this string to @@ -1780,8 +1780,8 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { } break; case eSaveTransfer_GettingSavesInfo: if (pClass->m_saveTransferDownloadCancelled) { - wchar_t wcTemp[256]; - swprintf( + char wcTemp[256]; + snprintf( wcTemp, 256, app.GetString( IDS_CANCEL)); // MGH - should change this string to @@ -1818,15 +1818,15 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { } case eSaveTransfer_GettingFileData: { - wchar_t wcTemp[256]; + char wcTemp[256]; int dataProgress = app.getRemoteStorage()->getDataProgress(); pMinecraft->progressRenderer->progressStagePercentage( dataProgress); - // swprintf(wcTemp, 256, L"Downloading data : %d", + // snprintf(wcTemp, 256, "Downloading data : %d", // dataProgress);//app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA),0,pClass->m_ulFileSize); - swprintf(wcTemp, 256, + snprintf(wcTemp, 256, app.GetString(IDS_SAVETRANSFER_STAGE_GET_DATA), dataProgress); m_wstrStageText = wcTemp; @@ -2000,8 +2000,8 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { case eSaveTransfer_Error: { if (bSaveFileCreated) { if (pClass->m_saveTransferDownloadCancelled) { - wchar_t wcTemp[256]; - swprintf(wcTemp, 256, + char wcTemp[256]; + snprintf(wcTemp, 256, app.GetString( IDS_CANCEL)); // MGH - should change this // string to "cancelling diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 666f636ff..d03c6b834 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -133,7 +133,7 @@ private: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: int loadSaveDataThumbnailReturned(std::uint8_t* pbThumbnail, @@ -191,7 +191,7 @@ private: }; eSaveTransferState m_eSaveTransferState; static unsigned long m_ulFileSize; - static std::wstring m_wstrStageText; + static std::string m_wstrStageText; static bool m_bSaveTransferRunning; int m_iProgress; char diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index a298e7a3c..46f40fe3b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -74,16 +74,16 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void* initData, doHorizontalResizeCheck(); - m_splash = L""; + m_splash = ""; - std::wstring filename = L"splashes.txt"; + std::string filename = "splashes.txt"; if (app.hasArchiveFile(filename)) { std::vector splashesArray = app.getArchiveFile(filename); ByteArrayInputStream bais(splashesArray); InputStreamReader isr(&bais); BufferedReader br(&isr); - std::wstring line = L""; + std::string line = ""; while (!(line = br.readLine()).empty()) { line = trimString(line); if (line.length() > 0) { @@ -196,7 +196,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack) { m_splash = m_splashes.at(splashIndex); } -std::wstring UIScene_MainMenu::getMoviePath() { return L"MainMenu"; } +std::string UIScene_MainMenu::getMoviePath() { return "MainMenu"; } void UIScene_MainMenu::handleReload() {} @@ -532,8 +532,8 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, PlatformProfile.SetLockedProfile(PlatformProfile.GetPrimaryPad()); // change the minecraft player name - Minecraft::GetInstance()->user->name = convStringToWstring( - PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad())); + Minecraft::GetInstance()->user->name = + PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad()); { bool bSignedInLive = PlatformProfile.IsSignedInLive(iPad); @@ -594,8 +594,8 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, #else Minecraft* pMinecraft = Minecraft::GetInstance(); pMinecraft->user->name = - convStringToWstring(PlatformProfile.GetGamertag( - PlatformProfile.GetPrimaryPad())); + PlatformProfile.GetGamertag( + PlatformProfile.GetPrimaryPad()); // ensure we've applied this player's settings app.ApplyGameSettingsChanged(iPad); @@ -808,8 +808,8 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { &CScene_Main::DeviceSelectReturned, this) == true) { // change the minecraft player name pMinecraft->user->name = - convStringToWstring(PlatformProfile.GetGamertag( - PlatformProfile.GetPrimaryPad())); + PlatformProfile.GetGamertag( + PlatformProfile.GetPrimaryPad()); // save device already selected // ensure we've applied this player's settings @@ -839,8 +839,8 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { m_Timer.SetShow(true); } #else - pMinecraft->user->name = convStringToWstring( - PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad())); + pMinecraft->user->name = + PlatformProfile.GetGamertag(PlatformProfile.GetPrimaryPad()); // ensure we've applied this player's settings app.ApplyGameSettingsChanged(iPad); @@ -1058,7 +1058,7 @@ void UIScene_MainMenu::LoadTrial(void) { // is complete app.SetGameHostOption(eGameHostOption_DisableSaving, 1); - PlatformStorage.SetSaveTitle(L"Tutorial"); + PlatformStorage.SetSaveTitle("Tutorial"); // Reset the autosave time app.SetAutosaveTimerTime(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index 89892fa19..da092417b 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -60,8 +60,8 @@ private: float m_fScreenWidth, m_fScreenHeight; float m_fRawWidth, m_fRawHeight; - std::vector m_splashes; - std::wstring m_splash; + std::vector m_splashes; + std::string m_splash; enum eSplashIndexes { eSplashHappyBirthdayEx = 0, eSplashHappyBirthdayNotch, @@ -109,7 +109,7 @@ public: protected: void customDrawSplash(IggyCustomDrawCallbackRegion* region); - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void tick(); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 1129f0402..1edae7b8c 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -25,18 +25,18 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData, m_buttonConfirm.init(app.GetString(IDS_TOOLTIPS_ACCEPT), eControl_Confirm); - std::wstring message = app.GetString(IDS_TITLEUPDATE); - message.append(L"\r\n"); + std::string message = app.GetString(IDS_TITLEUPDATE); + message.append("\r\n"); message = app.FormatHTMLString(m_iPad, message); - std::vector paragraphs; + std::vector paragraphs; int lastIndex = 0; - for (int index = message.find(L"\r\n", lastIndex, 2); - index != std::wstring::npos; - index = message.find(L"\r\n", lastIndex, 2)) { + for (int index = message.find("\r\n", lastIndex, 2); + index != std::string::npos; + index = message.find("\r\n", lastIndex, 2)) { paragraphs.push_back(message.substr(lastIndex, index - lastIndex) + - L" "); + " "); lastIndex = index + 2; } paragraphs.push_back( @@ -54,7 +54,7 @@ UIScene_NewUpdateMessage::~UIScene_NewUpdateMessage() { m_parentLayer->removeComponent(eUIComponent_Logo); } -std::wstring UIScene_NewUpdateMessage::getMoviePath() { return L"EULA"; } +std::string UIScene_NewUpdateMessage::getMoviePath() { return "EULA"; } void UIScene_NewUpdateMessage::updateTooltips() { ui.SetTooltips(DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index e177d7d10..741e00729 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -36,7 +36,7 @@ public: virtual void updateTooltips(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index d28a3ecf7..5b36680b5 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -56,7 +56,7 @@ UIScene_SaveMessage::~UIScene_SaveMessage() { m_parentLayer->removeComponent(eUIComponent_Logo); } -std::wstring UIScene_SaveMessage::getMoviePath() { return L"SaveMessage"; } +std::string UIScene_SaveMessage::getMoviePath() { return "SaveMessage"; } void UIScene_SaveMessage::updateTooltips() { ui.SetTooltips(DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT); diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index fd334e430..1e9752efc 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -28,7 +28,7 @@ private: UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) UI_MAP_ELEMENT(m_buttonConfirm, "Confirm") UI_MAP_ELEMENT(m_labelDescription, "Description") - UI_MAP_NAME(m_funcAutoResize, L"AutoResize") + UI_MAP_NAME(m_funcAutoResize, "AutoResize") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -41,7 +41,7 @@ public: virtual void updateTooltips(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index aebbdef45..408edb982 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -18,8 +18,8 @@ UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData, initialiseMovie(); } -std::wstring UIScene_TrialExitUpsell::getMoviePath() { - return L"TrialExitUpsell"; +std::string UIScene_TrialExitUpsell::getMoviePath() { + return "TrialExitUpsell"; } void UIScene_TrialExitUpsell::updateTooltips() { diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index fed184faf..f06c00362 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -22,7 +22,7 @@ public: virtual void updateTooltips(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index ec2a5d1f3..9797f1aa3 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -40,23 +40,23 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, bool bNotInGame = (Minecraft::GetInstance()->level == nullptr); if (bNotInGame) { - wchar_t* layoutString = new wchar_t[128]; - swprintf(layoutString, 128, L"%ls", VER_PRODUCTVERSION_STR_W); + char* layoutString = new char[128]; + snprintf(layoutString, 128, "%s", VER_PRODUCTVERSION_STR_W); m_labelVersion.init(layoutString); delete[] layoutString; } // 4J-PB - stop the label showing in the in-game controls menu else { - m_labelVersion.init(L" "); + m_labelVersion.init(" "); } m_bCreativeMode = !bNotInGame && Minecraft::GetInstance()->localplayers[m_iPad] && Minecraft::GetInstance()->localplayers[m_iPad]->abilities.mayfly; { - m_buttonLayouts[0].init(L"1", eControl_Button0); - m_buttonLayouts[1].init(L"2", eControl_Button1); - m_buttonLayouts[2].init(L"3", eControl_Button2); + m_buttonLayouts[0].init("1", eControl_Button0); + m_buttonLayouts[1].init("2", eControl_Button1); + m_buttonLayouts[2].init("3", eControl_Button2); } m_checkboxInvert.init( @@ -72,8 +72,8 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, int iSelected = app.GetGameSettings(m_iPad, eGameSetting_ControlScheme); - wchar_t* layoutString = new wchar_t[128]; - swprintf(layoutString, 128, L"%ls : %ls", app.GetString(IDS_CURRENT_LAYOUT), + char* layoutString = new char[128]; + snprintf(layoutString, 128, "%s : %s", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[iSelected])); { m_labelCurrentLayout.init(layoutString); @@ -92,7 +92,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, } for (unsigned int i = 0; i < e_PadCOUNT; ++i) { - m_labelsPad[i].init(L""); + m_labelsPad[i].init(""); m_controlLines[i].setVisible(false); } m_bLayoutChanged = false; @@ -100,11 +100,11 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, PositionAllText(m_iPad); } -std::wstring UIScene_ControlsMenu::getMoviePath() { +std::string UIScene_ControlsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"ControlsSplit"; + return "ControlsSplit"; } else { - return L"Controls"; + return "Controls"; } } @@ -170,8 +170,8 @@ void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId) { case eControl_Button2: app.SetGameSettings(m_iPad, eGameSetting_ControlScheme, (unsigned char)control); - wchar_t* layoutString = new wchar_t[128]; - swprintf(layoutString, 128, L"%ls : %ls", + char* layoutString = new char[128]; + snprintf(layoutString, 128, "%s : %s", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[control])); { @@ -196,7 +196,7 @@ void UIScene_ControlsMenu::handleFocusChange(F64 controlId, F64 childId) { void UIScene_ControlsMenu::PositionAllText(int iPad) { for (unsigned int i = 0; i < e_PadCOUNT; ++i) { - m_labelsPad[i].setLabel(L""); + m_labelsPad[i].setLabel(""); m_controlLines[i].setVisible(false); } @@ -297,7 +297,7 @@ void UIScene_ControlsMenu::PositionText(int iPad, int iTextID, void UIScene_ControlsMenu::PositionTextDirect(int iPad, int iTextID, int iControlDetailsIndex, bool bShow) { - const wchar_t* text = app.GetString(iTextID); + const char* text = app.GetString(iTextID); m_labelsPad[iControlDetailsIndex].setLabel(text); m_controlLines[iControlDetailsIndex].setVisible(bShow); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 35f5bf3a1..01a5ccd68 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -114,8 +114,8 @@ private: UI_MAP_ELEMENT(m_checkboxInvert, "InvertLook") UI_MAP_ELEMENT(m_checkboxSouthpaw, "SouthPaw") - UI_MAP_NAME(m_funcSetPlatform, L"SetPlatform") - UI_MAP_NAME(m_funcSetControllerLayout, L"SetControllerLayout") + UI_MAP_NAME(m_funcSetPlatform, "SetPlatform") + UI_MAP_NAME(m_funcSetControllerLayout, "SetControllerLayout") UI_MAP_ELEMENT(m_labelVersion, "Version") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -128,7 +128,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp index 6691f4bde..a8cc86b8b 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -14,129 +14,129 @@ #define CREDIT_ICON -2 SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] = { - {L"MOJANG", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"MOJANG", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_ORIGINALDESIGN, NO_TRANSLATED_STRING, eLargeText}, - {L"Markus Persson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_ORIGINALDESIGN, NO_TRANSLATED_STRING, eLargeText}, + {"Markus Persson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_PMPROD, NO_TRANSLATED_STRING, eLargeText}, - {L"Daniel Kaplan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_PMPROD, NO_TRANSLATED_STRING, eLargeText}, + {"Daniel Kaplan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_RESTOFMOJANG, NO_TRANSLATED_STRING, eMediumText}, - {L"%ls", IDS_CREDITS_LEADPC, NO_TRANSLATED_STRING, eLargeText}, - {L"Jens Bergensten", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_RESTOFMOJANG, NO_TRANSLATED_STRING, eMediumText}, + {"%s", IDS_CREDITS_LEADPC, NO_TRANSLATED_STRING, eLargeText}, + {"Jens Bergensten", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_JON_KAGSTROM, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CEO, NO_TRANSLATED_STRING, eLargeText}, - {L"Carl Manneh", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_DOF, NO_TRANSLATED_STRING, eLargeText}, - {L"Lydia Winters", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_WCW, NO_TRANSLATED_STRING, eLargeText}, - {L"Karin Severinsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_JON_KAGSTROM, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_CEO, NO_TRANSLATED_STRING, eLargeText}, + {"Carl Manneh", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_DOF, NO_TRANSLATED_STRING, eLargeText}, + {"Lydia Winters", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_WCW, NO_TRANSLATED_STRING, eLargeText}, + {"Karin Severinsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CUSTOMERSUPPORT, NO_TRANSLATED_STRING, eLargeText}, - {L"Marc Watson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_CUSTOMERSUPPORT, NO_TRANSLATED_STRING, eLargeText}, + {"Marc Watson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_DESPROG, NO_TRANSLATED_STRING, eLargeText}, - {L"Aron Nieminen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_DESPROG, NO_TRANSLATED_STRING, eLargeText}, + {"Aron Nieminen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_CHIEFARCHITECT, NO_TRANSLATED_STRING, eLargeText}, - {L"Daniel Frisk", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CODENINJA, NO_TRANSLATED_STRING, eLargeText}, - {L"%ls", IDS_CREDITS_TOBIAS_MOLLSTAM, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_OFFICEDJ, NO_TRANSLATED_STRING, eLargeText}, - {L"Kristoffer Jelbring", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_CHIEFARCHITECT, NO_TRANSLATED_STRING, eLargeText}, + {"Daniel Frisk", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_CODENINJA, NO_TRANSLATED_STRING, eLargeText}, + {"%s", IDS_CREDITS_TOBIAS_MOLLSTAM, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_OFFICEDJ, NO_TRANSLATED_STRING, eLargeText}, + {"Kristoffer Jelbring", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_DEVELOPER, NO_TRANSLATED_STRING, eLargeText}, - {L"Leonard Axelsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_DEVELOPER, NO_TRANSLATED_STRING, eLargeText}, + {"Leonard Axelsson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_BULLYCOORD, NO_TRANSLATED_STRING, eLargeText}, - {L"Jakob Porser", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_ARTDEVELOPER, NO_TRANSLATED_STRING, eLargeText}, - {L"Junkboy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_EXPLODANIM, NO_TRANSLATED_STRING, eLargeText}, - {L"Mattis Grahm", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CONCEPTART, NO_TRANSLATED_STRING, eLargeText}, - {L"Henrik Petterson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_BULLYCOORD, NO_TRANSLATED_STRING, eLargeText}, + {"Jakob Porser", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_ARTDEVELOPER, NO_TRANSLATED_STRING, eLargeText}, + {"Junkboy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_EXPLODANIM, NO_TRANSLATED_STRING, eLargeText}, + {"Mattis Grahm", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_CONCEPTART, NO_TRANSLATED_STRING, eLargeText}, + {"Henrik Petterson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_CRUNCHER, NO_TRANSLATED_STRING, eLargeText}, - {L"Patrick Geuder", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_MUSICANDSOUNDS, NO_TRANSLATED_STRING, eLargeText}, - {L"Daniel Rosenfeld (C418)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_CRUNCHER, NO_TRANSLATED_STRING, eLargeText}, + {"Patrick Geuder", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"%s", IDS_CREDITS_MUSICANDSOUNDS, NO_TRANSLATED_STRING, eLargeText}, + {"Daniel Rosenfeld (C418)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line // Added credit for horses - {L"Developers of Mo' Creatures:", NO_TRANSLATED_STRING, + {"Developers of Mo' Creatures:", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, - {L"John Olarte (DrZhark)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"John Olarte (DrZhark)", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Kent Christian Jensen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"Kent Christian Jensen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Dan Roque", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"Dan Roque", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"4J Studios", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"4J Studios", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText}, - {L"%ls", IDS_CREDITS_PROGRAMMING, NO_TRANSLATED_STRING, eLargeText}, - {L"Paddy Burns", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Richard Reavy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Stuart Ross", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"James Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Mark Hughes", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Harry Gordon", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Thomas Kronberg", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_PROGRAMMING, NO_TRANSLATED_STRING, eLargeText}, + {"Paddy Burns", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Richard Reavy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Stuart Ross", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"James Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Mark Hughes", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Harry Gordon", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Thomas Kronberg", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_ART, NO_TRANSLATED_STRING, eLargeText}, - {L"David Keningale", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_ART, NO_TRANSLATED_STRING, eLargeText}, + {"David Keningale", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Alan Redmond", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Chris Reeves", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Kate Wright", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Michael Hansen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Donald Robertson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"Alan Redmond", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Chris Reeves", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Kate Wright", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Michael Hansen", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Donald Robertson", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Jamie Keddie", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Thomas Naylor", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Brian Lindsay", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Hannah Watts", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Rebecca O'Neil", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Jamie Keddie", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Thomas Naylor", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Brian Lindsay", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Hannah Watts", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Rebecca O'Neil", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"%ls", IDS_CREDITS_QA, NO_TRANSLATED_STRING, eLargeText}, - {L"Steven Gary Woodward", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_QA, NO_TRANSLATED_STRING, eLargeText}, + {"Steven Gary Woodward", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"George Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"George Vaughan", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"%ls", IDS_CREDITS_SPECIALTHANKS, NO_TRANSLATED_STRING, eLargeText}, - {L"Chris van der Kuyl", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"%s", IDS_CREDITS_SPECIALTHANKS, NO_TRANSLATED_STRING, eLargeText}, + {"Chris van der Kuyl", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Roni Percy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Anne Clarke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, - {L"Anthony Kent", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Roni Percy", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Anne Clarke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, + {"Anthony Kent", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // Miles & Iggy credits - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"", CREDIT_ICON, eCreditIcon_Iggy, eSmallText}, // extra blank line - {L"Uses Iggy.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"", CREDIT_ICON, eCreditIcon_Iggy, eSmallText}, // extra blank line + {"Uses Iggy.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"Copyright (C) 2009-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, + {"Copyright (C) 2009-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"", CREDIT_ICON, eCreditIcon_Miles, eSmallText}, // extra blank line - {L"Uses Miles Sound System.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, + {"", CREDIT_ICON, eCreditIcon_Miles, eSmallText}, // extra blank line + {"Uses Miles Sound System.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line - {L"Copyright (C) 1991-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, + {"Copyright (C) 1991-2014 by RAD Game Tools, Inc.", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}, // extra blank line }; @@ -164,13 +164,13 @@ UIScene_Credits::UIScene_Credits(int iPad, void* initData, UILayer* parentLayer) setNextLabel(gs_aCreditDefs[i].m_Text, gs_aCreditDefs[i].m_eType); } else // using additional translated string. { - wchar_t* creditsString = new wchar_t[128]; + char* creditsString = new char[128]; if (gs_aCreditDefs[i].m_iStringID[1] != NO_TRANSLATED_STRING) { - swprintf(creditsString, 128, gs_aCreditDefs[i].m_Text, + snprintf(creditsString, 128, gs_aCreditDefs[i].m_Text, app.GetString(gs_aCreditDefs[i].m_iStringID[0]), app.GetString(gs_aCreditDefs[i].m_iStringID[1])); } else { - swprintf(creditsString, 128, gs_aCreditDefs[i].m_Text, + snprintf(creditsString, 128, gs_aCreditDefs[i].m_Text, app.GetString(gs_aCreditDefs[i].m_iStringID[0])); } setNextLabel(creditsString, gs_aCreditDefs[i].m_eType); @@ -179,7 +179,7 @@ UIScene_Credits::UIScene_Credits(int iPad, void* initData, UILayer* parentLayer) } } -std::wstring UIScene_Credits::getMoviePath() { return L"Credits"; } +std::string UIScene_Credits::getMoviePath() { return "Credits"; } void UIScene_Credits::updateTooltips() { ui.SetTooltips(m_iPad, -1, IDS_TOOLTIPS_BACK); @@ -228,30 +228,30 @@ void UIScene_Credits::tick() { addImage((ECreditIcons)pDef->m_iStringID[1]); } else // using additional translated string. { - std::wstring sanitisedString = std::wstring(pDef->m_Text); + std::string sanitisedString = std::string(pDef->m_Text); // 4J-JEV: Some DLC credits contain copyright or registered // symbols that are not rendered in some fonts. if (!ui.UsingBitmapFont()) { sanitisedString = - replaceAll(sanitisedString, L"\u00A9", L"(C)"); + replaceAll(sanitisedString, "\u00A9", "(C)"); sanitisedString = - replaceAll(sanitisedString, L"\u00AE", L"(R)"); + replaceAll(sanitisedString, "\u00AE", "(R)"); sanitisedString = - replaceAll(sanitisedString, L"\u2013", L"-"); + replaceAll(sanitisedString, "\u2013", "-"); } - wchar_t* creditsString = new wchar_t[128]; + char* creditsString = new char[128]; if (pDef->m_iStringID[0] == NO_TRANSLATED_STRING) { memset(creditsString, 0, 128); memcpy(creditsString, sanitisedString.c_str(), - sizeof(wchar_t) * sanitisedString.length()); + sizeof(char) * sanitisedString.length()); } else if (pDef->m_iStringID[1] != NO_TRANSLATED_STRING) { - swprintf(creditsString, 128, sanitisedString.c_str(), + snprintf(creditsString, 128, sanitisedString.c_str(), app.GetString(pDef->m_iStringID[0]), app.GetString(pDef->m_iStringID[1])); } else { - swprintf(creditsString, 128, sanitisedString.c_str(), + snprintf(creditsString, 128, sanitisedString.c_str(), app.GetString(pDef->m_iStringID[0])); } @@ -265,7 +265,7 @@ void UIScene_Credits::tick() { void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %ls, pressed- %ls, released- %ls\n", iPad, key, + // down- %s, pressed- %s, released- %s\n", iPad, key, // down?"true":"false", pressed?"true":"false", released?"true":"false"); ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); @@ -284,18 +284,16 @@ void UIScene_Credits::handleInput(int iPad, int key, bool repeat, bool pressed, } } -void UIScene_Credits::setNextLabel(const std::wstring& label, +void UIScene_Credits::setNextLabel(const std::string& label, ECreditTextTypes size) { IggyDataValue result; IggyDataValue value[3]; - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = (int)size; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h index 829df3f33..4920654df 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_Credits.h @@ -43,8 +43,8 @@ private: IggyName m_funcSetNextLabel, m_funcAddImage; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcSetNextLabel, L"SetNextLabel") - UI_MAP_NAME(m_funcAddImage, L"AddImage") + UI_MAP_NAME(m_funcSetNextLabel, "SetNextLabel") + UI_MAP_NAME(m_funcAddImage, "AddImage") UI_END_MAP_ELEMENTS_AND_NAMES() public: UIScene_Credits(int iPad, void* initData, UILayer* parentLayer); @@ -60,7 +60,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT @@ -70,6 +70,6 @@ public: virtual void handleRequestMoreData(F64 startIndex, bool up); private: - void setNextLabel(const std::wstring& label, ECreditTextTypes size); + void setNextLabel(const std::string& label, ECreditTextTypes size); void addImage(ECreditIcons icon); }; diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 7284a450c..38f341d24 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -76,11 +76,11 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData, UIScene_HelpAndOptionsMenu::~UIScene_HelpAndOptionsMenu() {} -std::wstring UIScene_HelpAndOptionsMenu::getMoviePath() { +std::string UIScene_HelpAndOptionsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"HelpAndOptionsMenuSplit"; + return "HelpAndOptionsMenuSplit"; } else { - return L"HelpAndOptionsMenu"; + return "HelpAndOptionsMenu"; } } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index 4c4b869de..ea34f974b 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -44,7 +44,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void handleReload(); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 132fc8dca..6846170a4 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -105,7 +105,7 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, // Setup all the Iggy references we need for this scene initialiseMovie(); - std::wstring inventoryString = app.GetString(IDS_INVENTORY); + std::string inventoryString = app.GetString(IDS_INVENTORY); m_labels[eHowToPlay_LabelCTItem].init(app.GetString(IDS_ITEM_HATCHET_WOOD)); m_labels[eHowToPlay_LabelCTGroup].init(app.GetString(IDS_GROUPNAME_TOOLS)); m_labels[eHowToPlay_LabelCTInventory3x3].init(inventoryString); @@ -132,8 +132,8 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, m_labels[eHowToPlay_LabelBInventory].init(inventoryString); m_labels[eHowToPlay_LabelAnvil_Inventory].init(inventoryString.c_str()); - std::wstring wsTemp = app.GetString(IDS_REPAIR_COST); - wsTemp.replace(wsTemp.find(L"%d"), 2, std::wstring(L"8")); + std::string wsTemp = app.GetString(IDS_REPAIR_COST); + wsTemp.replace(wsTemp.find("%d"), 2, std::string("8")); m_labels[eHowToPlay_LabelAnvil_Cost].init(wsTemp.c_str()); m_labels[eHowToPlay_LabelAnvil_ARepairAndName].init( @@ -162,9 +162,9 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, m_labels[eHowToPlay_LabelDropperInventory].init(inventoryString.c_str()); wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM); - wsTemp = replaceAll(wsTemp, L"{*VILLAGER_TYPE*}", + wsTemp = replaceAll(wsTemp, "{*VILLAGER_TYPE*}", app.GetString(IDS_VILLAGER_PRIEST)); - wsTemp.replace(wsTemp.find(L"%s"), 2, app.GetString(IDS_TILE_LIGHT_GEM)); + wsTemp.replace(wsTemp.find("%s"), 2, app.GetString(IDS_TILE_LIGHT_GEM)); m_labels[eHowToPlay_LabelTrading_VillagerOffers].init(wsTemp.c_str()); // Extract pad and required page from init data. We just put the data into @@ -178,11 +178,11 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void* initData, StartPage(eStartPage); } -std::wstring UIScene_HowToPlay::getMoviePath() { +std::string UIScene_HowToPlay::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"HowToPlaySplit"; + return "HowToPlaySplit"; } else { - return L"HowToPlay"; + return "HowToPlay"; } } @@ -265,45 +265,45 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { SHowToPlayPageDef* pDef = &(gs_aPageDefs[m_eCurrPage]); // Replace button identifiers in the text with actual button images. - std::wstring replacedText = + std::string replacedText = app.FormatHTMLString(m_iPad, app.GetString(pDef->m_iTextStringID)); // 4J-PB - replace the title with the platform specific title, and the // platform name // replacedText = - // replaceAll(replacedText,L"{*TITLE_UPDATE_NAME*}",app.GetString(IDS_TITLE_UPDATE_NAME)); - replacedText = replaceAll(replacedText, L"{*KICK_PLAYER_DESCRIPTION*}", + // replaceAll(replacedText,"{*TITLE_UPDATE_NAME*}",app.GetString(IDS_TITLE_UPDATE_NAME)); + replacedText = replaceAll(replacedText, "{*KICK_PLAYER_DESCRIPTION*}", app.GetString(IDS_KICK_PLAYER_DESCRIPTION)); - replacedText = replaceAll(replacedText, L"{*BACK_BUTTON*}", + replacedText = replaceAll(replacedText, "{*BACK_BUTTON*}", app.GetString(IDS_BACK_BUTTON)); replacedText = - replaceAll(replacedText, L"{*DISABLES_ACHIEVEMENTS*}", + replaceAll(replacedText, "{*DISABLES_ACHIEVEMENTS*}", app.GetString(IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS)); // 4J-JEV: Temporary fix: LOC: Minecraft: XB1: KO: Font: Uncategorized: // Squares appear instead of hyphens in FIREWORKS description if (!ui.UsingBitmapFont()) { - replacedText = replaceAll(replacedText, L"\u00A9", L"(C)"); - replacedText = replaceAll(replacedText, L"\u00AE", L"(R)"); - replacedText = replaceAll(replacedText, L"\u2013", L"-"); + replacedText = replaceAll(replacedText, "\u00A9", "(C)"); + replacedText = replaceAll(replacedText, "\u00AE", "(R)"); + replacedText = replaceAll(replacedText, "\u2013", "-"); } // strip out any tab characters and repeated spaces stripWhitespaceForHtml(replacedText, true); // Set the text colour - std::wstring finalText(replacedText.c_str()); - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + std::string finalText(replacedText.c_str()); + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); finalText = startTags + finalText; - std::vector paragraphs; + std::vector paragraphs; int lastIndex = 0; - for (int index = finalText.find(L"\r\n", lastIndex, 2); - index != std::wstring::npos; - index = finalText.find(L"\r\n", lastIndex, 2)) { + for (int index = finalText.find("\r\n", lastIndex, 2); + index != std::string::npos; + index = finalText.find("\r\n", lastIndex, 2)) { paragraphs.push_back(finalText.substr(lastIndex, index - lastIndex) + - L" "); + " "); lastIndex = index + 2; } paragraphs.push_back( @@ -313,19 +313,16 @@ void UIScene_HowToPlay::StartPage(EHowToPlayPage ePage) { IggyDataValue result; IggyDataValue* value = new IggyDataValue[paragraphs.size() + 1]; - IggyStringUTF16* stringVal = new IggyStringUTF16[paragraphs.size()]; + IggyStringUTF8* stringVal = new IggyStringUTF8[paragraphs.size()]; value[0].type = IGGY_DATATYPE_number; value[0].number = gs_pageToFlashMapping[(int)ePage]; for (unsigned int i = 0; i < paragraphs.size(); ++i) { - const std::u16string convParagraph = - wstring_to_u16string(paragraphs[i]); - - stringVal[i].string = convParagraph.c_str(); - stringVal[i].length = convParagraph.length(); - value[i + 1].type = IGGY_DATATYPE_string_UTF16; - value[i + 1].string16 = stringVal[i]; + stringVal[i].string = const_cast(paragraphs[i].c_str()); + stringVal[i].length = paragraphs[i].length(); + value[i + 1].type = IGGY_DATATYPE_string_UTF8; + value[i + 1].string8 = stringVal[i]; } IggyResult out = IggyPlayerCallMethodRS( diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 02ecaeb5d..f068baf2e 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -130,7 +130,7 @@ private: UI_MAP_ELEMENT(m_labels[eHowToPlay_LabelDropperText], "Label1_28") UI_MAP_ELEMENT(m_labels[eHowToPlay_LabelDropperInventory], "Label2_28") - UI_MAP_NAME(m_funcLoadPage, L"LoadHowToPlayPage") + UI_MAP_NAME(m_funcLoadPage, "LoadHowToPlayPage") UI_END_MAP_ELEMENTS_AND_NAMES() public: UIScene_HowToPlay(int iPad, void* initData, UILayer* parentLayer); @@ -140,7 +140,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void handleReload(); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index d85e378e0..c84ab18d5 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -80,11 +80,11 @@ UIScene_HowToPlayMenu::UIScene_HowToPlayMenu(int iPad, void* initData, doHorizontalResizeCheck(); } -std::wstring UIScene_HowToPlayMenu::getMoviePath() { +std::string UIScene_HowToPlayMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"HowToPlayMenuSplit"; + return "HowToPlayMenuSplit"; } else { - return L"HowToPlayMenu"; + return "HowToPlayMenu"; } } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 69be4630f..a49e14d5e 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -63,7 +63,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 04eefddb5..20a7c58f2 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -50,11 +50,11 @@ UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void* initData, } } -std::wstring UIScene_LanguageSelector::getMoviePath() { +std::string UIScene_LanguageSelector::getMoviePath() { if (app.GetLocalPlayerCount() > 1) - return L"LanguagesMenuSplit"; + return "LanguagesMenuSplit"; else - return L"LanguagesMenu"; + return "LanguagesMenu"; } void UIScene_LanguageSelector::updateTooltips() { diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index 2e5422a42..e183a6e9f 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -69,7 +69,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index dd5744486..9cd949d15 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -30,11 +30,11 @@ UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData, #endif } -std::wstring UIScene_ReinstallMenu::getMoviePath() { +std::string UIScene_ReinstallMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"ReinstallSplit"; + return "ReinstallSplit"; } else { - return L"ReinstallMenu"; + return "ReinstallMenu"; } } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index d799cb197..764686419 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -41,7 +41,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 26985f984..aeef22f6f 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -18,13 +18,13 @@ UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, // Setup all the Iggy references we need for this scene initialiseMovie(); - wchar_t TempString[256]; - swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_MUSIC), + char TempString[256]; + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_MUSIC), app.GetGameSettings(m_iPad, eGameSetting_MusicVolume)); m_sliderMusic.init(TempString, eControl_Music, 0, 100, app.GetGameSettings(m_iPad, eGameSetting_MusicVolume)); - swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_SOUND), + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SOUND), app.GetGameSettings(m_iPad, eGameSetting_SoundFXVolume)); m_sliderSound.init(TempString, eControl_Sound, 0, 100, app.GetGameSettings(m_iPad, eGameSetting_SoundFXVolume)); @@ -40,11 +40,11 @@ UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, UIScene_SettingsAudioMenu::~UIScene_SettingsAudioMenu() {} -std::wstring UIScene_SettingsAudioMenu::getMoviePath() { +std::string UIScene_SettingsAudioMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsAudioMenuSplit"; + return "SettingsAudioMenuSplit"; } else { - return L"SettingsAudioMenu"; + return "SettingsAudioMenu"; } } @@ -95,14 +95,14 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, void UIScene_SettingsAudioMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_Music: m_sliderMusic.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_MusicVolume, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_MUSIC), value); m_sliderMusic.setLabel(TempString); @@ -111,7 +111,7 @@ void UIScene_SettingsAudioMenu::handleSliderMove(F64 sliderId, m_sliderSound.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_SoundFXVolume, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SOUND), value); m_sliderSound.setLabel(TempString); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index d09d386d1..35b3cc41f 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -30,7 +30,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 6253885c7..a3e65f9e0 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -18,15 +18,15 @@ UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad, // Setup all the Iggy references we need for this scene initialiseMovie(); - wchar_t TempString[256]; - swprintf(TempString, 256, L"%ls: %d%%", + char TempString[256]; + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SENSITIVITY_INGAME), app.GetGameSettings(m_iPad, eGameSetting_Sensitivity_InGame)); m_sliderSensitivityInGame.init( TempString, eControl_SensitivityInGame, 0, 200, app.GetGameSettings(m_iPad, eGameSetting_Sensitivity_InGame)); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SENSITIVITY_INMENU), app.GetGameSettings(m_iPad, eGameSetting_Sensitivity_InMenu)); m_sliderSensitivityInMenu.init( @@ -44,11 +44,11 @@ UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad, UIScene_SettingsControlMenu::~UIScene_SettingsControlMenu() {} -std::wstring UIScene_SettingsControlMenu::getMoviePath() { +std::string UIScene_SettingsControlMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsControlMenuSplit"; + return "SettingsControlMenuSplit"; } else { - return L"SettingsControlMenu"; + return "SettingsControlMenu"; } } @@ -97,14 +97,14 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, void UIScene_SettingsControlMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_SensitivityInGame: m_sliderSensitivityInGame.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_Sensitivity_InGame, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SENSITIVITY_INGAME), value); m_sliderSensitivityInGame.setLabel(TempString); @@ -113,7 +113,7 @@ void UIScene_SettingsControlMenu::handleSliderMove(F64 sliderId, m_sliderSensitivityInMenu.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_Sensitivity_InMenu, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_SENSITIVITY_INMENU), value); m_sliderSensitivityInMenu.setLabel(TempString); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 1659543db..325fbdd9a 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -30,7 +30,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index 06cf9378a..23ac8299b 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -33,14 +33,14 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, app.GetString(IDS_CHECKBOX_CUSTOM_SKIN_ANIM), eControl_CustomSkinAnim, (app.GetGameSettings(m_iPad, eGameSetting_CustomSkinAnim) != 0)); - wchar_t TempString[256]; + char TempString[256]; - swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_GAMMA), + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_GAMMA), app.GetGameSettings(m_iPad, eGameSetting_Gamma)); m_sliderGamma.init(TempString, eControl_Gamma, 0, 100, app.GetGameSettings(m_iPad, eGameSetting_Gamma)); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_INTERFACEOPACITY), app.GetGameSettings(m_iPad, eGameSetting_InterfaceOpacity)); m_sliderInterfaceOpacity.init( @@ -80,11 +80,11 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, UIScene_SettingsGraphicsMenu::~UIScene_SettingsGraphicsMenu() {} -std::wstring UIScene_SettingsGraphicsMenu::getMoviePath() { +std::string UIScene_SettingsGraphicsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsGraphicsMenuSplit"; + return "SettingsGraphicsMenuSplit"; } else { - return L"SettingsGraphicsMenu"; + return "SettingsGraphicsMenu"; } } @@ -141,14 +141,14 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_Gamma: m_sliderGamma.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_Gamma, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_GAMMA), value); m_sliderGamma.setLabel(TempString); @@ -157,7 +157,7 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, m_sliderInterfaceOpacity.handleSliderMove(value); app.SetGameSettings(m_iPad, eGameSetting_InterfaceOpacity, value); - swprintf(TempString, 256, L"%ls: %d%%", + snprintf(TempString, 256, "%s: %d%%", app.GetString(IDS_SLIDER_INTERFACEOPACITY), value); m_sliderInterfaceOpacity.setLabel(TempString); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 5b3021e6f..967ce1aea 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -45,7 +45,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 13db8b4e4..e5719b4c2 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -43,11 +43,11 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void* initData, UIScene_SettingsMenu::~UIScene_SettingsMenu() {} -std::wstring UIScene_SettingsMenu::getMoviePath() { +std::string UIScene_SettingsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsMenuSplit"; + return "SettingsMenuSplit"; } else { - return L"SettingsMenu"; + return "SettingsMenu"; } } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index c9109c033..b8e886f58 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -41,7 +41,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index b708967fe..2c7f0a946 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -58,20 +58,20 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, m_checkboxMashupWorlds.init(IDS_UNHIDE_MASHUP_WORLDS, eControl_ShowMashUpWorlds, false); } else { - // m_checkboxMashupWorlds.init(L"",eControl_ShowMashUpWorlds,false); + // m_checkboxMashupWorlds.init("",eControl_ShowMashUpWorlds,false); removeControl(&m_checkboxMashupWorlds, true); m_bMashUpWorldsUnhideOption = false; } unsigned char ucValue = app.GetGameSettings(m_iPad, eGameSetting_Autosave); - wchar_t autosaveLabels[9][256]; + char autosaveLabels[9][256]; for (unsigned int i = 0; i < 9; ++i) { if (i == 0) { - swprintf(autosaveLabels[i], 256, L"%ls", + snprintf(autosaveLabels[i], 256, "%s", app.GetString(IDS_SLIDER_AUTOSAVE_OFF)); } else { - swprintf(autosaveLabels[i], 256, L"%ls: %d %ls", + snprintf(autosaveLabels[i], 256, "%s: %d %s", app.GetString(IDS_SLIDER_AUTOSAVE), i * 15, app.GetString(IDS_MINUTES)); } @@ -81,9 +81,9 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, ucValue); ucValue = app.GetGameSettings(m_iPad, eGameSetting_Difficulty); - wchar_t difficultyLabels[4][256]; + char difficultyLabels[4][256]; for (unsigned int i = 0; i < 4; ++i) { - swprintf(difficultyLabels[i], 256, L"%ls: %ls", + snprintf(difficultyLabels[i], 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[i])); } @@ -91,15 +91,15 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, m_sliderDifficulty.init(difficultyLabels[ucValue], eControl_Difficulty, 0, 3, ucValue); - std::wstring wsText = + std::string wsText = app.GetString(m_iDifficultySettingA[app.GetGameSettings( m_iPad, eGameSetting_Difficulty)]); EHTMLFontSize size = eHTMLSize_Normal; if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); wsText = startTags + wsText; @@ -178,11 +178,11 @@ void UIScene_SettingsOptionsMenu::tick() { } } -std::wstring UIScene_SettingsOptionsMenu::getMoviePath() { +std::string UIScene_SettingsOptionsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsOptionsMenuSplit"; + return "SettingsOptionsMenuSplit"; } else { - return L"SettingsOptionsMenu"; + return "SettingsOptionsMenu"; } } @@ -261,20 +261,20 @@ void UIScene_SettingsOptionsMenu::handleReload() { // the mash-up option is needed m_bMashUpWorldsUnhideOption = true; } else { - // m_checkboxMashupWorlds.init(L"",eControl_ShowMashUpWorlds,false); + // m_checkboxMashupWorlds.init("",eControl_ShowMashUpWorlds,false); removeControl(&m_checkboxMashupWorlds, true); m_bMashUpWorldsUnhideOption = false; } unsigned char ucValue = app.GetGameSettings(m_iPad, eGameSetting_Autosave); - wchar_t autosaveLabels[9][256]; + char autosaveLabels[9][256]; for (unsigned int i = 0; i < 9; ++i) { if (i == 0) { - swprintf(autosaveLabels[i], 256, L"%ls", + snprintf(autosaveLabels[i], 256, "%s", app.GetString(IDS_SLIDER_AUTOSAVE_OFF)); } else { - swprintf(autosaveLabels[i], 256, L"%ls: %d %ls", + snprintf(autosaveLabels[i], 256, "%s: %d %s", app.GetString(IDS_SLIDER_AUTOSAVE), i * 15, app.GetString(IDS_MINUTES)); } @@ -285,9 +285,9 @@ void UIScene_SettingsOptionsMenu::handleReload() { ucValue = app.GetGameSettings(m_iPad, eGameSetting_Difficulty); - wchar_t difficultyLabels[4][256]; + char difficultyLabels[4][256]; for (unsigned int i = 0; i < 4; ++i) { - swprintf(difficultyLabels[i], 256, L"%ls: %ls", + snprintf(difficultyLabels[i], 256, "%s: %s", app.GetString(IDS_SLIDER_DIFFICULTY), app.GetString(m_iDifficultyTitleSettingA[i])); } @@ -295,15 +295,15 @@ void UIScene_SettingsOptionsMenu::handleReload() { m_sliderDifficulty.init(difficultyLabels[ucValue], eControl_Difficulty, 0, 3, ucValue); - std::wstring wsText = + std::string wsText = app.GetString(m_iDifficultySettingA[app.GetGameSettings( m_iPad, eGameSetting_Difficulty)]); EHTMLFontSize size = eHTMLSize_Normal; if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); wsText = startTags + wsText; @@ -378,13 +378,13 @@ void UIScene_SettingsOptionsMenu::handleSliderMove(F64 sliderId, app.SetGameSettings(m_iPad, eGameSetting_Difficulty, value); - std::wstring wsText = app.GetString(m_iDifficultySettingA[value]); + std::string wsText = app.GetString(m_iDifficultySettingA[value]); EHTMLFontSize size = eHTMLSize_Normal; if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) { size = eHTMLSize_Splitscreen; } - wchar_t startTags[64]; - swprintf(startTags, 64, L"", + char startTags[64]; + snprintf(startTags, 64, "", app.GetHTMLColour(eHTMLColor_White)); wsText = startTags + wsText; m_labelDifficultyText.setLabel(wsText.c_str()); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index 3d690947a..5046ba223 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -66,7 +66,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 75a502653..125bf5abc 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -45,14 +45,14 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, (app.GetGameSettings(m_iPad, eGameSetting_DisplaySplitscreenGamertags) != 0)); - wchar_t TempString[256]; + char TempString[256]; - swprintf(TempString, 256, L"%ls: %d", app.GetString(IDS_SLIDER_UISIZE), + snprintf(TempString, 256, "%s: %d", app.GetString(IDS_SLIDER_UISIZE), app.GetGameSettings(m_iPad, eGameSetting_UISize) + 1); m_sliderUISize.init(TempString, eControl_UISize, 1, 3, app.GetGameSettings(m_iPad, eGameSetting_UISize) + 1); - swprintf(TempString, 256, L"%ls: %d", + snprintf(TempString, 256, "%s: %d", app.GetString(IDS_SLIDER_UISIZESPLITSCREEN), app.GetGameSettings(m_iPad, eGameSetting_UISizeSplitscreen) + 1); m_sliderUISizeSplitscreen.init( @@ -103,11 +103,11 @@ void UIScene_SettingsUIMenu::updateComponents() { UIScene_SettingsUIMenu::~UIScene_SettingsUIMenu() {} -std::wstring UIScene_SettingsUIMenu::getMoviePath() { +std::string UIScene_SettingsUIMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SettingsUIMenuSplit"; + return "SettingsUIMenuSplit"; } else { - return L"SettingsUIMenu"; + return "SettingsUIMenu"; } } @@ -170,13 +170,13 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, } void UIScene_SettingsUIMenu::handleSliderMove(F64 sliderId, F64 currentValue) { - wchar_t TempString[256]; + char TempString[256]; int value = (int)currentValue; switch ((int)sliderId) { case eControl_UISize: m_sliderUISize.handleSliderMove(value); - swprintf(TempString, 256, L"%ls: %d", + snprintf(TempString, 256, "%s: %d", app.GetString(IDS_SLIDER_UISIZE), value); m_sliderUISize.setLabel(TempString); @@ -191,7 +191,7 @@ void UIScene_SettingsUIMenu::handleSliderMove(F64 sliderId, F64 currentValue) { case eControl_UISizeSplitscreen: m_sliderUISizeSplitscreen.handleSliderMove(value); - swprintf(TempString, 256, L"%ls: %d", + snprintf(TempString, 256, "%s: %d", app.GetString(IDS_SLIDER_UISIZESPLITSCREEN), value); m_sliderUISizeSplitscreen.setLabel(TempString); diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index 3bca46fc5..ac245c6cf 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -55,7 +55,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 6f164c91d..810830562 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -33,16 +33,16 @@ class ModelPart; // #define SKIN_SELECT_PACK_PLAYER_CUSTOM 1 #define SKIN_SELECT_MAX_DEFAULTS 2 -const wchar_t* UIScene_SkinSelectMenu::wchDefaultNamesA[] = { - L"USE LOCALISED VERSION", // Server selected - L"Steve", - L"Tennis Steve", - L"Tuxedo Steve", - L"Athlete Steve", - L"Scottish Steve", - L"Prisoner Steve", - L"Cyclist Steve", - L"Boxer Steve", +const char* UIScene_SkinSelectMenu::wchDefaultNamesA[] = { + "USE LOCALISED VERSION", // Server selected + "Steve", + "Tennis Steve", + "Tuxedo Steve", + "Athlete Steve", + "Scottish Steve", + "Prisoner Steve", + "Cyclist Steve", + "Boxer Steve", }; UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, @@ -62,8 +62,8 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, m_originalSkinId = app.GetPlayerSkinId(iPad); m_currentSkinPath = app.GetPlayerSkinName(iPad); - m_selectedSkinPath = L""; - m_selectedCapePath = L""; + m_selectedSkinPath = ""; + m_selectedCapePath = ""; m_vAdditionalSkinBoxes = nullptr; m_bSlidingSkins = false; @@ -95,12 +95,12 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void* initData, m_characters[eCharacter_Previous4].SetFacing( UIControl_PlayerSkinPreview::e_SkinPreviewFacing_Right); - m_labelSkinName.init(L""); - m_labelSkinOrigin.init(L""); + m_labelSkinName.init(""); + m_labelSkinOrigin.init(""); - m_leftLabel = L""; - m_centreLabel = L""; - m_rightLabel = L""; + m_leftLabel = ""; + m_centreLabel = ""; + m_rightLabel = ""; // block input if we're waiting for DLC to install. The end of dlc mounting // custom message will fill the save list @@ -156,11 +156,11 @@ void UIScene_SkinSelectMenu::updateComponents() { m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); } -std::wstring UIScene_SkinSelectMenu::getMoviePath() { +std::string UIScene_SkinSelectMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SkinSelectMenuSplit"; + return "SkinSelectMenuSplit"; } else { - return L"SkinSelectMenu"; + return "SkinSelectMenu"; } } @@ -387,8 +387,8 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { case SKIN_SELECT_PACK_FAVORITES: if (app.GetPlayerFavoriteSkinsCount(iPad) > 0) { // get the pack number from the skin id - wchar_t chars[256]; - swprintf(chars, 256, L"dlcskin%08d.png", + char chars[256]; + snprintf(chars, 256, "dlcskin%08d.png", app.GetPlayerFavoriteSkin(iPad, m_skinIndex)); DLCPack* Pack = app.m_dlcManager.getPackContainingSkin(chars); @@ -499,7 +499,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad) { } void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) { - // 4jcraft: fuck wchar_t + // 4jcraft: fuck char int characterId = -1; if (region->name != nullptr && std::char_traits::length(region->name) > 9 && @@ -540,8 +540,8 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) { void UIScene_SkinSelectMenu::handleSkinIndexChanged() { bool showPrevious = false, showNext = false; int previousIndex = 0, nextIndex = 0; - std::wstring skinName = L""; - std::wstring skinOrigin = L""; + std::string skinName = ""; + std::string skinOrigin = ""; bool bSkinIsFree = false; bool bLicensed = false; DLCSkinFile* skinFile = nullptr; @@ -581,8 +581,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { m_characters[eCharacter_Current].setVisible(true); m_controlSkinNamePlate.setVisible(true); } else { - m_selectedSkinPath = L""; - m_selectedCapePath = L""; + m_selectedSkinPath = ""; + m_selectedCapePath = ""; m_vAdditionalSkinBoxes = nullptr; switch (m_packIndex) { @@ -609,8 +609,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { if (app.GetPlayerFavoriteSkinsCount(m_iPad) > 0) { // get the pack number from the skin id - wchar_t chars[256]; - swprintf(chars, 256, L"dlcskin%08d.png", + char chars[256]; + snprintf(chars, 256, "dlcskin%08d.png", app.GetPlayerFavoriteSkin(m_iPad, m_skinIndex)); Pack = app.m_dlcManager.getPackContainingSkin(chars); @@ -683,10 +683,10 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { nextIndex = getNextSkinIndex(m_skinIndex); previousIndex = getPreviousSkinIndex(m_skinIndex); - std::wstring otherSkinPath = L""; - std::wstring otherCapePath = L""; + std::string otherSkinPath = ""; + std::string otherCapePath = ""; std::vector* othervAdditionalSkinBoxes = nullptr; - wchar_t chars[256]; + char chars[256]; // turn off all displays for (unsigned int i = eCharacter_Current + 1; i < eCharacter_COUNT; ++i) { @@ -730,8 +730,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes(); backupTexture = TN_MOB_CHAR; } else { - otherSkinPath = L""; - otherCapePath = L""; + otherSkinPath = ""; + otherCapePath = ""; othervAdditionalSkinBoxes = nullptr; switch (m_packIndex) { case SKIN_SELECT_PACK_DEFAULT: @@ -740,8 +740,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { case SKIN_SELECT_PACK_FAVORITES: if (uiCurrentFavoriteC > 0) { // get the pack number from the skin id - swprintf( - chars, 256, L"dlcskin%08d.png", + snprintf( + chars, 256, "dlcskin%08d.png", app.GetPlayerFavoriteSkin(m_iPad, nextIndex)); Pack = @@ -798,8 +798,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes(); backupTexture = TN_MOB_CHAR; } else { - otherSkinPath = L""; - otherCapePath = L""; + otherSkinPath = ""; + otherCapePath = ""; othervAdditionalSkinBoxes = nullptr; switch (m_packIndex) { case SKIN_SELECT_PACK_DEFAULT: @@ -808,7 +808,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged() { case SKIN_SELECT_PACK_FAVORITES: if (uiCurrentFavoriteC > 0) { // get the pack number from the skin id - swprintf(chars, 256, L"dlcskin%08d.png", + snprintf(chars, 256, "dlcskin%08d.png", app.GetPlayerFavoriteSkin(m_iPad, previousIndex)); @@ -973,10 +973,10 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged() { case SKIN_SELECT_PACK_FAVORITES: if (app.GetPlayerFavoriteSkinsCount(m_iPad) > 0) { bool found; - wchar_t chars[256]; + char chars[256]; // get the pack number from the skin id - swprintf( - chars, 256, L"dlcskin%08d.png", + snprintf( + chars, 256, "dlcskin%08d.png", app.GetPlayerFavoriteSkin( m_iPad, app.GetPlayerFavoriteSkinsPos(m_iPad))); @@ -1102,63 +1102,57 @@ void UIScene_SkinSelectMenu::setCharacterLocked(bool locked) { m_funcSetCharacterLocked, 1, value); } -void UIScene_SkinSelectMenu::setLeftLabel(const std::wstring& label) { +void UIScene_SkinSelectMenu::setLeftLabel(const std::string& label) { if (label.compare(m_leftLabel) != 0) { m_leftLabel = label; - const std::u16string convLabel = wstring_to_u16string(label); - IggyDataValue result; IggyDataValue value[1]; - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetLeftLabel, 1, value); } } -void UIScene_SkinSelectMenu::setCentreLabel(const std::wstring& label) { +void UIScene_SkinSelectMenu::setCentreLabel(const std::string& label) { if (label.compare(m_centreLabel) != 0) { m_centreLabel = label; - const std::u16string convLabel = wstring_to_u16string(label); - IggyDataValue result; IggyDataValue value[1]; - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetCentreLabel, 1, value); } } -void UIScene_SkinSelectMenu::setRightLabel(const std::wstring& label) { +void UIScene_SkinSelectMenu::setRightLabel(const std::string& label) { if (label.compare(m_rightLabel) != 0) { m_rightLabel = label; - const std::u16string convLabel = wstring_to_u16string(label); - IggyDataValue result; IggyDataValue value[1]; - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS(getMovie(), &result, IggyPlayerRootPath(getMovie()), m_funcSetRightLabel, 1, value); @@ -1286,12 +1280,12 @@ void UIScene_SkinSelectMenu::handleReload() { m_currentNavigation = eSkinNavigation_Skin; m_currentPackCount = 0; - m_labelSkinName.init(L""); - m_labelSkinOrigin.init(L""); + m_labelSkinName.init(""); + m_labelSkinOrigin.init(""); - m_leftLabel = L""; - m_centreLabel = L""; - m_rightLabel = L""; + m_leftLabel = ""; + m_centreLabel = ""; + m_rightLabel = ""; handlePackIndexChanged(); } diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 28315e94a..be4090428 100644 --- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -24,7 +24,7 @@ class UILayer; class UIScene_SkinSelectMenu : public UIScene { private: - static const wchar_t* wchDefaultNamesA[std::to_underlying(EDefaultSkins::Count)]; + static const char* wchDefaultNamesA[std::to_underlying(EDefaultSkins::Count)]; // 4J Stu - How many to show on each side of the main control static const int sidePreviewControls = 4; @@ -88,18 +88,18 @@ private: UI_MAP_ELEMENT(m_characters[eCharacter_Previous4], "iggy_Character8") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcSetPlayerCharacterSelected, L"SetPlayerCharacterSelected") - UI_MAP_NAME(m_funcSetCharacterLocked, L"SetCharacterLocked") + UI_MAP_NAME(m_funcSetPlayerCharacterSelected, "SetPlayerCharacterSelected") + UI_MAP_NAME(m_funcSetCharacterLocked, "SetCharacterLocked") - UI_MAP_NAME(m_funcSetLeftLabel, L"SetLeftLabel") - UI_MAP_NAME(m_funcSetCentreLabel, L"SetCenterLabel") - UI_MAP_NAME(m_funcSetRightLabel, L"SetRightLabel") + UI_MAP_NAME(m_funcSetLeftLabel, "SetLeftLabel") + UI_MAP_NAME(m_funcSetCentreLabel, "SetCenterLabel") + UI_MAP_NAME(m_funcSetRightLabel, "SetRightLabel") UI_END_MAP_ELEMENTS_AND_NAMES() DLCPack* m_currentPack; int m_packIndex, m_skinIndex; std::uint32_t m_originalSkinId; - std::wstring m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath; + std::string m_currentSkinPath, m_selectedSkinPath, m_selectedCapePath; std::vector* m_vAdditionalSkinBoxes; bool m_bSlidingSkins, m_bAnimatingMove; @@ -109,7 +109,7 @@ private: int m_currentPackCount; bool m_bIgnoreInput; bool m_bSkinIndexChanged; - std::wstring m_leftLabel, m_centreLabel, m_rightLabel; + std::string m_leftLabel, m_centreLabel, m_rightLabel; S32 m_iTouchXStart; bool m_bTouchScrolled; @@ -128,7 +128,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT @@ -152,9 +152,9 @@ private: void setCharacterSelected(bool selected); void setCharacterLocked(bool locked); - void setLeftLabel(const std::wstring& label); - void setCentreLabel(const std::wstring& label); - void setRightLabel(const std::wstring& label); + void setLeftLabel(const std::string& label); + void setCentreLabel(const std::string& label); + void setRightLabel(const std::string& label); virtual void HandleDLCMountingComplete(); virtual void HandleDLCInstalled(); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 9c2a31751..6bf9d5a95 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -65,7 +65,7 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, m_slotListResult.addSlots(AnvilMenu::RESULT_SLOT, 1); bool expensive = false; - std::wstring m_costString = L""; + std::string m_costString = ""; if (m_repairMenu->cost > 0) { if (m_repairMenu->cost >= 40 && @@ -75,9 +75,9 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, } else if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem()) { // Do nothing } else { - const wchar_t* costString = app.GetString(IDS_REPAIR_COST); - wchar_t temp[256]; - swprintf(temp, 256, costString, m_repairMenu->cost); + const char* costString = app.GetString(IDS_REPAIR_COST); + char temp[256]; + snprintf(temp, 256, costString, m_repairMenu->cost); m_costString = temp; if (!m_repairMenu->getSlot(AnvilMenu::RESULT_SLOT) ->mayPickup(std::dynamic_pointer_cast( @@ -95,11 +95,11 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData, app.SetRichPresenceContext(iPad, CONTEXT_GAME_STATE_ANVIL); } -std::wstring UIScene_AnvilMenu::getMoviePath() { +std::string UIScene_AnvilMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"AnvilMenuSplit"; + return "AnvilMenuSplit"; } else { - return L"AnvilMenu"; + return "AnvilMenu"; } } @@ -322,7 +322,7 @@ void UIScene_AnvilMenu::handleEditNamePressed() { // 4J HEG - No reason to set value if keyboard was cancelled setIgnoreInput(false); if (bRes) { - std::wstring str = convStringToWstring(PlatformInput.GetText()); + std::string str = PlatformInput.GetText(); setEditNameValue(str); m_itemName = std::move(str); updateItemName(); @@ -332,24 +332,22 @@ void UIScene_AnvilMenu::handleEditNamePressed() { IPlatformInput::EKeyboardMode_Default); } -void UIScene_AnvilMenu::setEditNameValue(const std::wstring& name) { +void UIScene_AnvilMenu::setEditNameValue(const std::string& name) { m_textInputAnvil.setLabel(name); } void UIScene_AnvilMenu::setEditNameEditable(bool enabled) {} -void UIScene_AnvilMenu::setCostLabel(const std::wstring& label, +void UIScene_AnvilMenu::setCostLabel(const std::string& label, bool canAfford) { IggyDataValue result; IggyDataValue value[2]; - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_boolean; value[1].boolval = canAfford; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index b17e11b65..6a4262c7c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -52,11 +52,11 @@ protected: UI_MAP_ELEMENT(m_textInputAnvil, "AnvilTextInput") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcShowRedCross, L"ShowRedCross") - UI_MAP_NAME(m_funcSetCostLabel, L"SetCostLabel") + UI_MAP_NAME(m_funcShowRedCross, "ShowRedCross") + UI_MAP_NAME(m_funcSetCostLabel, "SetCostLabel") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual void tick(); @@ -73,10 +73,10 @@ protected: virtual UIControl* getSection(ESceneSection eSection); virtual void handleEditNamePressed(); - virtual void setEditNameValue(const std::wstring& name); + virtual void setEditNameValue(const std::string& name); virtual void setEditNameEditable(bool enabled); virtual void handleDestroy(); - void setCostLabel(const std::wstring& label, bool canAfford); + void setCostLabel(const std::string& label, bool canAfford); void showCross(bool show); }; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index 7378efa6d..a3ea7c513 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -66,11 +66,11 @@ UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_BeaconMenu::getMoviePath() { +std::string UIScene_BeaconMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"BeaconMenuSplit"; + return "BeaconMenuSplit"; } else { - return L"BeaconMenu"; + return "BeaconMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index ef2f26f56..173a4f0cb 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -62,7 +62,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual void tick(); virtual int GetBaseSlotCount() { return 4; } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 97853ac76..fb29b70e0 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -27,10 +27,10 @@ UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void* _initData, initialiseMovie(); m_progressBrewingArrow.init( - L"", 0, 0, + "", 0, 0, PotionBrewing::BREWING_TIME_SECONDS * SharedConstants::TICKS_PER_SECOND, 0); - m_progressBrewingBubbles.init(L"", 0, 0, 30, 0); + m_progressBrewingBubbles.init("", 0, 0, 30, 0); BrewingScreenInput* initData = (BrewingScreenInput*)_initData; m_brewingStand = initData->brewingStand; @@ -64,11 +64,11 @@ UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void* _initData, app.SetRichPresenceContext(iPad, CONTEXT_GAME_STATE_BREWING); } -std::wstring UIScene_BrewingStandMenu::getMoviePath() { +std::string UIScene_BrewingStandMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"BrewingStandMenuSplit"; + return "BrewingStandMenuSplit"; } else { - return L"BrewingStandMenu"; + return "BrewingStandMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h index 20d395573..ffa31b5c2 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h @@ -45,7 +45,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual void tick(); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index 06747581b..84e5a798e 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -53,18 +53,18 @@ UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void* _initData, if (initData) delete initData; } -std::wstring UIScene_ContainerMenu::getMoviePath() { +std::string UIScene_ContainerMenu::getMoviePath() { if (m_bLargeChest) { if (app.GetLocalPlayerCount() > 1) { - return L"ChestLargeMenuSplit"; + return "ChestLargeMenuSplit"; } else { - return L"ChestLargeMenu"; + return "ChestLargeMenu"; } } else { if (app.GetLocalPlayerCount() > 1) { - return L"ChestMenuSplit"; + return "ChestMenuSplit"; } else { - return L"ChestMenu"; + return "ChestMenu"; } } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h index 9113ed99c..becd3b9a4 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h @@ -35,7 +35,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index a13eef5d8..cf611ba13 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -37,7 +37,7 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, std::shared_ptr creativeContainer = std::shared_ptr( - new SimpleContainer(0, L"", false, TabSpec::MAX_SIZE)); + new SimpleContainer(0, "", false, TabSpec::MAX_SIZE)); itemPickerMenu = new ItemPickerMenu(creativeContainer, initData->player->inventory); @@ -45,7 +45,7 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, eSectionInventoryCreativeUsing, eSectionInventoryCreativeMax, initData->bNavigateBack); - m_labelInventory.setLabel(L""); + m_labelInventory.setLabel(""); m_bFirstCall = true; // m_slotListContainer.addSlots(0,TabSpec::MAX_SIZE); @@ -73,11 +73,11 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void* _initData, switchTab(eCreativeInventoryTab_BuildingBlocks); } -std::wstring UIScene_CreativeMenu::getMoviePath() { +std::string UIScene_CreativeMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"CreativeMenuSplit"; + return "CreativeMenuSplit"; } else { - return L"CreativeMenu"; + return "CreativeMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index 140664e4f..d96c3ba37 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -60,11 +60,11 @@ protected: UI_MAP_ELEMENT(m_slotListContainer, "containerList") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcSetActiveTab, L"SetActiveTab") - UI_MAP_NAME(m_funcSetScrollBar, L"SetScrollBar") + UI_MAP_NAME(m_funcSetActiveTab, "SetActiveTab") + UI_MAP_NAME(m_funcSetScrollBar, "SetScrollBar") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 466d5fdf6..a1beb76d7 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -48,11 +48,11 @@ UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_DispenserMenu::getMoviePath() { +std::string UIScene_DispenserMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"DispenserMenuSplit"; + return "DispenserMenuSplit"; } else { - return L"DispenserMenu"; + return "DispenserMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h index a40436d87..47402ff55 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h @@ -35,7 +35,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index 0b9ade283..9be761c88 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -60,11 +60,11 @@ UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_EnchantingMenu::getMoviePath() { +std::string UIScene_EnchantingMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"EnchantingMenuSplit"; + return "EnchantingMenuSplit"; } else { - return L"EnchantingMenu"; + return "EnchantingMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index e9b1f2c68..4cce00e0b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -50,7 +50,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index 5c7ffe66b..235401cf6 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -51,11 +51,11 @@ UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_FireworksMenu::getMoviePath() { +std::string UIScene_FireworksMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"FireworksMenuSplit"; + return "FireworksMenuSplit"; } else { - return L"FireworksMenu"; + return "FireworksMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 888530258..b457fb614 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -37,11 +37,11 @@ protected: UI_MAP_ELEMENT(m_slotList2x2, "Fireworks2x2") UI_MAP_ELEMENT(m_labelFireworks, "FireworksLabel") - UI_MAP_NAME(m_funcShowLargeCraftingGrid, L"ShowLargeCraftingGrid") + UI_MAP_NAME(m_funcShowLargeCraftingGrid, "ShowLargeCraftingGrid") UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 67b138708..bf465d457 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -32,8 +32,8 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, m_labelIngredient.init(app.GetString(IDS_INGREDIENT)); m_labelFuel.init(app.GetString(IDS_FUEL)); - m_progressFurnaceFire.init(L"", 0, 0, 12, 0); - m_progressFurnaceArrow.init(L"", 0, 0, 24, 0); + m_progressFurnaceFire.init("", 0, 0, 12, 0); + m_progressFurnaceArrow.init("", 0, 0, 24, 0); Minecraft* pMinecraft = Minecraft::GetInstance(); if (pMinecraft->localgameModes[initData->iPad] != nullptr) { @@ -58,11 +58,11 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_FurnaceMenu::getMoviePath() { +std::string UIScene_FurnaceMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"FurnaceMenuSplit"; + return "FurnaceMenuSplit"; } else { - return L"FurnaceMenu"; + return "FurnaceMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index 4e0ea1666..4f43bc00b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -46,7 +46,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual void tick(); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index ebe8ef0ac..cd37450b0 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -49,11 +49,11 @@ UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void* _initData, delete initData; } -std::wstring UIScene_HopperMenu::getMoviePath() { +std::string UIScene_HopperMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"HopperMenuSplit"; + return "HopperMenuSplit"; } else { - return L"HopperMenu"; + return "HopperMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h index 5ff4d392b..63b54e8df 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h @@ -35,7 +35,7 @@ protected: UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index f95a45415..baf7dcd44 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -80,11 +80,11 @@ UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, // app.SetRichPresenceContext(iPad, CONTEXT_GAME_STATE_HORSE); } -std::wstring UIScene_HorseInventoryMenu::getMoviePath() { +std::string UIScene_HorseInventoryMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"HorseInventoryMenuSplit"; + return "HorseInventoryMenuSplit"; } else { - return L"HorseInventoryMenu"; + return "HorseInventoryMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 6bcf7ff75..04a880fdc 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -46,11 +46,11 @@ protected: UI_MAP_ELEMENT(m_horsePreview, "iggy_horse") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcSetIsDonkey, L"SetIsDonkey") - UI_MAP_NAME(m_funcSetHasInventory, L"SetHasInventory") + UI_MAP_NAME(m_funcSetIsDonkey, "SetIsDonkey") + UI_MAP_NAME(m_funcSetHasInventory, "SetHasInventory") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index a588c1ff1..f0aafc9f5 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -71,11 +71,11 @@ UIScene_InventoryMenu::UIScene_InventoryMenu(int iPad, void* _initData, INVENTORY_UPDATE_EFFECTS_TIMER_TIME); } -std::wstring UIScene_InventoryMenu::getMoviePath() { +std::string UIScene_InventoryMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"InventoryMenuSplit"; + return "InventoryMenuSplit"; } else { - return L"InventoryMenu"; + return "InventoryMenu"; } } @@ -276,22 +276,22 @@ void UIScene_InventoryMenu::updateEffectsDisplay() { MobEffectInstance* effect = *it; if (effect->getDuration() >= m_bEffectTime[effect->getId()]) { - std::wstring effectString = app.GetString( + std::string effectString = app.GetString( effect ->getDescriptionId()); // I18n.get(effect.getDescriptionId()).trim(); if (effect->getAmplifier() > 0) { - std::wstring potencyString = L""; + std::string potencyString = ""; switch (effect->getAmplifier()) { case 1: - potencyString = L" "; + potencyString = " "; potencyString += app.GetString(IDS_POTION_POTENCY_1); break; case 2: - potencyString = L" "; + potencyString = " "; potencyString += app.GetString(IDS_POTION_POTENCY_2); break; case 3: - potencyString = L" "; + potencyString = " "; potencyString += app.GetString(IDS_POTION_POTENCY_3); break; default: @@ -310,13 +310,11 @@ void UIScene_InventoryMenu::updateEffectsDisplay() { value[0].type = IGGY_DATATYPE_number; value[0].number = icon; - const std::u16string convString = - wstring_to_u16string(effectString); - IggyStringUTF16 stringVal; - stringVal.string = convString.c_str(); - stringVal.length = convString.length(); - value[1].type = IGGY_DATATYPE_string_UTF16; - value[1].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(effectString.c_str()); + stringVal.length = effectString.length(); + value[1].type = IGGY_DATATYPE_string_UTF8; + value[1].string8 = stringVal; int seconds = effect->getDuration() / SharedConstants::TICKS_PER_SECOND; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index fe400fac7..b5c7548c1 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -40,12 +40,12 @@ protected: UI_MAP_ELEMENT(m_slotListArmor, "armorList") UI_MAP_ELEMENT(m_playerPreview, "iggy_player") - UI_MAP_NAME(m_funcUpdateEffects, L"UpdateEffects") - UI_MAP_NAME(m_funcAddEffect, L"AddEffect") + UI_MAP_NAME(m_funcUpdateEffects, "UpdateEffects") + UI_MAP_NAME(m_funcAddEffect, "AddEffect") UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual int getSectionColumns(ESceneSection eSection); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 13c05ad46..3829bf771 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -38,12 +38,12 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, // 4J-PB - "Villager" appears for a short time on opening the trading menu // m_labelTrading.init( app.GetString(IDS_VILLAGER) ); - m_labelTrading.init(L""); + m_labelTrading.init(""); m_labelInventory.init(app.GetString(IDS_INVENTORY)); m_labelRequired.init(app.GetString(IDS_REQUIRED_ITEMS_FOR_TRADE)); - m_labelRequest1.init(L""); - m_labelRequest2.init(L""); + m_labelRequest1.init(""); + m_labelRequest2.init(""); TradingScreenInput* initData = (TradingScreenInput*)_initData; m_merchant = initData->trader; @@ -86,11 +86,11 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void* _initData, app.SetRichPresenceContext(iPad, CONTEXT_GAME_STATE_TRADING); } -std::wstring UIScene_TradingMenu::getMoviePath() { +std::string UIScene_TradingMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"TradingMenuSplit"; + return "TradingMenuSplit"; } else { - return L"TradingMenu"; + return "TradingMenu"; } } @@ -245,15 +245,15 @@ void UIScene_TradingMenu::moveSelector(bool right) { m_funcMoveSelector, 1, value); } -void UIScene_TradingMenu::setTitle(const std::wstring& name) { +void UIScene_TradingMenu::setTitle(const std::string& name) { m_labelTrading.setLabel(name); } -void UIScene_TradingMenu::setRequest1Name(const std::wstring& name) { +void UIScene_TradingMenu::setRequest1Name(const std::string& name) { m_labelRequest1.setLabel(name); } -void UIScene_TradingMenu::setRequest2Name(const std::wstring& name) { +void UIScene_TradingMenu::setRequest2Name(const std::string& name) { m_labelRequest2.setLabel(name); } @@ -271,17 +271,16 @@ void UIScene_TradingMenu::setTradeRedBox(int index, bool show) { void UIScene_TradingMenu::setOfferDescription( std::vector* description) { - std::wstring descriptionStr = HtmlString::Compose(description); - const std::u16string conv = wstring_to_u16string(descriptionStr); + std::string descriptionStr = HtmlString::Compose(description); IggyDataValue result; IggyDataValue value[1]; - IggyStringUTF16 stringVal; - stringVal.string = conv.c_str(); - stringVal.length = conv.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(descriptionStr.c_str()); + stringVal.length = descriptionStr.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS( getMovie(), &result, IggyPlayerRootPath(getMovie()), diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index 4e04f6b38..736c01d1f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -58,14 +58,14 @@ protected: UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcMoveSelector, L"MoveSelector") - UI_MAP_NAME(m_funcShowScrollRightArrow, L"ShowScrollRightArrow") - UI_MAP_NAME(m_funcShowScrollLeftArrow, L"ShowScrollLeftArrow") - UI_MAP_NAME(m_funcSetOfferDescription, L"SetOfferDescription") - UI_MAP_NAME(m_funcSetActiveSlot, L"SetSelectorSlot") + UI_MAP_NAME(m_funcMoveSelector, "MoveSelector") + UI_MAP_NAME(m_funcShowScrollRightArrow, "ShowScrollRightArrow") + UI_MAP_NAME(m_funcShowScrollLeftArrow, "ShowScrollLeftArrow") + UI_MAP_NAME(m_funcSetOfferDescription, "SetOfferDescription") + UI_MAP_NAME(m_funcSetActiveSlot, "SetSelectorSlot") UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void updateTooltips(); virtual void handleDestroy(); virtual void handleReload(); @@ -80,9 +80,9 @@ protected: virtual void showScrollRightArrow(bool show); virtual void showScrollLeftArrow(bool show); virtual void moveSelector(bool right); - virtual void setTitle(const std::wstring& name); - virtual void setRequest1Name(const std::wstring& name); - virtual void setRequest2Name(const std::wstring& name); + virtual void setTitle(const std::string& name); + virtual void setRequest1Name(const std::string& name); + virtual void setRequest2Name(const std::string& name); virtual void setRequest1RedBox(bool show); virtual void setRequest2RedBox(bool show); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index f62f84c53..dbb9361dc 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -39,10 +39,10 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, // Setup all the Iggy references we need for this scene initialiseMovie(); - for (unsigned int i = 0; i < 4; ++i) m_labelIngredientsDesc[i].init(L""); - m_labelDescription.init(L""); - m_labelGroupName.init(L""); - m_labelItemName.init(L""); + for (unsigned int i = 0; i < 4; ++i) m_labelIngredientsDesc[i].init(""); + m_labelDescription.init(""); + m_labelGroupName.init(""); + m_labelItemName.init(""); m_labelInventory.init(app.GetString(IDS_INVENTORY)); m_labelIngredients.init(app.GetString(IDS_INGREDIENTS)); @@ -231,19 +231,19 @@ EUIScene UIScene_CraftingMenu::getSceneType() { } } -std::wstring UIScene_CraftingMenu::getMoviePath() { +std::string UIScene_CraftingMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { m_bSplitscreen = true; if (m_iContainerType == RECIPE_TYPE_3x3) { - return L"Crafting3x3MenuSplit"; + return "Crafting3x3MenuSplit"; } else { - return L"Crafting2x2MenuSplit"; + return "Crafting2x2MenuSplit"; } } else { if (m_iContainerType == RECIPE_TYPE_3x3) { - return L"Crafting3x3Menu"; + return "Crafting3x3Menu"; } else { - return L"Crafting2x2Menu"; + return "Crafting2x2Menu"; } } } @@ -440,7 +440,7 @@ void UIScene_CraftingMenu::hideAllIngredientsSlots() { m_ingredientsInfo[i].alpha = 31; m_ingredientsInfo[i].show = false; - m_labelIngredientsDesc[i].setLabel(L""); + m_labelIngredientsDesc[i].setLabel(""); IggyDataValue result; IggyDataValue value[2]; @@ -519,7 +519,7 @@ void UIScene_CraftingMenu::setIngredientDescriptionRedBox(int index, } void UIScene_CraftingMenu::setIngredientDescriptionText(int index, - const wchar_t* text) { + const char* text) { m_labelIngredientsDesc[index].setLabel(text); } @@ -540,15 +540,15 @@ void UIScene_CraftingMenu::showTabHighlight(int iIndex, bool show) { } } -void UIScene_CraftingMenu::setGroupText(const wchar_t* text) { +void UIScene_CraftingMenu::setGroupText(const char* text) { m_labelGroupName.setLabel(text); } -void UIScene_CraftingMenu::setDescriptionText(const wchar_t* text) { +void UIScene_CraftingMenu::setDescriptionText(const char* text) { m_labelDescription.setLabel(text); } -void UIScene_CraftingMenu::setItemText(const wchar_t* text) { +void UIScene_CraftingMenu::setItemText(const char* text) { m_labelItemName.setLabel(text); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 3a475c621..134f67da8 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -141,16 +141,16 @@ protected: UI_MAP_ELEMENT(m_labelItemName, "ItemName") UI_MAP_ELEMENT(m_labelInventory, "InventoryLabel") - UI_MAP_NAME(m_funcMoveSelector, L"MoveSelector") - UI_MAP_NAME(m_funcSelectVerticalItem, L"SelectVerticalItem") - UI_MAP_NAME(m_funcSetActiveTab, L"SetActiveTab") - UI_MAP_NAME(m_funcShowPanelDisplay, L"showPanelDisplay") - UI_MAP_NAME(m_funcShowIngredientSlot, L"ShowIngredient") + UI_MAP_NAME(m_funcMoveSelector, "MoveSelector") + UI_MAP_NAME(m_funcSelectVerticalItem, "SelectVerticalItem") + UI_MAP_NAME(m_funcSetActiveTab, "SetActiveTab") + UI_MAP_NAME(m_funcShowPanelDisplay, "showPanelDisplay") + UI_MAP_NAME(m_funcShowIngredientSlot, "ShowIngredient") UI_END_MAP_CHILD_ELEMENTS() UI_END_MAP_ELEMENTS_AND_NAMES() - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleReload(); virtual bool allowRepeat(int key); @@ -177,12 +177,12 @@ protected: virtual void setIngredientDescriptionItem( int iPad, int index, std::shared_ptr item); virtual void setIngredientDescriptionRedBox(int index, bool show); - virtual void setIngredientDescriptionText(int index, const wchar_t* text); + virtual void setIngredientDescriptionText(int index, const char* text); virtual void setShowCraftHSlot(int iIndex, bool show); virtual void showTabHighlight(int iIndex, bool show); - virtual void setGroupText(const wchar_t* text); - virtual void setDescriptionText(const wchar_t* text); - virtual void setItemText(const wchar_t* text); + virtual void setGroupText(const char* text); + virtual void setDescriptionText(const char* text); + virtual void setItemText(const char* text); virtual void scrollDescriptionUp(); virtual void scrollDescriptionDown(); virtual void updateHighlightAndScrollPositions(); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index a31062d8b..04ef15858 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -56,11 +56,11 @@ UIScene_DeathMenu::~UIScene_DeathMenu() { } } -std::wstring UIScene_DeathMenu::getMoviePath() { +std::string UIScene_DeathMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"DeathMenuSplit"; + return "DeathMenuSplit"; } else { - return L"DeathMenu"; + return "DeathMenu"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index 7b2c387d7..e1d9bce0c 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -32,7 +32,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 3a134ac1c..9185eb526 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -36,8 +36,8 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) // 4J Stu - Don't need these, the AS handles the scrolling and makes it look // nice - // wchar_t startTags[64]; - // swprintf(startTags,64,L"",app.GetHTMLFontSize(eHTMLSize_EndPoem)); // noNoiseString.append(halfScreenLineBreaks); // noNoiseString.append(halfScreenLineBreaks); @@ -49,13 +49,13 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) // 4J Stu - Iggy seems to strip our trailing linebreaks, so added a space to // made sure it scrolls this far - noNoiseString.append(L" "); + noNoiseString.append(" "); noNoiseString = app.FormatHTMLString(m_iPad, noNoiseString, 0xff000000); Minecraft* pMinecraft = Minecraft::GetInstance(); - std::wstring playerName = L""; + std::string playerName = ""; if (pMinecraft->localplayers[ui.GetWinUserIndex()] != nullptr) { playerName = escapeXML( pMinecraft->localplayers[ui.GetWinUserIndex()]->getDisplayName()); @@ -64,24 +64,24 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) escapeXML(pMinecraft->localplayers[PlatformProfile.GetPrimaryPad()] ->getDisplayName()); } - noNoiseString = replaceAll(noNoiseString, L"{*PLAYER*}", playerName); + noNoiseString = replaceAll(noNoiseString, "{*PLAYER*}", playerName); Random random(8124371); - int found = (int)noNoiseString.find(L"{*NOISE*}"); + int found = (int)noNoiseString.find("{*NOISE*}"); int length; while (found != std::string::npos) { length = random.nextInt(4) + 3; m_noiseLengths.push_back(length); - found = (int)noNoiseString.find(L"{*NOISE*}", found + 1); + found = (int)noNoiseString.find("{*NOISE*}", found + 1); } updateNoise(); // 4J-JEV: Find paragraph start and end points. - m_paragraphs = std::vector(); + m_paragraphs = std::vector(); int lastIndex = 0; - for (int index = 0; index != std::wstring::npos; - index = noiseString.find(L"

", index + 12, 12)) { + for (int index = 0; index != std::string::npos; + index = noiseString.find("

", index + 12, 12)) { m_paragraphs.push_back( noiseString.substr(lastIndex, index - lastIndex)); lastIndex = index; @@ -93,9 +93,9 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) // m_htmlPoem.init(noiseString.c_str()); // m_htmlPoem.startAutoScroll(); - // std::wstring result = m_htmlControl.GetText(); + // std::string result = m_htmlControl.GetText(); - // wcout << result.c_str(); + // cout << result.c_str(); #if TO_BE_IMPLEMENTED m_scrollDir = 1; @@ -110,7 +110,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) m_requestedLabel = 0; } -std::wstring UIScene_EndPoem::getMoviePath() { return L"EndPoem"; } +std::string UIScene_EndPoem::getMoviePath() { return "EndPoem"; } void UIScene_EndPoem::updateTooltips() { ui.SetTooltips(XUSER_INDEX_ANY, -1, @@ -121,18 +121,16 @@ void UIScene_EndPoem::tick() { UIScene::tick(); if (m_requestedLabel >= 0 && m_requestedLabel < m_paragraphs.size()) { - std::wstring label = m_paragraphs[m_requestedLabel]; + std::string label = m_paragraphs[m_requestedLabel]; IggyDataValue result; IggyDataValue value[3]; - const std::u16string convLabel = wstring_to_u16string(label); - - IggyStringUTF16 stringVal; - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; value[1].type = IGGY_DATATYPE_number; value[1].number = m_requestedLabel; @@ -201,14 +199,14 @@ void UIScene_EndPoem::updateNoise() { noiseString = noNoiseString; int length = 0; - wchar_t replacements[64]; - std::wstring replaceString = L""; - wchar_t randomChar = L'a'; + char replacements[64]; + std::string replaceString = ""; + char randomChar = 'a'; Random* random = pMinecraft->font->random; bool darken = false; - std::wstring tag = L"{*NOISE*}"; + std::string tag = "{*NOISE*}"; auto it = m_noiseLengths.begin(); int found = (int)noiseString.find(tag); @@ -216,7 +214,7 @@ void UIScene_EndPoem::updateNoise() { length = *it; ++it; - replaceString = L""; + replaceString = ""; for (int i = 0; i < length; ++i) { if (ui.UsingBitmapFont()) { randomChar = SharedConstants::acceptableLetters[random->nextInt( @@ -224,26 +222,26 @@ void UIScene_EndPoem::updateNoise() { } else { // 4J-JEV: It'd be nice to avoid null characters when using // asian languages. - static std::wstring acceptableLetters = - L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~"; + static std::string acceptableLetters = + "!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~"; randomChar = acceptableLetters[random->nextInt( (int)acceptableLetters.length())]; } - std::wstring randomCharStr = L""; + std::string randomCharStr = ""; randomCharStr.push_back(randomChar); - if (randomChar == L'<') { - randomCharStr = L"<"; - } else if (randomChar == L'>') { - randomCharStr = L">"; - } else if (randomChar == L'"') { - randomCharStr = L"""; - } else if (randomChar == L'&') { - randomCharStr = L"&"; - } else if (randomChar == L'\\') { - randomCharStr = L"\\\\"; - } else if (randomChar == L'{') { - randomCharStr = L"}"; + if (randomChar == '<') { + randomCharStr = "<"; + } else if (randomChar == '>') { + randomCharStr = ">"; + } else if (randomChar == '"') { + randomCharStr = """; + } else if (randomChar == '&') { + randomCharStr = "&"; + } else if (randomChar == '\\') { + randomCharStr = "\\\\"; + } else if (randomChar == '{') { + randomCharStr = "}"; } int randomVal = random->nextInt(2); @@ -252,10 +250,10 @@ void UIScene_EndPoem::updateNoise() { colour = eHTMLColor_9; else if (randomVal == 2) colour = eHTMLColor_a; - memset(replacements, 0, 64 * sizeof(wchar_t)); - swprintf( + memset(replacements, 0, 64 * sizeof(char)); + snprintf( replacements, 64, - L"%ls", + "%s", app.GetHTMLColour(colour), randomCharStr.c_str()); replaceString.append(replacements); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index d4e9d2d5a..9d5f13c9d 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -15,17 +15,17 @@ class UILayer; class UIScene_EndPoem : public UIScene { private: - std::wstring noNoiseString; - std::wstring noiseString; + std::string noNoiseString; + std::string noiseString; std::vector m_noiseLengths; bool m_bIgnoreInput; int m_requestedLabel; - std::vector m_paragraphs; + std::vector m_paragraphs; IggyName m_funcSetNextLabel; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) - UI_MAP_NAME(m_funcSetNextLabel, L"SetNextLabel") + UI_MAP_NAME(m_funcSetNextLabel, "SetNextLabel") UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -35,7 +35,7 @@ public: virtual void updateTooltips(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: virtual void tick(); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 3f98e1319..37a433684 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -80,11 +80,11 @@ UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu( } } -std::wstring UIScene_InGameHostOptionsMenu::getMoviePath() { +std::string UIScene_InGameHostOptionsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"InGameHostOptionsSplit"; + return "InGameHostOptionsSplit"; } else { - return L"InGameHostOptions"; + return "InGameHostOptions"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 40e605fd5..193153e68 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -55,7 +55,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index c5954b197..766c715f3 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -89,11 +89,11 @@ UIScene_InGameInfoMenu::~UIScene_InGameInfoMenu() { } } -std::wstring UIScene_InGameInfoMenu::getMoviePath() { +std::string UIScene_InGameInfoMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"InGameInfoMenuSplit"; + return "InGameInfoMenuSplit"; } else { - return L"InGameInfoMenu"; + return "InGameInfoMenu"; } } @@ -366,7 +366,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void* callbackParam, INetworkPlayer* pPlayer, bool leaving) { app.DebugPrintf( - " Player \"%ls\" %s (smallId: " + " Player \"%s\" %s (smallId: " "%d)\n", pPlayer->GetOnlineName(), leaving ? "leaving" : "joining", pPlayer->GetSmallId()); @@ -391,12 +391,12 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void* callbackParam, if (leaving && !playerFound) app.DebugPrintf( - " Error: Player \"%ls\" " + " Error: Player \"%s\" " "leaving but not found in list\n", pPlayer->GetOnlineName()); if (!leaving && playerFound) app.DebugPrintf( - " Error: Player \"%ls\" " + " Error: Player \"%s\" " "joining but already in list\n", pPlayer->GetOnlineName()); @@ -404,7 +404,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void* callbackParam, // added again later) if (playerFound) { app.DebugPrintf( - " Player \"%ls\" found, " + " Player \"%s\" found, " "removing\n", pPlayer->GetOnlineName()); @@ -419,7 +419,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void* callbackParam, // If the player is joining if (!leaving) { app.DebugPrintf( - " Player \"%ls\" not " + " Player \"%s\" not " "found, adding\n", pPlayer->GetOnlineName()); @@ -456,11 +456,11 @@ UIScene_InGameInfoMenu::PlayerInfo* UIScene_InGameInfoMenu::BuildPlayerInfo( PlayerInfo* info = new PlayerInfo(); info->m_smallId = player->GetSmallId(); - std::wstring playerName = L""; + std::string playerName = ""; #if !defined(_CONTENT_PACKAGE) if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playerName = L"WWWWWWWWWWWWWWWW"; + playerName = "WWWWWWWWWWWWWWWW"; } else #endif { diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index ce3c4ee1d..995c07e3f 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -27,7 +27,7 @@ private: uint8_t m_smallId; char m_voiceStatus; short m_colorState; - std::wstring m_name; + std::string m_name; } PlayerInfo; @@ -36,7 +36,7 @@ private: std::vector m_players; // A std::vector of player info structs // char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS]; // short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS]; - // std::wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; + // std::string m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; UIControl_Button m_buttonGameOptions; UIControl_PlayerList m_playerList; @@ -59,7 +59,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 80c3ffc85..1a0cf76fd 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -107,7 +107,7 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( removeControl(&m_checkboxes[eControl_Op], true); #else m_checkboxes[eControl_Op].init( - L"DEBUG: Creative", eControl_Op, + "DEBUG: Creative", eControl_Op, Player::getPlayerGamePrivilege( m_playerPrivileges, Player::ePlayerGamePrivilege_CreativeMode)); #endif @@ -301,11 +301,11 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( }); } -std::wstring UIScene_InGamePlayerOptionsMenu::getMoviePath() { +std::string UIScene_InGamePlayerOptionsMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"InGamePlayerOptionsSplit"; + return "InGamePlayerOptionsSplit"; } else { - return L"InGamePlayerOptions"; + return "InGamePlayerOptions"; } } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index cadd3122d..0b7f4a3a3 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -70,7 +70,7 @@ private: UI_MAP_ELEMENT(m_labelGamertag, "Gamertag") - UI_MAP_NAME(m_funcSetPlayerIcon, L"SetPlayerIcon"); + UI_MAP_NAME(m_funcSetPlayerIcon, "SetPlayerIcon"); UI_END_MAP_ELEMENTS_AND_NAMES() bool m_bModeratorState; @@ -86,7 +86,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void handleCheckboxToggled(F64 controlId, bool selected); virtual void handleTimerComplete(int id); diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp index c31632e5a..469b58061 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp @@ -131,8 +131,8 @@ void UIScene_InGameSaveManagementMenu::handleGainFocus(bool navBack) { } } -std::wstring UIScene_InGameSaveManagementMenu::getMoviePath() { - return L"SaveMenu"; +std::string UIScene_InGameSaveManagementMenu::getMoviePath() { + return "SaveMenu"; } void UIScene_InGameSaveManagementMenu::tick() { @@ -173,7 +173,7 @@ void UIScene_InGameSaveManagementMenu::tick() { m_iSaveDetailsCount = m_pSaveDetails->iSaveC; for (unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i) { m_buttonListSaves.addItem( - m_pSaveDetails->SaveInfoA[i].UTF8SaveTitle, L""); + m_pSaveDetails->SaveInfoA[i].UTF8SaveTitle, ""); m_saveDetails[i].saveId = i; memcpy(m_saveDetails[i].UTF8SaveName, @@ -224,9 +224,9 @@ void UIScene_InGameSaveManagementMenu::tick() { MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 // string, // in char's (= bytes), including end-of-string \0 - (wchar_t*)u16Message, // destination buffer + (char*)u16Message, // destination buffer MAX_SAVEFILENAME_LENGTH // size of destination buffer, in - // wchar_t's + // char's ); #else uint32_t srcmax, dstmax; @@ -245,13 +245,13 @@ void UIScene_InGameSaveManagementMenu::tick() { #endif if (m_saveDetails[m_iRequestingThumbnailId].pbThumbnailData) { registerSubstitutionTexture( - (wchar_t*)u16Message, + (char*)u16Message, m_saveDetails[m_iRequestingThumbnailId].pbThumbnailData, m_saveDetails[m_iRequestingThumbnailId] .dwThumbnailSize); } m_buttonListSaves.setTextureName(m_iRequestingThumbnailId, - (wchar_t*)u16Message); + (char*)u16Message); ++m_iRequestingThumbnailId; if (m_iRequestingThumbnailId < diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index a96c8d79c..737d8d5ef 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -87,7 +87,7 @@ private: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: int loadSaveDataThumbnailReturned(std::uint8_t* pbThumbnail, diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 5ea18e53b..371facf6b 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -95,11 +95,11 @@ UIScene_PauseMenu::~UIScene_PauseMenu() { m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false); } -std::wstring UIScene_PauseMenu::getMoviePath() { +std::string UIScene_PauseMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"PauseMenuSplit"; + return "PauseMenuSplit"; } else { - return L"PauseMenu"; + return "PauseMenu"; } } @@ -394,7 +394,7 @@ void UIScene_PauseMenu::PerformActionSaveGame() { m_pDLCPack = pDLCTexPack->getDLCInfoParentPack(); // tPack->getDLCPack(); - if (!m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { + if (!m_pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, "")) { // upsell unsigned int uiIDA[2]; uiIDA[0] = IDS_CONFIRM_OK; diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 957dcba9d..23c305cf8 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -65,7 +65,7 @@ protected: void updateControlsVisibility(); // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 75bfb83f2..7a637adfb 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -71,11 +71,11 @@ UIScene_SignEntryMenu::~UIScene_SignEntryMenu() { m_parentLayer->removeComponent(eUIComponent_MenuBackground); } -std::wstring UIScene_SignEntryMenu::getMoviePath() { +std::string UIScene_SignEntryMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"SignEntryMenuSplit"; + return "SignEntryMenuSplit"; } else { - return L"SignEntryMenu"; + return "SignEntryMenu"; } } @@ -92,7 +92,7 @@ void UIScene_SignEntryMenu::tick() { // Set the sign text here so we on;y call the verify once it has been // set, not while we're typing in to it for (int i = 0; i < 4; i++) { - std::wstring temp = m_textInputLines[i].getLabel(); + std::string temp = m_textInputLines[i].getLabel(); m_sign->SetMessage(i, temp); } @@ -126,7 +126,7 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, case ACTION_MENU_CANCEL: if (pressed) { // user backed out, so wipe the sign - std::wstring temp = L""; + std::string temp = ""; for (int i = 0; i < 4; i++) { m_sign->SetMessage(i, temp); @@ -164,8 +164,8 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId) { // 4J HEG - No reason to set value if keyboard was cancelled m_bIgnoreInput = false; if (bRes && m_iEditingLine >= 0 && m_iEditingLine < 4) { - std::wstring str = - convStringToWstring(PlatformInput.GetText()); + std::string str = + PlatformInput.GetText(); if (str.size() > 15) str.resize(15); m_textInputLines[m_iEditingLine].setLabel(str); } diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index 1b565038e..6a7c356a4 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -52,7 +52,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 33a08b6dd..d5c4379a1 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -41,7 +41,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, m_playerList.init(eControl_GamePlayers); for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) { - m_playerNames[i] = L""; + m_playerNames[i] = ""; } int playerCount = g_NetworkManager.GetPlayerCount(); @@ -55,12 +55,12 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, m_players[m_playersCount] = player->GetSmallId(); ++m_playersCount; - std::wstring playerName = L""; + std::string playerName = ""; #if !defined(_CONTENT_PACKAGE) if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playerName = L"WWWWWWWWWWWWWWWW"; + playerName = "WWWWWWWWWWWWWWWW"; } else #endif { @@ -102,11 +102,11 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void* initData, ui.HidePressStart(); } -std::wstring UIScene_TeleportMenu::getMoviePath() { +std::string UIScene_TeleportMenu::getMoviePath() { if (app.GetLocalPlayerCount() > 1) { - return L"InGameTeleportMenuSplit"; + return "InGameTeleportMenuSplit"; } else { - return L"InGameTeleportMenu"; + return "InGameTeleportMenu"; } } @@ -140,12 +140,12 @@ void UIScene_TeleportMenu::handleReload() { m_players[m_playersCount] = player->GetSmallId(); ++m_playersCount; - std::wstring playerName = L""; + std::string playerName = ""; #if !defined(_CONTENT_PACKAGE) if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playerName = L"WWWWWWWWWWWWWWWW"; + playerName = "WWWWWWWWWWWWWWWW"; } else #endif { @@ -199,12 +199,12 @@ void UIScene_TeleportMenu::tick() { i, (int)app.GetPlayerColour(m_players[i])); } - std::wstring playerName = L""; + std::string playerName = ""; #if !defined(_CONTENT_PACKAGE) if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playerName = L"WWWWWWWWWWWWWWWW"; + playerName = "WWWWWWWWWWWWWWWW"; } else #endif { @@ -292,7 +292,7 @@ void UIScene_TeleportMenu::OnPlayerChanged(void* callbackParam, --scene->m_playersCount; scene->m_playersVoiceState[scene->m_playersCount] = 0; scene->m_playersColourState[scene->m_playersCount] = 0; - scene->m_playerNames[scene->m_playersCount] = L""; + scene->m_playerNames[scene->m_playersCount] = ""; scene->m_playerList.removeItem(scene->m_playersCount); } @@ -301,12 +301,12 @@ void UIScene_TeleportMenu::OnPlayerChanged(void* callbackParam, scene->m_players[scene->m_playersCount] = pPlayer->GetSmallId(); ++scene->m_playersCount; - std::wstring playerName = L""; + std::string playerName = ""; #if !defined(_CONTENT_PACKAGE) if (app.DebugSettingsOn() && (app.GetGameSettingsDebugMask() & (1L << eDebugSetting_DebugLeaderboards))) { - playerName = L"WWWWWWWWWWWWWWWW"; + playerName = "WWWWWWWWWWWWWWWW"; } else #endif { diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index 9ac75f841..a0b2dbb57 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -26,7 +26,7 @@ private: m_players[MINECRAFT_NET_MAX_PLAYERS]; // An array of QNet small-id's char m_playersVoiceState[MINECRAFT_NET_MAX_PLAYERS]; short m_playersColourState[MINECRAFT_NET_MAX_PLAYERS]; - std::wstring m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; + std::string m_playerNames[MINECRAFT_NET_MAX_PLAYERS]; UIControl_PlayerList m_playerList; UIControl_Label m_labelTitle; @@ -46,7 +46,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp index fa5325bb7..fcc99ac9e 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -36,9 +36,9 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, if (param->stringId >= 0) { m_labelTitle.init(app.GetString(param->stringId)); } else { - m_labelTitle.init(L""); + m_labelTitle.init(""); } - m_progressBar.init(L"", 0, 0, 100, 0); + m_progressBar.init("", 0, 0, 100, 0); m_buttonConfirm.init(app.GetString(IDS_CONFIRM_OK), eControl_Confirm); m_buttonConfirm.setVisible(false); @@ -73,11 +73,11 @@ void UIScene_ConnectingProgress::tick() { } } -std::wstring UIScene_ConnectingProgress::getMoviePath() { +std::string UIScene_ConnectingProgress::getMoviePath() { if (app.GetLocalPlayerCount() > 1 && !m_parentLayer->IsFullscreenGroup()) { - return L"FullscreenProgressSplit"; + return "FullscreenProgressSplit"; } else { - return L"FullscreenProgress"; + return "FullscreenProgress"; } } diff --git a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h index 7866c9959..7ede9166d 100644 --- a/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_ConnectingProgress.h @@ -52,7 +52,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp index 83033654c..9c64047a4 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -36,8 +36,8 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, m_controlTimer.setVisible(false); - m_titleText = L""; - m_statusText = L""; + m_titleText = ""; + m_statusText = ""; m_lastTitle = -1; m_lastStatus = -1; @@ -63,21 +63,21 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void* initData, Minecraft* pMinecraft = Minecraft::GetInstance(); pMinecraft->progressRenderer->progressStart(-1); pMinecraft->progressRenderer->progressStage(-1); - m_progressBar.init(L"", 0, 0, 100, 0); + m_progressBar.init("", 0, 0, 100, 0); // set the tip - std::wstring wsText = + std::string wsText = app.FormatHTMLString(m_iPad, app.GetString(app.GetNextTip())); - wchar_t startTags[64]; - swprintf(startTags, 64, L"

", + char startTags[64]; + snprintf(startTags, 64, "

", app.GetHTMLColour(eHTMLColor_White)); - wsText = startTags + wsText + L"

"; + wsText = startTags + wsText + "

"; m_labelTip.init(wsText); addTimer(TIMER_FULLSCREEN_TIPS, TIMER_FULLSCREEN_TIPS_TIME); - m_labelTitle.init(L""); + m_labelTitle.init(""); m_labelTip.setVisible(m_CompletionData->bShowTips); @@ -97,8 +97,8 @@ UIScene_FullscreenProgress::~UIScene_FullscreenProgress() { delete m_CompletionData; } -std::wstring UIScene_FullscreenProgress::getMoviePath() { - return L"FullscreenProgress"; +std::string UIScene_FullscreenProgress::getMoviePath() { + return "FullscreenProgress"; } void UIScene_FullscreenProgress::updateTooltips() { @@ -152,7 +152,7 @@ void UIScene_FullscreenProgress::tick() { m_progressBar.setLabel(m_statusText.c_str()); } } else { - std::wstring& wstrText = + std::string& wstrText = pMinecraft->progressRenderer->getProgressString(); m_progressBar.setLabel(wstrText.c_str()); } @@ -360,12 +360,12 @@ void UIScene_FullscreenProgress::handleTimerComplete(int id) { switch (id) { case TIMER_FULLSCREEN_TIPS: { // display the next tip - std::wstring wsText = + std::string wsText = app.FormatHTMLString(m_iPad, app.GetString(app.GetNextTip())); - wchar_t startTags[64]; - swprintf(startTags, 64, L"

", + char startTags[64]; + snprintf(startTags, 64, "

", app.GetHTMLColour(eHTMLColor_White)); - wsText = startTags + wsText + L"

"; + wsText = startTags + wsText + "

"; m_labelTip.setLabel(wsText); } break; } diff --git a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h index e3b5b54cf..ad2e219c7 100644 --- a/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/app/common/UI/Scenes/UIScene_FullscreenProgress.h @@ -34,7 +34,7 @@ private: void* m_completeFuncParam; bool m_bWaitForThreadToDelete; - std::wstring m_titleText, m_statusText; + std::string m_titleText, m_statusText; int m_lastTitle, m_lastStatus, m_lastProgress; int m_cancelText; bool m_bWasCancelled; @@ -62,7 +62,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual long long getDefaultGtcButtons() { return 0; } diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp index db1538ee4..96eee7240 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.cpp @@ -20,32 +20,31 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void* initData, // Setup all the Iggy references we need for this scene initialiseMovie(); - m_EnterTextLabel.init(L"Enter Sign Text"); + m_EnterTextLabel.init("Enter Sign Text"); - m_KeyboardTextInput.init(L"", -1); + m_KeyboardTextInput.init("", -1); m_KeyboardTextInput.SetCharLimit(15); - m_ButtonSpace.init(L"Space", -1); - m_ButtonCursorLeft.init(L"Cursor Left", -1); - m_ButtonCursorRight.init(L"Cursor Right", -1); - m_ButtonCaps.init(L"Caps", -1); - m_ButtonDone.init(L"Done", 0); // only the done button needs an id, the + m_ButtonSpace.init("Space", -1); + m_ButtonCursorLeft.init("Cursor Left", -1); + m_ButtonCursorRight.init("Cursor Right", -1); + m_ButtonCaps.init("Caps", -1); + m_ButtonDone.init("Done", 0); // only the done button needs an id, the // others will never call back! - m_ButtonSymbols.init(L"Symbols", -1); - m_ButtonBackspace.init(L"Backspace", -1); + m_ButtonSymbols.init("Symbols", -1); + m_ButtonBackspace.init("Backspace", -1); // Initialise function keyboard Buttons and set alternative symbol button // string - std::wstring label = L"Abc"; - IggyStringUTF16 stringVal; - const std::u16string convLabel = wstring_to_u16string(label); - stringVal.string = convLabel.c_str(); - stringVal.length = convLabel.length(); + std::string label = "Abc"; + IggyStringUTF8 stringVal; + stringVal.string = const_cast(label.c_str()); + stringVal.length = label.length(); IggyDataValue result; IggyDataValue value[1]; - value[0].type = IGGY_DATATYPE_string_UTF16; - value[0].string16 = stringVal; + value[0].type = IGGY_DATATYPE_string_UTF8; + value[0].string8 = stringVal; IggyResult out = IggyPlayerCallMethodRS( getMovie(), &result, IggyPlayerRootPath(getMovie()), @@ -60,11 +59,11 @@ UIScene_Keyboard::~UIScene_Keyboard() { m_parentLayer->removeComponent(eUIComponent_MenuBackground); } -std::wstring UIScene_Keyboard::getMoviePath() { +std::string UIScene_Keyboard::getMoviePath() { if (app.GetLocalPlayerCount() > 1 && !m_parentLayer->IsFullscreenGroup()) { - return L"KeyboardSplit"; + return "KeyboardSplit"; } else { - return L"Keyboard"; + return "Keyboard"; } } @@ -188,7 +187,7 @@ void UIScene_Keyboard::handleTimerComplete(int id) { void UIScene_Keyboard::KeyboardDonePressed() { // Debug - app.DebugPrintf("UI Keyboard - DONE - [%ls]\n", + app.DebugPrintf("UI Keyboard - DONE - [%s]\n", m_KeyboardTextInput.getLabel()); // ToDo: Keyboard can now pass on its final string value and close itself diff --git a/targets/app/common/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/UI/Scenes/UIScene_Keyboard.h index 61defc8f3..83eb9b4d6 100644 --- a/targets/app/common/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/UI/Scenes/UIScene_Keyboard.h @@ -43,15 +43,15 @@ protected: UI_MAP_ELEMENT(m_ButtonSymbols, "Button_symbols") UI_MAP_ELEMENT(m_ButtonBackspace, "Button_bspace") - UI_MAP_NAME(m_funcInitFunctionButtons, L"InitFunctionButtons"); + UI_MAP_NAME(m_funcInitFunctionButtons, "InitFunctionButtons"); - UI_MAP_NAME(m_funcCursorRightButtonPressed, L"CursorRightButtonPressed"); - UI_MAP_NAME(m_funcCursorLeftButtonPressed, L"CursorLeftButtonPressed"); - UI_MAP_NAME(m_funcCapsButtonPressed, L"CapsButtonPressed"); - UI_MAP_NAME(m_funcBackspaceButtonPressed, L"BackspaceButtonPressed"); - UI_MAP_NAME(m_funcSpaceButtonPressed, L"SpaceButtonPressed"); - UI_MAP_NAME(m_funcSymbolButtonPressed, L"SymbolButtonPressed"); - UI_MAP_NAME(m_funcDoneButtonPressed, L"DoneButtonPressed"); + UI_MAP_NAME(m_funcCursorRightButtonPressed, "CursorRightButtonPressed"); + UI_MAP_NAME(m_funcCursorLeftButtonPressed, "CursorLeftButtonPressed"); + UI_MAP_NAME(m_funcCapsButtonPressed, "CapsButtonPressed"); + UI_MAP_NAME(m_funcBackspaceButtonPressed, "BackspaceButtonPressed"); + UI_MAP_NAME(m_funcSpaceButtonPressed, "SpaceButtonPressed"); + UI_MAP_NAME(m_funcSymbolButtonPressed, "SymbolButtonPressed"); + UI_MAP_NAME(m_funcDoneButtonPressed, "DoneButtonPressed"); UI_END_MAP_ELEMENTS_AND_NAMES() public: @@ -72,7 +72,7 @@ protected: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); private: void KeyboardDonePressed(); diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp index e96515fa1..1c5e369aa 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.cpp @@ -71,11 +71,11 @@ UIScene_MessageBox::~UIScene_MessageBox() { m_parentLayer->removeComponent(eUIComponent_MenuBackground); } -std::wstring UIScene_MessageBox::getMoviePath() { +std::string UIScene_MessageBox::getMoviePath() { if (app.GetLocalPlayerCount() > 1 && !m_parentLayer->IsFullscreenGroup()) { - return L"MessageBoxSplit"; + return "MessageBoxSplit"; } else { - return L"MessageBox"; + return "MessageBox"; } } diff --git a/targets/app/common/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/UI/Scenes/UIScene_MessageBox.h index 721aade9c..d417692e5 100644 --- a/targets/app/common/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/UI/Scenes/UIScene_MessageBox.h @@ -42,8 +42,8 @@ private: UI_MAP_ELEMENT(m_labelTitle, "Title") UI_MAP_ELEMENT(m_labelContent, "Content") - UI_MAP_NAME(m_funcInit, L"Init") - UI_MAP_NAME(m_funcAutoResize, L"AutoResize") + UI_MAP_NAME(m_funcInit, "Init") + UI_MAP_NAME(m_funcAutoResize, "AutoResize") UI_END_MAP_ELEMENTS_AND_NAMES() public: UIScene_MessageBox(int iPad, void* initData, UILayer* parentLayer); @@ -58,7 +58,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); virtual void updateTooltips(); diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp index cc96f8117..3dea50cd3 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -35,8 +35,8 @@ UIScene_QuadrantSignin::~UIScene_QuadrantSignin() { m_parentLayer->removeComponent(eUIComponent_MenuBackground); } -std::wstring UIScene_QuadrantSignin::getMoviePath() { - return L"QuadrantSignin"; +std::string UIScene_QuadrantSignin::getMoviePath() { + return "QuadrantSignin"; } void UIScene_QuadrantSignin::updateTooltips() { @@ -162,7 +162,7 @@ void UIScene_QuadrantSignin::updateState() { // app.DebugPrintf("Index %d is not signed in\n", i); setControllerState(i, eControllerStatus_PressToJoin); - m_labelDisplayName[i].setLabel(L""); + m_labelDisplayName[i].setLabel(""); m_iconRequested[i] = false; } else { // app.DebugPrintf("Index %d is not connected\n", i); @@ -201,8 +201,8 @@ int UIScene_QuadrantSignin::AvatarReturned(void* lpParam, // 4J-JEV - Added to ensure each new texture gets a unique name. static unsigned int quadrantImageCount = 0; - wchar_t iconName[32]; - swprintf(iconName, 32, L"quadrantImage%05d", quadrantImageCount++); + char iconName[32]; + snprintf(iconName, 32, "quadrantImage%05d", quadrantImageCount++); pClass->registerSubstitutionTexture(iconName, pbThumbnail, dwThumbnailBytes, true); @@ -220,8 +220,8 @@ void UIScene_QuadrantSignin::_initQuadrants() { m_iconRequested[i] = false; m_labelPressToJoin[i].init(IDS_MUST_SIGN_IN_TITLE); - m_labelConnectController[i].init(L""); - m_labelAccountType[i].init(L""); + m_labelConnectController[i].init(""); + m_labelAccountType[i].init(""); m_controllerStatus[i] = eControllerStatus_ConnectController; @@ -237,7 +237,7 @@ void UIScene_QuadrantSignin::_initQuadrants() { app.DebugPrintf("Index %d is not signed in\n", i); setControllerState(i, eControllerStatus_PressToJoin); - m_labelDisplayName[i].init(L""); + m_labelDisplayName[i].init(""); } else { app.DebugPrintf("Index %d is not connected\n", i); diff --git a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h index a360ae6e5..88f52f472 100644 --- a/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/UI/Scenes/UIScene_QuadrantSignin.h @@ -90,9 +90,9 @@ private: UI_MAP_ELEMENT(m_labelConnectController[3], "ConnectControllerLabel") UI_END_MAP_CHILD_ELEMENTS() - UI_MAP_NAME(m_funcJoinButtonPressed, L"JoinButtonPressed") - UI_MAP_NAME(m_funcSetControllerStatus, L"SetControllerStatus") - UI_MAP_NAME(m_funcSetABSwap, L"SetABSwap") + UI_MAP_NAME(m_funcJoinButtonPressed, "JoinButtonPressed") + UI_MAP_NAME(m_funcSetControllerStatus, "SetControllerStatus") + UI_MAP_NAME(m_funcSetABSwap, "SetABSwap") UI_END_MAP_ELEMENTS_AND_NAMES() public: UIScene_QuadrantSignin(int iPad, void* initData, UILayer* parentLayer); @@ -108,7 +108,7 @@ public: protected: // TODO: This should be pure virtual in this class - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); public: // INPUT diff --git a/targets/app/common/UI/Scenes/UIScene_Timer.cpp b/targets/app/common/UI/Scenes/UIScene_Timer.cpp index 97d4e59e0..1138210e5 100644 --- a/targets/app/common/UI/Scenes/UIScene_Timer.cpp +++ b/targets/app/common/UI/Scenes/UIScene_Timer.cpp @@ -17,7 +17,7 @@ UIScene_Timer::UIScene_Timer(int iPad, void* initData, UILayer* parentLayer) } } -std::wstring UIScene_Timer::getMoviePath() { return L"Timer"; } +std::string UIScene_Timer::getMoviePath() { return "Timer"; } void UIScene_Timer::reloadMovie(bool force) { // Never needs reloaded diff --git a/targets/app/common/UI/Scenes/UIScene_Timer.h b/targets/app/common/UI/Scenes/UIScene_Timer.h index f8830a6b4..7b12838c7 100644 --- a/targets/app/common/UI/Scenes/UIScene_Timer.h +++ b/targets/app/common/UI/Scenes/UIScene_Timer.h @@ -30,5 +30,5 @@ public: virtual bool needsReloaded(); protected: - virtual std::wstring getMoviePath(); + virtual std::string getMoviePath(); }; diff --git a/targets/app/common/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp index 2e557fc2a..12c385a29 100644 --- a/targets/app/common/UI/UIController.cpp +++ b/targets/app/common/UI/UIController.cpp @@ -500,22 +500,22 @@ void UIController::tick() { } void UIController::loadSkins() { - std::wstring platformSkinPath = L""; + std::string platformSkinPath = ""; #if defined(_WINDOWS64) || defined(__linux__) if (m_fScreenHeight == 1080.0f) { - platformSkinPath = L"skinHDWin.swf"; + platformSkinPath = "skinHDWin.swf"; } else { - platformSkinPath = L"skinWin.swf"; + platformSkinPath = "skinWin.swf"; } #endif // Every platform has one of these, so nothing shared if (m_fScreenHeight == 1080.0f) { m_iggyLibraries[eLibrary_Platform] = - loadSkin(platformSkinPath, L"platformskinHD.swf"); + loadSkin(platformSkinPath, "platformskinHD.swf"); } else { m_iggyLibraries[eLibrary_Platform] = - loadSkin(platformSkinPath, L"platformskin.swf"); + loadSkin(platformSkinPath, "platformskin.swf"); } #if defined(_WINDOWS64) || defined(__linux__) @@ -525,59 +525,61 @@ void UIController::loadSkins() { // during development #if !defined(_FINAL_BUILD) m_iggyLibraries[eLibraryFallback_GraphicsDefault] = - loadSkin(L"skinGraphics.swf", L"skinGraphics.swf"); + loadSkin("skinGraphics.swf", "skinGraphics.swf"); m_iggyLibraries[eLibraryFallback_GraphicsHUD] = - loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf"); + loadSkin("skinGraphicsHud.swf", "skinGraphicsHud.swf"); m_iggyLibraries[eLibraryFallback_GraphicsInGame] = - loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf"); + loadSkin("skinGraphicsInGame.swf", "skinGraphicsInGame.swf"); m_iggyLibraries[eLibraryFallback_GraphicsTooltips] = - loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf"); + loadSkin("skinGraphicsTooltips.swf", "skinGraphicsTooltips.swf"); m_iggyLibraries[eLibraryFallback_GraphicsLabels] = - loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf"); + loadSkin("skinGraphicsLabels.swf", "skinGraphicsLabels.swf"); m_iggyLibraries[eLibraryFallback_Labels] = - loadSkin(L"skinLabels.swf", L"skinLabels.swf"); + loadSkin("skinLabels.swf", "skinLabels.swf"); m_iggyLibraries[eLibraryFallback_InGame] = - loadSkin(L"skinInGame.swf", L"skinInGame.swf"); + loadSkin("skinInGame.swf", "skinInGame.swf"); m_iggyLibraries[eLibraryFallback_HUD] = - loadSkin(L"skinHud.swf", L"skinHud.swf"); + loadSkin("skinHud.swf", "skinHud.swf"); m_iggyLibraries[eLibraryFallback_Tooltips] = - loadSkin(L"skinTooltips.swf", L"skinTooltips.swf"); + loadSkin("skinTooltips.swf", "skinTooltips.swf"); m_iggyLibraries[eLibraryFallback_Default] = - loadSkin(L"skin.swf", L"skin.swf"); + loadSkin("skin.swf", "skin.swf"); #endif #endif m_iggyLibraries[eLibrary_GraphicsDefault] = - loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf"); + loadSkin("skinHDGraphics.swf", "skinHDGraphics.swf"); m_iggyLibraries[eLibrary_GraphicsHUD] = - loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf"); + loadSkin("skinHDGraphicsHud.swf", "skinHDGraphicsHud.swf"); m_iggyLibraries[eLibrary_GraphicsInGame] = - loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf"); + loadSkin("skinHDGraphicsInGame.swf", "skinHDGraphicsInGame.swf"); m_iggyLibraries[eLibrary_GraphicsTooltips] = - loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf"); + loadSkin("skinHDGraphicsTooltips.swf", "skinHDGraphicsTooltips.swf"); m_iggyLibraries[eLibrary_GraphicsLabels] = - loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf"); + loadSkin("skinHDGraphicsLabels.swf", "skinHDGraphicsLabels.swf"); m_iggyLibraries[eLibrary_Labels] = - loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf"); + loadSkin("skinHDLabels.swf", "skinHDLabels.swf"); m_iggyLibraries[eLibrary_InGame] = - loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf"); + loadSkin("skinHDInGame.swf", "skinHDInGame.swf"); m_iggyLibraries[eLibrary_HUD] = - loadSkin(L"skinHDHud.swf", L"skinHDHud.swf"); + loadSkin("skinHDHud.swf", "skinHDHud.swf"); m_iggyLibraries[eLibrary_Tooltips] = - loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf"); - m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf"); + loadSkin("skinHDTooltips.swf", "skinHDTooltips.swf"); + m_iggyLibraries[eLibrary_Default] = loadSkin("skinHD.swf", "skinHD.swf"); #endif } -IggyLibrary UIController::loadSkin(const std::wstring& skinPath, - const std::wstring& skinName) { +IggyLibrary UIController::loadSkin(const std::string& skinPath, + const std::string& skinName) { IggyLibrary lib = IGGY_INVALID_LIBRARY; // 4J Stu - We need to load the platformskin before the normal skin, as the // normal skin requires some elements from the platform skin if (!skinPath.empty() && app.hasArchiveFile(skinPath)) { std::vector baFile = app.getArchiveFile(skinPath); - const std::u16string convSkinName = wstring_to_u16string(skinName); + const std::u16string convSkinName = string_to_u16string(skinName); + + // 4jcraft: shiggy has no IggyLibraryCreateFromMemory unfortunately lib = IggyLibraryCreateFromMemoryUTF16( convSkinName.data(), (void*)baFile.data(), baFile.size(), nullptr); @@ -590,14 +592,14 @@ IggyLibrary UIController::loadSkin(const std::wstring& skinPath, &memoryInfo))) { totalStatic += memoryInfo.static_allocation_bytes; app.DebugPrintf( - app.USER_SR, "%ls - %.*s, static: %dB, dynamic: %dB\n", + app.USER_SR, "%s - %.*s, static: %dB, dynamic: %dB\n", skinPath.c_str(), memoryInfo.subcategory_stringlen, memoryInfo.subcategory, memoryInfo.static_allocation_bytes, memoryInfo.dynamic_allocation_bytes); ++iteration; } - app.DebugPrintf(app.USER_SR, "%ls - Total static: %dB (%dKB)\n", + app.DebugPrintf(app.USER_SR, "%s - Total static: %dB (%dKB)\n", skinPath.c_str(), totalStatic, totalStatic / 1024); #endif } @@ -713,7 +715,7 @@ void UIController::CleanUpSkinReload() { m_queuedMessageBoxData.clear(); } -std::vector UIController::getMovieData(const std::wstring& filename) { +std::vector UIController::getMovieData(const std::string& filename) { // Cache everything we load in the current tick int64_t targetTime = System::currentTimeMillis() + (1000LL * 60); auto it = m_cachedMovieData.find(filename); @@ -1116,11 +1118,11 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( void* user_callback_data, IggyUTF16* texture_name, S32* width, S32* height, void** destroy_callback_data) { UIController* uiController = (UIController*)user_callback_data; - auto it = uiController->m_substitutionTextures.find((wchar_t*)texture_name); + auto it = uiController->m_substitutionTextures.find((char*)texture_name); if (it != uiController->m_substitutionTextures.end()) { - app.DebugPrintf("Found substitution texture %ls, with %d bytes\n", - (wchar_t*)texture_name, it->second.size()); + app.DebugPrintf("Found substitution texture %s, with %d bytes\n", + (char*)texture_name, it->second.size()); BufferedImage image(it->second.data(), it->second.size()); if (image.getData() != nullptr) { @@ -1137,16 +1139,16 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback( *destroy_callback_data = (void*)(intptr_t)id; - app.DebugPrintf("Found substitution texture %ls (%d) - %dx%d\n", - (wchar_t*)texture_name, id, image.getWidth(), + app.DebugPrintf("Found substitution texture %s (%d) - %dx%d\n", + (char*)texture_name, id, image.getWidth(), image.getHeight()); return ui.getSubstitutionTexture(id); } else { return nullptr; } } else { - app.DebugPrintf("Could not find substitution texture %ls\n", - (wchar_t*)texture_name); + app.DebugPrintf("Could not find substitution texture %s\n", + (char*)texture_name); return nullptr; } } @@ -1167,7 +1169,7 @@ void RADLINK UIController::TextureSubstitutionDestroyCallback( t->releaseTexture(id); } -void UIController::registerSubstitutionTexture(const std::wstring& textureName, +void UIController::registerSubstitutionTexture(const std::string& textureName, std::uint8_t* pbData, unsigned int dwLength) { // Remove it if it already exists @@ -1178,7 +1180,7 @@ void UIController::registerSubstitutionTexture(const std::wstring& textureName, } void UIController::unregisterSubstitutionTexture( - const std::wstring& textureName, bool deleteData) { + const std::string& textureName, bool deleteData) { auto it = m_substitutionTextures.find(textureName); if (it != m_substitutionTextures.end()) { @@ -1358,7 +1360,7 @@ void UIController::NavigateToHomeMenu() { pMinecraft->soundEngine->SetStreamingSounds( eStream_Overworld_Calm1, eStream_Overworld_piano3, eStream_Nether1, eStream_Nether4, eStream_end_dragon, eStream_end_end, eStream_CD_1); - pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1); + pMinecraft->soundEngine->playStreaming("", 0, 0, 0, 1, 1); // if(pDLCTexPack->m_pStreamedWaveBank!=nullptr) // { @@ -1795,7 +1797,7 @@ void UIController::DisplayGamertag(unsigned int iPad, bool show) { } void UIController::SetSelectedItem(unsigned int iPad, - const std::wstring& name) { + const std::string& name) { EUIGroup group; if (app.GetGameStarted()) { @@ -1997,7 +1999,7 @@ void UIController::SetTrialTimerLimitSecs(unsigned int uiSeconds) { } void UIController::UpdateTrialTimer(unsigned int iPad) { - wchar_t wcTime[20]; + char wcTime[20]; std::uint32_t timeTicks = (std::uint32_t)app.getTrialTimer(); @@ -2016,7 +2018,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad) { { int iMins = timeTicks / 60; int iSeconds = timeTicks % 60; - swprintf(wcTime, 20, L"%d:%02d", iMins, iSeconds); + snprintf(wcTime, 20, "%d:%02d", iMins, iSeconds); if (m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen] ->getPressStartToPlay() @@ -2025,7 +2027,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad) { if (m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen] ->getPressStartToPlay() - ->setTrialTimer(L""); + ->setTrialTimer(""); } // are we out of time? @@ -2060,8 +2062,8 @@ void UIController::ShowAutosaveCountdownTimer(bool show) { } void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds) { - wchar_t wcAutosaveCountdown[100]; - swprintf(wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN), + char wcAutosaveCountdown[100]; + snprintf(wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN), uiSeconds); if (m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen] @@ -2158,7 +2160,7 @@ IPlatformStorage::EMessageResult UIController::RequestAlertMessage( unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int dwPad, int (*Func)(void*, int, const IPlatformStorage::EMessageResult), void* lpParam, - wchar_t* pwchFormatString) { + char* pwchFormatString) { return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, false); } @@ -2167,7 +2169,7 @@ IPlatformStorage::EMessageResult UIController::RequestErrorMessage( unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int dwPad, int (*Func)(void*, int, const IPlatformStorage::EMessageResult), void* lpParam, - wchar_t* pwchFormatString) { + char* pwchFormatString) { return RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pwchFormatString, 0, true); } @@ -2176,7 +2178,7 @@ IPlatformStorage::EMessageResult UIController::RequestMessageBox( unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int dwPad, int (*Func)(void*, int, const IPlatformStorage::EMessageResult), void* lpParam, - wchar_t* pwchFormatString, unsigned int dwFocusButton, bool bIsError) + char* pwchFormatString, unsigned int dwFocusButton, bool bIsError) { MessageBoxInfo param; diff --git a/targets/app/common/UI/UIController.h b/targets/app/common/UI/UIController.h index ad2ff44a3..561513dbe 100644 --- a/targets/app/common/UI/UIController.h +++ b/targets/app/common/UI/UIController.h @@ -173,14 +173,14 @@ private: static std::uint32_t m_dwTrialTimerLimitSecs; - std::unordered_map> + std::unordered_map> m_substitutionTextures; typedef struct _CachedMovieData { std::vector m_ba; int64_t m_expiry; } CachedMovieData; - std::unordered_map m_cachedMovieData; + std::unordered_map m_cachedMovieData; typedef struct _QueuedMessageBoxData { MessageBoxInfo info; @@ -240,8 +240,8 @@ public: private: void loadSkins(); - IggyLibrary loadSkin(const std::wstring& skinPath, - const std::wstring& skinName); + IggyLibrary loadSkin(const std::string& skinPath, + const std::string& skinName); public: void ReloadSkin(); @@ -254,7 +254,7 @@ private: static int reloadSkinThreadProc(void* lpParam); public: - std::vector getMovieData(const std::wstring& filename); + std::vector getMovieData(const std::string& filename); // INPUT private: @@ -329,10 +329,10 @@ protected: GDrawTexture* handle) {} public: - void registerSubstitutionTexture(const std::wstring& textureName, + void registerSubstitutionTexture(const std::string& textureName, std::uint8_t* pbData, unsigned int dwLength); - void unregisterSubstitutionTexture(const std::wstring& textureName, + void unregisterSubstitutionTexture(const std::string& textureName, bool deleteData); public: @@ -391,7 +391,7 @@ public: virtual void PlayUISFX(ESoundEffect eSound); virtual void DisplayGamertag(unsigned int iPad, bool show); - virtual void SetSelectedItem(unsigned int iPad, const std::wstring& name); + virtual void SetSelectedItem(unsigned int iPad, const std::string& name); virtual void UpdateSelectedItemPos(unsigned int iPad); virtual void HandleDLCMountingComplete(); @@ -432,19 +432,19 @@ public: uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, uint32_t dwPad = XUSER_INDEX_ANY, int (*Func)(void*, int, const IPlatformStorage::EMessageResult) = nullptr, - void* lpParam = nullptr, wchar_t* pwchFormatString = nullptr); + void* lpParam = nullptr, char* pwchFormatString = nullptr); virtual IPlatformStorage::EMessageResult RequestErrorMessage( uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, uint32_t dwPad = XUSER_INDEX_ANY, int (*Func)(void*, int, const IPlatformStorage::EMessageResult) = nullptr, - void* lpParam = nullptr, wchar_t* pwchFormatString = nullptr); + void* lpParam = nullptr, char* pwchFormatString = nullptr); private: virtual IPlatformStorage::EMessageResult RequestMessageBox( uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, uint32_t dwPad, int (*Func)(void*, int, const IPlatformStorage::EMessageResult), - void* lpParam, wchar_t* pwchFormatString, uint32_t dwFocusButton, + void* lpParam, char* pwchFormatString, uint32_t dwFocusButton, bool bIsError); public: diff --git a/targets/app/common/UI/UIFontData.cpp b/targets/app/common/UI/UIFontData.cpp index 61c9ad4c9..5f4e53c9d 100644 --- a/targets/app/common/UI/UIFontData.cpp +++ b/targets/app/common/UI/UIFontData.cpp @@ -14,7 +14,7 @@ SFontData SFontData::Mojangles_7 = { /* Font Name */ "Mojangles7", - /* Filename */ L"/TitleUpdate/res/font/Mojangles_7.png", + /* Filename */ "/TitleUpdate/res/font/Mojangles_7.png", /* Glyph count */ FONTSIZE, /* Codepoints */ SFontData::Codepoints, @@ -40,7 +40,7 @@ SFontData SFontData::Mojangles_11 = { /* Font Name */ "Mojangles11", - /* Filename */ L"/TitleUpdate/res/font/Mojangles_11.png", + /* Filename */ "/TitleUpdate/res/font/Mojangles_11.png", /* Glyph count */ FONTSIZE, /* Codepoints */ SFontData::Codepoints, diff --git a/targets/app/common/UI/UIFontData.h b/targets/app/common/UI/UIFontData.h index 6ff436051..3421ca800 100644 --- a/targets/app/common/UI/UIFontData.h +++ b/targets/app/common/UI/UIFontData.h @@ -20,7 +20,7 @@ public: std::string m_strFontName; // Filename of the glyph archive. - std::wstring m_wstrFilename; + std::string m_wstrFilename; // Number of glyphs in the archive. unsigned int m_uiGlyphCount; diff --git a/targets/app/common/UI/UIScene.cpp b/targets/app/common/UI/UIScene.cpp index ff764d2ca..148d8f930 100644 --- a/targets/app/common/UI/UIScene.cpp +++ b/targets/app/common/UI/UIScene.cpp @@ -4,8 +4,6 @@ #include #include -#include "platform/PlatformTypes.h" -#include "platform/renderer/renderer.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Controls/UIControl.h" @@ -14,6 +12,8 @@ #include "app/common/UI/UIGroup.h" #include "app/common/UI/UILayer.h" #include "app/linux/Iggy/include/iggy.h" +#include "platform/PlatformTypes.h" +#include "platform/renderer/renderer.h" #ifndef _ENABLEIGGY #include "app/linux/Stubs/iggy_stubs.h" #endif @@ -21,7 +21,6 @@ #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "util/StringHelpers.h" #include "java/System.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" @@ -29,6 +28,7 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/item/ItemInstance.h" +#include "util/StringHelpers.h" class MultiplayerLocalPlayer; @@ -252,13 +252,13 @@ void UIScene::initialiseMovie() { bool UIScene::mapElementsAndNames() { m_rootPath = IggyPlayerRootPath(swf); - m_funcRemoveObject = registerFastName(L"RemoveObject"); - m_funcSlideLeft = registerFastName(L"SlideLeft"); - m_funcSlideRight = registerFastName(L"SlideRight"); - m_funcSetSafeZone = registerFastName(L"SetSafeZone"); - m_funcSetAlpha = registerFastName(L"SetAlpha"); - m_funcSetFocus = registerFastName(L"SetFocus"); - m_funcHorizontalResizeCheck = registerFastName(L"DoHorizontalResizeCheck"); + m_funcRemoveObject = registerFastName("RemoveObject"); + m_funcSlideLeft = registerFastName("SlideLeft"); + m_funcSlideRight = registerFastName("SlideRight"); + m_funcSetSafeZone = registerFastName("SetSafeZone"); + m_funcSetAlpha = registerFastName("SetAlpha"); + m_funcSetFocus = registerFastName("SetFocus"); + m_funcHorizontalResizeCheck = registerFastName("DoHorizontalResizeCheck"); IggyDatatype safeZoneType = IGGY_DATATYPE__invalid_request; IggyResult safeZoneResult = IggyValueGetTypeRS( @@ -273,38 +273,38 @@ void UIScene::loadMovie() { UIController::ms_reloadSkinCS.lock(); // MGH - added to prevent crash // loading Iggy movies while the // skins were being reloaded - std::wstring moviePath = getMoviePath(); + std::string moviePath = getMoviePath(); #if defined(_WINDOWS64) if (ui.getScreenHeight() == 720) { - moviePath.append(L"720.swf"); + moviePath.append("720.swf"); m_loadedResolution = eSceneResolution_720; } else if (ui.getScreenHeight() == 480) { - moviePath.append(L"480.swf"); + moviePath.append("480.swf"); m_loadedResolution = eSceneResolution_480; } else if (ui.getScreenHeight() < 720) { - moviePath.append(L"Vita.swf"); + moviePath.append("Vita.swf"); m_loadedResolution = eSceneResolution_Vita; } else { - moviePath.append(L"1080.swf"); + moviePath.append("1080.swf"); m_loadedResolution = eSceneResolution_1080; } #else - moviePath.append(L"1080.swf"); + moviePath.append("1080.swf"); m_loadedResolution = eSceneResolution_1080; #endif if (!app.hasArchiveFile(moviePath)) { app.DebugPrintf( - "WARNING: Could not find iggy movie %ls, falling back on 720\n", + "WARNING: Could not find iggy movie %s, falling back on 720\n", moviePath.c_str()); moviePath = getMoviePath(); - moviePath.append(L"720.swf"); + moviePath.append("720.swf"); m_loadedResolution = eSceneResolution_720; if (!app.hasArchiveFile(moviePath)) { - app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", + app.DebugPrintf("ERROR: Could not find any iggy movie for %s!\n", moviePath.c_str()); #if !defined(_CONTENT_PACKAGE) assert(0); @@ -327,7 +327,7 @@ void UIScene::loadMovie() { #endif app.FatalLoadError(); } - app.DebugPrintf(app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str()); + app.DebugPrintf(app.USER_SR, "Loaded iggy movie %s\n", moviePath.c_str()); IggyProperties* properties = IggyPlayerProperties(swf); m_movieHeight = properties->movie_height_in_pixels; m_movieWidth = properties->movie_width_in_pixels; @@ -345,7 +345,7 @@ void UIScene::loadMovie() { UIController::ms_reloadSkinCS.unlock(); } -void UIScene::getDebugMemoryUseRecursive(const std::wstring& moviePath, +void UIScene::getDebugMemoryUseRecursive(const std::string& moviePath, IggyMemoryUseInfo& memoryInfo) { rrbool res; IggyMemoryUseInfo internalMemoryInfo; @@ -355,7 +355,7 @@ void UIScene::getDebugMemoryUseRecursive(const std::wstring& moviePath, internalIteration, &internalMemoryInfo))) { app.DebugPrintf( - app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", + app.USER_SR, "%s - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory, internalMemoryInfo.static_allocation_bytes, @@ -389,7 +389,7 @@ void UIScene::PrintTotalMemoryUsage(int64_t& totalStatic, app.DebugPrintf( app.USER_SR, - " \\- Scene static: %d , Scene dynamic: %d , Total: %d - %ls\n", + " \\- Scene static: %d , Scene dynamic: %d , Total: %d - %s\n", sceneStatic, sceneDynamic, sceneStatic + sceneDynamic, getMoviePath().c_str()); } @@ -443,15 +443,15 @@ void UIScene::tickTimers() { } } -IggyName UIScene::registerFastName(const std::wstring& name) { +IggyName UIScene::registerFastName(const std::string& name) { IggyName var; auto it = m_fastNames.find(name); if (it != m_fastNames.end()) { var = it->second; } else { - const std::u16string convName = wstring_to_u16string(name); - var = IggyPlayerCreateFastName(getMovie(), (IggyUTF16*)convName.c_str(), - -1); + // 4jcraft: shiggy has no IggyPlayerCreateFastNameUTF8 unfortunately + var = IggyPlayerCreateFastName(getMovie(), + string_to_u16string(name).c_str(), -1); m_fastNames[name] = var; } @@ -464,7 +464,7 @@ void UIScene::removeControl(UIControl_Base* control, bool centreScene) { std::string name = control->getControlName(); IggyStringUTF8 stringVal; - stringVal.string = (char*)name.c_str(); + stringVal.string = const_cast((char*)name.c_str()); stringVal.length = name.length(); value[0].type = IGGY_DATATYPE_string_UTF8; value[0].string8 = stringVal; @@ -497,7 +497,8 @@ void UIScene::doHorizontalResizeCheck() { m_funcHorizontalResizeCheck, 0, nullptr); } -void UIScene::render(S32 width, S32 height, IPlatformRenderer::eViewportType viewport) { +void UIScene::render(S32 width, S32 height, + IPlatformRenderer::eViewportType viewport) { if (m_bIsReloading) return; if (!m_hasTickedOnce || !swf) return; ui.setupRenderPosition(viewport); @@ -560,7 +561,8 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region, bool useCommandBuffers = false; if (!useCommandBuffers || m_needsCacheRendered) { - if (useCommandBuffers) PlatformRenderer.CBuffStart(list, true); + if (useCommandBuffers) + PlatformRenderer.CBuffStart(list, true); ui.setupCustomDrawMatrices(this, customDrawRegion); _customDrawSlotControl(customDrawRegion, iPad, item, fAlpha, isFoil, bDecorations, @@ -1087,7 +1089,7 @@ void UIScene::externalCallback(IggyExternalFunctionCallUTF16* call) { } } -void UIScene::registerSubstitutionTexture(const std::wstring& textureName, +void UIScene::registerSubstitutionTexture(const std::string& textureName, std::uint8_t* pbData, unsigned int dwLength, bool deleteData) { @@ -1096,8 +1098,7 @@ void UIScene::registerSubstitutionTexture(const std::wstring& textureName, ui.registerSubstitutionTexture(textureName, pbData, dwLength); } -bool UIScene::hasRegisteredSubstitutionTexture( - const std::wstring& textureName) { +bool UIScene::hasRegisteredSubstitutionTexture(const std::string& textureName) { auto it = m_registeredTextures.find(textureName); return it != m_registeredTextures.end(); diff --git a/targets/app/common/UI/UIScene.h b/targets/app/common/UI/UIScene.h index 9ff6a00f1..ebb660d42 100644 --- a/targets/app/common/UI/UIScene.h +++ b/targets/app/common/UI/UIScene.h @@ -73,8 +73,8 @@ private: IggyName m_funcSetAlpha; ItemRenderer* m_pItemRenderer; - std::unordered_map m_fastNames; - std::unordered_map m_registeredTextures; + std::unordered_map m_fastNames; + std::unordered_map m_registeredTextures; typedef struct _TimerInfo { int duration; @@ -134,14 +134,14 @@ protected: virtual F64 getSafeZoneHalfWidth(); void setSafeZone(S32 top, S32 bottom, S32 left, S32 right); void doHorizontalResizeCheck(); - virtual std::wstring getMoviePath() = 0; + virtual std::string getMoviePath() = 0; virtual bool mapElementsAndNames(); void initialiseMovie(); void loadMovie(); private: - void getDebugMemoryUseRecursive(const std::wstring& moviePath, + void getDebugMemoryUseRecursive(const std::string& moviePath, IggyMemoryUseInfo& memoryInfo); public: @@ -156,7 +156,7 @@ public: virtual void tick(); - IggyName registerFastName(const std::wstring& name); + IggyName registerFastName(const std::string& name); protected: void addTimer(int id, int ms); @@ -282,11 +282,11 @@ public: virtual void HandleMessage(EUIMessage message, void* data); - void registerSubstitutionTexture(const std::wstring& textureName, + void registerSubstitutionTexture(const std::string& textureName, std::uint8_t* pbData, unsigned int dwLength, bool deleteData = false); - bool hasRegisteredSubstitutionTexture(const std::wstring& textureName); + bool hasRegisteredSubstitutionTexture(const std::string& textureName); virtual void handleUnlockFullVersion() {} diff --git a/targets/app/common/UI/UIString.cpp b/targets/app/common/UI/UIString.cpp index 7e6fcd5d2..235e67a60 100644 --- a/targets/app/common/UI/UIString.cpp +++ b/targets/app/common/UI/UIString.cpp @@ -29,11 +29,11 @@ UIString::UIStringCore::UIStringCore(StringBuilder wstrBuilder) { m_fStringBuilder = wstrBuilder; - m_wstrCache = L""; + m_wstrCache = ""; update(true); } -UIString::UIStringCore::UIStringCore(const std::wstring& str) { +UIString::UIStringCore::UIStringCore(const std::string& str) { m_bIsConstant = true; m_lastSetLanguage = m_lastSetLocale = -1; @@ -42,7 +42,7 @@ UIString::UIStringCore::UIStringCore(const std::wstring& str) { m_wstrCache = str; } -std::wstring& UIString::UIStringCore::getString() { +std::string& UIString::UIStringCore::getString() { if (hasNewString()) update(true); return m_wstrCache; } @@ -92,19 +92,19 @@ UIString::UIString(StringBuilder wstrBuilder) { m_core = std::shared_ptr(core); } -UIString::UIString(const std::string& constant) { - std::wstring wstr = convStringToWstring(constant); - UIStringCore* core = new UIStringCore(wstr); - m_core = std::shared_ptr(core); -} +// UIString::UIString(const std::wstring& constant) { +// std::wstring wstr = convStringToWstring(constant); +// UIStringCore* core = new UIStringCore(wstr); +// m_core = std::shared_ptr(core); +// } -UIString::UIString(const std::wstring& constant) { +UIString::UIString(const std::string& constant) { UIStringCore* core = new UIStringCore(constant); m_core = std::shared_ptr(core); } -UIString::UIString(const wchar_t* constant) { - std::wstring str = std::wstring(constant); +UIString::UIString(const char* constant) { + std::string str = std::string(constant); UIStringCore* core = new UIStringCore(str); m_core = std::shared_ptr(core); } @@ -128,14 +128,14 @@ void UIString::setUpdated() { if (m_core != nullptr) m_core->setUpdated(); } -std::wstring& UIString::getString() { - static std::wstring blank(L""); +std::string& UIString::getString() { + static std::string blank(""); if (m_core != nullptr) return m_core->getString(); else return blank; } -const wchar_t* UIString::c_str() { return getString().c_str(); } +const char* UIString::c_str() { return getString().c_str(); } unsigned int UIString::length() { return getString().length(); } \ No newline at end of file diff --git a/targets/app/common/UI/UIString.h b/targets/app/common/UI/UIString.h index 715b3e379..c2b8ad09a 100644 --- a/targets/app/common/UI/UIString.h +++ b/targets/app/common/UI/UIString.h @@ -5,7 +5,7 @@ #include #include -typedef std::function StringBuilder; +typedef std::function StringBuilder; class UIString { protected: @@ -25,7 +25,7 @@ protected: int m_lastUpdatedLanguage; int m_lastUpdatedLocale; - std::wstring m_wstrCache; + std::string m_wstrCache; bool m_bIsConstant; @@ -33,9 +33,9 @@ protected: public: UIStringCore(StringBuilder wstrBuilder); - UIStringCore(const std::wstring& str); + UIStringCore(const std::string& str); - std::wstring& getString(); + std::string& getString(); bool hasNewString(); bool update(bool force); @@ -56,9 +56,9 @@ public: // with a custom update function. // Create a UIString with a constant value. + // UIString(const std::wstring& constant); UIString(const std::string& constant); - UIString(const std::wstring& constant); - UIString(const wchar_t* constant); + UIString(const char* constant); ~UIString(); @@ -69,8 +69,8 @@ public: // setUpdated was called. void setUpdated(); // The new text has been used. - std::wstring& getString(); + std::string& getString(); - const wchar_t* c_str(); + const char* c_str(); unsigned int length(); }; \ No newline at end of file diff --git a/targets/app/common/XboxStubs.cpp b/targets/app/common/XboxStubs.cpp index 9a713ee46..d0b57de3d 100644 --- a/targets/app/common/XboxStubs.cpp +++ b/targets/app/common/XboxStubs.cpp @@ -8,10 +8,10 @@ uint32_t XUserGetSigninInfo(uint32_t dwUserIndex, uint32_t dwFlags, return 0; } -const wchar_t* CXuiStringTable::Lookup(const wchar_t* szId) { return szId; } -const wchar_t* CXuiStringTable::Lookup(uint32_t nIndex) { return L"String"; } +const char* CXuiStringTable::Lookup(const char* szId) { return szId; } +const char* CXuiStringTable::Lookup(uint32_t nIndex) { return "String"; } void CXuiStringTable::Clear() {} -int32_t CXuiStringTable::Load(const wchar_t* szId) { return 0; } +int32_t CXuiStringTable::Load(const char* szId) { return 0; } uint32_t XGetLanguage() { return 1; } uint32_t XGetLocale() { return 0; } diff --git a/targets/app/linux/Iggy/include/iggy.h b/targets/app/linux/Iggy/include/iggy.h index 691537e91..23c441c61 100644 --- a/targets/app/linux/Iggy/include/iggy.h +++ b/targets/app/linux/Iggy/include/iggy.h @@ -124,7 +124,7 @@ typedef enum IggyDatatype { #ifdef __RADWIN__ #include -IDOCN typedef wchar_t IggyUTF16; +IDOCN typedef char IggyUTF16; #else typedef const char16_t IggyUTF16; #endif @@ -748,7 +748,7 @@ IDOCN typedef rrbool IggyGetMP3Decoder(IggyMP3Interface* decoder); #ifdef __RADNT__ RADEXPFUNC void RADEXPLINK IggyAudioInstallMP3Decoder(void); RADEXPFUNC void RADEXPLINK IggySetDLLDirectory(char* path); -RADEXPFUNC void RADEXPLINK IggySetDLLDirectoryW(wchar_t* path); +RADEXPFUNC void RADEXPLINK IggySetDLLDirectoryW(char* path); #else // this is overkill for non-DLL implementations, which could call into Iggy // directly, but it means everything goes through the same indirection diff --git a/targets/app/linux/LinuxGame.cpp b/targets/app/linux/LinuxGame.cpp index cba435278..0e6d59c73 100644 --- a/targets/app/linux/LinuxGame.cpp +++ b/targets/app/linux/LinuxGame.cpp @@ -55,7 +55,7 @@ void LinuxGame::TemporaryCreateGameStart() { Minecraft* pMinecraft = Minecraft::GetInstance(); app.ReleaseSaveThumbnail(); PlatformProfile.SetLockedProfile(0); - pMinecraft->user->name = L"Windows"; + pMinecraft->user->name = "Windows"; app.ApplyGameSettingsChanged(0); ////////////////////////////////////////////////////////////////////////////////////////////// @@ -70,7 +70,7 @@ void LinuxGame::TemporaryCreateGameStart() { /// From CScene_MultiGameCreate::CreateGame app.ClearTerrainFeaturePosition(); - std::wstring wWorldName = L"TestWorld"; + std::string wWorldName = "TestWorld"; PlatformStorage.ResetSaveData(); PlatformStorage.SetSaveTitle(wWorldName.c_str()); @@ -121,15 +121,15 @@ void LinuxGame::TemporaryCreateGameStart() { thread->run(); } -int LinuxGame::GetLocalTMSFileIndex(wchar_t* wchTMSFile, +int LinuxGame::GetLocalTMSFileIndex(char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) { return -1; } -int LinuxGame::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } +int LinuxGame::LoadLocalTMSFile(char* wchTMSFile) { return -1; } -int LinuxGame::LoadLocalTMSFile(wchar_t* wchTMSFile, +int LinuxGame::LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt) { return -1; } diff --git a/targets/app/linux/LinuxGame.h b/targets/app/linux/LinuxGame.h index 99a9fee55..528dfde4e 100644 --- a/targets/app/linux/LinuxGame.h +++ b/targets/app/linux/LinuxGame.h @@ -24,13 +24,13 @@ public: void GetScreenshot(int iPad, std::uint8_t** screenshotData, unsigned int* screenshotSize) override; - int LoadLocalTMSFile(wchar_t* wchTMSFile) override; - int LoadLocalTMSFile(wchar_t* wchTMSFile, + int LoadLocalTMSFile(char* wchTMSFile) override; + int LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt) override; void FreeLocalTMSFiles(eTMSFileType eType) override; int GetLocalTMSFileIndex( - wchar_t* wchTMSFile, bool bFilenameIncludesExtension, + char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT = eFileExtensionType_PNG) override; void ReadBannedList(int iPad, eTMSAction action = (eTMSAction)0, diff --git a/targets/app/linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp index 51c7ee065..c9d5d3c5e 100644 --- a/targets/app/linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -99,10 +99,6 @@ uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = {0, 0, 0, 0, 0}; // running for a long time. //------------------------------------------------------------------------------------- -// functions for storing and converting rich presence strings from wchar to utf8 -uint8_t* AddRichPresenceString(int iID); -void FreeRichPresenceStrings(); - bool g_bWidescreen = true; void DefineActions(void) { @@ -641,39 +637,3 @@ int main(int argc, const char* argv[]) { PlatformRenderer.Shutdown(); _exit(0); } // end main - -// Free resources, unregister custom classes, and exit. -// app.Uninit(); -// g_pd3dDevice->Release(); - -std::vector vRichPresenceStrings; - -uint8_t* mallocAndCreateUTF8ArrayFromString(int iID) { - const wchar_t* wchString = app.GetString(iID); - - std::wstring srcString = wchString; - std::u8string dstString = wstring_to_u8string(srcString); - - int dst_len = dstString.size() + 1; - uint8_t* strUtf8 = (uint8_t*)malloc(dst_len); - memcpy(strUtf8, dstString.c_str(), dst_len); - - return strUtf8; -} - -uint8_t* AddRichPresenceString(int iID) { - uint8_t* strUtf8 = mallocAndCreateUTF8ArrayFromString(iID); - if (strUtf8 != nullptr) { - vRichPresenceStrings.push_back(strUtf8); - } - return strUtf8; -} - -void FreeRichPresenceStrings() { - uint8_t* strUtf8; - for (int i = 0; i < vRichPresenceStrings.size(); i++) { - strUtf8 = vRichPresenceStrings.at(i); - free(strUtf8); - } - vRichPresenceStrings.clear(); -} diff --git a/targets/app/windows/Iggy/include/iggy.h b/targets/app/windows/Iggy/include/iggy.h index c648b4601..c1d89e639 100644 --- a/targets/app/windows/Iggy/include/iggy.h +++ b/targets/app/windows/Iggy/include/iggy.h @@ -124,7 +124,7 @@ typedef enum IggyDatatype { #ifdef __RADWIN__ #include -IDOCN typedef wchar_t IggyUTF16; +IDOCN typedef char IggyUTF16; #else typedef unsigned short IggyUTF16; #endif @@ -748,7 +748,7 @@ IDOCN typedef rrbool IggyGetMP3Decoder(IggyMP3Interface* decoder); #ifdef __RADNT__ RADEXPFUNC void RADEXPLINK IggyAudioInstallMP3Decoder(void); RADEXPFUNC void RADEXPLINK IggySetDLLDirectory(char* path); -RADEXPFUNC void RADEXPLINK IggySetDLLDirectoryW(wchar_t* path); +RADEXPFUNC void RADEXPLINK IggySetDLLDirectoryW(char* path); #else // this is overkill for non-DLL implementations, which could call into Iggy // directly, but it means everything goes through the same indirection diff --git a/targets/app/windows/Windows64_App.cpp b/targets/app/windows/Windows64_App.cpp index 74d266cb9..8a1ef2297 100644 --- a/targets/app/windows/Windows64_App.cpp +++ b/targets/app/windows/Windows64_App.cpp @@ -46,7 +46,7 @@ void WindowsGame::TemporaryCreateGameStart() { Minecraft* pMinecraft = Minecraft::GetInstance(); app.ReleaseSaveThumbnail(); PlatformProfile.SetLockedProfile(0); - pMinecraft->user->name = L"Windows"; + pMinecraft->user->name = "Windows"; app.ApplyGameSettingsChanged(0); ////////////////////////////////////////////////////////////////////////////////////////////// @@ -61,7 +61,7 @@ void WindowsGame::TemporaryCreateGameStart() { /// From CScene_MultiGameCreate::CreateGame app.ClearTerrainFeaturePosition(); - std::wstring wWorldName = L"TestWorld"; + std::string wWorldName = "TestWorld"; PlatformStorage.ResetSaveData(); PlatformStorage.SetSaveTitle(wWorldName.c_str()); @@ -112,15 +112,15 @@ void WindowsGame::TemporaryCreateGameStart() { thread->run(); } -int WindowsGame::GetLocalTMSFileIndex(wchar_t* wchTMSFile, +int WindowsGame::GetLocalTMSFileIndex(char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT) { return -1; } -int WindowsGame::LoadLocalTMSFile(wchar_t* wchTMSFile) { return -1; } +int WindowsGame::LoadLocalTMSFile(char* wchTMSFile) { return -1; } -int WindowsGame::LoadLocalTMSFile(wchar_t* wchTMSFile, +int WindowsGame::LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt) { return -1; } diff --git a/targets/app/windows/WindowsGame.h b/targets/app/windows/WindowsGame.h index 81b2ab899..f04abc674 100644 --- a/targets/app/windows/WindowsGame.h +++ b/targets/app/windows/WindowsGame.h @@ -17,12 +17,12 @@ public: virtual void GetScreenshot(int iPad, std::uint8_t** screenshotData, unsigned int* screenshotSize); - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile); - virtual int LoadLocalTMSFile(wchar_t* wchTMSFile, eFileExtensionType eExt); + virtual int LoadLocalTMSFile(char* wchTMSFile); + virtual int LoadLocalTMSFile(char* wchTMSFile, eFileExtensionType eExt); virtual void FreeLocalTMSFiles(eTMSFileType eType); virtual int GetLocalTMSFileIndex( - wchar_t* wchTMSFile, bool bFilenameIncludesExtension, + char* wchTMSFile, bool bFilenameIncludesExtension, eFileExtensionType eEXT = eFileExtensionType_PNG); // BANNED LEVEL LIST diff --git a/targets/app/windows/XML/ATGXmlParser.cpp b/targets/app/windows/XML/ATGXmlParser.cpp index c24328715..6b804aa58 100644 --- a/targets/app/windows/XML/ATGXmlParser.cpp +++ b/targets/app/windows/XML/ATGXmlParser.cpp @@ -103,7 +103,7 @@ int32_t XMLParser::ConsumeSpace() { //------------------------------------------------------------------------------------- int32_t XMLParser::ConvertEscape() { int32_t hr; - wchar_t wVal = 0; + char wVal = 0; if (FAILED(hr = AdvanceCharacter())) return hr; @@ -161,7 +161,7 @@ int32_t XMLParser::ConvertEscape() { // must be an entity reference - wchar_t* pEntityRefVal = m_pWritePtr; + char* pEntityRefVal = m_pWritePtr; uint32_t EntityRefLen; SkipNextAdvance(); @@ -175,15 +175,15 @@ int32_t XMLParser::ConvertEscape() { return E_INVALID_XML_SYNTAX; } - if (!wcsncmp(pEntityRefVal, L"lt", EntityRefLen)) + if (!strncmp(pEntityRefVal, "lt", EntityRefLen)) wVal = '<'; - else if (!wcsncmp(pEntityRefVal, L"gt", EntityRefLen)) + else if (!strncmp(pEntityRefVal, "gt", EntityRefLen)) wVal = '>'; - else if (!wcsncmp(pEntityRefVal, L"amp", EntityRefLen)) + else if (!strncmp(pEntityRefVal, "amp", EntityRefLen)) wVal = '&'; - else if (!wcsncmp(pEntityRefVal, L"apos", EntityRefLen)) + else if (!strncmp(pEntityRefVal, "apos", EntityRefLen)) wVal = '\''; - else if (!wcsncmp(pEntityRefVal, L"quot", EntityRefLen)) + else if (!strncmp(pEntityRefVal, "quot", EntityRefLen)) wVal = '"'; else { Error(E_INVALID_XML_SYNTAX, @@ -213,7 +213,7 @@ int32_t XMLParser::ConvertEscape() { //------------------------------------------------------------------------------------- int32_t XMLParser::AdvanceAttrVal() { int32_t hr; - wchar_t wQuoteChar; + char wQuoteChar; if (FAILED(hr = AdvanceCharacter())) return hr; @@ -331,7 +331,7 @@ int32_t XMLParser::AdvanceCharacter(bool bOkToFail) { m_pReadPtr++; } else // if( m_bUnicode == true ) { - m_Ch = *((wchar_t*)m_pReadPtr); + m_Ch = *((char*)m_pReadPtr); if (m_bReverseBytes) { m_Ch = (m_Ch << 8) + (m_Ch >> 8); @@ -413,7 +413,7 @@ int32_t XMLParser::AdvanceElement() { } if (FAILED(hr = AdvanceCDATA())) return hr; } else if (m_Ch == '/') { - wchar_t* pEntityRefVal = m_pWritePtr; + char* pEntityRefVal = m_pWritePtr; if (FAILED(hr = AdvanceName())) return hr; @@ -442,7 +442,7 @@ int32_t XMLParser::AdvanceElement() { XMLAttribute Attributes[XML_MAX_ATTRIBUTES_PER_ELEMENT]; uint32_t NumAttrs; - wchar_t* pEntityRefVal = m_pWritePtr; + char* pEntityRefVal = m_pWritePtr; uint32_t EntityRefLen; NumAttrs = 0; @@ -626,18 +626,18 @@ int32_t XMLParser::MainParseLoop() { FillBuffer(); - if (*((wchar_t*)m_pReadBuf) == 0xFEFF) { + if (*((char*)m_pReadBuf) == 0xFEFF) { m_bUnicode = true; m_bReverseBytes = false; m_pReadPtr += 2; - } else if (*((wchar_t*)m_pReadBuf) == 0xFFFE) { + } else if (*((char*)m_pReadBuf) == 0xFFFE) { m_bUnicode = true; m_bReverseBytes = true; m_pReadPtr += 2; - } else if (*((wchar_t*)m_pReadBuf) == 0x003C) { + } else if (*((char*)m_pReadBuf) == 0x003C) { m_bUnicode = true; m_bReverseBytes = false; - } else if (*((wchar_t*)m_pReadBuf) == 0x3C00) { + } else if (*((char*)m_pReadBuf) == 0x3C00) { m_bUnicode = true; m_bReverseBytes = true; } else if (m_pReadBuf[0] == 0x3C) { diff --git a/targets/app/windows/XML/ATGXmlParser.h b/targets/app/windows/XML/ATGXmlParser.h index ab5b6bd48..2b8dabbe0 100644 --- a/targets/app/windows/XML/ATGXmlParser.h +++ b/targets/app/windows/XML/ATGXmlParser.h @@ -39,9 +39,9 @@ const uint32_t XML_WRITE_BUFFER_SIZE = 2048; //------------------------------------------------------------------------------------- struct XMLAttribute { - wchar_t* strName; + char* strName; uint32_t NameLen; - wchar_t* strValue; + char* strValue; uint32_t ValueLen; }; @@ -56,15 +56,15 @@ public: virtual int32_t StartDocument() = 0; virtual int32_t EndDocument() = 0; - virtual int32_t ElementBegin(const wchar_t* strName, uint32_t NameLen, + virtual int32_t ElementBegin(const char* strName, uint32_t NameLen, const XMLAttribute* pAttributes, uint32_t NumAttributes) = 0; - virtual int32_t ElementContent(const wchar_t* strData, uint32_t DataLen, + virtual int32_t ElementContent(const char* strData, uint32_t DataLen, bool More) = 0; - virtual int32_t ElementEnd(const wchar_t* strName, uint32_t NameLen) = 0; + virtual int32_t ElementEnd(const char* strName, uint32_t NameLen) = 0; virtual int32_t CDATABegin() = 0; - virtual int32_t CDATAData(const wchar_t* strCDATA, uint32_t CDATALen, + virtual int32_t CDATAData(const char* strCDATA, uint32_t CDATALen, bool bMore) = 0; virtual int32_t CDATAEnd() = 0; @@ -103,7 +103,7 @@ public: int32_t ParseXMLFile(const char* strFilename); - // Parses from a buffer- if you pass a wchar_t buffer (and cast it), it + // Parses from a buffer- if you pass a char buffer (and cast it), it // will // correctly detect it and use unicode instead. Return codes are // the same as for ParseXMLFile @@ -142,16 +142,16 @@ private: uint32_t m_dwCharsConsumed; uint8_t m_pReadBuf[XML_READ_BUFFER_SIZE + 2]; // room for a trailing NULL - wchar_t m_pWriteBuf[XML_WRITE_BUFFER_SIZE]; + char m_pWriteBuf[XML_WRITE_BUFFER_SIZE]; uint8_t* m_pReadPtr; - wchar_t* m_pWritePtr; // write pointer within m_pBuf + char* m_pWritePtr; // write pointer within m_pBuf bool m_bUnicode; // true = 16-bits, false = 8-bits bool m_bReverseBytes; // true = reverse bytes, false = don't reverse bool m_bSkipNextAdvance; - wchar_t m_Ch; // Current character being parsed + char m_Ch; // Current character being parsed }; } // namespace ATG diff --git a/targets/app/windows/XML/xmlFilesCallback.h b/targets/app/windows/XML/xmlFilesCallback.h index af5b04db8..f3d940f73 100644 --- a/targets/app/windows/XML/xmlFilesCallback.h +++ b/targets/app/windows/XML/xmlFilesCallback.h @@ -11,44 +11,44 @@ public: virtual int32_t StartDocument() { return 0; }; virtual int32_t EndDocument() { return 0; }; - virtual int32_t ElementBegin(const wchar_t* strName, uint32_t NameLen, + virtual int32_t ElementBegin(const char* strName, uint32_t NameLen, const XMLAttribute* pAttributes, uint32_t NumAttributes) { - wchar_t wTemp[35] = L""; - wchar_t wAttName[32] = L""; - wchar_t wNameXUID[32] = L""; - wchar_t wNameSkin[32] = L""; - wchar_t wNameCloak[32] = L""; + char wTemp[35] = ""; + char wAttName[32] = ""; + char wNameXUID[32] = ""; + char wNameSkin[32] = ""; + char wNameCloak[32] = ""; PlayerUID xuid = 0LL; if (NameLen > 31) return 1; else - wcsncpy(wAttName, strName, NameLen); + strncpy(wAttName, strName, NameLen); - if (_wcsicmp(wAttName, L"root") == 0) { + if (_wcsicmp(wAttName, "root") == 0) { return 0; - } else if (_wcsicmp(wAttName, L"data") == 0) { + } else if (_wcsicmp(wAttName, "data") == 0) { for (uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s(wAttName, pAttributes[i].strName, pAttributes[i].NameLen); - if (_wcsicmp(wAttName, L"name") == 0) { + if (_wcsicmp(wAttName, "name") == 0) { if (pAttributes[i].ValueLen <= 32) wcsncpy_s(wNameXUID, pAttributes[i].strValue, pAttributes[i].ValueLen); - } else if (_wcsicmp(wAttName, L"xuid") == 0) { + } else if (_wcsicmp(wAttName, "xuid") == 0) { if (pAttributes[i].ValueLen <= 32) { - memset(wTemp, 0, sizeof(wchar_t) * 35); + memset(wTemp, 0, sizeof(char) * 35); wcsncpy_s(wTemp, pAttributes[i].strValue, pAttributes[i].ValueLen); xuid = _wcstoui64(wTemp, nullptr, 10); } - } else if (_wcsicmp(wAttName, L"cape") == 0) { + } else if (_wcsicmp(wAttName, "cape") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wNameCloak, pAttributes[i].strValue, pAttributes[i].ValueLen); } - } else if (_wcsicmp(wAttName, L"skin") == 0) { + } else if (_wcsicmp(wAttName, "skin") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wNameSkin, pAttributes[i].strValue, pAttributes[i].ValueLen); @@ -67,18 +67,18 @@ public: } }; - virtual int32_t ElementContent(const wchar_t* strData, uint32_t DataLen, + virtual int32_t ElementContent(const char* strData, uint32_t DataLen, bool More) { return 0; }; - virtual int32_t ElementEnd(const wchar_t* strName, uint32_t NameLen) { + virtual int32_t ElementEnd(const char* strName, uint32_t NameLen) { return 0; }; virtual int32_t CDATABegin() { return 0; }; - virtual int32_t CDATAData(const wchar_t* strCDATA, uint32_t CDATALen, + virtual int32_t CDATAData(const char* strCDATA, uint32_t CDATALen, bool bMore) { return 0; }; @@ -95,13 +95,13 @@ public: virtual int32_t StartDocument() { return 0; }; virtual int32_t EndDocument() { return 0; }; - virtual int32_t ElementBegin(const wchar_t* strName, uint32_t NameLen, + virtual int32_t ElementBegin(const char* strName, uint32_t NameLen, const XMLAttribute* pAttributes, uint32_t NumAttributes) { - wchar_t wTemp[35] = L""; - wchar_t wType[32] = L""; - wchar_t wAttName[32] = L""; - wchar_t wValue[32] = L""; + char wTemp[35] = ""; + char wType[32] = ""; + char wAttName[32] = ""; + char wValue[32] = ""; int iValue = -1; if (NameLen > 31) @@ -109,23 +109,23 @@ public: else wcsncpy_s(wAttName, strName, NameLen); - if (_wcsicmp(wAttName, L"root") == 0) { + if (_wcsicmp(wAttName, "root") == 0) { return 0; - } else if (_wcsicmp(wAttName, L"data") == 0) { + } else if (_wcsicmp(wAttName, "data") == 0) { for (uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s(wAttName, pAttributes[i].strName, pAttributes[i].NameLen); - if (_wcsicmp(wAttName, L"Type") == 0) { + if (_wcsicmp(wAttName, "Type") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wType, pAttributes[i].strValue, pAttributes[i].ValueLen); } - } else if (_wcsicmp(wAttName, L"Value") == 0) { + } else if (_wcsicmp(wAttName, "Value") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wValue, pAttributes[i].strValue, pAttributes[i].ValueLen); - iValue = wcstol(wValue, nullptr, 10); + iValue = strtol(wValue, nullptr, 10); } } } @@ -133,7 +133,7 @@ public: // if the xuid hasn't been defined, then we can't use the data if (iValue != -1) { #if defined(_DEBUG) - wprintf(L"Type - %s, Value - %d, ", wType, iValue); + printf("Type - %s, Value - %d, ", wType, iValue); #endif return Game::RegisterConfigValues(wType, @@ -146,18 +146,18 @@ public: } } - virtual int32_t ElementContent(const wchar_t* strData, uint32_t DataLen, + virtual int32_t ElementContent(const char* strData, uint32_t DataLen, bool More) { return 0; }; - virtual int32_t ElementEnd(const wchar_t* strName, uint32_t NameLen) { + virtual int32_t ElementEnd(const char* strName, uint32_t NameLen) { return 0; }; virtual int32_t CDATABegin() { return 0; }; - virtual int32_t CDATAData(const wchar_t* strCDATA, uint32_t CDATALen, + virtual int32_t CDATAData(const char* strCDATA, uint32_t CDATALen, bool bMore) { return 0; }; @@ -174,16 +174,16 @@ public: virtual int32_t StartDocument() { return 0; }; virtual int32_t EndDocument() { return 0; }; - virtual int32_t ElementBegin(const wchar_t* strName, uint32_t NameLen, + virtual int32_t ElementBegin(const char* strName, uint32_t NameLen, const XMLAttribute* pAttributes, uint32_t NumAttributes) { - wchar_t wTemp[35] = L""; - wchar_t wAttName[32] = L""; - wchar_t wNameBanner[32] = L""; - wchar_t wDataFile[32] = L""; - wchar_t wType[32] = L""; - wchar_t wFirstSkin[32] = L""; - wchar_t wConfig[32] = L""; + char wTemp[35] = ""; + char wAttName[32] = ""; + char wNameBanner[32] = ""; + char wDataFile[32] = ""; + char wType[32] = ""; + char wFirstSkin[32] = ""; + char wConfig[32] = ""; uint64_t ullFull = 0ll; uint64_t ullTrial = 0ll; unsigned int uiSortIndex = 0L; @@ -195,64 +195,64 @@ public: else wcsncpy_s(wAttName, strName, NameLen); - if (_wcsicmp(wAttName, L"root") == 0) { + if (_wcsicmp(wAttName, "root") == 0) { return 0; - } else if (_wcsicmp(wAttName, L"data") == 0) { + } else if (_wcsicmp(wAttName, "data") == 0) { for (uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s(wAttName, pAttributes[i].strName, pAttributes[i].NameLen); - if (_wcsicmp(wAttName, L"SortIndex") == 0) { + if (_wcsicmp(wAttName, "SortIndex") == 0) { if (pAttributes[i].ValueLen <= 32) { - memset(wTemp, 0, sizeof(wchar_t) * 35); + memset(wTemp, 0, sizeof(char) * 35); wcsncpy_s(wTemp, pAttributes[i].strValue, pAttributes[i].ValueLen); uiSortIndex = wcstoul(wTemp, nullptr, 16); } - } else if (_wcsicmp(wAttName, L"Banner") == 0) { + } else if (_wcsicmp(wAttName, "Banner") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wNameBanner, pAttributes[i].strValue, pAttributes[i].ValueLen); } - } else if (_wcsicmp(wAttName, L"Full") == 0) { + } else if (_wcsicmp(wAttName, "Full") == 0) { if (pAttributes[i].ValueLen <= 32) { - memset(wTemp, 0, sizeof(wchar_t) * 35); + memset(wTemp, 0, sizeof(char) * 35); wcsncpy_s(wTemp, pAttributes[i].strValue, pAttributes[i].ValueLen); ullFull = _wcstoui64(wTemp, nullptr, 16); } - } else if (_wcsicmp(wAttName, L"Trial") == 0) { + } else if (_wcsicmp(wAttName, "Trial") == 0) { if (pAttributes[i].ValueLen <= 32) { - memset(wTemp, 0, sizeof(wchar_t) * 35); + memset(wTemp, 0, sizeof(char) * 35); wcsncpy_s(wTemp, pAttributes[i].strValue, pAttributes[i].ValueLen); ullTrial = _wcstoui64(wTemp, nullptr, 16); } - } else if (_wcsicmp(wAttName, L"FirstSkin") == 0) { + } else if (_wcsicmp(wAttName, "FirstSkin") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wFirstSkin, pAttributes[i].strValue, pAttributes[i].ValueLen); } - } else if (_wcsicmp(wAttName, L"Type") == 0) { + } else if (_wcsicmp(wAttName, "Type") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wType, pAttributes[i].strValue, pAttributes[i].ValueLen); } - } else if (_wcsicmp(wAttName, L"Gender") == 0) { - if (_wcsicmp(wAttName, L"Male") == 0) { + } else if (_wcsicmp(wAttName, "Gender") == 0) { + if (_wcsicmp(wAttName, "Male") == 0) { iGender = 1; - } else if (_wcsicmp(wAttName, L"Female") == 0) { + } else if (_wcsicmp(wAttName, "Female") == 0) { iGender = 2; } else { iGender = 0; } - } else if (_wcsicmp(wAttName, L"Config") == 0) { + } else if (_wcsicmp(wAttName, "Config") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wConfig, pAttributes[i].strValue, pAttributes[i].ValueLen); - iConfig = wcstol(wConfig, nullptr, 10); + iConfig = strtol(wConfig, nullptr, 10); } - } else if (_wcsicmp(wAttName, L"DataFile") == 0) { + } else if (_wcsicmp(wAttName, "DataFile") == 0) { if (pAttributes[i].ValueLen <= 32) { wcsncpy_s(wDataFile, pAttributes[i].strValue, pAttributes[i].ValueLen); @@ -263,7 +263,7 @@ public: // if the xuid hasn't been defined, then we can't use the data if (ullFull != 0LL) { #if defined(_DEBUG) - wprintf(L"Type - %ls, Name - %ls, ", wType, wNameBanner); + printf("Type - %s, Name - %s, ", wType, wNameBanner); #endif app.DebugPrintf("Full = %lld, Trial %lld\n", ullFull, ullTrial); @@ -278,18 +278,18 @@ public: } }; - virtual int32_t ElementContent(const wchar_t* strData, uint32_t DataLen, + virtual int32_t ElementContent(const char* strData, uint32_t DataLen, bool More) { return 0; }; - virtual int32_t ElementEnd(const wchar_t* strName, uint32_t NameLen) { + virtual int32_t ElementEnd(const char* strName, uint32_t NameLen) { return 0; }; virtual int32_t CDATABegin() { return 0; }; - virtual int32_t CDATAData(const wchar_t* strCDATA, uint32_t CDATALen, + virtual int32_t CDATAData(const char* strCDATA, uint32_t CDATALen, bool bMore) { return 0; }; diff --git a/targets/java/include/java/Exceptions.h b/targets/java/include/java/Exceptions.h index 0f8ea8999..a5390380f 100644 --- a/targets/java/include/java/Exceptions.h +++ b/targets/java/include/java/Exceptions.h @@ -7,19 +7,19 @@ class EOFException : public std::exception {}; class IllegalArgumentException : public std::exception { public: - std::wstring information; + std::string information; - IllegalArgumentException(const std::wstring& information); + IllegalArgumentException(const std::string& information); }; class IOException : public std::exception { public: - std::wstring information; + std::string information; - IOException(const std::wstring& information); + IOException(const std::string& information); }; class RuntimeException : public std::exception { public: - RuntimeException(const std::wstring& information); + RuntimeException(const std::string& information); }; \ No newline at end of file diff --git a/targets/java/include/java/File.h b/targets/java/include/java/File.h index 76fe374b7..a5bba3647 100644 --- a/targets/java/include/java/File.h +++ b/targets/java/include/java/File.h @@ -11,16 +11,16 @@ class FileFilter; class File { public: // The system-dependent path-separator character - static const wchar_t pathSeparator; + static const char pathSeparator; // 4J Jev, the start of the file root - static const std::wstring pathRoot; + static const std::string pathRoot; - File() { m_abstractPathName = L""; } + File() { m_abstractPathName = ""; } - File(const File& parent, const std::wstring& child); - File(const std::wstring& pathname); - File(const std::wstring& parent, const std::wstring& child); + File(const File& parent, const std::string& child); + File(const std::string& pathname); + File(const std::string& parent, const std::string& child); bool _delete(); bool mkdir() const; bool mkdirs() const; @@ -32,19 +32,19 @@ public: bool isDirectory() const; int64_t length(); int64_t lastModified(); - const std::wstring getPath() const; // 4J Jev: TODO - std::wstring getName() const; + const std::string getPath() const; // 4J Jev: TODO + std::string getName() const; static int hash_fnct(const File& k); static bool eq_test(const File& x, const File& y); private: void _init(); - std::wstring m_abstractPathName; + std::string m_abstractPathName; // 4J Jev, just helper functions, change between paths and // std::vector - // File(std::vector *path); + // File(std::vector *path); }; struct FileKeyHash { diff --git a/targets/java/include/java/FilenameFilter.h b/targets/java/include/java/FilenameFilter.h index 5cda31dd3..687d5ed8e 100644 --- a/targets/java/include/java/FilenameFilter.h +++ b/targets/java/include/java/FilenameFilter.h @@ -7,5 +7,5 @@ class File; // 4J Jev, java lirary interface. class FilenameFilter { public: - virtual bool accept(File* dir, const std::wstring& name) = 0; + virtual bool accept(File* dir, const std::string& name) = 0; }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/BufferedReader.h b/targets/java/include/java/InputOutputStream/BufferedReader.h index b3a75af56..9e0583ad6 100644 --- a/targets/java/include/java/InputOutputStream/BufferedReader.h +++ b/targets/java/include/java/InputOutputStream/BufferedReader.h @@ -7,7 +7,7 @@ class BufferedReader : public Reader { private: Reader* reader; - wchar_t* buffer; + char* buffer; unsigned int readMark; unsigned int bufferedMark; @@ -23,6 +23,6 @@ public: virtual void close(); virtual int read(); - virtual int read(wchar_t cbuf[], unsigned int off, unsigned int len); - std::wstring readLine(); + virtual int read(char cbuf[], unsigned int off, unsigned int len); + std::string readLine(); }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/DataInput.h b/targets/java/include/java/InputOutputStream/DataInput.h index b3bcf9073..f9491f674 100644 --- a/targets/java/include/java/InputOutputStream/DataInput.h +++ b/targets/java/include/java/InputOutputStream/DataInput.h @@ -19,8 +19,8 @@ public: virtual int readInt() = 0; virtual int64_t readLong() = 0; virtual short readShort() = 0; - virtual wchar_t readChar() = 0; - virtual std::wstring readUTF() = 0; + virtual char readChar() = 0; + virtual std::string readUTF() = 0; virtual unsigned long long readPlayerUID() = 0; // 4J Added virtual int skipBytes(int n) = 0; }; diff --git a/targets/java/include/java/InputOutputStream/DataInputStream.h b/targets/java/include/java/InputOutputStream/DataInputStream.h index bb9b9e268..d87f9301f 100644 --- a/targets/java/include/java/InputOutputStream/DataInputStream.h +++ b/targets/java/include/java/InputOutputStream/DataInputStream.h @@ -23,7 +23,7 @@ public: virtual bool readBoolean(); virtual uint8_t readByte(); virtual unsigned char readUnsignedByte(); - virtual wchar_t readChar(); + virtual char readChar(); virtual bool readFully(std::vector& b); virtual bool readFully(std::vector& b); virtual double readDouble(); @@ -32,7 +32,7 @@ public: virtual int64_t readLong(); virtual short readShort(); virtual unsigned short readUnsignedShort(); - virtual std::wstring readUTF(); + virtual std::string readUTF(); void deleteChildStream(); virtual int readUTFChar(); virtual unsigned long long readPlayerUID(); // 4J Added diff --git a/targets/java/include/java/InputOutputStream/DataOutput.h b/targets/java/include/java/InputOutputStream/DataOutput.h index dc83c7d93..9006798b2 100644 --- a/targets/java/include/java/InputOutputStream/DataOutput.h +++ b/targets/java/include/java/InputOutputStream/DataOutput.h @@ -17,8 +17,8 @@ public: virtual void writeLong(int64_t a) = 0; virtual void writeShort(short a) = 0; virtual void writeBoolean(bool v) = 0; - virtual void writeChar(wchar_t v) = 0; - virtual void writeChars(const std::wstring& s) = 0; - virtual void writeUTF(const std::wstring& a) = 0; + virtual void writeChar(char v) = 0; + virtual void writeChars(const std::string& s) = 0; + virtual void writeUTF(const std::string& a) = 0; virtual void writePlayerUID(unsigned long long player) = 0; // 4J Added }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/DataOutputStream.h b/targets/java/include/java/InputOutputStream/DataOutputStream.h index 45dc5c426..67ead6fe7 100644 --- a/targets/java/include/java/InputOutputStream/DataOutputStream.h +++ b/targets/java/include/java/InputOutputStream/DataOutputStream.h @@ -35,10 +35,10 @@ public: virtual void writeLong(int64_t a); virtual void writeShort(short a); virtual void writeUnsignedShort(unsigned short a); - virtual void writeChar(wchar_t a); - virtual void writeChars(const std::wstring& a); + virtual void writeChar(char a); + virtual void writeChars(const std::string& a); virtual void writeBoolean(bool b); - virtual void writeUTF(const std::wstring& a); + virtual void writeUTF(const std::string& a); virtual void writePlayerUID(unsigned long long player); virtual void flush(); }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/InputStream.h b/targets/java/include/java/InputOutputStream/InputStream.h index 11093bb53..64bbbc3e0 100644 --- a/targets/java/include/java/InputOutputStream/InputStream.h +++ b/targets/java/include/java/InputOutputStream/InputStream.h @@ -17,5 +17,5 @@ public: virtual void close() = 0; virtual int64_t skip(int64_t n) = 0; - static InputStream* getResourceAsStream(const std::wstring& fileName); + static InputStream* getResourceAsStream(const std::string& fileName); }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/InputStreamReader.h b/targets/java/include/java/InputOutputStream/InputStreamReader.h index 4e22028cb..6b1996e6e 100644 --- a/targets/java/include/java/InputOutputStream/InputStreamReader.h +++ b/targets/java/include/java/InputOutputStream/InputStreamReader.h @@ -15,5 +15,5 @@ public: virtual void close(); virtual int read(); - virtual int read(wchar_t cbuf[], unsigned int offset, unsigned int length); + virtual int read(char cbuf[], unsigned int offset, unsigned int length); }; \ No newline at end of file diff --git a/targets/java/include/java/InputOutputStream/Reader.h b/targets/java/include/java/InputOutputStream/Reader.h index 81585a940..d41b1d526 100644 --- a/targets/java/include/java/InputOutputStream/Reader.h +++ b/targets/java/include/java/InputOutputStream/Reader.h @@ -8,6 +8,6 @@ public: // resources associated with it. virtual int read() = 0; // Reads a single character. virtual int read( - wchar_t cbuf[], unsigned int off, + char cbuf[], unsigned int off, unsigned int len) = 0; // Reads characters into a portion of an array. }; \ No newline at end of file diff --git a/targets/java/include/java/System.h b/targets/java/include/java/System.h index c9bb3f95a..30b3a7525 100644 --- a/targets/java/include/java/System.h +++ b/targets/java/include/java/System.h @@ -42,5 +42,5 @@ public: static void ReverseULONG(unsigned int* pulVal); static void ReverseINT(int* piVal); static void ReverseULONGLONG(int64_t* pullVal); - static void ReverseWCHARA(wchar_t* pwch, int iLen); + static void ReverseWCHARA(char* pwch, int iLen); }; diff --git a/targets/java/src/File.cpp b/targets/java/src/File.cpp index fbef763fb..ccc96a374 100644 --- a/targets/java/src/File.cpp +++ b/targets/java/src/File.cpp @@ -12,21 +12,21 @@ #include "platform/fs/fs.h" #include "java/FileFilter.h" -const wchar_t File::pathSeparator = L'/'; +const char File::pathSeparator = '/'; -const std::wstring File::pathRoot = - L""; // Path root after pathSeparator has been removed +const std::string File::pathRoot = + ""; // Path root after pathSeparator has been removed namespace { namespace fs = std::filesystem; -fs::path ToFilesystemPath(const std::wstring& path) { +fs::path ToFilesystemPath(const std::string& path) { return fs::path(path); } -std::wstring ToFilename(const fs::path& path) { +std::string ToFilename(const fs::path& path) { const std::string filename = path.filename().string(); - return filenametowstring(filename.c_str()); + return filename; } int64_t ToEpochMilliseconds(const fs::file_time_type& fileTime) { @@ -40,27 +40,27 @@ int64_t ToEpochMilliseconds(const fs::file_time_type& fileTime) { // Creates a new File instance from a parent abstract pathname and a child // pathname string. -File::File(const File& parent, const std::wstring& child) { +File::File(const File& parent, const std::string& child) { m_abstractPathName = parent.getPath() + pathSeparator + child; } // Creates a new File instance by converting the given pathname string into an // abstract pathname. -File::File(const std::wstring& pathname) { +File::File(const std::string& pathname) { if (pathname.empty()) { - m_abstractPathName = L""; + m_abstractPathName = ""; return; } - std::wstring fixedPath = pathname; + std::string fixedPath = pathname; for (size_t i = 0; i < fixedPath.length(); ++i) { - if (fixedPath[i] == L'\\') fixedPath[i] = L'/'; + if (fixedPath[i] == '\\') fixedPath[i] = '/'; } size_t dpos; - while ((dpos = fixedPath.find(L"//")) != std::wstring::npos) + while ((dpos = fixedPath.find("//")) != std::string::npos) fixedPath.erase(dpos, 1); - if (fixedPath.find(L"GAME:/") == 0) fixedPath = fixedPath.substr(6); + if (fixedPath.find("GAME:/") == 0) fixedPath = fixedPath.substr(6); m_abstractPathName = fixedPath; #if defined(__linux__) @@ -85,11 +85,11 @@ File::File(const std::wstring& pathname) { std::string tryFull = exeDir + base + request; std::string tryFile = exeDir + base + fileName; if (PlatformFilesystem.exists(tryFull)) { - m_abstractPathName = convStringToWstring(tryFull); + m_abstractPathName = tryFull; return; } if (PlatformFilesystem.exists(tryFile)) { - m_abstractPathName = convStringToWstring(tryFile); + m_abstractPathName = tryFile; return; } } @@ -99,15 +99,15 @@ File::File(const std::wstring& pathname) { std::string path = std::filesystem::path(m_abstractPathName).string(); std::string finalPath = PlatformStorage.GetMountedPath(path.c_str()); if (finalPath.size() == 0) finalPath = path; - m_abstractPathName = convStringToWstring(finalPath); + m_abstractPathName = finalPath; #endif /* - std::vector path = stringSplit( pathname, pathSeparator ); + std::vector path = stringSplit( pathname, pathSeparator ); if( path.back().compare( pathRoot ) != 0 ) m_abstractPathName = path.back(); else - m_abstractPathName = L""; + m_abstractPathName = ""; path.pop_back(); @@ -122,8 +122,8 @@ File::File(const std::wstring& pathname) { */ } -File::File(const std::wstring& parent, - const std::wstring& child) //: m_abstractPathName( child ) +File::File(const std::string& parent, + const std::string& child) //: m_abstractPathName( child ) { m_abstractPathName = pathRoot + pathSeparator + parent + pathSeparator + child; @@ -133,7 +133,7 @@ File::File(const std::wstring& parent, // Creates a new File instance by converting the given path vector into an // abstract pathname. /* -File::File( std::vector *path ) : parent( nullptr ) +File::File( std::vector *path ) : parent( nullptr ) { m_abstractPathName = path->back(); path->pop_back(); @@ -363,13 +363,13 @@ int64_t File::lastModified() { return 0l; } -const std::wstring File::getPath() const { +const std::string File::getPath() const { /* - std::wstring path; + std::string path; if ( parent != nullptr) path = parent->getPath(); else - path = std::wstring(pathRoot); + path = std::string(pathRoot); path.push_back( pathSeparator ); path.append(m_abstractPathName); @@ -377,7 +377,7 @@ const std::wstring File::getPath() const { return m_abstractPathName; } -std::wstring File::getName() const { +std::string File::getName() const { unsigned int sep = (unsigned int)(m_abstractPathName.find_last_of(this->pathSeparator)); return m_abstractPathName.substr(sep + 1, m_abstractPathName.length()); @@ -394,7 +394,7 @@ int File::hash_fnct(const File& k) { // if (k->parent != nullptr) // hashCode = hash_fnct(k->getParent()); - wchar_t* ref = (wchar_t*)k.m_abstractPathName.c_str(); + char* ref = (char*)k.m_abstractPathName.c_str(); for (unsigned int i = 0; i < k.m_abstractPathName.length(); i++) { hashCode += ((hashCode * 33) + ref[i]) % 149; diff --git a/targets/java/src/InputOutputStream/BufferedReader.cpp b/targets/java/src/InputOutputStream/BufferedReader.cpp index db59be543..234804ee7 100644 --- a/targets/java/src/InputOutputStream/BufferedReader.cpp +++ b/targets/java/src/InputOutputStream/BufferedReader.cpp @@ -11,8 +11,8 @@ BufferedReader::BufferedReader(Reader* in) : reader(in), readMark(0), bufferedMark(0), eofReached(false) { bufferSize = 64; - buffer = new wchar_t[bufferSize]; - memset(buffer, 0, sizeof(wchar_t) * bufferSize); + buffer = new char[bufferSize]; + memset(buffer, 0, sizeof(char) * bufferSize); bufferMore(); } @@ -25,8 +25,8 @@ void BufferedReader::bufferMore() { if (bufferSize < (bufferedMark + BUFFER_MORE_AMOUNT)) { // Enlarge the buffer - wchar_t* temp = new wchar_t[bufferSize * 2]; - memset(temp, 0, sizeof(wchar_t) * bufferSize * 2); + char* temp = new char[bufferSize * 2]; + memset(temp, 0, sizeof(char) * bufferSize * 2); std::copy(buffer, buffer + bufferSize, temp); delete[] buffer; @@ -99,11 +99,11 @@ int BufferedReader::read() { // Returns: // The number of characters read, or -1 if the end of the stream has been // reached -int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) { +int BufferedReader::read(char cbuf[], unsigned int off, unsigned int len) { if (bufferSize < (bufferedMark + len)) { // Enlarge the buffer - wchar_t* temp = new wchar_t[bufferSize * 2]; - memset(temp, 0, sizeof(wchar_t) * bufferSize * 2); + char* temp = new char[bufferSize * 2]; + memset(temp, 0, sizeof(char) * bufferSize * 2); std::copy(buffer, buffer + bufferSize, temp); delete[] buffer; @@ -135,12 +135,12 @@ int BufferedReader::read(wchar_t cbuf[], unsigned int off, unsigned int len) { // immediately by a linefeed. Returns: A String containing the contents of the // line, not including any line-termination characters, or null if the end of // the stream has been reached -std::wstring BufferedReader::readLine() { - std::wstring output = L""; +std::string BufferedReader::readLine() { + std::string output = ""; bool newLineCharFound = false; while (readMark < bufferedMark) { - wchar_t value = buffer[readMark++]; + char value = buffer[readMark++]; if (!newLineCharFound) { if ((value == '\n') || (value == '\r')) { diff --git a/targets/java/src/InputOutputStream/DataInputStream.cpp b/targets/java/src/InputOutputStream/DataInputStream.cpp index b33dc8d6b..482d3e9cb 100644 --- a/targets/java/src/InputOutputStream/DataInputStream.cpp +++ b/targets/java/src/InputOutputStream/DataInputStream.cpp @@ -162,7 +162,7 @@ unsigned char DataInputStream::readUnsignedByte() { // // This method is suitable for reading bytes written by the writeChar method of // interface DataOutput. Returns: the char value read. -wchar_t DataInputStream::readChar() { +char DataInputStream::readChar() { if (stream == nullptr) { fprintf( stderr, @@ -171,7 +171,7 @@ wchar_t DataInputStream::readChar() { } int a = stream->read(); int b = stream->read(); - return (wchar_t)((a << 8) | (b & 0xff)); + return (char)((a << 8) | (b & 0xff)); } // Reads some bytes from an input stream and stores them into the buffer array @@ -399,8 +399,8 @@ unsigned short DataInputStream::readUnsignedShort() { // // Returns: // a Unicode string. -std::wstring DataInputStream::readUTF() { - std::wstring outputString; +std::string DataInputStream::readUTF() { + std::string outputString; if (stream == nullptr) { fprintf( stderr, @@ -413,11 +413,11 @@ std::wstring DataInputStream::readUTF() { //// 4J Stu - I decided while writing DataOutputStream that we didn't need /// to bother using the UTF8 format / used in the java libs, and just write - /// in/out as wchar_t all the time + /// in/out as char all the time /*for( unsigned short i = 0; i < UTFLength; i++) { - wchar_t theChar = readChar(); + char theChar = readChar(); outputString.push_back(theChar); }*/ @@ -447,7 +447,7 @@ std::wstring DataInputStream::readUTF() { break; } else if ((firstByte & 0x80) == 0x00) { // One byte UTF - wchar_t readChar = (wchar_t)firstByte; + char readChar = (char)firstByte; outputString.push_back(readChar); continue; } else if ((firstByte & 0xE0) == 0xC0) { @@ -473,8 +473,8 @@ std::wstring DataInputStream::readUTF() { break; } - wchar_t readChar = - (wchar_t)(((firstByte & 0x1F) << 6) | (secondByte & 0x3F)); + char readChar = + (char)(((firstByte & 0x1F) << 6) | (secondByte & 0x3F)); outputString.push_back(readChar); continue; } else if ((firstByte & 0xF0) == 0xE0) { @@ -516,8 +516,8 @@ std::wstring DataInputStream::readUTF() { break; } - wchar_t readChar = - (wchar_t)(((firstByte & 0x0F) << 12) | + char readChar = + (char)(((firstByte & 0x0F) << 12) | ((secondByte & 0x3F) << 6) | (thirdByte & 0x3F)); outputString.push_back(readChar); continue; diff --git a/targets/java/src/InputOutputStream/DataOutputStream.cpp b/targets/java/src/InputOutputStream/DataOutputStream.cpp index 90a18aa23..e8992b34b 100644 --- a/targets/java/src/InputOutputStream/DataOutputStream.cpp +++ b/targets/java/src/InputOutputStream/DataOutputStream.cpp @@ -173,7 +173,7 @@ void DataOutputStream::writeUnsignedShort(unsigned short a) { // first. If no exception is thrown, the counter written is incremented by 2. // Parameters: // v - a char value to be written. -void DataOutputStream::writeChar(wchar_t v) { +void DataOutputStream::writeChar(char v) { stream->write((v >> 8) & 0xff); stream->write(v & 0xff); // TODO 4J Stu - Error handling? @@ -184,7 +184,7 @@ void DataOutputStream::writeChar(wchar_t v) { // Each character is written to the data output stream as if by the writeChar // method. If no exception is thrown, the counter written is incremented by // twice the length of s. Parameters: s - a String value to be written. -void DataOutputStream::writeChars(const std::wstring& str) { +void DataOutputStream::writeChars(const std::string& str) { for (unsigned int i = 0; i < str.length(); i++) { writeChar(str.at(i)); // TODO 4J Stu - Error handling? @@ -212,7 +212,7 @@ void DataOutputStream::writeBoolean(bool b) { // of bytes written to the output stream. This will be at least two plus the // length of str, and at most two plus thrice the length of str. Parameters: str // - a string to be written. -void DataOutputStream::writeUTF(const std::wstring& str) { +void DataOutputStream::writeUTF(const std::string& str) { int strlen = (int)str.length(); int utflen = 0; int c, count = 0; diff --git a/targets/java/src/InputOutputStream/FileInputStream.cpp b/targets/java/src/InputOutputStream/FileInputStream.cpp index 71e86f539..c59f25e81 100644 --- a/targets/java/src/InputOutputStream/FileInputStream.cpp +++ b/targets/java/src/InputOutputStream/FileInputStream.cpp @@ -51,7 +51,7 @@ bool FileSeek(std::FILE* file, int64_t offset, int origin) { // denies read access to the file. FileInputStream::FileInputStream(const File& file) : m_fileHandle(nullptr) { #if defined(_WIN32) - m_fileHandle = _wfopen(file.getPath().c_str(), L"rb"); + m_fileHandle = _wfopen(file.getPath().c_str(), "rb"); #else const std::string nativePath = std::filesystem::path(file.getPath()).string(); m_fileHandle = std::fopen(nativePath.c_str(), "rb"); diff --git a/targets/java/src/InputOutputStream/FileOutputStream.cpp b/targets/java/src/InputOutputStream/FileOutputStream.cpp index a52b6a7d7..59f64750f 100644 --- a/targets/java/src/InputOutputStream/FileOutputStream.cpp +++ b/targets/java/src/InputOutputStream/FileOutputStream.cpp @@ -28,7 +28,7 @@ FileOutputStream::FileOutputStream(const File& file) : m_fileHandle(nullptr) { } #if defined(_WIN32) - m_fileHandle = _wfopen(file.getPath().c_str(), L"wb"); + m_fileHandle = _wfopen(file.getPath().c_str(), "wb"); #else const std::string nativePath = std::filesystem::path(file.getPath()).string(); m_fileHandle = std::fopen(nativePath.c_str(), "wb"); diff --git a/targets/java/src/InputOutputStream/InputStream.cpp b/targets/java/src/InputOutputStream/InputStream.cpp index 9550c46b6..c52349082 100644 --- a/targets/java/src/InputOutputStream/InputStream.cpp +++ b/targets/java/src/InputOutputStream/InputStream.cpp @@ -5,7 +5,7 @@ #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" -InputStream* InputStream::getResourceAsStream(const std::wstring& fileName) { +InputStream* InputStream::getResourceAsStream(const std::string& fileName) { File file(fileName); return file.exists() ? new FileInputStream(file) : nullptr; } \ No newline at end of file diff --git a/targets/java/src/InputOutputStream/InputStreamReader.cpp b/targets/java/src/InputOutputStream/InputStreamReader.cpp index 976ad145f..94ae8ad36 100644 --- a/targets/java/src/InputOutputStream/InputStreamReader.cpp +++ b/targets/java/src/InputOutputStream/InputStreamReader.cpp @@ -29,11 +29,11 @@ int InputStreamReader::read() { return stream->readUTFChar(); } // Returns: // The number of characters read, or -1 if the end of the stream has been // reached -int InputStreamReader::read(wchar_t cbuf[], unsigned int offset, +int InputStreamReader::read(char cbuf[], unsigned int offset, unsigned int length) { unsigned int charsRead = 0; for (unsigned int i = offset; i < offset + length; i++) { - wchar_t value = (wchar_t)stream->readUTFChar(); + char value = (char)stream->readUTFChar(); if (value != -1) { cbuf[i] = value; charsRead++; diff --git a/targets/java/src/system.cpp b/targets/java/src/system.cpp index 57ccf8ee0..6d573c594 100644 --- a/targets/java/src/system.cpp +++ b/targets/java/src/system.cpp @@ -156,7 +156,7 @@ void System::ReverseULONGLONG(int64_t* pullVal) { pchVal1[7] = pchVal2[0]; } -void System::ReverseWCHARA(wchar_t* pwch, int iLen) { +void System::ReverseWCHARA(char* pwch, int iLen) { for (int i = 0; i < iLen; i++) { ReverseUSHORT((unsigned short*)&pwch[i]); } diff --git a/targets/minecraft/Direction.cpp b/targets/minecraft/Direction.cpp index 8915d269b..d5c5ef185 100644 --- a/targets/minecraft/Direction.cpp +++ b/targets/minecraft/Direction.cpp @@ -7,7 +7,7 @@ const int Direction::STEP_X[] = {0, -1, 0, 1}; const int Direction::STEP_Z[] = {1, 0, -1, 0}; -const std::wstring Direction::NAMES[] = {L"SOUTH", L"WEST", L"NORTH", L"EAST"}; +const std::string Direction::NAMES[] = {"SOUTH", "WEST", "NORTH", "EAST"}; // for [direction] it gives [tile-face] int Direction::DIRECTION_FACING[4] = {Facing::SOUTH, Facing::WEST, diff --git a/targets/minecraft/Direction.h b/targets/minecraft/Direction.h index 2fe738673..4d83f2950 100644 --- a/targets/minecraft/Direction.h +++ b/targets/minecraft/Direction.h @@ -13,7 +13,7 @@ public: static const int STEP_X[]; static const int STEP_Z[]; - static const std::wstring NAMES[]; + static const std::string NAMES[]; ; // for [direction] it gives [tile-face] diff --git a/targets/minecraft/Facing.cpp b/targets/minecraft/Facing.cpp index 7f9a4d1bc..49e1ccb14 100644 --- a/targets/minecraft/Facing.cpp +++ b/targets/minecraft/Facing.cpp @@ -8,5 +8,5 @@ const int Facing::STEP_Y[6] = {-1, 1, 0, 0, 0, 0}; const int Facing::STEP_Z[6] = {0, 0, -1, 1, 0, 0}; -const std::wstring Facing::NAMES[] = {L"DOWN", L"UP", L"NORTH", - L"SOUTH", L"WEST", L"EAST"}; \ No newline at end of file +const std::string Facing::NAMES[] = {"DOWN", "UP", "NORTH", + "SOUTH", "WEST", "EAST"}; \ No newline at end of file diff --git a/targets/minecraft/Facing.h b/targets/minecraft/Facing.h index 71c1e8f37..b00e46417 100644 --- a/targets/minecraft/Facing.h +++ b/targets/minecraft/Facing.h @@ -16,5 +16,5 @@ public: static const int STEP_Y[6]; static const int STEP_Z[6]; - static const std::wstring NAMES[]; + static const std::string NAMES[]; }; \ No newline at end of file diff --git a/targets/minecraft/GameTypes.h b/targets/minecraft/GameTypes.h index 721aea6b1..b233aa461 100644 --- a/targets/minecraft/GameTypes.h +++ b/targets/minecraft/GameTypes.h @@ -10,8 +10,8 @@ struct MOJANG_DATA { eXUID eXuid; - wchar_t wchCape[MAX_CAPENAME_SIZE]; - wchar_t wchSkin[MAX_CAPENAME_SIZE]; + char wchCape[MAX_CAPENAME_SIZE]; + char wchSkin[MAX_CAPENAME_SIZE]; }; struct FEATURE_DATA { diff --git a/targets/minecraft/IGameServices.h b/targets/minecraft/IGameServices.h index ed89c25f7..8e53f54ee 100644 --- a/targets/minecraft/IGameServices.h +++ b/targets/minecraft/IGameServices.h @@ -30,7 +30,7 @@ public: // -- Strings -- - [[nodiscard]] virtual const wchar_t* getString(int id) = 0; + [[nodiscard]] virtual const char* getString(int id) = 0; // -- Debug settings -- @@ -55,14 +55,14 @@ public: // -- Texture cache -- - virtual void addMemoryTextureFile(const std::wstring& name, + virtual void addMemoryTextureFile(const std::string& name, std::uint8_t* data, unsigned int size) = 0; - virtual void removeMemoryTextureFile(const std::wstring& name) = 0; - virtual void getMemFileDetails(const std::wstring& name, + virtual void removeMemoryTextureFile(const std::string& name) = 0; + virtual void getMemFileDetails(const std::string& name, std::uint8_t** data, unsigned int* size) = 0; - [[nodiscard]] virtual bool isFileInMemoryTextures(const std::wstring& name) = 0; + [[nodiscard]] virtual bool isFileInMemoryTextures(const std::string& name) = 0; // -- Player settings -- @@ -119,9 +119,9 @@ public: // -- Skin / cape / animation -- - [[nodiscard]] virtual std::wstring getPlayerSkinName(int iPad) = 0; + [[nodiscard]] virtual std::string getPlayerSkinName(int iPad) = 0; [[nodiscard]] virtual std::uint32_t getPlayerSkinId(int iPad) = 0; - [[nodiscard]] virtual std::wstring getPlayerCapeName(int iPad) = 0; + [[nodiscard]] virtual std::string getPlayerCapeName(int iPad) = 0; [[nodiscard]] virtual std::uint32_t getPlayerCapeId(int iPad) = 0; [[nodiscard]] virtual std::uint32_t getAdditionalModelPartsForPad(int iPad) = 0; virtual void setAdditionalSkinBoxes(std::uint32_t dwSkinID, @@ -137,8 +137,8 @@ public: unsigned int bitmask) = 0; [[nodiscard]] virtual unsigned int getAnimOverrideBitmask( std::uint32_t dwSkinID) = 0; - [[nodiscard]] virtual std::uint32_t getSkinIdFromPath(const std::wstring& skin) = 0; - [[nodiscard]] virtual std::wstring getSkinPathFromId(std::uint32_t skinId) = 0; + [[nodiscard]] virtual std::uint32_t getSkinIdFromPath(const std::string& skin) = 0; + [[nodiscard]] virtual std::string getSkinPathFromId(std::uint32_t skinId) = 0; [[nodiscard]] virtual bool defaultCapeExists() = 0; [[nodiscard]] virtual bool isXuidNotch(PlayerUID xuid) = 0; [[nodiscard]] virtual bool isXuidDeadmau5(PlayerUID xuid) = 0; @@ -172,23 +172,23 @@ public: // -- Archive / resources -- - [[nodiscard]] virtual bool hasArchiveFile(const std::wstring& filename) = 0; + [[nodiscard]] virtual bool hasArchiveFile(const std::string& filename) = 0; [[nodiscard]] virtual std::vector getArchiveFile( - const std::wstring& filename) = 0; + const std::string& filename) = 0; // -- Strings / formatting / misc queries -- [[nodiscard]] virtual int getHTMLColour(eMinecraftColour colour) = 0; - [[nodiscard]] virtual std::wstring getEntityName(EntityTypeId type) = 0; - [[nodiscard]] virtual const wchar_t* getGameRulesString( - const std::wstring& key) = 0; + [[nodiscard]] virtual std::string getEntityName(EntityTypeId type) = 0; + [[nodiscard]] virtual const char* getGameRulesString( + const std::string& key) = 0; [[nodiscard]] virtual unsigned int createImageTextData( std::uint8_t* textMetadata, int64_t seed, bool hasSeed, unsigned int uiHostOptions, unsigned int uiTexturePackId) = 0; - [[nodiscard]] virtual std::wstring getFilePath(std::uint32_t packId, - std::wstring filename, + [[nodiscard]] virtual std::string getFilePath(std::uint32_t packId, + std::string filename, bool bAddDataFolder, - std::wstring mountPoint = L"TPACK:") = 0; + std::string mountPoint = "TPACK:") = 0; [[nodiscard]] virtual char* getUniqueMapName() = 0; virtual void setUniqueMapName(char* name) = 0; [[nodiscard]] virtual unsigned int getOpacityTimer(int iPad) = 0; @@ -202,11 +202,11 @@ public: // -- DLC -- [[nodiscard]] virtual DLCSkinFile* getDLCSkinFile( - const std::wstring& name) = 0; + const std::string& name) = 0; [[nodiscard]] virtual bool dlcNeedsCorruptCheck() = 0; virtual unsigned int dlcCheckForCorrupt(bool showMessage = true) = 0; [[nodiscard]] virtual bool dlcReadDataFile(unsigned int& filesProcessed, - const std::wstring& path, DLCPack* pack, + const std::string& path, DLCPack* pack, bool fromArchive = false) = 0; virtual void dlcRemovePack(DLCPack* pack) = 0; @@ -222,7 +222,7 @@ public: // -- Shared data -- - [[nodiscard]] virtual std::vector& getSkinNames() = 0; + [[nodiscard]] virtual std::vector& getSkinNames() = 0; [[nodiscard]] virtual std::vector& getTerrainFeatures() = 0; // -- Menu service -- diff --git a/targets/minecraft/SharedConstants.cpp b/targets/minecraft/SharedConstants.cpp index b726e67f8..733d7529f 100644 --- a/targets/minecraft/SharedConstants.cpp +++ b/targets/minecraft/SharedConstants.cpp @@ -3,17 +3,17 @@ #include -const std::wstring SharedConstants::VERSION_STRING = L"1.6.4"; +const std::string SharedConstants::VERSION_STRING = "1.6.4"; const bool SharedConstants::TEXTURE_LIGHTING = true; -std::wstring SharedConstants::readAcceptableChars() { +std::string SharedConstants::readAcceptableChars() { // 4J-PB - I've added ã in (for Portuguese in bed string) and added the // character at the same place in the default.png font - std::wstring result = - L" !\"#$%&'()*+,-./" - L"0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'" - L"abcdefghijklmnopqrstuvwxyz{|}~" - L" ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»ã"; + std::string result = + " !\"#$%&'()*+,-./" + "0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'" + "abcdefghijklmnopqrstuvwxyz{|}~" + " ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»ã"; return result; } @@ -24,14 +24,14 @@ bool SharedConstants::isAllowedChatCharacter(char ch) { return true; } -std::wstring SharedConstants::acceptableLetters; +std::string SharedConstants::acceptableLetters; void SharedConstants::staticCtor() { acceptableLetters = readAcceptableChars(); } -const wchar_t +const char SharedConstants::ILLEGAL_FILE_CHARACTERS[ILLEGAL_FILE_CHARACTERS_LENGTH] = { // 4J-PB - corrected - L'/', L'\n', L'\r', L'\t', L'\0', L'\f', L'`', L'?', - L'*', L'\\', L'<', L'>', L'|', L'\"', L':'}; \ No newline at end of file + '/', '\n', '\r', '\t', '\0', '\f', '`', '?', + '*', '\\', '<', '>', '|', '\"', ':'}; \ No newline at end of file diff --git a/targets/minecraft/SharedConstants.h b/targets/minecraft/SharedConstants.h index a4ca7e4f0..6699867d6 100644 --- a/targets/minecraft/SharedConstants.h +++ b/targets/minecraft/SharedConstants.h @@ -7,7 +7,7 @@ class SharedConstants { public: static void staticCtor(); - static const std::wstring VERSION_STRING; + static const std::string VERSION_STRING; static inline constexpr int NETWORK_PROTOCOL_VERSION = 78; static const bool INGAME_DEBUG_OUTPUT = false; @@ -18,14 +18,14 @@ public: static bool isAllowedChatCharacter(char ch); private: - static std::wstring readAcceptableChars(); + static std::string readAcceptableChars(); public: static inline constexpr int maxChatLength = 100; - static std::wstring acceptableLetters; + static std::string acceptableLetters; static inline constexpr int ILLEGAL_FILE_CHARACTERS_LENGTH = 15; - static const wchar_t + static const char ILLEGAL_FILE_CHARACTERS[ILLEGAL_FILE_CHARACTERS_LENGTH]; static const bool diff --git a/targets/minecraft/client/BufferedImage.cpp b/targets/minecraft/client/BufferedImage.cpp index 232b4edf8..3e2ab00c9 100644 --- a/targets/minecraft/client/BufferedImage.cpp +++ b/targets/minecraft/client/BufferedImage.cpp @@ -37,51 +37,51 @@ void BufferedImage::ByteFlip4(unsigned int& data) { // with a valid alpha channel. // 4jcraft: mostly rewrote this function -BufferedImage::BufferedImage(const std::wstring& File, +BufferedImage::BufferedImage(const std::string& File, bool filenameHasExtension, bool bTitleUpdateTexture, - const std::wstring& drive) { + const std::string& drive) { int32_t hr = -1; - std::wstring filePath = File; + std::string filePath = File; for (size_t i = 0; i < filePath.length(); ++i) { - if (filePath[i] == L'\\') filePath[i] = L'/'; + if (filePath[i] == '\\') filePath[i] = '/'; } for (int l = 0; l < 10; l++) data[l] = nullptr; - std::wstring baseName = filePath; + std::string baseName = filePath; if (!filenameHasExtension) { if (baseName.size() > 4 && - baseName.substr(baseName.size() - 4) == L".png") { + baseName.substr(baseName.size() - 4) == ".png") { baseName = baseName.substr(0, baseName.size() - 4); } } - while (!baseName.empty() && (baseName[0] == L'/' || baseName[0] == L'\\')) + while (!baseName.empty() && (baseName[0] == '/' || baseName[0] == '\\')) baseName = baseName.substr(1); - if (baseName.find(L"res/") == 0) baseName = baseName.substr(4); + if (baseName.find("res/") == 0) baseName = baseName.substr(4); - std::wstring exeDir = PlatformFilesystem.getBasePath().wstring(); + std::string exeDir = PlatformFilesystem.getBasePath().string(); for (int l = 0; l < 10; l++) { - std::wstring mipSuffix = - (l != 0) ? L"MipMapLevel" + toWString(l + 1) : L""; - std::wstring fileName = baseName + mipSuffix + L".png"; - std::wstring finalPath; + std::string mipSuffix = + (l != 0) ? "MipMapLevel" + toWString(l + 1) : ""; + std::string fileName = baseName + mipSuffix + ".png"; + std::string finalPath; bool foundOnDisk = false; - std::vector searchPaths = { - exeDir + L"/Common/res/TitleUpdate/res/" + fileName, - exeDir + L"/Common/res/" + fileName, - exeDir + L"/Common/Media/Graphics/" + fileName, - exeDir + L"/Common/Media/font/" + fileName, - exeDir + L"/Common/res/font/" + fileName, - exeDir + L"/Common/Media/" + fileName}; + std::vector searchPaths = { + exeDir + "/Common/res/TitleUpdate/res/" + fileName, + exeDir + "/Common/res/" + fileName, + exeDir + "/Common/Media/Graphics/" + fileName, + exeDir + "/Common/Media/font/" + fileName, + exeDir + "/Common/res/font/" + fileName, + exeDir + "/Common/Media/" + fileName}; for (auto& attempt : searchPaths) { size_t p; - while ((p = attempt.find(L"//")) != std::wstring::npos) - attempt.replace(p, 2, L"/"); + while ((p = attempt.find("//")) != std::string::npos) + attempt.replace(p, 2, "/"); if (PlatformFilesystem.exists(attempt)) { finalPath = attempt; foundOnDisk = true; @@ -97,7 +97,7 @@ BufferedImage::BufferedImage(const std::wstring& File, hr = PlatformRenderer.LoadTextureData(nativePath.c_str(), &ImageInfo, &data[l]); } else { - std::wstring archiveKey = L"res/" + fileName; + std::string archiveKey = "res/" + fileName; if (gameServices().hasArchiveFile(archiveKey)) { std::vector ba = gameServices().getArchiveFile(archiveKey); hr = PlatformRenderer.LoadTextureData(ba.data(), ba.size(), @@ -122,22 +122,22 @@ BufferedImage::BufferedImage(const std::wstring& File, } } } -BufferedImage::BufferedImage(DLCPack* dlcPack, const std::wstring& File, +BufferedImage::BufferedImage(DLCPack* dlcPack, const std::string& File, bool filenameHasExtension) { int32_t hr; - std::wstring filePath = File; + std::string filePath = File; std::uint8_t* pbData = nullptr; std::uint32_t dataBytes = 0; for (int l = 0; l < 10; l++) data[l] = nullptr; for (int l = 0; l < 10; l++) { - std::wstring name; - std::wstring mipMapPath = - (l != 0) ? L"MipMapLevel" + toWString(l + 1) : L""; - name = L"res" + (filenameHasExtension + std::string name; + std::string mipMapPath = + (l != 0) ? "MipMapLevel" + toWString(l + 1) : ""; + name = "res" + (filenameHasExtension ? filePath : filePath.substr(0, filePath.length() - 4) + - mipMapPath + L".png"); + mipMapPath + ".png"); if (!dlcPack->doesPackContainFile(DLCManager::e_DLCType_All, name)) { if (l == 0) gameServices().fatalLoadError(); diff --git a/targets/minecraft/client/BufferedImage.h b/targets/minecraft/client/BufferedImage.h index df3a6a3f0..a5d04d790 100644 --- a/targets/minecraft/client/BufferedImage.h +++ b/targets/minecraft/client/BufferedImage.h @@ -16,10 +16,10 @@ public: static const int TYPE_INT_ARGB = 0; static const int TYPE_INT_RGB = 1; BufferedImage(int width, int height, int type); - BufferedImage(const std::wstring& File, bool filenameHasExtension = false, + BufferedImage(const std::string& File, bool filenameHasExtension = false, bool bTitleUpdateTexture = false, - const std::wstring& drive = L""); // 4J added - BufferedImage(DLCPack* dlcPack, const std::wstring& File, + const std::string& drive = ""); // 4J added + BufferedImage(DLCPack* dlcPack, const std::string& File, bool filenameHasExtension = false); // 4J Added BufferedImage(std::uint8_t* pbData, std::uint32_t dataBytes); // 4J added ~BufferedImage(); diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp index f2cc01850..ed9df059c 100644 --- a/targets/minecraft/client/ClientConstants.cpp +++ b/targets/minecraft/client/ClientConstants.cpp @@ -2,6 +2,6 @@ #include "app/common/BuildVer/BuildVer.h" -const std::wstring ClientConstants::VERSION_STRING = - std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + - std::wstring(L" (4jcraft)"); //+ SharedConstants::VERSION_STRING; +const std::string ClientConstants::VERSION_STRING = + std::string("Minecraft Xbox ") + VER_FILEVERSION_STR_W + + std::string(" (4jcraft)"); //+ SharedConstants::VERSION_STRING; diff --git a/targets/minecraft/client/ClientConstants.h b/targets/minecraft/client/ClientConstants.h index 49272c1ba..834a75690 100644 --- a/targets/minecraft/client/ClientConstants.h +++ b/targets/minecraft/client/ClientConstants.h @@ -11,7 +11,7 @@ class ClientConstants { // INTERNAL DEVELOPMENT SETTINGS public: - static const std::wstring VERSION_STRING; + static const std::string VERSION_STRING; static const bool DEADMAU5_CAMERA_CHEATS = false; static const bool IS_DEMO_VERSION = false; diff --git a/targets/minecraft/client/DemoUser.cpp b/targets/minecraft/client/DemoUser.cpp index ded80f007..fa7e113b6 100644 --- a/targets/minecraft/client/DemoUser.cpp +++ b/targets/minecraft/client/DemoUser.cpp @@ -4,4 +4,4 @@ #include "minecraft/client/User.h" -DemoUser::DemoUser() : User(L"DemoUser", L"n/a") {} \ No newline at end of file +DemoUser::DemoUser() : User("DemoUser", "n/a") {} \ No newline at end of file diff --git a/targets/minecraft/client/GuiMessage.cpp b/targets/minecraft/client/GuiMessage.cpp index f86bc15c0..1ae3ba59a 100644 --- a/targets/minecraft/client/GuiMessage.cpp +++ b/targets/minecraft/client/GuiMessage.cpp @@ -1,6 +1,6 @@ #include "GuiMessage.h" -GuiMessage::GuiMessage(const std::wstring& string) { +GuiMessage::GuiMessage(const std::string& string) { this->string = string; ticks = 0; } \ No newline at end of file diff --git a/targets/minecraft/client/GuiMessage.h b/targets/minecraft/client/GuiMessage.h index d251738cd..7c9cc3cd8 100644 --- a/targets/minecraft/client/GuiMessage.h +++ b/targets/minecraft/client/GuiMessage.h @@ -4,7 +4,7 @@ class GuiMessage { public: - std::wstring string; + std::string string; int ticks; - GuiMessage(const std::wstring& string); + GuiMessage(const std::string& string); }; \ No newline at end of file diff --git a/targets/minecraft/client/IMenuService.h b/targets/minecraft/client/IMenuService.h index 93c71e929..deac5a411 100644 --- a/targets/minecraft/client/IMenuService.h +++ b/targets/minecraft/client/IMenuService.h @@ -32,7 +32,7 @@ public: int x, int y, int z) = 0; virtual bool openEnchanting(int iPad, std::shared_ptr inventory, int x, int y, int z, Level* level, - const std::wstring& name) = 0; + const std::string& name) = 0; virtual bool openFurnace(int iPad, std::shared_ptr inventory, std::shared_ptr furnace) = 0; virtual bool openBrewingStand( @@ -50,7 +50,7 @@ public: Level* level, int x, int y, int z) = 0; virtual bool openTrading(int iPad, std::shared_ptr inventory, std::shared_ptr trader, Level* level, - const std::wstring& name) = 0; + const std::string& name) = 0; virtual bool openCommandBlock( int iPad, std::shared_ptr commandBlock) = 0; virtual bool openHopper(int iPad, std::shared_ptr inventory, diff --git a/targets/minecraft/client/KeyMapping.cpp b/targets/minecraft/client/KeyMapping.cpp index b56f4b1a1..23f419779 100644 --- a/targets/minecraft/client/KeyMapping.cpp +++ b/targets/minecraft/client/KeyMapping.cpp @@ -1,6 +1,6 @@ #include "KeyMapping.h" -KeyMapping::KeyMapping(const std::wstring& name, int key) { +KeyMapping::KeyMapping(const std::string& name, int key) { this->name = name; this->key = key; } \ No newline at end of file diff --git a/targets/minecraft/client/KeyMapping.h b/targets/minecraft/client/KeyMapping.h index 4a7f45bd3..d123c89c3 100644 --- a/targets/minecraft/client/KeyMapping.h +++ b/targets/minecraft/client/KeyMapping.h @@ -5,7 +5,7 @@ // 4J Stu - Not updated to 1.8.2 as we don't use this class KeyMapping { public: - std::wstring name; + std::string name; int key; - KeyMapping(const std::wstring& name, int key); + KeyMapping(const std::string& name, int key); }; \ No newline at end of file diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 98882b84c..91fbb8db1 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -1,6 +1,3 @@ -#include "minecraft/IGameServices.h" -#include "minecraft/client/IMenuService.h" -#include "minecraft/util/Log.h" #include "Minecraft.h" #include @@ -13,10 +10,12 @@ #include #include -#include "platform/profile/profile.h" -#include "platform/renderer/renderer.h" -#include "platform/storage/storage.h" -#include "minecraft/GameEnums.h" +#include "Options.h" +#include "Pos.h" +#include "ProgressRenderer.h" +#include "SharedConstants.h" +#include "Timer.h" +#include "User.h" #include "app/common/Audio/SoundEngine.h" #include "app/common/DLC/DLCManager.h" #include "app/common/Network/GameNetworkManager.h" @@ -26,22 +25,16 @@ #include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" -#include "platform/XboxStubs.h" -#include "Options.h" -#include "Pos.h" -#include "ProgressRenderer.h" -#include "SharedConstants.h" -#include "Timer.h" -#include "User.h" -#include "minecraft/world/entity/player/SkinTypes.h" -#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/Class.h" #include "java/Random.h" +#include "minecraft/GameEnums.h" +#include "minecraft/IGameServices.h" +#include "minecraft/client/IMenuService.h" #include "minecraft/client/gui/DeathScreen.h" #include "minecraft/client/gui/ErrorScreen.h" #include "minecraft/client/gui/PauseScreen.h" -#include "minecraft/client/gui/inventory/InventoryScreen.h" #include "minecraft/client/gui/Screen.h" +#include "minecraft/client/gui/inventory/InventoryScreen.h" #include "minecraft/client/gui/particle/GuiParticles.h" #include "minecraft/client/model/HumanoidModel.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" @@ -66,6 +59,7 @@ #include "minecraft/sounds/SoundTypes.h" #include "minecraft/stats/Stats.h" #include "minecraft/stats/StatsCounter.h" +#include "minecraft/util/Log.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/ItemFrame.h" #include "minecraft/world/entity/Mob.h" @@ -80,6 +74,7 @@ #include "minecraft/world/entity/player/Abilities.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/entity/player/SkinTypes.h" #include "minecraft/world/food/FoodData.h" #include "minecraft/world/item/DyePowderItem.h" #include "minecraft/world/item/FoodItem.h" @@ -91,6 +86,7 @@ #include "minecraft/world/level/chunk/CompressedTileStorage.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/material/Material.h" +#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "minecraft/world/level/storage/LevelData.h" #include "minecraft/world/level/storage/LevelStorageSource.h" #include "minecraft/world/level/storage/McRegionLevelStorageSource.h" @@ -99,19 +95,21 @@ #include "minecraft/world/level/tile/TallGrassPlantTile.h" #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/HitResult.h" +#include "platform/XboxStubs.h" +#include "platform/profile/profile.h" +#include "platform/renderer/renderer.h" +#include "platform/storage/storage.h" #include "strings.h" #if defined(ENABLE_JAVA_GUIS) #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif -#include "platform/input/input.h" -#include "app/common/Minecraft_Macros.h" #include "app/common/Colours/ColourTable.h" #include "app/common/ConsoleGameMode.h" #include "app/common/DLC/DLCPack.h" +#include "app/common/Minecraft_Macros.h" #include "app/common/Tutorial/FullTutorialMode.h" #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h" #include "app/common/UI/UIFontData.h" -#include "util/StringHelpers.h" #include "java/File.h" #include "java/System.h" #include "minecraft/StaticConstructors.h" @@ -130,6 +128,8 @@ #include "minecraft/world/item/alchemy/PotionMacros.h" #include "minecraft/world/level/chunk/SparseDataStorage.h" #include "minecraft/world/level/chunk/SparseLightStorage.h" +#include "platform/input/input.h" +#include "util/StringHelpers.h" class ChunkSource; @@ -149,7 +149,7 @@ int64_t Minecraft::frameTimes[512]; int64_t Minecraft::tickTimes[512]; int Minecraft::frameTimePos = 0; int64_t Minecraft::warezTime = 0; -File Minecraft::workDir = File(L""); +File Minecraft::workDir = File(""); ResourceLocation Minecraft::DEFAULT_FONT_LOCATION = ResourceLocation(TN_DEFAULT_FONT); @@ -203,14 +203,14 @@ Minecraft::Minecraft(Component* mouseComponent, Canvas* parent, soundEngine = new SoundEngine(); mouseHandler = nullptr; skins = nullptr; - workingDirectory = File(L""); + workingDirectory = File(""); levelSource = nullptr; stats[0] = nullptr; stats[1] = nullptr; stats[2] = nullptr; stats[3] = nullptr; connectToPort = 0; - workDir = File(L""); + workDir = File(""); // 4J removed // wasDown = false; lastTimer = -1; @@ -283,7 +283,7 @@ void Minecraft::clearConnectionFailed() { gameServices().setDisconnectReason(DisconnectPacket::eDisconnect_None); } -void Minecraft::connectTo(const std::wstring& server, int port) { +void Minecraft::connectTo(const std::string& server, int port) { connectToIp = server; connectToPort = port; } @@ -293,7 +293,7 @@ void Minecraft::init() { workingDirectory = getWorkingDirectory(); levelSource = - new McRegionLevelStorageSource(File(workingDirectory, L"saves")); + new McRegionLevelStorageSource(File(workingDirectory, "saves")); // levelSource = new MemoryLevelStorageSource(); options = new Options(this, workingDirectory); skins = new TexturePackRepository(workingDirectory, this); @@ -302,9 +302,9 @@ void Minecraft::init() { // renderLoadingScreen(); font = - new Font(options, L"font/Default.png", textures, false, + new Font(options, "font/Default.png", textures, false, &DEFAULT_FONT_LOCATION, 23, 20, 8, 8, SFontData::Codepoints); - altFont = new Font(options, L"font/alternate.png", textures, false, + altFont = new Font(options, "font/alternate.png", textures, false, &ALT_FONT_LOCATION, 16, 16, 8, 8); // if (options.languageCode != null) { @@ -316,9 +316,9 @@ void Minecraft::init() { // } // 4J Stu - Not using these any more - // WaterColor::init(textures->loadTexturePixels(L"misc/watercolor.png")); - // GrassColor::init(textures->loadTexturePixels(L"misc/grasscolor.png")); - // FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png")); + // WaterColor::init(textures->loadTexturePixels("misc/watercolor.png")); + // GrassColor::init(textures->loadTexturePixels("misc/grasscolor.png")); + // FoliageColor::init(textures->loadTexturePixels("misc/foliagecolor.png")); gameRenderer = new GameRenderer(this); EntityRenderDispatcher::instance->itemInHandRenderer = @@ -341,7 +341,7 @@ void Minecraft::init() { // Keyboard::create(); Mouse::create(); - checkGlError(L"Pre startup"); + checkGlError("Pre startup"); // width = Display.getDisplayMode().getWidth(); // height = Display.getDisplayMode().getHeight(); @@ -358,7 +358,7 @@ void Minecraft::init() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); glMatrixMode(GL_MODELVIEW); - checkGlError(L"Startup"); + checkGlError("Startup"); // openGLCapabilities = new OpenGLCapabilities(); // 4J - removed @@ -378,10 +378,10 @@ void Minecraft::init() { // } catch (Exception e) { // } - checkGlError(L"Post startup"); + checkGlError("Post startup"); gui = new Gui(this); - if (connectToIp != L"") // 4J - was nullptr comparison + if (connectToIp != "") // 4J - was nullptr comparison { // setScreen(new ConnectScreen(this, connectToIp, // connectToPort)); // 4J TODO - put back in @@ -462,36 +462,36 @@ void Minecraft::blit(int x, int y, int sx, int sy, int w, int h) { } File Minecraft::getWorkingDirectory() { - if (workDir.getPath().empty()) workDir = getWorkingDirectory(L"4jcraft"); + if (workDir.getPath().empty()) workDir = getWorkingDirectory("4jcraft"); return workDir; } -File Minecraft::getWorkingDirectory(const std::wstring& applicationName) { +File Minecraft::getWorkingDirectory(const std::string& applicationName) { // 4J - original version // 4jcraft: ported to C++ - std::wstring userHome = convStringToWstring(getenv("HOME")); + std::string userHome = getenv("HOME"); File* workingDirectory; #if defined(__linux__) - workingDirectory = new File(userHome, L'.' + applicationName + L'/'); + workingDirectory = new File(userHome, '.' + applicationName + '/'); #elif defined(_WINDOWS64) std::string applicationData = getenv("APPDATA"); if (!applicationData.empty()) { - workingDirectory = new File(convStringToWstring(applicationData), - L'.' + applicationName + L'/'); + workingDirectory = + new File(applicationData, '.' + applicationName + '/'); } else { - workingDirectory = new File(userHome, L'.' + applicationName + L'/'); + workingDirectory = new File(userHome, '.' + applicationName + '/'); } // #elif defined(_MACOS) // workingDirectory = new File(userHome, "Library/Application // Support/" + applicationName); #else - workingDirectory = new File(userHome, applicationName + L'/'); + workingDirectory = new File(userHome, applicationName + '/'); #endif if (!workingDirectory->exists()) { if (!workingDirectory->mkdirs()) { Log::info("The working directory could not be created"); assert(0); - // throw new RuntimeException(L"The working directory could not be + // throw new RuntimeException("The working directory could not be // created: " + workingDirectory); } } @@ -568,7 +568,7 @@ void Minecraft::setScreen(Screen* screen) { #endif } -void Minecraft::checkGlError(const std::wstring& string) { +void Minecraft::checkGlError(const std::string& string) { // 4J - TODO } @@ -714,8 +714,9 @@ void Minecraft::updatePlayerViewportAssignments() { for (int i = 0; i < XUSER_MAX_COUNT; i++) { if (localplayers[i] != nullptr) { // Primary player settings decide what the mode is - if (gameServices().getGameSettings(PlatformInput.GetPrimaryPad(), - eGameSetting_SplitScreenVertical)) { + if (gameServices().getGameSettings( + PlatformInput.GetPrimaryPad(), + eGameSetting_SplitScreenVertical)) { localplayers[i]->m_iScreenSection = IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT + found; } else { @@ -741,10 +742,12 @@ void Minecraft::updatePlayerViewportAssignments() { if ((localplayers[i]->m_iScreenSection >= IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) && (localplayers[i]->m_iScreenSection <= - IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) { + IPlatformRenderer:: + VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) { quadrantsAllocated [localplayers[i]->m_iScreenSection - - IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT] = true; + IPlatformRenderer:: + VIEWPORT_TYPE_QUADRANT_TOP_LEFT] = true; } } else { // Reset the viewport so that it can be assigned in the next @@ -766,7 +769,9 @@ void Minecraft::updatePlayerViewportAssignments() { for (int j = 0; j < 4; j++) { if (!quadrantsAllocated[j]) { localplayers[i]->m_iScreenSection = - IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT + j; + IPlatformRenderer:: + VIEWPORT_TYPE_QUADRANT_TOP_LEFT + + j; quadrantsAllocated[j] = true; break; } @@ -834,7 +839,7 @@ void Minecraft::addPendingLocalConnection(int idx, } std::shared_ptr Minecraft::createExtraLocalPlayer( - int idx, const std::wstring& name, int iPad, int iDimension, + int idx, const std::string& name, int iPad, int iDimension, ClientConnection* clientConnection /*= nullptr*/, MultiPlayerLevel* levelpassedin) { if (clientConnection == nullptr) return nullptr; @@ -845,7 +850,7 @@ std::shared_ptr Minecraft::createExtraLocalPlayer( // A temp player displaying a connecting screen tempScreenSection = localplayers[idx]->m_iScreenSection; } - std::wstring prevname = user->name; + std::string prevname = user->name; user->name = name; // Don't need this any more @@ -939,8 +944,7 @@ void Minecraft::storeExtraLocalPlayer(int idx) { localplayers[idx]->input = new Input(); if (PlatformProfile.IsSignedIn(idx)) { - localplayers[idx]->name = - convStringToWstring(PlatformProfile.GetGamertag(idx)); + localplayers[idx]->name = PlatformProfile.GetGamertag(idx); } } @@ -1013,8 +1017,7 @@ void Minecraft::createPrimaryLocalPlayer(int iPad) { // gameRenderer->itemInHandRenderer = localitemInHandRenderers[iPad]; // Give them the gamertag if they're signed in if (PlatformProfile.IsSignedIn(PlatformInput.GetPrimaryPad())) { - user->name = convStringToWstring( - PlatformProfile.GetGamertag(PlatformInput.GetPrimaryPad())); + user->name = PlatformProfile.GetGamertag(PlatformInput.GetPrimaryPad()); } } @@ -1074,7 +1077,8 @@ void Minecraft::run_middle() { // player has a app action running , or has any crafting // or containers open, don't autosave if (!PlatformStorage.GetSaveDisabled() && - (gameServices().getXuiAction(PlatformInput.GetPrimaryPad()) == + (gameServices().getXuiAction( + PlatformInput.GetPrimaryPad()) == eAppAction_Idle)) { if (!ui.IsPauseMenuDisplayed( PlatformInput.GetPrimaryPad()) && @@ -1101,7 +1105,7 @@ void Minecraft::run_middle() { if (pDLCPack) { if (!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, - L"")) { + "")) { bTrialTexturepack = true; } } @@ -1139,9 +1143,9 @@ void Minecraft::run_middle() { #endif Log::info("%02d:%02d:%02d\n", - utcTime.tm_hour, - utcTime.tm_min, - utcTime.tm_sec); + utcTime.tm_hour, + utcTime.tm_min, + utcTime.tm_sec); } #endif } else { @@ -1167,7 +1171,8 @@ void Minecraft::run_middle() { // the level in their banned list and ask if they want to play // it for (int i = 0; i < XUSER_MAX_COUNT; i++) { - if (localplayers[i] && (gameServices().getBanListCheck(i) == false) && + if (localplayers[i] && + (gameServices().getBanListCheck(i) == false) && !Minecraft::GetInstance()->isTutorial() && PlatformProfile.IsSignedInLive(i) && !PlatformProfile.IsGuest(i)) { @@ -1183,15 +1188,17 @@ void Minecraft::run_middle() { PlayerUID xuid = pHostPlayer->GetUID(); if (gameServices().isInBannedLevelList( - i, xuid, gameServices().getUniqueMapName())) { + i, xuid, + gameServices().getUniqueMapName())) { // put up a message box asking if the player // would like to unban this level Log::info("This level is banned\n"); // set the app action to bring up the message // box to give them the option to remove from // the ban list or exit the level - gameServices().setAction(i, eAppAction_LevelInBanLevelList, - (void*)true); + gameServices().setAction( + i, eAppAction_LevelInBanLevelList, + (void*)true); } } } @@ -1235,10 +1242,11 @@ void Minecraft::run_middle() { if (localplayers[i]) { // 4J-PB - add these to check for coming out of idle if (PlatformInput.ButtonPressed(i, - MINECRAFT_ACTION_JUMP)) + MINECRAFT_ACTION_JUMP)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_JUMP; - if (PlatformInput.ButtonPressed(i, MINECRAFT_ACTION_USE)) + if (PlatformInput.ButtonPressed(i, + MINECRAFT_ACTION_USE)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_USE; @@ -1246,8 +1254,8 @@ void Minecraft::run_middle() { i, MINECRAFT_ACTION_INVENTORY)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_INVENTORY; - if (PlatformInput.ButtonPressed(i, - MINECRAFT_ACTION_ACTION)) + if (PlatformInput.ButtonPressed( + i, MINECRAFT_ACTION_ACTION)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_ACTION; if (PlatformInput.ButtonPressed( @@ -1266,7 +1274,7 @@ void Minecraft::run_middle() { #endif } if (PlatformInput.ButtonPressed(i, - MINECRAFT_ACTION_DROP)) + MINECRAFT_ACTION_DROP)) localplayers[i]->ullButtonsPressed |= 1LL << MINECRAFT_ACTION_DROP; @@ -1293,7 +1301,8 @@ void Minecraft::run_middle() { 1LL << MINECRAFT_ACTION_GAME_INFO; #if !defined(_FINAL_BUILD) - if (gameServices().debugSettingsOn() && gameServices().getUseDPadForDebug()) { + if (gameServices().debugSettingsOn() && + gameServices().getUseDPadForDebug()) { localplayers[i]->ullDpad_last = 0; localplayers[i]->ullDpad_this = 0; localplayers[i]->ullDpad_filtered = 0; @@ -1400,7 +1409,8 @@ void Minecraft::run_middle() { // if this is a local game, then the // player just needs to be signed in if (g_NetworkManager.IsLocalGame() || - (PlatformProfile.IsSignedInLive(i) && + (PlatformProfile.IsSignedInLive( + i) && PlatformProfile .AllowedToPlayMultiplayer( i))) { @@ -1433,11 +1443,7 @@ void Minecraft::run_middle() { player = createExtraLocalPlayer( i, - (convStringToWstring( - PlatformProfile - .GetGamertag( - i))) - .c_str(), + PlatformProfile.GetGamertag(i), i, level->dimension ->id); @@ -1623,7 +1629,7 @@ void Minecraft::run_middle() { // // 4J added } // int64_t tickDuraction = System::nanoTime() - beforeTickTime; - checkGlError(L"Pre render"); + checkGlError("Pre render"); TileRenderer::fancy = options->fancyGraphics; @@ -1767,7 +1773,7 @@ void Minecraft::run_middle() { } } */ - checkGlError(L"Post render"); + checkGlError("Post render"); frames++; // pause = !isClientSide() && screen != nullptr && // screen->isPauseScreen(); @@ -1781,9 +1787,9 @@ void Minecraft::run_middle() { #if !defined(_CONTENT_PACKAGE) while (System::nanoTime() >= lastTime + 1000000000) { - fpsString = toWString(frames) + L" fps, " + + fpsString = toWString(frames) + " fps, " + toWString(Chunk::updates) + - L" chunk updates"; + " chunk updates"; Chunk::updates = 0; lastTime += 1000000000; frames = 0; @@ -2023,7 +2029,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!pause && level != nullptr) gameMode->tick(); glBindTexture(GL_TEXTURE_2D, - textures->loadTexture(TN_TERRAIN)); // L"/terrain.png")); + textures->loadTexture(TN_TERRAIN)); // "/terrain.png")); if (bFirst) { if (!pause) textures->tick(bUpdateTextures); } @@ -3315,7 +3321,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // Otherwise just the original game code for handling // autorepeat if (PlatformInput.ButtonDown(iPad, - MINECRAFT_ACTION_USE) && + MINECRAFT_ACTION_USE) && ticks - player->lastClickTick[1] >= timer->ticksPerSecond / 4) { player->handleMouseClick(1); @@ -3433,7 +3439,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { #if defined(ENABLE_JAVA_GUIS) setScreen(new InventoryScreen(player)); #else - gameServices().menus().openInventory(iPad, std::static_pointer_cast(player)); + gameServices().menus().openInventory( + iPad, std::static_pointer_cast(player)); #endif } @@ -3454,7 +3461,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { setScreen(new CreativeInventoryScreen(player)); } #else - gameServices().menus().openCreative(iPad, std::static_pointer_cast(player)); + gameServices().menus().openCreative( + iPad, std::static_pointer_cast(player)); } // 4J-PB - Microsoft request that we use the 3x3 crafting if someone // presses X while at the workbench @@ -3471,15 +3479,15 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { &hitResult->pos, false, &usedItem); } else { ui.PlayUISFX(eSFX_Press); - gameServices().menus().openCrafting2x2(iPad, std::static_pointer_cast(player)); + gameServices().menus().openCrafting2x2( + iPad, std::static_pointer_cast(player)); } #endif } if ((player->ullButtonsPressed & (1LL << MINECRAFT_ACTION_PAUSEMENU))) { - Log::info( - "PAUSE PRESS PROCESSING - ipad = %d, NavigateToScene\n", - player->GetXboxPad()); + Log::info("PAUSE PRESS PROCESSING - ipad = %d, NavigateToScene\n", + player->GetXboxPad()); ui.PlayUISFX(eSFX_Press); #if !defined(ENABLE_JAVA_GUIS) ui.NavigateToScene(iPad, eUIScene_PauseMenu, nullptr, @@ -3504,7 +3512,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { } if (selected || wheel != 0 || (player->ullButtonsPressed & (1LL << MINECRAFT_ACTION_DROP))) { - std::wstring itemName = L""; + std::string itemName = ""; std::shared_ptr selectedItem = player->getSelectedItem(); // Dropping items happens over network, so if we only have one then @@ -3533,7 +3541,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { // #ifndef _CONTENT_PACKAGE // if(!(ui.GetMenuDisplayed(iPad))) // { - // wchar_t wchInput; + // char wchInput; // if(PlatformInput.InputDetected(iPad,&wchInput)) // { // printf("Input Detected!\n"); @@ -3666,13 +3674,13 @@ bool Minecraft::isClientSide() { } void Minecraft::selectLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, - const std::wstring& levelName, + const std::string& levelId, + const std::string& levelName, LevelSettings* levelSettings) {} -bool Minecraft::saveSlot(int slot, const std::wstring& name) { return false; } +bool Minecraft::saveSlot(int slot, const std::string& name) { return false; } -bool Minecraft::loadSlot(const std::wstring& userName, int slot) { +bool Minecraft::loadSlot(const std::string& userName, int slot) { return false; } @@ -3715,7 +3723,7 @@ MultiPlayerLevel* Minecraft::getLevel(int dimension) { // Also causing ambiguous call for some reason // as it is matching shared_ptr from the func below with bool from this // one -// void Minecraft::setLevel(Level *level, const wstring& message, bool +// void Minecraft::setLevel(Level *level, const string& message, bool // doForceStatsSave /*= true*/) //{ // setLevel(level, message, nullptr, doForceStatsSave); @@ -3745,7 +3753,7 @@ void Minecraft::setLevel(MultiPlayerLevel* level, int message /*=-1*/, } // 4J-PB - since we now play music in the menu, just let it keep playing - // soundEngine->playStreaming(L"", 0, 0, 0, 0, 0); + // soundEngine->playStreaming("", 0, 0, 0, 0, 0); // 4J - stop update thread from processing this level, which blocks until it // is safe to move on - will be re-enabled if we set the level to be @@ -3947,42 +3955,42 @@ void Minecraft::prepareLevel(int title) { } } -void Minecraft::fileDownloaded(const std::wstring& name, File* file) { - int p = (int)name.find(L"/"); - std::wstring category = name.substr(0, p); - std::wstring name2 = name.substr(p + 1); +void Minecraft::fileDownloaded(const std::string& name, File* file) { + int p = (int)name.find("/"); + std::string category = name.substr(0, p); + std::string name2 = name.substr(p + 1); toLower(category); - if (category == L"sound") { + if (category == "sound") { soundEngine->add(name, file); - } else if (category == L"newsound") { + } else if (category == "newsound") { soundEngine->add(name, file); - } else if (category == L"streaming") { + } else if (category == "streaming") { soundEngine->addStreaming(name, file); - } else if (category == L"music") { + } else if (category == "music") { soundEngine->addMusic(name, file); - } else if (category == L"newmusic") { + } else if (category == "newmusic") { soundEngine->addMusic(name, file); } } -std::wstring Minecraft::gatherStats1() { +std::string Minecraft::gatherStats1() { // return levelRenderer->gatherStats1(); - return L"Time to autosave: " + - toWString(gameServices().secondsToAutosave()) + L"s"; + return "Time to autosave: " + + toWString(gameServices().secondsToAutosave()) + "s"; } -std::wstring Minecraft::gatherStats2() { +std::string Minecraft::gatherStats2() { return g_NetworkManager.GatherStats(); // return levelRenderer->gatherStats2(); } -std::wstring Minecraft::gatherStats3() { +std::string Minecraft::gatherStats3() { return g_NetworkManager.GatherRTTStats(); - // return L"P: " + particleEngine->countParticles() + L". T: " + + // return "P: " + particleEngine->countParticles() + ". T: " + // level->gatherStats(); } -std::wstring Minecraft::gatherStats4() { +std::string Minecraft::gatherStats4() { return level->gatherChunkSourceStats(); } @@ -4041,7 +4049,8 @@ void Minecraft::respawnPlayer(int iPad, int dimension, int newEntityId) { } // Set the animation override if the skin has one - std::uint32_t dwSkinID = gameServices().getSkinIdFromPath(player->customTextureUrl); + std::uint32_t dwSkinID = + gameServices().getSkinIdFromPath(player->customTextureUrl); if (GET_IS_DLC_SKIN_FROM_BITMASK(dwSkinID)) { player->setAnimOverrideBitmask( player->getSkinAnimOverrideBitmask(dwSkinID)); @@ -4055,14 +4064,17 @@ void Minecraft::respawnPlayer(int iPad, int dimension, int newEntityId) { createPrimaryLocalPlayer(iPad); // update the debugoptions - gameServices().setGameSettingsDebugMask(PlatformInput.GetPrimaryPad(), - gameServices().debugGetMask(-1, true)); + gameServices().setGameSettingsDebugMask( + PlatformInput.GetPrimaryPad(), + gameServices().debugGetMask(-1, true)); } else { storeExtraLocalPlayer(iPad); } player->setShowOnMaps( - gameServices().getGameHostOption(eGameHostOption_Gamertags) != 0 ? true : false); + gameServices().getGameHostOption(eGameHostOption_Gamertags) != 0 + ? true + : false); player->resetPos(); level->addEntity(player); @@ -4089,15 +4101,15 @@ void Minecraft::respawnPlayer(int iPad, int dimension, int newEntityId) { gameRenderer->EnableUpdateThread(); } -void Minecraft::start(const std::wstring& name, const std::wstring& sid) { - startAndConnectTo(name, sid, L""); +void Minecraft::start(const std::string& name, const std::string& sid) { + startAndConnectTo(name, sid, ""); } -void Minecraft::startAndConnectTo(const std::wstring& name, - const std::wstring& sid, - const std::wstring& url) { +void Minecraft::startAndConnectTo(const std::string& name, + const std::string& sid, + const std::string& url) { bool fullScreen = false; - std::wstring userName = name; + std::string userName = name; /* 4J - removed window handling things here final Frame frame = new Frame("Minecraft"); @@ -4134,18 +4146,18 @@ void Minecraft::startAndConnectTo(const std::wstring& name, final Thread thread = new Thread(minecraft, "Minecraft main thread"); thread.setPriority(Thread.MAX_PRIORITY); */ - minecraft->serverDomain = L"www.minecraft.net"; + minecraft->serverDomain = "www.minecraft.net"; { - if (userName != L"" && - sid != L"") // 4J - username & side were compared with nullptr - // rather than empty strings + if (userName != "" && + sid != "") // 4J - username & side were compared with nullptr + // rather than empty strings { minecraft->user = new User(userName, sid); } else { minecraft->user = new User( - L"Player" + toWString(System::currentTimeMillis() % 1000), - L""); + "Player" + toWString(System::currentTimeMillis() % 1000), + ""); } } // else @@ -4191,8 +4203,8 @@ bool useLomp = false; int g_iMainThreadId; void Minecraft::main() { - std::wstring name; - std::wstring sessionId; + std::string name; + std::string sessionId; // g_iMainThreadId = GetCurrentThreadId(); @@ -4215,8 +4227,8 @@ void Minecraft::main() { // 4J-PB - Can't call this for the first 5 seconds of a game - MS rule { name = - L"Player" + toWString(System::currentTimeMillis() % 1000); - sessionId = L"-"; + "Player" + toWString(System::currentTimeMillis() % 1000); + sessionId = "-"; /* 4J - TODO - get a session ID from somewhere? if (args.size() > 0) name = args[0]; sessionId = "-"; @@ -4253,7 +4265,7 @@ bool Minecraft::renderDebug() { return (m_instance != nullptr && m_instance->options->renderDebug); } -bool Minecraft::handleClientSideCommand(const std::wstring& chatMessage) { +bool Minecraft::handleClientSideCommand(const std::string& chatMessage) { return false; } @@ -4488,10 +4500,7 @@ int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad) { pMinecraftClass->localplayers[iPad]; if (player == nullptr) { player = pMinecraftClass->createExtraLocalPlayer( - iPad, - (convStringToWstring( - PlatformProfile.GetGamertag(iPad))) - .c_str(), + iPad, PlatformProfile.GetGamertag(iPad), iPad, pMinecraftClass->level->dimension->id); } } @@ -4528,8 +4537,7 @@ void Minecraft::tickAllConnections() { setLocalPlayerIdx(oldIdx); } -bool Minecraft::addPendingClientTextureRequest( - const std::wstring& textureName) { +bool Minecraft::addPendingClientTextureRequest(const std::string& textureName) { auto it = find(m_pendingTextureRequests.begin(), m_pendingTextureRequests.end(), textureName); if (it == m_pendingTextureRequests.end()) { @@ -4539,7 +4547,7 @@ bool Minecraft::addPendingClientTextureRequest( return false; } -void Minecraft::handleClientTextureReceived(const std::wstring& textureName) { +void Minecraft::handleClientTextureReceived(const std::string& textureName) { auto it = find(m_pendingTextureRequests.begin(), m_pendingTextureRequests.end(), textureName); if (it != m_pendingTextureRequests.end()) { diff --git a/targets/minecraft/client/Minecraft.h b/targets/minecraft/client/Minecraft.h index 1c0a205d0..44ca6988a 100644 --- a/targets/minecraft/client/Minecraft.h +++ b/targets/minecraft/client/Minecraft.h @@ -66,7 +66,7 @@ private: static ResourceLocation ALT_FONT_LOCATION; public: - static const std::wstring VERSION_STRING; + static const std::string VERSION_STRING; Minecraft(Component* mouseComponent, Canvas* parent, MinecraftApplet* minecraftApplet, int width, int height, bool fullscreen); @@ -135,7 +135,7 @@ public: } std::shared_ptr createExtraLocalPlayer( - int idx, const std::wstring& name, int pad, int iDimension, + int idx, const std::string& name, int pad, int iDimension, ClientConnection* clientConnection = nullptr, MultiPlayerLevel* levelpassedin = nullptr); void createPrimaryLocalPlayer(int iPad); @@ -150,7 +150,7 @@ public: std::shared_ptr crosshairPickMob; ParticleEngine* particleEngine; User* user; - std::wstring serverDomain; + std::string serverDomain; Canvas* parent; bool appletMode; @@ -216,12 +216,12 @@ public: StatsCounter* stats[4]; private: - std::wstring connectToIp; + std::string connectToIp; int connectToPort; public: void clearConnectionFailed(); - void connectTo(const std::wstring& server, int port); + void connectTo(const std::string& server, int port); private: void renderLoadingScreen(); @@ -234,19 +234,19 @@ private: public: static File getWorkingDirectory(); - static File getWorkingDirectory(const std::wstring& applicationName); + static File getWorkingDirectory(const std::string& applicationName); public: LevelStorageSource* getLevelSource(); void setScreen(Screen* screen); private: - void checkGlError(const std::wstring& string); + void checkGlError(const std::string& string); public: void destroy(); volatile bool running; - std::wstring fpsString; + std::string fpsString; void run(); // 4J-PB - split the run into 3 parts so we can run it from our xbox game // loop @@ -309,16 +309,16 @@ private: public: bool isClientSide(); - void selectLevel(ConsoleSaveFile* saveFile, const std::wstring& levelId, - const std::wstring& levelName, + void selectLevel(ConsoleSaveFile* saveFile, const std::string& levelId, + const std::string& levelName, LevelSettings* levelSettings); // void toggleDimension(int targetDimension); - bool saveSlot(int slot, const std::wstring& name); - bool loadSlot(const std::wstring& userName, int slot); + bool saveSlot(int slot, const std::string& name); + bool loadSlot(const std::string& userName, int slot); void releaseLevel(int message); // 4J Stu - Added the doForceStatsSave param // void setLevel(Level *level, bool doForceStatsSave = true); - // void setLevel(Level *level, const std::wstring& message, bool + // void setLevel(Level *level, const std::string& message, bool // doForceStatsSave = true); void setLevel(MultiPlayerLevel* level, int message = -1, std::shared_ptr forceInsertPlayer = nullptr, @@ -328,26 +328,26 @@ public: // the level at game load time void forceaddLevel(MultiPlayerLevel* level); void prepareLevel(int title); // 4J - changed to public - void fileDownloaded(const std::wstring& name, File* file); + void fileDownloaded(const std::string& name, File* file); // OpenGLCapabilities getOpenGLCapabilities(); // 4J - removed - std::wstring gatherStats1(); - std::wstring gatherStats2(); - std::wstring gatherStats3(); - std::wstring gatherStats4(); + std::string gatherStats1(); + std::string gatherStats2(); + std::string gatherStats3(); + std::string gatherStats4(); void respawnPlayer(int iPad, int dimension, int newEntityId); - static void start(const std::wstring& name, const std::wstring& sid); - static void startAndConnectTo(const std::wstring& name, - const std::wstring& sid, - const std::wstring& url); + static void start(const std::string& name, const std::string& sid); + static void startAndConnectTo(const std::string& name, + const std::string& sid, + const std::string& url); ClientConnection* getConnection(int iPad); // 4J Stu added iPad param static void main(); static bool renderNames(); static bool useFancyGraphics(); static bool useAmbientOcclusion(); static bool renderDebug(); - bool handleClientSideCommand(const std::wstring& chatMessage); + bool handleClientSideCommand(const std::string& chatMessage); static int maxSupportedTextureSize(); void delayTextureReload(); @@ -381,18 +381,18 @@ public: // 4J - When a client requests a texture, it should add it to here while we // are waiting for it - std::vector m_pendingTextureRequests; - std::vector + std::vector m_pendingTextureRequests; + std::vector m_pendingGeometryRequests; // additional skin box geometry // 4J Added - bool addPendingClientTextureRequest(const std::wstring& textureName); - void handleClientTextureReceived(const std::wstring& textureName); + bool addPendingClientTextureRequest(const std::string& textureName); + void handleClientTextureReceived(const std::string& textureName); void clearPendingClientTextureRequests() { m_pendingTextureRequests.clear(); } - bool addPendingClientGeometryRequest(const std::wstring& textureName); - void handleClientGeometryReceived(const std::wstring& textureName); + bool addPendingClientGeometryRequest(const std::string& textureName); + void handleClientGeometryReceived(const std::string& textureName); void clearPendingClientGeometryRequests() { m_pendingGeometryRequests.clear(); } diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index 63e8da42a..a02461ef7 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -21,23 +21,23 @@ // 4J - the Option sub-class used to be an java enumerated type, trying to // emulate that functionality here const Options::Option Options::Option::options[17] = { - Options::Option(L"options.music", true, false), - Options::Option(L"options.sound", true, false), - Options::Option(L"options.invertMouse", false, true), - Options::Option(L"options.sensitivity", true, false), - Options::Option(L"options.renderDistance", false, false), - Options::Option(L"options.viewBobbing", false, true), - Options::Option(L"options.anaglyph", false, true), - Options::Option(L"options.advancedOpengl", false, true), - Options::Option(L"options.framerateLimit", false, false), - Options::Option(L"options.difficulty", false, false), - Options::Option(L"options.graphics", false, false), - Options::Option(L"options.ao", false, true), - Options::Option(L"options.guiScale", false, false), - Options::Option(L"options.fov", true, false), - Options::Option(L"options.gamma", true, false), - Options::Option(L"options.renderClouds", false, true), - Options::Option(L"options.particles", false, false), + Options::Option("options.music", true, false), + Options::Option("options.sound", true, false), + Options::Option("options.invertMouse", false, true), + Options::Option("options.sensitivity", true, false), + Options::Option("options.renderDistance", false, false), + Options::Option("options.viewBobbing", false, true), + Options::Option("options.anaglyph", false, true), + Options::Option("options.advancedOpengl", false, true), + Options::Option("options.framerateLimit", false, false), + Options::Option("options.difficulty", false, false), + Options::Option("options.graphics", false, false), + Options::Option("options.ao", false, true), + Options::Option("options.guiScale", false, false), + Options::Option("options.fov", true, false), + Options::Option("options.gamma", true, false), + Options::Option("options.renderClouds", false, true), + Options::Option("options.particles", false, false), }; const Options::Option* Options::Option::MUSIC = &Options::Option::options[0]; @@ -72,7 +72,7 @@ const Options::Option* Options::Option::PARTICLES = const Options::Option* Options::Option::getItem(int id) { return &options[id]; } -Options::Option::Option(const std::wstring& captionId, bool hasProgress, +Options::Option::Option(const std::string& captionId, bool hasProgress, bool isBoolean) : _isProgress(hasProgress), _isBoolean(isBoolean), captionId(captionId) {} @@ -82,30 +82,30 @@ bool Options::Option::isBoolean() const { return _isBoolean; } int Options::Option::getId() const { return (int)(this - options); } -std::wstring Options::Option::getCaptionId() const { return captionId; } +std::string Options::Option::getCaptionId() const { return captionId; } -const std::wstring Options::RENDER_DISTANCE_NAMES[] = { - L"options.renderDistance.far", L"options.renderDistance.normal", - L"options.renderDistance.short", L"options.renderDistance.tiny"}; -const std::wstring Options::DIFFICULTY_NAMES[] = { - L"options.difficulty.peaceful", L"options.difficulty.easy", - L"options.difficulty.normal", L"options.difficulty.hard"}; -const std::wstring Options::GUI_SCALE[] = { - L"options.guiScale.auto", L"options.guiScale.small", - L"options.guiScale.normal", L"options.guiScale.large"}; +const std::string Options::RENDER_DISTANCE_NAMES[] = { + "options.renderDistance.far", "options.renderDistance.normal", + "options.renderDistance.short", "options.renderDistance.tiny"}; +const std::string Options::DIFFICULTY_NAMES[] = { + "options.difficulty.peaceful", "options.difficulty.easy", + "options.difficulty.normal", "options.difficulty.hard"}; +const std::string Options::GUI_SCALE[] = { + "options.guiScale.auto", "options.guiScale.small", + "options.guiScale.normal", "options.guiScale.large"}; #ifdef ENABLE_VSYNC -const std::wstring Options::FRAMERATE_LIMITS[] = { - L"performance.max", L"performance.balanced", L"performance.powersaver"}; +const std::string Options::FRAMERATE_LIMITS[] = { + "performance.max", "performance.balanced", "performance.powersaver"}; #else -const std::wstring Options::FRAMERATE_LIMITS[] = { - L"performance.max", L"performance.balanced", L"performance.powersaver", - L"performance.unlimited"}; +const std::string Options::FRAMERATE_LIMITS[] = { + "performance.max", "performance.balanced", "performance.powersaver", + "performance.unlimited"}; #endif -const std::wstring Options::PARTICLES[] = {L"options.particles.all", - L"options.particles.decreased", - L"options.particles.minimal"}; +const std::string Options::PARTICLES[] = {"options.particles.all", + "options.particles.decreased", + "options.particles.minimal"}; // 4J added void Options::init() { @@ -127,22 +127,22 @@ void Options::init() { fancyGraphics = true; ambientOcclusion = true; renderClouds = true; - skin = L"Default"; + skin = "Default"; - keyUp = new KeyMapping(L"key.forward", Keyboard::KEY_W); - keyLeft = new KeyMapping(L"key.left", Keyboard::KEY_A); - keyDown = new KeyMapping(L"key.back", Keyboard::KEY_S); - keyRight = new KeyMapping(L"key.right", Keyboard::KEY_D); - keyJump = new KeyMapping(L"key.jump", Keyboard::KEY_SPACE); - keyBuild = new KeyMapping(L"key.inventory", Keyboard::KEY_E); - keyDrop = new KeyMapping(L"key.drop", Keyboard::KEY_Q); - keyChat = new KeyMapping(L"key.chat", Keyboard::KEY_T); - keySneak = new KeyMapping(L"key.sneak", Keyboard::KEY_LSHIFT); - keyAttack = new KeyMapping(L"key.attack", -100 + 0); - keyUse = new KeyMapping(L"key.use", -100 + 1); - keyPlayerList = new KeyMapping(L"key.playerlist", Keyboard::KEY_TAB); - keyPickItem = new KeyMapping(L"key.pickItem", -100 + 2); - keyToggleFog = new KeyMapping(L"key.fog", Keyboard::KEY_F); + keyUp = new KeyMapping("key.forward", Keyboard::KEY_W); + keyLeft = new KeyMapping("key.left", Keyboard::KEY_A); + keyDown = new KeyMapping("key.back", Keyboard::KEY_S); + keyRight = new KeyMapping("key.right", Keyboard::KEY_D); + keyJump = new KeyMapping("key.jump", Keyboard::KEY_SPACE); + keyBuild = new KeyMapping("key.inventory", Keyboard::KEY_E); + keyDrop = new KeyMapping("key.drop", Keyboard::KEY_Q); + keyChat = new KeyMapping("key.chat", Keyboard::KEY_T); + keySneak = new KeyMapping("key.sneak", Keyboard::KEY_LSHIFT); + keyAttack = new KeyMapping("key.attack", -100 + 0); + keyUse = new KeyMapping("key.use", -100 + 1); + keyPlayerList = new KeyMapping("key.playerlist", Keyboard::KEY_TAB); + keyPickItem = new KeyMapping("key.pickItem", -100 + 2); + keyToggleFog = new KeyMapping("key.fog", Keyboard::KEY_F); keyMappings[0] = keyAttack; keyMappings[1] = keyUse; @@ -166,7 +166,7 @@ void Options::init() { hideGui = false; thirdPersonView = false; renderDebug = false; - lastMpIp = L""; + lastMpIp = ""; isFlying = false; smoothCamera = false; @@ -182,20 +182,20 @@ void Options::init() { Options::Options(Minecraft* minecraft, File workingDirectory) { init(); this->minecraft = minecraft; - optionsFile = File(workingDirectory, L"options.txt"); + optionsFile = File(workingDirectory, "options.txt"); } Options::Options() { init(); } -std::wstring Options::getKeyDescription(int i) { +std::string Options::getKeyDescription(int i) { Language* language = Language::getInstance(); return language->getElement(keyMappings[i]->name); } -std::wstring Options::getKeyMessage(int i) { +std::string Options::getKeyMessage(int i) { int key = keyMappings[i]->key; if (key < 0) { - return I18n::get(L"key.mouseButton", key + 101); + return I18n::get("key.mouseButton", key + 101); } else { return Keyboard::getKeyName(keyMappings[i]->key); } @@ -295,11 +295,11 @@ bool Options::getBooleanValue(const Options::Option* item) { return false; } -std::wstring Options::getMessage(const Options::Option* item) { +std::string Options::getMessage(const Options::Option* item) { // 4J TODO, should these std::wstrings append rather than add? Language* language = Language::getInstance(); - std::wstring caption = language->getElement(item->getCaptionId()) + L": "; + std::string caption = language->getElement(item->getCaptionId()) + ": "; if (item->isProgress()) { float progressValue = getProgressValue(item); @@ -307,42 +307,42 @@ std::wstring Options::getMessage(const Options::Option* item) { if (item == Option::SENSITIVITY) { if (progressValue == 0) { return caption + - language->getElement(L"options.sensitivity.min"); + language->getElement("options.sensitivity.min"); } if (progressValue == 1) { return caption + - language->getElement(L"options.sensitivity.max"); + language->getElement("options.sensitivity.max"); } - return caption + toWString((int)(progressValue * 200)) + L"%"; + return caption + toWString((int)(progressValue * 200)) + "%"; } else if (item == Option::FOV) { if (progressValue == 0) { - return caption + language->getElement(L"options.fov.min"); + return caption + language->getElement("options.fov.min"); } if (progressValue == 1) { - return caption + language->getElement(L"options.fov.max"); + return caption + language->getElement("options.fov.max"); } return caption + toWString((int)(70 + progressValue * 40)); } else if (item == Option::GAMMA) { if (progressValue == 0) { - return caption + language->getElement(L"options.gamma.min"); + return caption + language->getElement("options.gamma.min"); } if (progressValue == 1) { - return caption + language->getElement(L"options.gamma.max"); + return caption + language->getElement("options.gamma.max"); } - return caption + L"+" + toWString((int)(progressValue * 100)) + - L"%"; + return caption + "+" + toWString((int)(progressValue * 100)) + + "%"; } else { if (progressValue == 0) { - return caption + language->getElement(L"options.off"); + return caption + language->getElement("options.off"); } - return caption + toWString((int)(progressValue * 100)) + L"%"; + return caption + toWString((int)(progressValue * 100)) + "%"; } } else if (item->isBoolean()) { bool booleanValue = getBooleanValue(item); if (booleanValue) { - return caption + language->getElement(L"options.on"); + return caption + language->getElement("options.on"); } - return caption + language->getElement(L"options.off"); + return caption + language->getElement("options.off"); } else if (item == Option::RENDER_DISTANCE) { return caption + language->getElement(RENDER_DISTANCE_NAMES[viewDistance]); @@ -356,9 +356,9 @@ std::wstring Options::getMessage(const Options::Option* item) { return caption + I18n::get(FRAMERATE_LIMITS[framerateLimit]); } else if (item == Option::GRAPHICS) { if (fancyGraphics) { - return caption + language->getElement(L"options.graphics.fancy"); + return caption + language->getElement("options.graphics.fancy"); } - return caption + language->getElement(L"options.graphics.fast"); + return caption + language->getElement("options.graphics.fast"); } return caption; @@ -372,46 +372,46 @@ void Options::load() { BufferedReader* br = new BufferedReader( new InputStreamReader(new FileInputStream(optionsFile))); - std::wstring line = L""; + std::string line = ""; while ((line = br->readLine()) != - L"") // 4J - was check against nullptr - do we need to distinguish + "") // 4J - was check against nullptr - do we need to distinguish // between empty lines and a fail here? { // 4J - removed try/catch // try { - std::wstring cmds[2]; - int splitpos = (int)line.find(L":"); - if (splitpos == std::wstring::npos) { + std::string cmds[2]; + int splitpos = (int)line.find(":"); + if (splitpos == std::string::npos) { cmds[0] = line; - cmds[1] = L""; + cmds[1] = ""; } else { cmds[0] = line.substr(0, splitpos); cmds[1] = line.substr(splitpos, line.length() - splitpos); } - if (cmds[0] == L"music") music = readFloat(cmds[1]); - if (cmds[0] == L"sound") sound = readFloat(cmds[1]); - if (cmds[0] == L"mouseSensitivity") sensitivity = readFloat(cmds[1]); - if (cmds[0] == L"fov") fov = readFloat(cmds[1]); - if (cmds[0] == L"gamma") gamma = readFloat(cmds[1]); - if (cmds[0] == L"invertYMouse") invertYMouse = cmds[1] == L"true"; - if (cmds[0] == L"viewDistance") + if (cmds[0] == "music") music = readFloat(cmds[1]); + if (cmds[0] == "sound") sound = readFloat(cmds[1]); + if (cmds[0] == "mouseSensitivity") sensitivity = readFloat(cmds[1]); + if (cmds[0] == "fov") fov = readFloat(cmds[1]); + if (cmds[0] == "gamma") gamma = readFloat(cmds[1]); + if (cmds[0] == "invertYMouse") invertYMouse = cmds[1] == "true"; + if (cmds[0] == "viewDistance") viewDistance = fromWString(cmds[1]); - if (cmds[0] == L"guiScale") guiScale = fromWString(cmds[1]); - if (cmds[0] == L"particles") particles = fromWString(cmds[1]); - if (cmds[0] == L"bobView") bobView = cmds[1] == L"true"; - if (cmds[0] == L"anaglyph3d") anaglyph3d = cmds[1] == L"true"; - if (cmds[0] == L"advancedOpengl") advancedOpengl = cmds[1] == L"true"; - if (cmds[0] == L"fpsLimit") framerateLimit = fromWString(cmds[1]); - if (cmds[0] == L"difficulty") difficulty = fromWString(cmds[1]); - if (cmds[0] == L"fancyGraphics") fancyGraphics = cmds[1] == L"true"; - if (cmds[0] == L"ao") ambientOcclusion = cmds[1] == L"true"; - if (cmds[0] == L"clouds") renderClouds = cmds[1] == L"true"; - if (cmds[0] == L"skin") skin = cmds[1]; - if (cmds[0] == L"lastServer") lastMpIp = cmds[1]; + if (cmds[0] == "guiScale") guiScale = fromWString(cmds[1]); + if (cmds[0] == "particles") particles = fromWString(cmds[1]); + if (cmds[0] == "bobView") bobView = cmds[1] == "true"; + if (cmds[0] == "anaglyph3d") anaglyph3d = cmds[1] == "true"; + if (cmds[0] == "advancedOpengl") advancedOpengl = cmds[1] == "true"; + if (cmds[0] == "fpsLimit") framerateLimit = fromWString(cmds[1]); + if (cmds[0] == "difficulty") difficulty = fromWString(cmds[1]); + if (cmds[0] == "fancyGraphics") fancyGraphics = cmds[1] == "true"; + if (cmds[0] == "ao") ambientOcclusion = cmds[1] == "true"; + if (cmds[0] == "clouds") renderClouds = cmds[1] == "true"; + if (cmds[0] == "skin") skin = cmds[1]; + if (cmds[0] == "lastServer") lastMpIp = cmds[1]; for (int i = 0; i < keyMappings_length; i++) { - if (cmds[0] == (L"key_" + keyMappings[i]->name)) { + if (cmds[0] == ("key_" + keyMappings[i]->name)) { keyMappings[i]->key = fromWString(cmds[1]); } } @@ -427,9 +427,9 @@ void Options::load() { // } } -float Options::readFloat(std::wstring string) { - if (string == L"true") return 1; - if (string == L"false") return 0; +float Options::readFloat(std::string string) { + if (string == "true") return 1; + if (string == "false") return 0; return fromWString(string); } @@ -443,33 +443,33 @@ void Options::save() { DataOutputStream dos = DataOutputStream(&fos); // PrintWriter pw = new PrintWriter(new FileWriter(optionsFile)); - dos.writeChars(L"music:" + toWString(music) + L"\n"); - dos.writeChars(L"sound:" + toWString(sound) + L"\n"); - dos.writeChars(L"invertYMouse:" + - std::wstring(invertYMouse ? L"true" : L"false") + L"\n"); - dos.writeChars(L"mouseSensitivity:" + toWString(sensitivity)); - dos.writeChars(L"fov:" + toWString(fov)); - dos.writeChars(L"gamma:" + toWString(gamma)); - dos.writeChars(L"viewDistance:" + toWString(viewDistance)); - dos.writeChars(L"guiScale:" + toWString(guiScale)); - dos.writeChars(L"particles:" + toWString(particles)); - dos.writeChars(L"bobView:" + std::wstring(bobView ? L"true" : L"false")); - dos.writeChars(L"anaglyph3d:" + - std::wstring(anaglyph3d ? L"true" : L"false")); - dos.writeChars(L"advancedOpengl:" + - std::wstring(advancedOpengl ? L"true" : L"false")); - dos.writeChars(L"fpsLimit:" + toWString(framerateLimit)); - dos.writeChars(L"difficulty:" + toWString(difficulty)); - dos.writeChars(L"fancyGraphics:" + - std::wstring(fancyGraphics ? L"true" : L"false")); - dos.writeChars(L"ao:" + - std::wstring(ambientOcclusion ? L"true" : L"false")); - dos.writeChars(L"clouds:" + toWString(renderClouds)); - dos.writeChars(L"skin:" + skin); - dos.writeChars(L"lastServer:" + lastMpIp); + dos.writeChars("music:" + toWString(music) + "\n"); + dos.writeChars("sound:" + toWString(sound) + "\n"); + dos.writeChars("invertYMouse:" + + std::string(invertYMouse ? "true" : "false") + "\n"); + dos.writeChars("mouseSensitivity:" + toWString(sensitivity)); + dos.writeChars("fov:" + toWString(fov)); + dos.writeChars("gamma:" + toWString(gamma)); + dos.writeChars("viewDistance:" + toWString(viewDistance)); + dos.writeChars("guiScale:" + toWString(guiScale)); + dos.writeChars("particles:" + toWString(particles)); + dos.writeChars("bobView:" + std::string(bobView ? "true" : "false")); + dos.writeChars("anaglyph3d:" + + std::string(anaglyph3d ? "true" : "false")); + dos.writeChars("advancedOpengl:" + + std::string(advancedOpengl ? "true" : "false")); + dos.writeChars("fpsLimit:" + toWString(framerateLimit)); + dos.writeChars("difficulty:" + toWString(difficulty)); + dos.writeChars("fancyGraphics:" + + std::string(fancyGraphics ? "true" : "false")); + dos.writeChars("ao:" + + std::string(ambientOcclusion ? "true" : "false")); + dos.writeChars("clouds:" + toWString(renderClouds)); + dos.writeChars("skin:" + skin); + dos.writeChars("lastServer:" + lastMpIp); for (int i = 0; i < keyMappings_length; i++) { - dos.writeChars(L"key_" + keyMappings[i]->name + L":" + + dos.writeChars("key_" + keyMappings[i]->name + ":" + toWString(keyMappings[i]->key)); } diff --git a/targets/minecraft/client/Options.h b/targets/minecraft/client/Options.h index 127988ef4..6596bd868 100644 --- a/targets/minecraft/client/Options.h +++ b/targets/minecraft/client/Options.h @@ -38,24 +38,24 @@ public: private: const bool _isProgress; const bool _isBoolean; - const std::wstring captionId; + const std::string captionId; public: static const Option* getItem(int id); - Option(const std::wstring& captionId, bool hasProgress, bool isBoolean); + Option(const std::string& captionId, bool hasProgress, bool isBoolean); bool isProgress() const; bool isBoolean() const; int getId() const; - std::wstring getCaptionId() const; + std::string getCaptionId() const; }; private: - static const std::wstring RENDER_DISTANCE_NAMES[]; - static const std::wstring DIFFICULTY_NAMES[]; - static const std::wstring GUI_SCALE[]; - static const std::wstring FRAMERATE_LIMITS[]; - static const std::wstring PARTICLES[]; + static const std::string RENDER_DISTANCE_NAMES[]; + static const std::string DIFFICULTY_NAMES[]; + static const std::string GUI_SCALE[]; + static const std::string FRAMERATE_LIMITS[]; + static const std::string PARTICLES[]; public: float music; @@ -70,7 +70,7 @@ public: bool fancyGraphics; bool ambientOcclusion; bool renderClouds; - std::wstring skin; + std::string skin; KeyMapping* keyUp; KeyMapping* keyLeft; @@ -101,7 +101,7 @@ public: bool hideGui; bool thirdPersonView; bool renderDebug; - std::wstring lastMpIp; + std::string lastMpIp; bool isFlying; bool smoothCamera; @@ -116,18 +116,18 @@ public: void init(); // 4J added Options(Minecraft* minecraft, File workingDirectory); Options(); - std::wstring getKeyDescription(int i); - std::wstring getKeyMessage(int i); + std::string getKeyDescription(int i); + std::string getKeyMessage(int i); void setKey(int i, int key); void set(const Options::Option* item, float value); void toggle(const Options::Option* option, int dir); float getProgressValue(const Options::Option* item); bool getBooleanValue(const Options::Option* item); - std::wstring getMessage(const Options::Option* item); + std::string getMessage(const Options::Option* item); void load(); private: - float readFloat(std::wstring string); + float readFloat(std::string string); public: void save(); diff --git a/targets/minecraft/client/ProgressRenderer.cpp b/targets/minecraft/client/ProgressRenderer.cpp index 9b6b27806..451551c19 100644 --- a/targets/minecraft/client/ProgressRenderer.cpp +++ b/targets/minecraft/client/ProgressRenderer.cpp @@ -112,14 +112,14 @@ void ProgressRenderer::setType(eProgressStringType eType) { m_eType = eType; } -void ProgressRenderer::progressStage(std::wstring& wstrText) { +void ProgressRenderer::progressStage(std::string& wstrText) { std::lock_guard lock(ProgressRenderer::s_progress); m_wstrText = wstrText; m_eType = eProgressStringType_String; } -std::wstring& ProgressRenderer::getProgressString(void) { +std::string& ProgressRenderer::getProgressString(void) { std::lock_guard lock(ProgressRenderer::s_progress); - std::wstring& temp = m_wstrText; + std::string& temp = m_wstrText; return temp; } diff --git a/targets/minecraft/client/ProgressRenderer.h b/targets/minecraft/client/ProgressRenderer.h index ecec96d8d..a119ec63a 100644 --- a/targets/minecraft/client/ProgressRenderer.h +++ b/targets/minecraft/client/ProgressRenderer.h @@ -21,7 +21,7 @@ public: int getCurrentPercent(); int getCurrentTitle(); int getCurrentStatus(); - std::wstring& getProgressString(void); + std::string& getProgressString(void); ProgressRenderer::eProgressStringType getType(); private: @@ -33,7 +33,7 @@ private: int title; int64_t lastTime; bool noAbort; - std::wstring m_wstrText; + std::string m_wstrText; eProgressStringType m_eType; void setType(eProgressStringType eType); @@ -44,6 +44,6 @@ public: virtual void progressStartNoAbort(int string); void _progressStart(int title); virtual void progressStage(int status); - virtual void progressStage(std::wstring& wstrText); + virtual void progressStage(std::string& wstrText); virtual void progressStagePercentage(int i); }; \ No newline at end of file diff --git a/targets/minecraft/client/User.cpp b/targets/minecraft/client/User.cpp index 65d3a7813..fb8b8087d 100644 --- a/targets/minecraft/client/User.cpp +++ b/targets/minecraft/client/User.cpp @@ -42,7 +42,7 @@ void User::staticCtor() { allowedTiles.push_back(Tile::obsidian); } -User::User(const std::wstring& name, const std::wstring& sessionId) { +User::User(const std::string& name, const std::string& sessionId) { this->name = name; this->sessionId = sessionId; } diff --git a/targets/minecraft/client/User.h b/targets/minecraft/client/User.h index 3324d5c48..3de65df20 100644 --- a/targets/minecraft/client/User.h +++ b/targets/minecraft/client/User.h @@ -10,9 +10,9 @@ class User { public: static std::vector allowedTiles; static void staticCtor(); - std::wstring name; - std::wstring sessionId; - std::wstring mpPassword; + std::string name; + std::string sessionId; + std::string mpPassword; - User(const std::wstring& name, const std::wstring& sessionId); + User(const std::string& name, const std::string& sessionId); }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/Button.cpp b/targets/minecraft/client/gui/Button.cpp index e35869bba..f2ea78386 100644 --- a/targets/minecraft/client/gui/Button.cpp +++ b/targets/minecraft/client/gui/Button.cpp @@ -10,16 +10,16 @@ class Minecraft; ResourceLocation GUI_GUI_LOCATION = ResourceLocation(TN_GUI_GUI); #endif -Button::Button(int id, int x, int y, const std::wstring& msg) { +Button::Button(int id, int x, int y, const std::string& msg) { init(id, x, y, 200, 20, msg); } -Button::Button(int id, int x, int y, int w, int h, const std::wstring& msg) { +Button::Button(int id, int x, int y, int w, int h, const std::string& msg) { init(id, x, y, w, h, msg); } // 4J - added -void Button::init(int id, int x, int y, int w, int h, const std::wstring& msg) { +void Button::init(int id, int x, int y, int w, int h, const std::string& msg) { active = true; visible = true; @@ -48,7 +48,7 @@ void Button::render(Minecraft* minecraft, int xm, int ym) { Font* font = minecraft->font; // glBindTexture(GL_TEXTURE_2D, minecraft->textures->loadTexture( - // TN_GUI_GUI)); // 4J was L"/gui/gui.png" + // TN_GUI_GUI)); // 4J was "/gui/gui.png" minecraft->textures->bindTexture(&GUI_GUI_LOCATION); glColor4f(1, 1, 1, 1); diff --git a/targets/minecraft/client/gui/Button.h b/targets/minecraft/client/gui/Button.h index 08746b176..811913be4 100644 --- a/targets/minecraft/client/gui/Button.h +++ b/targets/minecraft/client/gui/Button.h @@ -12,15 +12,15 @@ protected: public: int x, y; - std::wstring msg; + std::string msg; int id; bool active; bool visible; - Button(int id, int x, int y, const std::wstring& msg); - Button(int id, int x, int y, int w, int h, const std::wstring& msg); + Button(int id, int x, int y, const std::string& msg); + Button(int id, int x, int y, int w, int h, const std::string& msg); void init(int id, int x, int y, int w, int h, - const std::wstring& msg); // 4J - added + const std::string& msg); // 4J - added protected: virtual int getYImage(bool hovered); diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index 617b71ca0..69eb819e7 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -10,7 +10,7 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -const std::wstring ChatScreen::allowedChars = +const std::string ChatScreen::allowedChars = SharedConstants::acceptableLetters; ChatScreen::ChatScreen() { frame = 0; } @@ -21,15 +21,15 @@ void ChatScreen::removed() { Keyboard::enableRepeatEvents(false); } void ChatScreen::tick() { frame++; } -void ChatScreen::keyPressed(wchar_t ch, int eventKey) { +void ChatScreen::keyPressed(char ch, int eventKey) { if (eventKey == Keyboard::KEY_ESCAPE) { minecraft->setScreen(nullptr); return; } if (eventKey == Keyboard::KEY_RETURN) { - std::wstring msg = trimString(message); + std::string msg = trimString(message); if (msg.length() > 0) { - std::wstring trim = trimString(message); + std::string trim = trimString(message); if (!minecraft->handleClientSideCommand(trim)) { minecraft->player->chat(trim); } @@ -47,7 +47,7 @@ void ChatScreen::keyPressed(wchar_t ch, int eventKey) { void ChatScreen::render(int xm, int ym, float a) { fill(2, height - 14, width - 2, height - 2, 0x80000000); - drawString(font, L"> " + message + (frame / 6 % 2 == 0 ? L"_" : L""), 4, + drawString(font, "> " + message + (frame / 6 % 2 == 0 ? "_" : ""), 4, height - 12, 0xe0e0e0); Screen::render(xm, ym, a); @@ -55,10 +55,10 @@ void ChatScreen::render(int xm, int ym, float a) { void ChatScreen::mouseClicked(int x, int y, int buttonNum) { if (buttonNum == 0) { - if (minecraft->gui->selectedName != L"") // 4J - was nullptr comparison + if (minecraft->gui->selectedName != "") // 4J - was nullptr comparison { - if (message.length() > 0 && message[message.length() - 1] != L' ') { - message += L" "; + if (message.length() > 0 && message[message.length() - 1] != ' ') { + message += " "; } message += minecraft->gui->selectedName; unsigned int maxLength = SharedConstants::maxChatLength; diff --git a/targets/minecraft/client/gui/ChatScreen.h b/targets/minecraft/client/gui/ChatScreen.h index 5656c40b8..b7057f32f 100644 --- a/targets/minecraft/client/gui/ChatScreen.h +++ b/targets/minecraft/client/gui/ChatScreen.h @@ -5,7 +5,7 @@ class ChatScreen : public Screen { protected: - std::wstring message; + std::string message; private: int frame; @@ -17,10 +17,10 @@ public: virtual void tick() override; private: - static const std::wstring allowedChars; + static const std::string allowedChars; protected: - void keyPressed(wchar_t ch, int eventKey) override; + void keyPressed(char ch, int eventKey) override; public: void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/gui/ConfirmScreen.cpp b/targets/minecraft/client/gui/ConfirmScreen.cpp index 184efc3e3..9e9d2871e 100644 --- a/targets/minecraft/client/gui/ConfirmScreen.cpp +++ b/targets/minecraft/client/gui/ConfirmScreen.cpp @@ -7,22 +7,22 @@ #include "minecraft/client/gui/Screen.h" #include "minecraft/locale/Language.h" -ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1, - const std::wstring& title2, int id) { +ConfirmScreen::ConfirmScreen(Screen* parent, const std::string& title1, + const std::string& title2, int id) { this->parent = parent; this->title1 = title1; this->title2 = title2; this->id = id; Language* language = Language::getInstance(); - yesButton = language->getElement(L"gui.yes"); - noButton = language->getElement(L"gui.no"); + yesButton = language->getElement("gui.yes"); + noButton = language->getElement("gui.no"); } -ConfirmScreen::ConfirmScreen(Screen* parent, const std::wstring& title1, - const std::wstring& title2, - const std::wstring& yesButton, - const std::wstring& noButton, int id) { +ConfirmScreen::ConfirmScreen(Screen* parent, const std::string& title1, + const std::string& title2, + const std::string& yesButton, + const std::string& noButton, int id) { this->parent = parent; this->title1 = title1; this->title2 = title2; diff --git a/targets/minecraft/client/gui/ConfirmScreen.h b/targets/minecraft/client/gui/ConfirmScreen.h index e3ded58c5..2b0281a4e 100644 --- a/targets/minecraft/client/gui/ConfirmScreen.h +++ b/targets/minecraft/client/gui/ConfirmScreen.h @@ -6,18 +6,18 @@ class ConfirmScreen : public Screen { private: Screen* parent; - std::wstring title1; - std::wstring title2; - std::wstring yesButton; - std::wstring noButton; + std::string title1; + std::string title2; + std::string yesButton; + std::string noButton; int id; public: - ConfirmScreen(Screen* parent, const std::wstring& title1, - const std::wstring& title2, int id); - ConfirmScreen(Screen* parent, const std::wstring& title1, - const std::wstring& title2, const std::wstring& yesButton, - const std::wstring& noButton, int id); + ConfirmScreen(Screen* parent, const std::string& title1, + const std::string& title2, int id); + ConfirmScreen(Screen* parent, const std::string& title1, + const std::string& title2, const std::string& yesButton, + const std::string& noButton, int id); virtual void init() override; protected: diff --git a/targets/minecraft/client/gui/ControlsScreen.cpp b/targets/minecraft/client/gui/ControlsScreen.cpp index 19439f026..4eefe302d 100644 --- a/targets/minecraft/client/gui/ControlsScreen.cpp +++ b/targets/minecraft/client/gui/ControlsScreen.cpp @@ -11,7 +11,7 @@ ControlsScreen::ControlsScreen(Screen* lastScreen, Options* options) { // 4J - added initialisers - title = L"Controls"; + title = "Controls"; selectedKey = -1; this->lastScreen = lastScreen; @@ -31,8 +31,8 @@ void ControlsScreen::init() { } buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 7, - language->getElement(L"gui.done"))); - title = language->getElement(L"controls.title"); + language->getElement("gui.done"))); + title = language->getElement("controls.title"); } void ControlsScreen::buttonClicked(Button* button) { @@ -43,11 +43,11 @@ void ControlsScreen::buttonClicked(Button* button) { minecraft->setScreen(lastScreen); } else { selectedKey = button->id; - button->msg = L"> " + options->getKeyMessage(button->id) + L" <"; + button->msg = "> " + options->getKeyMessage(button->id) + " <"; } } -void ControlsScreen::keyPressed(wchar_t eventCharacter, int eventKey) { +void ControlsScreen::keyPressed(char eventCharacter, int eventKey) { if (selectedKey >= 0) { options->setKey(selectedKey, eventKey); buttons[selectedKey]->msg = options->getKeyMessage(selectedKey); diff --git a/targets/minecraft/client/gui/ControlsScreen.h b/targets/minecraft/client/gui/ControlsScreen.h index 7c7eadc82..954a92b35 100644 --- a/targets/minecraft/client/gui/ControlsScreen.h +++ b/targets/minecraft/client/gui/ControlsScreen.h @@ -10,7 +10,7 @@ private: Screen* lastScreen; protected: - std::wstring title; + std::string title; private: Options* options; @@ -31,7 +31,7 @@ public: protected: void buttonClicked(Button* button) override; - void keyPressed(wchar_t eventCharacter, int eventKey) override; + void keyPressed(char eventCharacter, int eventKey) override; public: void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index 662eb92b1..a423d9c9c 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -33,7 +33,7 @@ CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { done = false; // 4J added moreOptions = false; - gameMode = L"survival"; + gameMode = "survival"; generateStructures = true; bonusChest = false; cheatsEnabled = false; @@ -56,42 +56,42 @@ void CreateWorldScreen::init() { Keyboard::enableRepeatEvents(true); buttons.clear(); buttons.push_back(new Button(0, width / 2 - 155, height - 28, 150, 20, - language->getElement(L"selectWorld.create"))); + language->getElement("selectWorld.create"))); buttons.push_back(new Button(1, width / 2 + 5, height - 28, 150, 20, - language->getElement(L"gui.cancel"))); + language->getElement("gui.cancel"))); nameEdit = new EditBox(this, font, width / 2 - 100, 60, 200, 20, - language->getElement(L"selectWorld.newWorld")); + language->getElement("selectWorld.newWorld")); nameEdit->inFocus = true; nameEdit->setMaxLength(32); - seedEdit = new EditBox(this, font, width / 2 - 100, 60, 200, 20, L""); + seedEdit = new EditBox(this, font, width / 2 - 100, 60, 200, 20, ""); buttons.push_back(gameModeButton = new Button( 2, width / 2 - 75, 100, 150, 20, - language->getElement(L"selectWorld.gameMode"))); + language->getElement("selectWorld.gameMode"))); buttons.push_back( moreWorldOptionsButton = new Button(3, width / 2 - 75, 172, 150, 20, - language->getElement(L"selectWorld.moreWorldOptions"))); + language->getElement("selectWorld.moreWorldOptions"))); buttons.push_back(generateStructuresButton = new Button( 4, width / 2 - 155, 100, 150, 20, - language->getElement(L"selectWorld.mapFeatures"))); + language->getElement("selectWorld.mapFeatures"))); generateStructuresButton->visible = false; generateStructuresButton->active = false; buttons.push_back(bonusChestButton = new Button( 7, width / 2 + 5, 136, 150, 20, - language->getElement(L"selectWorld.bonusItems"))); + language->getElement("selectWorld.bonusItems"))); bonusChestButton->visible = false; bonusChestButton->active = false; buttons.push_back(worldTypeButton = new Button( 5, width / 2 + 5, 100, 150, 20, - language->getElement(L"selectWorld.mapType"))); + language->getElement("selectWorld.mapType"))); worldTypeButton->visible = false; worldTypeButton->active = false; buttons.push_back(cheatsEnabledButton = new Button( 6, width / 2 - 155, 136, 150, 20, - language->getElement(L"selectWorld.allowCommands"))); + language->getElement("selectWorld.allowCommands"))); cheatsEnabledButton->visible = false; cheatsEnabledButton->active = false; @@ -104,33 +104,33 @@ void CreateWorldScreen::updateStrings() { Language* language = Language::getInstance(); gameModeButton->msg = - language->getElement(L"selectWorld.gameMode") + L" " + - language->getElement(L"selectWorld.gameMode." + gameMode); + language->getElement("selectWorld.gameMode") + " " + + language->getElement("selectWorld.gameMode." + gameMode); - std::wstring line1Key = L"selectWorld.gameMode." + gameMode + L".line1"; - std::wstring line2Key = L"selectWorld.gameMode." + gameMode + L".line2"; + std::string line1Key = "selectWorld.gameMode." + gameMode + ".line1"; + std::string line2Key = "selectWorld.gameMode." + gameMode + ".line2"; gameModeDescriptionLine1 = language->getElement(line1Key); gameModeDescriptionLine2 = language->getElement(line2Key); generateStructuresButton->msg = - language->getElement(L"selectWorld.mapFeatures") + L" " + - (generateStructures ? language->getElement(L"options.on") - : language->getElement(L"options.off")); + language->getElement("selectWorld.mapFeatures") + " " + + (generateStructures ? language->getElement("options.on") + : language->getElement("options.off")); - bonusChestButton->msg = language->getElement(L"selectWorld.bonusItems") + - L" " + - (bonusChest ? language->getElement(L"options.on") - : language->getElement(L"options.off")); + bonusChestButton->msg = language->getElement("selectWorld.bonusItems") + + " " + + (bonusChest ? language->getElement("options.on") + : language->getElement("options.off")); worldTypeButton->msg = - language->getElement(L"selectWorld.mapType") + L" " + - (flatWorld ? language->getElement(L"selectWorld.mapType.flat") - : language->getElement(L"selectWorld.mapType.normal")); + language->getElement("selectWorld.mapType") + " " + + (flatWorld ? language->getElement("selectWorld.mapType.flat") + : language->getElement("selectWorld.mapType.normal")); cheatsEnabledButton->msg = - language->getElement(L"selectWorld.allowCommands") + L" " + - (cheatsEnabled ? language->getElement(L"options.on") - : language->getElement(L"options.off")); + language->getElement("selectWorld.allowCommands") + " " + + (cheatsEnabled ? language->getElement("options.on") + : language->getElement("options.off")); } void CreateWorldScreen::updateResultFolder() { @@ -140,21 +140,21 @@ void CreateWorldScreen::updateResultFolder() { size_t pos; while ((pos = resultFolder.find( SharedConstants::ILLEGAL_FILE_CHARACTERS[i])) != - std::wstring::npos) { - resultFolder[pos] = L'_'; + std::string::npos) { + resultFolder[pos] = '_'; } } if (resultFolder.length() == 0) { - resultFolder = L"World"; + resultFolder = "World"; } resultFolder = CreateWorldScreen::findAvailableFolderName( minecraft->getLevelSource(), resultFolder); } -std::wstring CreateWorldScreen::findAvailableFolderName( - LevelStorageSource* levelSource, const std::wstring& folder) { - std::wstring folder2 = folder; // 4J - copy input as it is const +std::string CreateWorldScreen::findAvailableFolderName( + LevelStorageSource* levelSource, const std::string& folder) { + std::string folder2 = folder; // 4J - copy input as it is const return folder2; } @@ -201,15 +201,15 @@ void CreateWorldScreen::buttonClicked(Button* button) { moreOptionsParams->dwTexturePack = 0; - std::wstring worldName = nameEdit->getValue(); + std::string worldName = nameEdit->getValue(); if (worldName.empty()) { - worldName = L"2slimey"; + worldName = "2slimey"; } PlatformStorage.ResetSaveData(); - PlatformStorage.SetSaveTitle((wchar_t*)worldName.c_str()); + PlatformStorage.SetSaveTitle((char*)worldName.c_str()); - std::wstring seedString = seedEdit->getValue(); + std::string seedString = seedEdit->getValue(); int64_t seedValue = 0; NetworkGameInitData* param = new NetworkGameInitData(); @@ -221,8 +221,8 @@ void CreateWorldScreen::buttonClicked(Button* button) { bool isNumber = true; for (unsigned int i = 0; i < seedString.length(); ++i) { - if (seedString.at(i) < L'0' || seedString.at(i) > L'9') { - if (!(i == 0 && seedString.at(i) == L'-')) { + if (seedString.at(i) < '0' || seedString.at(i) > '9') { + if (!(i == 0 && seedString.at(i) == '-')) { isNumber = false; break; } @@ -259,7 +259,7 @@ void CreateWorldScreen::buttonClicked(Button* button) { gameServices().setGameHostOption(eGameHostOption_Gamertags, 1); gameServices().setGameHostOption(eGameHostOption_BedrockFog, 0); gameServices().setGameHostOption(eGameHostOption_GameType, - (gameMode == L"survival") + (gameMode == "survival") ? GameType::SURVIVAL->getId() : GameType::CREATIVE->getId()); gameServices().setGameHostOption(eGameHostOption_LevelType, @@ -309,14 +309,14 @@ void CreateWorldScreen::buttonClicked(Button* button) { ui.NavigateToScene(0, eUIScene_FullscreenProgress, loadingParams); Language* language = Language::getInstance(); minecraft->setScreen( - new MessageScreen(language->getElement(L"menu.generatingLevel"))); + new MessageScreen(language->getElement("menu.generatingLevel"))); // 4J Stu - This screen is not used, so removing this to stop the build // failing } else if (button->id == 2) { - if (gameMode == L"survival") - gameMode = L"creative"; + if (gameMode == "survival") + gameMode = "creative"; else - gameMode = L"survival"; + gameMode = "survival"; updateStrings(); } else if (button->id == 3) { moreOptions = !moreOptions; @@ -333,10 +333,10 @@ void CreateWorldScreen::buttonClicked(Button* button) { Language* language = Language::getInstance(); if (moreOptions) { - moreWorldOptionsButton->msg = language->getElement(L"gui.done"); + moreWorldOptionsButton->msg = language->getElement("gui.done"); } else { moreWorldOptionsButton->msg = - language->getElement(L"selectWorld.moreWorldOptions"); + language->getElement("selectWorld.moreWorldOptions"); } } else if (button->id == 4) { generateStructures = !generateStructures; @@ -353,7 +353,7 @@ void CreateWorldScreen::buttonClicked(Button* button) { } } -void CreateWorldScreen::keyPressed(wchar_t ch, int eventKey) { +void CreateWorldScreen::keyPressed(char ch, int eventKey) { if (nameEdit->inFocus && !moreOptions) nameEdit->keyPressed(ch, eventKey); else @@ -382,13 +382,13 @@ void CreateWorldScreen::render(int xm, int ym, float a) { // fill(0, 0, width, height, 0x40000000); renderBackground(); - drawCenteredString(font, language->getElement(L"selectWorld.create"), + drawCenteredString(font, language->getElement("selectWorld.create"), width / 2, 20, 0xffffff); if (!moreOptions) { - drawString(font, language->getElement(L"selectWorld.enterName"), + drawString(font, language->getElement("selectWorld.enterName"), width / 2 - 100, 47, 0xa0a0a0); drawString(font, - language->getElement(L"selectWorld.resultFolder") + L" " + + language->getElement("selectWorld.resultFolder") + " " + resultFolder, width / 2 - 100, 85, 0xa0a0a0); @@ -399,14 +399,14 @@ void CreateWorldScreen::render(int xm, int ym, float a) { drawString(font, gameModeDescriptionLine2, width / 2 - 100, 134, 0xa0a0a0); } else { - drawString(font, language->getElement(L"selectWorld.enterSeed"), + drawString(font, language->getElement("selectWorld.enterSeed"), width / 2 - 100, 47, 0xa0a0a0); - drawString(font, language->getElement(L"selectWorld.seedInfo"), + drawString(font, language->getElement("selectWorld.seedInfo"), width / 2 - 100, 85, 0xa0a0a0); - drawString(font, language->getElement(L"selectWorld.mapFeatures.info"), + drawString(font, language->getElement("selectWorld.mapFeatures.info"), width / 2 - 150, 122, 0xa0a0a0); drawString(font, - language->getElement(L"selectWorld.allowCommands.info"), + language->getElement("selectWorld.allowCommands.info"), width / 2 - 150, 157, 0xa0a0a0); seedEdit->render(); diff --git a/targets/minecraft/client/gui/CreateWorldScreen.h b/targets/minecraft/client/gui/CreateWorldScreen.h index e786a2beb..550a650d5 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.h +++ b/targets/minecraft/client/gui/CreateWorldScreen.h @@ -12,11 +12,11 @@ private: Screen* lastScreen; EditBox* nameEdit; EditBox* seedEdit; - std::wstring resultFolder; + std::string resultFolder; bool done; bool moreOptions; - std::wstring gameMode; + std::string gameMode; bool generateStructures; bool bonusChest; bool cheatsEnabled; @@ -29,9 +29,9 @@ private: Button* worldTypeButton; Button* cheatsEnabledButton; - std::wstring gameModeDescriptionLine1; - std::wstring gameModeDescriptionLine2; - std::wstring seed; + std::string gameModeDescriptionLine1; + std::string gameModeDescriptionLine2; + std::string seed; public: CreateWorldScreen(Screen* lastScreen); @@ -43,13 +43,13 @@ private: void updateStrings(); public: - static std::wstring findAvailableFolderName(LevelStorageSource* levelSource, - const std::wstring& folder); + static std::string findAvailableFolderName(LevelStorageSource* levelSource, + const std::string& folder); virtual void removed() override; protected: virtual void buttonClicked(Button* button) override; - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; virtual void mouseClicked(int x, int y, int buttonNum) override; public: @@ -84,7 +84,7 @@ private: bool bCheatsEnabled; int dwTexturePack; int iPad; - std::wstring worldName; - std::wstring seed; + std::string worldName; + std::string seed; } m_MoreOptionsParams; }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/DeathScreen.cpp b/targets/minecraft/client/gui/DeathScreen.cpp index fee4bcf7f..723d88fd9 100644 --- a/targets/minecraft/client/gui/DeathScreen.cpp +++ b/targets/minecraft/client/gui/DeathScreen.cpp @@ -15,9 +15,9 @@ void DeathScreen::init() { buttons.clear(); buttons.push_back( - new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn")); + new Button(1, width / 2 - 100, height / 4 + 24 * 3, "Respawn")); buttons.push_back( - new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Title menu")); + new Button(2, width / 2 - 100, height / 4 + 24 * 4, "Title menu")); if (minecraft->user == nullptr) { buttons[1]->active = false; @@ -50,10 +50,10 @@ void DeathScreen::render(int xm, int ym, float a) { glPushMatrix(); glScalef(2, 2, 2); - drawCenteredString(font, L"Game over!", width / 2 / 2, 60 / 2, 0xffffff); + drawCenteredString(font, "Game over!", width / 2 / 2, 60 / 2, 0xffffff); glPopMatrix(); drawCenteredString(font, - L"Score: &e" + toWString(minecraft->player->getScore()), + "Score: &e" + toWString(minecraft->player->getScore()), width / 2, 100, 0xffffff); Screen::render(xm, ym, a); diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp index 3a785bd5f..9af8859d3 100644 --- a/targets/minecraft/client/gui/EditBox.cpp +++ b/targets/minecraft/client/gui/EditBox.cpp @@ -5,7 +5,7 @@ #include "minecraft/client/gui/Screen.h" EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, - int height, const std::wstring& value) { + int height, const std::string& value) { // 4J - added initialisers maxLength = 0; frame = 0; @@ -22,13 +22,13 @@ EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, this->setValue(value); } -void EditBox::setValue(const std::wstring& value) { this->value = value; } +void EditBox::setValue(const std::string& value) { this->value = value; } -std::wstring EditBox::getValue() { return value; } +std::string EditBox::getValue() { return value; } void EditBox::tick() { frame++; } -void EditBox::keyPressed(wchar_t ch, int eventKey) { +void EditBox::keyPressed(char ch, int eventKey) { if (!active || !inFocus) { return; } @@ -52,7 +52,7 @@ void EditBox::keyPressed(wchar_t ch, int eventKey) { if (eventKey == Keyboard::KEY_BACK && value.length() > 0) { value = value.substr(0, value.length() - 1); } - if (SharedConstants::acceptableLetters.find(ch) != std::wstring::npos && + if (SharedConstants::acceptableLetters.find(ch) != std::string::npos && (value.length() < maxLength || maxLength == 0)) { value += ch; } @@ -89,7 +89,7 @@ void EditBox::render() { if (active) { bool renderUnderscore = inFocus && (frame / 6 % 2 == 0); - drawString(font, value + (renderUnderscore ? L"_" : L""), textX, textY, + drawString(font, value + (renderUnderscore ? "_" : ""), textX, textY, (enableBackgroundDrawing ? 0xe0e0e0 : 0xffffff)); } else { drawString(font, value, textX, textY, diff --git a/targets/minecraft/client/gui/EditBox.h b/targets/minecraft/client/gui/EditBox.h index 6f13de8fa..bf3197e6a 100644 --- a/targets/minecraft/client/gui/EditBox.h +++ b/targets/minecraft/client/gui/EditBox.h @@ -13,7 +13,7 @@ private: int y; int width; int height; - std::wstring value; + std::string value; unsigned int maxLength; int frame; @@ -28,11 +28,11 @@ private: public: EditBox(Screen* screen, Font* font, int x, int y, int width, int height, - const std::wstring& value); - void setValue(const std::wstring& value); - std::wstring getValue(); + const std::string& value); + void setValue(const std::string& value); + std::string getValue(); void tick(); - void keyPressed(wchar_t ch, int eventKey); + void keyPressed(char ch, int eventKey); void mouseClicked(int mouseX, int mouseY, int buttonNum); void focus(bool newFocus); void render(); diff --git a/targets/minecraft/client/gui/ErrorScreen.cpp b/targets/minecraft/client/gui/ErrorScreen.cpp index 55f88dcc9..73cbb843d 100644 --- a/targets/minecraft/client/gui/ErrorScreen.cpp +++ b/targets/minecraft/client/gui/ErrorScreen.cpp @@ -2,8 +2,8 @@ #include "minecraft/client/gui/Screen.h" -ErrorScreen::ErrorScreen(const std::wstring& title, - const std::wstring& message) { +ErrorScreen::ErrorScreen(const std::string& title, + const std::string& message) { this->title = title; this->message = message; } @@ -20,4 +20,4 @@ void ErrorScreen::render(int xm, int ym, float a) { Screen::render(xm, ym, a); } -void ErrorScreen::keyPressed(wchar_t eventCharacter, int eventKey) {} \ No newline at end of file +void ErrorScreen::keyPressed(char eventCharacter, int eventKey) {} \ No newline at end of file diff --git a/targets/minecraft/client/gui/ErrorScreen.h b/targets/minecraft/client/gui/ErrorScreen.h index bf1804199..c67762177 100644 --- a/targets/minecraft/client/gui/ErrorScreen.h +++ b/targets/minecraft/client/gui/ErrorScreen.h @@ -5,13 +5,13 @@ class ErrorScreen : public Screen { private: - std::wstring title, message; + std::string title, message; public: - ErrorScreen(const std::wstring& title, const std::wstring& message); + ErrorScreen(const std::string& title, const std::string& message); virtual void init() override; virtual void render(int xm, int ym, float a) override; protected: - virtual void keyPressed(wchar_t eventCharacter, int eventKey) override; + virtual void keyPressed(char eventCharacter, int eventKey) override; }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index 9caa216b9..bc3e1c56b 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -16,7 +16,7 @@ #include "minecraft/client/renderer/Textures.h" #include "minecraft/client/resources/ResourceLocation.h" -Font::Font(Options* options, const std::wstring& name, Textures* textures, +Font::Font(Options* options, const std::string& name, Textures* textures, bool enforceUnicode, ResourceLocation* textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] /* = nullptr */) @@ -124,7 +124,7 @@ Font::Font(Options* options, const std::wstring& name, Textures* textures, // take it out for now. Can go back when we have got rid of XUI Font::~Font() { delete[] charWidths; } -void Font::renderCharacter(wchar_t c) { +void Font::renderCharacter(char c) { float xOff = c % m_cols * m_charWidth; float yOff = c / m_cols * m_charWidth; @@ -154,49 +154,49 @@ void Font::renderCharacter(wchar_t c) { xPos += (float)charWidths[c]; } -void Font::drawShadow(const std::wstring& str, int x, int y, int color) { +void Font::drawShadow(const std::string& str, int x, int y, int color) { draw(str, x + 1, y + 1, color, true); draw(str, x, y, color, false); } -void Font::drawShadowWordWrap(const std::wstring& str, int x, int y, int w, +void Font::drawShadowWordWrap(const std::string& str, int x, int y, int w, int color, int h) { drawWordWrapInternal(str, x + 1, y + 1, w, color, true, h); drawWordWrapInternal(str, x, y, w, color, h); } -void Font::draw(const std::wstring& str, int x, int y, int color) { +void Font::draw(const std::string& str, int x, int y, int color) { draw(str, x, y, color, false); } -std::wstring Font::reorderBidi(const std::wstring& str) { +std::string Font::reorderBidi(const std::string& str) { // 4J Not implemented return str; } -void Font::draw(const std::wstring& str, bool dropShadow) { +void Font::draw(const std::string& str, bool dropShadow) { // Bind the texture textures->bindTexture(m_textureLocation); bool noise = false; - std::wstring cleanStr = sanitize(str); + std::string cleanStr = sanitize(str); for (int i = 0; i < (int)cleanStr.length(); ++i) { // Map character - wchar_t c = cleanStr.at(i); + char c = cleanStr.at(i); if (c == 167 && i + 1 < cleanStr.length()) { // 4J - following block was: // int colorN = - // L"0123456789abcdefk".indexOf(str.toLowerCase().charAt(i + 1)); - wchar_t ca = cleanStr[i + 1]; + // "0123456789abcdefk".indexOf(str.toLowerCase().charAt(i + 1)); + char ca = cleanStr[i + 1]; int colorN = 16; - if ((ca >= L'0') && (ca <= L'9')) - colorN = ca - L'0'; - else if ((ca >= L'a') && (ca <= L'f')) - colorN = (ca - L'a') + 10; - else if ((ca >= L'A') && (ca <= L'F')) - colorN = (ca - L'A') + 10; + if ((ca >= '0') && (ca <= '9')) + colorN = ca - '0'; + else if ((ca >= 'a') && (ca <= 'f')) + colorN = (ca - 'a') + 10; + else if ((ca >= 'A') && (ca <= 'F')) + colorN = (ca - 'A') + 10; if (colorN == 16) { noise = true; @@ -229,7 +229,7 @@ void Font::draw(const std::wstring& str, bool dropShadow) { } } -void Font::draw(const std::wstring& str, int x, int y, int color, +void Font::draw(const std::string& str, int x, int y, int color, bool dropShadow) { if (!str.empty()) { if ((color & 0xFC000000) == 0) color |= 0xFF000000; // force alpha @@ -249,14 +249,14 @@ void Font::draw(const std::wstring& str, int x, int y, int color, } } -int Font::width(const std::wstring& str) { - std::wstring cleanStr = sanitize(str); +int Font::width(const std::string& str) { + std::string cleanStr = sanitize(str); - if (cleanStr == L"") return 0; // 4J - was nullptr comparison + if (cleanStr == "") return 0; // 4J - was nullptr comparison int len = 0; for (int i = 0; i < cleanStr.length(); ++i) { - wchar_t c = cleanStr.at(i); + char c = cleanStr.at(i); if (c == 167) { // Ignore the character used to define coloured text @@ -269,8 +269,8 @@ int Font::width(const std::wstring& str) { return len; } -std::wstring Font::sanitize(const std::wstring& str) { - std::wstring sb = str; +std::string Font::sanitize(const std::string& str) { + std::string sb = str; for (unsigned int i = 0; i < sb.length(); i++) { if (CharacterExists(sb[i])) { @@ -284,7 +284,7 @@ std::wstring Font::sanitize(const std::wstring& str) { return sb; } -int Font::MapCharacter(wchar_t c) { +int Font::MapCharacter(char c) { if (!m_charMap.empty()) { // Don't map space character return c == ' ' ? c : m_charMap[c]; @@ -293,7 +293,7 @@ int Font::MapCharacter(wchar_t c) { } } -bool Font::CharacterExists(wchar_t c) { +bool Font::CharacterExists(char c) { if (!m_charMap.empty()) { return m_charMap.find(c) != m_charMap.end(); } else { @@ -301,7 +301,7 @@ bool Font::CharacterExists(wchar_t c) { } } -void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, +void Font::drawWordWrap(const std::string& string, int x, int y, int w, int col, int h) { // if (bidirectional) //{ @@ -310,12 +310,12 @@ void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, drawWordWrapInternal(string, x, y, w, col, h); } -void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, +void Font::drawWordWrapInternal(const std::string& string, int x, int y, int w, int col, int h) { drawWordWrapInternal(string, x, y, w, col, false, h); } -void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, +void Font::drawWordWrap(const std::string& string, int x, int y, int w, int col, bool darken, int h) { // if (bidirectional) //{ @@ -324,9 +324,9 @@ void Font::drawWordWrap(const std::wstring& string, int x, int y, int w, drawWordWrapInternal(string, x, y, w, col, darken, h); } -void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, +void Font::drawWordWrapInternal(const std::string& string, int x, int y, int w, int col, bool darken, int h) { - std::vector lines = stringSplit(string, L'\n'); + std::vector lines = stringSplit(string, '\n'); if (lines.size() > 1) { auto itEnd = lines.end(); for (auto it = lines.begin(); it != itEnd; it++) { @@ -338,12 +338,12 @@ void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, } return; } - std::vector words = stringSplit(string, L' '); + std::vector words = stringSplit(string, ' '); unsigned int pos = 0; while (pos < words.size()) { - std::wstring line = words[pos++] + L" "; + std::string line = words[pos++] + " "; while (pos < words.size() && width(line + words[pos]) < w) { - line += words[pos++] + L" "; + line += words[pos++] + " "; } while (width(line) > w) { int l = 0; @@ -369,8 +369,8 @@ void Font::drawWordWrapInternal(const std::wstring& string, int x, int y, int w, } } -int Font::wordWrapHeight(const std::wstring& string, int w) { - std::vector lines = stringSplit(string, L'\n'); +int Font::wordWrapHeight(const std::string& string, int w) { + std::vector lines = stringSplit(string, '\n'); if (lines.size() > 1) { int h = 0; auto itEnd = lines.end(); @@ -379,13 +379,13 @@ int Font::wordWrapHeight(const std::wstring& string, int w) { } return h; } - std::vector words = stringSplit(string, L' '); + std::vector words = stringSplit(string, ' '); unsigned int pos = 0; int y = 0; while (pos < words.size()) { - std::wstring line = words[pos++] + L" "; + std::string line = words[pos++] + " "; while (pos < words.size() && width(line + words[pos]) < w) { - line += words[pos++] + L" "; + line += words[pos++] + " "; } while (width(line) > w) { int l = 0; @@ -413,9 +413,9 @@ void Font::setBidirectional(bool bidirectional) { this->bidirectional = bidirectional; } -bool Font::AllCharactersValid(const std::wstring& str) { +bool Font::AllCharactersValid(const std::string& str) { for (int i = 0; i < (int)str.length(); ++i) { - wchar_t c = str.at(i); + char c = str.at(i); if (c == 167 && i + 1 < str.length()) { // skip special color setting @@ -499,9 +499,9 @@ Font::renderFakeCB(IntBuffer *ib) void Font::loadUnicodePage(int page) { - wchar_t fileName[25]; + char fileName[25]; //String fileName = String.format("/1_2_2/font/glyph_%02X.png", page); - swprintf(fileName,25,L"/1_2_2/font/glyph_%02X.png",page); + snprintf(fileName,25,"/1_2_2/font/glyph_%02X.png",page); BufferedImage *image = new BufferedImage(fileName); //try //{ @@ -517,7 +517,7 @@ ImageIO.read(Textures.class.getResourceAsStream(fileName.toWString())); lastBoundTexture = unicodeTexID[page]; } -void Font::renderUnicodeCharacter(wchar_t c) +void Font::renderUnicodeCharacter(char c) { if (unicodeWidth[c] == 0) { diff --git a/targets/minecraft/client/gui/Font.h b/targets/minecraft/client/gui/Font.h index a7c4c8590..83b0a4ce1 100644 --- a/targets/minecraft/client/gui/Font.h +++ b/targets/minecraft/client/gui/Font.h @@ -36,7 +36,7 @@ private: std::map m_charMap; public: - Font(Options* options, const std::wstring& name, Textures* textures, + Font(Options* options, const std::string& name, Textures* textures, bool enforceUnicode, ResourceLocation* textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = nullptr); @@ -46,13 +46,13 @@ public: void renderFakeCB(IntBuffer* cb); // 4J added private: - void renderCharacter(wchar_t c); // 4J added + void renderCharacter(char c); // 4J added public: - void drawShadow(const std::wstring& str, int x, int y, int color); - void drawShadowWordWrap(const std::wstring& str, int x, int y, int w, + void drawShadow(const std::string& str, int x, int y, int color); + void drawShadowWordWrap(const std::string& str, int x, int y, int w, int color, int h); // 4J Added h param - void draw(const std::wstring& str, int x, int y, int color); + void draw(const std::string& str, int x, int y, int color); /** * Reorders the string according to bidirectional levels. A bit expensive at * the moment. @@ -61,37 +61,37 @@ public: * @return */ private: - std::wstring reorderBidi(const std::wstring& str); + std::string reorderBidi(const std::string& str); - void draw(const std::wstring& str, bool dropShadow); - void draw(const std::wstring& str, int x, int y, int color, + void draw(const std::string& str, bool dropShadow); + void draw(const std::string& str, int x, int y, int color, bool dropShadow); - int MapCharacter(wchar_t c); // 4J added - bool CharacterExists(wchar_t c); // 4J added + int MapCharacter(char c); // 4J added + bool CharacterExists(char c); // 4J added public: - int width(const std::wstring& str); - std::wstring sanitize(const std::wstring& str); - void drawWordWrap(const std::wstring& string, int x, int y, int w, int col, + int width(const std::string& str); + std::string sanitize(const std::string& str); + void drawWordWrap(const std::string& string, int x, int y, int w, int col, int h); // 4J Added h param private: - void drawWordWrapInternal(const std::wstring& string, int x, int y, int w, + void drawWordWrapInternal(const std::string& string, int x, int y, int w, int col, int h); // 4J Added h param public: - void drawWordWrap(const std::wstring& string, int x, int y, int w, int col, + void drawWordWrap(const std::string& string, int x, int y, int w, int col, bool darken, int h); // 4J Added h param private: - void drawWordWrapInternal(const std::wstring& string, int x, int y, int w, + void drawWordWrapInternal(const std::string& string, int x, int y, int w, int col, bool darken, int h); // 4J Added h param public: - int wordWrapHeight(const std::wstring& string, int w); + int wordWrapHeight(const std::string& string, int w); void setEnforceUnicodeSheet(bool enforceUnicodeSheet); void setBidirectional(bool bidirectional); // 4J-PB - check for invalid player name - Japanese local name - bool AllCharactersValid(const std::wstring& str); + bool AllCharactersValid(const std::string& str); }; diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index 0a373143b..b967cf608 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -372,7 +372,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { ///////////////////////////////////////////////////////////////////////////////////// if (bDisplayGui) { minecraft->textures->bindTexture( - &GUI_GUI_LOCATION); // 4J was L"/gui/gui.png" + &GUI_GUI_LOCATION); // 4J was "/gui/gui.png" std::shared_ptr inventory = minecraft->player->inventory; if (bTwoPlayerSplitscreen) { @@ -408,7 +408,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { } minecraft->textures->bindTexture( - &GUI_ICONS_LOCATION); // L"/gui/icons.png")); + &GUI_ICONS_LOCATION); // "/gui/icons.png")); glEnable(GL_BLEND); PlatformRenderer.StateSetBlendFactor(0xffffff | (((unsigned int)fVal) << 24)); @@ -841,7 +841,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { #if RENDER_HUD // 4jcraft: backported item switch tooltip display from 1.6.4 if (remainingHighlightTicks > 0 && highlightingItemStack != nullptr) { - std::wstring displayName = highlightingItemStack->getHoverName(); + std::string displayName = highlightingItemStack->getHoverName(); int x = (screenWidth - font->width(displayName)) / 2; int y = screenHeight - 89; @@ -870,10 +870,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { if (true) { bool blink = false; int col = blink ? 0xffffff : 0x80ff20; - wchar_t formatted[10]; - swprintf(formatted, 10, L"%d", minecraft->player->experienceLevel); + char formatted[10]; + snprintf(formatted, 10, "%d", minecraft->player->experienceLevel); - std::wstring str = formatted; + std::string str = formatted; int x = iWidthOffset + (screenWidth - font->width(str)) / 2; int y = screenHeight - iSafezoneYHalf - iTooltipsYOffset; // If we're in creative mode, we don't need to offset the XP display @@ -951,11 +951,11 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { if (minecraft->options->renderDebug) { glPushMatrix(); if (Minecraft::warezTime > 0) glTranslatef(0, 32, 0); - font->drawShadow(ClientConstants::VERSION_STRING + L" (" + - minecraft->fpsString + L")", + font->drawShadow(ClientConstants::VERSION_STRING + " (" + + minecraft->fpsString + ")", iSafezoneXHalf + 2, 20, 0xffffff); font->drawShadow( - L"Seed: " + + "Seed: " + toWString(minecraft->level->getLevelData()->getSeed()), iSafezoneXHalf + 2, 32 + 00, 0xffffff); font->drawShadow(minecraft->gatherStats1(), iSafezoneXHalf + 2, 32 + 10, @@ -971,19 +971,19 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { int iYPos = 82; if (minecraft->level->dimension->id == 0) { - std::wstring wfeature[eTerrainFeature_Count]; + std::string wfeature[eTerrainFeature_Count]; - wfeature[eTerrainFeature_Stronghold] = L"Stronghold: "; - wfeature[eTerrainFeature_Mineshaft] = L"Mineshaft: "; - wfeature[eTerrainFeature_Village] = L"Village: "; - wfeature[eTerrainFeature_Ravine] = L"Ravine: "; + wfeature[eTerrainFeature_Stronghold] = "Stronghold: "; + wfeature[eTerrainFeature_Mineshaft] = "Mineshaft: "; + wfeature[eTerrainFeature_Village] = "Village: "; + wfeature[eTerrainFeature_Ravine] = "Ravine: "; for (int i = 0; i < gameServices().getTerrainFeatures().size(); i++) { FEATURE_DATA* pFeatureData = gameServices().getTerrainFeatures()[i]; - std::wstring itemInfo = - L"[" + toWString(pFeatureData->x * 16) + L", " + - toWString(pFeatureData->z * 16) + L"] "; + std::string itemInfo = + "[" + toWString(pFeatureData->x * 16) + ", " + + toWString(pFeatureData->z * 16) + "] "; wfeature[pFeatureData->eTerrainFeature] += itemInfo; } @@ -1015,28 +1015,28 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth double yBlockPos = floor(minecraft->player->y); double zBlockPos = floor(minecraft->player->z); drawString(font, - L"x: " + toWString(minecraft->player->x) + - L"/ Head: " + toWString(xBlockPos) + - L"/ Chunk: " + + "x: " + toWString(minecraft->player->x) + + "/ Head: " + toWString(xBlockPos) + + "/ Chunk: " + toWString(minecraft->player->xChunk), iSafezoneXHalf + 2, iYPos + 8 * 0, 0xe0e0e0); drawString(font, - L"y: " + toWString(minecraft->player->y) + - L"/ Head: " + toWString(yBlockPos), + "y: " + toWString(minecraft->player->y) + + "/ Head: " + toWString(yBlockPos), iSafezoneXHalf + 2, iYPos + 8 * 1, 0xe0e0e0); drawString(font, - L"z: " + toWString(minecraft->player->z) + - L"/ Head: " + toWString(zBlockPos) + - L"/ Chunk: " + + "z: " + toWString(minecraft->player->z) + + "/ Head: " + toWString(zBlockPos) + + "/ Chunk: " + toWString(minecraft->player->zChunk), iSafezoneXHalf + 2, iYPos + 8 * 2, 0xe0e0e0); drawString( font, - L"f: " + + "f: " + toWString( Mth::floor(minecraft->player->yRot * 4.0f / 360.0f + 0.5) & 0x3) + - L"/ yRot: " + toWString(minecraft->player->yRot), + "/ yRot: " + toWString(minecraft->player->yRot), iSafezoneXHalf + 2, iYPos + 8 * 3, 0xe0e0e0); iYPos += 8 * 4; @@ -1049,8 +1049,8 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth Biome* biome = chunkAt->getBiome( px & 15, pz & 15, minecraft->level->getBiomeSource()); drawString(font, - L"b: " + biome->m_name + L" (" + - toWString(biome->id) + L")", + "b: " + biome->m_name + " (" + + toWString(biome->id) + ")", iSafezoneXHalf + 2, iYPos, 0xe0e0e0); } @@ -1143,7 +1143,7 @@ max) + "% (" + (total / 1024 / 1024) + "MB)"; drawString(font, msg, screenWidth y += iHeightOffset; } - std::wstring msg = guiMessages[iPad][i].string; + std::string msg = guiMessages[iPad][i].string; // 4J-PB - fill the black bar across the whole screen, // otherwise it looks odd due to the safe area this->fill(0, y - 1, screenWidth / fScaleFactorWidth, y + 8, @@ -1199,7 +1199,7 @@ void Gui::renderBossHealth(void) { // blit(xLeft, yo, 0, 79, progress, 5); // } - // std::wstring msg = L"Boss health" /*L"Boss health - NON LOCALISED"*/; + // std::string msg = "Boss health" /*"Boss health - NON LOCALISED"*/; // font->drawShadow(msg, screenWidth / 2 - font->width(msg) / 2, yo - 10, // 0xff00ff); // glColor4f(1, 1, 1, 1); @@ -1244,7 +1244,7 @@ void Gui::renderVignette(float br, int w, int h) { glBindTexture( GL_TEXTURE_2D, minecraft->textures->loadTexture( - TN__BLUR__MISC_VIGNETTE)); // L"%blur%/misc/vignette.png")); + TN__BLUR__MISC_VIGNETTE)); // "%blur%/misc/vignette.png")); Tesselator* t = Tesselator::getInstance(); t->begin(); t->vertexUV((float)(0), (float)(h), (float)(-90), (float)(0), (float)(1)); @@ -1272,7 +1272,7 @@ void Gui::renderTp(float br, int w, int h) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glColor4f(1, 1, 1, br); minecraft->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png")); + &TextureAtlas::LOCATION_BLOCKS); // "/terrain.png")); Icon* slot = Tile::portalTile->getTexture(Facing::UP); float u0 = slot->getU0(); @@ -1369,9 +1369,9 @@ void Gui::clearMessages(int iPad) { } } -void Gui::addMessage(const std::wstring& _string, int iPad, +void Gui::addMessage(const std::string& _string, int iPad, bool bIsDeathMessage) { - std::wstring string = _string; // 4J - Take copy of input as it is const + std::string string = _string; // 4J - Take copy of input as it is const // int iScale=1; // if((minecraft->player->m_iScreenSection==IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP) @@ -1390,7 +1390,7 @@ void Gui::addMessage(const std::wstring& _string, int iPad, // { // i++; // } - // int iLast=string.find_last_of(L" ",i); + // int iLast=string.find_last_of(" ",i); // // if a space was found, include the space on this line // if(iLast!=i) @@ -1441,7 +1441,7 @@ void Gui::addMessage(const std::wstring& _string, int iPad, while (i < string.length() && (i + 1) <= maximumChars) { i++; } - int iLast = (int)string.find_last_of(L" ", i); + int iLast = (int)string.find_last_of(" ", i); switch (XGetLanguage()) { case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: @@ -1449,7 +1449,7 @@ void Gui::addMessage(const std::wstring& _string, int iPad, iLast = maximumChars; break; default: - iLast = (int)string.find_last_of(L" ", i); + iLast = (int)string.find_last_of(" ", i); break; } @@ -1508,8 +1508,8 @@ float Gui::getJukeboxOpacity(int iPad) { return alpha; } -void Gui::setNowPlaying(const std::wstring& string) { - // overlayMessageString = L"Now playing: " + string; +void Gui::setNowPlaying(const std::string& string) { + // overlayMessageString = "Now playing: " + string; overlayMessageString = gameServices().getString(IDS_NOWPLAYING) + string; overlayMessageTime = 20 * 3; animateOverlayMessageColor = true; @@ -1517,7 +1517,7 @@ void Gui::setNowPlaying(const std::wstring& string) { void Gui::displayClientMessage(int messageId, int iPad) { // Language *language = Language::getInstance(); - std::wstring languageString = + std::string languageString = gameServices().getString(messageId); // language->getElement(messageId); addMessage(languageString, iPad); diff --git a/targets/minecraft/client/gui/Gui.h b/targets/minecraft/client/gui/Gui.h index d6300fe51..7cee85007 100644 --- a/targets/minecraft/client/gui/Gui.h +++ b/targets/minecraft/client/gui/Gui.h @@ -33,11 +33,11 @@ private: Minecraft* minecraft; public: - std::wstring selectedName; + std::string selectedName; private: int tickCount; - std::wstring overlayMessageString; + std::string overlayMessageString; int overlayMessageTime; bool animateOverlayMessageColor; @@ -73,19 +73,19 @@ private: public: void tick(); void clearMessages(int iPad = -1); - void addMessage(const std::wstring& string, int iPad, + void addMessage(const std::string& string, int iPad, bool bIsDeathMessage = false); - void setNowPlaying(const std::wstring& string); + void setNowPlaying(const std::string& string); void displayClientMessage(int messageId, int iPad); // 4J Added std::size_t getMessagesCount(int iPad) { return guiMessages[iPad].size(); } - std::wstring getMessage(int iPad, std::size_t index) { + std::string getMessage(int iPad, std::size_t index) { return guiMessages[iPad].at(index).string; } float getOpacity(int iPad, std::size_t index); - std::wstring getJukeboxMessage(int iPad) { return overlayMessageString; } + std::string getJukeboxMessage(int iPad) { return overlayMessageString; } float getJukeboxOpacity(int iPad); // 4J Added diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp index b89ee5e95..11b209f2c 100644 --- a/targets/minecraft/client/gui/GuiComponent.cpp +++ b/targets/minecraft/client/gui/GuiComponent.cpp @@ -92,12 +92,12 @@ void GuiComponent::fillGradient(int x0, int y0, int x1, int y1, int col1, GuiComponent::GuiComponent() { blitOffset = 0; } -void GuiComponent::drawCenteredString(Font* font, const std::wstring& str, +void GuiComponent::drawCenteredString(Font* font, const std::string& str, int x, int y, int color) { font->drawShadow(str, x - (font->width(str)) / 2, y, color); } -void GuiComponent::drawString(Font* font, const std::wstring& str, int x, int y, +void GuiComponent::drawString(Font* font, const std::string& str, int x, int y, int color) { font->drawShadow(str, x, y, color); } diff --git a/targets/minecraft/client/gui/GuiComponent.h b/targets/minecraft/client/gui/GuiComponent.h index d29ffd0e3..cf3735680 100644 --- a/targets/minecraft/client/gui/GuiComponent.h +++ b/targets/minecraft/client/gui/GuiComponent.h @@ -15,9 +15,9 @@ protected: public: GuiComponent(); // 4J added - void drawCenteredString(Font* font, const std::wstring& str, int x, int y, + void drawCenteredString(Font* font, const std::string& str, int x, int y, int color); - void drawString(Font* font, const std::wstring& str, int x, int y, + void drawString(Font* font, const std::string& str, int x, int y, int color); void blit(int x, int y, int sx, int sy, int w, int h); }; diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index fb4fa57a8..65cac4711 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -19,20 +19,20 @@ void InBedChatScreen::init() { buttons.push_back( new Button(WAKE_UP_BUTTON, width / 2 - 100, height - 40, - language->getElement(L"multiplayer.stopSleeping"))); + language->getElement("multiplayer.stopSleeping"))); } void InBedChatScreen::removed() { Keyboard::enableRepeatEvents(false); } -void InBedChatScreen::keyPressed(wchar_t ch, int eventKey) { +void InBedChatScreen::keyPressed(char ch, int eventKey) { if (eventKey == Keyboard::KEY_ESCAPE) { sendWakeUp(); } else if (eventKey == Keyboard::KEY_RETURN) { - std::wstring msg = trimString(message); + std::string msg = trimString(message); if (msg.length() > 0) { minecraft->player->chat(trimString(message)); } - message = L""; + message = ""; } else { ChatScreen::keyPressed(ch, eventKey); } diff --git a/targets/minecraft/client/gui/InBedChatScreen.h b/targets/minecraft/client/gui/InBedChatScreen.h index e068f5ce4..1fe25e0a3 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.h +++ b/targets/minecraft/client/gui/InBedChatScreen.h @@ -11,7 +11,7 @@ public: virtual void removed() override; protected: - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; public: virtual void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index 99c987d51..14555085d 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -24,10 +24,10 @@ void JoinMultiplayerScreen::init() { Keyboard::enableRepeatEvents(true); buttons.clear(); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + 12, - language->getElement(L"multiplayer.connect"))); + language->getElement("multiplayer.connect"))); buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + 12, - language->getElement(L"gui.cancel"))); - std::wstring ip = replaceAll(minecraft->options->lastMpIp, L"_", L":"); + language->getElement("gui.cancel"))); + std::string ip = replaceAll(minecraft->options->lastMpIp, "_", ":"); buttons[0]->active = ip.length() > 0; ipEdit = new EditBox(this, font, width / 2 - 100, height / 4 - 10 + 50 + 18, @@ -43,18 +43,18 @@ void JoinMultiplayerScreen::buttonClicked(Button* button) { if (button->id == 1) { minecraft->setScreen(lastScreen); } else if (button->id == 0) { - std::wstring ip = trimString(ipEdit->getValue()); + std::string ip = trimString(ipEdit->getValue()); - minecraft->options->lastMpIp = replaceAll(ip, L":", L"_"); + minecraft->options->lastMpIp = replaceAll(ip, ":", "_"); minecraft->options->save(); - std::vector parts = stringSplit(ip, L'L'); - if (ip[0] == L'[') { - int pos = (int)ip.find(L"]"); - if (pos != std::wstring::npos) { - std::wstring path = ip.substr(1, pos); - std::wstring port = trimString(ip.substr(pos + 1)); - if (port[0] == L':' && port.length() > 0) { + std::vector parts = stringSplit(ip, 'L'); + if (ip[0] == '[') { + int pos = (int)ip.find("]"); + if (pos != std::string::npos) { + std::string path = ip.substr(1, pos); + std::string port = trimString(ip.substr(pos + 1)); + if (port[0] == ':' && port.length() > 0) { port = port.substr(1); parts.clear(); parts.push_back(path); @@ -76,11 +76,11 @@ void JoinMultiplayerScreen::buttonClicked(Button* button) { } } -int JoinMultiplayerScreen::parseInt(const std::wstring& str, int def) { +int JoinMultiplayerScreen::parseInt(const std::string& str, int def) { return fromWString(str); } -void JoinMultiplayerScreen::keyPressed(wchar_t ch, int eventKey) { +void JoinMultiplayerScreen::keyPressed(char ch, int eventKey) { ipEdit->keyPressed(ch, eventKey); if (ch == 13) { @@ -101,13 +101,13 @@ void JoinMultiplayerScreen::render(int xm, int ym, float a) { // fill(0, 0, width, height, 0x40000000); renderBackground(); - drawCenteredString(font, language->getElement(L"multiplayer.title"), + drawCenteredString(font, language->getElement("multiplayer.title"), width / 2, height / 4 - 60 + 20, 0xffffff); - drawString(font, language->getElement(L"multiplayer.info1"), + drawString(font, language->getElement("multiplayer.info1"), width / 2 - 140, height / 4 - 60 + 60 + 9 * 0, 0xa0a0a0); - drawString(font, language->getElement(L"multiplayer.info2"), + drawString(font, language->getElement("multiplayer.info2"), width / 2 - 140, height / 4 - 60 + 60 + 9 * 1, 0xa0a0a0); - drawString(font, language->getElement(L"multiplayer.ipinfo"), + drawString(font, language->getElement("multiplayer.ipinfo"), width / 2 - 140, height / 4 - 60 + 60 + 9 * 4, 0xa0a0a0); ipEdit->render(); diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.h b/targets/minecraft/client/gui/JoinMultiplayerScreen.h index ee411c8eb..fb4188ac9 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.h +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.h @@ -21,10 +21,10 @@ protected: virtual void buttonClicked(Button* button) override; private: - virtual int parseInt(const std::wstring& str, int def); + virtual int parseInt(const std::string& str, int def); protected: - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; virtual void mouseClicked(int x, int y, int buttonNum) override; public: diff --git a/targets/minecraft/client/gui/MessageScreen.cpp b/targets/minecraft/client/gui/MessageScreen.cpp index 933657fa9..c6bc2cc4e 100644 --- a/targets/minecraft/client/gui/MessageScreen.cpp +++ b/targets/minecraft/client/gui/MessageScreen.cpp @@ -4,7 +4,7 @@ #include "minecraft/client/gui/Screen.h" -MessageScreen::MessageScreen(const std::wstring& message) { +MessageScreen::MessageScreen(const std::string& message) { this->message = message; } diff --git a/targets/minecraft/client/gui/MessageScreen.h b/targets/minecraft/client/gui/MessageScreen.h index 5e9a705fc..83b3d3383 100644 --- a/targets/minecraft/client/gui/MessageScreen.h +++ b/targets/minecraft/client/gui/MessageScreen.h @@ -5,10 +5,10 @@ class MessageScreen : public Screen { private: - std::wstring message; + std::string message; public: - MessageScreen(const std::wstring& message); + MessageScreen(const std::string& message); protected: using Screen::keyPressed; diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index 5f863df84..cae204f9c 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -131,7 +131,7 @@ void Minimap::render(std::shared_ptr player, Textures* textures, glDisable(GL_BLEND); textures->bind( - textures->loadTexture(TN_MISC_MAPICONS)); // L"/misc/mapicons.png")); + textures->loadTexture(TN_MISC_MAPICONS)); // "/misc/mapicons.png")); auto itEnd = data->decorations.end(); @@ -253,12 +253,12 @@ void Minimap::render(std::shared_ptr player, Textures* textures, // 4J Stu - TU-1 hotfix // DCR: Render the players current position here instead if (player != nullptr) { - wchar_t playerPosText[32]; - memset(&playerPosText, 0, sizeof(wchar_t) * 32); + char playerPosText[32]; + memset(&playerPosText, 0, sizeof(char) * 32); int posx = floor(player->x); int posy = floor(player->y); int posz = floor(player->z); - swprintf(playerPosText, 32, L"X: %d, Y: %d, Z: %d", posx, posy, posz); + snprintf(playerPosText, 32, "X: %d, Y: %d, Z: %d", posx, posy, posz); font->draw(playerPosText, x, y, Minecraft::GetInstance()->getColourTable()->getColour( diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp index 18acb3d38..3eb92a8ed 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.cpp +++ b/targets/minecraft/client/gui/NameEntryScreen.cpp @@ -8,27 +8,27 @@ #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" -const std::wstring NameEntryScreen::allowedChars = - L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 " - L",.:-_'*!\"#%/()=+?[]{}<>"; +const std::string NameEntryScreen::allowedChars = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 " + ",.:-_'*!\"#%/()=+?[]{}<>"; NameEntryScreen::NameEntryScreen(Screen* lastScreen, - const std::wstring& oldName, int slot) { + const std::string& oldName, int slot) { frame = 0; // 4J added this->lastScreen = lastScreen; this->slot = slot; this->name = oldName; - if (name == L"-") name = L""; + if (name == "-") name = ""; } void NameEntryScreen::init() { buttons.clear(); Keyboard::enableRepeatEvents(true); buttons.push_back( - new Button(0, width / 2 - 100, height / 4 + 24 * 5, L"Save")); + new Button(0, width / 2 - 100, height / 4 + 24 * 5, "Save")); buttons.push_back( - new Button(1, width / 2 - 100, height / 4 + 24 * 6, L"Cancel")); + new Button(1, width / 2 - 100, height / 4 + 24 * 6, "Cancel")); buttons[0]->active = trimString(name).length() > 1; } @@ -49,10 +49,10 @@ void NameEntryScreen::buttonClicked(Button button) { } } -void NameEntryScreen::keyPressed(wchar_t ch, int eventKey) { +void NameEntryScreen::keyPressed(char ch, int eventKey) { if (eventKey == Keyboard::KEY_BACK && name.length() > 0) name = name.substr(0, name.length() - 1); - if (allowedChars.find(ch) != std::wstring::npos && name.length() < 64) { + if (allowedChars.find(ch) != std::string::npos && name.length() < 64) { name += ch; } buttons[0]->active = trimString(name).length() > 1; @@ -69,7 +69,7 @@ void NameEntryScreen::render(int xm, int ym, float a) { int bh = 20; fill(bx - 1, by - 1, bx + bw + 1, by + bh + 1, 0xffa0a0a0); fill(bx, by, bx + bw, by + bh, 0xff000000); - drawString(font, name + (frame / 6 % 2 == 0 ? L"_" : L""), bx + 4, + drawString(font, name + (frame / 6 % 2 == 0 ? "_" : ""), bx + 4, by + (bh - 8) / 2, 0xe0e0e0); Screen::render(xm, ym, a); diff --git a/targets/minecraft/client/gui/NameEntryScreen.h b/targets/minecraft/client/gui/NameEntryScreen.h index 092d75d67..f1f8b2eda 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.h +++ b/targets/minecraft/client/gui/NameEntryScreen.h @@ -10,15 +10,15 @@ private: Screen* lastScreen; protected: - std::wstring title; + std::string title; private: int slot; - std::wstring name; + std::string name; int frame; public: - NameEntryScreen(Screen* lastScreen, const std::wstring& oldName, int slot); + NameEntryScreen(Screen* lastScreen, const std::string& oldName, int slot); virtual void init() override; virtual void removed() override; virtual void tick() override; @@ -27,10 +27,10 @@ protected: virtual void buttonClicked(Button button); private: - static const std::wstring allowedChars; + static const std::string allowedChars; protected: - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; public: virtual void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/gui/OptionsScreen.cpp b/targets/minecraft/client/gui/OptionsScreen.cpp index 9aa855932..77ebe993d 100644 --- a/targets/minecraft/client/gui/OptionsScreen.cpp +++ b/targets/minecraft/client/gui/OptionsScreen.cpp @@ -13,7 +13,7 @@ #include "minecraft/locale/Language.h" OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { - title = L"Options"; // 4J added + title = "Options"; // 4J added this->lastScreen = lastScreen; this->options = options; @@ -21,7 +21,7 @@ OptionsScreen::OptionsScreen(Screen* lastScreen, Options* options) { void OptionsScreen::init() { Language* language = Language::getInstance(); - this->title = language->getElement(L"options.title"); + this->title = language->getElement("options.title"); int position = 0; @@ -49,12 +49,12 @@ void OptionsScreen::init() { buttons.push_back(new Button(VIDEO_BUTTON_ID, width / 2 - 100, height / 6 + 24 * 4 + 12, - language->getElement(L"options.video"))); + language->getElement("options.video"))); buttons.push_back(new Button(CONTROLS_BUTTON_ID, width / 2 - 100, height / 6 + 24 * 5 + 12, - language->getElement(L"options.controls"))); + language->getElement("options.controls"))); buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 7, - language->getElement(L"gui.done"))); + language->getElement("gui.done"))); } void OptionsScreen::buttonClicked(Button* button) { diff --git a/targets/minecraft/client/gui/OptionsScreen.h b/targets/minecraft/client/gui/OptionsScreen.h index 5139afb84..9f3a12849 100644 --- a/targets/minecraft/client/gui/OptionsScreen.h +++ b/targets/minecraft/client/gui/OptionsScreen.h @@ -12,7 +12,7 @@ private: Screen* lastScreen; protected: - std::wstring title; + std::string title; private: Options* options; diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index d1d7405a5..941edff8f 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -36,25 +36,25 @@ void PauseScreen::init() { gameServices().setXuiServerAction(PlatformInput.GetPrimaryPad(), eXuiServerAction_PauseServer, (void*)true); buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, - I18n::get(L"menu.returnToMenu"))); + I18n::get("menu.returnToMenu"))); if (!g_NetworkManager.IsHost()) { - buttons[0]->msg = I18n::get(L"menu.disconnect"); + buttons[0]->msg = I18n::get("menu.disconnect"); } buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, - L"LBack to game")); + "LBack to game")); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + yo, - L"LOptions...")); + "LOptions...")); buttons.push_back(new Button(4, width / 2 - 100, height / 4 + 24 * 1 + yo, - I18n::get(L"menu.returnToGame"))); + I18n::get("menu.returnToGame"))); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 4 + yo, - I18n::get(L"menu.options"))); + I18n::get("menu.options"))); buttons.push_back(new Button(5, width / 2 - 100, height / 4 + 24 * 2 + yo, - 98, 20, I18n::get(L"gui.achievements"))); + 98, 20, I18n::get("gui.achievements"))); buttons.push_back(new Button(6, width / 2 + 2, height / 4 + 24 * 2 + yo, 98, - 20, I18n::get(L"gui.stats"))); + 20, I18n::get("gui.stats"))); /* * if (minecraft->serverConnection!=null) { buttons.get(1).active = * false; buttons.get(2).active = false; buttons.get(3).active = false; @@ -67,7 +67,7 @@ void PauseScreen::exitWorld(Minecraft* minecraft, bool save) { // places such as the deathscreen need this) MinecraftServer* server = MinecraftServer::getInstance(); - minecraft->setScreen(new MessageScreen(L"Leaving world")); + minecraft->setScreen(new MessageScreen("Leaving world")); if (g_NetworkManager.IsHost()) { server->setSaveOnExit(save); } @@ -121,11 +121,11 @@ void PauseScreen::render(int xm, int ym, float a) { col = sinf(col * std::numbers::pi * 2) * 0.2f + 0.8f; int br = (int)(255 * col); - drawString(font, L"Saving level..", 8, height - 16, + drawString(font, "Saving level..", 8, height - 16, br << 16 | br << 8 | br); } - drawCenteredString(font, L"Game menu", width / 2, 40, 0xffffff); + drawCenteredString(font, "Game menu", width / 2, 40, 0xffffff); Screen::render(xm, ym, a); } \ No newline at end of file diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index e0e937276..fb060ff2b 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -12,7 +12,7 @@ #include "minecraft/world/level/storage/LevelStorageSource.h" RenameWorldScreen::RenameWorldScreen(Screen* lastScreen, - const std::wstring& levelId) { + const std::string& levelId) { nameEdit = nullptr; this->lastScreen = lastScreen; this->levelId = levelId; @@ -39,7 +39,7 @@ void RenameWorldScreen::buttonClicked(Button* button) { } } -void RenameWorldScreen::keyPressed(wchar_t ch, int eventKey) { +void RenameWorldScreen::keyPressed(char ch, int eventKey) { nameEdit->keyPressed(ch, eventKey); buttons[0]->active = trimString(nameEdit->getValue()).length() > 0; @@ -60,9 +60,9 @@ void RenameWorldScreen::render(int xm, int ym, float a) { // fill(0, 0, width, height, 0x40000000); renderBackground(); - drawCenteredString(font, language->getElement(L"selectWorld.renameTitle"), + drawCenteredString(font, language->getElement("selectWorld.renameTitle"), width / 2, height / 4 - 60 + 20, 0xffffff); - drawString(font, language->getElement(L"selectWorld.enterName"), + drawString(font, language->getElement("selectWorld.enterName"), width / 2 - 100, 47, 0xa0a0a0); nameEdit->render(); diff --git a/targets/minecraft/client/gui/RenameWorldScreen.h b/targets/minecraft/client/gui/RenameWorldScreen.h index 79a2ff3de..4319479db 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.h +++ b/targets/minecraft/client/gui/RenameWorldScreen.h @@ -10,17 +10,17 @@ class RenameWorldScreen : public Screen { private: Screen* lastScreen; EditBox* nameEdit; - std::wstring levelId; + std::string levelId; public: - RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId); + RenameWorldScreen(Screen* lastScreen, const std::string& levelId); virtual void tick() override; virtual void init() override; virtual void removed() override; protected: virtual void buttonClicked(Button* button) override; - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; virtual void mouseClicked(int x, int y, int buttonNum) override; public: diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 8701b10aa..9c681564d 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -35,7 +35,7 @@ void Screen::render(int xm, int ym, float a) { } } -void Screen::keyPressed(wchar_t eventCharacter, int eventKey) { +void Screen::keyPressed(char eventCharacter, int eventKey) { if (eventKey == Keyboard::KEY_ESCAPE) { minecraft->setScreen(nullptr); // minecraft->grabMouse(); // 4J - removed @@ -48,12 +48,12 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey) { } } -std::wstring Screen::getClipboard() { +std::string Screen::getClipboard() { // 4J - removed - return std::wstring(); + return std::string(); } -void Screen::setClipboard(const std::wstring& str) { +void Screen::setClipboard(const std::string& str) { // 4J - removed } diff --git a/targets/minecraft/client/gui/Screen.h b/targets/minecraft/client/gui/Screen.h index dab45b160..b38e4c0c4 100644 --- a/targets/minecraft/client/gui/Screen.h +++ b/targets/minecraft/client/gui/Screen.h @@ -33,9 +33,9 @@ public: virtual void render(int xm, int ym, float a); public: - virtual void keyPressed(wchar_t eventCharacter, int eventKey); - static std::wstring getClipboard(); - static void setClipboard(const std::wstring& str); + virtual void keyPressed(char eventCharacter, int eventKey); + static std::string getClipboard(); + static void setClipboard(const std::string& str); private: Button* clickedButton; diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index 3d121c03f..edcefd9c0 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -22,7 +22,7 @@ SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { // 4J - added initialisers - title = L"Select world"; + title = "Select world"; done = false; selectedWorld = 0; worldSelectionList = nullptr; @@ -37,10 +37,10 @@ SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) { void SelectWorldScreen::init() { Log::info("SelectWorldScreen::init() START\n"); Language* language = Language::getInstance(); - title = language->getElement(L"selectWorld.title"); + title = language->getElement("selectWorld.title"); - worldLang = language->getElement(L"selectWorld.world"); - conversionLang = language->getElement(L"selectWorld.conversion"); + worldLang = language->getElement("selectWorld.world"); + conversionLang = language->getElement("selectWorld.conversion"); loadLevelList(); worldSelectionList = new WorldSelectionList(this); @@ -56,16 +56,16 @@ void SelectWorldScreen::loadLevelList() { selectedWorld = -1; } -std::wstring SelectWorldScreen::getWorldId(int id) { +std::string SelectWorldScreen::getWorldId(int id) { return levelList->at(id)->getLevelId(); } -std::wstring SelectWorldScreen::getWorldName(int id) { - std::wstring levelName = levelList->at(id)->getLevelName(); +std::string SelectWorldScreen::getWorldName(int id) { + std::string levelName = levelList->at(id)->getLevelName(); if (levelName.length() == 0) { Language* language = Language::getInstance(); - levelName = language->getElement(L"selectWorld.world") + L" " + + levelName = language->getElement("selectWorld.world") + " " + toWString(id + 1); } @@ -77,18 +77,18 @@ void SelectWorldScreen::postInit() { buttons.push_back(selectButton = new Button( BUTTON_SELECT_ID, width / 2 - 154, height - 52, 150, - 20, language->getElement(L"selectWorld.select"))); + 20, language->getElement("selectWorld.select"))); buttons.push_back(deleteButton = new Button( BUTTON_RENAME_ID, width / 2 - 154, height - 28, 70, - 20, language->getElement(L"selectWorld.rename"))); + 20, language->getElement("selectWorld.rename"))); buttons.push_back(renameButton = new Button( BUTTON_DELETE_ID, width / 2 - 74, height - 28, 70, 20, - language->getElement(L"selectWorld.delete"))); + language->getElement("selectWorld.delete"))); buttons.push_back(new Button(BUTTON_CREATE_ID, width / 2 + 4, height - 52, 150, 20, - language->getElement(L"selectWorld.create"))); + language->getElement("selectWorld.create"))); buttons.push_back(new Button(BUTTON_CANCEL_ID, width / 2 + 4, height - 28, - 150, 20, language->getElement(L"gui.cancel"))); + 150, 20, language->getElement("gui.cancel"))); selectButton->active = false; deleteButton->active = false; @@ -99,19 +99,19 @@ void SelectWorldScreen::buttonClicked(Button* button) { Log::info("SelectWorldScreen::buttonClicked START\n"); if (!button->active) return; if (button->id == BUTTON_DELETE_ID) { - std::wstring worldName = getWorldName(selectedWorld); - if (worldName != L"") { + std::string worldName = getWorldName(selectedWorld); + if (worldName != "") { isDeleting = true; Language* language = Language::getInstance(); - std::wstring title = - language->getElement(L"selectWorld.deleteQuestion"); - std::wstring warning = - L"'" + worldName + L"' " + - language->getElement(L"selectWorld.deleteWarning"); - std::wstring yes = - language->getElement(L"selectWorld.deleteButton"); - std::wstring no = language->getElement(L"gui.cancel"); + std::string title = + language->getElement("selectWorld.deleteQuestion"); + std::string warning = + "'" + worldName + "' " + + language->getElement("selectWorld.deleteWarning"); + std::string yes = + language->getElement("selectWorld.deleteButton"); + std::string no = language->getElement("gui.cancel"); ConfirmScreen* confirmScreen = new ConfirmScreen(this, title, warning, yes, no, selectedWorld); @@ -140,10 +140,10 @@ void SelectWorldScreen::worldSelected(int id) { done = true; minecraft->gameMode = nullptr; // new SurvivalMode(minecraft); - std::wstring worldFolderName = getWorldId(id); - if (worldFolderName == L"") // 4J - was nullptr comparison + std::string worldFolderName = getWorldId(id); + if (worldFolderName == "") // 4J - was nullptr comparison { - worldFolderName = L"World" + toWString(id); + worldFolderName = "World" + toWString(id); } // 4J Stu - Not used, so commenting to stop the build failing } @@ -252,12 +252,12 @@ void SelectWorldScreen::WorldSelectionList::renderItem(int i, int x, int y, int h, Tesselator* t) { LevelSummary* levelSummary = parent->levelList->at(i); - std::wstring name = levelSummary->getLevelName(); + std::string name = levelSummary->getLevelName(); if (name.length() == 0) { - name = parent->worldLang + L" " + toWString(i + 1); + name = parent->worldLang + " " + toWString(i + 1); } - std::wstring id = levelSummary->getLevelId(); + std::string id = levelSummary->getLevelId(); ULARGE_INTEGER rawtime; rawtime.QuadPart = levelSummary->getLastPlayed() * @@ -270,19 +270,19 @@ void SelectWorldScreen::WorldSelectionList::renderItem(int i, int x, int y, SYSTEMTIME time; FileTimeToSystemTime(&timeasfiletime, &time); - wchar_t buffer[20]; + char buffer[20]; // 4J Stu - Currently shows years as 4 digits, where java only showed 2 - swprintf(buffer, 20, L"%d/%d/%d %d:%02d", time.wDay, time.wMonth, + snprintf(buffer, 20, "%d/%d/%d %d:%02d", time.wDay, time.wMonth, time.wYear, time.wHour, time.wMinute); // 4J - TODO Localise this - id = id + L" (" + buffer; + id = id + " (" + buffer; int64_t size = levelSummary->getSizeOnDisk(); - id = id + L", " + toWString(size / 1024 * 100 / 1024 / 100.0f) + - L" MB)"; - std::wstring info; + id = id + ", " + toWString(size / 1024 * 100 / 1024 / 100.0f) + + " MB)"; + std::string info; if (levelSummary->isRequiresConversion()) { - info = parent->conversionLang + L" " + info; + info = parent->conversionLang + " " + info; } parent->drawString(parent->font, name, x + 2, y + 1, 0xffffff); diff --git a/targets/minecraft/client/gui/SelectWorldScreen.h b/targets/minecraft/client/gui/SelectWorldScreen.h index cb28d7c06..4f0d2160e 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.h +++ b/targets/minecraft/client/gui/SelectWorldScreen.h @@ -29,15 +29,15 @@ private: protected: Screen* lastScreen; - std::wstring title; + std::string title; private: bool done; int selectedWorld; std::vector* levelList; WorldSelectionList* worldSelectionList; - std::wstring worldLang; - std::wstring conversionLang; + std::string worldLang; + std::string conversionLang; bool isDeleting; Button* deleteButton; @@ -52,8 +52,8 @@ private: void loadLevelList(); protected: - std::wstring getWorldId(int id); - std::wstring getWorldName(int id); + std::string getWorldId(int id); + std::string getWorldName(int id); public: virtual void postInit(); diff --git a/targets/minecraft/client/gui/SlideButton.cpp b/targets/minecraft/client/gui/SlideButton.cpp index 8e4df5c47..d617e1bef 100644 --- a/targets/minecraft/client/gui/SlideButton.cpp +++ b/targets/minecraft/client/gui/SlideButton.cpp @@ -6,7 +6,7 @@ #include "minecraft/client/gui/Button.h" SlideButton::SlideButton(int id, int x, int y, const Options::Option* option, - const std::wstring& msg, float value) + const std::string& msg, float value) : Button(id, x, y, 150, 20, msg) { this->sliding = false; // 4J added this->option = option; diff --git a/targets/minecraft/client/gui/SlideButton.h b/targets/minecraft/client/gui/SlideButton.h index 87c01df48..4c533e73f 100644 --- a/targets/minecraft/client/gui/SlideButton.h +++ b/targets/minecraft/client/gui/SlideButton.h @@ -16,7 +16,7 @@ private: public: SlideButton(int id, int x, int y, const Options::Option* option, - const std::wstring& msg, float value); + const std::string& msg, float value); protected: virtual int getYImage(bool hovered) override; diff --git a/targets/minecraft/client/gui/SmallButton.cpp b/targets/minecraft/client/gui/SmallButton.cpp index a4abc5451..3a614e9ca 100644 --- a/targets/minecraft/client/gui/SmallButton.cpp +++ b/targets/minecraft/client/gui/SmallButton.cpp @@ -3,19 +3,19 @@ #include "minecraft/client/Options.h" #include "minecraft/client/gui/Button.h" -SmallButton::SmallButton(int id, int x, int y, const std::wstring& msg) +SmallButton::SmallButton(int id, int x, int y, const std::string& msg) : Button(id, x, y, 150, 20, msg) { this->option = nullptr; } SmallButton::SmallButton(int id, int x, int y, int width, int height, - const std::wstring& msg) + const std::string& msg) : Button(id, x, y, width, height, msg) { this->option = nullptr; } SmallButton::SmallButton(int id, int x, int y, const Options::Option* item, - const std::wstring& msg) + const std::string& msg) : Button(id, x, y, 150, 20, msg) { this->option = item; } diff --git a/targets/minecraft/client/gui/SmallButton.h b/targets/minecraft/client/gui/SmallButton.h index 7d39190bf..6a19f48a0 100644 --- a/targets/minecraft/client/gui/SmallButton.h +++ b/targets/minecraft/client/gui/SmallButton.h @@ -9,10 +9,10 @@ private: const Options::Option* option; public: - SmallButton(int id, int x, int y, const std::wstring& msg); + SmallButton(int id, int x, int y, const std::string& msg); SmallButton(int id, int x, int y, int width, int height, - const std::wstring& msg); + const std::string& msg); SmallButton(int id, int x, int y, const Options::Option* item, - const std::wstring& msg); + const std::string& msg); const Options::Option* getOption(); }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/TradeSwitchButton.cpp b/targets/minecraft/client/gui/TradeSwitchButton.cpp index 28b514cee..ee0063317 100644 --- a/targets/minecraft/client/gui/TradeSwitchButton.cpp +++ b/targets/minecraft/client/gui/TradeSwitchButton.cpp @@ -15,7 +15,7 @@ extern ResourceLocation GUI_VILLAGER_LOCATION; #endif TradeSwitchButton::TradeSwitchButton(int id, int x, int y, bool mirrored) - : Button(id, x, y, 12, 19, L"") { + : Button(id, x, y, 12, 19, "") { this->mirrored = mirrored; } diff --git a/targets/minecraft/client/gui/VideoSettingsScreen.cpp b/targets/minecraft/client/gui/VideoSettingsScreen.cpp index 864c0a742..95ef9cf7d 100644 --- a/targets/minecraft/client/gui/VideoSettingsScreen.cpp +++ b/targets/minecraft/client/gui/VideoSettingsScreen.cpp @@ -14,14 +14,14 @@ #define ITEM_COUNT 10 VideoSettingsScreen::VideoSettingsScreen(Screen* lastScreen, Options* options) { - this->title = L"Video Settings"; // 4J - added + this->title = "Video Settings"; // 4J - added this->lastScreen = lastScreen; this->options = options; } void VideoSettingsScreen::init() { Language* language = Language::getInstance(); - this->title = language->getElement(L"options.videoTitle"); + this->title = language->getElement("options.videoTitle"); const Options::Option* items[ITEM_COUNT] = { Options::Option::GRAPHICS, @@ -55,7 +55,7 @@ void VideoSettingsScreen::init() { // buttons.add(new Button(CONTROLS_BUTTON_ID, width / 2 - 100, height // / 6 + 24 * 5 + 12, language.getElement("options.controls"))); buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 6, - language->getElement(L"gui.done"))); + language->getElement("gui.done"))); } void VideoSettingsScreen::buttonClicked(Button* button) { diff --git a/targets/minecraft/client/gui/VideoSettingsScreen.h b/targets/minecraft/client/gui/VideoSettingsScreen.h index 6635f162a..a69cf9aed 100644 --- a/targets/minecraft/client/gui/VideoSettingsScreen.h +++ b/targets/minecraft/client/gui/VideoSettingsScreen.h @@ -10,7 +10,7 @@ private: Screen* lastScreen; protected: - std::wstring title; + std::string title; private: Options* options; diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp index 159dfca74..1830e3a22 100644 --- a/targets/minecraft/client/gui/achievement/AchievementPopup.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementPopup.cpp @@ -25,7 +25,7 @@ AchievementPopup::AchievementPopup(Minecraft* mc) { } void AchievementPopup::popup(Achievement* ach) { - title = I18n::get(L"achievement.get"); + title = I18n::get("achievement.get"); desc = ach->name; startTime = System::currentTimeMillis(); this->ach = ach; @@ -76,10 +76,10 @@ void AchievementPopup::render() { Lighting::turnOff(); prepareWindow(); - std::wstring title = L"Minecraft " + SharedConstants::VERSION_STRING + - L" Unlicensed Copy :("; - std::wstring msg1 = L"(Or logged in from another location)"; - std::wstring msg2 = L"Purchase at minecraft.net"; + std::string title = "Minecraft " + SharedConstants::VERSION_STRING + + " Unlicensed Copy :("; + std::string msg1 = "(Or logged in from another location)"; + std::string msg2 = "Purchase at minecraft.net"; mc->font->drawShadow(title, 2, 2 + 9 * 0, 0xffffff); mc->font->drawShadow(msg1, 2, 2 + 9 * 1, 0xffffff); diff --git a/targets/minecraft/client/gui/achievement/AchievementPopup.h b/targets/minecraft/client/gui/achievement/AchievementPopup.h index a33bf458b..74ae2bc80 100644 --- a/targets/minecraft/client/gui/achievement/AchievementPopup.h +++ b/targets/minecraft/client/gui/achievement/AchievementPopup.h @@ -14,8 +14,8 @@ private: Minecraft* mc; int width, height; - std::wstring title; - std::wstring desc; + std::string title; + std::string desc; Achievement* ach; int64_t startTime; ItemRenderer* ir; diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index fa1000c76..1789ce69e 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -49,7 +49,7 @@ void AchievementScreen::init() { // buttons.add(new SmallButton(0, width / 2 - 80 - 24, height / 2 + // 74, 110, 20, I18n.get("gui.achievements"))); buttons.push_back(new SmallButton(1, width / 2 + 24, height / 2 + 74, 80, - 20, I18n::get(L"gui.done"))); + 20, I18n::get("gui.done"))); } void AchievementScreen::buttonClicked(Button* button) { @@ -132,7 +132,7 @@ void AchievementScreen::tick() { void AchievementScreen::renderLabels() { int xo = (width - imageWidth) / 2; int yo = (height - imageHeight) / 2; - font->draw(L"Achievements", xo + 15, yo + 5, 0x404040); + font->draw("Achievements", xo + 15, yo + 5, 0x404040); // font.draw(xScrollP + ", " + yScrollP, xo + 5, yo + 5 + // BIGMAP_HEIGHT + 18, 0x404040); font.drawWordWrap("Ride a pig off a diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index 2ae8ad43c..d9dbee6b6 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -33,7 +33,7 @@ StatsScreen::StatsScreen(Screen* lastScreen, StatsCounter* stats) { } void StatsScreen::init() { - title = I18n::get(L"gui.stats"); + title = I18n::get("gui.stats"); statsList = new GeneralStatisticsList(this); statsList->init(&buttons, 1, 1); @@ -52,19 +52,19 @@ void StatsScreen::init() { void StatsScreen::postInit() { Language* language = Language::getInstance(); buttons.push_back(new Button(BUTTON_CANCEL_ID, width / 2 + 4, height - 28, - 150, 20, language->getElement(L"gui.done"))); + 150, 20, language->getElement("gui.done"))); Button *blockButton, *itemButton; buttons.push_back(new Button(BUTTON_STATS_ID, width / 2 - 154, height - 52, 100, 20, - language->getElement(L"stat.generalButton"))); + language->getElement("stat.generalButton"))); buttons.push_back(blockButton = new Button( BUTTON_BLOCKITEMSTATS_ID, width / 2 - 46, height - 52, - 100, 20, language->getElement(L"stat.blocksButton"))); + 100, 20, language->getElement("stat.blocksButton"))); buttons.push_back(itemButton = new Button( BUTTON_ITEMSTATS_ID, width / 2 + 62, height - 52, 100, - 20, language->getElement(L"stat.itemsButton"))); + 20, language->getElement("stat.itemsButton"))); if (blockStatsList->getNumberOfItems() == 0) { blockButton->active = false; @@ -129,7 +129,7 @@ void StatsScreen::GeneralStatisticsList::renderItem(int i, int x, int y, int h, Stat* stat = Stats::generalStats->at(i); parent->drawString(parent->font, stat->name, x + 2, y + 1, i % 2 == 0 ? 0xffffff : 0x909090); - std::wstring msg = stat->format(parent->stats->getTotalValue(stat)); + std::string msg = stat->format(parent->stats->getTotalValue(stat)); parent->drawString(parent->font, msg, x + 2 + 213 - parent->font->width(msg), y + 1, i % 2 == 0 ? 0xffffff : 0x909090); @@ -246,11 +246,11 @@ ItemStat* StatsScreen::StatisticsList::getSlotStat(int slot) { void StatsScreen::StatisticsList::renderStat(ItemStat* stat, int x, int y, bool shaded) { if (stat != nullptr) { - std::wstring msg = stat->format(parent->stats->getTotalValue(stat)); + std::string msg = stat->format(parent->stats->getTotalValue(stat)); parent->drawString(parent->font, msg, x - parent->font->width(msg), y + SLOT_TEXT_OFFSET, shaded ? 0xffffff : 0x909090); } else { - std::wstring msg = L"-"; + std::string msg = "-"; parent->drawString(parent->font, msg, x - parent->font->width(msg), y + SLOT_TEXT_OFFSET, shaded ? 0xffffff : 0x909090); } @@ -272,7 +272,7 @@ void StatsScreen::StatisticsList::renderDecorations(int mouseX, int mouseY) { ItemStat* stat = getSlotStat(slot); renderMousehoverTooltip(stat, mouseX, mouseY); } else { - std::wstring elementName; + std::string elementName; if (mouseX >= (rowX + ROW_COL_1 - SLOT_BG_SIZE) && mouseX <= (rowX + ROW_COL_1)) { elementName = getHeaderDescriptionId(0); @@ -287,7 +287,7 @@ void StatsScreen::StatisticsList::renderDecorations(int mouseX, int mouseY) { } elementName = - trimString(L"" + Language::getInstance()->getElement(elementName)); + trimString("" + Language::getInstance()->getElement(elementName)); if (elementName.length() > 0) { int rx = mouseX + 12; @@ -434,14 +434,14 @@ void StatsScreen::ItemStatisticsList::renderItem(int i, int x, int y, int h, 0); renderStat((ItemStat *) stat, x + ROW_COL_3, y, i % 2 == 0);*/ } -std::wstring StatsScreen::ItemStatisticsList::getHeaderDescriptionId( +std::string StatsScreen::ItemStatisticsList::getHeaderDescriptionId( int column) { if (column == COLUMN_CRAFTED) { - return L"stat.crafted"; + return "stat.crafted"; } else if (column == COLUMN_USED) { - return L"stat.used"; + return "stat.used"; } else { - return L"stat.depleted"; + return "stat.depleted"; } } @@ -558,13 +558,13 @@ void StatsScreen::BlockStatisticsList::renderItem(int i, int x, int y, int h, 0); renderStat((ItemStat *) mineCount, x + ROW_COL_3, y, i % 2 == 0);*/ } -std::wstring StatsScreen::BlockStatisticsList::getHeaderDescriptionId( +std::string StatsScreen::BlockStatisticsList::getHeaderDescriptionId( int column) { if (column == COLUMN_CRAFTED) { - return L"stat.crafted"; + return "stat.crafted"; } else if (column == COLUMN_USED) { - return L"stat.used"; + return "stat.used"; } else { - return L"stat.mined"; + return "stat.mined"; } } \ No newline at end of file diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.h b/targets/minecraft/client/gui/achievement/StatsScreen.h index 17dc2fe37..885b5492c 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.h +++ b/targets/minecraft/client/gui/achievement/StatsScreen.h @@ -21,7 +21,7 @@ protected: static const int BUTTON_ITEMSTATS_ID = 3; Screen* lastScreen; - std::wstring title; + std::string title; public: class GeneralStatisticsList; @@ -105,7 +105,7 @@ private: virtual void clickedHeader(int headerMouseX, int headerMouseY); virtual int getNumberOfItems(); ItemStat* getSlotStat(int slot); - virtual std::wstring getHeaderDescriptionId(int column) = 0; + virtual std::string getHeaderDescriptionId(int column) = 0; virtual void renderStat(ItemStat* stat, int x, int y, bool shaded); virtual void renderDecorations(int mouseX, int mouseY); virtual void renderMousehoverTooltip(ItemStat* stat, int x, int y); @@ -124,7 +124,7 @@ public: StatsScreen* ss); // 4J - added parameter so we can access parent virtual void renderHeader(int x, int y, Tesselator* t); virtual void renderItem(int i, int x, int y, int h, Tesselator* t); - virtual std::wstring getHeaderDescriptionId(int column); + virtual std::string getHeaderDescriptionId(int column); }; class BlockStatisticsList : public StatisticsList { @@ -138,6 +138,6 @@ public: StatsScreen* ss); // 4J - added parameter so we can access parent virtual void renderHeader(int x, int y, Tesselator* t); virtual void renderItem(int i, int x, int y, int h, Tesselator* t); - virtual std::wstring getHeaderDescriptionId(int column); + virtual std::string getHeaderDescriptionId(int column); }; }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp index 8c4079b49..b862f511c 100644 --- a/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp @@ -14,7 +14,7 @@ extern ResourceLocation GUI_BEACON_LOCATION; #endif AbstractBeaconButton::AbstractBeaconButton(int id, int x, int y) - : Button(id, x, y, 22, 22, L"") { + : Button(id, x, y, 22, 22, "") { hovered = false; selected = false; iconRes = nullptr; diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 92aba34cf..a9a53c044 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -127,7 +127,7 @@ void AbstractContainerScreen::render(int xm, int ym, float a) { // update: also added 1.6.x era overloads (for the creative inventory and other // places) void AbstractContainerScreen::renderTooltipInternal( - const std::vector& cleanedLines, + const std::vector& cleanedLines, const std::vector& lineColors, int xm, int ym) { if (cleanedLines.empty()) return; @@ -174,7 +174,7 @@ void AbstractContainerScreen::renderTooltipInternal( int currentY = tooltipY; for (size_t lineIndex = 0; lineIndex < cleanedLines.size(); ++lineIndex) { - const std::wstring& currentLine = cleanedLines[lineIndex]; + const std::string& currentLine = cleanedLines[lineIndex]; int textColor = lineColors[lineIndex]; font->drawShadow(currentLine, tooltipX, currentY, textColor); @@ -190,18 +190,18 @@ void AbstractContainerScreen::renderTooltip(std::shared_ptr item, int xm, int ym) { if (item == nullptr) return; - std::vector elementName; - std::vector* tooltipLines = + std::vector elementName; + std::vector* tooltipLines = item->getHoverText(minecraft->player, false, elementName); if (tooltipLines != nullptr && tooltipLines->size() > 0) { - std::vector cleanedLines; + std::vector cleanedLines; std::vector lineColors; for (int lineIndex = 0; lineIndex < (int)tooltipLines->size(); ++lineIndex) { - std::wstring rawLine = (*tooltipLines)[lineIndex]; - std::wstring clean = L""; + std::string rawLine = (*tooltipLines)[lineIndex]; + std::string clean = ""; int lineColor = 0xffffffff; // 4jcraft: LCE is using HTML font elements for its tooltip @@ -209,23 +209,23 @@ void AbstractContainerScreen::renderTooltip(std::shared_ptr item, // // examples would be enchantment books, potions and music // discs - size_t fontPos = rawLine.find(L" item, } bool inTag = false; - for (wchar_t currentChar : rawLine) { - if (currentChar == L'<') { + for (char currentChar : rawLine) { + if (currentChar == '<') { inTag = true; - } else if (currentChar == L'>') { + } else if (currentChar == '>') { inTag = false; } else if (!inTag) { clean += currentChar; @@ -257,10 +257,10 @@ void AbstractContainerScreen::renderTooltip(std::shared_ptr item, } void AbstractContainerScreen::renderTooltip( - const std::vector& lines, int xm, int ym) { + const std::vector& lines, int xm, int ym) { if (lines.empty()) return; - std::vector cleanedLines = lines; + std::vector cleanedLines = lines; std::vector lineColors; lineColors.reserve(lines.size()); @@ -275,9 +275,9 @@ void AbstractContainerScreen::renderTooltip( renderTooltipInternal(cleanedLines, lineColors, xm, ym); } -void AbstractContainerScreen::renderTooltip(const std::wstring& line, int xm, +void AbstractContainerScreen::renderTooltip(const std::string& line, int xm, int ym) { - renderTooltip(std::vector{line}, xm, ym); + renderTooltip(std::vector{line}, xm, ym); } void AbstractContainerScreen::renderLabels() {} @@ -294,7 +294,7 @@ void AbstractContainerScreen::renderSlot(Slot* slot) { // if (icon >= 0) // { // glDisable(GL_LIGHTING); - // minecraft->textures->bind(minecraft->textures->loadTexture(TN_GUI_ITEMS));//L"/gui/items.png")); + // minecraft->textures->bind(minecraft->textures->loadTexture(TN_GUI_ITEMS));//"/gui/items.png")); // blit(x, y, icon % 16 * 16, icon / 16 * 16, 16, 16); // glEnable(GL_LIGHTING); // return; @@ -370,7 +370,7 @@ void AbstractContainerScreen::mouseReleased(int x, int y, int buttonNum) { } } -void AbstractContainerScreen::keyPressed(wchar_t eventCharacter, int eventKey) { +void AbstractContainerScreen::keyPressed(char eventCharacter, int eventKey) { if (eventKey == Keyboard::KEY_ESCAPE || eventKey == minecraft->options->keyBuild->key) { minecraft->player->closeContainer(); diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h index 5f4e1cb30..3c5308c6e 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.h @@ -42,7 +42,7 @@ protected: // 4jcraft: extracted from render() into a standalone method so this can be // used in other places virtual void renderTooltipInternal( - const std::vector& cleanedLines, + const std::vector& cleanedLines, const std::vector& lineColors, int xm, int ym); virtual void renderTooltip(std::shared_ptr item, int xm, int ym); @@ -53,7 +53,7 @@ private: protected: virtual void mouseClicked(int x, int y, int buttonNum) override; virtual void mouseReleased(int x, int y, int buttonNum) override; - virtual void keyPressed(wchar_t eventCharacter, int eventKey) override; + virtual void keyPressed(char eventCharacter, int eventKey) override; public: virtual void removed() override; @@ -62,7 +62,7 @@ public: virtual void tick() override; // 4jcraft: 1.6.x era overloads - virtual void renderTooltip(const std::vector& lines, int xm, + virtual void renderTooltip(const std::vector& lines, int xm, int ym); - virtual void renderTooltip(const std::wstring& line, int xm, int ym); + virtual void renderTooltip(const std::string& line, int xm, int ym); }; diff --git a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp index 9071fc97e..4226697e6 100644 --- a/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconCancelButton.cpp @@ -23,6 +23,6 @@ BeaconCancelButton::BeaconCancelButton(BeaconScreen* screen, int id, int x, } void BeaconCancelButton::renderTooltip(int xm, int ym) { - screen->renderTooltip(Language::getInstance()->getElement(L"gui.cancel"), + screen->renderTooltip(Language::getInstance()->getElement("gui.cancel"), xm, ym); } \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp index a3cbf95ba..324f05ced 100644 --- a/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconConfirmButton.cpp @@ -23,6 +23,6 @@ BeaconConfirmButton::BeaconConfirmButton(BeaconScreen* screen, int id, int x, } void BeaconConfirmButton::renderTooltip(int xm, int ym) { - screen->renderTooltip(Language::getInstance()->getElement(L"gui.done"), xm, + screen->renderTooltip(Language::getInstance()->getElement("gui.done"), xm, ym); } \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 41ae1c2fc..14f9d2198 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -35,9 +35,9 @@ void BeaconPowerButton::renderTooltip(int xm, int ym) { MobEffect* effect = MobEffect::effects[effectId]; if (!effect) return; - std::wstring name = gameServices().getString(effect->getDescriptionId()); + std::string name = gameServices().getString(effect->getDescriptionId()); if (tier >= 3 && effect->id != MobEffect::regeneration->id) { - name += L" II"; + name += " II"; } screen->renderTooltip(name, xm, ym); } \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp index 219014eb4..07bfa39aa 100644 --- a/targets/minecraft/client/gui/inventory/BeaconScreen.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconScreen.cpp @@ -154,12 +154,12 @@ void BeaconScreen::tick() { void BeaconScreen::removed() { AbstractContainerScreen::removed(); } void BeaconScreen::renderLabels() { - std::wstring primaryLabel = - Language::getInstance()->getElement(L"tile.beacon.primary"); + std::string primaryLabel = + Language::getInstance()->getElement("tile.beacon.primary"); font->drawShadow(primaryLabel, 25, 10, 0xE1E1E1); - std::wstring secondaryLabel = - Language::getInstance()->getElement(L"tile.beacon.secondary"); + std::string secondaryLabel = + Language::getInstance()->getElement("tile.beacon.secondary"); font->drawShadow(secondaryLabel, 125, 10, 0xE1E1E1); } diff --git a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp index b2c09a7f4..49e40f26e 100644 --- a/targets/minecraft/client/gui/inventory/CraftingScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CraftingScreen.cpp @@ -29,7 +29,7 @@ void CraftingScreen::removed() { } void CraftingScreen::renderLabels() { - font->draw(Language::getInstance()->getElement(L"container.crafting"), + font->draw(Language::getInstance()->getElement("container.crafting"), 8 + 16 + 4, 2 + 2 + 2, 0x404040); font->draw(inventory->getName(), 8, imageHeight - 96 + 2, 0x404040); } diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index f5d9ec587..028578462 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -66,7 +66,7 @@ const int CreativeInventoryScreen::tabIconIds Item::bucket_lava_Id}; std::shared_ptr CreativeInventoryScreen::basicInventory = - std::make_shared(0, L"", false, ITEMS_PER_PAGE); + std::make_shared(0, "", false, ITEMS_PER_PAGE); ItemRenderer* CreativeInventoryScreen::itemRenderer = new ItemRenderer(); std::shared_ptr CreativeInventoryScreen::tabIcons [IUIScene_CreativeMenu::eCreativeInventoryTab_COUNT]; @@ -274,7 +274,7 @@ void CreativeInventoryScreen::containerTick() {} void CreativeInventoryScreen::tick() { Screen::tick(); } -void CreativeInventoryScreen::keyPressed(wchar_t eventCharacter, int eventKey) { +void CreativeInventoryScreen::keyPressed(char eventCharacter, int eventKey) { AbstractContainerScreen::keyPressed(eventCharacter, eventKey); } @@ -411,7 +411,7 @@ void CreativeInventoryScreen::renderLabels() { IUIScene_CreativeMenu::TabSpec* spec = IUIScene_CreativeMenu::specs[selectedTabIndex]; if (spec) { - std::wstring tabName = gameServices().getString(spec->m_descriptionId); + std::string tabName = gameServices().getString(spec->m_descriptionId); font->draw(tabName, 8, 6, 0x404040); } } diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h index c67636193..71ab38e35 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -72,7 +72,7 @@ public: virtual void containerTick(); virtual void tick() override; virtual void updateEvents() override; - virtual void keyPressed(wchar_t eventCharacter, int eventKey) override; + virtual void keyPressed(char eventCharacter, int eventKey) override; virtual void mouseClicked(int x, int y, int buttonNum) override; virtual void mouseReleased(int x, int y, int buttonNum) override; virtual void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp index fd739c9d8..13b01596e 100644 --- a/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp @@ -52,7 +52,7 @@ void EnchantmentScreen::init() { AbstractContainerScreen::init(); } void EnchantmentScreen::removed() { AbstractContainerScreen::removed(); } void EnchantmentScreen::renderLabels() { - font->draw(Language::getInstance()->getElement(L"container.enchant"), 12, 5, + font->draw(Language::getInstance()->getElement("container.enchant"), 12, 5, 0x404040); font->draw(inventory->getName(), 8, imageHeight - 96 + 2, 0x404040); @@ -74,7 +74,7 @@ void EnchantmentScreen::renderLabels() { if (enchantMenu->costs[i] > 0) { enchantNames[i] = EnchantmentNames::instance.getRandomName(); } else { - enchantNames[i] = L""; + enchantNames[i] = ""; } } } @@ -93,7 +93,7 @@ void EnchantmentScreen::renderLabels() { minecraft->player->abilities.instabuild; if (cost > 0) { - std::wstring enchantName = enchantNames[i]; + std::string enchantName = enchantNames[i]; Font* weirdEnchantTableFont = minecraft->altFont; if (weirdEnchantTableFont) { @@ -114,7 +114,7 @@ void EnchantmentScreen::renderLabels() { enchantName, buttonX + 2, buttonY + 2, 104, nameColor, 64); } - std::wstring costStr = std::to_wstring(cost); + std::string costStr = std::to_string(cost); int costX = buttonX + 108 - font->width(costStr) - 2; int costY = buttonY + 8; @@ -308,26 +308,26 @@ EnchantmentScreen::EnchantmentNames EnchantmentScreen::EnchantmentNames::instance; EnchantmentScreen::EnchantmentNames::EnchantmentNames() { - std::wstring allWords = - L"the elder scrolls klaatu berata niktu xyzzy bless curse light " - L"darkness fire air earth water hot dry cold wet ignite snuff embiggen " - L"twist shorten stretch fiddle destroy imbue galvanize enchant free " - L"limited range of towards inside sphere cube self other ball mental " - L"physical grow shrink demon elemental spirit animal creature beast " - L"humanoid undead fresh stale "; - std::wistringstream iss(allWords); - std::copy(std::istream_iterator >(iss), - std::istream_iterator >(), + std::string allWords = + "the elder scrolls klaatu berata niktu xyzzy bless curse light " + "darkness fire air earth water hot dry cold wet ignite snuff embiggen " + "twist shorten stretch fiddle destroy imbue galvanize enchant free " + "limited range of towards inside sphere cube self other ball mental " + "physical grow shrink demon elemental spirit animal creature beast " + "humanoid undead fresh stale "; + std::istringstream iss(allWords); + std::copy(std::istream_iterator >(iss), + std::istream_iterator >(), std::back_inserter(words)); } -std::wstring EnchantmentScreen::EnchantmentNames::getRandomName() { +std::string EnchantmentScreen::EnchantmentNames::getRandomName() { int wordCount = random.nextInt(2) + 3; - std::wstring word = L""; + std::string word = ""; for (int i = 0; i < wordCount; i++) { - if (i > 0) word += L" "; + if (i > 0) word += " "; word += words[random.nextInt(words.size())]; } return word; diff --git a/targets/minecraft/client/gui/inventory/EnchantmentScreen.h b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h index e9d50e8ae..20aa20706 100644 --- a/targets/minecraft/client/gui/inventory/EnchantmentScreen.h +++ b/targets/minecraft/client/gui/inventory/EnchantmentScreen.h @@ -47,14 +47,14 @@ private: private: Random random; - std::vector words; + std::vector words; EnchantmentNames(); public: - std::wstring getRandomName(); + std::string getRandomName(); }; - std::wstring enchantNames[3]; + std::string enchantNames[3]; int lastCosts[3]; }; \ No newline at end of file diff --git a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp index c5ef4963e..f31715916 100644 --- a/targets/minecraft/client/gui/inventory/InventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/InventoryScreen.cpp @@ -31,7 +31,7 @@ InventoryScreen::InventoryScreen(std::shared_ptr player) void InventoryScreen::init() { buttons.clear(); } void InventoryScreen::renderLabels() { - font->draw(L"Crafting", 84 + 2, 8 * 2, 0x404040); + font->draw("Crafting", 84 + 2, 8 * 2, 0x404040); } void InventoryScreen::render(int xm, int ym, float a) { diff --git a/targets/minecraft/client/gui/inventory/RepairScreen.cpp b/targets/minecraft/client/gui/inventory/RepairScreen.cpp index f3ce5c284..67e1cb606 100644 --- a/targets/minecraft/client/gui/inventory/RepairScreen.cpp +++ b/targets/minecraft/client/gui/inventory/RepairScreen.cpp @@ -49,7 +49,7 @@ void RepairScreen::init() { int xo = (width - imageWidth) / 2; int yo = (height - imageHeight) / 2; - editName = new EditBox(this, font, xo + 62, yo + 24, 103, 12, L""); + editName = new EditBox(this, font, xo + 62, yo + 24, 103, 12, ""); editName->setMaxLength(40); editName->setEnableBackgroundDrawing(false); editName->inFocus = true; @@ -72,19 +72,19 @@ void RepairScreen::render(int xm, int ym, float a) { } void RepairScreen::renderLabels() { - std::wstring title = - Language::getInstance()->getElement(L"container.repair"); + std::string title = + Language::getInstance()->getElement("container.repair"); font->draw(title, 60, 6, 0x404040); if (repairMenu->cost > 0) { int textColor = 0x80ff20; bool showCost = true; - std::wstring costString; + std::string costString; if (repairMenu->cost >= 40 && !Minecraft::GetInstance()->localplayers[0]->abilities.instabuild) { costString = Language::getInstance()->getElement( - L"container.repair.expensive"); + "container.repair.expensive"); textColor = 0xff6060; } else if (!repairMenu->getSlot(AnvilMenu::RESULT_SLOT)->hasItem()) { showCost = false; @@ -97,7 +97,7 @@ void RepairScreen::renderLabels() { if (showCost) { if (costString.empty()) { costString = Language::getInstance()->getElement( - L"container.repair.cost", repairMenu->cost); + "container.repair.cost", repairMenu->cost); } int shadowColor = -0x00ffffff | ((textColor & 0xfcfcfc) >> 2) | @@ -157,12 +157,12 @@ void RepairScreen::mouseClicked(int mouseX, int mouseY, int buttonNum) { } void RepairScreen::updateItemName() { - std::wstring itemName; + std::string itemName; Slot* slot = repairMenu->getSlot(0); if (slot != nullptr && slot->hasItem()) { if (!slot->getItem()->hasCustomHoverName() && itemName == slot->getItem()->getHoverName()) { - itemName = L""; + itemName = ""; } } @@ -188,7 +188,7 @@ void RepairScreen::refreshContainer( void RepairScreen::slotChanged(AbstractContainerMenu* container, int slotIndex, std::shared_ptr item) { if (slotIndex == AnvilMenu::INPUT_SLOT) { - std::wstring itemName = item == nullptr ? L"" : item->getHoverName(); + std::string itemName = item == nullptr ? "" : item->getHoverName(); editName->setValue(itemName); if (item != nullptr) { editName->focus(true); diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp index 6bf52f199..c3ddf2b66 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -15,14 +15,14 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/SignTileEntity.h" -const std::wstring TextEditScreen::allowedChars = +const std::string TextEditScreen::allowedChars = SharedConstants::acceptableLetters; TextEditScreen::TextEditScreen(std::shared_ptr sign) { // 4J - added initialisers line = 0; frame = 0; - title = L"Edit sign message:"; + title = "Edit sign message:"; this->sign = sign; } @@ -31,7 +31,7 @@ void TextEditScreen::init() { buttons.clear(); Keyboard::enableRepeatEvents(true); buttons.push_back( - new Button(0, width / 2 - 100, height / 4 + 24 * 5, L"Done")); + new Button(0, width / 2 - 100, height / 4 + 24 * 5, "Done")); } void TextEditScreen::removed() { @@ -54,16 +54,16 @@ void TextEditScreen::buttonClicked(Button* button) { } } -void TextEditScreen::keyPressed(wchar_t ch, int eventKey) { +void TextEditScreen::keyPressed(char ch, int eventKey) { if (eventKey == Keyboard::KEY_UP) line = (line - 1) & 3; if (eventKey == Keyboard::KEY_DOWN || eventKey == Keyboard::KEY_RETURN) line = (line + 1) & 3; - std::wstring temp = sign->GetMessage(line); + std::string temp = sign->GetMessage(line); if (eventKey == Keyboard::KEY_BACK && temp.length() > 0) { temp = temp.substr(0, temp.length() - 1); } - if (allowedChars.find(ch) != std::wstring::npos && temp.length() < 15) { + if (allowedChars.find(ch) != std::string::npos && temp.length() < 15) { temp += ch; } diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.h b/targets/minecraft/client/gui/inventory/TextEditScreen.h index ef2d8a655..84306467e 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.h +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.h @@ -8,7 +8,7 @@ class SignTileEntity; class TextEditScreen : public Screen { protected: - std::wstring title; + std::string title; private: std::shared_ptr sign; @@ -25,10 +25,10 @@ protected: virtual void buttonClicked(Button* button) override; private: - static const std::wstring allowedChars; + static const std::string allowedChars; protected: - virtual void keyPressed(wchar_t ch, int eventKey) override; + virtual void keyPressed(char ch, int eventKey) override; public: virtual void render(int xm, int ym, float a) override; diff --git a/targets/minecraft/client/level/DemoLevel.cpp b/targets/minecraft/client/level/DemoLevel.cpp index de9c490f9..58013b44e 100644 --- a/targets/minecraft/client/level/DemoLevel.cpp +++ b/targets/minecraft/client/level/DemoLevel.cpp @@ -13,7 +13,7 @@ LevelSettings DemoLevel::DEMO_LEVEL_SETTINGS = false, LevelType::lvl_normal_1_1, LEVEL_MAX_WIDTH, 1.0); DemoLevel::DemoLevel(std::shared_ptr levelStorage, - const std::wstring& levelName) + const std::string& levelName) : Level(levelStorage, levelName, &DEMO_LEVEL_SETTINGS) {} void DemoLevel::setInitialSpawn() { diff --git a/targets/minecraft/client/level/DemoLevel.h b/targets/minecraft/client/level/DemoLevel.h index d768251c9..b9ab5932d 100644 --- a/targets/minecraft/client/level/DemoLevel.h +++ b/targets/minecraft/client/level/DemoLevel.h @@ -22,7 +22,7 @@ private: public: DemoLevel(std::shared_ptr levelStorage, - const std::wstring& levelName); + const std::string& levelName); DemoLevel(Level* level, Dimension* dimension); protected: diff --git a/targets/minecraft/client/model/OcelotModel.cpp b/targets/minecraft/client/model/OcelotModel.cpp index 00c7a71de..088d8d1a1 100644 --- a/targets/minecraft/client/model/OcelotModel.cpp +++ b/targets/minecraft/client/model/OcelotModel.cpp @@ -31,16 +31,16 @@ const float OcelotModel::frontLegZ = 4.f + zo; OcelotModel::OcelotModel() { state = WALK_STATE; - setMapTex(L"head.main", 0, 0); - setMapTex(L"head.nose", 0, 24); - setMapTex(L"head.ear1", 0, 10); - setMapTex(L"head.ear2", 6, 10); + setMapTex("head.main", 0, 0); + setMapTex("head.nose", 0, 24); + setMapTex("head.ear1", 0, 10); + setMapTex("head.ear2", 6, 10); - head = new ModelPart(this, L"head"); - head->addBox(L"main", -2.5f, -2, -3, 5, 4, 5); - head->addBox(L"nose", -1.5f, 0, -4, 3, 2, 2); - head->addBox(L"ear1", -2, -3, 0, 1, 1, 2); - head->addBox(L"ear2", 1, -3, 0, 1, 1, 2); + head = new ModelPart(this, "head"); + head->addBox("main", -2.5f, -2, -3, 5, 4, 5); + head->addBox("nose", -1.5f, 0, -4, 3, 2, 2); + head->addBox("ear1", -2, -3, 0, 1, 1, 2); + head->addBox("ear2", 1, -3, 0, 1, 1, 2); head->setPos(0 + xo, headWalkY, headWalkZ); body = new ModelPart(this, 20, 0); diff --git a/targets/minecraft/client/model/dragon/DragonModel.cpp b/targets/minecraft/client/model/dragon/DragonModel.cpp index 0298f3426..69aeb7c5c 100644 --- a/targets/minecraft/client/model/dragon/DragonModel.cpp +++ b/targets/minecraft/client/model/dragon/DragonModel.cpp @@ -19,85 +19,85 @@ DragonModel::DragonModel(float g) : Model() { texWidth = 256; texHeight = 256; - setMapTex(L"body.body", 0, 0); - setMapTex(L"wing.skin", -56, 88); - setMapTex(L"wingtip.skin", -56, 144); - setMapTex(L"rearleg.main", 0, 0); - setMapTex(L"rearfoot.main", 112, 0); - setMapTex(L"rearlegtip.main", 196, 0); - setMapTex(L"head.upperhead", 112, 30); - setMapTex(L"wing.bone", 112, 88); - setMapTex(L"head.upperlip", 176, 44); - setMapTex(L"jaw.jaw", 176, 65); - setMapTex(L"frontleg.main", 112, 104); - setMapTex(L"wingtip.bone", 112, 136); - setMapTex(L"frontfoot.main", 144, 104); - setMapTex(L"neck.box", 192, 104); - setMapTex(L"frontlegtip.main", 226, 138); - setMapTex(L"body.scale", 220, 53); - setMapTex(L"head.scale", 0, 0); - setMapTex(L"neck.scale", 48, 0); - setMapTex(L"head.nostril", 112, 0); + setMapTex("body.body", 0, 0); + setMapTex("wing.skin", -56, 88); + setMapTex("wingtip.skin", -56, 144); + setMapTex("rearleg.main", 0, 0); + setMapTex("rearfoot.main", 112, 0); + setMapTex("rearlegtip.main", 196, 0); + setMapTex("head.upperhead", 112, 30); + setMapTex("wing.bone", 112, 88); + setMapTex("head.upperlip", 176, 44); + setMapTex("jaw.jaw", 176, 65); + setMapTex("frontleg.main", 112, 104); + setMapTex("wingtip.bone", 112, 136); + setMapTex("frontfoot.main", 144, 104); + setMapTex("neck.box", 192, 104); + setMapTex("frontlegtip.main", 226, 138); + setMapTex("body.scale", 220, 53); + setMapTex("head.scale", 0, 0); + setMapTex("neck.scale", 48, 0); + setMapTex("head.nostril", 112, 0); float zo = -16; - head = new ModelPart(this, L"head"); - head->addBox(L"upperlip", -6, -1, -8 + zo, 12, 5, 16); - head->addBox(L"upperhead", -8, -8, 6 + zo, 16, 16, 16); + head = new ModelPart(this, "head"); + head->addBox("upperlip", -6, -1, -8 + zo, 12, 5, 16); + head->addBox("upperhead", -8, -8, 6 + zo, 16, 16, 16); head->bMirror = true; - head->addBox(L"scale", -1 - 4, -12, 12 + zo, 2, 4, 6); - head->addBox(L"nostril", -1 - 4, -3, -6 + zo, 2, 2, 4); + head->addBox("scale", -1 - 4, -12, 12 + zo, 2, 4, 6); + head->addBox("nostril", -1 - 4, -3, -6 + zo, 2, 2, 4); head->bMirror = false; - head->addBox(L"scale", -1 + 4, -12, 12 + zo, 2, 4, 6); - head->addBox(L"nostril", -1 + 4, -3, -6 + zo, 2, 2, 4); + head->addBox("scale", -1 + 4, -12, 12 + zo, 2, 4, 6); + head->addBox("nostril", -1 + 4, -3, -6 + zo, 2, 2, 4); - jaw = new ModelPart(this, L"jaw"); + jaw = new ModelPart(this, "jaw"); jaw->setPos(0, 4, 8 + zo); - jaw->addBox(L"jaw", -6, 0, -16, 12, 4, 16); + jaw->addBox("jaw", -6, 0, -16, 12, 4, 16); head->addChild(jaw); - neck = new ModelPart(this, L"neck"); - neck->addBox(L"box", -5, -5, -5, 10, 10, 10); - neck->addBox(L"scale", -1, -9, -5 + 2, 2, 4, 6); + neck = new ModelPart(this, "neck"); + neck->addBox("box", -5, -5, -5, 10, 10, 10); + neck->addBox("scale", -1, -9, -5 + 2, 2, 4, 6); - body = new ModelPart(this, L"body"); + body = new ModelPart(this, "body"); body->setPos(0, 4, 8); - body->addBox(L"body", -12, 0, -16, 24, 24, 64); - body->addBox(L"scale", -1, -6, -10 + 20 * 0, 2, 6, 12); - body->addBox(L"scale", -1, -6, -10 + 20 * 1, 2, 6, 12); - body->addBox(L"scale", -1, -6, -10 + 20 * 2, 2, 6, 12); + body->addBox("body", -12, 0, -16, 24, 24, 64); + body->addBox("scale", -1, -6, -10 + 20 * 0, 2, 6, 12); + body->addBox("scale", -1, -6, -10 + 20 * 1, 2, 6, 12); + body->addBox("scale", -1, -6, -10 + 20 * 2, 2, 6, 12); - wing = new ModelPart(this, L"wing"); + wing = new ModelPart(this, "wing"); wing->setPos(-12, 5, 2); - wing->addBox(L"bone", -56, -4, -4, 56, 8, 8); - wing->addBox(L"skin", -56, 0, +2, 56, 0, 56); - wingTip = new ModelPart(this, L"wingtip"); + wing->addBox("bone", -56, -4, -4, 56, 8, 8); + wing->addBox("skin", -56, 0, +2, 56, 0, 56); + wingTip = new ModelPart(this, "wingtip"); wingTip->setPos(-56, 0, 0); - wingTip->addBox(L"bone", -56, -2, -2, 56, 4, 4); - wingTip->addBox(L"skin", -56, 0, +2, 56, 0, 56); + wingTip->addBox("bone", -56, -2, -2, 56, 4, 4); + wingTip->addBox("skin", -56, 0, +2, 56, 0, 56); wing->addChild(wingTip); - frontLeg = new ModelPart(this, L"frontleg"); + frontLeg = new ModelPart(this, "frontleg"); frontLeg->setPos(-12, 20, 2); - frontLeg->addBox(L"main", -4, -4, -4, 8, 24, 8); - frontLegTip = new ModelPart(this, L"frontlegtip"); + frontLeg->addBox("main", -4, -4, -4, 8, 24, 8); + frontLegTip = new ModelPart(this, "frontlegtip"); frontLegTip->setPos(0, 20, -1); - frontLegTip->addBox(L"main", -3, -1, -3, 6, 24, 6); + frontLegTip->addBox("main", -3, -1, -3, 6, 24, 6); frontLeg->addChild(frontLegTip); - frontFoot = new ModelPart(this, L"frontfoot"); + frontFoot = new ModelPart(this, "frontfoot"); frontFoot->setPos(0, 23, 0); - frontFoot->addBox(L"main", -4, 0, -12, 8, 4, 16); + frontFoot->addBox("main", -4, 0, -12, 8, 4, 16); frontLegTip->addChild(frontFoot); - rearLeg = new ModelPart(this, L"rearleg"); + rearLeg = new ModelPart(this, "rearleg"); rearLeg->setPos(-12 - 4, 16, 2 + 40); - rearLeg->addBox(L"main", -8, -4, -8, 16, 32, 16); - rearLegTip = new ModelPart(this, L"rearlegtip"); + rearLeg->addBox("main", -8, -4, -8, 16, 32, 16); + rearLegTip = new ModelPart(this, "rearlegtip"); rearLegTip->setPos(0, 32, -4); - rearLegTip->addBox(L"main", -6, -2, 0, 12, 32, 12); + rearLegTip->addBox("main", -6, -2, 0, 12, 32, 12); rearLeg->addChild(rearLegTip); - rearFoot = new ModelPart(this, L"rearfoot"); + rearFoot = new ModelPart(this, "rearfoot"); rearFoot->setPos(0, 31, 4); - rearFoot->addBox(L"main", -9, 0, -20, 18, 6, 24); + rearFoot->addBox("main", -9, 0, -20, 18, 6, 24); rearLegTip->addChild(rearFoot); // 4J added - compile now to avoid random performance hit first time cubes diff --git a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp index a02cf3832..f84bac143 100644 --- a/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp +++ b/targets/minecraft/client/model/dragon/EnderCrystalModel.cpp @@ -8,13 +8,13 @@ #include "minecraft/client/model/geom/ModelPart.h" EnderCrystalModel::EnderCrystalModel(float g) { - glass = new ModelPart(this, L"glass"); + glass = new ModelPart(this, "glass"); glass->texOffs(0, 0)->addBox(-4, -4, -4, 8, 8, 8); - cube = new ModelPart(this, L"cube"); + cube = new ModelPart(this, "cube"); cube->texOffs(32, 0)->addBox(-4, -4, -4, 8, 8, 8); - base = new ModelPart(this, L"base"); + base = new ModelPart(this, "base"); base->texOffs(0, 16)->addBox(-6, 0, -6, 12, 4, 12); // 4J added - compile now to avoid random performance hit first time cubes diff --git a/targets/minecraft/client/model/geom/Cube.cpp b/targets/minecraft/client/model/geom/Cube.cpp index 35705c2ed..1ba07ec04 100644 --- a/targets/minecraft/client/model/geom/Cube.cpp +++ b/targets/minecraft/client/model/geom/Cube.cpp @@ -115,7 +115,7 @@ void Cube::render(Tesselator* t, float scale) { } } -Cube* Cube::setId(const std::wstring& id) { +Cube* Cube::setId(const std::string& id) { this->id = id; return this; } diff --git a/targets/minecraft/client/model/geom/Cube.h b/targets/minecraft/client/model/geom/Cube.h index 09aff8df3..5acf5f113 100644 --- a/targets/minecraft/client/model/geom/Cube.h +++ b/targets/minecraft/client/model/geom/Cube.h @@ -20,7 +20,7 @@ private: public: const float x0, y0, z0, x1, y1, z1; - std::wstring id; + std::string id; public: Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0, @@ -28,5 +28,5 @@ public: bool bFlipPoly3UVs = false); // 4J - added faceMask void render(Tesselator* t, float scale); - Cube* setId(const std::wstring& id); + Cube* setId(const std::string& id); }; diff --git a/targets/minecraft/client/model/geom/Model.cpp b/targets/minecraft/client/model/geom/Model.cpp index 75c8284b9..a10b469aa 100644 --- a/targets/minecraft/client/model/geom/Model.cpp +++ b/targets/minecraft/client/model/geom/Model.cpp @@ -9,11 +9,11 @@ Model::Model() { texHeight = 32; } -void Model::setMapTex(std::wstring id, int x, int y) { +void Model::setMapTex(std::string id, int x, int y) { mappedTexOffs[id] = new TexOffs(x, y); } -TexOffs* Model::getMapTex(std::wstring id) { +TexOffs* Model::getMapTex(std::string id) { // 4J-PB - assuming there will always be this one return mappedTexOffs[id]; } \ No newline at end of file diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h index d8bc1682b..3951fd120 100644 --- a/targets/minecraft/client/model/geom/Model.h +++ b/targets/minecraft/client/model/geom/Model.h @@ -20,7 +20,7 @@ public: bool riding; std::vector cubes; bool young; - std::unordered_map mappedTexOffs; + std::unordered_map mappedTexOffs; int texWidth; int texHeight; @@ -39,8 +39,8 @@ public: } virtual ModelPart* AddOrRetrievePart(SKIN_BOX* pBox) { return nullptr; } - void setMapTex(std::wstring id, int x, int y); - TexOffs* getMapTex(std::wstring id); + void setMapTex(std::string id, int x, int y); + TexOffs* getMapTex(std::string id); protected: float yHeadOffs; diff --git a/targets/minecraft/client/model/geom/ModelPart.cpp b/targets/minecraft/client/model/geom/ModelPart.cpp index 9665d0688..2f003f8f0 100644 --- a/targets/minecraft/client/model/geom/ModelPart.cpp +++ b/targets/minecraft/client/model/geom/ModelPart.cpp @@ -28,7 +28,7 @@ void ModelPart::_init() { ModelPart::ModelPart() { _init(); } -ModelPart::ModelPart(Model* model, const std::wstring& id) { +ModelPart::ModelPart(Model* model, const std::string& id) { construct(model, id); } @@ -38,7 +38,7 @@ ModelPart::ModelPart(Model* model, int xTexOffs, int yTexOffs) { construct(model, xTexOffs, yTexOffs); } -void ModelPart::construct(Model* model, const std::wstring& id) { +void ModelPart::construct(Model* model, const std::string& id) { _init(); this->model = model; model->cubes.push_back(this); @@ -48,7 +48,7 @@ void ModelPart::construct(Model* model, const std::wstring& id) { void ModelPart::construct(Model* model) { _init(); - construct(model, L""); + construct(model, ""); } void ModelPart::construct(Model* model, int xTexOffs, int yTexOffs) { @@ -95,9 +95,9 @@ ModelPart* ModelPart::texOffs(int xTexOffs, int yTexOffs) { return this; } -ModelPart* ModelPart::addBox(std::wstring id, float x0, float y0, float z0, +ModelPart* ModelPart::addBox(std::string id, float x0, float y0, float z0, int w, int h, int d) { - id = this->id + L"." + id; + id = this->id + "." + id; TexOffs* offs = model->getMapTex(id); texOffs(offs->x, offs->y); cubes.push_back((new Cube(this, xTexOffs, yTexOffs, x0, y0, z0, w, h, d, 0)) diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h index 92514d8b4..fb1eace16 100644 --- a/targets/minecraft/client/model/geom/ModelPart.h +++ b/targets/minecraft/client/model/geom/ModelPart.h @@ -25,7 +25,7 @@ public: float translateX, translateY, translateZ; private: - std::wstring id; + std::string id; int xTexOffs, yTexOffs; bool compiled; int list; @@ -34,14 +34,14 @@ private: public: void _init(); // 4J added ModelPart(); - ModelPart(Model* model, const std::wstring& id); + ModelPart(Model* model, const std::string& id); ModelPart(Model* model); ModelPart(Model* model, int xTexOffs, int yTexOffs); // MGH - had to add these for PS3, as calling constructors from others was // only introduced in c++11 - // https://en.wikipedia.org/wiki/C++11#Object_construction_improvement - void construct(Model* model, const std::wstring& id); + void construct(Model* model, const std::string& id); void construct(Model* model); void construct(Model* model, int xTexOffs, int yTexOffs); @@ -49,7 +49,7 @@ public: ModelPart* retrieveChild(SKIN_BOX* pBox); ModelPart* mirror(); ModelPart* texOffs(int xTexOffs, int yTexOffs); - ModelPart* addBox(std::wstring id, float x0, float y0, float z0, int w, + ModelPart* addBox(std::string id, float x0, float y0, float z0, int w, int h, int d); ModelPart* addBox(float x0, float y0, float z0, int w, int h, int d); ModelPart* addBoxWithMask(float x0, float y0, float z0, int w, int h, int d, diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 8aa82c20b..fbc53d387 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -209,7 +209,7 @@ class Packet; class TexturePack; class UIScene; -ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip, +ClientConnection::ClientConnection(Minecraft* minecraft, const std::string& ip, int port) { // 4J Stu - No longer used as we use the socket version below. assert(false); @@ -239,7 +239,7 @@ ClientConnection::ClientConnection(Minecraft* minecraft, Socket* socket, createdOk = socket->createdOk; if (createdOk) { - connection = new Connection(socket, L"Client", this); + connection = new Connection(socket, "Client", this); } else { connection = nullptr; // TODO 4J Stu - This will cause issues since the session player owns @@ -314,7 +314,7 @@ void ClientConnection::handleLogin(std::shared_ptr packet) { if (pMojangData) { // a skin? if (pMojangData->wchSkin[0] != 0L) { - std::wstring wstr = pMojangData->wchSkin; + std::string wstr = pMojangData->wchSkin; // check the file is not already in bRes = gameServices().isFileInMemoryTextures(wstr); if (!bRes) { @@ -327,7 +327,7 @@ void ClientConnection::handleLogin(std::shared_ptr packet) { // a cloak? if (pMojangData->wchCape[0] != 0L) { - std::wstring wstr = pMojangData->wchCape; + std::string wstr = pMojangData->wchCape; // check the file is not already in bRes = gameServices().isFileInMemoryTextures(wstr); if (!bRes) { @@ -919,13 +919,13 @@ void ClientConnection::handleAddPlayer( packet->m_uiGamePrivileges); if (!player->customTextureUrl.empty() && - player->customTextureUrl.substr(0, 3).compare(L"def") != 0 && + player->customTextureUrl.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(player->customTextureUrl)) { if (minecraft->addPendingClientTextureRequest( player->customTextureUrl)) { Log::info( "Client sending TextureAndGeometryPacket to get custom skin " - "%ls for player %ls\n", + "%s for player %s\n", player->customTextureUrl.c_str(), player->name.c_str()); send(std::shared_ptr( @@ -938,17 +938,17 @@ void ClientConnection::handleAddPlayer( gameServices().addMemoryTextureFile(player->customTextureUrl, nullptr, 0); } - Log::info("Custom skin for player %ls is %ls\n", player->name.c_str(), + Log::info("Custom skin for player %s is %s\n", player->name.c_str(), player->customTextureUrl.c_str()); if (!player->customTextureUrl2.empty() && - player->customTextureUrl2.substr(0, 3).compare(L"def") != 0 && + player->customTextureUrl2.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(player->customTextureUrl2)) { if (minecraft->addPendingClientTextureRequest( player->customTextureUrl2)) { Log::info( - "Client sending texture packet to get custom cape %ls for " - "player %ls\n", + "Client sending texture packet to get custom cape %s for " + "player %s\n", player->customTextureUrl2.c_str(), player->name.c_str()); send(std::shared_ptr( new TexturePacket(player->customTextureUrl2, nullptr, 0))); @@ -959,7 +959,7 @@ void ClientConnection::handleAddPlayer( gameServices().addMemoryTextureFile(player->customTextureUrl2, nullptr, 0); } - Log::info("Custom cape for player %ls is %ls\n", player->name.c_str(), + Log::info("Custom cape for player %s is %s\n", player->name.c_str(), player->customTextureUrl2.c_str()); level->putEntity(packet->id, player); @@ -1343,8 +1343,8 @@ void ClientConnection::handleDisconnect( gameServices().setAction(m_userIndex, eAppAction_ExitWorld, (void*)true); // minecraft->setLevel(nullptr); - // minecraft->setScreen(new DisconnectedScreen(L"disconnect.disconnected", - // L"disconnect.genericReason", &packet->reason)); + // minecraft->setScreen(new DisconnectedScreen("disconnect.disconnected", + // "disconnect.genericReason", &packet->reason)); } void ClientConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, @@ -1375,7 +1375,7 @@ void ClientConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, } // minecraft->setLevel(nullptr); - // minecraft->setScreen(new DisconnectedScreen(L"disconnect.lost", reason, + // minecraft->setScreen(new DisconnectedScreen("disconnect.lost", reason, // reasonObjects)); } @@ -1477,7 +1477,7 @@ void ClientConnection::handleTakeItemEntity( } void ClientConnection::handleChat(std::shared_ptr packet) { - std::wstring message; + std::string message; int iPos; bool displayOnGui = true; @@ -1485,8 +1485,8 @@ void ClientConnection::handleChat(std::shared_ptr packet) { bool replaceEntitySource = false; bool replaceItem = false; - std::wstring playerDisplayName = L""; - std::wstring sourceDisplayName = L""; + std::string playerDisplayName = ""; + std::string sourceDisplayName = ""; // On platforms other than Xbox One this just sets display name to gamertag if (packet->m_stringArgs.size() >= 1) @@ -1509,7 +1509,7 @@ void ClientConnection::handleChat(std::shared_ptr packet) { break; case ChatPacket::e_ChatBedPlayerSleep: message = gameServices().getString(IDS_TILE_BED_PLAYERSLEEP); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; case ChatPacket::e_ChatBedMeSleep: @@ -1517,17 +1517,17 @@ void ClientConnection::handleChat(std::shared_ptr packet) { break; case ChatPacket::e_ChatPlayerJoinedGame: message = gameServices().getString(IDS_PLAYER_JOINED); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; case ChatPacket::e_ChatPlayerLeftGame: message = gameServices().getString(IDS_PLAYER_LEFT); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; case ChatPacket::e_ChatPlayerKickedFromGame: message = gameServices().getString(IDS_PLAYER_KICKED); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; case ChatPacket::e_ChatCannotPlaceLava: @@ -1746,12 +1746,12 @@ void ClientConnection::handleChat(std::shared_ptr packet) { case ChatPacket::e_ChatPlayerEnteredEnd: message = gameServices().getString(IDS_PLAYER_ENTERED_END); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; case ChatPacket::e_ChatPlayerLeftEnd: message = gameServices().getString(IDS_PLAYER_LEFT_END); - iPos = message.find(L"%s"); + iPos = message.find("%s"); message.replace(iPos, 2, playerDisplayName); break; @@ -1820,10 +1820,10 @@ void ClientConnection::handleChat(std::shared_ptr packet) { replacePlayer = true; if (packet->m_intArgs[0] == eTYPE_SERVERPLAYER) { message = - replaceAll(message, L"{*DESTINATION*}", sourceDisplayName); + replaceAll(message, "{*DESTINATION*}", sourceDisplayName); } else { message = replaceAll( - message, L"{*DESTINATION*}", + message, "{*DESTINATION*}", gameServices().getEntityName((EntityTypeId)packet->m_intArgs[0])); } break; @@ -1842,14 +1842,14 @@ void ClientConnection::handleChat(std::shared_ptr packet) { } if (replacePlayer) { - message = replaceAll(message, L"{*PLAYER*}", playerDisplayName); + message = replaceAll(message, "{*PLAYER*}", playerDisplayName); } if (replaceEntitySource) { if (packet->m_intArgs[0] == eTYPE_SERVERPLAYER) { - message = replaceAll(message, L"{*SOURCE*}", sourceDisplayName); + message = replaceAll(message, "{*SOURCE*}", sourceDisplayName); } else { - std::wstring entityName; + std::string entityName; // Check for a custom mob name if (packet->m_stringArgs.size() >= 2 && @@ -1860,12 +1860,12 @@ void ClientConnection::handleChat(std::shared_ptr packet) { gameServices().getEntityName((EntityTypeId)packet->m_intArgs[0]); } - message = replaceAll(message, L"{*SOURCE*}", entityName); + message = replaceAll(message, "{*SOURCE*}", entityName); } } if (replaceItem) { - message = replaceAll(message, L"{*ITEM*}", packet->m_stringArgs[2]); + message = replaceAll(message, "{*ITEM*}", packet->m_stringArgs[2]); } // flag that a message is a death message @@ -2058,7 +2058,7 @@ void ClientConnection::handlePreLogin(std::shared_ptr packet) { PlatformProfile.AllowedPlayerCreatedContent( m_userIndex, true, &allAllowed, &friendsAllowed); fprintf(stderr, - "[LOGIN] Sending LoginPacket: user=%ls netVer=%d userIdx=%d " + "[LOGIN] Sending LoginPacket: user=%s netVer=%d userIdx=%d " "isHost=%d\n", minecraft->user->name.c_str(), SharedConstants::NETWORK_PROTOCOL_VERSION, m_userIndex, @@ -2263,7 +2263,7 @@ void ClientConnection::handleTexture(std::shared_ptr packet) { if (packet->dataBytes == 0) { // Request for texture #if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received request for custom texture %ls\n", + printf("Client received request for custom texture %s\n", packet->textureName.c_str()); #endif std::uint8_t* pbData = nullptr; @@ -2277,7 +2277,7 @@ void ClientConnection::handleTexture(std::shared_ptr packet) { } else { // Response with texture data #if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received custom texture %ls\n", + printf("Client received custom texture %s\n", packet->textureName.c_str()); #endif gameServices().addMemoryTextureFile(packet->textureName, packet->pbData, @@ -2297,8 +2297,8 @@ void ClientConnection::handleTextureAndGeometry( if (packet->dwTextureBytes == 0) { // Request for texture #if !defined(_CONTENT_PACKAGE) - wprintf( - L"Client received request for custom texture and geometry %ls\n", + printf( + "Client received request for custom texture and geometry %s\n", packet->textureName.c_str()); #endif std::uint8_t* pbData = nullptr; @@ -2333,7 +2333,7 @@ void ClientConnection::handleTextureAndGeometry( } else { // Response with texture data #if !defined(_CONTENT_PACKAGE) - wprintf(L"Client received custom TextureAndGeometry %ls\n", + printf("Client received custom TextureAndGeometry %s\n", packet->textureName.c_str()); #endif // Add the texture data @@ -2375,7 +2375,7 @@ void ClientConnection::handleTextureChange( case TextureChangePacket::e_TextureChange_Skin: player->setCustomSkin(gameServices().getSkinIdFromPath(packet->path)); #if !defined(_CONTENT_PACKAGE) - wprintf(L"Skin for remote player %ls has changed to %ls (%d)\n", + printf("Skin for remote player %s has changed to %s (%d)\n", player->name.c_str(), player->customTextureUrl.c_str(), player->getPlayerDefaultSkin()); #endif @@ -2384,20 +2384,20 @@ void ClientConnection::handleTextureChange( player->setCustomCape(Player::getCapeIdFromPath(packet->path)); // player->customTextureUrl2 = packet->path; #if !defined(_CONTENT_PACKAGE) - wprintf(L"Cape for remote player %ls has changed to %ls\n", + printf("Cape for remote player %s has changed to %s\n", player->name.c_str(), player->customTextureUrl2.c_str()); #endif break; } if (!packet->path.empty() && - packet->path.substr(0, 3).compare(L"def") != 0 && + packet->path.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(packet->path)) { if (minecraft->addPendingClientTextureRequest(packet->path)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"handleTextureChange - Client sending texture packet to get " - L"custom skin %ls for player %ls\n", + printf( + "handleTextureChange - Client sending texture packet to get " + "custom skin %s for player %s\n", packet->path.c_str(), player->name.c_str()); #endif send(std::shared_ptr( @@ -2431,20 +2431,20 @@ void ClientConnection::handleTextureAndGeometryChange( player->setCustomSkin(gameServices().getSkinIdFromPath(packet->path)); #if !defined(_CONTENT_PACKAGE) - wprintf(L"Skin for remote player %ls has changed to %ls (%d)\n", + printf("Skin for remote player %s has changed to %s (%d)\n", player->name.c_str(), player->customTextureUrl.c_str(), player->getPlayerDefaultSkin()); #endif if (!packet->path.empty() && - packet->path.substr(0, 3).compare(L"def") != 0 && + packet->path.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(packet->path)) { if (minecraft->addPendingClientTextureRequest(packet->path)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"handleTextureAndGeometryChange - Client sending " - L"TextureAndGeometryPacket to get custom skin %ls for player " - L"%ls\n", + printf( + "handleTextureAndGeometryChange - Client sending " + "TextureAndGeometryPacket to get custom skin %s for player " + "%s\n", packet->path.c_str(), player->name.c_str()); #endif send(std::shared_ptr( @@ -2710,7 +2710,7 @@ void ClientConnection::handleContainerOpen( if (player->startEnchanting( std::floor(player->x), std::floor(player->y), std::floor(player->z), - packet->customName ? packet->title : L"")) { + packet->customName ? packet->title : "")) { player->containerMenu->containerId = packet->containerId; } else { failed = true; @@ -2722,7 +2722,7 @@ void ClientConnection::handleContainerOpen( new ClientSideMerchant(player, packet->title)); csm->createContainer(); if (player->openTrading(csm, - packet->customName ? packet->title : L"")) { + packet->customName ? packet->title : "")) { player->containerMenu->containerId = packet->containerId; } else { failed = true; @@ -3162,7 +3162,7 @@ void ClientConnection::displayPrivilegeChanges( if (Player::getPlayerGamePrivilege(newPrivileges, priv) != Player::getPlayerGamePrivilege(oldPrivileges, priv)) { privOn = Player::getPlayerGamePrivilege(newPrivileges, priv); - std::wstring message = L""; + std::string message = ""; if (gameServices().getGameHostOption(eGameHostOption_TrustPlayers) == 0) { switch (priv) { case Player::ePlayerGamePrivilege_CannotMine: @@ -3402,9 +3402,9 @@ void ClientConnection::handleUpdateProgress( void ClientConnection::handleUpdateGameRuleProgressPacket( std::shared_ptr packet) { - const wchar_t* string = gameServices().getGameRulesString(packet->m_messageId); + const char* string = gameServices().getGameRulesString(packet->m_messageId); if (string != nullptr) { - std::wstring message(string); + std::string message(string); message = GameRuleDefinition::generateDescriptionString( packet->m_definitionType, message, packet->m_data.data(), packet->m_data.size()); @@ -3437,7 +3437,7 @@ int ClientConnection::HostDisconnectReturned( DLCPack* pDLCPack = pDLCTexPack->getDLCInfoParentPack(); // tPack->getDLCPack(); - if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { + if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, "")) { // no upsell, we're about to quit MinecraftServer::getInstance()->setSaveOnExit(false); // flag a app action of exit game @@ -3487,7 +3487,7 @@ int ClientConnection::ExitGameAndSaveReturned( } // -std::wstring ClientConnection::GetDisplayNameByGamertag(std::wstring gamertag) { +std::string ClientConnection::GetDisplayNameByGamertag(std::string gamertag) { return gamertag; } diff --git a/targets/minecraft/client/multiplayer/ClientConnection.h b/targets/minecraft/client/multiplayer/ClientConnection.h index d182f6ac1..5764e310f 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.h +++ b/targets/minecraft/client/multiplayer/ClientConnection.h @@ -38,7 +38,7 @@ private: Connection* connection; public: - std::wstring message; + std::string message; bool createdOk; // 4J added private: Minecraft* minecraft; @@ -63,7 +63,7 @@ private: int m_userIndex; // 4J Added public: SavedDataStorage* savedDataStorage; - ClientConnection(Minecraft* minecraft, const std::wstring& ip, int port); + ClientConnection(Minecraft* minecraft, const std::string& ip, int port); ClientConnection(Minecraft* minecraft, Socket* socket, int iUserIndex = -1); ~ClientConnection(); void tick(); @@ -127,7 +127,7 @@ public: private: std::shared_ptr getEntity(int entityId); - std::wstring GetDisplayNameByGamertag(std::wstring gamertag); + std::string GetDisplayNameByGamertag(std::string gamertag); public: virtual void handleSetHealth(std::shared_ptr packet); diff --git a/targets/minecraft/client/multiplayer/ConnectScreen.cpp b/targets/minecraft/client/multiplayer/ConnectScreen.cpp index 050e3f6aa..c2894dc2a 100644 --- a/targets/minecraft/client/multiplayer/ConnectScreen.cpp +++ b/targets/minecraft/client/multiplayer/ConnectScreen.cpp @@ -12,7 +12,7 @@ #include "minecraft/locale/Language.h" #include "minecraft/network/packet/PreLoginPacket.h" -ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::wstring& ip, +ConnectScreen::ConnectScreen(Minecraft* minecraft, const std::string& ip, int port) { aborted = false; // System.out.println("Connecting to " + ip + ", " + port); @@ -38,7 +38,7 @@ void ConnectScreen::init() { buttons.clear(); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 5 + 12, - language->getElement(L"gui.cancel"))); + language->getElement("gui.cancel"))); } void ConnectScreen::buttonClicked(Button* button) { @@ -55,11 +55,11 @@ void ConnectScreen::render(int xm, int ym, float a) { Language* language = Language::getInstance(); if (connection == nullptr) { - drawCenteredString(font, language->getElement(L"connect.connecting"), + drawCenteredString(font, language->getElement("connect.connecting"), width / 2, height / 2 - 50, 0xffffff); - drawCenteredString(font, L"", width / 2, height / 2 - 10, 0xffffff); + drawCenteredString(font, "", width / 2, height / 2 - 10, 0xffffff); } else { - drawCenteredString(font, language->getElement(L"connect.authorizing"), + drawCenteredString(font, language->getElement("connect.authorizing"), width / 2, height / 2 - 50, 0xffffff); drawCenteredString(font, connection->message, width / 2, height / 2 - 10, 0xffffff); diff --git a/targets/minecraft/client/multiplayer/ConnectScreen.h b/targets/minecraft/client/multiplayer/ConnectScreen.h index c66f40d4f..9544d9895 100644 --- a/targets/minecraft/client/multiplayer/ConnectScreen.h +++ b/targets/minecraft/client/multiplayer/ConnectScreen.h @@ -12,7 +12,7 @@ private: bool aborted; public: - ConnectScreen(Minecraft* minecraft, const std::wstring& ip, int port); + ConnectScreen(Minecraft* minecraft, const std::string& ip, int port); virtual void tick() override; protected: diff --git a/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp b/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp index b9cd27d2a..cb4cb090c 100644 --- a/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp +++ b/targets/minecraft/client/multiplayer/DisconnectedScreen.cpp @@ -8,8 +8,8 @@ #include "minecraft/client/title/TitleScreen.h" #include "minecraft/locale/Language.h" -DisconnectedScreen::DisconnectedScreen(const std::wstring& title, - const std::wstring reason, +DisconnectedScreen::DisconnectedScreen(const std::string& title, + const std::string reason, void* reasonObjects, ...) { Language* language = Language::getInstance(); @@ -30,7 +30,7 @@ void DisconnectedScreen::init() { buttons.clear(); buttons.push_back(new Button(0, width / 2 - 100, height / 4 + 24 * 5 + 12, - language->getElement(L"gui.toMenu"))); + language->getElement("gui.toMenu"))); } void DisconnectedScreen::buttonClicked(Button* button) { diff --git a/targets/minecraft/client/multiplayer/DisconnectedScreen.h b/targets/minecraft/client/multiplayer/DisconnectedScreen.h index 9edd7f241..7b0b91ee2 100644 --- a/targets/minecraft/client/multiplayer/DisconnectedScreen.h +++ b/targets/minecraft/client/multiplayer/DisconnectedScreen.h @@ -5,10 +5,10 @@ class DisconnectedScreen : public Screen { private: - std::wstring title, reason; + std::string title, reason; public: - DisconnectedScreen(const std::wstring& title, const std::wstring reason, + DisconnectedScreen(const std::string& title, const std::string reason, void* reasonObjects, ...); virtual void tick() override; diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 7e1802a17..980cb0192 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -282,20 +282,20 @@ std::vector* MultiPlayerChunkCache::getMobsAt( } TilePos* MultiPlayerChunkCache::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return nullptr; } void MultiPlayerChunkCache::recreateLogicStructuresForChunk(int chunkX, int chunkZ) {} -std::wstring MultiPlayerChunkCache::gatherStats() { +std::string MultiPlayerChunkCache::gatherStats() { int size; { std::lock_guard lock(m_csLoadCreate); size = (int)loadedChunkList.size(); } - return L"MultiplayerChunkCache: " + toWString(size); + return "MultiplayerChunkCache: " + toWString(size); } void MultiPlayerChunkCache::dataReceived(int x, int z) { diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h index fc45641ae..82a068da7 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.h @@ -46,11 +46,11 @@ public: virtual bool tick(); virtual bool shouldSave(); virtual void postProcess(ChunkSource* parent, int x, int z); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); virtual void dataReceived(int x, int z); // 4J added diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index a0073fcbc..12ae6a211 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -56,7 +56,7 @@ MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, MultiPlayerLevel::MultiPlayerLevel(ClientConnection* connection, LevelSettings* levelSettings, int dimension, int difficulty) - : Level(std::make_shared(), L"MpServer", + : Level(std::make_shared(), "MpServer", Dimension::getNew(dimension), levelSettings, false) { minecraft = Minecraft::GetInstance(); @@ -808,11 +808,11 @@ void MultiPlayerLevel::setDayTime(int64_t newTime) { /*if (newTime < 0) { newTime = -newTime; - getGameRules()->set(GameRules::RULE_DAYLIGHT, L"false"); + getGameRules()->set(GameRules::RULE_DAYLIGHT, "false"); } else { - getGameRules()->set(GameRules::RULE_DAYLIGHT, L"true"); + getGameRules()->set(GameRules::RULE_DAYLIGHT, "true"); }*/ Level::setDayTime(newTime); diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 00df22c57..3fb436eec 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -211,7 +211,7 @@ std::shared_ptr MultiplayerLocalPlayer::drop() { void MultiplayerLocalPlayer::reallyDrop( std::shared_ptr itemEntity) {} -void MultiplayerLocalPlayer::chat(const std::wstring& message) { +void MultiplayerLocalPlayer::chat(const std::string& message) { connection->send(std::make_shared(message)); } @@ -373,7 +373,7 @@ void MultiplayerLocalPlayer::setAndBroadcastCustomSkin(std::uint32_t skinId) { std::uint32_t oldSkinIndex = getCustomSkin(); LocalPlayer::setCustomSkin(skinId); #if !defined(_CONTENT_PACKAGE) - wprintf(L"Skin for local player %ls has changed to %ls (%d)\n", + printf("Skin for local player %s has changed to %s (%d)\n", name.c_str(), customTextureUrl.c_str(), getPlayerDefaultSkin()); #endif if (getCustomSkin() != oldSkinIndex) @@ -386,7 +386,7 @@ void MultiplayerLocalPlayer::setAndBroadcastCustomCape(std::uint32_t capeId) { std::uint32_t oldCapeIndex = getCustomCape(); LocalPlayer::setCustomCape(capeId); #if !defined(_CONTENT_PACKAGE) - wprintf(L"Cape for local player %ls has changed to %ls\n", name.c_str(), + printf("Cape for local player %s has changed to %s\n", name.c_str(), customTextureUrl2.c_str()); #endif if (getCustomCape() != oldCapeIndex) diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h index 7bc1c1a15..955cccb95 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h @@ -59,7 +59,7 @@ protected: virtual void reallyDrop(std::shared_ptr itemEntity); public: - virtual void chat(const std::wstring& message); + virtual void chat(const std::string& message); virtual void swing(); virtual void respawn(); diff --git a/targets/minecraft/client/multiplayer/PlayerInfo.h b/targets/minecraft/client/multiplayer/PlayerInfo.h index f31d59572..5243e58f7 100644 --- a/targets/minecraft/client/multiplayer/PlayerInfo.h +++ b/targets/minecraft/client/multiplayer/PlayerInfo.h @@ -2,10 +2,10 @@ class PlayerInfo { public: - std::wstring name; + std::string name; int latency; - PlayerInfo(const std::wstring& name) { + PlayerInfo(const std::string& name) { this->name = name; latency = 0; } diff --git a/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp b/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp index 57927c748..cfa4b6758 100644 --- a/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp +++ b/targets/minecraft/client/multiplayer/ReceivingLevelScreen.cpp @@ -36,7 +36,7 @@ void ReceivingLevelScreen::render(int xm, int ym, float a) { Language* language = Language::getInstance(); drawCenteredString(font, - language->getElement(L"multiplayer.downloadingTerrain"), + language->getElement("multiplayer.downloadingTerrain"), width / 2, height / 2 - 50, 0xffffff); Screen::render(xm, ym, a); diff --git a/targets/minecraft/client/particle/Particle.cpp b/targets/minecraft/client/particle/Particle.cpp index 41b27c006..2713ce19f 100644 --- a/targets/minecraft/client/particle/Particle.cpp +++ b/targets/minecraft/client/particle/Particle.cpp @@ -210,8 +210,8 @@ void Particle::setNextMiscAnimTex() { texX++; } bool Particle::isAttackable() { return false; } //@Override -std::wstring Particle::toString() { - return L"A particle"; // getClass()->getSimpleName() + ", Pos (" + x + "," +std::string Particle::toString() { + return "A particle"; // getClass()->getSimpleName() + ", Pos (" + x + "," // + y + "," + z + "), RGBA (" + rCol + "," + gCol + // "," + bCol + "," + alpha + "), Age " + age; } \ No newline at end of file diff --git a/targets/minecraft/client/particle/Particle.h b/targets/minecraft/client/particle/Particle.h index 5853c517a..d47eed8a6 100644 --- a/targets/minecraft/client/particle/Particle.h +++ b/targets/minecraft/client/particle/Particle.h @@ -61,5 +61,5 @@ public: virtual void setMiscTex(int slotIndex); virtual void setNextMiscAnimTex(); virtual bool isAttackable(); - virtual std::wstring toString(); + virtual std::string toString(); }; \ No newline at end of file diff --git a/targets/minecraft/client/particle/ParticleEngine.cpp b/targets/minecraft/client/particle/ParticleEngine.cpp index 31efb4f2f..7267e750f 100644 --- a/targets/minecraft/client/particle/ParticleEngine.cpp +++ b/targets/minecraft/client/particle/ParticleEngine.cpp @@ -279,7 +279,7 @@ void ParticleEngine::moveParticleInList(std::shared_ptr particle, } } -std::wstring ParticleEngine::countParticles() { +std::string ParticleEngine::countParticles() { int l = level->dimension->id == 0 ? 0 : (level->dimension->id == -1 ? 1 : 2); int total = 0; diff --git a/targets/minecraft/client/particle/ParticleEngine.h b/targets/minecraft/client/particle/ParticleEngine.h index 86f06d6db..d6ec03a9c 100644 --- a/targets/minecraft/client/particle/ParticleEngine.h +++ b/targets/minecraft/client/particle/ParticleEngine.h @@ -59,5 +59,5 @@ public: void moveParticleInList(std::shared_ptr particle, int source, int destination); - std::wstring countParticles(); + std::string countParticles(); }; \ No newline at end of file diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index baecf09b7..ab5d556bf 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -110,11 +110,11 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, if (user != nullptr && user->name.length() > 0) { customTextureUrl = - L"http://s3.amazonaws.com/MinecraftSkins/" + user->name + L".png"; + "http://s3.amazonaws.com/MinecraftSkins/" + user->name + ".png"; } if (user != nullptr) { this->name = user->name; - // wprintf(L"Created LocalPlayer with name %ls\n", name.c_str() ); + // printf("Created LocalPlayer with name %s\n", name.c_str() ); // check to see if this player's xuid is in the list of special players MOJANG_DATA* pMojangData = gameServices().getMojangDataForXuid(getOnlineXuid()); if (pMojangData) { @@ -561,12 +561,12 @@ float LocalPlayer::getFieldOfViewModifier() { void LocalPlayer::addAdditonalSaveData(CompoundTag* entityTag) { Player::addAdditonalSaveData(entityTag); - // entityTag->putInt(L"Score", score); + // entityTag->putInt("Score", score); } void LocalPlayer::readAdditionalSaveData(CompoundTag* entityTag) { Player::readAdditionalSaveData(entityTag); - // score = entityTag->getInt(L"Score"); + // score = entityTag->getInt("Score"); } void LocalPlayer::closeContainer() { @@ -674,7 +674,7 @@ bool LocalPlayer::openFireworks(int x, int y, int z) { } bool LocalPlayer::startEnchanting(int x, int y, int z, - const std::wstring& name) { + const std::string& name) { #ifdef ENABLE_JAVA_GUIS minecraft->setScreen(new EnchantmentScreen(inventory, level, x, y, z)); bool success = true; @@ -745,7 +745,7 @@ bool LocalPlayer::openTrap(std::shared_ptr trap) { } bool LocalPlayer::openTrading(std::shared_ptr traderTarget, - const std::wstring& name) { + const std::string& name) { #ifdef ENABLE_JAVA_GUIS minecraft->setScreen(new MerchantScreen(inventory, traderTarget, level)); bool success = true; @@ -776,7 +776,7 @@ void LocalPlayer::take(std::shared_ptr e, int orgCount) { (Level*)minecraft->level, e, shared_from_this(), -0.5f)); } -void LocalPlayer::chat(const std::wstring& message) {} +void LocalPlayer::chat(const std::string& message) {} bool LocalPlayer::isSneaking() { return input->sneaking && !m_isSleeping; } diff --git a/targets/minecraft/client/player/LocalPlayer.h b/targets/minecraft/client/player/LocalPlayer.h index d449f6c66..5b73c8679 100644 --- a/targets/minecraft/client/player/LocalPlayer.h +++ b/targets/minecraft/client/player/LocalPlayer.h @@ -130,7 +130,7 @@ public: virtual bool startCrafting(int x, int y, int z); // 4J added bool return virtual bool openFireworks(int x, int y, int z); // 4J added virtual bool startEnchanting( - int x, int y, int z, const std::wstring& name); // 4J added bool return + int x, int y, int z, const std::string& name); // 4J added bool return virtual bool startRepairing(int x, int y, int z); virtual bool openFurnace( std::shared_ptr furnace); // 4J added bool return @@ -141,11 +141,11 @@ public: virtual bool openTrap( std::shared_ptr trap); // 4J added bool return virtual bool openTrading(std::shared_ptr traderTarget, - const std::wstring& name); + const std::string& name); virtual void crit(std::shared_ptr e); virtual void magicCrit(std::shared_ptr e); virtual void take(std::shared_ptr e, int orgCount); - virtual void chat(const std::wstring& message); + virtual void chat(const std::string& message); virtual bool isSneaking(); // virtual bool isIdle(); virtual void hurtTo(float newHealth, uint8_t damageSource); diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp index 39adc9838..2f447a4ad 100644 --- a/targets/minecraft/client/player/RemotePlayer.cpp +++ b/targets/minecraft/client/player/RemotePlayer.cpp @@ -14,7 +14,7 @@ class Level; -RemotePlayer::RemotePlayer(Level* level, const std::wstring& name) +RemotePlayer::RemotePlayer(Level* level, const std::string& name) : Player(level, name) { // 4J - added initialisers hasStartedUsingItem = false; @@ -22,7 +22,7 @@ RemotePlayer::RemotePlayer(Level* level, const std::wstring& name) lx = ly = lz = lyr = lxr = 0.0; fallTime = 0.0f; - Log::info("Created RemotePlayer with name %ls\n", name.c_str()); + Log::info("Created RemotePlayer with name %s\n", name.c_str()); heightOffset = 0; footSize = 0; diff --git a/targets/minecraft/client/player/RemotePlayer.h b/targets/minecraft/client/player/RemotePlayer.h index 278e24aff..1492e4653 100644 --- a/targets/minecraft/client/player/RemotePlayer.h +++ b/targets/minecraft/client/player/RemotePlayer.h @@ -20,7 +20,7 @@ private: public: Input* input; - RemotePlayer(Level* level, const std::wstring& name); + RemotePlayer(Level* level, const std::string& name); protected: virtual void setDefaultHeadHeight(); diff --git a/targets/minecraft/client/renderer/BossMobGuiInfo.cpp b/targets/minecraft/client/renderer/BossMobGuiInfo.cpp index 3001120c5..23e04edbe 100644 --- a/targets/minecraft/client/renderer/BossMobGuiInfo.cpp +++ b/targets/minecraft/client/renderer/BossMobGuiInfo.cpp @@ -5,7 +5,7 @@ float BossMobGuiInfo::healthProgress = 0.0f; int BossMobGuiInfo::displayTicks = 0; -std::wstring BossMobGuiInfo::name = L""; +std::string BossMobGuiInfo::name = ""; bool BossMobGuiInfo::darkenWorld = false; void BossMobGuiInfo::setBossHealth(std::shared_ptr boss, diff --git a/targets/minecraft/client/renderer/BossMobGuiInfo.h b/targets/minecraft/client/renderer/BossMobGuiInfo.h index 3193b008d..52ec0eb84 100644 --- a/targets/minecraft/client/renderer/BossMobGuiInfo.h +++ b/targets/minecraft/client/renderer/BossMobGuiInfo.h @@ -9,7 +9,7 @@ class BossMobGuiInfo { public: static float healthProgress; static int displayTicks; - static std::wstring name; + static std::string name; static bool darkenWorld; static void setBossHealth(std::shared_ptr boss, bool darkenWorld); diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index b7cdcc947..91a2ee532 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -1337,7 +1337,7 @@ void GameRenderer::renderLevel(float a, int64_t until) { setupFog(0, a); glEnable(GL_FOG); mc->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // 4J was L"/terrain.png" + &TextureAtlas::LOCATION_BLOCKS); // 4J was "/terrain.png" Lighting::turnOff(); levelRenderer->render(cameraEntity, 0, a, updateChunks); @@ -1403,7 +1403,7 @@ void GameRenderer::renderLevel(float a, int64_t until) { glEnable(GL_BLEND); glDisable(GL_CULL_FACE); mc->textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // 4J was L"/terrain.png" + &TextureAtlas::LOCATION_BLOCKS); // 4J was "/terrain.png" // 4J - have changed this fancy rendering option to work with our // command buffers. The original used to use frame buffer flags to // disable writing to colour when doing the z-only pass, but that value @@ -1645,7 +1645,7 @@ void GameRenderer::renderSnowAndRain(float a) { glAlphaFunc(GL_GREATER, 0.01f); mc->textures->bindTexture( - &SNOW_LOCATION); // 4J was L"/environment/snow.png" + &SNOW_LOCATION); // 4J was "/environment/snow.png" double xo = player->xOld + (player->x - player->xOld) * a; double yo = player->yOld + (player->y - player->yOld) * a; diff --git a/targets/minecraft/client/renderer/HttpTexture.cpp b/targets/minecraft/client/renderer/HttpTexture.cpp index 2d76d1b74..053956906 100644 --- a/targets/minecraft/client/renderer/HttpTexture.cpp +++ b/targets/minecraft/client/renderer/HttpTexture.cpp @@ -1,6 +1,6 @@ #include "HttpTexture.h" -HttpTexture::HttpTexture(const std::wstring& _url, +HttpTexture::HttpTexture(const std::string& _url, HttpTextureProcessor* processor) { // 4J - added count = 1; diff --git a/targets/minecraft/client/renderer/HttpTexture.h b/targets/minecraft/client/renderer/HttpTexture.h index aba341884..b65cbc239 100644 --- a/targets/minecraft/client/renderer/HttpTexture.h +++ b/targets/minecraft/client/renderer/HttpTexture.h @@ -11,5 +11,5 @@ public: int id; bool isLoaded; - HttpTexture(const std::wstring& _url, HttpTextureProcessor* processor); + HttpTexture(const std::string& _url, HttpTextureProcessor* processor); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index b0d025a97..3a868f133 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -578,7 +578,7 @@ void ItemInHandRenderer::render(float a) { glScalef(s, s, s); minecraft->textures->bindTexture( - &MAP_BACKGROUND_LOCATION); // 4J was L"/misc/mapbg.png" + &MAP_BACKGROUND_LOCATION); // 4J was "/misc/mapbg.png" Tesselator* t = Tesselator::getInstance(); // glNormal3f(0, 0, -1); // 4J - changed to use tesselator @@ -815,7 +815,7 @@ void ItemInHandRenderer::renderScreenEffect(float a) { if (minecraft->player->isUnderLiquid(Material::water)) { minecraft->textures->bindTexture( - &UNDERWATER_LOCATION); // 4J was L"/misc/water.png" + &UNDERWATER_LOCATION); // 4J was "/misc/water.png" renderWater(a); } glEnable(GL_ALPHA_TEST); diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index d6923b404..de14d43a0 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -679,18 +679,18 @@ void LevelRenderer::renderEntities(Vec3* cam, Culler* culler, float a) { mc->gameRenderer->turnOffLightLayer(a); // 4J - brought forward from 1.8.2 } -std::wstring LevelRenderer::gatherStats1() { - return L"C: " + toWString(renderedChunks) + L"/" + - toWString(totalChunks) + L". F: " + - toWString(offscreenChunks) + L", O: " + - toWString(occludedChunks) + L", E: " + +std::string LevelRenderer::gatherStats1() { + return "C: " + toWString(renderedChunks) + "/" + + toWString(totalChunks) + ". F: " + + toWString(offscreenChunks) + ", O: " + + toWString(occludedChunks) + ", E: " + toWString(emptyChunks); } -std::wstring LevelRenderer::gatherStats2() { - return L"E: " + toWString(renderedEntities) + L"/" + - toWString(totalEntities) + L". B: " + - toWString(culledEntities) + L", I: " + +std::string LevelRenderer::gatherStats2() { + return "E: " + toWString(renderedEntities) + "/" + + toWString(totalEntities) + ". B: " + + toWString(culledEntities) + ", I: " + toWString((totalEntities - culledEntities) - renderedEntities); } @@ -916,7 +916,7 @@ void LevelRenderer::renderSky(float alpha) { glDepthMask(false); textures->bindTexture( - &END_SKY_LOCATION); // 4J was L"/1_2_2/misc/tunnel.png" + &END_SKY_LOCATION); // 4J was "/1_2_2/misc/tunnel.png" Tesselator* t = Tesselator::getInstance(); t->setMipmapEnable(false); for (int i = 0; i < 6; i++) { @@ -1053,7 +1053,7 @@ void LevelRenderer::renderSky(float alpha) { ss = 20; textures->bindTexture( - &MOON_PHASES_LOCATION); // 4J was L"/1_2_2/terrain/moon_phases.png" + &MOON_PHASES_LOCATION); // 4J was "/1_2_2/terrain/moon_phases.png" int phase = level[playerIndex]->getMoonPhase(); int u = phase % 4; int v = phase / 4 % 2; @@ -1144,7 +1144,7 @@ void LevelRenderer::renderHaloRing(float alpha) { glDepthMask(false); textures->bindTexture( - L"misc/haloRing.png"); // 4J was L"/1_2_2/misc/tunnel.png" + "misc/haloRing.png"); // 4J was "/1_2_2/misc/tunnel.png" Tesselator* t = Tesselator::getInstance(); bool prev = t->setMipmapEnable(true); @@ -1490,7 +1490,7 @@ void LevelRenderer::renderAdvancedClouds(float alpha) { } textures->bindTexture( - &CLOUDS_LOCATION); // 4J was L"/environment/clouds.png" + &CLOUDS_LOCATION); // 4J was "/environment/clouds.png" glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -2786,10 +2786,10 @@ void LevelRenderer::cull(Culler* culler, float a) { "Unknown occlusion mode, this should NEVER happen, check meson.build for misconfiguration" #endif } -void LevelRenderer::playStreamingMusic(const std::wstring& name, int x, int y, +void LevelRenderer::playStreamingMusic(const std::string& name, int x, int y, int z) { - if (name != L"") { - mc->gui->setNowPlaying(L"C418 - " + name); + if (name != "") { + mc->gui->setNowPlaying("C418 - " + name); } mc->soundEngine->playStreaming(name, (float)x, (float)y, (float)z, 1, 1); } @@ -2834,7 +2834,7 @@ void LevelRenderer::playSoundExceptPlayer(std::shared_ptr player, // 4J-PB - original function. I've changed to an enum instead of string compares // 4J removed - /* -void LevelRenderer::addParticle(const wstring& name, double x, double y, double +void LevelRenderer::addParticle(const string& name, double x, double y, double z, double xa, double ya, double za) { if (mc == nullptr || mc->cameraTargetPlayer == nullptr || mc->particleEngine == @@ -2849,36 +2849,36 @@ if (xd * xd + yd * yd + zd * zd > particleDistance * particleDistance) return; int playerIndex = mc->player->GetXboxPad(); // 4J added -if (name== L"bubble") mc->particleEngine->add(shared_ptr( new +if (name== "bubble") mc->particleEngine->add(shared_ptr( new BubbleParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"smoke") mc->particleEngine->add(shared_ptr( new +"smoke") mc->particleEngine->add(shared_ptr( new SmokeParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"note") mc->particleEngine->add(shared_ptr( new +"note") mc->particleEngine->add(shared_ptr( new NoteParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"portal") mc->particleEngine->add(shared_ptr( new +"portal") mc->particleEngine->add(shared_ptr( new PortalParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"explode") mc->particleEngine->add(shared_ptr( new +"explode") mc->particleEngine->add(shared_ptr( new ExplodeParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"flame") mc->particleEngine->add(shared_ptr( new +"flame") mc->particleEngine->add(shared_ptr( new FlameParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"lava") mc->particleEngine->add(shared_ptr( new -LavaParticle(level[playerIndex], x, y, z) ) ); else if (name== L"footstep") +"lava") mc->particleEngine->add(shared_ptr( new +LavaParticle(level[playerIndex], x, y, z) ) ); else if (name== "footstep") mc->particleEngine->add(shared_ptr( new FootstepParticle(textures, level[playerIndex], x, y, z) ) ); else if (name== -L"splash") mc->particleEngine->add(shared_ptr( new +"splash") mc->particleEngine->add(shared_ptr( new SplashParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== -L"largesmoke") mc->particleEngine->add(shared_ptr( new +"largesmoke") mc->particleEngine->add(shared_ptr( new SmokeParticle(level[playerIndex], x, y, z, xa, ya, za, 2.5f) ) ); else if -(name== L"reddust") mc->particleEngine->add(shared_ptr( new +(name== "reddust") mc->particleEngine->add(shared_ptr( new RedDustParticle(level[playerIndex], x, y, z, (float) xa, (float) ya, (float) za) -) ); else if (name== L"snowballpoof") +) ); else if (name== "snowballpoof") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::snowBall) ) ); else if -(name== L"snowshovel") mc->particleEngine->add(shared_ptr( +(name== "snowshovel") mc->particleEngine->add(shared_ptr( new SnowShovelParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if -(name== L"slime") mc->particleEngine->add(shared_ptr( new +(name== "slime") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::slimeBall)) ) ; else if -(name== L"heart") mc->particleEngine->add(shared_ptr( new +(name== "heart") mc->particleEngine->add(shared_ptr( new HeartParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); } */ @@ -3210,11 +3210,11 @@ void LevelRenderer::entityAdded(std::shared_ptr entity) { player->prepareCustomTextures(); // 4J-PB - adding these from global title storage - if (player->customTextureUrl != L"") { + if (player->customTextureUrl != "") { textures->addMemTexture(player->customTextureUrl, new MobSkinMemTextureProcessor()); } - if (player->customTextureUrl2 != L"") { + if (player->customTextureUrl2 != "") { textures->addMemTexture(player->customTextureUrl2, new MobSkinMemTextureProcessor()); } @@ -3225,10 +3225,10 @@ void LevelRenderer::entityRemoved(std::shared_ptr entity) { if (entity->instanceof(eTYPE_PLAYER)) { std::shared_ptr player = std::dynamic_pointer_cast(entity); - if (player->customTextureUrl != L"") { + if (player->customTextureUrl != "") { textures->removeMemTexture(player->customTextureUrl); } - if (player->customTextureUrl2 != L"") { + if (player->customTextureUrl2 != "") { textures->removeMemTexture(player->customTextureUrl2); } } @@ -3310,7 +3310,7 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, break; case LevelEvent::SOUND_CLICK_FAIL: // level[playerIndex]->playSound(x, y, z, - // L"random.click", 1.0f, 1.2f); + // "random.click", 1.0f, 1.2f); level[playerIndex]->playLocalSound(x, y, z, eSoundType_RANDOM_CLICK, 1.0f, 1.2f, false); break; @@ -3517,7 +3517,7 @@ void LevelRenderer::levelEvent(std::shared_ptr source, int type, int x, // started playing already if (!mc->soundEngine->GetIsPlayingStreamingGameMusic()) { level[playerIndex]->playStreamingMusic( - L"", x, y, z); // 4J - used to pass nullptr, but using + "", x, y, z); // 4J - used to pass nullptr, but using // empty string here now instead } } @@ -3625,7 +3625,7 @@ void LevelRenderer::registerTextures(IconRegister* iconRegister) { for (int i = 0; i < 10; i++) { breakingTextures[i] = - iconRegister->registerIcon(L"destroy_" + toWString(i)); + iconRegister->registerIcon("destroy_" + toWString(i)); } } diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index e07bd4732..9adda8ec3 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -95,8 +95,8 @@ public: public: void renderEntities(Vec3* cam, Culler* culler, float a); - std::wstring gatherStats1(); - std::wstring gatherStats2(); + std::string gatherStats1(); + std::string gatherStats2(); private: void resortChunks(int xc, int yc, int zc); @@ -136,7 +136,7 @@ public: Level* level); // 4J - added level param void cull(Culler* culler, float a); - void playStreamingMusic(const std::wstring& name, int x, int y, int z); + void playStreamingMusic(const std::string& name, int x, int y, int z); void playSound(int iSound, double x, double y, double z, float volume, float pitch, float fSoundClipDist = 16.0f); void playSound(std::shared_ptr entity, int iSound, double x, diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp index a4d2b917a..426d9012e 100644 --- a/targets/minecraft/client/renderer/MemTexture.cpp +++ b/targets/minecraft/client/renderer/MemTexture.cpp @@ -7,7 +7,7 @@ class MemTextureProcessor; -MemTexture::MemTexture(const std::wstring& _url, std::uint8_t* pbData, +MemTexture::MemTexture(const std::string& _url, std::uint8_t* pbData, std::uint32_t dataBytes, MemTextureProcessor* processor) { // 4J - added diff --git a/targets/minecraft/client/renderer/MemTexture.h b/targets/minecraft/client/renderer/MemTexture.h index d0177229d..9f2dd6232 100644 --- a/targets/minecraft/client/renderer/MemTexture.h +++ b/targets/minecraft/client/renderer/MemTexture.h @@ -15,7 +15,7 @@ public: int ticksSinceLastUse; static const int UNUSED_TICKS_TO_FREE = 20; - MemTexture(const std::wstring& _name, std::uint8_t* pbData, + MemTexture(const std::string& _name, std::uint8_t* pbData, std::uint32_t dataBytes, MemTextureProcessor* processor); ~MemTexture(); }; diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index 0b5d2ed3f..a76612b4b 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -44,258 +44,258 @@ IPlatformRenderer::eTextureFormat Textures::TEXTURE_FORMAT = IPlatformRenderer::TEXTURE_FORMAT_RxGyBzAw; int Textures::preLoadedIdx[TN_COUNT]; -const wchar_t* Textures::preLoaded[TN_COUNT] = { - L"%blur%misc/pumpkinblur", - L"%clamp%misc/shadow", - L"art/kz", - L"environment/clouds", - L"environment/rain", - L"environment/snow", - L"gui/gui", - L"gui/icons", - L"item/arrows", - L"item/boat", - L"item/cart", - L"item/sign", - L"misc/mapbg", - L"misc/mapicons", - L"misc/water", - L"misc/footprint", - L"mob/saddle", - L"mob/sheep_fur", - L"mob/spider_eyes", - L"particles", - L"mob/chicken", - L"mob/cow", - L"mob/pig", - L"mob/sheep", - L"mob/squid", - L"mob/wolf", - L"mob/wolf_tame", - L"mob/wolf_angry", - L"mob/creeper", - L"mob/ghast", - L"mob/ghast_fire", - L"mob/zombie", - L"mob/pigzombie", - L"mob/skeleton", - L"mob/slime", - L"mob/spider", - L"mob/char", - L"mob/char1", - L"mob/char2", - L"mob/char3", - L"mob/char4", - L"mob/char5", - L"mob/char6", - L"mob/char7", - L"terrain/moon", - L"terrain/sun", - L"armor/power", +const char* Textures::preLoaded[TN_COUNT] = { + "%blur%misc/pumpkinblur", + "%clamp%misc/shadow", + "art/kz", + "environment/clouds", + "environment/rain", + "environment/snow", + "gui/gui", + "gui/icons", + "item/arrows", + "item/boat", + "item/cart", + "item/sign", + "misc/mapbg", + "misc/mapicons", + "misc/water", + "misc/footprint", + "mob/saddle", + "mob/sheep_fur", + "mob/spider_eyes", + "particles", + "mob/chicken", + "mob/cow", + "mob/pig", + "mob/sheep", + "mob/squid", + "mob/wolf", + "mob/wolf_tame", + "mob/wolf_angry", + "mob/creeper", + "mob/ghast", + "mob/ghast_fire", + "mob/zombie", + "mob/pigzombie", + "mob/skeleton", + "mob/slime", + "mob/spider", + "mob/char", + "mob/char1", + "mob/char2", + "mob/char3", + "mob/char4", + "mob/char5", + "mob/char6", + "mob/char7", + "terrain/moon", + "terrain/sun", + "armor/power", // 1.8.2 - L"mob/cavespider", - L"mob/enderman", - L"mob/silverfish", - L"mob/enderman_eyes", - L"misc/explosion", - L"item/xporb", - L"item/chest", - L"item/largechest", + "mob/cavespider", + "mob/enderman", + "mob/silverfish", + "mob/enderman_eyes", + "misc/explosion", + "item/xporb", + "item/chest", + "item/largechest", // 1.3.2 - L"item/enderchest", + "item/enderchest", // 1.0.1 - L"mob/redcow", - L"mob/snowman", - L"mob/enderdragon/ender", - L"mob/fire", - L"mob/lava", - L"mob/villager/villager", - L"mob/villager/farmer", - L"mob/villager/librarian", - L"mob/villager/priest", - L"mob/villager/smith", - L"mob/villager/butcher", - L"mob/enderdragon/crystal", - L"mob/enderdragon/shuffle", - L"mob/enderdragon/beam", - L"mob/enderdragon/ender_eyes", - L"%blur%misc/glint", - L"item/book", - L"misc/tunnel", - L"misc/particlefield", - L"terrain/moon_phases", + "mob/redcow", + "mob/snowman", + "mob/enderdragon/ender", + "mob/fire", + "mob/lava", + "mob/villager/villager", + "mob/villager/farmer", + "mob/villager/librarian", + "mob/villager/priest", + "mob/villager/smith", + "mob/villager/butcher", + "mob/enderdragon/crystal", + "mob/enderdragon/shuffle", + "mob/enderdragon/beam", + "mob/enderdragon/ender_eyes", + "%blur%misc/glint", + "item/book", + "misc/tunnel", + "misc/particlefield", + "terrain/moon_phases", // 1.2.3 - L"mob/ozelot", - L"mob/cat_black", - L"mob/cat_red", - L"mob/cat_siamese", - L"mob/villager_golem", - L"mob/skeleton_wither", + "mob/ozelot", + "mob/cat_black", + "mob/cat_red", + "mob/cat_siamese", + "mob/villager_golem", + "mob/skeleton_wither", // TU 14 - L"mob/wolf_collar", - L"mob/zombie_villager", + "mob/wolf_collar", + "mob/zombie_villager", // 1.6.4 - L"item/lead_knot", + "item/lead_knot", - L"misc/beacon_beam", + "misc/beacon_beam", - L"mob/bat", + "mob/bat", - L"mob/horse/donkey", - L"mob/horse/horse_black", - L"mob/horse/horse_brown", - L"mob/horse/horse_chestnut", - L"mob/horse/horse_creamy", - L"mob/horse/horse_darkbrown", - L"mob/horse/horse_gray", - L"mob/horse/horse_markings_blackdots", - L"mob/horse/horse_markings_white", - L"mob/horse/horse_markings_whitedots", - L"mob/horse/horse_markings_whitefield", - L"mob/horse/horse_skeleton", - L"mob/horse/horse_white", - L"mob/horse/horse_zombie", - L"mob/horse/mule", + "mob/horse/donkey", + "mob/horse/horse_black", + "mob/horse/horse_brown", + "mob/horse/horse_chestnut", + "mob/horse/horse_creamy", + "mob/horse/horse_darkbrown", + "mob/horse/horse_gray", + "mob/horse/horse_markings_blackdots", + "mob/horse/horse_markings_white", + "mob/horse/horse_markings_whitedots", + "mob/horse/horse_markings_whitefield", + "mob/horse/horse_skeleton", + "mob/horse/horse_white", + "mob/horse/horse_zombie", + "mob/horse/mule", - L"mob/horse/armor/horse_armor_diamond", - L"mob/horse/armor/horse_armor_gold", - L"mob/horse/armor/horse_armor_iron", + "mob/horse/armor/horse_armor_diamond", + "mob/horse/armor/horse_armor_gold", + "mob/horse/armor/horse_armor_iron", - L"mob/witch", + "mob/witch", - L"mob/wither/wither", - L"mob/wither/wither_armor", - L"mob/wither/wither_invulnerable", + "mob/wither/wither", + "mob/wither/wither_armor", + "mob/wither/wither_invulnerable", - L"item/trapped", - L"item/trapped_double", + "item/trapped", + "item/trapped_double", // 4jcraft: java UI specific #ifdef ENABLE_JAVA_GUIS - L"%blur%/misc/vignette", - L"/achievement/bg", - L"gui/background", - L"gui/inventory", - L"gui/container", - L"gui/crafting", - L"gui/furnace", - L"gui/creative_inventory/tabs", - L"gui/creative_inventory/tab_items", - L"gui/creative_inventory/tab_inventory", - L"gui/creative_inventory/tab_item_search", - L"title/mclogo", - L"gui/horse", - L"gui/anvil", - L"gui/trap", - L"gui/beacon", - L"gui/hopper", - L"gui/enchant", - L"gui/villager", - L"gui/brewing_stand", - L"title/bg/panorama", - L"title/bg/panorama0", - L"title/bg/panorama1", - L"title/bg/panorama2", - L"title/bg/panorama3", - L"title/bg/panorama4", - L"title/bg/panorama5", + "%blur%/misc/vignette", + "/achievement/bg", + "gui/background", + "gui/inventory", + "gui/container", + "gui/crafting", + "gui/furnace", + "gui/creative_inventory/tabs", + "gui/creative_inventory/tab_items", + "gui/creative_inventory/tab_inventory", + "gui/creative_inventory/tab_item_search", + "title/mclogo", + "gui/horse", + "gui/anvil", + "gui/trap", + "gui/beacon", + "gui/hopper", + "gui/enchant", + "gui/villager", + "gui/brewing_stand", + "title/bg/panorama", + "title/bg/panorama0", + "title/bg/panorama1", + "title/bg/panorama2", + "title/bg/panorama3", + "title/bg/panorama4", + "title/bg/panorama5", #endif -// L"item/christmas", -// L"item/christmas_double", +// "item/christmas", +// "item/christmas_double", #if defined(_LARGE_WORLDS) - L"misc/additionalmapicons", + "misc/additionalmapicons", #endif - L"font/Default", - L"font/alternate", + "font/Default", + "font/alternate", // skin packs - /* L"/SP1", - L"/SP2", - L"/SP3", - L"/SPF", + /* "/SP1", + "/SP2", + "/SP3", + "/SPF", // themes - L"/ThSt", - L"/ThIr", - L"/ThGo", - L"/ThDi", + "/ThSt", + "/ThIr", + "/ThGo", + "/ThDi", // gamerpics - L"/GPAn", - L"/GPCo", - L"/GPEn", - L"/GPFo", - L"/GPTo", - L"/GPBA", - L"/GPFa", - L"/GPME", - L"/GPMF", - L"/GPMM", - L"/GPSE", + "/GPAn", + "/GPCo", + "/GPEn", + "/GPFo", + "/GPTo", + "/GPBA", + "/GPFa", + "/GPME", + "/GPMF", + "/GPMM", + "/GPSE", // avatar items - L"/AH_0006", - L"/AH_0003", - L"/AH_0007", - L"/AH_0005", - L"/AH_0004", - L"/AH_0001", - L"/AH_0002", - L"/AT_0001", - L"/AT_0002", - L"/AT_0003", - L"/AT_0004", - L"/AT_0005", - L"/AT_0006", - L"/AT_0007", - L"/AT_0008", - L"/AT_0009", - L"/AT_0010", - L"/AT_0011", - L"/AT_0012", - L"/AP_0001", - L"/AP_0002", - L"/AP_0003", - L"/AP_0004", - L"/AP_0005", - L"/AP_0006", - L"/AP_0007", - L"/AP_0009", - L"/AP_0010", - L"/AP_0011", - L"/AP_0012", - L"/AP_0013", - L"/AP_0014", - L"/AP_0015", - L"/AP_0016", - L"/AP_0017", - L"/AP_0018", - L"/AA_0001", - L"/AT_0013", - L"/AT_0014", - L"/AT_0015", - L"/AT_0016", - L"/AT_0017", - L"/AT_0018", - L"/AP_0019", - L"/AP_0020", - L"/AP_0021", - L"/AP_0022", - L"/AP_0023", - L"/AH_0008", - L"/AH_0009",*/ + "/AH_0006", + "/AH_0003", + "/AH_0007", + "/AH_0005", + "/AH_0004", + "/AH_0001", + "/AH_0002", + "/AT_0001", + "/AT_0002", + "/AT_0003", + "/AT_0004", + "/AT_0005", + "/AT_0006", + "/AT_0007", + "/AT_0008", + "/AT_0009", + "/AT_0010", + "/AT_0011", + "/AT_0012", + "/AP_0001", + "/AP_0002", + "/AP_0003", + "/AP_0004", + "/AP_0005", + "/AP_0006", + "/AP_0007", + "/AP_0009", + "/AP_0010", + "/AP_0011", + "/AP_0012", + "/AP_0013", + "/AP_0014", + "/AP_0015", + "/AP_0016", + "/AP_0017", + "/AP_0018", + "/AA_0001", + "/AT_0013", + "/AT_0014", + "/AT_0015", + "/AT_0016", + "/AT_0017", + "/AT_0018", + "/AP_0019", + "/AP_0020", + "/AP_0021", + "/AP_0022", + "/AP_0023", + "/AH_0008", + "/AH_0009",*/ - L"gui/items", - L"terrain", + "gui/items", + "terrain", }; Textures::Textures(TexturePackRepository* skins, Options* options) { @@ -324,10 +324,10 @@ g.dispose(); */ // 4J Stu - Changed these to our PreStitchedTextureMap from TextureMap - terrain = new PreStitchedTextureMap(Icon::TYPE_TERRAIN, L"terrain", - L"textures/blocks/", missingNo, true); - items = new PreStitchedTextureMap(Icon::TYPE_ITEM, L"items", - L"textures/items/", missingNo, true); + terrain = new PreStitchedTextureMap(Icon::TYPE_TERRAIN, "terrain", + "textures/blocks/", missingNo, true); + items = new PreStitchedTextureMap(Icon::TYPE_ITEM, "items", + "textures/items/", missingNo, true); // 4J - added - preload a set of commonly used textures that can then be // referenced directly be an enumerated type rather by string @@ -339,12 +339,12 @@ void Textures::loadIndexedTextures() { // referenced directly be an enumerated type rather by string for (int i = 0; i < TN_COUNT - 2; i++) { preLoadedIdx[i] = - loadTexture((TEXTURE_NAME)i, std::wstring(preLoaded[i]) + L".png"); + loadTexture((TEXTURE_NAME)i, std::string(preLoaded[i]) + ".png"); } } std::vector Textures::loadTexturePixels(TEXTURE_NAME texId, - const std::wstring& resourceName) { + const std::string& resourceName) { TexturePack* skin = skins->getSelected(); { @@ -357,7 +357,7 @@ std::vector Textures::loadTexturePixels(TEXTURE_NAME texId, // 4J - removed try/catch // try { std::vector res; - // wstring in = skin->getResource(resourceName); + // string in = skin->getResource(resourceName); if (false) // 4J - removed - was ( in == nullptr) { res = loadTexturePixels(missingNo); @@ -414,14 +414,14 @@ int Textures::loadTexture(int idx) { // 4J added - textures default to standard 32-bit RGBA format, but where we can, // use an 8-bit format. There's 3 different varieties of these currently in the // renderer that map the single 8-bit channel to RGBA differently. -void Textures::setTextureFormat(const std::wstring& resourceName) { +void Textures::setTextureFormat(const std::string& resourceName) { // 4J Stu - These texture formats are not currently in the render header { TEXTURE_FORMAT = IPlatformRenderer::TEXTURE_FORMAT_RxGyBzAw; } } -void Textures::bindTexture(const std::wstring& resourceName) { +void Textures::bindTexture(const std::string& resourceName) { bind(loadTexture(TN_COUNT, resourceName)); } @@ -441,11 +441,11 @@ void Textures::bindTextureLayers(ResourceLocation* resource) { // Hack: 4JLibs on Windows does not currently reproduce Minecraft's layered // horse texture path reliably. Merge the layers on the CPU and bind the // cached result as a normal single texture instead. - std::wstring cacheKey = L"%layered%"; + std::string cacheKey = "%layered%"; int layers = resource->getTextureCount(); for (int i = 0; i < layers; i++) { - cacheKey += std::to_wstring(resource->getTexture(i)); - cacheKey += L"/"; + cacheKey += std::to_string(resource->getTexture(i)); + cacheKey += "/"; } int id = -1; @@ -466,8 +466,8 @@ void Textures::bindTextureLayers(ResourceLocation* resource) { continue; } - std::wstring resourceName = - std::wstring(preLoaded[textureName]) + L".png"; + std::string resourceName = + std::string(preLoaded[textureName]) + ".png"; BufferedImage* image = readImage(textureName, resourceName); if (image == nullptr) { continue; @@ -574,17 +574,17 @@ ResourceLocation* Textures::getTextureLocation(int iconType) { void Textures::clearLastBoundId() { lastBoundId = -1; } int Textures::loadTexture(TEXTURE_NAME texId, - const std::wstring& resourceName) { + const std::string& resourceName) { // char buf[256]; - // wcstombs(buf, resourceName.c_str(), 256); + // strncpy(buf, resourceName.c_str(), 256); // printf("Textures::loadTexture name - %s\n",buf); - // if (resourceName.compare(L"/terrain.png") == 0) + // if (resourceName.compare("/terrain.png") == 0) //{ // terrain->getStitchedTexture()->bind(0); // return terrain->getStitchedTexture()->getGlId(); // } - // if (resourceName.compare(L"/gui/items.png") == 0) + // if (resourceName.compare("/gui/items.png") == 0) //{ // items->getStitchedTexture()->bind(0); // return items->getStitchedTexture()->getGlId(); @@ -599,16 +599,16 @@ int Textures::loadTexture(TEXTURE_NAME texId, if (inMap) return id; } - std::wstring pathName = resourceName; + std::string pathName = resourceName; // 4J - added special cases to avoid mipmapping on clouds & shadows - if ((resourceName == L"environment/clouds.png") || - (resourceName == L"%clamp%misc/shadow.png") || - (resourceName == L"%blur%misc/pumpkinblur.png") || - (resourceName == L"%clamp%misc/shadow.png") || - (resourceName == L"gui/icons.png") || - (resourceName == L"gui/gui.png") || - (resourceName == L"misc/footprint.png")) { + if ((resourceName == "environment/clouds.png") || + (resourceName == "%clamp%misc/shadow.png") || + (resourceName == "%blur%misc/pumpkinblur.png") || + (resourceName == "%clamp%misc/shadow.png") || + (resourceName == "gui/icons.png") || + (resourceName == "gui/gui.png") || + (resourceName == "misc/footprint.png")) { MIPMAP = false; } setTextureFormat(resourceName); @@ -617,17 +617,17 @@ int Textures::loadTexture(TEXTURE_NAME texId, // try { int id = MemoryTracker::genTextures(); - std::wstring prefix = L"%blur%"; + std::string prefix = "%blur%"; bool blur = resourceName.substr(0, prefix.size()).compare(prefix) == 0; // resourceName.startsWith("%blur%"); if (blur) pathName = resourceName.substr(6); - prefix = L"%clamp%"; + prefix = "%clamp%"; bool clamp = resourceName.substr(0, prefix.size()).compare(prefix) == 0; // resourceName.startsWith("%clamp%"); if (clamp) pathName = resourceName.substr(7); - // wstring in = skins->getSelected()->getResource(pathName); + // string in = skins->getSelected()->getResource(pathName); if (false) // 4J - removed was ( in == nullptr) { loadTexture(missingNo, id, blur, clamp); @@ -933,8 +933,8 @@ void Textures::releaseTexture(int id) { glDeleteTextures(id); } -int Textures::loadHttpTexture(const std::wstring& url, - const std::wstring& backup) { +int Textures::loadHttpTexture(const std::string& url, + const std::string& backup) { HttpTexture* texture = httpTextures[url]; if (texture != nullptr) { if (texture->loadedImage != nullptr && !texture->isLoaded) { @@ -953,7 +953,7 @@ int Textures::loadHttpTexture(const std::wstring& url, return texture->id; } -int Textures::loadHttpTexture(const std::wstring& url, int backup) { +int Textures::loadHttpTexture(const std::string& url, int backup) { HttpTexture* texture = httpTextures[url]; if (texture != nullptr) { if (texture->loadedImage != nullptr && !texture->isLoaded) { @@ -971,11 +971,11 @@ int Textures::loadHttpTexture(const std::wstring& url, int backup) { return texture->id; } -bool Textures::hasHttpTexture(const std::wstring& url) { +bool Textures::hasHttpTexture(const std::string& url) { return httpTextures.find(url) != httpTextures.end(); } -HttpTexture* Textures::addHttpTexture(const std::wstring& url, +HttpTexture* Textures::addHttpTexture(const std::string& url, HttpTextureProcessor* processor) { HttpTexture* texture = httpTextures[url]; if (texture == nullptr) { @@ -986,7 +986,7 @@ HttpTexture* Textures::addHttpTexture(const std::wstring& url, return texture; } -void Textures::removeHttpTexture(const std::wstring& url) { +void Textures::removeHttpTexture(const std::string& url) { HttpTexture* texture = httpTextures[url]; if (texture != nullptr) { texture->count--; @@ -998,8 +998,8 @@ void Textures::removeHttpTexture(const std::wstring& url) { } // 4J-PB - adding for texture in memory (from global title storage) -int Textures::loadMemTexture(const std::wstring& url, - const std::wstring& backup) { +int Textures::loadMemTexture(const std::string& url, + const std::string& backup) { MemTexture* texture = nullptr; auto it = memTextures.find(url); if (it != memTextures.end()) { @@ -1013,8 +1013,8 @@ int Textures::loadMemTexture(const std::wstring& url, if (texture->loadedImage != nullptr && !texture->isLoaded) { // 4J - Disable mipmapping in general for skins & capes. Have seen // problems with edge-on polys for some eg mumbo jumbo - if ((url.substr(0, 7) == L"dlcskin") || - (url.substr(0, 7) == L"dlccape")) { + if ((url.substr(0, 7) == "dlcskin") || + (url.substr(0, 7) == "dlccape")) { MIPMAP = false; } @@ -1036,7 +1036,7 @@ int Textures::loadMemTexture(const std::wstring& url, return texture->id; } -int Textures::loadMemTexture(const std::wstring& url, int backup) { +int Textures::loadMemTexture(const std::string& url, int backup) { MemTexture* texture = nullptr; auto it = memTextures.find(url); if (it != memTextures.end()) { @@ -1051,8 +1051,8 @@ int Textures::loadMemTexture(const std::wstring& url, int backup) { if (texture->loadedImage != nullptr && !texture->isLoaded) { // 4J - Disable mipmapping in general for skins & capes. Have seen // problems with edge-on polys for some eg mumbo jumbo - if ((url.substr(0, 7) == L"dlcskin") || - (url.substr(0, 7) == L"dlccape")) { + if ((url.substr(0, 7) == "dlcskin") || + (url.substr(0, 7) == "dlccape")) { MIPMAP = false; } if (texture->id < 0) { @@ -1072,7 +1072,7 @@ int Textures::loadMemTexture(const std::wstring& url, int backup) { return texture->id; } -MemTexture* Textures::addMemTexture(const std::wstring& name, +MemTexture* Textures::addMemTexture(const std::string& name, MemTextureProcessor* processor) { MemTexture* texture = nullptr; auto it = memTextures.find(name); @@ -1102,7 +1102,7 @@ MemTexture* Textures::addMemTexture(const std::wstring& name, return texture; } -// MemTexture *Textures::getMemTexture(const wstring& url, MemTextureProcessor +// MemTexture *Textures::getMemTexture(const string& url, MemTextureProcessor // *processor) // { // MemTexture *texture = memTextures[url]; @@ -1113,7 +1113,7 @@ MemTexture* Textures::addMemTexture(const std::wstring& name, // return texture; // } -void Textures::removeMemTexture(const std::wstring& url) { +void Textures::removeMemTexture(const std::string& url) { MemTexture* texture = nullptr; auto it = memTextures.find(url); if (it != memTextures.end()) { @@ -1187,9 +1187,9 @@ void Textures::reloadAll() { pixelsMap.clear(); // 4J Stu - These are not used any more - // WaterColor::init(loadTexturePixels(L"misc/watercolor.png")); - // GrassColor::init(loadTexturePixels(L"misc/grasscolor.png")); - // FoliageColor::init(loadTexturePixels(L"misc/foliagecolor.png")); + // WaterColor::init(loadTexturePixels("misc/watercolor.png")); + // GrassColor::init(loadTexturePixels("misc/grasscolor.png")); + // FoliageColor::init(loadTexturePixels("misc/foliagecolor.png")); stitch(); @@ -1216,15 +1216,15 @@ Icon* Textures::getMissingIcon(int type) { } BufferedImage* Textures::readImage( - TEXTURE_NAME texId, const std::wstring& name) // 4J was InputStream *in + TEXTURE_NAME texId, const std::string& name) // 4J was InputStream *in { BufferedImage* img = nullptr; // is this image one of the Title Update ones? bool isTu = IsTUImage(texId, name); - std::wstring drive = L""; + std::string drive = ""; if (!skins->isUsingDefaultSkin() && - skins->getSelected()->hasFile(L"res/" + name, false)) { + skins->getSelected()->hasFile("res/" + name, false)) { drive = skins->getSelected()->getPath(isTu); img = skins->getSelected()->getImageResource( name, false, isTu, @@ -1240,8 +1240,8 @@ BufferedImage* Textures::readImage( drive); // new BufferedImage(name,false,isTu,drive); } else { img = skins->getDefault()->getImageResource( - L"1_2_2/" + name, false, isTu, - drive); // new BufferedImage(L"/1_2_2" + + "1_2_2/" + name, false, isTu, + drive); // new BufferedImage("/1_2_2" + // name,false,isTu,drive); } } @@ -1303,18 +1303,18 @@ TEXTURE_NAME TUImages[] = { }; // This is for any TU textures that aren't part of our enum indexed preload set -const wchar_t* const TUImagePaths[] = { - L"font/Default", L"font/Mojangles_7", L"font/Mojangles_11", +const char* const TUImagePaths[] = { + "font/Default", "font/Mojangles_7", "font/Mojangles_11", // TU12 - L"armor/cloth_1.png", L"armor/cloth_1_b.png", L"armor/cloth_2.png", - L"armor/cloth_2_b.png", + "armor/cloth_1.png", "armor/cloth_1_b.png", "armor/cloth_2.png", + "armor/cloth_2_b.png", // nullptr}; -bool Textures::IsTUImage(TEXTURE_NAME texId, const std::wstring& name) { +bool Textures::IsTUImage(TEXTURE_NAME texId, const std::string& name) { int i = 0; if (texId < TN_COUNT) { while (TUImages[i] < TN_COUNT) { @@ -1342,11 +1342,11 @@ TEXTURE_NAME OriginalImages[] = {TN_MOB_CHAR, TN_MOB_CHAR1, TN_MOB_CHAR2, TN_COUNT}; -const wchar_t* const OriginalImagesPaths[] = {L"misc/watercolor.png", +const char* const OriginalImagesPaths[] = {"misc/watercolor.png", nullptr}; -bool Textures::IsOriginalImage(TEXTURE_NAME texId, const std::wstring& name) { +bool Textures::IsOriginalImage(TEXTURE_NAME texId, const std::string& name) { int i = 0; if (texId < TN_COUNT) { while (OriginalImages[i] < TN_COUNT) { diff --git a/targets/minecraft/client/renderer/Textures.h b/targets/minecraft/client/renderer/Textures.h index c026f36bb..8d067f247 100644 --- a/targets/minecraft/client/renderer/Textures.h +++ b/targets/minecraft/client/renderer/Textures.h @@ -276,18 +276,18 @@ public: static IPlatformRenderer::eTextureFormat TEXTURE_FORMAT; private: - static const wchar_t* preLoaded[TN_COUNT]; + static const char* preLoaded[TN_COUNT]; static int preLoadedIdx[TN_COUNT]; - std::unordered_map idMap; - std::unordered_map> pixelsMap; + std::unordered_map idMap; + std::unordered_map> pixelsMap; std::unordered_map loadedImages; // IntBuffer *pixels; // 4J - removed so we don't have a permanent // buffer kicking round using up 1MB - std::unordered_map httpTextures; + std::unordered_map httpTextures; // 4J-PB - Added for GTS textures - std::unordered_map memTextures; + std::unordered_map memTextures; Options* options; private: @@ -306,16 +306,16 @@ private: public: std::vector loadTexturePixels(TEXTURE_NAME texId, - const std::wstring& resourceName); + const std::string& resourceName); private: std::vector loadTexturePixels(BufferedImage* img); std::vector loadTexturePixels(BufferedImage* img, std::vector& pixels); - void setTextureFormat(const std::wstring& resourceName); // 4J added + void setTextureFormat(const std::string& resourceName); // 4J added public: - void bindTexture(const std::wstring& resourceName); + void bindTexture(const std::string& resourceName); void bindTexture(ResourceLocation* resource); // 4J Added void bindTextureLayers(ResourceLocation* resource); // 4J added @@ -329,7 +329,7 @@ public: void clearLastBoundId(); private: - int loadTexture(TEXTURE_NAME texId, const std::wstring& resourceName); + int loadTexture(TEXTURE_NAME texId, const std::string& resourceName); public: int loadTexture(int idx); // 4J added @@ -350,21 +350,21 @@ public: void replaceTextureDirect(const std::vector& rawPixels, int w, int h, int id); // 4J added as optimisation void releaseTexture(int id); - int loadHttpTexture(const std::wstring& url, const std::wstring& backup); - int loadHttpTexture(const std::wstring& url, int backup); // 4J added - bool hasHttpTexture(const std::wstring& url); - HttpTexture* addHttpTexture(const std::wstring& url, + int loadHttpTexture(const std::string& url, const std::string& backup); + int loadHttpTexture(const std::string& url, int backup); // 4J added + bool hasHttpTexture(const std::string& url); + HttpTexture* addHttpTexture(const std::string& url, HttpTextureProcessor* processor); - void removeHttpTexture(const std::wstring& url); + void removeHttpTexture(const std::string& url); // 4J-PB - for the GTS textures - int loadMemTexture(const std::wstring& url, const std::wstring& backup); - int loadMemTexture(const std::wstring& url, int backup); - MemTexture* addMemTexture(const std::wstring& url, + int loadMemTexture(const std::string& url, const std::string& backup); + int loadMemTexture(const std::string& url, int backup); + MemTexture* addMemTexture(const std::string& url, MemTextureProcessor* processor); - // MemTexture * getMemTexture(const std::wstring& url, + // MemTexture * getMemTexture(const std::string& url, // MemTextureProcessor *processor); - void removeMemTexture(const std::wstring& url); + void removeMemTexture(const std::string& url); void tick(bool updateTextures, bool tickDynamics = @@ -375,9 +375,9 @@ public: Icon* getMissingIcon(int type); BufferedImage* readImage( TEXTURE_NAME texId, - const std::wstring& name); // Moved this to public for Font.cpp access + const std::string& name); // Moved this to public for Font.cpp access // check list of title update textures to see if we need to use the UPDATE: // drive - static bool IsTUImage(TEXTURE_NAME texId, const std::wstring& name); - static bool IsOriginalImage(TEXTURE_NAME texId, const std::wstring& name); + static bool IsTUImage(TEXTURE_NAME texId, const std::string& name); + static bool IsOriginalImage(TEXTURE_NAME texId, const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp index 216fbb231..123b26bc5 100644 --- a/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ArrowRenderer.cpp @@ -22,7 +22,7 @@ void ArrowRenderer::render(std::shared_ptr _arrow, double x, double y, // type Arrow rather than shared_ptr we have here - do some casting // around instead std::shared_ptr arrow = std::dynamic_pointer_cast(_arrow); - bindTexture(_arrow); // 4J - was L"/item/arrows.png" + bindTexture(_arrow); // 4J - was "/item/arrows.png" glPushMatrix(); diff --git a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp index 50ba53c66..d62cc154a 100644 --- a/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EndermanRenderer.cpp @@ -98,7 +98,7 @@ int EndermanRenderer::prepareArmor(std::shared_ptr _mob, if (layer != 0) return -1; - bindTexture(&ENDERMAN_EYES_LOCATION); // 4J was L"/mob/enderman_eyes.png" + bindTexture(&ENDERMAN_EYES_LOCATION); // 4J was "/mob/enderman_eyes.png" float br = 1; glEnable(GL_BLEND); // 4J Stu - We probably don't need to do this on 360 either (as we force it diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp index e972fc713..02b24d18f 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.cpp @@ -42,7 +42,7 @@ void EntityRenderer::bindTexture(ResourceLocation* location) { entityRenderDispatcher->textures->bindTexture(location); } -bool EntityRenderer::bindTexture(const std::wstring& urlTexture, +bool EntityRenderer::bindTexture(const std::string& urlTexture, int backupTexture) { Textures* t = entityRenderDispatcher->textures; @@ -60,8 +60,8 @@ bool EntityRenderer::bindTexture(const std::wstring& urlTexture, } } -bool EntityRenderer::bindTexture(const std::wstring& urlTexture, - const std::wstring& backupTexture) { +bool EntityRenderer::bindTexture(const std::string& urlTexture, + const std::string& backupTexture) { Textures* t = entityRenderDispatcher->textures; // 4J-PB - no http textures on the xbox, mem textures instead diff --git a/targets/minecraft/client/renderer/entity/EntityRenderer.h b/targets/minecraft/client/renderer/entity/EntityRenderer.h index 996c6ccf9..095857c81 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderer.h +++ b/targets/minecraft/client/renderer/entity/EntityRenderer.h @@ -53,9 +53,9 @@ public: protected: virtual void bindTexture(std::shared_ptr entity); virtual void bindTexture(ResourceLocation* location); - virtual bool bindTexture(const std::wstring& urlTexture, int backupTexture); - virtual bool bindTexture(const std::wstring& urlTexture, - const std::wstring& backupTexture); + virtual bool bindTexture(const std::string& urlTexture, int backupTexture); + virtual bool bindTexture(const std::string& urlTexture, + const std::string& backupTexture); virtual ResourceLocation* getTextureLocation(std::shared_ptr mob); diff --git a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp index 2f2ce92bb..b08b3cdeb 100644 --- a/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ExperienceOrbRenderer.cpp @@ -31,7 +31,7 @@ void ExperienceOrbRenderer::render(std::shared_ptr _orb, double x, glTranslatef((float)x, (float)y, (float)z); int icon = orb->getIcon(); - bindTexture(orb); // 4J was L"/item/xporb.png" + bindTexture(orb); // 4J was "/item/xporb.png" float u0 = ((icon % 4) * 16 + 0) / 64.0f; float u1 = ((icon % 4) * 16 + 16) / 64.0f; diff --git a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp index cbe55dd55..8648cf187 100644 --- a/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FallingTileRenderer.cpp @@ -33,7 +33,7 @@ void FallingTileRenderer::render(std::shared_ptr _tile, double x, glPushMatrix(); glTranslatef((float)x, (float)y, (float)z); - bindTexture(tile); // 4J was L"/terrain.png" + bindTexture(tile); // 4J was "/terrain.png" Tile* tt = Tile::tiles[tile->tile]; Level* level = tile->getLevel(); diff --git a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp index 70513d796..a9e292a14 100644 --- a/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/FishingHookRenderer.cpp @@ -34,7 +34,7 @@ void FishingHookRenderer::render(std::shared_ptr _hook, double x, glScalef(1 / 2.0f, 1 / 2.0f, 1 / 2.0f); int xi = 1; int yi = 2; - bindTexture(hook); // 4J was L"/particles.png" + bindTexture(hook); // 4J was "/particles.png" Tesselator* t = Tesselator::getInstance(); float u0 = (xi * 8 + 0) / 128.0f; diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp index 566a17fdd..fb692c550 100644 --- a/targets/minecraft/client/renderer/entity/HorseRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HorseRenderer.cpp @@ -25,7 +25,7 @@ ResourceLocation HorseRenderer::HORSE_ZOMBIE_LOCATION = ResourceLocation HorseRenderer::HORSE_SKELETON_LOCATION = ResourceLocation(TN_MOB_HORSE_SKELETON); -std::map HorseRenderer::LAYERED_LOCATION_CACHE; +std::map HorseRenderer::LAYERED_LOCATION_CACHE; HorseRenderer::HorseRenderer(Model* model, float f) : MobRenderer(model, f) {} @@ -94,7 +94,7 @@ ResourceLocation* HorseRenderer::getTextureLocation( ResourceLocation* HorseRenderer::getOrCreateLayeredTextureLocation( std::shared_ptr horse) { - std::wstring textureName = horse->getLayeredTextureHashName(); + std::string textureName = horse->getLayeredTextureHashName(); auto it = LAYERED_LOCATION_CACHE.find(textureName); diff --git a/targets/minecraft/client/renderer/entity/HorseRenderer.h b/targets/minecraft/client/renderer/entity/HorseRenderer.h index 54b650d3d..b6c15a878 100644 --- a/targets/minecraft/client/renderer/entity/HorseRenderer.h +++ b/targets/minecraft/client/renderer/entity/HorseRenderer.h @@ -13,7 +13,7 @@ class ResourceLocation; class HorseRenderer : public MobRenderer { private: - static std::map LAYERED_LOCATION_CACHE; + static std::map LAYERED_LOCATION_CACHE; static ResourceLocation HORSE_LOCATION; static ResourceLocation HORSE_MULE_LOCATION; diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp index dc9d98380..8e3e496d4 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp @@ -25,9 +25,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "nbt/CompoundTag.h" -const std::wstring HumanoidMobRenderer::MATERIAL_NAMES[5] = { - L"cloth", L"chain", L"iron", L"diamond", L"gold"}; -std::map +const std::string HumanoidMobRenderer::MATERIAL_NAMES[5] = { + "cloth", "chain", "iron", "diamond", "gold"}; +std::map HumanoidMobRenderer::ARMOR_LOCATION_CACHE; void HumanoidMobRenderer::_init(HumanoidModel* humanoidModel, float scale) { @@ -71,21 +71,21 @@ ResourceLocation* HumanoidMobRenderer::getArmorLocation(ArmorItem* armorItem, case 4: break; }; - std::wstring path = - std::wstring(L"armor/" + MATERIAL_NAMES[armorItem->modelIndex]) - .append(L"_") + std::string path = + std::string("armor/" + MATERIAL_NAMES[armorItem->modelIndex]) + .append("_") .append(toWString(layer == 2 ? 2 : 1)) - .append((overlay ? L"_b" : L"")) - .append(L".png"); + .append((overlay ? "_b" : "")) + .append(".png"); - std::map::iterator it = + std::map::iterator it = ARMOR_LOCATION_CACHE.find(path); ResourceLocation* location; if (it != ARMOR_LOCATION_CACHE.end()) { location = &it->second; } else { - ARMOR_LOCATION_CACHE.insert(std::pair( + ARMOR_LOCATION_CACHE.insert(std::pair( path, ResourceLocation(path))); it = ARMOR_LOCATION_CACHE.find(path); @@ -241,10 +241,10 @@ void HumanoidMobRenderer::additionalRendering(std::shared_ptr mob, float s = 17 / 16.0f; glScalef(s, -s, -s); - std::wstring extra = L""; + std::string extra = ""; if (headGear->hasTag() && - headGear->getTag()->contains(L"SkullOwner")) { - extra = headGear->getTag()->getString(L"SkullOwner"); + headGear->getTag()->contains("SkullOwner")) { + extra = headGear->getTag()->getString("SkullOwner"); } SkullTileRenderer::instance->renderSkull( -0.5f, 0, -0.5f, Facing::UP, 180, headGear->getAuxValue(), diff --git a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.h b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.h index 4425da096..b01d4b174 100644 --- a/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.h +++ b/targets/minecraft/client/renderer/entity/HumanoidMobRenderer.h @@ -14,8 +14,8 @@ class ResourceLocation; class HumanoidMobRenderer : public MobRenderer { private: - static const std::wstring MATERIAL_NAMES[5]; - static std::map ARMOR_LOCATION_CACHE; + static const std::string MATERIAL_NAMES[5]; + static std::map ARMOR_LOCATION_CACHE; protected: HumanoidModel* humanoidModel; diff --git a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp index eb52cec58..aed9f0e74 100644 --- a/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemFrameRenderer.cpp @@ -34,7 +34,7 @@ ResourceLocation ItemFrameRenderer::MAP_BACKGROUND_LOCATION = ResourceLocation(TN_MISC_MAPBG); void ItemFrameRenderer::registerTerrainTextures(IconRegister* iconRegister) { - backTexture = iconRegister->registerIcon(L"itemframe_back"); + backTexture = iconRegister->registerIcon("itemframe_back"); } void ItemFrameRenderer::render(std::shared_ptr _itemframe, double x, diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp index a0601a3c9..d93de63ea 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -54,9 +54,9 @@ ResourceLocation* ItemRenderer::getTextureLocation( ResourceLocation* ItemRenderer::getTextureLocation(int iconType) { if (iconType == Icon::TYPE_TERRAIN) { - return &TextureAtlas::LOCATION_BLOCKS; // L"/terrain.png")); + return &TextureAtlas::LOCATION_BLOCKS; // "/terrain.png")); } else { - return &TextureAtlas::LOCATION_ITEMS; // L"/gui/items.png")); + return &TextureAtlas::LOCATION_ITEMS; // "/gui/items.png")); } } @@ -412,10 +412,10 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, glDisable(GL_LIGHTING); if (item->getIconType() == Icon::TYPE_TERRAIN) { textures->bindTexture( - &TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png")); + &TextureAtlas::LOCATION_BLOCKS); // "/terrain.png")); } else { textures->bindTexture( - &TextureAtlas::LOCATION_ITEMS); // L"/gui/items.png")); + &TextureAtlas::LOCATION_ITEMS); // "/gui/items.png")); } if (itemIcon == nullptr) { @@ -579,13 +579,13 @@ void ItemRenderer::blitGlint(int id, float x, float y, float w, float h) { void ItemRenderer::renderGuiItemDecorations(Font* font, Textures* textures, std::shared_ptr item, int x, int y, float fAlpha) { - renderGuiItemDecorations(font, textures, item, x, y, L"", fAlpha); + renderGuiItemDecorations(font, textures, item, x, y, "", fAlpha); } void ItemRenderer::renderGuiItemDecorations(Font* font, Textures* textures, std::shared_ptr item, int x, int y, - const std::wstring& countText, + const std::string& countText, float fAlpha) { if (item == nullptr) { return; @@ -593,11 +593,11 @@ void ItemRenderer::renderGuiItemDecorations(Font* font, Textures* textures, if (item->count > 1 || !countText.empty() || item->GetForceNumberDisplay()) { - std::wstring amount = countText; + std::string amount = countText; if (amount.empty()) { int count = item->count; if (count > 64) { - amount = toWString(64) + L"+"; + amount = toWString(64) + "+"; } else { amount = toWString(item->count); } diff --git a/targets/minecraft/client/renderer/entity/ItemRenderer.h b/targets/minecraft/client/renderer/entity/ItemRenderer.h index 3baabd89c..0a9da116a 100644 --- a/targets/minecraft/client/renderer/entity/ItemRenderer.h +++ b/targets/minecraft/client/renderer/entity/ItemRenderer.h @@ -79,7 +79,7 @@ public: int y, float fAlpha = 1.0f); void renderGuiItemDecorations(Font* font, Textures* textures, std::shared_ptr item, int x, - int y, const std::wstring& countText, + int y, const std::string& countText, float fAlpha = 1.0f); private: diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index cdde47435..806435813 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -283,8 +283,8 @@ void LivingEntityRenderer::setupRotations(std::shared_ptr mob, if (fall > 1) fall = 1; glRotatef(fall * getFlipDegrees(mob), 0, 0, 1); } else { - std::wstring name = mob->getAName(); - if (name == L"Dinnerbone" || name == L"Grumm") { + std::string name = mob->getAName(); + if (name == "Dinnerbone" || name == "Grumm") { if (!mob->instanceof(eTYPE_PLAYER) || !std::dynamic_pointer_cast(mob)->isCapeHidden()) { glTranslatef(0, mob->bbHeight + 0.1f, 0); @@ -385,7 +385,7 @@ void LivingEntityRenderer::renderName(std::shared_ptr mob, float maxDist = mob->isSneaking() ? 32 : 64; if (dist < maxDist * maxDist) { - std::wstring msg = mob->getDisplayName(); + std::string msg = mob->getDisplayName(); if (!msg.empty()) { if (mob->isSneaking()) { @@ -450,7 +450,7 @@ bool LivingEntityRenderer::shouldShowName(std::shared_ptr mob) { void LivingEntityRenderer::renderNameTags(std::shared_ptr mob, double x, double y, double z, - const std::wstring& msg, float scale, + const std::string& msg, float scale, double dist) { if (mob->isSleeping()) { renderNameTag(mob, msg, x, y - 1.5f, z, 64); @@ -461,7 +461,7 @@ void LivingEntityRenderer::renderNameTags(std::shared_ptr mob, // 4J Added parameter for color here so that we can colour players names void LivingEntityRenderer::renderNameTag(std::shared_ptr mob, - const std::wstring& name, double x, + const std::string& name, double x, double y, double z, int maxDist, int color /*= 0xff000000*/) { if (gameServices().getGameSettings(eGameSetting_DisplayHUD) == 0) { @@ -522,8 +522,8 @@ void LivingEntityRenderer::renderNameTag(std::shared_ptr mob, int offs = 0; - std::wstring playerName; - wchar_t wchName[2]; + std::string playerName; + char wchName[2]; if (mob->instanceof(eTYPE_PLAYER)) { std::shared_ptr player = std::dynamic_pointer_cast(mob); diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h index 434bd3508..b056f18d6 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.h @@ -58,9 +58,9 @@ protected: double y, double z); virtual bool shouldShowName(std::shared_ptr mob); virtual void renderNameTags(std::shared_ptr mob, double x, - double y, double z, const std::wstring& msg, + double y, double z, const std::string& msg, float scale, double dist); virtual void renderNameTag(std::shared_ptr mob, - const std::wstring& name, double x, double y, + const std::string& name, double x, double y, double z, int maxDist, int color = 0xff000000); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp index ce0c7a068..b91901b44 100644 --- a/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MinecartRenderer.cpp @@ -115,7 +115,7 @@ void MinecartRenderer::render(std::shared_ptr _cart, double x, double y, if (cart->type != Minecart::RIDEABLE) { glPushMatrix(); - bindTexture(TN_TERRAIN); // 4J was L"/terrain.png" + bindTexture(TN_TERRAIN); // 4J was "/terrain.png" float ss = 12 / 16.0f; glScalef(ss, ss, ss); @@ -138,7 +138,7 @@ void MinecartRenderer::render(std::shared_ptr _cart, double x, double y, glColor4f(1, 1, 1, 1); } - bindTexture(TN_ITEM_CART); // 4J - was L"/item/cart.png" + bindTexture(TN_ITEM_CART); // 4J - was "/item/cart.png" glScalef(-1, -1, 1); // model.render(0, 0, cart->getLootContent() * 7.1f - 0.1f, 0, 0, 1 / // 16.0f); diff --git a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp index f86aeda37..31b9aef47 100644 --- a/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PaintingRenderer.cpp @@ -31,7 +31,7 @@ void PaintingRenderer::render(std::shared_ptr _painting, double x, glTranslatef((float)x, (float)y, (float)z); glRotatef(rot, 0, 1, 0); glEnable(GL_RESCALE_NORMAL); - bindTexture(painting); // 4J was L"/art/kz.png" + bindTexture(painting); // 4J was "/art/kz.png" Painting::Motive* motive = painting->motive; diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index 6a92015a3..f9f573919 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -288,10 +288,10 @@ void PlayerRenderer::additionalRendering(std::shared_ptr _mob, float s = 17 / 16.0f; glScalef(s, -s, -s); - std::wstring extra = L""; + std::string extra = ""; if (headGear->hasTag() && - headGear->getTag()->contains(L"SkullOwner")) { - extra = headGear->getTag()->getString(L"SkullOwner"); + headGear->getTag()->contains("SkullOwner")) { + extra = headGear->getTag()->getString("SkullOwner"); } SkullTileRenderer::instance->renderSkull( -0.5f, 0, -0.5f, Facing::UP, 180, headGear->getAuxValue(), @@ -304,7 +304,7 @@ void PlayerRenderer::additionalRendering(std::shared_ptr _mob, // need to add a custom texture for deadmau5 if (mob != nullptr && gameServices().isXuidDeadmau5(mob->getXuid()) && - bindTexture(mob->customTextureUrl, L"")) { + bindTexture(mob->customTextureUrl, "")) { for (int i = 0; i < 2; i++) { float yr = (mob->yRotO + (mob->yRot - mob->yRotO) * a) - (mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * a); @@ -328,7 +328,7 @@ void PlayerRenderer::additionalRendering(std::shared_ptr _mob, /*bool loaded = mob->getCloakTexture()->isLoaded(); bool b1 = !mob->isInvisible(); bool b2 = !mob->isCapeHidden();*/ - if (bindTexture(mob->customTextureUrl2, L"") && !mob->isInvisible()) { + if (bindTexture(mob->customTextureUrl2, "") && !mob->isInvisible()) { glPushMatrix(); glTranslatef(0, 0, 2 / 16.0f); @@ -459,7 +459,7 @@ bool b2 = !mob->isCapeHidden();*/ void PlayerRenderer::renderNameTags(std::shared_ptr player, double x, double y, double z, - std::wstring msg, float scale, + std::string msg, float scale, double dist) { LivingEntityRenderer::renderNameTags(player, x, y, z, msg, scale, dist); } diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h index 951a19701..5feabe813 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h @@ -31,7 +31,7 @@ public: static unsigned int getNametagColour(int index); private: - static const std::wstring MATERIAL_NAMES[5]; + static const std::string MATERIAL_NAMES[5]; protected: virtual int prepareArmor(std::shared_ptr _player, int layer, @@ -47,7 +47,7 @@ protected: virtual void additionalRendering(std::shared_ptr _mob, float a); void renderNameTags(std::shared_ptr player, double x, - double y, double z, std::wstring msg, float scale, + double y, double z, std::string msg, float scale, double dist); virtual void scale(std::shared_ptr _player, float a); diff --git a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp index a2391e853..38907890b 100644 --- a/targets/minecraft/client/renderer/entity/SheepRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/SheepRenderer.cpp @@ -39,7 +39,7 @@ int SheepRenderer::prepareArmor(std::shared_ptr _sheep, int layer, bindTexture(&SHEEP_FUR_LOCATION); if (sheep->hasCustomName() && - sheep->getCustomName().compare(L"jeb_") == 0) { + sheep->getCustomName().compare("jeb_") == 0) { // easter egg... int colorDuration = 25; int value = (sheep->tickCount / colorDuration) + sheep->entityId; diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index ff9fd08c5..969bf9473 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -25,13 +25,13 @@ class Stitcher; class TextureHolder; -const std::wstring PreStitchedTextureMap::NAME_MISSING_TEXTURE = L"missingno"; +const std::string PreStitchedTextureMap::NAME_MISSING_TEXTURE = "missingno"; -PreStitchedTextureMap::PreStitchedTextureMap(int type, const std::wstring& name, - const std::wstring& path, +PreStitchedTextureMap::PreStitchedTextureMap(int type, const std::string& name, + const std::string& path, BufferedImage* missingTexture, bool mipmap) - : iconType(type), name(name), path(path), extension(L".png") { + : iconType(type), name(name), path(path), extension(".png") { this->missingTexture = missingTexture; // 4J Initialisers @@ -83,7 +83,7 @@ void PreStitchedTextureMap::stitch() { animatedTextures.clear(); // Create the final image - std::wstring filename = name + extension; + std::string filename = name + extension; TexturePack* texturePack = Minecraft::GetInstance()->skins->getSelected(); // try { @@ -94,19 +94,19 @@ void PreStitchedTextureMap::stitch() { int minFilter = Texture::TFLT_NEAREST; int magFilter = Texture::TFLT_NEAREST; - std::wstring drive = L""; + std::string drive = ""; // 4J-PB - need to check for BD patched files - if (texturePack->hasFile(L"res/" + filename, false)) { + if (texturePack->hasFile("res/" + filename, false)) { drive = texturePack->getPath(true); } else { drive = Minecraft::GetInstance()->skins->getDefault()->getPath(true); texturePack = Minecraft::GetInstance()->skins->getDefault(); } - // BufferedImage *image = new BufferedImage(texturePack->getResource(L"/" + + // BufferedImage *image = new BufferedImage(texturePack->getResource("/" + // filename),false,true,drive); - // //ImageIO::read(texturePack->getResource(L"/" + filename)); + // //ImageIO::read(texturePack->getResource("/" + filename)); BufferedImage* image = texturePack->getImageResource(filename, false, true, drive); int height = image->getHeight(); @@ -142,7 +142,7 @@ void PreStitchedTextureMap::stitch() { // missingPosition = (StitchedTexture // *)texturesByName.find(NAME_MISSING_TEXTURE)->second; - stitchResult->writeAsPNG(L"debug.stitched_" + name + L".png"); + stitchResult->writeAsPNG("debug.stitched_" + name + ".png"); stitchResult->updateOnGPU(); } @@ -153,13 +153,13 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack* texturePack, return; } - std::wstring textureFileName = tex->m_fileName; + std::string textureFileName = tex->m_fileName; - std::wstring animString = + std::string animString = texturePack->getAnimationString(textureFileName, path, true); if (!animString.empty()) { - std::wstring filename = path + textureFileName + extension; + std::string filename = path + textureFileName + extension; // TODO: [EB] Put the frames into a proper object, not this inside out // hack @@ -174,7 +174,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack* texturePack, #if !defined(_CONTENT_PACKAGE) if (first->getWidth() != tex->getWidth() || first->getHeight() != tex->getHeight()) { - Log::info("%ls - first w - %d, h - %d, tex w - %d, h - %d\n", + Log::info("%s - first w - %d, h - %d, tex w - %d, h - %d\n", textureFileName.c_str(), first->getWidth(), tex->getWidth(), first->getHeight(), tex->getHeight()); @@ -193,7 +193,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack* texturePack, } } -StitchedTexture* PreStitchedTextureMap::getTexture(const std::wstring& name) { +StitchedTexture* PreStitchedTextureMap::getTexture(const std::string& name) { #if !defined(_CONTENT_PACKAGE) Log::info("Not implemented!\n"); assert(0); @@ -213,7 +213,7 @@ void PreStitchedTextureMap::cycleAnimationFrames() { Texture* PreStitchedTextureMap::getStitchedTexture() { return stitchResult; } // 4J Stu - register is a reserved keyword in C++ -Icon* PreStitchedTextureMap::registerIcon(const std::wstring& name) { +Icon* PreStitchedTextureMap::registerIcon(const std::string& name) { Icon* result = nullptr; if (name.empty()) { Log::info("Don't register nullptr\n"); @@ -229,7 +229,7 @@ Icon* PreStitchedTextureMap::registerIcon(const std::wstring& name) { if (result == nullptr) { #if !defined(_CONTENT_PACKAGE) - Log::info("Could not find uv data for icon %ls\n", name.c_str()); + Log::info("Could not find uv data for icon %s\n", name.c_str()); assert(0); #endif result = missingPosition; @@ -273,670 +273,670 @@ void PreStitchedTextureMap::loadUVs() { float horizRatio = 1.0f / 16.0f; float vertRatio = 1.0f / 16.0f; - ADD_ICON(0, 0, L"helmetCloth") - ADD_ICON(0, 1, L"helmetChain") - ADD_ICON(0, 2, L"helmetIron") - ADD_ICON(0, 3, L"helmetDiamond") - ADD_ICON(0, 4, L"helmetGold") - ADD_ICON(0, 5, L"flintAndSteel") - ADD_ICON(0, 6, L"flint") - ADD_ICON(0, 7, L"coal") - ADD_ICON(0, 8, L"string") - ADD_ICON(0, 9, L"seeds") - ADD_ICON(0, 10, L"apple") - ADD_ICON(0, 11, L"appleGold") - ADD_ICON(0, 12, L"egg") - ADD_ICON(0, 13, L"sugar") - ADD_ICON(0, 14, L"snowball") - ADD_ICON(0, 15, L"slot_empty_helmet") + ADD_ICON(0, 0, "helmetCloth") + ADD_ICON(0, 1, "helmetChain") + ADD_ICON(0, 2, "helmetIron") + ADD_ICON(0, 3, "helmetDiamond") + ADD_ICON(0, 4, "helmetGold") + ADD_ICON(0, 5, "flintAndSteel") + ADD_ICON(0, 6, "flint") + ADD_ICON(0, 7, "coal") + ADD_ICON(0, 8, "string") + ADD_ICON(0, 9, "seeds") + ADD_ICON(0, 10, "apple") + ADD_ICON(0, 11, "appleGold") + ADD_ICON(0, 12, "egg") + ADD_ICON(0, 13, "sugar") + ADD_ICON(0, 14, "snowball") + ADD_ICON(0, 15, "slot_empty_helmet") - ADD_ICON(1, 0, L"chestplateCloth") - ADD_ICON(1, 1, L"chestplateChain") - ADD_ICON(1, 2, L"chestplateIron") - ADD_ICON(1, 3, L"chestplateDiamond") - ADD_ICON(1, 4, L"chestplateGold") - ADD_ICON(1, 5, L"bow") - ADD_ICON(1, 6, L"brick") - ADD_ICON(1, 7, L"ingotIron") - ADD_ICON(1, 8, L"feather") - ADD_ICON(1, 9, L"wheat") - ADD_ICON(1, 10, L"painting") - ADD_ICON(1, 11, L"reeds") - ADD_ICON(1, 12, L"bone") - ADD_ICON(1, 13, L"cake") - ADD_ICON(1, 14, L"slimeball") - ADD_ICON(1, 15, L"slot_empty_chestplate") + ADD_ICON(1, 0, "chestplateCloth") + ADD_ICON(1, 1, "chestplateChain") + ADD_ICON(1, 2, "chestplateIron") + ADD_ICON(1, 3, "chestplateDiamond") + ADD_ICON(1, 4, "chestplateGold") + ADD_ICON(1, 5, "bow") + ADD_ICON(1, 6, "brick") + ADD_ICON(1, 7, "ingotIron") + ADD_ICON(1, 8, "feather") + ADD_ICON(1, 9, "wheat") + ADD_ICON(1, 10, "painting") + ADD_ICON(1, 11, "reeds") + ADD_ICON(1, 12, "bone") + ADD_ICON(1, 13, "cake") + ADD_ICON(1, 14, "slimeball") + ADD_ICON(1, 15, "slot_empty_chestplate") - ADD_ICON(2, 0, L"leggingsCloth") - ADD_ICON(2, 1, L"leggingsChain") - ADD_ICON(2, 2, L"leggingsIron") - ADD_ICON(2, 3, L"leggingsDiamond") - ADD_ICON(2, 4, L"leggingsGold") - ADD_ICON(2, 5, L"arrow") - ADD_ICON(2, 6, L"quiver") - ADD_ICON(2, 7, L"ingotGold") - ADD_ICON(2, 8, L"sulphur") - ADD_ICON(2, 9, L"bread") - ADD_ICON(2, 10, L"sign") - ADD_ICON(2, 11, L"doorWood") - ADD_ICON(2, 12, L"doorIron") - ADD_ICON(2, 13, L"bed") - ADD_ICON(2, 14, L"fireball") - ADD_ICON(2, 15, L"slot_empty_leggings") + ADD_ICON(2, 0, "leggingsCloth") + ADD_ICON(2, 1, "leggingsChain") + ADD_ICON(2, 2, "leggingsIron") + ADD_ICON(2, 3, "leggingsDiamond") + ADD_ICON(2, 4, "leggingsGold") + ADD_ICON(2, 5, "arrow") + ADD_ICON(2, 6, "quiver") + ADD_ICON(2, 7, "ingotGold") + ADD_ICON(2, 8, "sulphur") + ADD_ICON(2, 9, "bread") + ADD_ICON(2, 10, "sign") + ADD_ICON(2, 11, "doorWood") + ADD_ICON(2, 12, "doorIron") + ADD_ICON(2, 13, "bed") + ADD_ICON(2, 14, "fireball") + ADD_ICON(2, 15, "slot_empty_leggings") - ADD_ICON(3, 0, L"bootsCloth") - ADD_ICON(3, 1, L"bootsChain") - ADD_ICON(3, 2, L"bootsIron") - ADD_ICON(3, 3, L"bootsDiamond") - ADD_ICON(3, 4, L"bootsGold") - ADD_ICON(3, 5, L"stick") - ADD_ICON(3, 6, L"compass") - ADD_ICON(3, 7, L"diamond") - ADD_ICON(3, 8, L"redstone") - ADD_ICON(3, 9, L"clay") - ADD_ICON(3, 10, L"paper") - ADD_ICON(3, 11, L"book") - ADD_ICON(3, 12, L"map") - ADD_ICON(3, 13, L"seeds_pumpkin") - ADD_ICON(3, 14, L"seeds_melon") - ADD_ICON(3, 15, L"slot_empty_boots") + ADD_ICON(3, 0, "bootsCloth") + ADD_ICON(3, 1, "bootsChain") + ADD_ICON(3, 2, "bootsIron") + ADD_ICON(3, 3, "bootsDiamond") + ADD_ICON(3, 4, "bootsGold") + ADD_ICON(3, 5, "stick") + ADD_ICON(3, 6, "compass") + ADD_ICON(3, 7, "diamond") + ADD_ICON(3, 8, "redstone") + ADD_ICON(3, 9, "clay") + ADD_ICON(3, 10, "paper") + ADD_ICON(3, 11, "book") + ADD_ICON(3, 12, "map") + ADD_ICON(3, 13, "seeds_pumpkin") + ADD_ICON(3, 14, "seeds_melon") + ADD_ICON(3, 15, "slot_empty_boots") - ADD_ICON(4, 0, L"swordWood") - ADD_ICON(4, 1, L"swordStone") - ADD_ICON(4, 2, L"swordIron") - ADD_ICON(4, 3, L"swordDiamond") - ADD_ICON(4, 4, L"swordGold") - ADD_ICON(4, 5, L"fishingRod_uncast") - ADD_ICON(4, 6, L"clock") - ADD_ICON(4, 7, L"bowl") - ADD_ICON(4, 8, L"mushroomStew") - ADD_ICON(4, 9, L"yellowDust") - ADD_ICON(4, 10, L"bucket") - ADD_ICON(4, 11, L"bucketWater") - ADD_ICON(4, 12, L"bucketLava") - ADD_ICON(4, 13, L"milk") - ADD_ICON(4, 14, L"dyePowder_black") - ADD_ICON(4, 15, L"dyePowder_gray") + ADD_ICON(4, 0, "swordWood") + ADD_ICON(4, 1, "swordStone") + ADD_ICON(4, 2, "swordIron") + ADD_ICON(4, 3, "swordDiamond") + ADD_ICON(4, 4, "swordGold") + ADD_ICON(4, 5, "fishingRod_uncast") + ADD_ICON(4, 6, "clock") + ADD_ICON(4, 7, "bowl") + ADD_ICON(4, 8, "mushroomStew") + ADD_ICON(4, 9, "yellowDust") + ADD_ICON(4, 10, "bucket") + ADD_ICON(4, 11, "bucketWater") + ADD_ICON(4, 12, "bucketLava") + ADD_ICON(4, 13, "milk") + ADD_ICON(4, 14, "dyePowder_black") + ADD_ICON(4, 15, "dyePowder_gray") - ADD_ICON(5, 0, L"shovelWood") - ADD_ICON(5, 1, L"shovelStone") - ADD_ICON(5, 2, L"shovelIron") - ADD_ICON(5, 3, L"shovelDiamond") - ADD_ICON(5, 4, L"shovelGold") - ADD_ICON(5, 5, L"fishingRod_cast") - ADD_ICON(5, 6, L"diode") - ADD_ICON(5, 7, L"porkchopRaw") - ADD_ICON(5, 8, L"porkchopCooked") - ADD_ICON(5, 9, L"fishRaw") - ADD_ICON(5, 10, L"fishCooked") - ADD_ICON(5, 11, L"rottenFlesh") - ADD_ICON(5, 12, L"cookie") - ADD_ICON(5, 13, L"shears") - ADD_ICON(5, 14, L"dyePowder_red") - ADD_ICON(5, 15, L"dyePowder_pink") + ADD_ICON(5, 0, "shovelWood") + ADD_ICON(5, 1, "shovelStone") + ADD_ICON(5, 2, "shovelIron") + ADD_ICON(5, 3, "shovelDiamond") + ADD_ICON(5, 4, "shovelGold") + ADD_ICON(5, 5, "fishingRod_cast") + ADD_ICON(5, 6, "diode") + ADD_ICON(5, 7, "porkchopRaw") + ADD_ICON(5, 8, "porkchopCooked") + ADD_ICON(5, 9, "fishRaw") + ADD_ICON(5, 10, "fishCooked") + ADD_ICON(5, 11, "rottenFlesh") + ADD_ICON(5, 12, "cookie") + ADD_ICON(5, 13, "shears") + ADD_ICON(5, 14, "dyePowder_red") + ADD_ICON(5, 15, "dyePowder_pink") - ADD_ICON(6, 0, L"pickaxeWood") - ADD_ICON(6, 1, L"pickaxeStone") - ADD_ICON(6, 2, L"pickaxeIron") - ADD_ICON(6, 3, L"pickaxeDiamond") - ADD_ICON(6, 4, L"pickaxeGold") - ADD_ICON(6, 5, L"bow_pull_0") - ADD_ICON(6, 6, L"carrotOnAStick") - ADD_ICON(6, 7, L"leather") - ADD_ICON(6, 8, L"saddle") - ADD_ICON(6, 9, L"beefRaw") - ADD_ICON(6, 10, L"beefCooked") - ADD_ICON(6, 11, L"enderPearl") - ADD_ICON(6, 12, L"blazeRod") - ADD_ICON(6, 13, L"melon") - ADD_ICON(6, 14, L"dyePowder_green") - ADD_ICON(6, 15, L"dyePowder_lime") + ADD_ICON(6, 0, "pickaxeWood") + ADD_ICON(6, 1, "pickaxeStone") + ADD_ICON(6, 2, "pickaxeIron") + ADD_ICON(6, 3, "pickaxeDiamond") + ADD_ICON(6, 4, "pickaxeGold") + ADD_ICON(6, 5, "bow_pull_0") + ADD_ICON(6, 6, "carrotOnAStick") + ADD_ICON(6, 7, "leather") + ADD_ICON(6, 8, "saddle") + ADD_ICON(6, 9, "beefRaw") + ADD_ICON(6, 10, "beefCooked") + ADD_ICON(6, 11, "enderPearl") + ADD_ICON(6, 12, "blazeRod") + ADD_ICON(6, 13, "melon") + ADD_ICON(6, 14, "dyePowder_green") + ADD_ICON(6, 15, "dyePowder_lime") - ADD_ICON(7, 0, L"hatchetWood") - ADD_ICON(7, 1, L"hatchetStone") - ADD_ICON(7, 2, L"hatchetIron") - ADD_ICON(7, 3, L"hatchetDiamond") - ADD_ICON(7, 4, L"hatchetGold") - ADD_ICON(7, 5, L"bow_pull_1") - ADD_ICON(7, 6, L"potatoBaked") - ADD_ICON(7, 7, L"potato") - ADD_ICON(7, 8, L"carrots") - ADD_ICON(7, 9, L"chickenRaw") - ADD_ICON(7, 10, L"chickenCooked") - ADD_ICON(7, 11, L"ghastTear") - ADD_ICON(7, 12, L"goldNugget") - ADD_ICON(7, 13, L"netherStalkSeeds") - ADD_ICON(7, 14, L"dyePowder_brown") - ADD_ICON(7, 15, L"dyePowder_yellow") + ADD_ICON(7, 0, "hatchetWood") + ADD_ICON(7, 1, "hatchetStone") + ADD_ICON(7, 2, "hatchetIron") + ADD_ICON(7, 3, "hatchetDiamond") + ADD_ICON(7, 4, "hatchetGold") + ADD_ICON(7, 5, "bow_pull_1") + ADD_ICON(7, 6, "potatoBaked") + ADD_ICON(7, 7, "potato") + ADD_ICON(7, 8, "carrots") + ADD_ICON(7, 9, "chickenRaw") + ADD_ICON(7, 10, "chickenCooked") + ADD_ICON(7, 11, "ghastTear") + ADD_ICON(7, 12, "goldNugget") + ADD_ICON(7, 13, "netherStalkSeeds") + ADD_ICON(7, 14, "dyePowder_brown") + ADD_ICON(7, 15, "dyePowder_yellow") - ADD_ICON(8, 0, L"hoeWood") - ADD_ICON(8, 1, L"hoeStone") - ADD_ICON(8, 2, L"hoeIron") - ADD_ICON(8, 3, L"hoeDiamond") - ADD_ICON(8, 4, L"hoeGold") - ADD_ICON(8, 5, L"bow_pull_2") - ADD_ICON(8, 6, L"potatoPoisonous") - ADD_ICON(8, 7, L"minecart") - ADD_ICON(8, 8, L"boat") - ADD_ICON(8, 9, L"speckledMelon") - ADD_ICON(8, 10, L"fermentedSpiderEye") - ADD_ICON(8, 11, L"spiderEye") - ADD_ICON(8, 12, L"potion") - ADD_ICON(8, 12, L"glassBottle") // Same as potion - ADD_ICON(8, 13, L"potion_contents") - ADD_ICON(8, 14, L"dyePowder_blue") - ADD_ICON(8, 15, L"dyePowder_light_blue") + ADD_ICON(8, 0, "hoeWood") + ADD_ICON(8, 1, "hoeStone") + ADD_ICON(8, 2, "hoeIron") + ADD_ICON(8, 3, "hoeDiamond") + ADD_ICON(8, 4, "hoeGold") + ADD_ICON(8, 5, "bow_pull_2") + ADD_ICON(8, 6, "potatoPoisonous") + ADD_ICON(8, 7, "minecart") + ADD_ICON(8, 8, "boat") + ADD_ICON(8, 9, "speckledMelon") + ADD_ICON(8, 10, "fermentedSpiderEye") + ADD_ICON(8, 11, "spiderEye") + ADD_ICON(8, 12, "potion") + ADD_ICON(8, 12, "glassBottle") // Same as potion + ADD_ICON(8, 13, "potion_contents") + ADD_ICON(8, 14, "dyePowder_blue") + ADD_ICON(8, 15, "dyePowder_light_blue") - ADD_ICON(9, 0, L"helmetCloth_overlay") - // ADD_ICON(9, 1, L"unused") - ADD_ICON(9, 2, L"iron_horse_armor") - ADD_ICON(9, 3, L"diamond_horse_armor") - ADD_ICON(9, 4, L"gold_horse_armor") - ADD_ICON(9, 5, L"comparator") - ADD_ICON(9, 6, L"carrotGolden") - ADD_ICON(9, 7, L"minecart_chest") - ADD_ICON(9, 8, L"pumpkinPie") - ADD_ICON(9, 9, L"monsterPlacer") - ADD_ICON(9, 10, L"potion_splash") - ADD_ICON(9, 11, L"eyeOfEnder") - ADD_ICON(9, 12, L"cauldron") - ADD_ICON(9, 13, L"blazePowder") - ADD_ICON(9, 14, L"dyePowder_purple") - ADD_ICON(9, 15, L"dyePowder_magenta") + ADD_ICON(9, 0, "helmetCloth_overlay") + // ADD_ICON(9, 1, "unused") + ADD_ICON(9, 2, "iron_horse_armor") + ADD_ICON(9, 3, "diamond_horse_armor") + ADD_ICON(9, 4, "gold_horse_armor") + ADD_ICON(9, 5, "comparator") + ADD_ICON(9, 6, "carrotGolden") + ADD_ICON(9, 7, "minecart_chest") + ADD_ICON(9, 8, "pumpkinPie") + ADD_ICON(9, 9, "monsterPlacer") + ADD_ICON(9, 10, "potion_splash") + ADD_ICON(9, 11, "eyeOfEnder") + ADD_ICON(9, 12, "cauldron") + ADD_ICON(9, 13, "blazePowder") + ADD_ICON(9, 14, "dyePowder_purple") + ADD_ICON(9, 15, "dyePowder_magenta") - ADD_ICON(10, 0, L"chestplateCloth_overlay") - // ADD_ICON(10, 1, L"unused") - // ADD_ICON(10, 2, L"unused") - ADD_ICON(10, 3, L"name_tag") - ADD_ICON(10, 4, L"lead") - ADD_ICON(10, 5, L"netherbrick") - // ADD_ICON(10, 6, L"unused") - ADD_ICON(10, 7, L"minecart_furnace") - ADD_ICON(10, 8, L"charcoal") - ADD_ICON(10, 9, L"monsterPlacer_overlay") - ADD_ICON(10, 10, L"ruby") - ADD_ICON(10, 11, L"expBottle") - ADD_ICON(10, 12, L"brewingStand") - ADD_ICON(10, 13, L"magmaCream") - ADD_ICON(10, 14, L"dyePowder_cyan") - ADD_ICON(10, 15, L"dyePowder_orange") + ADD_ICON(10, 0, "chestplateCloth_overlay") + // ADD_ICON(10, 1, "unused") + // ADD_ICON(10, 2, "unused") + ADD_ICON(10, 3, "name_tag") + ADD_ICON(10, 4, "lead") + ADD_ICON(10, 5, "netherbrick") + // ADD_ICON(10, 6, "unused") + ADD_ICON(10, 7, "minecart_furnace") + ADD_ICON(10, 8, "charcoal") + ADD_ICON(10, 9, "monsterPlacer_overlay") + ADD_ICON(10, 10, "ruby") + ADD_ICON(10, 11, "expBottle") + ADD_ICON(10, 12, "brewingStand") + ADD_ICON(10, 13, "magmaCream") + ADD_ICON(10, 14, "dyePowder_cyan") + ADD_ICON(10, 15, "dyePowder_orange") - ADD_ICON(11, 0, L"leggingsCloth_overlay") - // ADD_ICON(11, 1, L"unused") - // ADD_ICON(11, 2, L"unused") - // ADD_ICON(11, 3, L"unused") - // ADD_ICON(11, 4, L"unused") - // ADD_ICON(11, 5, L"unused") - // ADD_ICON(11, 6, L"unused") - ADD_ICON(11, 7, L"minecart_hopper") - ADD_ICON(11, 8, L"hopper") - ADD_ICON(11, 9, L"nether_star") - ADD_ICON(11, 10, L"emerald") - ADD_ICON(11, 11, L"writingBook") - ADD_ICON(11, 12, L"writtenBook") - ADD_ICON(11, 13, L"flowerPot") - ADD_ICON(11, 14, L"dyePowder_silver") - ADD_ICON(11, 15, L"dyePowder_white") + ADD_ICON(11, 0, "leggingsCloth_overlay") + // ADD_ICON(11, 1, "unused") + // ADD_ICON(11, 2, "unused") + // ADD_ICON(11, 3, "unused") + // ADD_ICON(11, 4, "unused") + // ADD_ICON(11, 5, "unused") + // ADD_ICON(11, 6, "unused") + ADD_ICON(11, 7, "minecart_hopper") + ADD_ICON(11, 8, "hopper") + ADD_ICON(11, 9, "nether_star") + ADD_ICON(11, 10, "emerald") + ADD_ICON(11, 11, "writingBook") + ADD_ICON(11, 12, "writtenBook") + ADD_ICON(11, 13, "flowerPot") + ADD_ICON(11, 14, "dyePowder_silver") + ADD_ICON(11, 15, "dyePowder_white") - ADD_ICON(12, 0, L"bootsCloth_overlay") - // ADD_ICON(12, 1, L"unused") - // ADD_ICON(12, 2, L"unused") - // ADD_ICON(12, 3, L"unused") - // ADD_ICON(12, 4, L"unused") - // ADD_ICON(12, 5, L"unused") - // ADD_ICON(12, 6, L"unused") - ADD_ICON(12, 7, L"minecart_tnt") - // ADD_ICON(12, 8, L"unused") - ADD_ICON(12, 9, L"fireworks") - ADD_ICON(12, 10, L"fireworks_charge") - ADD_ICON(12, 11, L"fireworks_charge_overlay") - ADD_ICON(12, 12, L"netherquartz") - ADD_ICON(12, 13, L"map_empty") - ADD_ICON(12, 14, L"frame") - ADD_ICON(12, 15, L"enchantedBook") + ADD_ICON(12, 0, "bootsCloth_overlay") + // ADD_ICON(12, 1, "unused") + // ADD_ICON(12, 2, "unused") + // ADD_ICON(12, 3, "unused") + // ADD_ICON(12, 4, "unused") + // ADD_ICON(12, 5, "unused") + // ADD_ICON(12, 6, "unused") + ADD_ICON(12, 7, "minecart_tnt") + // ADD_ICON(12, 8, "unused") + ADD_ICON(12, 9, "fireworks") + ADD_ICON(12, 10, "fireworks_charge") + ADD_ICON(12, 11, "fireworks_charge_overlay") + ADD_ICON(12, 12, "netherquartz") + ADD_ICON(12, 13, "map_empty") + ADD_ICON(12, 14, "frame") + ADD_ICON(12, 15, "enchantedBook") - ADD_ICON(14, 0, L"skull_skeleton") - ADD_ICON(14, 1, L"skull_wither") - ADD_ICON(14, 2, L"skull_zombie") - ADD_ICON(14, 3, L"skull_char") - ADD_ICON(14, 4, L"skull_creeper") - // ADD_ICON(14, 5, L"unused") - // ADD_ICON(14, 6, L"unused") - ADD_ICON_WITH_NAME(14, 7, L"compassP0", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 8, L"compassP1", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 9, L"compassP2", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 10, L"compassP3", L"compass") // 4J Added - ADD_ICON_WITH_NAME(14, 11, L"clockP0", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 12, L"clockP1", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 13, L"clockP2", L"clock") // 4J Added - ADD_ICON_WITH_NAME(14, 14, L"clockP3", L"clock") // 4J Added - ADD_ICON(14, 15, L"dragonFireball") + ADD_ICON(14, 0, "skull_skeleton") + ADD_ICON(14, 1, "skull_wither") + ADD_ICON(14, 2, "skull_zombie") + ADD_ICON(14, 3, "skull_char") + ADD_ICON(14, 4, "skull_creeper") + // ADD_ICON(14, 5, "unused") + // ADD_ICON(14, 6, "unused") + ADD_ICON_WITH_NAME(14, 7, "compassP0", "compass") // 4J Added + ADD_ICON_WITH_NAME(14, 8, "compassP1", "compass") // 4J Added + ADD_ICON_WITH_NAME(14, 9, "compassP2", "compass") // 4J Added + ADD_ICON_WITH_NAME(14, 10, "compassP3", "compass") // 4J Added + ADD_ICON_WITH_NAME(14, 11, "clockP0", "clock") // 4J Added + ADD_ICON_WITH_NAME(14, 12, "clockP1", "clock") // 4J Added + ADD_ICON_WITH_NAME(14, 13, "clockP2", "clock") // 4J Added + ADD_ICON_WITH_NAME(14, 14, "clockP3", "clock") // 4J Added + ADD_ICON(14, 15, "dragonFireball") - ADD_ICON(15, 0, L"record_13") - ADD_ICON(15, 1, L"record_cat") - ADD_ICON(15, 2, L"record_blocks") - ADD_ICON(15, 3, L"record_chirp") - ADD_ICON(15, 4, L"record_far") - ADD_ICON(15, 5, L"record_mall") - ADD_ICON(15, 6, L"record_mellohi") - ADD_ICON(15, 7, L"record_stal") - ADD_ICON(15, 8, L"record_strad") - ADD_ICON(15, 9, L"record_ward") - ADD_ICON(15, 10, L"record_11") - ADD_ICON(15, 11, L"record_where are we now") + ADD_ICON(15, 0, "record_13") + ADD_ICON(15, 1, "record_cat") + ADD_ICON(15, 2, "record_blocks") + ADD_ICON(15, 3, "record_chirp") + ADD_ICON(15, 4, "record_far") + ADD_ICON(15, 5, "record_mall") + ADD_ICON(15, 6, "record_mellohi") + ADD_ICON(15, 7, "record_stal") + ADD_ICON(15, 8, "record_strad") + ADD_ICON(15, 9, "record_ward") + ADD_ICON(15, 10, "record_11") + ADD_ICON(15, 11, "record_where are we now") // Special cases ClockTexture* dataClock = new ClockTexture(); - Icon* oldClock = texturesByName[L"clock"]; + Icon* oldClock = texturesByName["clock"]; dataClock->initUVs(oldClock->getU0(), oldClock->getV0(), oldClock->getU1(), oldClock->getV1()); delete oldClock; - texturesByName[L"clock"] = dataClock; + texturesByName["clock"] = dataClock; ClockTexture* clock = new ClockTexture(0, dataClock); - oldClock = texturesByName[L"clockP0"]; + oldClock = texturesByName["clockP0"]; clock->initUVs(oldClock->getU0(), oldClock->getV0(), oldClock->getU1(), oldClock->getV1()); delete oldClock; - texturesByName[L"clockP0"] = clock; + texturesByName["clockP0"] = clock; clock = new ClockTexture(1, dataClock); - oldClock = texturesByName[L"clockP1"]; + oldClock = texturesByName["clockP1"]; clock->initUVs(oldClock->getU0(), oldClock->getV0(), oldClock->getU1(), oldClock->getV1()); delete oldClock; - texturesByName[L"clockP1"] = clock; + texturesByName["clockP1"] = clock; clock = new ClockTexture(2, dataClock); - oldClock = texturesByName[L"clockP2"]; + oldClock = texturesByName["clockP2"]; clock->initUVs(oldClock->getU0(), oldClock->getV0(), oldClock->getU1(), oldClock->getV1()); delete oldClock; - texturesByName[L"clockP2"] = clock; + texturesByName["clockP2"] = clock; clock = new ClockTexture(3, dataClock); - oldClock = texturesByName[L"clockP3"]; + oldClock = texturesByName["clockP3"]; clock->initUVs(oldClock->getU0(), oldClock->getV0(), oldClock->getU1(), oldClock->getV1()); delete oldClock; - texturesByName[L"clockP3"] = clock; + texturesByName["clockP3"] = clock; CompassTexture* dataCompass = new CompassTexture(); - Icon* oldCompass = texturesByName[L"compass"]; + Icon* oldCompass = texturesByName["compass"]; dataCompass->initUVs(oldCompass->getU0(), oldCompass->getV0(), oldCompass->getU1(), oldCompass->getV1()); delete oldCompass; - texturesByName[L"compass"] = dataCompass; + texturesByName["compass"] = dataCompass; CompassTexture* compass = new CompassTexture(0, dataCompass); - oldCompass = texturesByName[L"compassP0"]; + oldCompass = texturesByName["compassP0"]; compass->initUVs(oldCompass->getU0(), oldCompass->getV0(), oldCompass->getU1(), oldCompass->getV1()); delete oldCompass; - texturesByName[L"compassP0"] = compass; + texturesByName["compassP0"] = compass; compass = new CompassTexture(1, dataCompass); - oldCompass = texturesByName[L"compassP1"]; + oldCompass = texturesByName["compassP1"]; compass->initUVs(oldCompass->getU0(), oldCompass->getV0(), oldCompass->getU1(), oldCompass->getV1()); delete oldCompass; - texturesByName[L"compassP1"] = compass; + texturesByName["compassP1"] = compass; compass = new CompassTexture(2, dataCompass); - oldCompass = texturesByName[L"compassP2"]; + oldCompass = texturesByName["compassP2"]; compass->initUVs(oldCompass->getU0(), oldCompass->getV0(), oldCompass->getU1(), oldCompass->getV1()); delete oldCompass; - texturesByName[L"compassP2"] = compass; + texturesByName["compassP2"] = compass; compass = new CompassTexture(3, dataCompass); - oldCompass = texturesByName[L"compassP3"]; + oldCompass = texturesByName["compassP3"]; compass->initUVs(oldCompass->getU0(), oldCompass->getV0(), oldCompass->getU1(), oldCompass->getV1()); delete oldCompass; - texturesByName[L"compassP3"] = compass; + texturesByName["compassP3"] = compass; } else { float horizRatio = 1.0f / 16.0f; float vertRatio = 1.0f / 32.0f; - ADD_ICON(0, 0, L"grass_top") - texturesByName[L"grass_top"]->setFlags( + ADD_ICON(0, 0, "grass_top") + texturesByName["grass_top"]->setFlags( Icon::IS_GRASS_TOP); // 4J added for faster determination of // texture type in tesselation - ADD_ICON(0, 1, L"stone") - ADD_ICON(0, 2, L"dirt") - ADD_ICON(0, 3, L"grass_side") - texturesByName[L"grass_side"]->setFlags( + ADD_ICON(0, 1, "stone") + ADD_ICON(0, 2, "dirt") + ADD_ICON(0, 3, "grass_side") + texturesByName["grass_side"]->setFlags( Icon::IS_GRASS_SIDE); // 4J added for faster determination of // texture type in tesselation - ADD_ICON(0, 4, L"planks_oak") - ADD_ICON(0, 5, L"stoneslab_side") - ADD_ICON(0, 6, L"stoneslab_top") - ADD_ICON(0, 7, L"brick") - ADD_ICON(0, 8, L"tnt_side") - ADD_ICON(0, 9, L"tnt_top") - ADD_ICON(0, 10, L"tnt_bottom") - ADD_ICON(0, 11, L"web") - ADD_ICON(0, 12, L"flower_rose") - ADD_ICON(0, 13, L"flower_dandelion") - ADD_ICON(0, 14, L"portal") - ADD_ICON(0, 15, L"sapling") + ADD_ICON(0, 4, "planks_oak") + ADD_ICON(0, 5, "stoneslab_side") + ADD_ICON(0, 6, "stoneslab_top") + ADD_ICON(0, 7, "brick") + ADD_ICON(0, 8, "tnt_side") + ADD_ICON(0, 9, "tnt_top") + ADD_ICON(0, 10, "tnt_bottom") + ADD_ICON(0, 11, "web") + ADD_ICON(0, 12, "flower_rose") + ADD_ICON(0, 13, "flower_dandelion") + ADD_ICON(0, 14, "portal") + ADD_ICON(0, 15, "sapling") - ADD_ICON(1, 0, L"cobblestone"); - ADD_ICON(1, 1, L"bedrock"); - ADD_ICON(1, 2, L"sand"); - ADD_ICON(1, 3, L"gravel"); - ADD_ICON(1, 4, L"log_oak"); - ADD_ICON(1, 5, L"log_oak_top"); - ADD_ICON(1, 6, L"iron_block"); - ADD_ICON(1, 7, L"gold_block"); - ADD_ICON(1, 8, L"diamond_block"); - ADD_ICON(1, 9, L"emerald_block"); - ADD_ICON(1, 10, L"redstone_block"); - ADD_ICON(1, 11, L"dropper_front_horizontal"); - ADD_ICON(1, 12, L"mushroom_red"); - ADD_ICON(1, 13, L"mushroom_brown"); - ADD_ICON(1, 14, L"sapling_jungle"); - ADD_ICON(1, 15, L"fire_0"); + ADD_ICON(1, 0, "cobblestone"); + ADD_ICON(1, 1, "bedrock"); + ADD_ICON(1, 2, "sand"); + ADD_ICON(1, 3, "gravel"); + ADD_ICON(1, 4, "log_oak"); + ADD_ICON(1, 5, "log_oak_top"); + ADD_ICON(1, 6, "iron_block"); + ADD_ICON(1, 7, "gold_block"); + ADD_ICON(1, 8, "diamond_block"); + ADD_ICON(1, 9, "emerald_block"); + ADD_ICON(1, 10, "redstone_block"); + ADD_ICON(1, 11, "dropper_front_horizontal"); + ADD_ICON(1, 12, "mushroom_red"); + ADD_ICON(1, 13, "mushroom_brown"); + ADD_ICON(1, 14, "sapling_jungle"); + ADD_ICON(1, 15, "fire_0"); - ADD_ICON(2, 0, L"gold_ore"); - ADD_ICON(2, 1, L"iron_ore"); - ADD_ICON(2, 2, L"coal_ore"); - ADD_ICON(2, 3, L"bookshelf"); - ADD_ICON(2, 4, L"cobblestone_mossy"); - ADD_ICON(2, 5, L"obsidian"); - ADD_ICON(2, 6, L"grass_side_overlay"); - ADD_ICON(2, 7, L"tallgrass"); - ADD_ICON(2, 8, L"dispenser_front_vertical"); - ADD_ICON(2, 9, L"beacon"); - ADD_ICON(2, 10, L"dropper_front_vertical"); - ADD_ICON(2, 11, L"workbench_top"); - ADD_ICON(2, 12, L"furnace_front"); - ADD_ICON(2, 13, L"furnace_side"); - ADD_ICON(2, 14, L"dispenser_front"); - ADD_ICON(2, 15, L"fire_1"); + ADD_ICON(2, 0, "gold_ore"); + ADD_ICON(2, 1, "iron_ore"); + ADD_ICON(2, 2, "coal_ore"); + ADD_ICON(2, 3, "bookshelf"); + ADD_ICON(2, 4, "cobblestone_mossy"); + ADD_ICON(2, 5, "obsidian"); + ADD_ICON(2, 6, "grass_side_overlay"); + ADD_ICON(2, 7, "tallgrass"); + ADD_ICON(2, 8, "dispenser_front_vertical"); + ADD_ICON(2, 9, "beacon"); + ADD_ICON(2, 10, "dropper_front_vertical"); + ADD_ICON(2, 11, "workbench_top"); + ADD_ICON(2, 12, "furnace_front"); + ADD_ICON(2, 13, "furnace_side"); + ADD_ICON(2, 14, "dispenser_front"); + ADD_ICON(2, 15, "fire_1"); - ADD_ICON(3, 0, L"sponge"); - ADD_ICON(3, 1, L"glass"); - ADD_ICON(3, 2, L"diamond_ore"); - ADD_ICON(3, 3, L"redstone_ore"); - ADD_ICON(3, 4, L"leaves"); - ADD_ICON(3, 5, L"leaves_opaque"); - ADD_ICON(3, 6, L"stonebrick"); - ADD_ICON(3, 7, L"deadbush"); - ADD_ICON(3, 8, L"fern"); - ADD_ICON(3, 9, L"daylight_detector_top"); - ADD_ICON(3, 10, L"daylight_detector_side"); - ADD_ICON(3, 11, L"workbench_side"); - ADD_ICON(3, 12, L"workbench_front"); - ADD_ICON(3, 13, L"furnace_front_lit"); - ADD_ICON(3, 14, L"furnace_top"); - ADD_ICON(3, 15, L"sapling_spruce"); + ADD_ICON(3, 0, "sponge"); + ADD_ICON(3, 1, "glass"); + ADD_ICON(3, 2, "diamond_ore"); + ADD_ICON(3, 3, "redstone_ore"); + ADD_ICON(3, 4, "leaves"); + ADD_ICON(3, 5, "leaves_opaque"); + ADD_ICON(3, 6, "stonebrick"); + ADD_ICON(3, 7, "deadbush"); + ADD_ICON(3, 8, "fern"); + ADD_ICON(3, 9, "daylight_detector_top"); + ADD_ICON(3, 10, "daylight_detector_side"); + ADD_ICON(3, 11, "workbench_side"); + ADD_ICON(3, 12, "workbench_front"); + ADD_ICON(3, 13, "furnace_front_lit"); + ADD_ICON(3, 14, "furnace_top"); + ADD_ICON(3, 15, "sapling_spruce"); - ADD_ICON(4, 0, L"wool_colored_white"); - ADD_ICON(4, 1, L"mob_spawner"); - ADD_ICON(4, 2, L"snow"); - ADD_ICON(4, 3, L"ice"); - ADD_ICON(4, 4, L"snow_side"); - ADD_ICON(4, 5, L"cactus_top"); - ADD_ICON(4, 6, L"cactus_side"); - ADD_ICON(4, 7, L"cactus_bottom"); - ADD_ICON(4, 8, L"clay"); - ADD_ICON(4, 9, L"reeds"); - ADD_ICON(4, 10, L"jukebox_side"); - ADD_ICON(4, 11, L"jukebox_top"); - ADD_ICON(4, 12, L"waterlily"); - ADD_ICON(4, 13, L"mycel_side"); - ADD_ICON(4, 14, L"mycel_top"); - ADD_ICON(4, 15, L"sapling_birch"); + ADD_ICON(4, 0, "wool_colored_white"); + ADD_ICON(4, 1, "mob_spawner"); + ADD_ICON(4, 2, "snow"); + ADD_ICON(4, 3, "ice"); + ADD_ICON(4, 4, "snow_side"); + ADD_ICON(4, 5, "cactus_top"); + ADD_ICON(4, 6, "cactus_side"); + ADD_ICON(4, 7, "cactus_bottom"); + ADD_ICON(4, 8, "clay"); + ADD_ICON(4, 9, "reeds"); + ADD_ICON(4, 10, "jukebox_side"); + ADD_ICON(4, 11, "jukebox_top"); + ADD_ICON(4, 12, "waterlily"); + ADD_ICON(4, 13, "mycel_side"); + ADD_ICON(4, 14, "mycel_top"); + ADD_ICON(4, 15, "sapling_birch"); - ADD_ICON(5, 0, L"torch_on"); - ADD_ICON(5, 1, L"door_wood_upper"); - ADD_ICON(5, 2, L"door_iron_upper"); - ADD_ICON(5, 3, L"ladder"); - ADD_ICON(5, 4, L"trapdoor"); - ADD_ICON(5, 5, L"iron_bars"); - ADD_ICON(5, 6, L"farmland_wet"); - ADD_ICON(5, 7, L"farmland_dry"); - ADD_ICON(5, 8, L"crops_0"); - ADD_ICON(5, 9, L"crops_1"); - ADD_ICON(5, 10, L"crops_2"); - ADD_ICON(5, 11, L"crops_3"); - ADD_ICON(5, 12, L"crops_4"); - ADD_ICON(5, 13, L"crops_5"); - ADD_ICON(5, 14, L"crops_6"); - ADD_ICON(5, 15, L"crops_7"); + ADD_ICON(5, 0, "torch_on"); + ADD_ICON(5, 1, "door_wood_upper"); + ADD_ICON(5, 2, "door_iron_upper"); + ADD_ICON(5, 3, "ladder"); + ADD_ICON(5, 4, "trapdoor"); + ADD_ICON(5, 5, "iron_bars"); + ADD_ICON(5, 6, "farmland_wet"); + ADD_ICON(5, 7, "farmland_dry"); + ADD_ICON(5, 8, "crops_0"); + ADD_ICON(5, 9, "crops_1"); + ADD_ICON(5, 10, "crops_2"); + ADD_ICON(5, 11, "crops_3"); + ADD_ICON(5, 12, "crops_4"); + ADD_ICON(5, 13, "crops_5"); + ADD_ICON(5, 14, "crops_6"); + ADD_ICON(5, 15, "crops_7"); - ADD_ICON(6, 0, L"lever"); - ADD_ICON(6, 1, L"door_wood_lower"); - ADD_ICON(6, 2, L"door_iron_lower"); - ADD_ICON(6, 3, L"redstone_torch_on"); - ADD_ICON(6, 4, L"stonebrick_mossy"); - ADD_ICON(6, 5, L"stonebrick_cracked"); - ADD_ICON(6, 6, L"pumpkin_top"); - ADD_ICON(6, 7, L"netherrack"); - ADD_ICON(6, 8, L"soul_sand"); - ADD_ICON(6, 9, L"glowstone"); - ADD_ICON(6, 10, L"piston_top_sticky"); - ADD_ICON(6, 11, L"piston_top"); - ADD_ICON(6, 12, L"piston_side"); - ADD_ICON(6, 13, L"piston_bottom"); - ADD_ICON(6, 14, L"piston_inner_top"); - ADD_ICON(6, 15, L"stem_straight"); + ADD_ICON(6, 0, "lever"); + ADD_ICON(6, 1, "door_wood_lower"); + ADD_ICON(6, 2, "door_iron_lower"); + ADD_ICON(6, 3, "redstone_torch_on"); + ADD_ICON(6, 4, "stonebrick_mossy"); + ADD_ICON(6, 5, "stonebrick_cracked"); + ADD_ICON(6, 6, "pumpkin_top"); + ADD_ICON(6, 7, "netherrack"); + ADD_ICON(6, 8, "soul_sand"); + ADD_ICON(6, 9, "glowstone"); + ADD_ICON(6, 10, "piston_top_sticky"); + ADD_ICON(6, 11, "piston_top"); + ADD_ICON(6, 12, "piston_side"); + ADD_ICON(6, 13, "piston_bottom"); + ADD_ICON(6, 14, "piston_inner_top"); + ADD_ICON(6, 15, "stem_straight"); - ADD_ICON(7, 0, L"rail_normal_turned"); - ADD_ICON(7, 1, L"wool_colored_black"); - ADD_ICON(7, 2, L"wool_colored_gray"); - ADD_ICON(7, 3, L"redstone_torch_off"); - ADD_ICON(7, 4, L"log_spruce"); - ADD_ICON(7, 5, L"log_birch"); - ADD_ICON(7, 6, L"pumpkin_side"); - ADD_ICON(7, 7, L"pumpkin_face_off"); - ADD_ICON(7, 8, L"pumpkin_face_on"); - ADD_ICON(7, 9, L"cake_top"); - ADD_ICON(7, 10, L"cake_side"); - ADD_ICON(7, 11, L"cake_inner"); - ADD_ICON(7, 12, L"cake_bottom"); - ADD_ICON(7, 13, L"mushroom_block_skin_red"); - ADD_ICON(7, 14, L"mushroom_block_skin_brown"); - ADD_ICON(7, 15, L"stem_bent"); + ADD_ICON(7, 0, "rail_normal_turned"); + ADD_ICON(7, 1, "wool_colored_black"); + ADD_ICON(7, 2, "wool_colored_gray"); + ADD_ICON(7, 3, "redstone_torch_off"); + ADD_ICON(7, 4, "log_spruce"); + ADD_ICON(7, 5, "log_birch"); + ADD_ICON(7, 6, "pumpkin_side"); + ADD_ICON(7, 7, "pumpkin_face_off"); + ADD_ICON(7, 8, "pumpkin_face_on"); + ADD_ICON(7, 9, "cake_top"); + ADD_ICON(7, 10, "cake_side"); + ADD_ICON(7, 11, "cake_inner"); + ADD_ICON(7, 12, "cake_bottom"); + ADD_ICON(7, 13, "mushroom_block_skin_red"); + ADD_ICON(7, 14, "mushroom_block_skin_brown"); + ADD_ICON(7, 15, "stem_bent"); - ADD_ICON(8, 0, L"rail_normal"); - ADD_ICON(8, 1, L"wool_colored_red"); - ADD_ICON(8, 2, L"wool_colored_pink"); - ADD_ICON(8, 3, L"repeater_off"); - ADD_ICON(8, 4, L"leaves_spruce"); - ADD_ICON(8, 5, L"leaves_spruce_opaque"); - ADD_ICON(8, 6, L"bed_feet_top"); - ADD_ICON(8, 7, L"bed_head_top"); - ADD_ICON(8, 8, L"melon_side"); - ADD_ICON(8, 9, L"melon_top"); - ADD_ICON(8, 10, L"cauldron_top"); - ADD_ICON(8, 11, L"cauldron_inner"); - // ADD_ICON(8, 12, L"unused"); - ADD_ICON(8, 13, L"mushroom_block_skin_stem"); - ADD_ICON(8, 14, L"mushroom_block_inside"); - ADD_ICON(8, 15, L"vine"); + ADD_ICON(8, 0, "rail_normal"); + ADD_ICON(8, 1, "wool_colored_red"); + ADD_ICON(8, 2, "wool_colored_pink"); + ADD_ICON(8, 3, "repeater_off"); + ADD_ICON(8, 4, "leaves_spruce"); + ADD_ICON(8, 5, "leaves_spruce_opaque"); + ADD_ICON(8, 6, "bed_feet_top"); + ADD_ICON(8, 7, "bed_head_top"); + ADD_ICON(8, 8, "melon_side"); + ADD_ICON(8, 9, "melon_top"); + ADD_ICON(8, 10, "cauldron_top"); + ADD_ICON(8, 11, "cauldron_inner"); + // ADD_ICON(8, 12, "unused"); + ADD_ICON(8, 13, "mushroom_block_skin_stem"); + ADD_ICON(8, 14, "mushroom_block_inside"); + ADD_ICON(8, 15, "vine"); - ADD_ICON(9, 0, L"lapis_block"); - ADD_ICON(9, 1, L"wool_colored_green"); - ADD_ICON(9, 2, L"wool_colored_lime"); - ADD_ICON(9, 3, L"repeater_on"); - ADD_ICON(9, 4, L"glass_pane_top"); - ADD_ICON(9, 5, L"bed_feet_end"); - ADD_ICON(9, 6, L"bed_feet_side"); - ADD_ICON(9, 7, L"bed_head_side"); - ADD_ICON(9, 8, L"bed_head_end"); - ADD_ICON(9, 9, L"log_jungle"); - ADD_ICON(9, 10, L"cauldron_side"); - ADD_ICON(9, 11, L"cauldron_bottom"); - ADD_ICON(9, 12, L"brewing_stand_base"); - ADD_ICON(9, 13, L"brewing_stand"); - ADD_ICON(9, 14, L"endframe_top"); - ADD_ICON(9, 15, L"endframe_side"); + ADD_ICON(9, 0, "lapis_block"); + ADD_ICON(9, 1, "wool_colored_green"); + ADD_ICON(9, 2, "wool_colored_lime"); + ADD_ICON(9, 3, "repeater_on"); + ADD_ICON(9, 4, "glass_pane_top"); + ADD_ICON(9, 5, "bed_feet_end"); + ADD_ICON(9, 6, "bed_feet_side"); + ADD_ICON(9, 7, "bed_head_side"); + ADD_ICON(9, 8, "bed_head_end"); + ADD_ICON(9, 9, "log_jungle"); + ADD_ICON(9, 10, "cauldron_side"); + ADD_ICON(9, 11, "cauldron_bottom"); + ADD_ICON(9, 12, "brewing_stand_base"); + ADD_ICON(9, 13, "brewing_stand"); + ADD_ICON(9, 14, "endframe_top"); + ADD_ICON(9, 15, "endframe_side"); - ADD_ICON(10, 0, L"lapis_ore"); - ADD_ICON(10, 1, L"wool_colored_brown"); - ADD_ICON(10, 2, L"wool_colored_yellow"); - ADD_ICON(10, 3, L"rail_golden"); - ADD_ICON(10, 4, L"redstone_dust_cross"); - ADD_ICON(10, 5, L"redstone_dust_line"); - ADD_ICON(10, 6, L"enchantment_top"); - ADD_ICON(10, 7, L"dragon_egg"); - ADD_ICON(10, 8, L"cocoa_2"); - ADD_ICON(10, 9, L"cocoa_1"); - ADD_ICON(10, 10, L"cocoa_0"); - ADD_ICON(10, 11, L"emerald_ore"); - ADD_ICON(10, 12, L"trip_wire_source"); - ADD_ICON(10, 13, L"trip_wire"); - ADD_ICON(10, 14, L"endframe_eye"); - ADD_ICON(10, 15, L"end_stone"); + ADD_ICON(10, 0, "lapis_ore"); + ADD_ICON(10, 1, "wool_colored_brown"); + ADD_ICON(10, 2, "wool_colored_yellow"); + ADD_ICON(10, 3, "rail_golden"); + ADD_ICON(10, 4, "redstone_dust_cross"); + ADD_ICON(10, 5, "redstone_dust_line"); + ADD_ICON(10, 6, "enchantment_top"); + ADD_ICON(10, 7, "dragon_egg"); + ADD_ICON(10, 8, "cocoa_2"); + ADD_ICON(10, 9, "cocoa_1"); + ADD_ICON(10, 10, "cocoa_0"); + ADD_ICON(10, 11, "emerald_ore"); + ADD_ICON(10, 12, "trip_wire_source"); + ADD_ICON(10, 13, "trip_wire"); + ADD_ICON(10, 14, "endframe_eye"); + ADD_ICON(10, 15, "end_stone"); - ADD_ICON(11, 0, L"sandstone_top"); - ADD_ICON(11, 1, L"wool_colored_blue"); - ADD_ICON(11, 2, L"wool_colored_light_blue"); - ADD_ICON(11, 3, L"rail_golden_powered"); - ADD_ICON(11, 4, L"redstone_dust_cross_overlay"); - ADD_ICON(11, 5, L"redstone_dust_line_overlay"); - ADD_ICON(11, 6, L"enchantment_side"); - ADD_ICON(11, 7, L"enchantment_bottom"); - ADD_ICON(11, 8, L"command_block"); - ADD_ICON(11, 9, L"itemframe_back"); - ADD_ICON(11, 10, L"flower_pot"); - ADD_ICON(11, 11, L"comparator_off"); - ADD_ICON(11, 12, L"comparator_on"); - ADD_ICON(11, 13, L"rail_activator"); - ADD_ICON(11, 14, L"rail_activator_powered"); - ADD_ICON(11, 15, L"quartz_ore"); + ADD_ICON(11, 0, "sandstone_top"); + ADD_ICON(11, 1, "wool_colored_blue"); + ADD_ICON(11, 2, "wool_colored_light_blue"); + ADD_ICON(11, 3, "rail_golden_powered"); + ADD_ICON(11, 4, "redstone_dust_cross_overlay"); + ADD_ICON(11, 5, "redstone_dust_line_overlay"); + ADD_ICON(11, 6, "enchantment_side"); + ADD_ICON(11, 7, "enchantment_bottom"); + ADD_ICON(11, 8, "command_block"); + ADD_ICON(11, 9, "itemframe_back"); + ADD_ICON(11, 10, "flower_pot"); + ADD_ICON(11, 11, "comparator_off"); + ADD_ICON(11, 12, "comparator_on"); + ADD_ICON(11, 13, "rail_activator"); + ADD_ICON(11, 14, "rail_activator_powered"); + ADD_ICON(11, 15, "quartz_ore"); - ADD_ICON(12, 0, L"sandstone_side"); - ADD_ICON(12, 1, L"wool_colored_purple"); - ADD_ICON(12, 2, L"wool_colored_magenta"); - ADD_ICON(12, 3, L"detectorRail"); - ADD_ICON(12, 4, L"leaves_jungle"); - ADD_ICON(12, 5, L"leaves_jungle_opaque"); - ADD_ICON(12, 6, L"planks_spruce"); - ADD_ICON(12, 7, L"planks_jungle"); - ADD_ICON(12, 8, L"carrots_stage_0"); - ADD_ICON(12, 9, L"carrots_stage_1"); - ADD_ICON(12, 10, L"carrots_stage_2"); - ADD_ICON(12, 11, L"carrots_stage_3"); - // ADD_ICON(12, 12, L"unused"); - ADD_ICON(12, 13, L"water"); - ADD_ICON_SIZE(12, 14, L"water_flow", 2, 2); + ADD_ICON(12, 0, "sandstone_side"); + ADD_ICON(12, 1, "wool_colored_purple"); + ADD_ICON(12, 2, "wool_colored_magenta"); + ADD_ICON(12, 3, "detectorRail"); + ADD_ICON(12, 4, "leaves_jungle"); + ADD_ICON(12, 5, "leaves_jungle_opaque"); + ADD_ICON(12, 6, "planks_spruce"); + ADD_ICON(12, 7, "planks_jungle"); + ADD_ICON(12, 8, "carrots_stage_0"); + ADD_ICON(12, 9, "carrots_stage_1"); + ADD_ICON(12, 10, "carrots_stage_2"); + ADD_ICON(12, 11, "carrots_stage_3"); + // ADD_ICON(12, 12, "unused"); + ADD_ICON(12, 13, "water"); + ADD_ICON_SIZE(12, 14, "water_flow", 2, 2); - ADD_ICON(13, 0, L"sandstone_bottom"); - ADD_ICON(13, 1, L"wool_colored_cyan"); - ADD_ICON(13, 2, L"wool_colored_orange"); - ADD_ICON(13, 3, L"redstoneLight"); - ADD_ICON(13, 4, L"redstoneLight_lit"); - ADD_ICON(13, 5, L"stonebrick_carved"); - ADD_ICON(13, 6, L"planks_birch"); - ADD_ICON(13, 7, L"anvil_base"); - ADD_ICON(13, 8, L"anvil_top_damaged_1"); - ADD_ICON(13, 9, L"quartz_block_chiseled_top"); - ADD_ICON(13, 10, L"quartz_block_lines_top"); - ADD_ICON(13, 11, L"quartz_block_top"); - ADD_ICON(13, 12, L"hopper_outside"); - ADD_ICON(13, 13, L"detectorRail_on"); + ADD_ICON(13, 0, "sandstone_bottom"); + ADD_ICON(13, 1, "wool_colored_cyan"); + ADD_ICON(13, 2, "wool_colored_orange"); + ADD_ICON(13, 3, "redstoneLight"); + ADD_ICON(13, 4, "redstoneLight_lit"); + ADD_ICON(13, 5, "stonebrick_carved"); + ADD_ICON(13, 6, "planks_birch"); + ADD_ICON(13, 7, "anvil_base"); + ADD_ICON(13, 8, "anvil_top_damaged_1"); + ADD_ICON(13, 9, "quartz_block_chiseled_top"); + ADD_ICON(13, 10, "quartz_block_lines_top"); + ADD_ICON(13, 11, "quartz_block_top"); + ADD_ICON(13, 12, "hopper_outside"); + ADD_ICON(13, 13, "detectorRail_on"); - ADD_ICON(14, 0, L"nether_brick"); - ADD_ICON(14, 1, L"wool_colored_silver"); - ADD_ICON(14, 2, L"nether_wart_stage_0"); - ADD_ICON(14, 3, L"nether_wart_stage_1"); - ADD_ICON(14, 4, L"nether_wart_stage_2"); - ADD_ICON(14, 5, L"sandstone_carved"); - ADD_ICON(14, 6, L"sandstone_smooth"); - ADD_ICON(14, 7, L"anvil_top"); - ADD_ICON(14, 8, L"anvil_top_damaged_2"); - ADD_ICON(14, 9, L"quartz_block_chiseled"); - ADD_ICON(14, 10, L"quartz_block_lines"); - ADD_ICON(14, 11, L"quartz_block_side"); - ADD_ICON(14, 12, L"hopper_inside"); - ADD_ICON(14, 13, L"lava"); - ADD_ICON_SIZE(14, 14, L"lava_flow", 2, 2); + ADD_ICON(14, 0, "nether_brick"); + ADD_ICON(14, 1, "wool_colored_silver"); + ADD_ICON(14, 2, "nether_wart_stage_0"); + ADD_ICON(14, 3, "nether_wart_stage_1"); + ADD_ICON(14, 4, "nether_wart_stage_2"); + ADD_ICON(14, 5, "sandstone_carved"); + ADD_ICON(14, 6, "sandstone_smooth"); + ADD_ICON(14, 7, "anvil_top"); + ADD_ICON(14, 8, "anvil_top_damaged_2"); + ADD_ICON(14, 9, "quartz_block_chiseled"); + ADD_ICON(14, 10, "quartz_block_lines"); + ADD_ICON(14, 11, "quartz_block_side"); + ADD_ICON(14, 12, "hopper_inside"); + ADD_ICON(14, 13, "lava"); + ADD_ICON_SIZE(14, 14, "lava_flow", 2, 2); - ADD_ICON(15, 0, L"destroy_0"); - ADD_ICON(15, 1, L"destroy_1"); - ADD_ICON(15, 2, L"destroy_2"); - ADD_ICON(15, 3, L"destroy_3"); - ADD_ICON(15, 4, L"destroy_4"); - ADD_ICON(15, 5, L"destroy_5"); - ADD_ICON(15, 6, L"destroy_6"); - ADD_ICON(15, 7, L"destroy_7"); - ADD_ICON(15, 8, L"destroy_8"); - ADD_ICON(15, 9, L"destroy_9"); - ADD_ICON(15, 10, L"hay_block_side"); - ADD_ICON(15, 11, L"quartz_block_bottom"); - ADD_ICON(15, 12, L"hopper_top"); - ADD_ICON(15, 13, L"hay_block_top"); + ADD_ICON(15, 0, "destroy_0"); + ADD_ICON(15, 1, "destroy_1"); + ADD_ICON(15, 2, "destroy_2"); + ADD_ICON(15, 3, "destroy_3"); + ADD_ICON(15, 4, "destroy_4"); + ADD_ICON(15, 5, "destroy_5"); + ADD_ICON(15, 6, "destroy_6"); + ADD_ICON(15, 7, "destroy_7"); + ADD_ICON(15, 8, "destroy_8"); + ADD_ICON(15, 9, "destroy_9"); + ADD_ICON(15, 10, "hay_block_side"); + ADD_ICON(15, 11, "quartz_block_bottom"); + ADD_ICON(15, 12, "hopper_top"); + ADD_ICON(15, 13, "hay_block_top"); - ADD_ICON(16, 0, L"coal_block"); - ADD_ICON(16, 1, L"hardened_clay"); - ADD_ICON(16, 2, L"noteblock"); - // ADD_ICON(16, 3, L"unused"); - // ADD_ICON(16, 4, L"unused"); - // ADD_ICON(16, 5, L"unused"); - // ADD_ICON(16, 6, L"unused"); - // ADD_ICON(16, 7, L"unused"); - // ADD_ICON(16, 8, L"unused"); - ADD_ICON(16, 9, L"potatoes_stage_0"); - ADD_ICON(16, 10, L"potatoes_stage_1"); - ADD_ICON(16, 11, L"potatoes_stage_2"); - ADD_ICON(16, 12, L"potatoes_stage_3"); - ADD_ICON(16, 13, L"log_spruce_top"); - ADD_ICON(16, 14, L"log_jungle_top"); - ADD_ICON(16, 15, L"log_birch_top"); + ADD_ICON(16, 0, "coal_block"); + ADD_ICON(16, 1, "hardened_clay"); + ADD_ICON(16, 2, "noteblock"); + // ADD_ICON(16, 3, "unused"); + // ADD_ICON(16, 4, "unused"); + // ADD_ICON(16, 5, "unused"); + // ADD_ICON(16, 6, "unused"); + // ADD_ICON(16, 7, "unused"); + // ADD_ICON(16, 8, "unused"); + ADD_ICON(16, 9, "potatoes_stage_0"); + ADD_ICON(16, 10, "potatoes_stage_1"); + ADD_ICON(16, 11, "potatoes_stage_2"); + ADD_ICON(16, 12, "potatoes_stage_3"); + ADD_ICON(16, 13, "log_spruce_top"); + ADD_ICON(16, 14, "log_jungle_top"); + ADD_ICON(16, 15, "log_birch_top"); - ADD_ICON(17, 0, L"hardened_clay_stained_black"); - ADD_ICON(17, 1, L"hardened_clay_stained_blue"); - ADD_ICON(17, 2, L"hardened_clay_stained_brown"); - ADD_ICON(17, 3, L"hardened_clay_stained_cyan"); - ADD_ICON(17, 4, L"hardened_clay_stained_gray"); - ADD_ICON(17, 5, L"hardened_clay_stained_green"); - ADD_ICON(17, 6, L"hardened_clay_stained_light_blue"); - ADD_ICON(17, 7, L"hardened_clay_stained_lime"); - ADD_ICON(17, 8, L"hardened_clay_stained_magenta"); - ADD_ICON(17, 9, L"hardened_clay_stained_orange"); - ADD_ICON(17, 10, L"hardened_clay_stained_pink"); - ADD_ICON(17, 11, L"hardened_clay_stained_purple"); - ADD_ICON(17, 12, L"hardened_clay_stained_red"); - ADD_ICON(17, 13, L"hardened_clay_stained_silver"); - ADD_ICON(17, 14, L"hardened_clay_stained_white"); - ADD_ICON(17, 15, L"hardened_clay_stained_yellow"); + ADD_ICON(17, 0, "hardened_clay_stained_black"); + ADD_ICON(17, 1, "hardened_clay_stained_blue"); + ADD_ICON(17, 2, "hardened_clay_stained_brown"); + ADD_ICON(17, 3, "hardened_clay_stained_cyan"); + ADD_ICON(17, 4, "hardened_clay_stained_gray"); + ADD_ICON(17, 5, "hardened_clay_stained_green"); + ADD_ICON(17, 6, "hardened_clay_stained_light_blue"); + ADD_ICON(17, 7, "hardened_clay_stained_lime"); + ADD_ICON(17, 8, "hardened_clay_stained_magenta"); + ADD_ICON(17, 9, "hardened_clay_stained_orange"); + ADD_ICON(17, 10, "hardened_clay_stained_pink"); + ADD_ICON(17, 11, "hardened_clay_stained_purple"); + ADD_ICON(17, 12, "hardened_clay_stained_red"); + ADD_ICON(17, 13, "hardened_clay_stained_silver"); + ADD_ICON(17, 14, "hardened_clay_stained_white"); + ADD_ICON(17, 15, "hardened_clay_stained_yellow"); - ADD_ICON(18, 0, L"glass_black"); - ADD_ICON(18, 1, L"glass_blue"); - ADD_ICON(18, 2, L"glass_brown"); - ADD_ICON(18, 3, L"glass_cyan"); - ADD_ICON(18, 4, L"glass_gray"); - ADD_ICON(18, 5, L"glass_green"); - ADD_ICON(18, 6, L"glass_light_blue"); - ADD_ICON(18, 7, L"glass_lime"); - ADD_ICON(18, 8, L"glass_magenta"); - ADD_ICON(18, 9, L"glass_orange"); - ADD_ICON(18, 10, L"glass_pink"); - ADD_ICON(18, 11, L"glass_purple"); - ADD_ICON(18, 12, L"glass_red"); - ADD_ICON(18, 13, L"glass_silver"); - ADD_ICON(18, 14, L"glass_white"); - ADD_ICON(18, 15, L"glass_yellow"); + ADD_ICON(18, 0, "glass_black"); + ADD_ICON(18, 1, "glass_blue"); + ADD_ICON(18, 2, "glass_brown"); + ADD_ICON(18, 3, "glass_cyan"); + ADD_ICON(18, 4, "glass_gray"); + ADD_ICON(18, 5, "glass_green"); + ADD_ICON(18, 6, "glass_light_blue"); + ADD_ICON(18, 7, "glass_lime"); + ADD_ICON(18, 8, "glass_magenta"); + ADD_ICON(18, 9, "glass_orange"); + ADD_ICON(18, 10, "glass_pink"); + ADD_ICON(18, 11, "glass_purple"); + ADD_ICON(18, 12, "glass_red"); + ADD_ICON(18, 13, "glass_silver"); + ADD_ICON(18, 14, "glass_white"); + ADD_ICON(18, 15, "glass_yellow"); - ADD_ICON(19, 0, L"glass_pane_top_black"); - ADD_ICON(19, 1, L"glass_pane_top_blue"); - ADD_ICON(19, 2, L"glass_pane_top_brown"); - ADD_ICON(19, 3, L"glass_pane_top_cyan"); - ADD_ICON(19, 4, L"glass_pane_top_gray"); - ADD_ICON(19, 5, L"glass_pane_top_green"); - ADD_ICON(19, 6, L"glass_pane_top_light_blue"); - ADD_ICON(19, 7, L"glass_pane_top_lime"); - ADD_ICON(19, 8, L"glass_pane_top_magenta"); - ADD_ICON(19, 9, L"glass_pane_top_orange"); - ADD_ICON(19, 10, L"glass_pane_top_pink"); - ADD_ICON(19, 11, L"glass_pane_top_purple"); - ADD_ICON(19, 12, L"glass_pane_top_red"); - ADD_ICON(19, 13, L"glass_pane_top_silver"); - ADD_ICON(19, 14, L"glass_pane_top_white"); - ADD_ICON(19, 15, L"glass_pane_top_yellow"); + ADD_ICON(19, 0, "glass_pane_top_black"); + ADD_ICON(19, 1, "glass_pane_top_blue"); + ADD_ICON(19, 2, "glass_pane_top_brown"); + ADD_ICON(19, 3, "glass_pane_top_cyan"); + ADD_ICON(19, 4, "glass_pane_top_gray"); + ADD_ICON(19, 5, "glass_pane_top_green"); + ADD_ICON(19, 6, "glass_pane_top_light_blue"); + ADD_ICON(19, 7, "glass_pane_top_lime"); + ADD_ICON(19, 8, "glass_pane_top_magenta"); + ADD_ICON(19, 9, "glass_pane_top_orange"); + ADD_ICON(19, 10, "glass_pane_top_pink"); + ADD_ICON(19, 11, "glass_pane_top_purple"); + ADD_ICON(19, 12, "glass_pane_top_red"); + ADD_ICON(19, 13, "glass_pane_top_silver"); + ADD_ICON(19, 14, "glass_pane_top_white"); + ADD_ICON(19, 15, "glass_pane_top_yellow"); } } diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h index 3285d4679..142fd40cd 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.h @@ -15,18 +15,18 @@ class TexturePack; // 4J Added this class to stop having to do texture stitching at runtime class PreStitchedTextureMap : public IconRegister { public: - static const std::wstring NAME_MISSING_TEXTURE; + static const std::string NAME_MISSING_TEXTURE; private: const int iconType; - const std::wstring name; - const std::wstring path; - const std::wstring extension; + const std::string name; + const std::string path; + const std::string extension; bool m_mipMap; - typedef std::unordered_map stringIconMap; + typedef std::unordered_map stringIconMap; stringIconMap texturesByName; // = new HashMap(); BufferedImage* missingTexture; // = new BufferedImage(64, 64, // BufferedImage.TYPE_INT_ARGB); @@ -38,8 +38,8 @@ private: void loadUVs(); public: - PreStitchedTextureMap(int type, const std::wstring& name, - const std::wstring& path, + PreStitchedTextureMap(int type, const std::string& name, + const std::string& path, BufferedImage* missingTexture, bool mipMap = false); void stitch(); @@ -48,12 +48,12 @@ private: void makeTextureAnimated(TexturePack* texturePack, StitchedTexture* tex); public: - StitchedTexture* getTexture(const std::wstring& name); + StitchedTexture* getTexture(const std::string& name); void cycleAnimationFrames(); Texture* getStitchedTexture(); // 4J Stu - register is a reserved keyword in C++ - Icon* registerIcon(const std::wstring& name); + Icon* registerIcon(const std::string& name); int getIconType(); Icon* getMissingIcon(); diff --git a/targets/minecraft/client/renderer/texture/SimpleIcon.cpp b/targets/minecraft/client/renderer/texture/SimpleIcon.cpp index d4e91680f..602af686a 100644 --- a/targets/minecraft/client/renderer/texture/SimpleIcon.cpp +++ b/targets/minecraft/client/renderer/texture/SimpleIcon.cpp @@ -2,7 +2,7 @@ #include "minecraft/client/renderer/texture/StitchedTexture.h" -SimpleIcon::SimpleIcon(const std::wstring& name, const std::wstring& filename, +SimpleIcon::SimpleIcon(const std::string& name, const std::string& filename, float U0, float V0, float U1, float V1) : StitchedTexture(name, filename) { u0 = U0; diff --git a/targets/minecraft/client/renderer/texture/SimpleIcon.h b/targets/minecraft/client/renderer/texture/SimpleIcon.h index 7e86aee0b..38af0c42a 100644 --- a/targets/minecraft/client/renderer/texture/SimpleIcon.h +++ b/targets/minecraft/client/renderer/texture/SimpleIcon.h @@ -7,6 +7,6 @@ // loaded from a file class SimpleIcon : public StitchedTexture { public: - SimpleIcon(const std::wstring& name, const std::wstring& filename, float u0, + SimpleIcon(const std::string& name, const std::string& filename, float u0, float v0, float u1, float v1); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.cpp b/targets/minecraft/client/renderer/texture/StitchSlot.cpp index 81839ed28..da44be1fe 100644 --- a/targets/minecraft/client/renderer/texture/StitchSlot.cpp +++ b/targets/minecraft/client/renderer/texture/StitchSlot.cpp @@ -136,9 +136,9 @@ void StitchSlot::collectAssignments(std::vector* result) { } //@Override -std::wstring StitchSlot::toString() { - return L"Slot{originX=" + toWString(originX) + L", originY=" + - toWString(originY) + L", width=" + toWString(width) + L", height=" + - toWString(height) + L", texture=" + toWString(textureHolder) + - L", subSlots=" + toWString(subSlots) + L'}'; +std::string StitchSlot::toString() { + return "Slot{originX=" + toWString(originX) + ", originY=" + + toWString(originY) + ", width=" + toWString(width) + ", height=" + + toWString(height) + ", texture=" + toWString(textureHolder) + + ", subSlots=" + toWString(subSlots) + '}'; } \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/StitchSlot.h b/targets/minecraft/client/renderer/texture/StitchSlot.h index 1da1b6e6f..b122cb85d 100644 --- a/targets/minecraft/client/renderer/texture/StitchSlot.h +++ b/targets/minecraft/client/renderer/texture/StitchSlot.h @@ -26,5 +26,5 @@ public: void collectAssignments(std::vector* result); //@Override - std::wstring toString(); + std::string toString(); }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp index 53e66eb95..5bd407020 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.cpp +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.cpp @@ -10,19 +10,19 @@ #include "minecraft/client/renderer/texture/custom/ClockTexture.h" #include "minecraft/client/renderer/texture/custom/CompassTexture.h" -StitchedTexture* StitchedTexture::create(const std::wstring& name) { +StitchedTexture* StitchedTexture::create(const std::string& name) { // TODO: Generalize? - if (name.compare(L"clock") == 0) { + if (name.compare("clock") == 0) { return new ClockTexture(); - } else if (name.compare(L"compass") == 0) { + } else if (name.compare("compass") == 0) { return new CompassTexture(); } else { return new StitchedTexture(name, name); } } -StitchedTexture::StitchedTexture(const std::wstring& name, - const std::wstring& filename) +StitchedTexture::StitchedTexture(const std::string& name, + const std::string& filename) : name(name) { // 4J Initialisers source = nullptr; @@ -48,7 +48,7 @@ StitchedTexture::StitchedTexture(const std::wstring& name, void StitchedTexture::freeFrameTextures() { if (frames != nullptr) { for (auto it = frames->begin(); it != frames->end(); ++it) { - TextureManager::getInstance()->unregisterTexture(L"", *it); + TextureManager::getInstance()->unregisterTexture("", *it); delete *it; } delete frames; @@ -156,7 +156,7 @@ float StitchedTexture::getV(double offset, bool adjust /*=false*/) const { (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); } -std::wstring StitchedTexture::getName() const { return name; } +std::string StitchedTexture::getName() const { return name; } int StitchedTexture::getSourceWidth() const { return source->getWidth(); } @@ -216,14 +216,14 @@ void StitchedTexture::loadAnimationFrames(BufferedReader* bufferedReader) { intPairVector* results = new intPairVector(); // try { - std::wstring line = bufferedReader->readLine(); + std::string line = bufferedReader->readLine(); while (!line.empty()) { line = trimString(line); if (line.length() > 0) { - std::vector tokens = stringSplit(line, L','); + std::vector tokens = stringSplit(line, ','); // for (String token : tokens) for (auto it = tokens.begin(); it != tokens.end(); ++it) { - std::wstring token = *it; + std::string token = *it; int multiPos = token.find_first_of('*'); if (multiPos > 0) { int frame = fromWString(token.substr(0, multiPos)); @@ -250,7 +250,7 @@ void StitchedTexture::loadAnimationFrames(BufferedReader* bufferedReader) { } } -void StitchedTexture::loadAnimationFrames(const std::wstring& string) { +void StitchedTexture::loadAnimationFrames(const std::string& string) { if (frameOverride != nullptr) { delete frameOverride; frameOverride = nullptr; @@ -260,10 +260,10 @@ void StitchedTexture::loadAnimationFrames(const std::wstring& string) { intPairVector* results = new intPairVector(); - std::vector tokens = stringSplit(trimString(string), L','); + std::vector tokens = stringSplit(trimString(string), ','); // for (String token : tokens) for (auto it = tokens.begin(); it != tokens.end(); ++it) { - std::wstring token = trimString(*it); + std::string token = trimString(*it); int multiPos = token.find_first_of('*'); if (multiPos > 0) { int frame = fromWString(token.substr(0, multiPos)); diff --git a/targets/minecraft/client/renderer/texture/StitchedTexture.h b/targets/minecraft/client/renderer/texture/StitchedTexture.h index 740b8fe11..cb6c12d97 100644 --- a/targets/minecraft/client/renderer/texture/StitchedTexture.h +++ b/targets/minecraft/client/renderer/texture/StitchedTexture.h @@ -13,10 +13,10 @@ class BufferedReader; class StitchedTexture : public Icon { private: - const std::wstring name; + const std::string name; public: - std::wstring m_fileName; + std::string m_fileName; protected: Texture* source; @@ -50,12 +50,12 @@ protected: int subFrame; public: - static StitchedTexture* create(const std::wstring& name); + static StitchedTexture* create(const std::string& name); ~StitchedTexture(); protected: - StitchedTexture(const std::wstring& name, const std::wstring& filename); + StitchedTexture(const std::string& name, const std::string& filename); public: void initUVs(float U0, float V0, float U1, float V1); @@ -72,7 +72,7 @@ public: float getV0(bool adjust = false) const; float getV1(bool adjust = false) const; float getV(double offset, bool adjust = false) const; - std::wstring getName() const; + std::string getName() const; virtual int getSourceWidth() const; virtual int getSourceHeight() const; virtual void cycleFrames(); @@ -91,7 +91,7 @@ public: * @param bufferedReader */ void loadAnimationFrames(BufferedReader* bufferedReader); - void loadAnimationFrames(const std::wstring& string); // 4J Added + void loadAnimationFrames(const std::string& string); // 4J Added int getFlags() const; // 4J added void setFlags(int flags); // 4J added diff --git a/targets/minecraft/client/renderer/texture/Stitcher.cpp b/targets/minecraft/client/renderer/texture/Stitcher.cpp index 9056aac66..6ccc29570 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.cpp +++ b/targets/minecraft/client/renderer/texture/Stitcher.cpp @@ -10,7 +10,7 @@ #include "TextureHolder.h" #include "TextureManager.h" -void Stitcher::_init(const std::wstring& name, int maxWidth, int maxHeight, +void Stitcher::_init(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale) { this->name = name; this->maxWidth = maxWidth; @@ -24,12 +24,12 @@ void Stitcher::_init(const std::wstring& name, int maxWidth, int maxHeight, stitchedTexture = nullptr; } -Stitcher::Stitcher(const std::wstring& name, int maxWidth, int maxHeight, +Stitcher::Stitcher(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo) { _init(name, maxWidth, maxHeight, forcePowerOfTwo, 0); } -Stitcher::Stitcher(const std::wstring& name, int maxWidth, int maxHeight, +Stitcher::Stitcher(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale) { _init(name, maxWidth, maxHeight, forcePowerOfTwo, forcedScale); } diff --git a/targets/minecraft/client/renderer/texture/Stitcher.h b/targets/minecraft/client/renderer/texture/Stitcher.h index b4e0ff062..0fccd2cd5 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.h +++ b/targets/minecraft/client/renderer/texture/Stitcher.h @@ -34,15 +34,15 @@ private: Texture* stitchedTexture; - std::wstring name; + std::string name; - void _init(const std::wstring& name, int maxWidth, int maxHeight, + void _init(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale); public: - Stitcher(const std::wstring& name, int maxWidth, int maxHeight, + Stitcher(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo); - Stitcher(const std::wstring& name, int maxWidth, int maxHeight, + Stitcher(const std::string& name, int maxWidth, int maxHeight, bool forcePowerOfTwo, int forcedScale); int getWidth(); diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index 65a0a757e..1db756dcd 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -16,14 +16,14 @@ #define MAX_MIP_LEVELS 5 -Texture::Texture(const std::wstring& name, int mode, int width, int height, +Texture::Texture(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, bool mipMap) { _init(name, mode, width, height, depth, wrapMode, format, minFilter, magFilter, mipMap); } -void Texture::_init(const std::wstring& name, int mode, int width, int height, +void Texture::_init(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, bool mipMap) { this->name = name; @@ -89,7 +89,7 @@ void Texture::_init(const std::wstring& name, int mode, int width, int height, managerId = TextureManager::getInstance()->createTextureID(); } -void Texture::_init(const std::wstring& name, int mode, int width, int height, +void Texture::_init(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap) { _init(name, mode, width, height, depth, wrapMode, format, minFilter, @@ -144,14 +144,14 @@ void Texture::_init(const std::wstring& name, int mode, int width, int height, } } -Texture::Texture(const std::wstring& name, int mode, int width, int height, +Texture::Texture(const std::string& name, int mode, int width, int height, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap) { _init(name, mode, width, height, 1, wrapMode, format, minFilter, magFilter, image, mipMap); } -Texture::Texture(const std::wstring& name, int mode, int width, int height, +Texture::Texture(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap) { _init(name, mode, width, height, depth, wrapMode, format, minFilter, @@ -206,11 +206,11 @@ void Texture::fill(const Rect2i* rect, int color) { } } -void Texture::writeAsBMP(const std::wstring& name) { +void Texture::writeAsBMP(const std::string& name) { // 4J Don't need } -void Texture::writeAsPNG(const std::wstring& filename) { +void Texture::writeAsPNG(const std::string& filename) { // 4J Don't need } @@ -529,7 +529,7 @@ int Texture::getWidth() { return width; } int Texture::getHeight() { return height; } -std::wstring Texture::getName() { return name; } +std::string Texture::getName() { return name; } void Texture::setImmediateUpdate(bool immediateUpdate) { this->immediateUpdate = immediateUpdate; diff --git a/targets/minecraft/client/renderer/texture/Texture.h b/targets/minecraft/client/renderer/texture/Texture.h index d83638819..718e0ade1 100644 --- a/targets/minecraft/client/renderer/texture/Texture.h +++ b/targets/minecraft/client/renderer/texture/Texture.h @@ -52,7 +52,7 @@ private: int magFilter; int wrapMode; bool mipmapped; - std::wstring name; + std::string name; Rect2i* rect; @@ -68,29 +68,29 @@ public: ~Texture(); private: - Texture(const std::wstring& name, int mode, int width, int height, + Texture(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, bool mipMap = true); - void _init(const std::wstring& name, int mode, int width, int height, + void _init(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, bool mipMap); - void _init(const std::wstring& name, int mode, int width, int height, + void _init(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap); public: - Texture(const std::wstring& name, int mode, int width, int height, + Texture(const std::string& name, int mode, int width, int height, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap = true); - Texture(const std::wstring& name, int mode, int width, int height, + Texture(const std::string& name, int mode, int width, int height, int depth, int wrapMode, int format, int minFilter, int magFilter, BufferedImage* image, bool mipMap = true); const Rect2i* getRect(); void fill(const Rect2i* rect, int color); - void writeAsBMP(const std::wstring& name); - void writeAsPNG(const std::wstring& filename); + void writeAsBMP(const std::string& name); + void writeAsPNG(const std::string& filename); void blit(int x, int y, Texture* source); void blit(int x, int y, Texture* source, bool rotated); void transferFromBuffer(const std::vector& buffer); @@ -99,7 +99,7 @@ public: int getGlId(); int getWidth(); int getHeight(); - std::wstring getName(); + std::string getName(); void setImmediateUpdate(bool immediateUpdate); void bind(int mipMapIndex); void updateOnGPU(); diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.cpp b/targets/minecraft/client/renderer/texture/TextureHolder.cpp index 1893b9337..413beb484 100644 --- a/targets/minecraft/client/renderer/texture/TextureHolder.cpp +++ b/targets/minecraft/client/renderer/texture/TextureHolder.cpp @@ -48,9 +48,9 @@ void TextureHolder::setForcedScale(int targetSize) { } //@Override -std::wstring TextureHolder::toString() { - return L"TextureHolder{width=" + toWString(width) + L", height=" + - toWString(height) + L'}'; +std::string TextureHolder::toString() { + return "TextureHolder{width=" + toWString(width) + ", height=" + + toWString(height) + '}'; } int TextureHolder::compareTo(const TextureHolder* other) const { diff --git a/targets/minecraft/client/renderer/texture/TextureHolder.h b/targets/minecraft/client/renderer/texture/TextureHolder.h index 87b473890..6030ad322 100644 --- a/targets/minecraft/client/renderer/texture/TextureHolder.h +++ b/targets/minecraft/client/renderer/texture/TextureHolder.h @@ -28,7 +28,7 @@ private: public: void setForcedScale(int targetSize); //@Override - std::wstring toString(); + std::string toString(); int compareTo(const TextureHolder* other) const; }; diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp index 79eed49ef..9c076aefc 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.cpp +++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp @@ -25,7 +25,7 @@ TextureManager::TextureManager() { nextID = 0; } int TextureManager::createTextureID() { return nextID++; } -Texture* TextureManager::getTexture(const std::wstring& name) { +Texture* TextureManager::getTexture(const std::string& name) { if (stringToIDMap.find(name) != stringToIDMap.end()) { return idToTextureMap.find(stringToIDMap.find(name)->second)->second; } @@ -33,7 +33,7 @@ Texture* TextureManager::getTexture(const std::wstring& name) { return nullptr; } -void TextureManager::registerName(const std::wstring& name, Texture* texture) { +void TextureManager::registerName(const std::string& name, Texture* texture) { stringToIDMap.insert( stringIntMap::value_type(name, texture->getManagerId())); @@ -60,7 +60,7 @@ void TextureManager::registerTexture(Texture* texture) { intTextureMap::value_type(texture->getManagerId(), texture)); } -void TextureManager::unregisterTexture(const std::wstring& name, +void TextureManager::unregisterTexture(const std::string& name, Texture* texture) { auto it = idToTextureMap.find(texture->getManagerId()); if (it != idToTextureMap.end()) idToTextureMap.erase(it); @@ -69,14 +69,14 @@ void TextureManager::unregisterTexture(const std::wstring& name, if (it2 != stringToIDMap.end()) stringToIDMap.erase(it2); } -Stitcher* TextureManager::createStitcher(const std::wstring& name) { +Stitcher* TextureManager::createStitcher(const std::string& name) { int maxTextureSize = Minecraft::maxSupportedTextureSize(); return new Stitcher(name, maxTextureSize, maxTextureSize, true); } std::vector* TextureManager::createTextures( - const std::wstring& filename, bool mipmap) { + const std::string& filename, bool mipmap) { std::vector* result = new std::vector(); TexturePack* texturePack = Minecraft::GetInstance()->skins->getSelected(); // try { @@ -89,9 +89,9 @@ std::vector* TextureManager::createTextures( int minFilter = Texture::TFLT_NEAREST; int magFilter = Texture::TFLT_NEAREST; - std::wstring drive = L""; + std::string drive = ""; - if (texturePack->hasFile(L"res/" + filename, false)) { + if (texturePack->hasFile("res/" + filename, false)) { drive = texturePack->getPath(true); } else { { @@ -100,16 +100,16 @@ std::vector* TextureManager::createTextures( } } - // BufferedImage *image = new BufferedImage(texturePack->getResource(L"/" + + // BufferedImage *image = new BufferedImage(texturePack->getResource("/" + // filename),false,true,drive); - // //ImageIO::read(texturePack->getResource(L"/" + filename)); + // //ImageIO::read(texturePack->getResource("/" + filename)); BufferedImage* image = texturePack->getImageResource(filename, false, true, drive); int height = image->getHeight(); int width = image->getWidth(); - std::wstring texName = getTextureNameFromPath(filename); + std::string texName = getTextureNameFromPath(filename); if (isAnimation(filename, texturePack)) { // TODO: Read this information from the animation file later @@ -140,9 +140,9 @@ std::vector* TextureManager::createTextures( // Skipping " + filename + " because of broken aspect ratio and not // animation"); #if !defined(_CONTENT_PACKAGE) - wprintf( - L"TextureManager.createTexture: Skipping %ls because of broken " - L"aspect ratio and not animation\n", + printf( + "TextureManager.createTexture: Skipping %s because of broken " + "aspect ratio and not animation\n", filename.c_str()); #endif } @@ -161,22 +161,22 @@ std::vector* TextureManager::createTextures( return result; } -std::wstring TextureManager::getTextureNameFromPath( - const std::wstring& filename) { +std::string TextureManager::getTextureNameFromPath( + const std::string& filename) { File file(filename); - return file.getName().substr(0, file.getName().find_last_of(L'.')); + return file.getName().substr(0, file.getName().find_last_of('.')); } -bool TextureManager::isAnimation(const std::wstring& filename, +bool TextureManager::isAnimation(const std::string& filename, TexturePack* texturePack) { - std::wstring dataFileName = - L"/" + filename.substr(0, filename.find_last_of(L'.')) + L".txt"; - bool hasOriginalImage = texturePack->hasFile(L"/" + filename, false); + std::string dataFileName = + "/" + filename.substr(0, filename.find_last_of('.')) + ".txt"; + bool hasOriginalImage = texturePack->hasFile("/" + filename, false); return Minecraft::GetInstance()->skins->getSelected()->hasFile( dataFileName, !hasOriginalImage); } -Texture* TextureManager::createTexture(const std::wstring& name, int mode, +Texture* TextureManager::createTexture(const std::string& name, int mode, int width, int height, int wrap, int format, int minFilter, int magFilter, bool mipmap, BufferedImage* image) { @@ -186,7 +186,7 @@ Texture* TextureManager::createTexture(const std::wstring& name, int mode, return newTex; } -Texture* TextureManager::createTexture(const std::wstring& name, int mode, +Texture* TextureManager::createTexture(const std::string& name, int mode, int width, int height, int format, bool mipmap) { // 4J Stu - Don't clamp as it causes issues with how we signal diff --git a/targets/minecraft/client/renderer/texture/TextureManager.h b/targets/minecraft/client/renderer/texture/TextureManager.h index 0d307f8fa..5371eca97 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.h +++ b/targets/minecraft/client/renderer/texture/TextureManager.h @@ -15,7 +15,7 @@ private: static TextureManager* instance; int nextID; - typedef std::unordered_map stringIntMap; + typedef std::unordered_map stringIntMap; typedef std::unordered_map intTextureMap; intTextureMap idToTextureMap; stringIntMap stringToIDMap; @@ -29,23 +29,23 @@ private: public: int createTextureID(); - Texture* getTexture(const std::wstring& name); - void registerName(const std::wstring& name, Texture* texture); + Texture* getTexture(const std::string& name); + void registerName(const std::string& name, Texture* texture); void registerTexture(Texture* texture); - void unregisterTexture(const std::wstring& name, Texture* texture); - Stitcher* createStitcher(const std::wstring& name); + void unregisterTexture(const std::string& name, Texture* texture); + Stitcher* createStitcher(const std::string& name); std::vector* createTextures( - const std::wstring& filename, bool mipmap); // 4J added mipmap param + const std::string& filename, bool mipmap); // 4J added mipmap param private: - std::wstring getTextureNameFromPath(const std::wstring& filename); - bool isAnimation(const std::wstring& filename, TexturePack* texturePack); + std::string getTextureNameFromPath(const std::string& filename); + bool isAnimation(const std::string& filename, TexturePack* texturePack); public: - Texture* createTexture(const std::wstring& name, int mode, int width, + Texture* createTexture(const std::string& name, int mode, int width, int height, int wrap, int format, int minFilter, int magFilter, bool mipmap, BufferedImage* image); - Texture* createTexture(const std::wstring& name, int mode, int width, + Texture* createTexture(const std::string& name, int mode, int width, int height, int format, bool mipmap); // 4J Added mipmap param }; \ No newline at end of file diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp index b6e6f6ce2..c74a3d57f 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp @@ -27,12 +27,12 @@ #include "minecraft/world/item/Item.h" #include "minecraft/world/level/tile/Tile.h" -const std::wstring TextureMap::NAME_MISSING_TEXTURE = L"missingno"; +const std::string TextureMap::NAME_MISSING_TEXTURE = "missingno"; -TextureMap::TextureMap(int type, const std::wstring& name, - const std::wstring& path, BufferedImage* missingTexture, +TextureMap::TextureMap(int type, const std::string& name, + const std::string& path, BufferedImage* missingTexture, bool mipmap) - : iconType(type), name(name), path(path), extension(L".png") { + : iconType(type), name(name), path(path), extension(".png") { this->missingTexture = missingTexture; // 4J Initialisers @@ -96,9 +96,9 @@ void TextureMap::stitch() { // for (final String name : texturesToRegister.keySet()) for (auto it = texturesToRegister.begin(); it != texturesToRegister.end(); ++it) { - std::wstring name = it->first; + std::string name = it->first; - std::wstring filename = path + name + extension; + std::string filename = path + name + extension; // TODO: [EB] Put the frames into a proper object, not this inside out // hack @@ -138,7 +138,7 @@ void TextureMap::stitch() { TextureHolder* textureHolder = slot->getHolder(); Texture* texture = textureHolder->getTexture(); - std::wstring textureName = texture->getName(); + std::string textureName = texture->getName(); std::vector* frames = textures.find(textureHolder)->second; @@ -158,7 +158,7 @@ void TextureMap::stitch() { // Minecraft::getInstance()->getLogger().warning("Couldn't find // premade icon for " + textureName + " doing " + name); #ifndef _CONTENT_PACKAGE - wprintf(L"Couldn't find premade icon for %ls doing %ls\n", + printf("Couldn't find premade icon for %s doing %s\n", textureName.c_str(), name.c_str()); #endif } @@ -176,20 +176,20 @@ void TextureMap::stitch() { if (frames->size() > 1) { animatedTextures.push_back(stored); - std::wstring animationDefinitionFile = textureName + L".txt"; + std::string animationDefinitionFile = textureName + ".txt"; TexturePack* texturePack = Minecraft::GetInstance()->skins->getSelected(); bool requiresFallback = - !texturePack->hasFile(L"\\" + textureName + L".png", false); + !texturePack->hasFile("\\" + textureName + ".png", false); // try { InputStream* fileStream = texturePack->getResource( - L"\\" + path + animationDefinitionFile, requiresFallback); + "\\" + path + animationDefinitionFile, requiresFallback); // Minecraft::getInstance()->getLogger().info("Found animation info // for: " + animationDefinitionFile); #ifndef _CONTENT_PACKAGE - wprintf(L"Found animation info for: %ls\n", + printf("Found animation info for: %s\n", animationDefinitionFile.c_str()); #endif InputStreamReader isr(fileStream); @@ -211,11 +211,11 @@ void TextureMap::stitch() { texture->replaceWith(missingPosition); } - stitchResult->writeAsPNG(L"debug.stitched_" + name + L".png"); + stitchResult->writeAsPNG("debug.stitched_" + name + ".png"); stitchResult->updateOnGPU(); } -StitchedTexture* TextureMap::getTexture(const std::wstring& name) { +StitchedTexture* TextureMap::getTexture(const std::string& name) { StitchedTexture* result = texturesByName.find(name)->second; if (result == nullptr) result = missingPosition; return result; @@ -233,7 +233,7 @@ void TextureMap::cycleAnimationFrames() { Texture* TextureMap::getStitchedTexture() { return stitchResult; } // 4J Stu - register is a reserved keyword in C++ -Icon* TextureMap::registerIcon(const std::wstring& name) { +Icon* TextureMap::registerIcon(const std::string& name) { if (name.empty()) { Log::info("Don't register nullptr\n"); #ifndef _CONTENT_PACKAGE diff --git a/targets/minecraft/client/renderer/texture/TextureMap.h b/targets/minecraft/client/renderer/texture/TextureMap.h index f2c172af8..6c4ac1922 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.h +++ b/targets/minecraft/client/renderer/texture/TextureMap.h @@ -13,18 +13,18 @@ class Icon; class TextureMap : public IconRegister { public: - static const std::wstring NAME_MISSING_TEXTURE; + static const std::string NAME_MISSING_TEXTURE; private: const int iconType; - const std::wstring name; - const std::wstring path; - const std::wstring extension; + const std::string name; + const std::string path; + const std::string extension; bool m_mipMap; - typedef std::unordered_map + typedef std::unordered_map stringStitchedTextureMap; stringStitchedTextureMap texturesByName; // = new HashMap(); @@ -39,16 +39,16 @@ private: texturesToRegister; // = new HashMap(); public: - TextureMap(int type, const std::wstring& name, const std::wstring& path, + TextureMap(int type, const std::string& name, const std::string& path, BufferedImage* missingTexture, bool mipMap = false); void stitch(); - StitchedTexture* getTexture(const std::wstring& name); + StitchedTexture* getTexture(const std::string& name); void cycleAnimationFrames(); Texture* getStitchedTexture(); // 4J Stu - register is a reserved keyword in C++ - Icon* registerIcon(const std::wstring& name); + Icon* registerIcon(const std::string& name); int getIconType(); Icon* getMissingIcon(); diff --git a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp index 1d1d22e5c..dab61cdc0 100644 --- a/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/ClockTexture.cpp @@ -13,14 +13,14 @@ #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" -ClockTexture::ClockTexture() : StitchedTexture(L"clock", L"clock") { +ClockTexture::ClockTexture() : StitchedTexture("clock", "clock") { rot = rota = 0.0; m_dataTexture = nullptr; m_iPad = XUSER_INDEX_ANY; } ClockTexture::ClockTexture(int iPad, ClockTexture* dataTexture) - : StitchedTexture(L"clock", L"clock") { + : StitchedTexture("clock", "clock") { rot = rota = 0.0; m_dataTexture = dataTexture; m_iPad = iPad; diff --git a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp index edc17baa2..5abc49cab 100644 --- a/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp +++ b/targets/minecraft/client/renderer/texture/custom/CompassTexture.cpp @@ -19,7 +19,7 @@ CompassTexture* CompassTexture::instance = nullptr; -CompassTexture::CompassTexture() : StitchedTexture(L"compass", L"compass") { +CompassTexture::CompassTexture() : StitchedTexture("compass", "compass") { instance = this; m_dataTexture = nullptr; @@ -29,7 +29,7 @@ CompassTexture::CompassTexture() : StitchedTexture(L"compass", L"compass") { } CompassTexture::CompassTexture(int iPad, CompassTexture* dataTexture) - : StitchedTexture(L"compass", L"compass") { + : StitchedTexture("compass", "compass") { m_dataTexture = dataTexture; m_iPad = iPad; diff --git a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h index d127e9210..b1e56fe5b 100644 --- a/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/MobSpawnerRenderer.h @@ -10,7 +10,7 @@ class Entity; class MobSpawnerRenderer : public TileEntityRenderer { private: - std::unordered_map > models; + std::unordered_map > models; public: static void render(BaseMobSpawner* spawner, double x, double y, double z, diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index f590f0479..0751a1db3 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -58,7 +58,7 @@ void SignRenderer::render(std::shared_ptr _sign, double x, double y, signModel->cube2->visible = false; } - bindTexture(&SIGN_LOCATION); // 4J was L"/item/sign.png" + bindTexture(&SIGN_LOCATION); // 4J was "/item/sign.png" glPushMatrix(); glScalef(size, -size, -size); @@ -74,7 +74,7 @@ void SignRenderer::render(std::shared_ptr _sign, double x, double y, int col = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Sign_Text); - std::wstring msg; + std::string msg; // need to send the new data // Get the current language setting from the console std::uint32_t dwLanguage = XGetLanguage(); @@ -87,7 +87,7 @@ void SignRenderer::render(std::shared_ptr _sign, double x, double y, case XC_LANGUAGE_KOREAN: case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: - msg = L"Censored"; // In-game font, so English only + msg = "Censored"; // In-game font, so English only break; default: msg = gameServices().getString(IDS_STRINGVERIFY_CENSORED); @@ -102,7 +102,7 @@ void SignRenderer::render(std::shared_ptr _sign, double x, double y, case XC_LANGUAGE_JAPANESE: case XC_LANGUAGE_TCHINESE: msg = - L"Awaiting Approval"; // In-game font, so English only + "Awaiting Approval"; // In-game font, so English only break; default: msg = gameServices().getString(IDS_STRINGVERIFY_AWAITING_APPROVAL); @@ -111,7 +111,7 @@ void SignRenderer::render(std::shared_ptr _sign, double x, double y, } if (i == sign->GetSelectedLine()) { - msg = L"> " + msg + L" <"; + msg = "> " + msg + " <"; font->draw(msg, -font->width(msg) / 2, i * 10 - (MAX_SIGN_LINES) * 5, col); // 4J - (MAX_SIGN_LINES) was sign.messages.size() diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp index de773b5e6..3c21309ee 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.cpp @@ -55,7 +55,7 @@ void SkullTileRenderer::init( void SkullTileRenderer::renderSkull(float x, float y, float z, int face, float rot, int type, - const std::wstring& extra) { + const std::string& extra) { Model* model = skeletonModel; switch (type) { @@ -69,7 +69,7 @@ void SkullTileRenderer::renderSkull(float x, float y, float z, int face, case SkullTileEntity::TYPE_CHAR: // if (!extra.empty()) //{ - // wstring url = "http://skins.minecraft.net/MinecraftSkins/" + + // string url = "http://skins.minecraft.net/MinecraftSkins/" + // StringUtil.stripColor(extra) + ".png"; // if diff --git a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h index b8cd9b7f0..c2390b5a2 100644 --- a/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/SkullTileRenderer.h @@ -29,5 +29,5 @@ public: float a, bool setColor, float alpha, bool useCompiled = true); void init(TileEntityRenderDispatcher* tileEntityRenderDispatcher); void renderSkull(float x, float y, float z, int face, float rot, int type, - const std::wstring& extra); + const std::string& extra); }; diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp index e5799bd7d..48aadfdec 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.cpp @@ -9,7 +9,7 @@ void TileEntityRenderer::bindTexture(ResourceLocation* location) { if (t != nullptr) t->bind(t->loadTexture(location->getTexture())); } -void TileEntityRenderer::bindTexture(const std::wstring& urlTexture, +void TileEntityRenderer::bindTexture(const std::string& urlTexture, ResourceLocation* location) { Textures* t = tileEntityRenderDispatcher->textures; if (t != nullptr) diff --git a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h index 5d4b3eeec..d1cb09091 100644 --- a/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h +++ b/targets/minecraft/client/renderer/tileentity/TileEntityRenderer.h @@ -24,10 +24,10 @@ public: protected: void bindTexture( - ResourceLocation* location); // 4J - changed from std::wstring to int + ResourceLocation* location); // 4J - changed from std::string to int void bindTexture( - const std::wstring& urlTexture, - ResourceLocation* location); // 4J - changed from std::wstring to int + const std::string& urlTexture, + ResourceLocation* location); // 4J - changed from std::string to int private: Level* getLevel(); diff --git a/targets/minecraft/client/resources/ResourceLocation.h b/targets/minecraft/client/resources/ResourceLocation.h index 61791e318..73c35e168 100644 --- a/targets/minecraft/client/resources/ResourceLocation.h +++ b/targets/minecraft/client/resources/ResourceLocation.h @@ -5,13 +5,13 @@ typedef std::vector<_TEXTURE_NAME> textureNameArray; class ResourceLocation { private: textureNameArray m_texture; - std::wstring m_path; + std::string m_path; bool m_preloaded; public: ResourceLocation() { m_preloaded = false; - m_path = L""; + m_path = ""; } ResourceLocation(_TEXTURE_NAME texture) { @@ -19,7 +19,7 @@ public: m_preloaded = true; } - ResourceLocation(std::wstring path) { + ResourceLocation(std::string path) { m_path = path; m_preloaded = false; } @@ -40,7 +40,7 @@ public: int getTextureCount() { return m_texture.size(); } - std::wstring getPath() { return m_path; } + std::string getPath() { return m_path; } bool isPreloaded() { return m_preloaded; } }; diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index 7a901bbc3..cf6b240e3 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -21,7 +21,7 @@ #include "minecraft/client/skins/TexturePack.h" AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, - const std::wstring& name, + const std::string& name, TexturePack* fallback) : id(id), name(name) { // 4J init @@ -42,7 +42,7 @@ AbstractTexturePack::AbstractTexturePack(std::uint32_t id, File* file, // loadDescription(); } -std::wstring AbstractTexturePack::trim(std::wstring line) { +std::string AbstractTexturePack::trim(std::string line) { if (!line.empty() && line.length() > 34) { line = line.substr(0, 34); } @@ -60,9 +60,9 @@ void AbstractTexturePack::loadDescription() { void AbstractTexturePack::loadName() {} InputStream* AbstractTexturePack::getResource( - const std::wstring& name, bool allowFallback) // throws IOException + const std::string& name, bool allowFallback) // throws IOException { - Log::info("texture - %ls\n", name.c_str()); + Log::info("texture - %s\n", name.c_str()); InputStream* is = getResourceImplementation(name); if (is == nullptr && fallback != nullptr && allowFallback) { is = fallback->getResource(name, true); @@ -72,7 +72,7 @@ InputStream* AbstractTexturePack::getResource( } // 4J Currently removed due to override in TexturePack class -// InputStream *AbstractTexturePack::getResource(const std::wstring &name) +// InputStream *AbstractTexturePack::getResource(const std::string &name) // //throws IOException //{ // return getResource(name, true); @@ -93,11 +93,11 @@ void AbstractTexturePack::load(Textures* textures) { textures->clearLastBoundId(); } else { // 4J Stu - Don't do this - // textures->bindTexture(L"/gui/unknown_pack.png"); + // textures->bindTexture("/gui/unknown_pack.png"); } } -bool AbstractTexturePack::hasFile(const std::wstring& name, +bool AbstractTexturePack::hasFile(const std::string& name, bool allowFallback) { bool hasFile = this->hasFile(name); @@ -108,46 +108,46 @@ bool AbstractTexturePack::hasFile(const std::wstring& name, std::uint32_t AbstractTexturePack::getId() { return id; } -std::wstring AbstractTexturePack::getName() { return texname; } +std::string AbstractTexturePack::getName() { return texname; } -std::wstring AbstractTexturePack::getWorldName() { return m_wsWorldName; } +std::string AbstractTexturePack::getWorldName() { return m_wsWorldName; } -std::wstring AbstractTexturePack::getDesc1() { return desc1; } +std::string AbstractTexturePack::getDesc1() { return desc1; } -std::wstring AbstractTexturePack::getDesc2() { return desc2; } +std::string AbstractTexturePack::getDesc2() { return desc2; } -std::wstring AbstractTexturePack::getAnimationString( - const std::wstring& textureName, const std::wstring& path, +std::string AbstractTexturePack::getAnimationString( + const std::string& textureName, const std::string& path, bool allowFallback) { return getAnimationString(textureName, path); } -std::wstring AbstractTexturePack::getAnimationString( - const std::wstring& textureName, const std::wstring& path) { - std::wstring animationDefinitionFile = textureName + L".txt"; +std::string AbstractTexturePack::getAnimationString( + const std::string& textureName, const std::string& path) { + std::string animationDefinitionFile = textureName + ".txt"; - bool requiresFallback = !hasFile(L"\\" + textureName + L".png", false); + bool requiresFallback = !hasFile("\\" + textureName + ".png", false); - std::wstring result = L""; + std::string result = ""; InputStream* fileStream = - getResource(L"\\" + path + animationDefinitionFile, requiresFallback); + getResource("\\" + path + animationDefinitionFile, requiresFallback); if (fileStream) { // Minecraft::getInstance()->getLogger().info("Found animation info for: // " + animationDefinitionFile); #if !defined(_CONTENT_PACKAGE) - Log::info("Found animation info for: %ls\n", + Log::info("Found animation info for: %s\n", animationDefinitionFile.c_str()); #endif InputStreamReader isr(fileStream); BufferedReader br(&isr); - std::wstring line = br.readLine(); + std::string line = br.readLine(); while (!line.empty()) { line = trimString(line); if (line.length() > 0) { - result.append(L","); + result.append(","); result.append(line); } line = br.readLine(); @@ -159,14 +159,14 @@ std::wstring AbstractTexturePack::getAnimationString( } BufferedImage* AbstractTexturePack::getImageResource( - const std::wstring& File, bool filenameHasExtension /*= false*/, - bool bTitleUpdateTexture /*=false*/, const std::wstring& drive /*=L""*/) { - std::string pchTexture = wstringtofilename(File); - std::string pchDrive = wstringtofilename(drive); + const std::string& File, bool filenameHasExtension /*= false*/, + bool bTitleUpdateTexture /*=false*/, const std::string& drive /*=""*/) { + std::string pchTexture = File; + std::string pchDrive = drive; Log::info("AbstractTexturePack::getImageResource - %s, drive is %s\n", pchTexture.c_str(), pchDrive.c_str()); - return new BufferedImage(TexturePack::getResource(L"/" + File), + return new BufferedImage(TexturePack::getResource("/" + File), filenameHasExtension, bTitleUpdateTexture, drive); } @@ -180,7 +180,7 @@ void AbstractTexturePack::loadColourTable() { void AbstractTexturePack::loadDefaultColourTable() { // Load the file File coloursFile( - AbstractTexturePack::getPath(true).append(L"res/colours.col")); + AbstractTexturePack::getPath(true).append("res/colours.col")); if (coloursFile.exists()) { uint32_t dataLength = coloursFile.length(); @@ -199,9 +199,9 @@ void AbstractTexturePack::loadDefaultColourTable() { } void AbstractTexturePack::loadDefaultHTMLColourTable() { - if (gameServices().hasArchiveFile(L"HTMLColours.col")) { + if (gameServices().hasArchiveFile("HTMLColours.col")) { std::vector textColours = - gameServices().getArchiveFile(L"HTMLColours.col"); + gameServices().getArchiveFile("HTMLColours.col"); m_colourTable->loadColoursFromData(textColours.data(), textColours.size()); } @@ -213,17 +213,17 @@ void AbstractTexturePack::unloadUI() { // Do nothing } -std::wstring AbstractTexturePack::getXuiRootPath() { +std::string AbstractTexturePack::getXuiRootPath() { // const uintptr_t c_ModuleHandle = (uintptr_t)GetModuleHandle(nullptr); const uintptr_t c_ModuleHandle = 0; // 4jcraft changed // Load new skin constexpr int LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string - wchar_t szResourceLocator[LOCATOR_SIZE]; + char szResourceLocator[LOCATOR_SIZE]; - swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls", - c_ModuleHandle, L"media", L"media/"); + snprintf(szResourceLocator, LOCATOR_SIZE, "section://%X,%s#%s", + c_ModuleHandle, "media", "media/"); return szResourceLocator; } diff --git a/targets/minecraft/client/skins/AbstractTexturePack.h b/targets/minecraft/client/skins/AbstractTexturePack.h index eedf82cc3..33bf00a3f 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.h +++ b/targets/minecraft/client/skins/AbstractTexturePack.h @@ -13,15 +13,15 @@ class InputStream; class AbstractTexturePack : public TexturePack { private: const std::uint32_t id; - const std::wstring name; + const std::string name; protected: File* file; - std::wstring texname; - std::wstring m_wsWorldName; + std::string texname; + std::string m_wsWorldName; - std::wstring desc1; - std::wstring desc2; + std::string desc1; + std::string desc2; std::uint8_t* m_iconData; std::uint32_t m_iconSize; @@ -40,11 +40,11 @@ private: int textureId; protected: - AbstractTexturePack(std::uint32_t id, File* file, const std::wstring& name, + AbstractTexturePack(std::uint32_t id, File* file, const std::string& name, TexturePack* fallback); private: - static std::wstring trim(std::wstring line); + static std::string trim(std::string line); protected: virtual void loadIcon(); @@ -53,47 +53,47 @@ protected: virtual void loadName(); public: - virtual InputStream* getResource(const std::wstring& name, + virtual InputStream* getResource(const std::string& name, bool allowFallback); // throws IOException // 4J Removed do to current override in TexturePack class - // virtual InputStream *getResource(const std::wstring &name); //throws + // virtual InputStream *getResource(const std::string &name); //throws // IOException virtual DLCPack* getDLCPack() = 0; protected: virtual InputStream* getResourceImplementation( - const std::wstring& name) = 0; // throws IOException; + const std::string& name) = 0; // throws IOException; public: virtual void unload(Textures* textures); virtual void load(Textures* textures); - virtual bool hasFile(const std::wstring& name, bool allowFallback); - virtual bool hasFile(const std::wstring& name) = 0; + virtual bool hasFile(const std::string& name, bool allowFallback); + virtual bool hasFile(const std::string& name) = 0; virtual std::uint32_t getId(); - virtual std::wstring getName(); - virtual std::wstring getDesc1(); - virtual std::wstring getDesc2(); - virtual std::wstring getWorldName(); + virtual std::string getName(); + virtual std::string getDesc1(); + virtual std::string getDesc2(); + virtual std::string getWorldName(); - virtual std::wstring getAnimationString(const std::wstring& textureName, - const std::wstring& path, + virtual std::string getAnimationString(const std::string& textureName, + const std::string& path, bool allowFallback); protected: - virtual std::wstring getAnimationString(const std::wstring& textureName, - const std::wstring& path); + virtual std::string getAnimationString(const std::string& textureName, + const std::string& path); void loadDefaultUI(); void loadDefaultColourTable(); void loadDefaultHTMLColourTable(); public: - virtual BufferedImage* getImageResource(const std::wstring& File, + virtual BufferedImage* getImageResource(const std::string& File, bool filenameHasExtension = false, bool bTitleUpdateTexture = false, - const std::wstring& drive = L""); + const std::string& drive = ""); virtual void loadColourTable(); virtual void loadUI(); virtual void unloadUI(); - virtual std::wstring getXuiRootPath(); + virtual std::string getXuiRootPath(); virtual std::uint8_t* getPackIcon(std::uint32_t& imageBytes); virtual std::uint8_t* getPackComparison(std::uint32_t& imageBytes); virtual unsigned int getDLCParentPackId(); diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 3a25807e3..930a40ecc 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -86,10 +86,10 @@ DLCTexturePack::DLCTexturePack(std::uint32_t id, DLCPack* pack, m_stringTable = nullptr; if (m_dlcInfoPack->doesPackContainFile( - DLCManager::e_DLCType_LocalisationData, L"languages.loc")) { + DLCManager::e_DLCType_LocalisationData, "languages.loc")) { DLCLocalisationFile* localisationFile = (DLCLocalisationFile*)m_dlcInfoPack->getFile( - DLCManager::e_DLCType_LocalisationData, L"languages.loc"); + DLCManager::e_DLCType_LocalisationData, "languages.loc"); m_stringTable = localisationFile->getStringTable(); } @@ -102,9 +102,9 @@ DLCTexturePack::DLCTexturePack(std::uint32_t id, DLCPack* pack, void DLCTexturePack::loadIcon() { if (m_dlcInfoPack->doesPackContainFile(DLCManager::e_DLCType_Texture, - L"icon.png")) { + "icon.png")) { DLCTextureFile* textureFile = (DLCTextureFile*)m_dlcInfoPack->getFile( - DLCManager::e_DLCType_Texture, L"icon.png"); + DLCManager::e_DLCType_Texture, "icon.png"); std::uint32_t iconSize = 0; m_iconData = textureFile->getData(iconSize); m_iconSize = iconSize; @@ -115,9 +115,9 @@ void DLCTexturePack::loadIcon() { void DLCTexturePack::loadComparison() { if (m_dlcInfoPack->doesPackContainFile(DLCManager::e_DLCType_Texture, - L"comparison.png")) { + "comparison.png")) { DLCTextureFile* textureFile = (DLCTextureFile*)m_dlcInfoPack->getFile( - DLCManager::e_DLCType_Texture, L"comparison.png"); + DLCManager::e_DLCType_Texture, "comparison.png"); std::uint32_t comparisonSize = 0; m_comparisonData = textureFile->getData(comparisonSize); m_comparisonSize = comparisonSize; @@ -125,38 +125,38 @@ void DLCTexturePack::loadComparison() { } void DLCTexturePack::loadName() { - texname = L""; + texname = ""; if (m_dlcInfoPack->GetPackID() & 1024) { if (m_stringTable != nullptr) { - texname = m_stringTable->getString(L"IDS_DISPLAY_NAME"); - m_wsWorldName = m_stringTable->getString(L"IDS_WORLD_NAME"); + texname = m_stringTable->getString("IDS_DISPLAY_NAME"); + m_wsWorldName = m_stringTable->getString("IDS_WORLD_NAME"); } } else { if (m_stringTable != nullptr) { - texname = m_stringTable->getString(L"IDS_DISPLAY_NAME"); + texname = m_stringTable->getString("IDS_DISPLAY_NAME"); } } } void DLCTexturePack::loadDescription() { - desc1 = L""; + desc1 = ""; if (m_stringTable != nullptr) { - desc1 = m_stringTable->getString(L"IDS_TP_DESCRIPTION"); + desc1 = m_stringTable->getString("IDS_TP_DESCRIPTION"); } } -std::wstring DLCTexturePack::getResource(const std::wstring& name) { +std::string DLCTexturePack::getResource(const std::string& name) { // 4J Stu - We should never call this function #if !defined(__CONTENT_PACKAGE) assert(0); #endif - return L""; + return ""; } InputStream* DLCTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException + const std::string& name) // throws IOException { // 4J Stu - We should never call this function #if !defined(_CONTENT_PACKAGE) @@ -166,7 +166,7 @@ InputStream* DLCTexturePack::getResourceImplementation( return nullptr; // resource; } -bool DLCTexturePack::hasFile(const std::wstring& name) { +bool DLCTexturePack::hasFile(const std::string& name) { bool hasFile = false; if (m_dlcDataPack != nullptr) hasFile = m_dlcDataPack->doesPackContainFile( @@ -176,16 +176,16 @@ bool DLCTexturePack::hasFile(const std::wstring& name) { bool DLCTexturePack::isTerrainUpdateCompatible() { return true; } -std::wstring DLCTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, +std::string DLCTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, const char* pchBDPatchFilename) { - return L""; + return ""; } -std::wstring DLCTexturePack::getAnimationString(const std::wstring& textureName, - const std::wstring& path) { - std::wstring result = L""; +std::string DLCTexturePack::getAnimationString(const std::string& textureName, + const std::string& path) { + std::string result = ""; - std::wstring fullpath = L"res/" + path + textureName + L".png"; + std::string fullpath = "res/" + path + textureName + ".png"; if (hasFile(fullpath)) { result = m_dlcDataPack->getFile(DLCManager::e_DLCType_Texture, fullpath) ->getParameterAsString(DLCManager::e_DLCParamType_Anim); @@ -195,10 +195,10 @@ std::wstring DLCTexturePack::getAnimationString(const std::wstring& textureName, } BufferedImage* DLCTexturePack::getImageResource( - const std::wstring& File, bool filenameHasExtension /*= false*/, - bool bTitleUpdateTexture /*=false*/, const std::wstring& drive /*=L""*/) { + const std::string& File, bool filenameHasExtension /*= false*/, + bool bTitleUpdateTexture /*=false*/, const std::string& drive /*=""*/) { if (m_dlcDataPack) - return new BufferedImage(m_dlcDataPack, L"/" + File, + return new BufferedImage(m_dlcDataPack, "/" + File, filenameHasExtension); else return fallback->getImageResource(File, filenameHasExtension, @@ -211,10 +211,10 @@ void DLCTexturePack::loadColourTable() { // Load the game colours if (m_dlcDataPack != nullptr && m_dlcDataPack->doesPackContainFile(DLCManager::e_DLCType_ColourTable, - L"colours.col")) { + "colours.col")) { DLCColourTableFile* colourFile = (DLCColourTableFile*)m_dlcDataPack->getFile( - DLCManager::e_DLCType_ColourTable, L"colours.col"); + DLCManager::e_DLCType_ColourTable, "colours.col"); m_colourTable = colourFile->getColourTable(); m_bUsingDefaultColourTable = false; } else { @@ -226,9 +226,9 @@ void DLCTexturePack::loadColourTable() { } // Load the text colours - if (gameServices().hasArchiveFile(L"HTMLColours.col")) { + if (gameServices().hasArchiveFile("HTMLColours.col")) { std::vector textColours = - gameServices().getArchiveFile(L"HTMLColours.col"); + gameServices().getArchiveFile("HTMLColours.col"); m_colourTable->loadColoursFromData(textColours.data(), textColours.size()); } @@ -264,8 +264,8 @@ void DLCTexturePack::loadData() { } } -std::wstring DLCTexturePack::getFilePath(std::uint32_t packId, - std::wstring filename, +std::string DLCTexturePack::getFilePath(std::uint32_t packId, + std::string filename, bool bAddDataFolder) { return gameServices().getFilePath(packId, filename, bAddDataFolder); } @@ -285,7 +285,7 @@ int DLCTexturePack::onPackMounted(int iPad, std::uint32_t dwErr, texturePack->setHasAudio(false); unsigned int dwFilesProcessed = 0; // Load the DLC textures - std::wstring dataFilePath = + std::string dataFilePath = texturePack->m_dlcInfoPack->getFullDataPath(); if (!dataFilePath.empty()) { if (!gameServices().dlcReadDataFile( @@ -301,7 +301,7 @@ int DLCTexturePack::onPackMounted(int iPad, std::uint32_t dwErr, if (texturePack->m_dlcDataPack != nullptr) { File archivePath( getFilePath(texturePack->m_dlcInfoPack->GetPackID(), - std::wstring(L"media.arc"))); + std::string("media.arc"))); if (archivePath.exists()) texturePack->m_archiveFile = new ArchiveFile(archivePath); @@ -410,7 +410,7 @@ int DLCTexturePack::onPackMounted(int iPad, std::uint32_t dwErr, } void DLCTexturePack::loadUI() { - if (m_archiveFile && m_archiveFile->hasFile(L"skin.swf")) { + if (m_archiveFile && m_archiveFile->hasFile("skin.swf")) { ui.ReloadSkin(); bUILoaded = true; } else { @@ -439,21 +439,21 @@ void DLCTexturePack::unloadUI() { bUILoaded = false; } -std::wstring DLCTexturePack::getXuiRootPath() { - std::wstring path = L""; +std::string DLCTexturePack::getXuiRootPath() { + std::string path = ""; if (m_dlcDataPack != nullptr && m_dlcDataPack->doesPackContainFile(DLCManager::e_DLCType_UIData, - L"TexturePack.xzp")) { + "TexturePack.xzp")) { DLCUIDataFile* dataFile = (DLCUIDataFile*)m_dlcDataPack->getFile( - DLCManager::e_DLCType_UIData, L"TexturePack.xzp"); + DLCManager::e_DLCType_UIData, "TexturePack.xzp"); std::uint32_t dwSize = 0; std::uint8_t* pbData = dataFile->getData(dwSize); constexpr int LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string - wchar_t szResourceLocator[LOCATOR_SIZE]; - swprintf(szResourceLocator, LOCATOR_SIZE, L"memory://%08X,%04X#", + char szResourceLocator[LOCATOR_SIZE]; + snprintf(szResourceLocator, LOCATOR_SIZE, "memory://%08X,%04X#", pbData, dwSize); path = szResourceLocator; } diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index ccec65f84..29914cddc 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -29,16 +29,16 @@ public: DLCTexturePack(std::uint32_t id, DLCPack* pack, TexturePack* fallback); ~DLCTexturePack() {}; - virtual std::wstring getResource(const std::wstring& name); + virtual std::string getResource(const std::string& name); virtual DLCPack* getDLCPack(); - virtual std::wstring getDesc1() { - return m_stringTable->getString(L"IDS_TP_DESCRIPTION"); + virtual std::string getDesc1() { + return m_stringTable->getString("IDS_TP_DESCRIPTION"); } - virtual std::wstring getName() { - return m_stringTable->getString(L"IDS_DISPLAY_NAME"); + virtual std::string getName() { + return m_stringTable->getString("IDS_DISPLAY_NAME"); } - virtual std::wstring getWorldName() { - return m_stringTable->getString(L"IDS_WORLD_NAME"); + virtual std::string getWorldName() { + return m_stringTable->getString("IDS_WORLD_NAME"); } // Added for sound banks with MashUp packs @@ -49,30 +49,30 @@ protected: void loadName(); void loadDescription(); InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException + const std::string& name); // throws IOException public: //@Override - bool hasFile(const std::wstring& name); + bool hasFile(const std::string& name); bool isTerrainUpdateCompatible(); // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, + virtual std::string getPath(bool bTitleUpdateTexture = false, const char* pchBDPatchFilename = nullptr); - virtual std::wstring getAnimationString(const std::wstring& textureName, - const std::wstring& path); - virtual BufferedImage* getImageResource(const std::wstring& File, + virtual std::string getAnimationString(const std::string& textureName, + const std::string& path); + virtual BufferedImage* getImageResource(const std::string& File, bool filenameHasExtension = false, bool bTitleUpdateTexture = false, - const std::wstring& drive = L""); + const std::string& drive = ""); virtual void loadColourTable(); virtual bool hasData() { return m_bHasLoadedData; } virtual bool isLoadingData() { return m_bLoadingData; } private: - static std::wstring getRootPath(std::uint32_t packId, bool allowOverride, + static std::string getRootPath(std::uint32_t packId, bool allowOverride, bool bAddDataFolder); - static std::wstring getFilePath(std::uint32_t packId, std::wstring filename, + static std::string getFilePath(std::uint32_t packId, std::string filename, bool bAddDataFolder = true); public: @@ -81,7 +81,7 @@ public: virtual void loadData(); virtual void loadUI(); virtual void unloadUI(); - virtual std::wstring getXuiRootPath(); + virtual std::string getXuiRootPath(); virtual ArchiveFile* getArchiveFile() { return m_archiveFile; } virtual unsigned int getDLCParentPackId(); diff --git a/targets/minecraft/client/skins/DefaultTexturePack.cpp b/targets/minecraft/client/skins/DefaultTexturePack.cpp index 5305d3843..7a344dcae 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.cpp +++ b/targets/minecraft/client/skins/DefaultTexturePack.cpp @@ -9,7 +9,7 @@ #include "minecraft/client/skins/AbstractTexturePack.h" DefaultTexturePack::DefaultTexturePack() - : AbstractTexturePack(0, nullptr, L"Minecraft", nullptr) { + : AbstractTexturePack(0, nullptr, "Minecraft", nullptr) { // 4J Stu - These calls need to be in the most derived version of the class loadIcon(); loadName(); // 4J-PB - added so the PS3 can have localised texture names' @@ -18,20 +18,20 @@ DefaultTexturePack::DefaultTexturePack() } void DefaultTexturePack::loadIcon() { - if (gameServices().hasArchiveFile(L"Graphics\\TexturePackIcon.png")) { + if (gameServices().hasArchiveFile("Graphics\\TexturePackIcon.png")) { std::vector ba = - gameServices().getArchiveFile(L"Graphics\\TexturePackIcon.png"); + gameServices().getArchiveFile("Graphics\\TexturePackIcon.png"); m_iconData = ba.data(); m_iconSize = static_cast(ba.size()); } } void DefaultTexturePack::loadDescription() { - desc1 = L"LOCALISE ME: The default look of Minecraft"; + desc1 = "LOCALISE ME: The default look of Minecraft"; } -void DefaultTexturePack::loadName() { texname = L"Minecraft"; } +void DefaultTexturePack::loadName() { texname = "Minecraft"; } -bool DefaultTexturePack::hasFile(const std::wstring& name) { +bool DefaultTexturePack::hasFile(const std::string& name) { // return DefaultTexturePack::class->getResourceAsStream(name) != null; return true; } @@ -39,11 +39,11 @@ bool DefaultTexturePack::hasFile(const std::wstring& name) { bool DefaultTexturePack::isTerrainUpdateCompatible() { return true; } InputStream* DefaultTexturePack::getResourceImplementation( - const std::wstring& name) // throws FileNotFoundException + const std::string& name) // throws FileNotFoundException { - std::wstring wDrive = L""; + std::string wDrive = ""; // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\res\\TitleUpdate\\res"; + wDrive = "Common\\res\\TitleUpdate\\res"; InputStream* resource = InputStream::getResourceAsStream(wDrive + name); // InputStream *stream = diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index fa2e00689..085b1d4ed 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -19,15 +19,15 @@ protected: public: //@Override - bool hasFile(const std::wstring& name); + bool hasFile(const std::string& name); bool isTerrainUpdateCompatible(); - std::wstring getDesc1() { return gameServices().getString(IDS_DEFAULT_TEXTUREPACK); } + std::string getDesc1() { return gameServices().getString(IDS_DEFAULT_TEXTUREPACK); } protected: //@Override InputStream* getResourceImplementation( - const std::wstring& name); // throws FileNotFoundException + const std::string& name); // throws FileNotFoundException public: virtual bool hasData() { return true; } diff --git a/targets/minecraft/client/skins/FileTexturePack.cpp b/targets/minecraft/client/skins/FileTexturePack.cpp index f05e3d427..b0f87d820 100644 --- a/targets/minecraft/client/skins/FileTexturePack.cpp +++ b/targets/minecraft/client/skins/FileTexturePack.cpp @@ -17,12 +17,12 @@ FileTexturePack::FileTexturePack(std::uint32_t id, File* file, void FileTexturePack::unload(Textures* textures) {} InputStream* FileTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException + const std::string& name) // throws IOException { return nullptr; } -bool FileTexturePack::hasFile(const std::wstring& name) { return false; } +bool FileTexturePack::hasFile(const std::string& name) { return false; } void FileTexturePack::loadZipFile() // throws IOException {} diff --git a/targets/minecraft/client/skins/FileTexturePack.h b/targets/minecraft/client/skins/FileTexturePack.h index 293c52da6..db033c678 100644 --- a/targets/minecraft/client/skins/FileTexturePack.h +++ b/targets/minecraft/client/skins/FileTexturePack.h @@ -22,11 +22,11 @@ public: protected: InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException + const std::string& name); // throws IOException public: //@Override - bool hasFile(const std::wstring& name); + bool hasFile(const std::string& name); private: void loadZipFile(); // throws IOException diff --git a/targets/minecraft/client/skins/FolderTexturePack.cpp b/targets/minecraft/client/skins/FolderTexturePack.cpp index 69379f428..aa62fd4bc 100644 --- a/targets/minecraft/client/skins/FolderTexturePack.cpp +++ b/targets/minecraft/client/skins/FolderTexturePack.cpp @@ -6,7 +6,7 @@ class TexturePack; -FolderTexturePack::FolderTexturePack(std::uint32_t id, const std::wstring& name, +FolderTexturePack::FolderTexturePack(std::uint32_t id, const std::string& name, File* folder, TexturePack* fallback) : AbstractTexturePack(id, folder, name, fallback) { // 4J Stu - These calls need to be in the most derived version of the class @@ -18,11 +18,11 @@ FolderTexturePack::FolderTexturePack(std::uint32_t id, const std::wstring& name, } InputStream* FolderTexturePack::getResourceImplementation( - const std::wstring& name) // throws IOException + const std::string& name) // throws IOException { - std::wstring wDrive = L""; + std::string wDrive = ""; // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\DummyTexturePack\\res"; + wDrive = "Common\\DummyTexturePack\\res"; InputStream* resource = InputStream::getResourceAsStream(wDrive + name); // InputStream *stream = // DefaultTexturePack::class->getResourceAsStream(name); if (stream == @@ -35,7 +35,7 @@ InputStream* FolderTexturePack::getResourceImplementation( return resource; } -bool FolderTexturePack::hasFile(const std::wstring& name) { +bool FolderTexturePack::hasFile(const std::string& name) { File file = File(getPath() + name); return file.exists() && file.isFile(); // return true; @@ -43,10 +43,10 @@ bool FolderTexturePack::hasFile(const std::wstring& name) { bool FolderTexturePack::isTerrainUpdateCompatible() { return true; } -std::wstring FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, +std::string FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/, const char* pchBDPatchFilename) { - std::wstring wDrive; - wDrive = L"Common\\" + file->getPath() + L"\\"; + std::string wDrive; + wDrive = "Common\\" + file->getPath() + "\\"; return wDrive; } diff --git a/targets/minecraft/client/skins/FolderTexturePack.h b/targets/minecraft/client/skins/FolderTexturePack.h index c78ec2f64..637ef54d8 100644 --- a/targets/minecraft/client/skins/FolderTexturePack.h +++ b/targets/minecraft/client/skins/FolderTexturePack.h @@ -13,21 +13,21 @@ private: bool bUILoaded; public: - FolderTexturePack(std::uint32_t id, const std::wstring& name, File* folder, + FolderTexturePack(std::uint32_t id, const std::string& name, File* folder, TexturePack* fallback); protected: //@Override InputStream* getResourceImplementation( - const std::wstring& name); // throws IOException + const std::string& name); // throws IOException public: //@Override - bool hasFile(const std::wstring& name); + bool hasFile(const std::string& name); bool isTerrainUpdateCompatible(); // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, + virtual std::string getPath(bool bTitleUpdateTexture = false, const char* pchBDPatchFilename = nullptr); virtual void loadUI(); virtual void unloadUI(); diff --git a/targets/minecraft/client/skins/TexturePack.cpp b/targets/minecraft/client/skins/TexturePack.cpp index 550ab35a3..c323e5fb2 100644 --- a/targets/minecraft/client/skins/TexturePack.cpp +++ b/targets/minecraft/client/skins/TexturePack.cpp @@ -1,15 +1,15 @@ #include "TexturePack.h" -std::wstring TexturePack::getPath( +std::string TexturePack::getPath( bool bTitleUpdateTexture /*= false*/, const char* pchBDPatchFileName /*= nullptr*/) { - std::wstring wDrive; + std::string wDrive; if (bTitleUpdateTexture) { // Make the content package point to to the UPDATE: drive is needed - wDrive = L"Common\\res\\TitleUpdate\\"; + wDrive = "Common\\res\\TitleUpdate\\"; } else { - wDrive = L"app/common/"; + wDrive = "app/common/"; } return wDrive; diff --git a/targets/minecraft/client/skins/TexturePack.h b/targets/minecraft/client/skins/TexturePack.h index 477db580f..53727ff40 100644 --- a/targets/minecraft/client/skins/TexturePack.h +++ b/targets/minecraft/client/skins/TexturePack.h @@ -25,19 +25,19 @@ public: virtual void unload(Textures* textures) = 0; virtual void load(Textures* textures) = 0; virtual InputStream* getResource( - const std::wstring& name, + const std::string& name, bool allowFallback) = 0; // throws IOException; - // virtual InputStream *getResource(const std::wstring &name) = 0;// throws + // virtual InputStream *getResource(const std::string &name) = 0;// throws // IOException; virtual std::uint32_t getId() = 0; - virtual std::wstring getName() = 0; - virtual std::wstring getDesc1() = 0; - virtual std::wstring getDesc2() = 0; - virtual bool hasFile(const std::wstring& name, bool allowFallback) = 0; + virtual std::string getName() = 0; + virtual std::string getDesc1() = 0; + virtual std::string getDesc2() = 0; + virtual bool hasFile(const std::string& name, bool allowFallback) = 0; virtual bool isTerrainUpdateCompatible() = 0; - virtual std::wstring getResource( - const std::wstring& name) // 4J - changed to just return a name rather + virtual std::string getResource( + const std::string& name) // 4J - changed to just return a name rather // than an input stream { /* 4J - TODO @@ -48,18 +48,18 @@ return TexturePack.class.getResourceAsStream(name); virtual DLCPack* getDLCPack() { return nullptr; } // 4J Added - virtual std::wstring getPath(bool bTitleUpdateTexture = false, + virtual std::string getPath(bool bTitleUpdateTexture = false, const char* pchBDPatchFilename = nullptr); - virtual std::wstring getAnimationString(const std::wstring& textureName, - const std::wstring& path, + virtual std::string getAnimationString(const std::string& textureName, + const std::string& path, bool allowFallback) = 0; virtual BufferedImage* getImageResource( - const std::wstring& File, bool filenameHasExtension = false, - bool bTitleUpdateTexture = false, const std::wstring& drive = L"") = 0; + const std::string& File, bool filenameHasExtension = false, + bool bTitleUpdateTexture = false, const std::string& drive = "") = 0; virtual void loadColourTable() = 0; virtual void loadUI() = 0; virtual void unloadUI() = 0; - virtual std::wstring getXuiRootPath() = 0; + virtual std::string getXuiRootPath() = 0; virtual std::uint8_t* getPackIcon(std::uint32_t& imageBytes) = 0; virtual std::uint8_t* getPackComparison(std::uint32_t& imageBytes) = 0; virtual unsigned int getDLCParentPackId() = 0; diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 5423d434a..dc7005742 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -63,12 +63,12 @@ bool TexturePackRepository::selectSkin(TexturePack* skin) { return true; } -void TexturePackRepository::selectWebSkin(const std::wstring& url) { +void TexturePackRepository::selectWebSkin(const std::string& url) { Log::info( "TexturePackRepository::selectWebSkin is not implemented\n"); } -void TexturePackRepository::downloadWebSkin(const std::wstring& url, +void TexturePackRepository::downloadWebSkin(const std::string& url, File file) { Log::info( "TexturePackRepository::selectWebSkin is not implemented\n"); @@ -87,9 +87,9 @@ void TexturePackRepository::updateList() { // up-to-date as we go } -std::wstring TexturePackRepository::getIdOrNull(File file) { +std::string TexturePackRepository::getIdOrNull(File file) { Log::info("TexturePackRepository::getIdOrNull is not implemented\n"); - return L""; + return ""; } std::vector TexturePackRepository::getWorkDirContents() { @@ -122,14 +122,14 @@ bool TexturePackRepository::canUseWebSkin() { return false; } -std::vector >* +std::vector >* TexturePackRepository::getTexturePackIdNames() { - std::vector >* packList = - new std::vector >(); + std::vector >* packList = + new std::vector >(); for (auto it = texturePacks->begin(); it != texturePacks->end(); ++it) { TexturePack* pack = *it; - packList->push_back(std::pair( + packList->push_back(std::pair( pack->getId(), pack->getName())); } return packList; @@ -198,11 +198,11 @@ TexturePack* TexturePackRepository::addTexturePackFromDLC(DLCPack* dlcPack, cacheById[parentId] = newPack; #if !defined(_CONTENT_PACKAGE) - if (dlcPack->hasPurchasedFile(DLCManager::e_DLCType_TexturePack, L"")) { - wprintf(L"Added new FULL DLCTexturePack: %ls - id=%u\n", + if (dlcPack->hasPurchasedFile(DLCManager::e_DLCType_TexturePack, "")) { + printf("Added new FULL DLCTexturePack: %s - id=%u\n", dlcPack->getName().c_str(), parentId); } else { - wprintf(L"Added new TRIAL DLCTexturePack: %ls - id=%u\n", + printf("Added new TRIAL DLCTexturePack: %s - id=%u\n", dlcPack->getName().c_str(), parentId); } #endif diff --git a/targets/minecraft/client/skins/TexturePackRepository.h b/targets/minecraft/client/skins/TexturePackRepository.h index 1fe70e507..168291ad7 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.h +++ b/targets/minecraft/client/skins/TexturePackRepository.h @@ -47,10 +47,10 @@ private: public: bool selectSkin(TexturePack* skin); - void selectWebSkin(const std::wstring& url); + void selectWebSkin(const std::string& url); private: - void downloadWebSkin(const std::wstring& url, File file); + void downloadWebSkin(const std::string& url, File file); public: bool isUsingWebSkin(); @@ -58,7 +58,7 @@ public: void updateList(); private: - std::wstring getIdOrNull(File file); + std::string getIdOrNull(File file); std::vector getWorkDirContents(); public: @@ -72,7 +72,7 @@ public: } // 4J Added TexturePack* getDefault() { return DEFAULT_TEXTURE_PACK; } // 4J Added - std::vector >* + std::vector >* getTexturePackIdNames(); bool selectTexturePackById(std::uint32_t id); // 4J Added TexturePack* getTexturePackById(std::uint32_t id); // 4J Added diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index f50ab5792..0e9f08a5d 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -35,21 +35,21 @@ TitleScreen::TitleScreen() { vo = 0; multiplayerButton = nullptr; - splash = L"missingno"; + splash = "missingno"; // try { // 4J - removed try/catch - std::vector splashes; + std::vector splashes; // 4jcraft: copied over from UIScene_MainMenu int splashIndex; - std::wstring filename = L"splashes.txt"; + std::string filename = "splashes.txt"; if (gameServices().hasArchiveFile(filename)) { std::vector splashesArray = gameServices().getArchiveFile(filename); ByteArrayInputStream bais(splashesArray); InputStreamReader isr(&bais); BufferedReader br(&isr); - std::wstring line = L""; + std::string line = ""; while (!(line = br.readLine()).empty()) { line = trimString(line); if (line.length() > 0) { @@ -89,7 +89,7 @@ void TitleScreen::tick() { // // 4J - temp testing } -void TitleScreen::keyPressed(wchar_t eventCharacter, int eventKey) {} +void TitleScreen::keyPressed(char eventCharacter, int eventKey) {} void TitleScreen::init() { Log::info("TitleScreen::init() START\n"); @@ -117,23 +117,23 @@ if (c.get(Calendar.MONTH) + 1 == 11 && c.get(Calendar.DAY_OF_MONTH) == 9) { const int topPos = height / 4 + spacing * 2; buttons.push_back(new Button(1, width / 2 - 100, topPos, - language->getElement(L"menu.singleplayer"))); + language->getElement("menu.singleplayer"))); buttons.push_back(multiplayerButton = new Button( 2, width / 2 - 100, topPos + spacing * 1, - language->getElement(L"menu.multiplayer"))); + language->getElement("menu.multiplayer"))); buttons.push_back(new Button(3, width / 2 - 100, topPos + spacing * 2, - language->getElement(L"menu.mods"))); + language->getElement("menu.mods"))); if (minecraft->appletMode) { buttons.push_back(new Button(0, width / 2 - 100, topPos + spacing * 3, - language->getElement(L"menu.options"))); + language->getElement("menu.options"))); } else { buttons.push_back(new Button(0, width / 2 - 100, topPos + spacing * 3 + 12, 98, 20, - language->getElement(L"menu.options"))); + language->getElement("menu.options"))); buttons.push_back(new Button(4, width / 2 + 2, topPos + spacing * 3 + 12, 98, 20, - language->getElement(L"menu.quit"))); + language->getElement("menu.quit"))); } if (minecraft->user == nullptr) { @@ -417,7 +417,7 @@ void TitleScreen::render(int xm, int ym, float a) { drawString( font, ClientConstants::VERSION_STRING, 2, height - 10, 0xffffff); // 4jcraft: use the same height as the copyright message - std::wstring msg = L"Copyright Mojang AB. Do not distribute."; + std::string msg = "Copyright Mojang AB. Do not distribute."; drawString(font, msg, width - font->width(msg) - 2, height - 10, 0xffffff); Screen::render(xm, ym, a); diff --git a/targets/minecraft/client/title/TitleScreen.h b/targets/minecraft/client/title/TitleScreen.h index ed2b856f0..3ea036ca3 100644 --- a/targets/minecraft/client/title/TitleScreen.h +++ b/targets/minecraft/client/title/TitleScreen.h @@ -12,7 +12,7 @@ private: float vo; - std::wstring splash; + std::string splash; Button* multiplayerButton; // 4jcraft: panorama @@ -39,7 +39,7 @@ public: virtual void tick() override; protected: - virtual void keyPressed(wchar_t eventCharacter, int eventKey) override; + virtual void keyPressed(char eventCharacter, int eventKey) override; public: virtual void init() override; diff --git a/targets/minecraft/commands/AdminLogCommand.h b/targets/minecraft/commands/AdminLogCommand.h index fcb74f0b1..a20713570 100644 --- a/targets/minecraft/commands/AdminLogCommand.h +++ b/targets/minecraft/commands/AdminLogCommand.h @@ -11,6 +11,6 @@ public: virtual void logAdminCommand( std::shared_ptr source, int type, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message = L"", int customData = -1, - const std::wstring& additionalMessage = L"") = 0; + const std::string& message = "", int customData = -1, + const std::string& additionalMessage = "") = 0; }; \ No newline at end of file diff --git a/targets/minecraft/commands/Command.cpp b/targets/minecraft/commands/Command.cpp index f54f306e1..d0f6dafe7 100644 --- a/targets/minecraft/commands/Command.cpp +++ b/targets/minecraft/commands/Command.cpp @@ -16,16 +16,16 @@ bool Command::canExecute(std::shared_ptr source) { void Command::logAdminAction(std::shared_ptr source, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message, int customData, - const std::wstring& additionalMessage) { + const std::string& message, int customData, + const std::string& additionalMessage) { logAdminAction(source, 0, messageType, message, customData, additionalMessage); } void Command::logAdminAction(std::shared_ptr source, int type, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message, int customData, - const std::wstring& additionalMessage) { + const std::string& message, int customData, + const std::string& additionalMessage) { if (logger != nullptr) { logger->logAdminCommand(source, type, messageType, message, customData, additionalMessage); diff --git a/targets/minecraft/commands/Command.h b/targets/minecraft/commands/Command.h index 2e1d05d91..ae308e167 100644 --- a/targets/minecraft/commands/Command.h +++ b/targets/minecraft/commands/Command.h @@ -42,14 +42,14 @@ public: static void logAdminAction(std::shared_ptr source, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message = L"", + const std::string& message = "", int customData = -1, - const std::wstring& additionalMessage = L""); + const std::string& additionalMessage = ""); static void logAdminAction(std::shared_ptr source, int type, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message = L"", + const std::string& message = "", int customData = -1, - const std::wstring& additionalMessage = L""); + const std::string& additionalMessage = ""); static void setLogger(AdminLogCommand* logger); protected: diff --git a/targets/minecraft/commands/CommandDispatcher.cpp b/targets/minecraft/commands/CommandDispatcher.cpp index 87037c66f..175b3dd94 100644 --- a/targets/minecraft/commands/CommandDispatcher.cpp +++ b/targets/minecraft/commands/CommandDispatcher.cpp @@ -21,7 +21,7 @@ int CommandDispatcher::performCommand(std::shared_ptr sender, } else { #ifndef _CONTENT_PACKAGE sender->sendMessage( - L"\u00A7cYou do not have permission to use this command."); + "\u00A7cYou do not have permission to use this command."); #endif } } else { diff --git a/targets/minecraft/commands/CommandSender.h b/targets/minecraft/commands/CommandSender.h index 21e539113..78591f901 100644 --- a/targets/minecraft/commands/CommandSender.h +++ b/targets/minecraft/commands/CommandSender.h @@ -7,8 +7,8 @@ class CommandSender { public: // virtual int getUID() = 0; virtual void sendMessage( - const std::wstring& message, + const std::string& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L"") = 0; + int customData = -1, const std::string& additionalMessage = "") = 0; virtual bool hasPermission(EGameCommand command) = 0; }; \ No newline at end of file diff --git a/targets/minecraft/commands/common/EffectCommand.cpp b/targets/minecraft/commands/common/EffectCommand.cpp index c56525459..beceb2512 100644 --- a/targets/minecraft/commands/common/EffectCommand.cpp +++ b/targets/minecraft/commands/common/EffectCommand.cpp @@ -14,8 +14,8 @@ EGameCommand EffectCommand::getId() { return eGameCommand_Effect; } int EffectCommand::getPermissionLevel() { return LEVEL_GAMEMASTERS; } -std::wstring EffectCommand::getUsage(CommandSender* source) { - return L"commands.effect.usage"; +std::string EffectCommand::getUsage(CommandSender* source) { + return "commands.effect.usage"; } void EffectCommand::execute(std::shared_ptr source, @@ -86,11 +86,11 @@ void EffectCommand::execute(std::shared_ptr source, // throw new UsageException("commands.effect.usage"); } -std::wstring EffectCommand::getPlayerNames() { - return L""; // MinecraftServer::getInstance()->getPlayerNames(); +std::string EffectCommand::getPlayerNames() { + return ""; // MinecraftServer::getInstance()->getPlayerNames(); } -bool EffectCommand::isValidWildcardPlayerArgument(std::wstring args, +bool EffectCommand::isValidWildcardPlayerArgument(std::string args, int argumentIndex) { return argumentIndex == 0; } \ No newline at end of file diff --git a/targets/minecraft/commands/common/EffectCommand.h b/targets/minecraft/commands/common/EffectCommand.h index 9a95b7719..acaaf5254 100644 --- a/targets/minecraft/commands/common/EffectCommand.h +++ b/targets/minecraft/commands/common/EffectCommand.h @@ -13,13 +13,13 @@ class EffectCommand : public Command { public: EGameCommand getId(); int getPermissionLevel(); - std::wstring getUsage(CommandSender* source); + std::string getUsage(CommandSender* source); void execute(std::shared_ptr source, std::vector& commandData); protected: - std::wstring getPlayerNames(); + std::string getPlayerNames(); public: - bool isValidWildcardPlayerArgument(std::wstring args, int argumentIndex); + bool isValidWildcardPlayerArgument(std::string args, int argumentIndex); }; \ No newline at end of file diff --git a/targets/minecraft/commands/common/EnchantItemCommand.cpp b/targets/minecraft/commands/common/EnchantItemCommand.cpp index b24927a27..dee0c25d3 100644 --- a/targets/minecraft/commands/common/EnchantItemCommand.cpp +++ b/targets/minecraft/commands/common/EnchantItemCommand.cpp @@ -57,7 +57,7 @@ void EnchantItemCommand::execute(std::shared_ptr source, if (enchantmentTags != nullptr) { for (int i = 0; i < enchantmentTags->size(); i++) { int type = enchantmentTags->get(i)->getShort( - (wchar_t*)ItemInstance::TAG_ENCH_ID); + (char*)ItemInstance::TAG_ENCH_ID); if (Enchantment::enchantments[type] != nullptr) { Enchantment* other = Enchantment::enchantments[type]; @@ -77,7 +77,7 @@ void EnchantItemCommand::execute(std::shared_ptr source, // logAdminAction(source, "commands.enchant.success"); logAdminAction(source, ChatPacket::e_ChatCustom, - L"commands.enchant.success"); + "commands.enchant.success"); } std::shared_ptr EnchantItemCommand::preparePacket( diff --git a/targets/minecraft/commands/common/GameModeCommand.cpp b/targets/minecraft/commands/common/GameModeCommand.cpp index 647d81995..8c9ff5848 100644 --- a/targets/minecraft/commands/common/GameModeCommand.cpp +++ b/targets/minecraft/commands/common/GameModeCommand.cpp @@ -38,7 +38,7 @@ void GameModeCommand::execute(std::shared_ptr source, } GameType* GameModeCommand::getModeForString( - std::shared_ptr source, const std::wstring& name) { + std::shared_ptr source, const std::string& name) { return nullptr; // if (name.equalsIgnoreCase(GameType.SURVIVAL.getName()) || // name.equalsIgnoreCase("s")) { return GameType.SURVIVAL; } else if diff --git a/targets/minecraft/commands/common/GameModeCommand.h b/targets/minecraft/commands/common/GameModeCommand.h index 3473d0e37..42703b0f8 100644 --- a/targets/minecraft/commands/common/GameModeCommand.h +++ b/targets/minecraft/commands/common/GameModeCommand.h @@ -20,5 +20,5 @@ public: protected: GameType* getModeForString(std::shared_ptr source, - const std::wstring& name); + const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/commands/common/GiveItemCommand.cpp b/targets/minecraft/commands/common/GiveItemCommand.cpp index 19d31d589..bf3165ff2 100644 --- a/targets/minecraft/commands/common/GiveItemCommand.cpp +++ b/targets/minecraft/commands/common/GiveItemCommand.cpp @@ -29,7 +29,7 @@ void GiveItemCommand::execute(std::shared_ptr source, int item = dis.readInt(); int amount = dis.readInt(); int aux = dis.readInt(); - std::wstring tag = dis.readUTF(); + std::string tag = dis.readUTF(); bais.reset(); @@ -39,17 +39,17 @@ void GiveItemCommand::execute(std::shared_ptr source, std::make_shared(item, amount, aux); std::shared_ptr drop = player->drop(itemInstance); drop->throwTime = 0; - // logAdminAction(source, L"commands.give.success", + // logAdminAction(source, "commands.give.success", // ChatPacket::e_ChatCustom, Item::items[item]->getName(itemInstance), // item, amount, player->getAName()); logAdminAction(source, ChatPacket::e_ChatCustom, - L"commands.give.success", item, player->getAName()); + "commands.give.success", item, player->getAName()); } } std::shared_ptr GiveItemCommand::preparePacket( std::shared_ptr player, int item, int amount, int aux, - const std::wstring& tag) { + const std::string& tag) { if (player == nullptr) return nullptr; ByteArrayOutputStream baos; diff --git a/targets/minecraft/commands/common/GiveItemCommand.h b/targets/minecraft/commands/common/GiveItemCommand.h index 111729b87..5182aa43c 100644 --- a/targets/minecraft/commands/common/GiveItemCommand.h +++ b/targets/minecraft/commands/common/GiveItemCommand.h @@ -21,5 +21,5 @@ public: public: static std::shared_ptr preparePacket( std::shared_ptr player, int item, int amount = 1, int aux = 0, - const std::wstring& tag = L""); + const std::string& tag = ""); }; \ No newline at end of file diff --git a/targets/minecraft/commands/common/KillCommand.cpp b/targets/minecraft/commands/common/KillCommand.cpp index 6506d43e8..4041fcfd2 100644 --- a/targets/minecraft/commands/common/KillCommand.cpp +++ b/targets/minecraft/commands/common/KillCommand.cpp @@ -19,6 +19,6 @@ void KillCommand::execute(std::shared_ptr source, player->hurt(DamageSource::outOfWorld, std::numeric_limits::max()); - source->sendMessage(L"Ouch. That look like it hurt."); + source->sendMessage("Ouch. That look like it hurt."); // source.sendMessage(ChatMessageComponent.forTranslation("commands.kill.success")); } diff --git a/targets/minecraft/commands/common/TimeCommand.cpp b/targets/minecraft/commands/common/TimeCommand.cpp index 9a24de005..b552baf53 100644 --- a/targets/minecraft/commands/common/TimeCommand.cpp +++ b/targets/minecraft/commands/common/TimeCommand.cpp @@ -32,7 +32,7 @@ void TimeCommand::execute(std::shared_ptr source, if (night) amount = 12500; doSetTime(source, amount); // logAdminAction(source, "commands.time.set", amount); - logAdminAction(source, ChatPacket::e_ChatCustom, L"commands.time.set"); + logAdminAction(source, ChatPacket::e_ChatCustom, "commands.time.set"); // if (args.size() > 1) { // if (args[0].equals("set")) { diff --git a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp index b0adfe597..710c466a8 100644 --- a/targets/minecraft/commands/common/ToggleDownfallCommand.cpp +++ b/targets/minecraft/commands/common/ToggleDownfallCommand.cpp @@ -20,7 +20,7 @@ void ToggleDownfallCommand::execute(std::shared_ptr source, std::vector& commandData) { doToggleDownfall(); logAdminAction(source, ChatPacket::e_ChatCustom, - L"commands.downfall.success"); + "commands.downfall.success"); } void ToggleDownfallCommand::doToggleDownfall() { diff --git a/targets/minecraft/locale/I18n.cpp b/targets/minecraft/locale/I18n.cpp index 180ebba66..de813a6f2 100644 --- a/targets/minecraft/locale/I18n.cpp +++ b/targets/minecraft/locale/I18n.cpp @@ -4,12 +4,12 @@ Language* I18n::lang = Language::getInstance(); // 4jcraft const & into va_start is ub -std::wstring I18n::get(std::wstring id, ...) { +std::string I18n::get(std::string id, ...) { va_list va; va_start(va, id); return I18n::get(id, va); } -std::wstring I18n::get(const std::wstring& id, va_list args) { +std::string I18n::get(const std::string& id, va_list args) { return lang->getElement(id, args); } diff --git a/targets/minecraft/locale/I18n.h b/targets/minecraft/locale/I18n.h index 47d8f1b08..15e390df6 100644 --- a/targets/minecraft/locale/I18n.h +++ b/targets/minecraft/locale/I18n.h @@ -13,6 +13,6 @@ private: static Language* lang; public: - static std::wstring get(std::wstring id, ...); - static std::wstring get(const std::wstring& id, va_list args); + static std::string get(std::string id, ...); + static std::string get(const std::string& id, va_list args); }; diff --git a/targets/minecraft/locale/Language.cpp b/targets/minecraft/locale/Language.cpp index 3217e14e4..90b49e4a1 100644 --- a/targets/minecraft/locale/Language.cpp +++ b/targets/minecraft/locale/Language.cpp @@ -19,7 +19,7 @@ Language* Language::singleton = nullptr; Language::Language() { // TODO: move the language loading out of the init to better match 1.3.x // see StringTranslate.java in MCP 7.x for more context - File langFile(L"Common/res/lang/en_US.lang"); + File langFile("Common/res/lang/en_US.lang"); if (langFile.exists()) { InputStream* stream = new FileInputStream(langFile); if (stream) { @@ -32,7 +32,7 @@ Language::Language() { // // InputStreamReader reader(stream); // BufferedReader bufferedReader(&reader); - // std::wstring line; + // std::string line; std::vector buffer((unsigned int)fileSize); int bytesRead = stream->read(buffer, 0, (unsigned int)fileSize); if (bytesRead > 0) { @@ -57,8 +57,8 @@ Language::Language() { std::string key = trimmed.substr(0, equalsPos); std::string value = trimmed.substr(equalsPos + 1); - std::wstring wkey(key.begin(), key.end()); - std::wstring wvalue(value.begin(), value.end()); + std::string wkey(key.begin(), key.end()); + std::string wvalue(value.begin(), value.end()); translateTable[wkey] = wvalue; } @@ -80,47 +80,47 @@ Language* Language::getInstance() { } /* 4J Jev, creates 2 identical functions. -std::wstring Language::getElement(const std::wstring& elementId) +std::string Language::getElement(const std::string& elementId) { return elementId; } */ // 4jcraft changed, again const reference into va_start, std forbids -std::wstring Language::getElement(std::wstring elementId, ...) { +std::string Language::getElement(std::string elementId, ...) { va_list args; va_start(args, elementId); - std::wstring result = getElement(elementId, args); + std::string result = getElement(elementId, args); va_end(args); return result; } -std::wstring Language::getElement(const std::wstring& elementId, va_list args) { +std::string Language::getElement(const std::string& elementId, va_list args) { auto it = translateTable.find(elementId); - std::wstring formatString = + std::string formatString = (it != translateTable.end()) ? it->second : elementId; - if (formatString.find(L'%') != std::wstring::npos) { + if (formatString.find('%') != std::string::npos) { int bufferSize = formatString.length() + 256; - std::vector buffer(bufferSize); + std::vector buffer(bufferSize); int written = - vswprintf(buffer.data(), bufferSize, formatString.c_str(), args); + vsnprintf(buffer.data(), bufferSize, formatString.c_str(), args); if (written >= 0) { - return std::wstring(buffer.data(), written); + return std::string(buffer.data(), written); } } return formatString; } -std::wstring Language::getElementName(const std::wstring& elementId) { - std::wstring nameKey = elementId + L".name"; +std::string Language::getElementName(const std::string& elementId) { + std::string nameKey = elementId + ".name"; auto it = translateTable.find(nameKey); return (it != translateTable.end()) ? it->second : elementId; } -std::wstring Language::getElementDescription(const std::wstring& elementId) { - std::wstring descKey = elementId + L".description"; +std::string Language::getElementDescription(const std::string& elementId) { + std::string descKey = elementId + ".description"; auto it = translateTable.find(descKey); return (it != translateTable.end()) ? it->second : elementId; } diff --git a/targets/minecraft/locale/Language.h b/targets/minecraft/locale/Language.h index c91103aaa..5d950e526 100644 --- a/targets/minecraft/locale/Language.h +++ b/targets/minecraft/locale/Language.h @@ -8,13 +8,13 @@ class Language { private: static Language* singleton; - std::unordered_map translateTable; + std::unordered_map translateTable; public: Language(); static Language* getInstance(); - std::wstring getElement(std::wstring elementId, ...); - std::wstring getElement(const std::wstring& elementId, va_list args); - std::wstring getElementName(const std::wstring& elementId); - std::wstring getElementDescription(const std::wstring& elementId); + std::string getElement(std::string elementId, ...); + std::string getElement(const std::string& elementId, va_list args); + std::string getElementName(const std::string& elementId); + std::string getElementDescription(const std::string& elementId); }; \ No newline at end of file diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index 9a77e473b..e29dc6e21 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -82,7 +82,7 @@ Connection::~Connection() { dis = nullptr; } -Connection::Connection(Socket* socket, const std::wstring& id, +Connection::Connection(Socket* socket, const std::string& id, PacketListener* packetListener) // throws IOException { _init(); @@ -116,7 +116,7 @@ Connection::Connection(Socket* socket, const std::wstring& id, m_hWakeReadThread = new C4JThread::Event; m_hWakeWriteThread = new C4JThread::Event; - std::string szId = wstringtofilename(id); + std::string szId = id; char readThreadName[256]; char writeThreadName[256]; sprintf(readThreadName, "%s read\n", szId.c_str()); @@ -130,7 +130,7 @@ Connection::Connection(Socket* socket, const std::wstring& id, writeThread->run(); /* 4J JEV, java: - new Thread(wstring(id).append(L" read thread")) { + new Thread(string(id).append(" read thread")) { }; @@ -371,7 +371,7 @@ void Connection::close(DisconnectPacket::eDisconnectReason reason) { // printf("Con:0x%x close doing something\n",this); disconnected = true; - disconnectReason = reason; // va_arg( input, const wstring ); + disconnectReason = reason; // va_arg( input, const string ); disconnectReasonObjects = nullptr; // int count = 0, sum = 0, i = first; diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index c38b5a808..cdac099b3 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -109,7 +109,7 @@ private: public: ~Connection(); - Connection(Socket* socket, const std::wstring& id, + Connection(Socket* socket, const std::string& id, PacketListener* packetListener); // throws IOException void setListener(PacketListener* packetListener); diff --git a/targets/minecraft/network/packet/AddPaintingPacket.cpp b/targets/minecraft/network/packet/AddPaintingPacket.cpp index 8d57a6b78..ce7df6a73 100644 --- a/targets/minecraft/network/packet/AddPaintingPacket.cpp +++ b/targets/minecraft/network/packet/AddPaintingPacket.cpp @@ -11,7 +11,7 @@ AddPaintingPacket::AddPaintingPacket() { y = 0; z = 0; dir = 0; - motive = L""; + motive = ""; } AddPaintingPacket::AddPaintingPacket(std::shared_ptr e) { diff --git a/targets/minecraft/network/packet/AddPaintingPacket.h b/targets/minecraft/network/packet/AddPaintingPacket.h index 80f848cf2..cda35225a 100644 --- a/targets/minecraft/network/packet/AddPaintingPacket.h +++ b/targets/minecraft/network/packet/AddPaintingPacket.h @@ -15,7 +15,7 @@ public: int id; int x, y, z; int dir; - std::wstring motive; + std::string motive; public: AddPaintingPacket(); diff --git a/targets/minecraft/network/packet/AddPlayerPacket.cpp b/targets/minecraft/network/packet/AddPlayerPacket.cpp index b3275acc1..8d96701e3 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.cpp +++ b/targets/minecraft/network/packet/AddPlayerPacket.cpp @@ -12,7 +12,7 @@ AddPlayerPacket::AddPlayerPacket() { id = -1; - name = L""; + name = ""; x = 0; y = 0; z = 0; diff --git a/targets/minecraft/network/packet/AddPlayerPacket.h b/targets/minecraft/network/packet/AddPlayerPacket.h index abf1d9f8a..240ee5737 100644 --- a/targets/minecraft/network/packet/AddPlayerPacket.h +++ b/targets/minecraft/network/packet/AddPlayerPacket.h @@ -21,7 +21,7 @@ private: public: int id; - std::wstring name; + std::string name; int x, y, z; char yRot, xRot; int carriedItem; diff --git a/targets/minecraft/network/packet/ChatPacket.cpp b/targets/minecraft/network/packet/ChatPacket.cpp index e61694e92..c0e79e188 100644 --- a/targets/minecraft/network/packet/ChatPacket.cpp +++ b/targets/minecraft/network/packet/ChatPacket.cpp @@ -12,7 +12,7 @@ const unsigned int ChatPacket::MAX_LENGTH = ChatPacket::ChatPacket() { m_messageType = e_ChatCustom; } -ChatPacket::ChatPacket(const std::wstring& message, +ChatPacket::ChatPacket(const std::string& message, EChatPacketMessage type /*= e_ChatCustom*/, int customData /*= -1*/) { m_messageType = type; @@ -21,8 +21,8 @@ ChatPacket::ChatPacket(const std::wstring& message, m_stringArgs.push_back(message); } -ChatPacket::ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName) { +ChatPacket::ChatPacket(const std::string& message, EChatPacketMessage type, + int sourceEntityType, const std::string& sourceName) { m_messageType = type; if (sourceEntityType != -1) m_intArgs.push_back(sourceEntityType); @@ -30,9 +30,9 @@ ChatPacket::ChatPacket(const std::wstring& message, EChatPacketMessage type, m_stringArgs.push_back(sourceName); } -ChatPacket::ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName, - const std::wstring& itemName) { +ChatPacket::ChatPacket(const std::string& message, EChatPacketMessage type, + int sourceEntityType, const std::string& sourceName, + const std::string& itemName) { m_messageType = type; if (sourceEntityType != -1) m_intArgs.push_back(sourceEntityType); diff --git a/targets/minecraft/network/packet/ChatPacket.h b/targets/minecraft/network/packet/ChatPacket.h index 1fa574b8a..8b642d3fd 100644 --- a/targets/minecraft/network/packet/ChatPacket.h +++ b/targets/minecraft/network/packet/ChatPacket.h @@ -124,7 +124,7 @@ public: }; public: - std::vector m_stringArgs; + std::vector m_stringArgs; std::vector m_intArgs; EChatPacketMessage m_messageType; @@ -133,13 +133,13 @@ public: // 4J: Seperated the one convoluted ctor into three more readable ctors. The // last two ctors are only used for death messages and I'd really like to // consolodate them and/or the logic that uses them at some point. - ChatPacket(const std::wstring& message, + ChatPacket(const std::string& message, EChatPacketMessage type = e_ChatCustom, int customData = -1); - ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName); - ChatPacket(const std::wstring& message, EChatPacketMessage type, - int sourceEntityType, const std::wstring& sourceName, - const std::wstring& itemName); + ChatPacket(const std::string& message, EChatPacketMessage type, + int sourceEntityType, const std::string& sourceName); + ChatPacket(const std::string& message, EChatPacketMessage type, + int sourceEntityType, const std::string& sourceName, + const std::string& itemName); virtual void read(DataInputStream* dis); virtual void write(DataOutputStream* dos); diff --git a/targets/minecraft/network/packet/ContainerOpenPacket.cpp b/targets/minecraft/network/packet/ContainerOpenPacket.cpp index 007054f97..4cd9dfc6e 100644 --- a/targets/minecraft/network/packet/ContainerOpenPacket.cpp +++ b/targets/minecraft/network/packet/ContainerOpenPacket.cpp @@ -5,7 +5,7 @@ #include "java/InputOutputStream/DataOutputStream.h" void ContainerOpenPacket::_init(int containerId, int type, - const std::wstring& title, int size, + const std::string& title, int size, bool customName, int entityId) { this->containerId = containerId; this->type = type; @@ -15,16 +15,16 @@ void ContainerOpenPacket::_init(int containerId, int type, this->entityId = entityId; } -ContainerOpenPacket::ContainerOpenPacket() { _init(0, 0, L"", 0, false, 0); } +ContainerOpenPacket::ContainerOpenPacket() { _init(0, 0, "", 0, false, 0); } ContainerOpenPacket::ContainerOpenPacket(int containerId, int type, - const std::wstring& title, int size, + const std::string& title, int size, bool customName) { _init(containerId, type, title, size, customName, 0); } ContainerOpenPacket::ContainerOpenPacket(int containerId, int type, - const std::wstring& title, int size, + const std::string& title, int size, bool customName, int entityId) { _init(containerId, type, title, size, customName, entityId); } diff --git a/targets/minecraft/network/packet/ContainerOpenPacket.h b/targets/minecraft/network/packet/ContainerOpenPacket.h index 32bb11662..d338b5ed6 100644 --- a/targets/minecraft/network/packet/ContainerOpenPacket.h +++ b/targets/minecraft/network/packet/ContainerOpenPacket.h @@ -33,18 +33,18 @@ public: int type; int size; bool customName; - std::wstring title; + std::string title; int entityId; private: - void _init(int containerId, int type, const std::wstring& title, int size, + void _init(int containerId, int type, const std::string& title, int size, bool customName, int entityId); public: ContainerOpenPacket(); - ContainerOpenPacket(int containerId, int type, const std::wstring& title, + ContainerOpenPacket(int containerId, int type, const std::string& title, int size, bool customName); - ContainerOpenPacket(int containerId, int type, const std::wstring& title, + ContainerOpenPacket(int containerId, int type, const std::string& title, int size, bool customName, int entityId); virtual void handle(PacketListener* listener); diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.cpp b/targets/minecraft/network/packet/CustomPayloadPacket.cpp index 9402bc31e..9baf33da4 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.cpp +++ b/targets/minecraft/network/packet/CustomPayloadPacket.cpp @@ -10,19 +10,19 @@ #include "java/InputOutputStream/DataOutputStream.h" // Mojang-defined custom packets -const std::wstring CustomPayloadPacket::CUSTOM_BOOK_PACKET = L"MC|BEdit"; -const std::wstring CustomPayloadPacket::CUSTOM_BOOK_SIGN_PACKET = L"MC|BSign"; -const std::wstring CustomPayloadPacket::TEXTURE_PACK_PACKET = L"MC|TPack"; -const std::wstring CustomPayloadPacket::TRADER_LIST_PACKET = L"MC|TrList"; -const std::wstring CustomPayloadPacket::TRADER_SELECTION_PACKET = L"MC|TrSel"; -const std::wstring CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET = - L"MC|AdvCdm"; -const std::wstring CustomPayloadPacket::SET_BEACON_PACKET = L"MC|Beacon"; -const std::wstring CustomPayloadPacket::SET_ITEM_NAME_PACKET = L"MC|ItemName"; +const std::string CustomPayloadPacket::CUSTOM_BOOK_PACKET = "MC|BEdit"; +const std::string CustomPayloadPacket::CUSTOM_BOOK_SIGN_PACKET = "MC|BSign"; +const std::string CustomPayloadPacket::TEXTURE_PACK_PACKET = "MC|TPack"; +const std::string CustomPayloadPacket::TRADER_LIST_PACKET = "MC|TrList"; +const std::string CustomPayloadPacket::TRADER_SELECTION_PACKET = "MC|TrSel"; +const std::string CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET = + "MC|AdvCdm"; +const std::string CustomPayloadPacket::SET_BEACON_PACKET = "MC|Beacon"; +const std::string CustomPayloadPacket::SET_ITEM_NAME_PACKET = "MC|ItemName"; CustomPayloadPacket::CustomPayloadPacket() {} -CustomPayloadPacket::CustomPayloadPacket(const std::wstring& identifier, +CustomPayloadPacket::CustomPayloadPacket(const std::string& identifier, std::vector data) { this->identifier = identifier; this->data = data; diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.h b/targets/minecraft/network/packet/CustomPayloadPacket.h index cfd6a7b6a..01547fa8e 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.h +++ b/targets/minecraft/network/packet/CustomPayloadPacket.h @@ -15,21 +15,21 @@ class CustomPayloadPacket public std::enable_shared_from_this { public: // Mojang-defined custom packets - static const std::wstring CUSTOM_BOOK_PACKET; - static const std::wstring CUSTOM_BOOK_SIGN_PACKET; - static const std::wstring TEXTURE_PACK_PACKET; - static const std::wstring TRADER_LIST_PACKET; - static const std::wstring TRADER_SELECTION_PACKET; - static const std::wstring SET_ADVENTURE_COMMAND_PACKET; - static const std::wstring SET_BEACON_PACKET; - static const std::wstring SET_ITEM_NAME_PACKET; + static const std::string CUSTOM_BOOK_PACKET; + static const std::string CUSTOM_BOOK_SIGN_PACKET; + static const std::string TEXTURE_PACK_PACKET; + static const std::string TRADER_LIST_PACKET; + static const std::string TRADER_SELECTION_PACKET; + static const std::string SET_ADVENTURE_COMMAND_PACKET; + static const std::string SET_BEACON_PACKET; + static const std::string SET_ITEM_NAME_PACKET; - std::wstring identifier; + std::string identifier; int length; std::vector data; CustomPayloadPacket(); - CustomPayloadPacket(const std::wstring& identifier, + CustomPayloadPacket(const std::string& identifier, std::vector data); virtual void read(DataInputStream* dis); diff --git a/targets/minecraft/network/packet/LevelParticlesPacket.cpp b/targets/minecraft/network/packet/LevelParticlesPacket.cpp index cdc23d404..af02253ad 100644 --- a/targets/minecraft/network/packet/LevelParticlesPacket.cpp +++ b/targets/minecraft/network/packet/LevelParticlesPacket.cpp @@ -5,7 +5,7 @@ #include "java/InputOutputStream/DataOutputStream.h" LevelParticlesPacket::LevelParticlesPacket() { - this->name = L""; + this->name = ""; this->x = 0.0f; this->y = 0.0f; this->z = 0.0f; @@ -16,7 +16,7 @@ LevelParticlesPacket::LevelParticlesPacket() { this->count = 0; } -LevelParticlesPacket::LevelParticlesPacket(const std::wstring& name, float x, +LevelParticlesPacket::LevelParticlesPacket(const std::string& name, float x, float y, float z, float xDist, float yDist, float zDist, float maxSpeed, int count) { @@ -55,7 +55,7 @@ void LevelParticlesPacket::write(DataOutputStream* dos) { dos->writeInt(count); } -std::wstring LevelParticlesPacket::getName() { return name; } +std::string LevelParticlesPacket::getName() { return name; } double LevelParticlesPacket::getX() { return x; } diff --git a/targets/minecraft/network/packet/LevelParticlesPacket.h b/targets/minecraft/network/packet/LevelParticlesPacket.h index 21f541848..d201836de 100644 --- a/targets/minecraft/network/packet/LevelParticlesPacket.h +++ b/targets/minecraft/network/packet/LevelParticlesPacket.h @@ -10,7 +10,7 @@ class LevelParticlesPacket : public Packet, public std::enable_shared_from_this { private: - std::wstring name; + std::string name; float x; float y; float z; @@ -22,13 +22,13 @@ private: public: LevelParticlesPacket(); - LevelParticlesPacket(const std::wstring& name, float x, float y, float z, + LevelParticlesPacket(const std::string& name, float x, float y, float z, float xDist, float yDist, float zDist, float maxSpeed, int count); void read(DataInputStream* dis); void write(DataOutputStream* dos); - std::wstring getName(); + std::string getName(); double getX(); double getY(); double getZ(); diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp index 6823437ad..cd180e13d 100644 --- a/targets/minecraft/network/packet/LoginPacket.cpp +++ b/targets/minecraft/network/packet/LoginPacket.cpp @@ -10,7 +10,7 @@ #include "minecraft/world/level/chunk/ChunkSource.h" LoginPacket::LoginPacket() { - this->userName = L""; + this->userName = ""; this->clientVersion = 0; this->seed = 0; this->dimension = 0; @@ -37,7 +37,7 @@ LoginPacket::LoginPacket() { } // Client -> Server -LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, +LoginPacket::LoginPacket(const std::string& userName, int clientVersion, PlayerUID offlineXuid, PlayerUID onlineXuid, bool friendsOnlyUGC, std::uint32_t ugcPlayersVersion, std::uint32_t skinId, std::uint32_t capeId, @@ -69,7 +69,7 @@ LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, } // Server -> Client -LoginPacket::LoginPacket(const std::wstring& userName, int clientVersion, +LoginPacket::LoginPacket(const std::string& userName, int clientVersion, LevelType* pLevelType, int64_t seed, int gameType, char dimension, std::uint8_t mapHeight, std::uint8_t maxPlayers, char difficulty, @@ -106,7 +106,7 @@ void LoginPacket::read(DataInputStream* dis) // throws IOException { clientVersion = dis->readInt(); userName = readUtf(dis, Player::MAX_NAME_LENGTH); - std::wstring typeName = readUtf(dis, 16); + std::string typeName = readUtf(dis, 16); m_pLevelType = LevelType::getLevelType(typeName); if (m_pLevelType == nullptr) { m_pLevelType = LevelType::lvl_normal; @@ -140,7 +140,7 @@ void LoginPacket::write(DataOutputStream* dos) // throws IOException dos->writeInt(clientVersion); writeUtf(userName, dos); if (m_pLevelType == nullptr) { - writeUtf(L"", dos); + writeUtf("", dos); } else { writeUtf(m_pLevelType->getGeneratorName(), dos); } diff --git a/targets/minecraft/network/packet/LoginPacket.h b/targets/minecraft/network/packet/LoginPacket.h index a098e0706..facc61ae7 100644 --- a/targets/minecraft/network/packet/LoginPacket.h +++ b/targets/minecraft/network/packet/LoginPacket.h @@ -14,7 +14,7 @@ class LoginPacket : public Packet, public std::enable_shared_from_this { public: int clientVersion; - std::wstring userName; + std::string userName; int64_t seed; char dimension; PlayerUID m_offlineXuid, m_onlineXuid; // 4J Added @@ -37,14 +37,14 @@ public: std::uint8_t maxPlayers; LoginPacket(); - LoginPacket(const std::wstring& userName, int clientVersion, + LoginPacket(const std::string& userName, int clientVersion, LevelType* pLevelType, int64_t seed, int gameType, char dimension, std::uint8_t mapHeight, std::uint8_t maxPlayers, char difficulty, int m_multiplayerInstanceId, std::uint8_t playerIndex, bool newSeaLevel, unsigned int uiGamePrivileges, int xzSize, int hellScale); // Server -> Client - LoginPacket(const std::wstring& userName, int clientVersion, + LoginPacket(const std::string& userName, int clientVersion, PlayerUID offlineXuid, PlayerUID onlineXuid, bool friendsOnlyUGC, std::uint32_t ugcPlayersVersion, std::uint32_t skinId, std::uint32_t capeId, diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp index 5e18938b1..9a1946392 100644 --- a/targets/minecraft/network/packet/Packet.cpp +++ b/targets/minecraft/network/packet/Packet.cpp @@ -352,11 +352,11 @@ void Packet::staticCtor() { } IllegalArgumentException::IllegalArgumentException( - const std::wstring& information) { + const std::string& information) { this->information = information; } -IOException::IOException(const std::wstring& information) { +IOException::IOException(const std::string& information) { this->information = information; } @@ -440,11 +440,11 @@ void Packet::updatePacketStatsPIX() { it++) { Packet::PacketStatistics* stat = it->second; int64_t count = stat->getRunningCount(); - wchar_t pixName[256]; - swprintf_s(pixName, L"Packet count %d", stat->id); + char pixName[256]; + snprintf(pixName, "Packet count %d", stat->id); // PIXReportCounter(pixName,(float)count); int64_t total = stat->getRunningTotal(); - swprintf_s(pixName, L"Packet bytes %d", stat->id); + snprintf(pixName, "Packet bytes %d", stat->id); PIXReportCounter(pixName, (float)total); stat->IncrementPos(); } @@ -519,13 +519,13 @@ std::shared_ptr Packet::readPacket( // Log::info("Bad packet id %d\n", id); assert(0); assert(false); - // throw new IOException(wstring(L"Bad packet id ") + + // throw new IOException(string("Bad packet id ") + // toWString(id)); } packet = getPacket(id); if (packet == nullptr) - assert(false); // throw new IOException(wstring(L"Bad packet id ") + + assert(false); // throw new IOException(string("Bad packet id ") + // toWString(id)); // Log::info("%s reading packet %d\n", isServer ? "Server" : "Client", @@ -569,7 +569,7 @@ void Packet::writePacket( packet->write(dos); } -void Packet::writeUtf(const std::wstring& value, +void Packet::writeUtf(const std::string& value, DataOutputStream* dos) // throws IOException TODO 4J JEV, // should this declare a throws? { @@ -577,27 +577,27 @@ void Packet::writeUtf(const std::wstring& value, dos->writeChars(value); } -std::wstring Packet::readUtf(DataInputStream* dis, +std::string Packet::readUtf(DataInputStream* dis, int maxLength) // throws IOException TODO 4J JEV, // should this declare a throws? { short stringLength = dis->readShort(); if (stringLength > maxLength) { - std::wstringstream stream; - stream << L"Received string length longer than maximum allowed (" + std::stringstream stream; + stream << "Received string length longer than maximum allowed (" << stringLength << " > " << maxLength << ")"; assert(false); // throw new IOException( stream.str() ); } if (stringLength < 0) { assert(false); - // throw new IOException(L"Received string length is less than + // throw new IOException("Received string length is less than // zero! Weird string!"); } - std::wstring builder = L""; + std::string builder = ""; for (int i = 0; i < stringLength; i++) { - wchar_t rc = dis->readChar(); + char rc = dis->readChar(); builder.push_back(rc); } diff --git a/targets/minecraft/network/packet/Packet.h b/targets/minecraft/network/packet/Packet.h index a5d13a3de..b47b57f7c 100644 --- a/targets/minecraft/network/packet/Packet.h +++ b/targets/minecraft/network/packet/Packet.h @@ -111,8 +111,8 @@ public: bool isServer); static void writePacket(std::shared_ptr packet, DataOutputStream* dos); - static void writeUtf(const std::wstring& value, DataOutputStream* dos); - static std::wstring readUtf(DataInputStream* dis, int maxLength); + static void writeUtf(const std::string& value, DataOutputStream* dos); + static std::string readUtf(DataInputStream* dis, int maxLength); virtual void read( DataInputStream* dis) = 0; // throws IOException = 0; TODO 4J JEV, // should this declare a throws? diff --git a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp index 6cd269123..0028bf204 100644 --- a/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp +++ b/targets/minecraft/network/packet/PlayerAbilitiesPacket.cpp @@ -55,7 +55,7 @@ void PlayerAbilitiesPacket::handle(PacketListener* listener) { int PlayerAbilitiesPacket::getEstimatedSize() { return 2; } -// wstring getDebugInfo() +// string getDebugInfo() //{ // return String.format("invuln=%b, flying=%b, canfly=%b, instabuild=%b, // flyspeed=%.4f, walkspped=%.4f", isInvulnerable(), isFlying(), canFly(), diff --git a/targets/minecraft/network/packet/PlayerAbilitiesPacket.h b/targets/minecraft/network/packet/PlayerAbilitiesPacket.h index 11d365da6..a35378c5d 100644 --- a/targets/minecraft/network/packet/PlayerAbilitiesPacket.h +++ b/targets/minecraft/network/packet/PlayerAbilitiesPacket.h @@ -31,7 +31,7 @@ public: void write(DataOutputStream* dos); void handle(PacketListener* listener); int getEstimatedSize(); - // std::wstring getDebugInfo(); + // std::string getDebugInfo(); bool isInvulnerable(); void setInvulnerable(bool invulnerable); bool isFlying(); diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.h b/targets/minecraft/network/packet/PlayerInfoPacket.h index 07d513b44..ae333006e 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.h +++ b/targets/minecraft/network/packet/PlayerInfoPacket.h @@ -12,7 +12,7 @@ class PlayerInfoPacket : public Packet, public std::enable_shared_from_this { public: // 4J Stu - I have re-purposed this packet for our uses - // std::wstring name; + // std::string name; // bool add; // int latency; short m_networkSmallId; @@ -21,7 +21,7 @@ public: int m_entityId; PlayerInfoPacket(); - // PlayerInfoPacket(const std::wstring &name, bool add, int latency); + // PlayerInfoPacket(const std::string &name, bool add, int latency); PlayerInfoPacket(std::uint8_t networkSmallId, short playerColourIndex, unsigned int playerPrivileges = 0); PlayerInfoPacket(std::shared_ptr player); diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index 3cb9a859b..4d4de72b9 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -13,7 +13,7 @@ #include "java/InputOutputStream/DataOutputStream.h" PreLoginPacket::PreLoginPacket() { - loginKey = L""; + loginKey = ""; m_playerXuids = nullptr; m_dwPlayerCount = 0; m_friendsOnlyBits = 0; @@ -25,7 +25,7 @@ PreLoginPacket::PreLoginPacket() { m_netcodeVersion = 0; } -PreLoginPacket::PreLoginPacket(std::wstring userName) { +PreLoginPacket::PreLoginPacket(std::string userName) { this->loginKey = userName; m_playerXuids = nullptr; m_dwPlayerCount = 0; @@ -39,7 +39,7 @@ PreLoginPacket::PreLoginPacket(std::wstring userName) { } PreLoginPacket::PreLoginPacket( - std::wstring userName, PlayerUID* playerXuids, std::uint8_t playerCount, + std::string userName, PlayerUID* playerXuids, std::uint8_t playerCount, std::uint8_t friendsOnlyBits, std::uint32_t ugcPlayersVersion, const char* pszUniqueSaveName, std::uint32_t serverSettings, std::uint8_t hostIndex, std::uint32_t texturePackId) { diff --git a/targets/minecraft/network/packet/PreLoginPacket.h b/targets/minecraft/network/packet/PreLoginPacket.h index c096ab247..14d47bb5e 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.h +++ b/targets/minecraft/network/packet/PreLoginPacket.h @@ -33,11 +33,11 @@ public: std::uint32_t m_texturePackId; std::int16_t m_netcodeVersion; - std::wstring loginKey; + std::string loginKey; PreLoginPacket(); - PreLoginPacket(std::wstring userName); - PreLoginPacket(std::wstring userName, PlayerUID* playerXuids, + PreLoginPacket(std::string userName); + PreLoginPacket(std::string userName, PlayerUID* playerXuids, std::uint8_t playerCount, std::uint8_t friendsOnlyBits, std::uint32_t ugcPlayersVersion, const char* pszUniqueSaveName, std::uint32_t serverSettings, diff --git a/targets/minecraft/network/packet/RespawnPacket.cpp b/targets/minecraft/network/packet/RespawnPacket.cpp index 91e7cb3df..01a0eeb68 100644 --- a/targets/minecraft/network/packet/RespawnPacket.cpp +++ b/targets/minecraft/network/packet/RespawnPacket.cpp @@ -50,7 +50,7 @@ void RespawnPacket::read(DataInputStream* dis) // throws IOException dimension = dis->readByte(); playerGameType = GameType::byId(dis->readByte()); mapHeight = dis->readShort(); - std::wstring typeName = readUtf(dis, 16); + std::string typeName = readUtf(dis, 16); m_pLevelType = LevelType::getLevelType(typeName); if (m_pLevelType == nullptr) { m_pLevelType = LevelType::lvl_normal; @@ -72,7 +72,7 @@ void RespawnPacket::write(DataOutputStream* dos) // throws IOException dos->writeByte(playerGameType->getId()); dos->writeShort(mapHeight); if (m_pLevelType == nullptr) { - writeUtf(L"", dos); + writeUtf("", dos); } else { writeUtf(m_pLevelType->getGeneratorName(), dos); } diff --git a/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp b/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp index 5bd500c16..8440f0e03 100644 --- a/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp +++ b/targets/minecraft/network/packet/SetDisplayObjectivePacket.cpp @@ -7,7 +7,7 @@ SetDisplayObjectivePacket::SetDisplayObjectivePacket() { slot = 0; - objectiveName = L""; + objectiveName = ""; } SetDisplayObjectivePacket::SetDisplayObjectivePacket(int slot, @@ -15,7 +15,7 @@ SetDisplayObjectivePacket::SetDisplayObjectivePacket(int slot, this->slot = slot; if (objective == nullptr) { - objectiveName = L""; + objectiveName = ""; } else { objectiveName = objective->getName(); } diff --git a/targets/minecraft/network/packet/SetDisplayObjectivePacket.h b/targets/minecraft/network/packet/SetDisplayObjectivePacket.h index a20f4ab65..4ca2fa492 100644 --- a/targets/minecraft/network/packet/SetDisplayObjectivePacket.h +++ b/targets/minecraft/network/packet/SetDisplayObjectivePacket.h @@ -13,7 +13,7 @@ class SetDisplayObjectivePacket public std::enable_shared_from_this { public: int slot; - std::wstring objectiveName; + std::string objectiveName; SetDisplayObjectivePacket(); SetDisplayObjectivePacket(int slot, Objective* objective); diff --git a/targets/minecraft/network/packet/SetObjectivePacket.cpp b/targets/minecraft/network/packet/SetObjectivePacket.cpp index 8e7a38609..000e15efe 100644 --- a/targets/minecraft/network/packet/SetObjectivePacket.cpp +++ b/targets/minecraft/network/packet/SetObjectivePacket.cpp @@ -6,8 +6,8 @@ #include "minecraft/world/scores/Objective.h" SetObjectivePacket::SetObjectivePacket() { - objectiveName = L""; - displayName = L""; + objectiveName = ""; + displayName = ""; method = 0; } diff --git a/targets/minecraft/network/packet/SetObjectivePacket.h b/targets/minecraft/network/packet/SetObjectivePacket.h index d419cfd02..9b097d91c 100644 --- a/targets/minecraft/network/packet/SetObjectivePacket.h +++ b/targets/minecraft/network/packet/SetObjectivePacket.h @@ -16,8 +16,8 @@ public: static const int METHOD_REMOVE = 1; static const int METHOD_CHANGE = 2; - std::wstring objectiveName; - std::wstring displayName; + std::string objectiveName; + std::string displayName; int method; SetObjectivePacket(); diff --git a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp index ae33874ef..246ae4e95 100644 --- a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp +++ b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp @@ -13,10 +13,10 @@ #include "minecraft/world/scores/PlayerTeam.h" SetPlayerTeamPacket::SetPlayerTeamPacket() { - name = L""; - displayName = L""; - prefix = L""; - suffix = L""; + name = ""; + displayName = ""; + prefix = ""; + suffix = ""; method = 0; options = 0; } @@ -32,13 +32,13 @@ SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam* team, int method) { options = team->packOptions(); } if (method == METHOD_ADD) { - std::unordered_set* playerNames = team->getPlayers(); + std::unordered_set* playerNames = team->getPlayers(); players.insert(players.end(), playerNames->begin(), playerNames->end()); } } SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam* team, - std::vector* playerNames, + std::vector* playerNames, int method) { if (method != METHOD_JOIN && method != METHOD_LEAVE) { Log::info("Method must be join or leave for player constructor"); diff --git a/targets/minecraft/network/packet/SetPlayerTeamPacket.h b/targets/minecraft/network/packet/SetPlayerTeamPacket.h index 45b9323ec..fd77918bd 100644 --- a/targets/minecraft/network/packet/SetPlayerTeamPacket.h +++ b/targets/minecraft/network/packet/SetPlayerTeamPacket.h @@ -20,17 +20,17 @@ public: static const int METHOD_JOIN = 3; static const int METHOD_LEAVE = 4; - std::wstring name; - std::wstring displayName; - std::wstring prefix; - std::wstring suffix; - std::vector players; + std::string name; + std::string displayName; + std::string prefix; + std::string suffix; + std::vector players; int method; int options; SetPlayerTeamPacket(); SetPlayerTeamPacket(PlayerTeam* team, int method); - SetPlayerTeamPacket(PlayerTeam* team, std::vector* players, + SetPlayerTeamPacket(PlayerTeam* team, std::vector* players, int method); void read(DataInputStream* dis); void write(DataOutputStream* dos); diff --git a/targets/minecraft/network/packet/SetScorePacket.cpp b/targets/minecraft/network/packet/SetScorePacket.cpp index e607434d3..daf75c14e 100644 --- a/targets/minecraft/network/packet/SetScorePacket.cpp +++ b/targets/minecraft/network/packet/SetScorePacket.cpp @@ -8,8 +8,8 @@ #include "minecraft/world/scores/Score.h" SetScorePacket::SetScorePacket() { - owner = L""; - objectiveName = L""; + owner = ""; + objectiveName = ""; score = 0; method = 0; } @@ -21,9 +21,9 @@ SetScorePacket::SetScorePacket(Score* score, int method) { this->method = method; } -SetScorePacket::SetScorePacket(const std::wstring& owner) { +SetScorePacket::SetScorePacket(const std::string& owner) { this->owner = owner; - objectiveName = L""; + objectiveName = ""; score = 0; method = METHOD_REMOVE; } diff --git a/targets/minecraft/network/packet/SetScorePacket.h b/targets/minecraft/network/packet/SetScorePacket.h index 11c2649c6..ed797d84f 100644 --- a/targets/minecraft/network/packet/SetScorePacket.h +++ b/targets/minecraft/network/packet/SetScorePacket.h @@ -14,14 +14,14 @@ public: static const int METHOD_CHANGE = 0; static const int METHOD_REMOVE = 1; - std::wstring owner; - std::wstring objectiveName; + std::string owner; + std::string objectiveName; int score; int method; SetScorePacket(); SetScorePacket(Score* score, int method); - SetScorePacket(const std::wstring& owner); + SetScorePacket(const std::string& owner); void read(DataInputStream* dis); void write(DataOutputStream* dos); diff --git a/targets/minecraft/network/packet/SignUpdatePacket.cpp b/targets/minecraft/network/packet/SignUpdatePacket.cpp index 1069dc77d..31ccc0f57 100644 --- a/targets/minecraft/network/packet/SignUpdatePacket.cpp +++ b/targets/minecraft/network/packet/SignUpdatePacket.cpp @@ -17,7 +17,7 @@ SignUpdatePacket::SignUpdatePacket() { } SignUpdatePacket::SignUpdatePacket(int x, int y, int z, bool bVerified, - bool bCensored, std::wstring lines[]) { + bool bCensored, std::string lines[]) { shouldDelay = true; this->m_bVerified = bVerified; this->m_bCensored = bCensored; diff --git a/targets/minecraft/network/packet/SignUpdatePacket.h b/targets/minecraft/network/packet/SignUpdatePacket.h index 19ddd8a65..45021791f 100644 --- a/targets/minecraft/network/packet/SignUpdatePacket.h +++ b/targets/minecraft/network/packet/SignUpdatePacket.h @@ -12,11 +12,11 @@ public: int x, y, z; bool m_bVerified; bool m_bCensored; - std::wstring lines[4]; + std::string lines[4]; SignUpdatePacket(); SignUpdatePacket(int x, int y, int z, bool bVerified, bool bCensored, - std::wstring lines[]); + std::string lines[]); bool GetVerified() { return m_bVerified; } bool GetCensored() { return m_bCensored; } virtual void read(DataInputStream* dis); diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp index c0535eaaa..65066922f 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp @@ -10,17 +10,17 @@ TextureAndGeometryChangePacket::TextureAndGeometryChangePacket() { id = -1; - path = L""; + path = ""; dwSkinID = 0; } TextureAndGeometryChangePacket::TextureAndGeometryChangePacket( - std::shared_ptr e, const std::wstring& path) { + std::shared_ptr e, const std::string& path) { id = e->entityId; this->path = path; - std::wstring skinValue = path.substr(7, path.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); - std::wstringstream ss; + std::string skinValue = path.substr(7, path.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); + std::stringstream ss; ss << std::dec << skinValue.c_str(); ss >> dwSkinID; dwSkinID = MAKE_SKIN_BITMASK(true, dwSkinID); diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.h b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.h index 04157a3b1..529a8a4ea 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.h +++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.h @@ -13,12 +13,12 @@ class TextureAndGeometryChangePacket public std::enable_shared_from_this { public: int id; - std::wstring path; + std::string path; std::uint32_t dwSkinID; TextureAndGeometryChangePacket(); TextureAndGeometryChangePacket(std::shared_ptr e, - const std::wstring& path); + const std::string& path); virtual void read(DataInputStream* dis); virtual void write(DataOutputStream* dos); diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp index b1348769b..40cb83761 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -10,7 +10,7 @@ #include "java/InputOutputStream/DataOutputStream.h" TextureAndGeometryPacket::TextureAndGeometryPacket() { - this->textureName = L""; + this->textureName = ""; this->dwTextureBytes = 0; this->pbData = nullptr; this->dwBoxC = 0; @@ -32,13 +32,13 @@ TextureAndGeometryPacket::~TextureAndGeometryPacket() { } TextureAndGeometryPacket::TextureAndGeometryPacket( - const std::wstring& textureName, std::uint8_t* pbData, + const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes) { this->textureName = textureName; - std::wstring skinValue = textureName.substr(7, textureName.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); - std::wstringstream ss; + std::string skinValue = textureName.substr(7, textureName.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); + std::stringstream ss; ss << std::dec << skinValue.c_str(); ss >> this->dwSkinID; this->dwSkinID = MAKE_SKIN_BITMASK(true, this->dwSkinID); @@ -50,13 +50,13 @@ TextureAndGeometryPacket::TextureAndGeometryPacket( } TextureAndGeometryPacket::TextureAndGeometryPacket( - const std::wstring& textureName, std::uint8_t* pbData, + const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes, DLCSkinFile* pDLCSkinFile) { this->textureName = textureName; - std::wstring skinValue = textureName.substr(7, textureName.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); - std::wstringstream ss; + std::string skinValue = textureName.substr(7, textureName.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); + std::stringstream ss; ss << std::dec << skinValue.c_str(); ss >> this->dwSkinID; this->dwSkinID = MAKE_SKIN_BITMASK(true, this->dwSkinID); @@ -80,14 +80,14 @@ TextureAndGeometryPacket::TextureAndGeometryPacket( } TextureAndGeometryPacket::TextureAndGeometryPacket( - const std::wstring& textureName, std::uint8_t* pbData, + const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes, std::vector* pvSkinBoxes, unsigned int uiAnimOverrideBitmask) { this->textureName = textureName; - std::wstring skinValue = textureName.substr(7, textureName.size()); - skinValue = skinValue.substr(0, skinValue.find_first_of(L'.')); - std::wstringstream ss; + std::string skinValue = textureName.substr(7, textureName.size()); + skinValue = skinValue.substr(0, skinValue.find_first_of('.')); + std::stringstream ss; ss << std::dec << skinValue.c_str(); ss >> this->dwSkinID; this->dwSkinID = MAKE_SKIN_BITMASK(true, this->dwSkinID); diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h index 5247b5547..9f8735587 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h @@ -16,7 +16,7 @@ class TextureAndGeometryPacket : public Packet, public std::enable_shared_from_this { public: - std::wstring textureName; + std::string textureName; std::uint32_t dwSkinID; std::uint8_t* pbData; std::uint32_t dwTextureBytes; @@ -26,12 +26,12 @@ public: TextureAndGeometryPacket(); ~TextureAndGeometryPacket(); - TextureAndGeometryPacket(const std::wstring& textureName, + TextureAndGeometryPacket(const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes); - TextureAndGeometryPacket(const std::wstring& textureName, + TextureAndGeometryPacket(const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes, DLCSkinFile* pDLCSkinFile); - TextureAndGeometryPacket(const std::wstring& textureName, + TextureAndGeometryPacket(const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes, std::vector* pvSkinBoxes, unsigned int uiAnimOverrideBitmask); diff --git a/targets/minecraft/network/packet/TextureChangePacket.cpp b/targets/minecraft/network/packet/TextureChangePacket.cpp index 313268cb8..81a288171 100644 --- a/targets/minecraft/network/packet/TextureChangePacket.cpp +++ b/targets/minecraft/network/packet/TextureChangePacket.cpp @@ -8,12 +8,12 @@ TextureChangePacket::TextureChangePacket() { id = -1; action = e_TextureChange_Skin; - path = L""; + path = ""; } TextureChangePacket::TextureChangePacket(std::shared_ptr e, ETextureChangeType action, - const std::wstring& path) { + const std::string& path) { id = e->entityId; this->action = action; this->path = path; diff --git a/targets/minecraft/network/packet/TextureChangePacket.h b/targets/minecraft/network/packet/TextureChangePacket.h index 33416bd56..66465420a 100644 --- a/targets/minecraft/network/packet/TextureChangePacket.h +++ b/targets/minecraft/network/packet/TextureChangePacket.h @@ -19,11 +19,11 @@ public: int id; ETextureChangeType action; - std::wstring path; + std::string path; TextureChangePacket(); TextureChangePacket(std::shared_ptr e, ETextureChangeType action, - const std::wstring& path); + const std::string& path); virtual void read(DataInputStream* dis); virtual void write(DataOutputStream* dos); diff --git a/targets/minecraft/network/packet/TexturePacket.cpp b/targets/minecraft/network/packet/TexturePacket.cpp index 55e2940c3..5ecd6b0e4 100644 --- a/targets/minecraft/network/packet/TexturePacket.cpp +++ b/targets/minecraft/network/packet/TexturePacket.cpp @@ -5,7 +5,7 @@ #include "java/InputOutputStream/DataOutputStream.h" TexturePacket::TexturePacket() { - this->textureName = L""; + this->textureName = ""; this->dataBytes = 0; this->pbData = nullptr; } @@ -18,7 +18,7 @@ TexturePacket::~TexturePacket() { // } } -TexturePacket::TexturePacket(const std::wstring& textureName, +TexturePacket::TexturePacket(const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes) { this->textureName = textureName; this->pbData = pbData; diff --git a/targets/minecraft/network/packet/TexturePacket.h b/targets/minecraft/network/packet/TexturePacket.h index 892b13bc1..65cc5576a 100644 --- a/targets/minecraft/network/packet/TexturePacket.h +++ b/targets/minecraft/network/packet/TexturePacket.h @@ -9,13 +9,13 @@ class TexturePacket : public Packet, public std::enable_shared_from_this { public: - std::wstring textureName; + std::string textureName; std::uint8_t* pbData; std::uint32_t dataBytes; TexturePacket(); ~TexturePacket(); - TexturePacket(const std::wstring& textureName, std::uint8_t* pbData, + TexturePacket(const std::string& textureName, std::uint8_t* pbData, std::uint32_t dataBytes); virtual void handle(PacketListener* listener); diff --git a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp index 636faaf1c..f8b02d537 100644 --- a/targets/minecraft/network/packet/UpdateAttributesPacket.cpp +++ b/targets/minecraft/network/packet/UpdateAttributesPacket.cpp @@ -48,7 +48,7 @@ void UpdateAttributesPacket::read(DataInputStream* dis) { double amount = dis->readDouble(); uint8_t operation = dis->readByte(); modifiers.insert(new AttributeModifier( - id, /*L"Unknown synced attribute modifier",*/ amount, + id, /*"Unknown synced attribute modifier",*/ amount, operation)); } diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp index d42d16e7a..84316b48d 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.cpp @@ -7,7 +7,7 @@ #include "java/InputOutputStream/DataOutputStream.h" UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket() { - m_messageId = L""; + m_messageId = ""; m_icon = -1; m_auxValue = 0; m_definitionType = ConsoleGameRules::eGameRuleType_LevelRules; @@ -16,7 +16,7 @@ UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket() { UpdateGameRuleProgressPacket::UpdateGameRuleProgressPacket( ConsoleGameRules::EGameRuleType definitionType, - const std::wstring& messageId, int icon, int auxValue, int dataTag, + const std::string& messageId, int icon, int auxValue, int dataTag, void* data, int dataLength) { m_definitionType = definitionType; m_messageId = messageId; diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h index 4cf9694ed..ce015a45e 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -15,14 +15,14 @@ class UpdateGameRuleProgressPacket public std::enable_shared_from_this { public: ConsoleGameRules::EGameRuleType m_definitionType; - std::wstring m_messageId; + std::string m_messageId; int m_icon, m_auxValue; int m_dataTag; std::vector m_data; UpdateGameRuleProgressPacket(); UpdateGameRuleProgressPacket(ConsoleGameRules::EGameRuleType definitionType, - const std::wstring& messageId, int icon, + const std::string& messageId, int icon, int auxValue, int dataTag, void* data, int dataLength); diff --git a/targets/minecraft/server/ConsoleInput.cpp b/targets/minecraft/server/ConsoleInput.cpp index 13eaafa19..b638904df 100644 --- a/targets/minecraft/server/ConsoleInput.cpp +++ b/targets/minecraft/server/ConsoleInput.cpp @@ -2,7 +2,7 @@ class ConsoleInputSource; -ConsoleInput::ConsoleInput(const std::wstring& msg, +ConsoleInput::ConsoleInput(const std::string& msg, ConsoleInputSource* source) { this->msg = msg; this->source = source; diff --git a/targets/minecraft/server/ConsoleInput.h b/targets/minecraft/server/ConsoleInput.h index ac86606cd..fb020d04f 100644 --- a/targets/minecraft/server/ConsoleInput.h +++ b/targets/minecraft/server/ConsoleInput.h @@ -7,8 +7,8 @@ class ConsoleInputSource; class ConsoleInput { public: - std::wstring msg; + std::string msg; ConsoleInputSource* source; - ConsoleInput(const std::wstring& msg, ConsoleInputSource* source); + ConsoleInput(const std::string& msg, ConsoleInputSource* source); }; \ No newline at end of file diff --git a/targets/minecraft/server/ConsoleInputSource.h b/targets/minecraft/server/ConsoleInputSource.h index 03dd059c8..503054ed9 100644 --- a/targets/minecraft/server/ConsoleInputSource.h +++ b/targets/minecraft/server/ConsoleInputSource.h @@ -5,7 +5,7 @@ class ConsoleInputSource { public: virtual ~ConsoleInputSource() {} - virtual void info(const std::wstring& string) = 0; - virtual void warn(const std::wstring& string) = 0; - virtual std::wstring getConsoleName() = 0; + virtual void info(const std::string& string) = 0; + virtual void warn(const std::string& string) = 0; + virtual std::string getConsoleName() = 0; }; diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index 20468abb4..d1f984d39 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -108,7 +108,7 @@ time_util::time_point MinecraftServer::s_slowQueueLastTime = {}; bool MinecraftServer::s_slowQueuePacketSent = false; #endif -std::unordered_map MinecraftServer::ironTimers; +std::unordered_map MinecraftServer::ironTimers; MinecraftServer::MinecraftServer() { // 4J - added initialisers @@ -120,9 +120,9 @@ MinecraftServer::MinecraftServer() { m_bLoaded = false; stopped = false; tickCount = 0; - std::wstring progressStatus; + std::string progressStatus; progress = 0; - motd = L""; + motd = ""; m_isServerPaused = false; m_serverPausedEvent = new C4JThread::Event; @@ -147,7 +147,7 @@ MinecraftServer::~MinecraftServer() {} bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, std::uint32_t initSettings, bool findSeed) { // 4J - removed - settings = new Settings(new File(L"server.properties")); + settings = new Settings(new File("server.properties")); Log::info("\n*** SERVER SETTINGS ***\n"); Log::info( @@ -171,26 +171,26 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, Log::info("\n"); // TODO 4J Stu - Init a load of settings based on data passed as params - // settings->setBooleanAndSave( L"host-friends-only", + // settings->setBooleanAndSave( "host-friends-only", // (gameServices().getGameHostOption(eGameHostOption_FriendsOfFriends)>0) ); // 4J - Unused - // localIp = settings->getString(L"server-ip", L""); - // onlineMode = settings->getBoolean(L"online-mode", true); - // motd = settings->getString(L"motd", L"A Minecraft Server"); + // localIp = settings->getString("server-ip", ""); + // onlineMode = settings->getBoolean("online-mode", true); + // motd = settings->getString("motd", "A Minecraft Server"); // motd.replace('§', '$'); - setAnimals(settings->getBoolean(L"spawn-animals", true)); - setNpcsEnabled(settings->getBoolean(L"spawn-npcs", true)); + setAnimals(settings->getBoolean("spawn-animals", true)); + setNpcsEnabled(settings->getBoolean("spawn-npcs", true)); setPvpAllowed(gameServices().getGameHostOption(eGameHostOption_PvP) > 0 ? true - : false); // settings->getBoolean(L"pvp", true); + : false); // settings->getBoolean("pvp", true); // 4J Stu - We should never have hacked clients flying when they shouldn't // be like the PC version, so enable flying always Fix for #46612 - TU5: // Code: Multiplayer: A client can be banned for flying when accidentaly // being blown by dynamite - setFlightAllowed(true); // settings->getBoolean(L"allow-flight", false); + setFlightAllowed(true); // settings->getBoolean("allow-flight", false); // 4J Stu - Enabling flight to stop it kicking us when we use it #if defined(_DEBUG_MENUS_ENABLED) @@ -213,8 +213,8 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, int64_t levelNanoTime = System::nanoTime(); - std::wstring levelName = settings->getString(L"level-name", L"world"); - std::wstring levelTypeString; + std::string levelName = settings->getString("level-name", "world"); + std::string levelTypeString; bool gameRuleUseFlatWorld = false; if (gameServices().getLevelGenerationOptions() != nullptr) { @@ -223,9 +223,9 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, } if (gameRuleUseFlatWorld || gameServices().getGameHostOption(eGameHostOption_LevelType) > 0) { - levelTypeString = settings->getString(L"level-type", L"flat"); + levelTypeString = settings->getString("level-type", "flat"); } else { - levelTypeString = settings->getString(L"level-type", L"default"); + levelTypeString = settings->getString("level-type", "default"); } LevelType* pLevelType = LevelType::getLevelType(levelTypeString); @@ -241,14 +241,14 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData* initData, } setMaxBuildHeight( - settings->getInt(L"max-build-height", Level::maxBuildHeight)); + settings->getInt("max-build-height", Level::maxBuildHeight)); setMaxBuildHeight(((getMaxBuildHeight() + 8) / 16) * 16); setMaxBuildHeight( std::clamp(getMaxBuildHeight(), 64, Level::maxBuildHeight)); - // settings->setProperty(L"max-build-height", maxBuildHeight); + // settings->setProperty("max-build-height", maxBuildHeight); // logger.info("Preparing level \"" + levelName + "\""); - m_bLoaded = loadLevel(new McRegionLevelStorageSource(File(L".")), levelName, + m_bLoaded = loadLevel(new McRegionLevelStorageSource(File(".")), levelName, seed, pLevelType, initData); // logger.info("Done (" + (System.nanoTime() - levelNanoTime) + "ns)! // For help, type \"help\" or \"?\""); @@ -363,7 +363,7 @@ void MinecraftServer::postProcessTerminate(ProgressRenderer* mcprogress) { } bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, - const std::wstring& name, int64_t levelSeed, + const std::string& name, int64_t levelSeed, LevelType* pLevelType, NetworkGameInitData* initData) { // 4J - TODO - do with new save stuff @@ -377,7 +377,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, levels = std::vector(3); int gameTypeId = settings->getInt( - L"gamemode", + "gamemode", gameServices().getGameHostOption( eGameHostOption_GameType)); // LevelSettings::GAMETYPE_SURVIVAL); GameType* gameType = LevelSettings::validateGameType(gameTypeId); @@ -415,7 +415,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, // file from PS3->PS4 storage = std::shared_ptr( - new McRegionLevelStorage(pSave, File(L"."), name, true)); + new McRegionLevelStorage(pSave, File("."), name, true)); } else { // We are loading a save from the storage manager #if defined(SPLIT_SAVES) @@ -428,23 +428,23 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, } ConsoleSaveFileSplit* newFormatSave = nullptr; if (bLevelGenBaseSave) { - ConsoleSaveFileOriginal oldFormatSave(L""); + ConsoleSaveFileOriginal oldFormatSave(""); newFormatSave = new ConsoleSaveFileSplit(&oldFormatSave); } else { - newFormatSave = new ConsoleSaveFileSplit(L""); + newFormatSave = new ConsoleSaveFileSplit(""); } storage = std::shared_ptr( - new McRegionLevelStorage(newFormatSave, File(L"."), name, true)); + new McRegionLevelStorage(newFormatSave, File("."), name, true)); #else storage = std::make_shared( - new ConsoleSaveFileOriginal(L""), File(L"."), name, true); + new ConsoleSaveFileOriginal(""), File("."), name, true); #endif } // McRegionLevelStorage *storage = new McRegionLevelStorage(new - // ConsoleSaveFile( L"" ), L"", L"", 0); // original - // McRegionLevelStorage *storage = new McRegionLevelStorage(File(L"."), + // ConsoleSaveFile( "" ), "", "", 0); // original + // McRegionLevelStorage *storage = new McRegionLevelStorage(File("."), // name, true); // TODO for (unsigned int i = 0; i < levels.size(); i++) { if (s_bServerHalted || !g_NetworkManager.IsInSession()) { @@ -479,7 +479,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, // chunk to load, which might actually happen there // 4J Stu - We set the levels difficulty based on the minecraft options - // levels[i]->difficulty = settings->getBoolean(L"spawn-monsters", true) + // levels[i]->difficulty = settings->getBoolean("spawn-monsters", true) // ? Difficulty::EASY : Difficulty::PEACEFUL; Minecraft* pMinecraft = Minecraft::GetInstance(); // m_lastSentDifficulty = pMinecraft->options->difficulty; @@ -492,7 +492,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, levels[i]->setSpawnSettings(false, false); #else levels[i]->setSpawnSettings( - settings->getBoolean(L"spawn-monsters", true), animals); + settings->getBoolean("spawn-monsters", true), animals); #endif levels[i]->getLevelData()->setGameType(gameType); @@ -578,7 +578,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, int i = 0; for (int i = 0; i < levels.size(); i++) { // logger.info("Preparing start region for level " + i); - if (i == 0 || settings->getBoolean(L"allow-nether", true)) { + if (i == 0 || settings->getBoolean("allow-nether", true)) { ServerLevel* level = levels[i]; if (levelChunksNeedConverted) { // storage->getSaveFile()->convertLevelChunks(level) @@ -605,7 +605,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource* storageSource, // lastTime + 1000) { int pos = (x + r) * twoRPlusOne + (z + 1); - // setProgress(L"Preparing spawn + // setProgress("Preparing spawn // area", (pos) * 100 / total); mcprogress->progressStagePercentage((pos + r) * 100 / total); @@ -791,14 +791,14 @@ void MinecraftServer::overwriteHellBordersForNewWorldSize(ServerLevel* level, #endif -void MinecraftServer::setProgress(const std::wstring& status, int progress) { +void MinecraftServer::setProgress(const std::string& status, int progress) { progressStatus = status; this->progress = progress; // logger.info(status + ": " + progress + "%"); } void MinecraftServer::endProgress() { - progressStatus = L""; + progressStatus = ""; this->progress = 0; } @@ -1131,16 +1131,16 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { tick(); // int64_t // after = System::currentTimeMillis(); - // PIXReportCounter(L"Server + // PIXReportCounter("Server // time",(float)(after-before)); chunkPacketManagement_PostTick(); } // int64_t afterall = // System::currentTimeMillis(); - // M_PIXReportCounter(L"Server time + // M_PIXReportCounter("Server time // all",(float)(afterall-beforeall)); - // PIXReportCounter(L"Server + // PIXReportCounter("Server // ticks",(float)tickcount); } } else { @@ -1160,7 +1160,7 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { MinecraftServer::setTimeAtEndOfTick = false; for (unsigned int i = 0; i < levels.size(); i++) { // if (i == 0 || - // settings->getBoolean(L"allow-nether", true)) + // settings->getBoolean("allow-nether", true)) //// 4J removed - we always have nether { ServerLevel* level = levels[i]; @@ -1171,7 +1171,7 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { if (MinecraftServer::setTimeOfDayAtEndOfTick) { MinecraftServer::setTimeOfDayAtEndOfTick = false; for (unsigned int i = 0; i < levels.size(); i++) { - if (i == 0 || settings->getBoolean(L"allow-nether", true)) { + if (i == 0 || settings->getBoolean("allow-nether", true)) { ServerLevel* level = levels[i]; level->setDayTime(MinecraftServer::setTimeOfDay); } @@ -1314,18 +1314,18 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { ConsoleSchematicFile::XboxSchematicInitParam* initData = (ConsoleSchematicFile:: XboxSchematicInitParam*)param; - File targetFileDir(L"Schematics"); + File targetFileDir("Schematics"); if (!targetFileDir.exists()) targetFileDir.mkdir(); - wchar_t filename[128]; - swprintf(filename, 128, L"%ls%dx%dx%d.sch", + char filename[128]; + snprintf(filename, 128, "%s%dx%dx%d.sch", initData->name, (initData->endX - initData->startX + 1), (initData->endY - initData->startY + 1), (initData->endZ - initData->startZ + 1)); File dataFile = - File(targetFileDir, std::wstring(filename)); + File(targetFileDir, std::string(filename)); if (dataFile.exists()) dataFile._delete(); FileOutputStream fos = FileOutputStream(dataFile); DataOutputStream dos = DataOutputStream(&fos); @@ -1406,7 +1406,7 @@ void MinecraftServer::broadcastStopSavingPacket() { } void MinecraftServer::tick() { - std::vector toRemove; + std::vector toRemove; for (auto it = ironTimers.begin(); it != ironTimers.end(); it++) { int t = it->second; if (t > 0) { @@ -1433,7 +1433,7 @@ void MinecraftServer::tick() { }*/ for (unsigned int i = 0; i < levels.size(); i++) { - // if (i == 0 || settings->getBoolean(L"allow-nether", true)) + // if (i == 0 || settings->getBoolean("allow-nether", true)) // // 4J removed - we always have nether { ServerLevel* level = levels[i]; @@ -1506,7 +1506,7 @@ void MinecraftServer::tick() { // } } -void MinecraftServer::handleConsoleInput(const std::wstring& msg, +void MinecraftServer::handleConsoleInput(const std::string& msg, ConsoleInputSource* source) { consoleInput.push_back(new ConsoleInput(msg, source)); } @@ -1538,15 +1538,15 @@ void MinecraftServer::HaltServer(bool bPrimaryPlayerSignedOut) { } } -File* MinecraftServer::getFile(const std::wstring& name) { +File* MinecraftServer::getFile(const std::string& name) { return new File(name); } -void MinecraftServer::info(const std::wstring& string) {} +void MinecraftServer::info(const std::string& string) {} -void MinecraftServer::warn(const std::wstring& string) {} +void MinecraftServer::warn(const std::string& string) {} -std::wstring MinecraftServer::getConsoleName() { return L"CONSOLE"; } +std::string MinecraftServer::getConsoleName() { return "CONSOLE"; } ServerLevel* MinecraftServer::getLevel(int dimension) { if (dimension == -1) diff --git a/targets/minecraft/server/MinecraftServer.h b/targets/minecraft/server/MinecraftServer.h index 7a1c56cb0..de67ec84e 100644 --- a/targets/minecraft/server/MinecraftServer.h +++ b/targets/minecraft/server/MinecraftServer.h @@ -37,9 +37,9 @@ class Pos; typedef struct _LoadSaveDataThreadParam { void* data; int64_t fileSize; - const std::wstring saveName; + const std::string saveName; _LoadSaveDataThreadParam(void* data, int64_t filesize, - const std::wstring& saveName) + const std::string& saveName) : data(data), fileSize(filesize), saveName(saveName) {} } LoadSaveDataThreadParam; @@ -72,18 +72,18 @@ typedef struct _NetworkGameInitData { // implementing here class MinecraftServer : public ConsoleInputSource { public: - static const std::wstring VERSION; + static const std::string VERSION; static const int TICK_STATS_SPAN = SharedConstants::TICKS_PER_SECOND * 5; // static Logger logger = Logger.getLogger("Minecraft"); - static std::unordered_map ironTimers; + static std::unordered_map ironTimers; private: static const int DEFAULT_MINECRAFT_PORT = 25565; static const int MS_PER_TICK = 1000 / SharedConstants::TICKS_PER_SECOND; // 4J Stu - Added 1.0.1, Not needed - // std::wstring localIp; + // std::string localIp; // int port; public: ServerConnection* connection; @@ -106,7 +106,7 @@ public: int tickCount; public: - std::wstring progressStatus; + std::string progressStatus; int progress; private: @@ -121,7 +121,7 @@ public: bool npcs; bool pvp; bool allowFlight; - std::wstring motd; + std::string motd; int maxBuildHeight; int playerIdleTimeout; bool forceGameType; @@ -149,10 +149,10 @@ private: bool initServer(int64_t seed, NetworkGameInitData* initData, std::uint32_t initSettings, bool findSeed); void postProcessTerminate(ProgressRenderer* mcprogress); - bool loadLevel(LevelStorageSource* storageSource, const std::wstring& name, + bool loadLevel(LevelStorageSource* storageSource, const std::string& name, int64_t levelSeed, LevelType* pLevelType, NetworkGameInitData* initData); - void setProgress(const std::wstring& status, int progress); + void setProgress(const std::string& status, int progress); void endProgress(); void saveAllChunks(); void saveGameRules(); @@ -204,17 +204,17 @@ private: void tick(); public: - void handleConsoleInput(const std::wstring& msg, + void handleConsoleInput(const std::string& msg, ConsoleInputSource* source); void handleConsoleInputs(); // void addTickable(Tickable tickable); // 4J removed static void main(int64_t seed, void* lpParameter); static void HaltServer(bool bPrimaryPlayerSignedOut = false); - File* getFile(const std::wstring& name); - void info(const std::wstring& string); - void warn(const std::wstring& string); - std::wstring getConsoleName(); + File* getFile(const std::string& name); + void info(const std::string& string); + void warn(const std::string& string); + std::string getConsoleName(); ServerLevel* getLevel(int dimension); void setLevel(int dimension, ServerLevel* level); // 4J added static MinecraftServer* getInstance() { return server; } // 4J added diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 11b3faa7e..a177ad9fc 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -98,9 +98,9 @@ PlayerList::PlayerList(MinecraftServer* server) { viewDistance = 10; #endif - // int viewDistance = server->settings->getInt(L"view-distance", 10); + // int viewDistance = server->settings->getInt("view-distance", 10); - maxPlayers = server->settings->getInt(L"max-players", 20); + maxPlayers = server->settings->getInt("max-players", 20); doWhiteList = false; } @@ -193,14 +193,14 @@ void PlayerList::placeNewPlayer(Connection* connection, } if (!player->customTextureUrl.empty() && - player->customTextureUrl.substr(0, 3).compare(L"def") != 0 && + player->customTextureUrl.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(player->customTextureUrl)) { if (server->getConnection()->addPendingTextureRequest( player->customTextureUrl)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"Sending texture packet to get custom skin %ls from player " - L"%ls\n", + printf( + "Sending texture packet to get custom skin %s from player " + "%s\n", player->customTextureUrl.c_str(), player->name.c_str()); #endif playerConnection->send(std::shared_ptr( @@ -214,14 +214,14 @@ void PlayerList::placeNewPlayer(Connection* connection, } if (!player->customTextureUrl2.empty() && - player->customTextureUrl2.substr(0, 3).compare(L"def") != 0 && + player->customTextureUrl2.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(player->customTextureUrl2)) { if (server->getConnection()->addPendingTextureRequest( player->customTextureUrl2)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"Sending texture packet to get custom skin %ls from player " - L"%ls\n", + printf( + "Sending texture packet to get custom skin %s from player " + "%s\n", player->customTextureUrl2.c_str(), player->name.c_str()); #endif playerConnection->send(std::shared_ptr( @@ -271,7 +271,7 @@ void PlayerList::placeNewPlayer(Connection* connection, addPlayerToReceiving(player); playerConnection->send(std::make_shared( - L"", player->entityId, level->getLevelData()->getGenerator(), + "", player->entityId, level->getLevelData()->getGenerator(), level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(), (uint8_t)level->dimension->id, (uint8_t)level->getMaxBuildHeight(), (uint8_t)getMaxPlayers(), level->difficulty, @@ -295,7 +295,7 @@ void PlayerList::placeNewPlayer(Connection* connection, // 4J-PB - removed, since it needs to be localised in the language the // client is in // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) ); + // ChatPacket("§e" + playerEntity->name + " joined the game.") ) ); broadcastAll(std::shared_ptr( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame))); @@ -583,7 +583,7 @@ void PlayerList::remove(std::shared_ptr player) { } std::shared_ptr PlayerList::getPlayerForLogin( - PendingConnection* pendingConnection, const std::wstring& userName, + PendingConnection* pendingConnection, const std::string& userName, PlayerUID xuid, PlayerUID onlineXuid) { if (players.size() >= maxPlayers) { pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull); @@ -1119,7 +1119,7 @@ void PlayerList::tick() { if (newPlayer != nullptr) { receiveAllPlayers[dim][i] = newPlayer; Log::info( - "Replacing primary player %ls with %ls in dimension " + "Replacing primary player %s with %s in dimension " "%d\n", currentPlayer->name.c_str(), newPlayer->name.c_str(), dim); @@ -1153,18 +1153,18 @@ void PlayerList::broadcastAll(std::shared_ptr packet, int dimension) { } } -std::wstring PlayerList::getPlayerNames() { - std::wstring msg; +std::string PlayerList::getPlayerNames() { + std::string msg; for (unsigned int i = 0; i < players.size(); i++) { - if (i > 0) msg += L", "; + if (i > 0) msg += ", "; msg += players[i]->name; } return msg; } -bool PlayerList::isWhiteListed(const std::wstring& name) { return true; } +bool PlayerList::isWhiteListed(const std::string& name) { return true; } -bool PlayerList::isOp(const std::wstring& name) { return false; } +bool PlayerList::isOp(const std::string& name) { return false; } bool PlayerList::isOp(std::shared_ptr player) { bool cheatsEnabled = gameServices().getGameHostOption(eGameHostOption_CheatsEnabled); @@ -1178,7 +1178,7 @@ bool PlayerList::isOp(std::shared_ptr player) { return isOp; } -std::shared_ptr PlayerList::getPlayer(const std::wstring& name) { +std::shared_ptr PlayerList::getPlayer(const std::string& name) { for (unsigned int i = 0; i < players.size(); i++) { std::shared_ptr p = players[i]; if (p->name == @@ -1232,8 +1232,8 @@ std::shared_ptr PlayerList::getNearestPlayer(Pos* position, std::vector* PlayerList::getPlayers( Pos* position, int rangeMin, int rangeMax, int count, int mode, int levelMin, int levelMax, - std::unordered_map* scoreRequirements, - const std::wstring& playerName, const std::wstring& teamName, + std::unordered_map* scoreRequirements, + const std::string& playerName, const std::string& teamName, Level* level) { Log::info("getPlayers NOT IMPLEMENTED!"); return nullptr; @@ -1289,7 +1289,7 @@ std::vector* PlayerList::getPlayers( bool PlayerList::meetsScoreRequirements( std::shared_ptr player, - std::unordered_map scoreRequirements) { + std::unordered_map scoreRequirements) { Log::info("meetsScoreRequirements NOT IMPLEMENTED!"); return false; @@ -1321,8 +1321,8 @@ bool PlayerList::meetsScoreRequirements( // return true; } -void PlayerList::sendMessage(const std::wstring& name, - const std::wstring& message) { +void PlayerList::sendMessage(const std::string& name, + const std::string& message) { std::shared_ptr player = getPlayer(name); if (player != nullptr) { player->connection->send(std::make_shared(message)); @@ -1407,9 +1407,9 @@ void PlayerList::saveAll(ProgressListener* progressListener, } } -void PlayerList::whiteList(const std::wstring& playerName) {} +void PlayerList::whiteList(const std::string& playerName) {} -void PlayerList::blackList(const std::wstring& playerName) {} +void PlayerList::blackList(const std::string& playerName) {} void PlayerList::reloadWhitelist() {} @@ -1524,7 +1524,7 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, dimIndex = 2; #if !defined(_CONTENT_PACKAGE) - Log::info("Requesting remove player %ls as primary in dimension %d\n", + Log::info("Requesting remove player %s as primary in dimension %d\n", player->name.c_str(), dimIndex); #endif bool playerRemoved = false; @@ -1534,7 +1534,7 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, if (it != receiveAllPlayers[dimIndex].end()) { #if !defined(_CONTENT_PACKAGE) Log::info( - "Remove: Removing player %ls as primary in dimension %d\n", + "Remove: Removing player %s as primary in dimension %d\n", player->name.c_str(), dimIndex); #endif receiveAllPlayers[dimIndex].erase(it); @@ -1554,7 +1554,7 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, otherPlayer->IsSameSystem(thisPlayer)) { #if !defined(_CONTENT_PACKAGE) Log::info( - "Remove: Adding player %ls as primary in dimension %d\n", + "Remove: Adding player %s as primary in dimension %d\n", newPlayer->name.c_str(), dimIndex); #endif receiveAllPlayers[dimIndex].push_back(newPlayer); @@ -1564,7 +1564,7 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, } else if (thisPlayer == nullptr) { #if !defined(_CONTENT_PACKAGE) Log::info( - "Remove: Qnet player for %ls was nullptr so re-checking all " + "Remove: Qnet player for %s was nullptr so re-checking all " "players\n", player->name.c_str()); #endif @@ -1597,7 +1597,7 @@ void PlayerList::removePlayerFromReceiving(std::shared_ptr player, if (!foundPrimary) { #if !defined(_CONTENT_PACKAGE) Log::info( - "Remove: Adding player %ls as primary in dimension " + "Remove: Adding player %s as primary in dimension " "%d\n", newPlayer->name.c_str(), newPlayerDim); #endif @@ -1616,7 +1616,7 @@ void PlayerList::addPlayerToReceiving(std::shared_ptr player) { playerDim = 2; #if !defined(_CONTENT_PACKAGE) - Log::info("Requesting add player %ls as primary in dimension %d\n", + Log::info("Requesting add player %s as primary in dimension %d\n", player->name.c_str(), playerDim); #endif @@ -1627,7 +1627,7 @@ void PlayerList::addPlayerToReceiving(std::shared_ptr player) { if (thisPlayer == nullptr) { #if !defined(_CONTENT_PACKAGE) Log::info( - "Add: Qnet player for player %ls is nullptr so not adding them\n", + "Add: Qnet player for player %s is nullptr so not adding them\n", player->name.c_str()); #endif shouldAddPlayer = false; @@ -1647,7 +1647,7 @@ void PlayerList::addPlayerToReceiving(std::shared_ptr player) { if (shouldAddPlayer) { #if !defined(_CONTENT_PACKAGE) - Log::info("Add: Adding player %ls as primary in dimension %d\n", + Log::info("Add: Adding player %s as primary in dimension %d\n", player->name.c_str(), playerDim); #endif receiveAllPlayers[playerDim].push_back(player); diff --git a/targets/minecraft/server/PlayerList.h b/targets/minecraft/server/PlayerList.h index 620483afe..401c89ba1 100644 --- a/targets/minecraft/server/PlayerList.h +++ b/targets/minecraft/server/PlayerList.h @@ -107,7 +107,7 @@ public: void move(std::shared_ptr player); void remove(std::shared_ptr player); std::shared_ptr getPlayerForLogin( - PendingConnection* pendingConnection, const std::wstring& userName, + PendingConnection* pendingConnection, const std::string& userName, PlayerUID xuid, PlayerUID OnlineXuid); std::shared_ptr respawn( std::shared_ptr serverPlayer, int targetDimension, @@ -123,29 +123,29 @@ public: void broadcastAll(std::shared_ptr packet); void broadcastAll(std::shared_ptr packet, int dimension); - std::wstring getPlayerNames(); + std::string getPlayerNames(); public: - bool isWhiteListed(const std::wstring& name); - bool isOp(const std::wstring& name); + bool isWhiteListed(const std::string& name); + bool isOp(const std::string& name); bool isOp(std::shared_ptr player); // 4J Added - std::shared_ptr getPlayer(const std::wstring& name); + std::shared_ptr getPlayer(const std::string& name); std::shared_ptr getPlayer(PlayerUID uid); std::shared_ptr getNearestPlayer(Pos* position, int range); std::vector* getPlayers( Pos* position, int rangeMin, int rangeMax, int count, int mode, int levelMin, int levelMax, - std::unordered_map* scoreRequirements, - const std::wstring& playerName, const std::wstring& teamName, + std::unordered_map* scoreRequirements, + const std::string& playerName, const std::string& teamName, Level* level); private: bool meetsScoreRequirements( std::shared_ptr player, - std::unordered_map scoreRequirements); + std::unordered_map scoreRequirements); public: - void sendMessage(const std::wstring& name, const std::wstring& message); + void sendMessage(const std::string& name, const std::string& message); void broadcast(double x, double y, double z, double range, int dimension, std::shared_ptr packet); void broadcast(std::shared_ptr except, double x, double y, double z, @@ -154,8 +154,8 @@ public: // param void saveAll(ProgressListener* progressListener, bool bDeleteGuestMaps = false); - void whiteList(const std::wstring& playerName); - void blackList(const std::wstring& playerName); + void whiteList(const std::string& playerName); + void blackList(const std::string& playerName); // Set getWhiteList(); / 4J removed void reloadWhitelist(); void sendLevelInfo(std::shared_ptr player, diff --git a/targets/minecraft/server/ServerInterface.h b/targets/minecraft/server/ServerInterface.h index 55f692c4f..29c42ae7b 100644 --- a/targets/minecraft/server/ServerInterface.h +++ b/targets/minecraft/server/ServerInterface.h @@ -1,29 +1,29 @@ #pragma once class ServerInterface { - virtual int getConfigInt(const std::wstring& name, int defaultValue) = 0; - virtual std::wstring getConfigString(const std::wstring& name, - const std::wstring& defaultValue) = 0; - virtual bool getConfigBoolean(const std::wstring& name, + virtual int getConfigInt(const std::string& name, int defaultValue) = 0; + virtual std::string getConfigString(const std::string& name, + const std::string& defaultValue) = 0; + virtual bool getConfigBoolean(const std::string& name, bool defaultValue) = 0; - virtual void setProperty(std::wstring& propertyName, void* value) = 0; + virtual void setProperty(std::string& propertyName, void* value) = 0; virtual void configSave() = 0; - virtual std::wstring getConfigPath() = 0; - virtual std::wstring getServerIp() = 0; + virtual std::string getConfigPath() = 0; + virtual std::string getServerIp() = 0; virtual int getServerPort() = 0; - virtual std::wstring getServerName() = 0; - virtual std::wstring getServerVersion() = 0; + virtual std::string getServerName() = 0; + virtual std::string getServerVersion() = 0; virtual int getPlayerCount() = 0; virtual int getMaxPlayers() = 0; - virtual std::wstring[] getPlayerNames() = 0; - virtual std::wstring getWorldName() = 0; - virtual std::wstring getPluginNames() = 0; + virtual std::string[] getPlayerNames() = 0; + virtual std::string getWorldName() = 0; + virtual std::string getPluginNames() = 0; virtual void disablePlugin() = 0; - virtual std::wstring runCommand(const std::wstring& command) = 0; + virtual std::string runCommand(const std::string& command) = 0; virtual bool isDebugging() = 0; // Logging - virtual void info(const std::wstring& string) = 0; - virtual void warn(const std::wstring& string) = 0; - virtual void error(const std::wstring& string) = 0; - virtual void debug(const std::wstring& string) = 0; + virtual void info(const std::string& string) = 0; + virtual void warn(const std::string& string) = 0; + virtual void error(const std::string& string) = 0; + virtual void debug(const std::string& string) = 0; }; \ No newline at end of file diff --git a/targets/minecraft/server/ServerScoreboard.cpp b/targets/minecraft/server/ServerScoreboard.cpp index 2a5f30833..8780f2fd5 100644 --- a/targets/minecraft/server/ServerScoreboard.cpp +++ b/targets/minecraft/server/ServerScoreboard.cpp @@ -20,7 +20,7 @@ void ServerScoreboard::onScoreChanged(Score* score) { // setDirty(); } -void ServerScoreboard::onPlayerRemoved(const std::wstring& player) { +void ServerScoreboard::onPlayerRemoved(const std::string& player) { // Scoreboard::onPlayerRemoved(player); // server->getPlayers()->broadcastAll( shared_ptr( new // SetScorePacket(player))); setDirty(); @@ -62,7 +62,7 @@ void ServerScoreboard::setDisplayObjective(int slot, Objective* objective) { // setDirty(); } -void ServerScoreboard::addPlayerToTeam(const std::wstring& player, +void ServerScoreboard::addPlayerToTeam(const std::string& player, PlayerTeam* team) { // Scoreboard::addPlayerToTeam(player, team); @@ -73,7 +73,7 @@ void ServerScoreboard::addPlayerToTeam(const std::wstring& player, // setDirty(); } -void ServerScoreboard::removePlayerFromTeam(const std::wstring& player, +void ServerScoreboard::removePlayerFromTeam(const std::string& player, PlayerTeam* team) { // Scoreboard::removePlayerFromTeam(player, team); diff --git a/targets/minecraft/server/ServerScoreboard.h b/targets/minecraft/server/ServerScoreboard.h index f7494e1fc..cef653b2b 100644 --- a/targets/minecraft/server/ServerScoreboard.h +++ b/targets/minecraft/server/ServerScoreboard.h @@ -25,10 +25,10 @@ public: MinecraftServer* getServer(); void onScoreChanged(Score* score); - void onPlayerRemoved(const std::wstring& player); + void onPlayerRemoved(const std::string& player); void setDisplayObjective(int slot, Objective* objective); - void addPlayerToTeam(const std::wstring& player, PlayerTeam* team); - void removePlayerFromTeam(const std::wstring& player, PlayerTeam* team); + void addPlayerToTeam(const std::string& player, PlayerTeam* team); + void removePlayerFromTeam(const std::string& player, PlayerTeam* team); void onObjectiveAdded(Objective* objective); void onObjectiveChanged(Objective* objective); void onObjectiveRemoved(Objective* objective); diff --git a/targets/minecraft/server/Settings.cpp b/targets/minecraft/server/Settings.cpp index d23221cf4..39ac1c996 100644 --- a/targets/minecraft/server/Settings.cpp +++ b/targets/minecraft/server/Settings.cpp @@ -9,8 +9,8 @@ void Settings::generateNewProperties() {} void Settings::saveProperties() {} -std::wstring Settings::getString(const std::wstring& key, - const std::wstring& defaultValue) { +std::string Settings::getString(const std::string& key, + const std::string& defaultValue) { if (properties.find(key) == properties.end()) { properties[key] = defaultValue; saveProperties(); @@ -18,7 +18,7 @@ std::wstring Settings::getString(const std::wstring& key, return properties[key]; } -int Settings::getInt(const std::wstring& key, int defaultValue) { +int Settings::getInt(const std::string& key, int defaultValue) { if (properties.find(key) == properties.end()) { properties[key] = toWString(defaultValue); saveProperties(); @@ -26,7 +26,7 @@ int Settings::getInt(const std::wstring& key, int defaultValue) { return fromWString(properties[key]); } -bool Settings::getBoolean(const std::wstring& key, bool defaultValue) { +bool Settings::getBoolean(const std::string& key, bool defaultValue) { if (properties.find(key) == properties.end()) { properties[key] = toWString(defaultValue); saveProperties(); @@ -35,7 +35,7 @@ bool Settings::getBoolean(const std::wstring& key, bool defaultValue) { return retval; } -void Settings::setBooleanAndSave(const std::wstring& key, bool value) { +void Settings::setBooleanAndSave(const std::string& key, bool value) { properties[key] = toWString(value); saveProperties(); } \ No newline at end of file diff --git a/targets/minecraft/server/Settings.h b/targets/minecraft/server/Settings.h index e18595cd0..b74af9621 100644 --- a/targets/minecraft/server/Settings.h +++ b/targets/minecraft/server/Settings.h @@ -8,7 +8,7 @@ class Settings { // public static Logger logger = Logger.getLogger("Minecraft"); // private Properties properties = new Properties(); private: - std::unordered_map + std::unordered_map properties; // 4J - TODO was Properties type, will need to implement // something we can serialise/deserialise too // File *file; @@ -17,9 +17,9 @@ public: Settings(File* file); void generateNewProperties(); void saveProperties(); - std::wstring getString(const std::wstring& key, - const std::wstring& defaultValue); - int getInt(const std::wstring& key, int defaultValue); - bool getBoolean(const std::wstring& key, bool defaultValue); - void setBooleanAndSave(const std::wstring& key, bool value); + std::string getString(const std::string& key, + const std::string& defaultValue); + int getInt(const std::string& key, int defaultValue); + bool getBoolean(const std::string& key, bool defaultValue); + void setBooleanAndSave(const std::string& key, bool value); }; diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp index 13131a0ee..1a27fe1d5 100644 --- a/targets/minecraft/server/commands/ServerCommandDispatcher.cpp +++ b/targets/minecraft/server/commands/ServerCommandDispatcher.cpp @@ -65,8 +65,8 @@ ServerCommandDispatcher::ServerCommandDispatcher() { void ServerCommandDispatcher::logAdminCommand( std::shared_ptr source, int type, - ChatPacket::EChatPacketMessage messageType, const std::wstring& message, - int customData, const std::wstring& additionalMessage) { + ChatPacket::EChatPacketMessage messageType, const std::string& message, + int customData, const std::string& additionalMessage) { PlayerList* playerList = MinecraftServer::getInstance()->getPlayers(); // for (Player player : MinecraftServer.getInstance().getPlayers().players) for (auto it = playerList->players.begin(); it != playerList->players.end(); diff --git a/targets/minecraft/server/commands/ServerCommandDispatcher.h b/targets/minecraft/server/commands/ServerCommandDispatcher.h index 2027c7b5a..a6322f1d0 100644 --- a/targets/minecraft/server/commands/ServerCommandDispatcher.h +++ b/targets/minecraft/server/commands/ServerCommandDispatcher.h @@ -12,6 +12,6 @@ public: ServerCommandDispatcher(); void logAdminCommand(std::shared_ptr source, int type, ChatPacket::EChatPacketMessage messageType, - const std::wstring& message = L"", int customData = -1, - const std::wstring& additionalMessage = L""); + const std::string& message = "", int customData = -1, + const std::string& additionalMessage = ""); }; \ No newline at end of file diff --git a/targets/minecraft/server/level/DemoMode.cpp b/targets/minecraft/server/level/DemoMode.cpp index b9519ee8b..5caa2ed0f 100644 --- a/targets/minecraft/server/level/DemoMode.cpp +++ b/targets/minecraft/server/level/DemoMode.cpp @@ -25,14 +25,14 @@ void DemoMode::tick() { { if (day <= (DEMO_DAYS + 1)) { - minecraft->gui->displayClientMessage(L"demo.day." + + minecraft->gui->displayClientMessage("demo.day." + toWString(day)); } } else if (day == 1) { Options *options = minecraft->options; - wstring message; + string message; if (time == 100) { minecraft.gui.addMessage("Seed: " + minecraft.level.getSeed()); diff --git a/targets/minecraft/server/level/DerivedServerLevel.cpp b/targets/minecraft/server/level/DerivedServerLevel.cpp index 5ad1de97f..1e30abb8f 100644 --- a/targets/minecraft/server/level/DerivedServerLevel.cpp +++ b/targets/minecraft/server/level/DerivedServerLevel.cpp @@ -10,7 +10,7 @@ class MinecraftServer; DerivedServerLevel::DerivedServerLevel( MinecraftServer* server, std::shared_ptr levelStorage, - const std::wstring& levelName, int dimension, LevelSettings* levelSettings, + const std::string& levelName, int dimension, LevelSettings* levelSettings, ServerLevel* wrapped) : ServerLevel(server, levelStorage, levelName, dimension, levelSettings) { // 4J-PB - we're going to override the savedDataStorage, so we need to diff --git a/targets/minecraft/server/level/DerivedServerLevel.h b/targets/minecraft/server/level/DerivedServerLevel.h index c46f2a053..55b15c007 100644 --- a/targets/minecraft/server/level/DerivedServerLevel.h +++ b/targets/minecraft/server/level/DerivedServerLevel.h @@ -12,7 +12,7 @@ class DerivedServerLevel : public ServerLevel { public: DerivedServerLevel(MinecraftServer* server, std::shared_ptr levelStorage, - const std::wstring& levelName, int dimension, + const std::string& levelName, int dimension, LevelSettings* levelSettings, ServerLevel* wrapped); ~DerivedServerLevel(); diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index 9e26fdea3..a420c8b25 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -165,8 +165,8 @@ void PlayerChunkMap::PlayerChunk::remove(std::shared_ptr player) { } } if (noOtherPlayersFound) { - // wprintf(L"Sending ChunkVisiblity packet false for chunk - // (%d,%d) to player %ls\n", x, z, player->name.c_str() ); + // printf("Sending ChunkVisiblity packet false for chunk + // (%d,%d) to player %s\n", x, z, player->name.c_str() ); player->connection->send(std::shared_ptr( new ChunkVisibilityPacket(pos.x, pos.z, false))); } diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index 0ed746b98..203c58d9b 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -821,8 +821,8 @@ bool ServerChunkCache::tick() { bool ServerChunkCache::shouldSave() { return !level->noSave; } -std::wstring ServerChunkCache::gatherStats() { - return L"ServerChunkCache: "; // + toWString(loadedChunks.size()) + L" +std::string ServerChunkCache::gatherStats() { + return "ServerChunkCache: "; // + toWString(loadedChunks.size()) + " // Drop: " + toWString(toDrop.size()); } @@ -832,7 +832,7 @@ std::vector* ServerChunkCache::getMobsAt( } TilePos* ServerChunkCache::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return source->findNearestMapFeature(level, featureName, x, y, z); } diff --git a/targets/minecraft/server/level/ServerChunkCache.h b/targets/minecraft/server/level/ServerChunkCache.h index c7734225d..86cb3a6eb 100644 --- a/targets/minecraft/server/level/ServerChunkCache.h +++ b/targets/minecraft/server/level/ServerChunkCache.h @@ -103,12 +103,12 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index d672999d4..fd310d273 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -131,7 +131,7 @@ void ServerLevel::staticCtor() { ServerLevel::ServerLevel(MinecraftServer* server, std::shared_ptr levelStorage, - const std::wstring& levelName, int dimension, + const std::string& levelName, int dimension, LevelSettings* levelSettings) : Level(levelStorage, levelName, levelSettings, Dimension::getNew(dimension), false) { @@ -993,7 +993,7 @@ void ServerLevel::saveToDisc(ProgressListener* progressListener, DLCPack* pDLCPack = pDLCTexPack->getDLCInfoParentPack(); - if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, L"")) { + if (!pDLCPack->hasPurchasedFile(DLCManager::e_DLCType_Texture, "")) { return; } } @@ -1207,13 +1207,13 @@ PlayerChunkMap* ServerLevel::getChunkMap() { return chunkMap; } PortalForcer* ServerLevel::getPortalForcer() { return portalForcer; } -void ServerLevel::sendParticles(const std::wstring& name, double x, double y, +void ServerLevel::sendParticles(const std::string& name, double x, double y, double z, int count) { sendParticles(name, x + 0.5f, y + 0.5f, z + 0.5f, count, 0.5f, 0.5f, 0.5f, 0.02f); } -void ServerLevel::sendParticles(const std::wstring& name, double x, double y, +void ServerLevel::sendParticles(const std::string& name, double x, double y, double z, int count, double xDist, double yDist, double zDist, double speed) { std::shared_ptr packet = std::make_shared( diff --git a/targets/minecraft/server/level/ServerLevel.h b/targets/minecraft/server/level/ServerLevel.h index 819467196..8407324b6 100644 --- a/targets/minecraft/server/level/ServerLevel.h +++ b/targets/minecraft/server/level/ServerLevel.h @@ -79,7 +79,7 @@ public: static void staticCtor(); ServerLevel(MinecraftServer* server, std::shared_ptr levelStorage, - const std::wstring& levelName, int dimension, + const std::string& levelName, int dimension, LevelSettings* levelSettings); ~ServerLevel(); void tick(); @@ -184,9 +184,9 @@ public: void setTimeAndAdjustTileTicks(int64_t newTime); PlayerChunkMap* getChunkMap(); PortalForcer* getPortalForcer(); - void sendParticles(const std::wstring& name, double x, double y, double z, + void sendParticles(const std::string& name, double x, double y, double z, int count); - void sendParticles(const std::wstring& name, double x, double y, double z, + void sendParticles(const std::string& name, double x, double y, double z, int count, double xDist, double yDist, double zDist, double speed); diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp index dd2204c08..15f7f2ffd 100644 --- a/targets/minecraft/server/level/ServerLevelListener.cpp +++ b/targets/minecraft/server/level/ServerLevelListener.cpp @@ -27,7 +27,7 @@ ServerLevelListener::ServerLevelListener(MinecraftServer* server, // 4J removed - /* -void ServerLevelListener::addParticle(const wstring& name, double x, double y, +void ServerLevelListener::addParticle(const string& name, double x, double y, double z, double xa, double ya, double za) { } @@ -106,7 +106,7 @@ void ServerLevelListener::tileChanged(int x, int y, int z) { void ServerLevelListener::tileLightChanged(int x, int y, int z) {} -void ServerLevelListener::playStreamingMusic(const std::wstring& name, int x, +void ServerLevelListener::playStreamingMusic(const std::string& name, int x, int y, int z) {} void ServerLevelListener::levelEvent(std::shared_ptr source, int type, diff --git a/targets/minecraft/server/level/ServerLevelListener.h b/targets/minecraft/server/level/ServerLevelListener.h index 4f30d5c8b..5d86fe3ca 100644 --- a/targets/minecraft/server/level/ServerLevelListener.h +++ b/targets/minecraft/server/level/ServerLevelListener.h @@ -18,7 +18,7 @@ private: public: ServerLevelListener(MinecraftServer* server, ServerLevel* level); - // 4J removed - virtual void addParticle(const std::wstring& name, double x, + // 4J removed - virtual void addParticle(const std::string& name, double x, // double y, double z, double xa, double ya, double za); virtual void addParticle(ePARTICLE_TYPE name, double x, double y, double z, double xa, double ya, double za); // 4J added @@ -40,7 +40,7 @@ public: virtual void skyColorChanged(); virtual void tileChanged(int x, int y, int z); virtual void tileLightChanged(int x, int y, int z); - virtual void playStreamingMusic(const std::wstring& name, int x, int y, + virtual void playStreamingMusic(const std::string& name, int x, int y, int z); virtual void levelEvent(std::shared_ptr source, int type, int x, int y, int z, int data); diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 1274c881f..d50593678 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -114,7 +114,7 @@ class Objective; ServerPlayer::ServerPlayer(MinecraftServer* server, Level* level, - const std::wstring& name, + const std::string& name, ServerPlayerGameMode* gameMode) : Player(level, name) { // 4J - added initialisers @@ -248,7 +248,7 @@ void ServerPlayer::flagEntitiesToBeRemoved(unsigned int* flags, void ServerPlayer::readAdditionalSaveData(CompoundTag* entityTag) { Player::readAdditionalSaveData(entityTag); - if (entityTag->contains(L"playerGameType")) { + if (entityTag->contains("playerGameType")) { // 4J Stu - We do not want to change the game mode for the player, // instead we let the server override it globally // if (MinecraftServer::getInstance()->getForceGameType()) @@ -257,13 +257,13 @@ void ServerPlayer::readAdditionalSaveData(CompoundTag* entityTag) { //} // else //{ - // gameMode->setGameModeForPlayer(GameType::byId(entityTag->getInt(L"playerGameType"))); + // gameMode->setGameModeForPlayer(GameType::byId(entityTag->getInt("playerGameType"))); //} } GameRulesInstance* grs = gameMode->getGameRules(); - if (entityTag->contains(L"GameRules") && grs != nullptr) { - std::vector ba = entityTag->getByteArray(L"GameRules"); + if (entityTag->contains("GameRules") && grs != nullptr) { + std::vector ba = entityTag->getByteArray("GameRules"); ByteArrayInputStream bais(ba); DataInputStream dis(&bais); grs->read(&dis); @@ -280,7 +280,7 @@ void ServerPlayer::addAdditonalSaveData(CompoundTag* entityTag) { ByteArrayOutputStream baos; DataOutputStream dos(&baos); grs->write(&dos); - entityTag->putByteArray(L"GameRules", baos.buf); + entityTag->putByteArray("GameRules", baos.buf); baos.buf.clear(); dos.close(); baos.close(); @@ -288,7 +288,7 @@ void ServerPlayer::addAdditonalSaveData(CompoundTag* entityTag) { // 4J Stu - We do not want to change the game mode for the player, instead // we let the server override it globally - // entityTag->putInt(L"playerGameType", + // entityTag->putInt("playerGameType", // gameMode->getGameModeForPlayer()->getId()); } @@ -462,7 +462,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks) { connection->getNetworkPlayer()); // static - // unordered_map mapLastTime; + // unordered_map mapLastTime; // int64_t thisTime = // System::currentTimeMillis(); // int64_t lastTime = @@ -705,7 +705,7 @@ bool ServerPlayer::hurt(DamageSource* dmgSource, float dmg) { // way out of 'fall traps' // bool allowFallDamage = server->isPvpAllowed() && // server->isDedicatedServer() && server->isPvpAllowed() && - // (dmgSource->msgId.compare(L"fall") == 0); + // (dmgSource->msgId.compare("fall") == 0); if (!server->isPvpAllowed() && invulnerableTime > 0 && dmgSource != DamageSource::outOfWorld) return false; @@ -746,7 +746,7 @@ bool ServerPlayer::canHarmPlayer(std::shared_ptr target) { // 4J: Added for checking when only player name is provided (possible player // isn't on server), e.g. can harm owned animals -bool ServerPlayer::canHarmPlayer(std::wstring targetName) { +bool ServerPlayer::canHarmPlayer(std::string targetName) { bool canHarm = true; std::shared_ptr owner = @@ -917,7 +917,7 @@ bool ServerPlayer::startCrafting(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send(std::make_shared( - containerCounter, ContainerOpenPacket::WORKBENCH, L"", 9, false)); + containerCounter, ContainerOpenPacket::WORKBENCH, "", 9, false)); containerMenu = new CraftingMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -934,7 +934,7 @@ bool ServerPlayer::openFireworks(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send(std::make_shared( - containerCounter, ContainerOpenPacket::FIREWORKS, L"", 9, false)); + containerCounter, ContainerOpenPacket::FIREWORKS, "", 9, false)); containerMenu = new FireworksMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -943,7 +943,7 @@ bool ServerPlayer::openFireworks(int x, int y, int z) { nextContainerCounter(); connection->send(std::make_shared( - containerCounter, ContainerOpenPacket::FIREWORKS, L"", 9, false)); + containerCounter, ContainerOpenPacket::FIREWORKS, "", 9, false)); containerMenu = new FireworksMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -957,12 +957,12 @@ bool ServerPlayer::openFireworks(int x, int y, int z) { } bool ServerPlayer::startEnchanting(int x, int y, int z, - const std::wstring& name) { + const std::string& name) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send(std::make_shared( containerCounter, ContainerOpenPacket::ENCHANTMENT, - name.empty() ? L"" : name, 9, !name.empty())); + name.empty() ? "" : name, 9, !name.empty())); containerMenu = new EnchantmentMenu(inventory, level, x, y, z); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); @@ -979,7 +979,7 @@ bool ServerPlayer::startRepairing(int x, int y, int z) { if (containerMenu == inventoryMenu) { nextContainerCounter(); connection->send(std::make_shared( - containerCounter, ContainerOpenPacket::REPAIR_TABLE, L"", 9, + containerCounter, ContainerOpenPacket::REPAIR_TABLE, "", 9, false)); containerMenu = new AnvilMenu( inventory, level, x, y, z, @@ -1135,7 +1135,7 @@ bool ServerPlayer::openBeacon(std::shared_ptr beacon) { } bool ServerPlayer::openTrading(std::shared_ptr traderTarget, - const std::wstring& name) { + const std::string& name) { if (containerMenu == inventoryMenu) { nextContainerCounter(); containerMenu = new MerchantMenu(inventory, traderTarget, level); @@ -1146,7 +1146,7 @@ bool ServerPlayer::openTrading(std::shared_ptr traderTarget, connection->send(std::make_shared( containerCounter, ContainerOpenPacket::TRADER_NPC, - name.empty() ? L"" : name, container->getContainerSize(), + name.empty() ? "" : name, container->getContainerSize(), !name.empty())); MerchantRecipeList* offers = traderTarget->getOffers( @@ -1301,19 +1301,19 @@ void ServerPlayer::displayClientMessage(int messageId) { switch (messageId) { case IDS_TILE_BED_OCCUPIED: messageType = ChatPacket::e_ChatBedOccupied; - connection->send(std::make_shared(L"", messageType)); + connection->send(std::make_shared("", messageType)); break; case IDS_TILE_BED_NO_SLEEP: messageType = ChatPacket::e_ChatBedNoSleep; - connection->send(std::make_shared(L"", messageType)); + connection->send(std::make_shared("", messageType)); break; case IDS_TILE_BED_NOT_VALID: messageType = ChatPacket::e_ChatBedNotValid; - connection->send(std::make_shared(L"", messageType)); + connection->send(std::make_shared("", messageType)); break; case IDS_TILE_BED_NOTSAFE: messageType = ChatPacket::e_ChatBedNotSafe; - connection->send(std::make_shared(L"", messageType)); + connection->send(std::make_shared("", messageType)); break; case IDS_TILE_BED_PLAYERSLEEP: messageType = ChatPacket::e_ChatBedPlayerSleep; @@ -1356,7 +1356,7 @@ void ServerPlayer::displayClientMessage(int messageId) { break; case IDS_TILE_BED_MESLEEP: messageType = ChatPacket::e_ChatBedMeSleep; - connection->send(std::make_shared(L"", messageType)); + connection->send(std::make_shared("", messageType)); break; case IDS_MAX_PIGS_SHEEP_COWS_CATS_SPAWNED: @@ -1550,9 +1550,9 @@ void ServerPlayer::displayClientMessage(int messageId) { } // Language *language = Language::getInstance(); - // wstring languageString = + // string languageString = // gameServices().getString(messageId);//language->getElement(messageId); - // connection->send( shared_ptr( new ChatPacket(L"", + // connection->send( shared_ptr( new ChatPacket("", // messageType) ) ); } @@ -1635,9 +1635,9 @@ void ServerPlayer::setGameMode(GameType* mode) { } void ServerPlayer::sendMessage( - const std::wstring& message, + const std::string& message, ChatPacket::EChatPacketMessage type /*= e_ChatCustom*/, - int customData /*= -1*/, const std::wstring& additionalMessage /*= L""*/) { + int customData /*= -1*/, const std::string& additionalMessage /*= ""*/) { connection->send(std::shared_ptr( new ChatPacket(message, type, customData, additionalMessage))); } diff --git a/targets/minecraft/server/level/ServerPlayer.h b/targets/minecraft/server/level/ServerPlayer.h index e5f983869..aea142f5d 100644 --- a/targets/minecraft/server/level/ServerPlayer.h +++ b/targets/minecraft/server/level/ServerPlayer.h @@ -65,7 +65,7 @@ private: public: ServerPlayer(MinecraftServer* server, Level* level, - const std::wstring& name, ServerPlayerGameMode* gameMode); + const std::string& name, ServerPlayerGameMode* gameMode); ~ServerPlayer(); void flagEntitiesToBeRemoved(unsigned int* flags, bool* removedFound); // 4J added @@ -86,7 +86,7 @@ public: virtual void die(DamageSource* source); virtual bool hurt(DamageSource* dmgSource, float dmg); virtual bool canHarmPlayer(std::shared_ptr target); - bool canHarmPlayer(std::wstring targetName); // 4J: Added + bool canHarmPlayer(std::string targetName); // 4J: Added void doTick(bool sendChunks, bool dontDelayChunks = false, bool ignorePortal = false); void doTickA(); @@ -130,7 +130,7 @@ public: virtual bool startCrafting(int x, int y, int z); // 4J added bool return virtual bool openFireworks(int x, int y, int z); // 4J added virtual bool startEnchanting( - int x, int y, int z, const std::wstring& name); // 4J added bool return + int x, int y, int z, const std::string& name); // 4J added bool return virtual bool startRepairing(int x, int y, int z); // 4J added bool return virtual bool openContainer( std::shared_ptr container); // 4J added bool return @@ -144,7 +144,7 @@ public: brewingStand); // 4J added bool return virtual bool openBeacon(std::shared_ptr beacon); virtual bool openTrading(std::shared_ptr traderTarget, - const std::wstring& name); // 4J added bool return + const std::string& name); // 4J added bool return virtual bool openHorseInventory(std::shared_ptr horse, std::shared_ptr container); virtual void slotChanged(AbstractContainerMenu* container, int slotIndex, @@ -190,9 +190,9 @@ public: ServerLevel* getLevel(); void setGameMode(GameType* mode); void sendMessage( - const std::wstring& message, + const std::string& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L""); + int customData = -1, const std::string& additionalMessage = ""); bool hasPermission(EGameCommand command); // bool hasPermission(int permissionLevel, EGameCommand command); // void updateOptions(std::shared_ptr packet); // diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index baab36f6f..f7eb9b3b4 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -599,7 +599,7 @@ void TrackedEntity::updatePlayer(EntityTracker* tracker, if (e->instanceof(eTYPE_PLAYER)) { std::shared_ptr plr = std::dynamic_pointer_cast(e); Log::info( - "TrackedEntity:: Player '%ls' is now visible to player '%ls', " + "TrackedEntity:: Player '%s' is now visible to player '%s', " "%s.\n", plr->name.c_str(), sp->name.c_str(), (e->riding == nullptr ? "not riding minecart" : "in minecart")); @@ -712,7 +712,7 @@ void TrackedEntity::updatePlayers( std::shared_ptr TrackedEntity::getAddEntityPacket() { if (e->removed) { - Log::info("Fetching addPacket for removed entity - %ls\n", + Log::info("Fetching addPacket for removed entity - %s\n", e->getAName().c_str()); } diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 2a8746dc8..62c26afd1 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -36,13 +36,13 @@ class Packet; Random* PendingConnection::random = new Random(); PendingConnection::PendingConnection(MinecraftServer* server, Socket* socket, - const std::wstring& id) { + const std::string& id) { // 4J - added initialisers done = false; _tick = 0; - name = L""; + name = ""; acceptedLogin = nullptr; - loginKey = L""; + loginKey = ""; this->server = server; connection = new Connection(socket, id, this); @@ -137,7 +137,7 @@ void PendingConnection::sendPreLoginResponse() { { connection->send(std::shared_ptr( - new PreLoginPacket(L"-", ugcXuids, ugcXuidCount, ugcFriendsOnlyBits, + new PreLoginPacket("-", ugcXuids, ugcXuidCount, ugcFriendsOnlyBits, server->m_ugcPlayersVersion, szUniqueMapName, gameServices().getGameHostOption(eGameHostOption_All), hostIndex, server->m_texturePackId))); @@ -234,8 +234,8 @@ void PendingConnection::send(std::shared_ptr packet) { connection->send(packet); } -std::wstring PendingConnection::getName() { - return L"Unimplemented"; +std::string PendingConnection::getName() { + return "Unimplemented"; // if (name != null) return name + " [" + // connection.getRemoteAddress().toString() + "]"; return // connection.getRemoteAddress().toString(); diff --git a/targets/minecraft/server/network/PendingConnection.h b/targets/minecraft/server/network/PendingConnection.h index cf1524b0f..054443632 100644 --- a/targets/minecraft/server/network/PendingConnection.h +++ b/targets/minecraft/server/network/PendingConnection.h @@ -31,13 +31,13 @@ public: private: MinecraftServer* server; int _tick; - std::wstring name; + std::string name; std::shared_ptr acceptedLogin; - std::wstring loginKey; + std::string loginKey; public: PendingConnection(MinecraftServer* server, Socket* socket, - const std::wstring& id); + const std::string& id); ~PendingConnection(); void tick(); void disconnect(DisconnectPacket::eDisconnectReason reason); @@ -50,7 +50,7 @@ public: virtual void handleKeepAlive(std::shared_ptr packet); virtual void onUnhandledPacket(std::shared_ptr packet); void send(std::shared_ptr packet); - std::wstring getName(); + std::string getName(); virtual bool isServerPacketListener(); virtual bool isDisconnected(); diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index 8871671f9..184f4264e 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -191,7 +191,7 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason) { // 4J-PB - removed, since it needs to be localised in the language the // client is in // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + player->name + L" left the game.") ) ); + // ChatPacket("§e" + player->name + " left the game.") ) ); if (getWasKicked()) { server->getPlayers()->broadcastAll(std::make_shared( player->name, ChatPacket::e_ChatPlayerKickedFromGame)); @@ -382,7 +382,7 @@ void PlayerConnection::handleMovePlayer( // ", " + zt); System.out.println("Expected " + player->x // + ", " + player->y + ", " + player->z); #if !defined(_CONTENT_PACKAGE) - wprintf(L"%ls moved wrongly!\n", player->name.c_str()); + printf("%s moved wrongly!\n", player->name.c_str()); Log::info("Got position %f, %f, %f\n", xt, yt, zt); Log::info("Expected %f, %f, %f\n", player->x, player->y, player->z); @@ -407,7 +407,7 @@ void PlayerConnection::handleMovePlayer( // logger.warning(player->name + " was // kicked for floating too long!"); #if !defined(_CONTENT_PACKAGE) - wprintf(L"%ls was kicked for floating too long!\n", + printf("%s was kicked for floating too long!\n", player->name.c_str()); #endif disconnect(DisconnectPacket::eDisconnect_NoFlying); @@ -623,7 +623,7 @@ void PlayerConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, // 4J-PB - removed, since it needs to be localised in the language the // client is in // server->players->broadcastAll( std::shared_ptr( new - // ChatPacket(L"§e" + player->name + L" left the game.") ) ); + // ChatPacket("§e" + player->name + " left the game.") ) ); if (getWasKicked()) { server->getPlayers()->broadcastAll(std::make_shared( player->name, ChatPacket::e_ChatPlayerKickedFromGame)); @@ -646,8 +646,8 @@ void PlayerConnection::send(std::shared_ptr packet) { if (!server->getPlayers()->canReceiveAllPackets(player)) { // Check if we are allowed to send this packet type if (!Packet::canSendToAnyClient(packet)) { - // wprintf(L"Not the systems primary player, so not sending them - // a packet : %ls / %d\n", player->name.c_str(), packet->getId() + // printf("Not the systems primary player, so not sending them + // a packet : %s / %d\n", player->name.c_str(), packet->getId() // ); return; } @@ -662,8 +662,8 @@ void PlayerConnection::queueSend(std::shared_ptr packet) { if (!server->getPlayers()->canReceiveAllPackets(player)) { // Check if we are allowed to send this packet type if (!Packet::canSendToAnyClient(packet)) { - // wprintf(L"Not the systems primary player, so not queueing - // them a packet : %ls\n", + // printf("Not the systems primary player, so not queueing + // them a packet : %s\n", // connection->getSocket()->getPlayer()->GetGamertag() ); return; } @@ -687,7 +687,7 @@ void PlayerConnection::handleChat(std::shared_ptr packet) { // 4J - TODO } -void PlayerConnection::handleCommand(const std::wstring& message) { +void PlayerConnection::handleCommand(const std::string& message) { // 4J - TODO } @@ -747,19 +747,19 @@ int PlayerConnection::countDelayedPackets() { return connection->countDelayedPackets(); } -void PlayerConnection::info(const std::wstring& string) { +void PlayerConnection::info(const std::string& string) { // 4J-PB - removed, since it needs to be localised in the language the // client is in - // send( std::shared_ptr( new ChatPacket(L"§7" + string) ) ); + // send( std::shared_ptr( new ChatPacket("§7" + string) ) ); } -void PlayerConnection::warn(const std::wstring& string) { +void PlayerConnection::warn(const std::string& string) { // 4J-PB - removed, since it needs to be localised in the language the // client is in - // send( std::shared_ptr( new ChatPacket(L"§9" + string) ) ); + // send( std::shared_ptr( new ChatPacket("§9" + string) ) ); } -std::wstring PlayerConnection::getConsoleName() { return player->getName(); } +std::string PlayerConnection::getConsoleName() { return player->getName(); } void PlayerConnection::handleInteract(std::shared_ptr packet) { ServerLevel* level = server->getLevel(player->dimension); @@ -809,7 +809,7 @@ void PlayerConnection::handleTexture(std::shared_ptr packet) { if (packet->dataBytes == 0) { // Request for texture #if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received request for custom texture %ls\n", + printf("Server received request for custom texture %s\n", packet->textureName.c_str()); #endif std::uint8_t* pbData = nullptr; @@ -825,7 +825,7 @@ void PlayerConnection::handleTexture(std::shared_ptr packet) { } else { // Response with texture data #if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received custom texture %ls\n", + printf("Server received custom texture %s\n", packet->textureName.c_str()); #endif gameServices().addMemoryTextureFile(packet->textureName, packet->pbData, @@ -842,7 +842,7 @@ void PlayerConnection::handleTextureAndGeometry( if (packet->dwTextureBytes == 0) { // Request for texture and geometry #if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received request for custom texture %ls\n", + printf("Server received request for custom texture %s\n", packet->textureName.c_str()); #endif std::uint8_t* pbData = nullptr; @@ -882,7 +882,7 @@ void PlayerConnection::handleTextureAndGeometry( } else { // Response with texture and geometry data #if !defined(_CONTENT_PACKAGE) - wprintf(L"Server received custom texture %ls and geometry\n", + printf("Server received custom texture %s and geometry\n", packet->textureName.c_str()); #endif gameServices().addMemoryTextureFile(packet->textureName, packet->pbData, @@ -891,7 +891,7 @@ void PlayerConnection::handleTextureAndGeometry( // add the geometry to the app list if (packet->dwBoxC != 0) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Adding skin boxes for skin id %X, box count %d\n", + printf("Adding skin boxes for skin id %X, box count %d\n", packet->dwSkinID, packet->dwBoxC); #endif gameServices().setAdditionalSkinBoxes(packet->dwSkinID, packet->BoxDataA, @@ -908,7 +908,7 @@ void PlayerConnection::handleTextureAndGeometry( } } -void PlayerConnection::handleTextureReceived(const std::wstring& textureName) { +void PlayerConnection::handleTextureReceived(const std::string& textureName) { // This sends the server received texture out to any other players waiting // for the data auto it = find(m_texturesRequested.begin(), m_texturesRequested.end(), @@ -927,7 +927,7 @@ void PlayerConnection::handleTextureReceived(const std::wstring& textureName) { } void PlayerConnection::handleTextureAndGeometryReceived( - const std::wstring& textureName) { + const std::string& textureName) { // This sends the server received texture out to any other players waiting // for the data auto it = find(m_texturesRequested.begin(), m_texturesRequested.end(), @@ -968,7 +968,7 @@ void PlayerConnection::handleTextureChange( case TextureChangePacket::e_TextureChange_Skin: player->setCustomSkin(gameServices().getSkinIdFromPath(packet->path)); #if !defined(_CONTENT_PACKAGE) - wprintf(L"Skin for server player %ls has changed to %ls (%d)\n", + printf("Skin for server player %s has changed to %s (%d)\n", player->name.c_str(), player->customTextureUrl.c_str(), player->getPlayerDefaultSkin()); #endif @@ -977,19 +977,19 @@ void PlayerConnection::handleTextureChange( player->setCustomCape(Player::getCapeIdFromPath(packet->path)); // player->customTextureUrl2 = packet->path; #if !defined(_CONTENT_PACKAGE) - wprintf(L"Cape for server player %ls has changed to %ls\n", + printf("Cape for server player %s has changed to %s\n", player->name.c_str(), player->customTextureUrl2.c_str()); #endif break; } if (!packet->path.empty() && - packet->path.substr(0, 3).compare(L"def") != 0 && + packet->path.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(packet->path)) { if (server->connection->addPendingTextureRequest(packet->path)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"Sending texture packet to get custom skin %ls from player " - L"%ls\n", + printf( + "Sending texture packet to get custom skin %s from player " + "%s\n", packet->path.c_str(), player->name.c_str()); #endif send(std::shared_ptr( @@ -1010,21 +1010,21 @@ void PlayerConnection::handleTextureAndGeometryChange( std::shared_ptr packet) { player->setCustomSkin(gameServices().getSkinIdFromPath(packet->path)); #if !defined(_CONTENT_PACKAGE) - wprintf( - L"PlayerConnection::handleTextureAndGeometryChange - Skin for server " - L"player %ls has changed to %ls (%d)\n", + printf( + "PlayerConnection::handleTextureAndGeometryChange - Skin for server " + "player %s has changed to %s (%d)\n", player->name.c_str(), player->customTextureUrl.c_str(), player->getPlayerDefaultSkin()); #endif if (!packet->path.empty() && - packet->path.substr(0, 3).compare(L"def") != 0 && + packet->path.substr(0, 3).compare("def") != 0 && !gameServices().isFileInMemoryTextures(packet->path)) { if (server->connection->addPendingTextureRequest(packet->path)) { #if !defined(_CONTENT_PACKAGE) - wprintf( - L"Sending texture packet to get custom skin %ls from player " - L"%ls\n", + printf( + "Sending texture packet to get custom skin %s from player " + "%s\n", packet->path.c_str(), player->name.c_str()); #endif send(std::shared_ptr( @@ -1264,9 +1264,9 @@ void PlayerConnection::handleSetCreativeModeSlot( MapItem::getSavedData(item->getAuxValue(), player->level); // 4J Stu - We only have one map per player per dimension, so don't // reset the one that they have when a new one is created - wchar_t buf[64]; - swprintf(buf, 64, L"map_%d", item->getAuxValue()); - std::wstring id = std::wstring(buf); + char buf[64]; + snprintf(buf, 64, "map_%d", item->getAuxValue()); + std::string id = std::string(buf); if (data == nullptr) { data = std::make_shared(id); } @@ -1352,8 +1352,8 @@ void PlayerConnection::handleSignUpdate( std::shared_ptr ste = std::dynamic_pointer_cast(te); if (!ste->isEditable() || ste->getPlayerWhoMayEdit() != player) { - server->warn(L"Player " + player->getName() + - L" just tried to change non-editable sign"); + server->warn("Player " + player->getName() + + " just tried to change non-editable sign"); return; } } @@ -1366,7 +1366,7 @@ void PlayerConnection::handleSignUpdate( std::shared_ptr ste = std::dynamic_pointer_cast(te); for (int i = 0; i < 4; i++) { - std::wstring lineText = packet->lines[i].substr(0, 15); + std::string lineText = packet->lines[i].substr(0, 15); ste->SetMessage(i, lineText); } ste->SetVerified(false); @@ -1423,7 +1423,7 @@ void PlayerConnection::handlePlayerInfo( if (serverPlayer->gameMode->getGameModeForPlayer() != gameType) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Setting %ls to game mode %d\n", + printf("Setting %s to game mode %d\n", serverPlayer->name.c_str(), gameType); #endif serverPlayer->setPlayerGamePrivilege( @@ -1438,7 +1438,7 @@ void PlayerConnection::handlePlayerInfo( gameType->getId())); } else { #if !defined(_CONTENT_PACKAGE) - wprintf(L"%ls already has game mode %d\n", + printf("%s already has game mode %d\n", serverPlayer->name.c_str(), gameType); #endif } @@ -1617,7 +1617,7 @@ void PlayerConnection::handleCustomPayload( int x = input.readInt(); int y = input.readInt(); int z = input.readInt(); - std::wstring command = Packet::readUtf(&input, 256); + std::string command = Packet::readUtf(&input, 256); std::shared_ptr tileEntity = player->level->getTileEntity(x, y, z); @@ -1656,11 +1656,11 @@ void PlayerConnection::handleCustomPayload( AnvilMenu* menu = dynamic_cast(player->containerMenu); if (menu) { if (customPayloadPacket->data.empty()) { - menu->setItemName(L""); + menu->setItemName(""); } else { ByteArrayInputStream bais(customPayloadPacket->data); DataInputStream dis(&bais); - std::wstring name = dis.readUTF(); + std::string name = dis.readUTF(); if (name.length() <= 30) { menu->setItemName(name); } diff --git a/targets/minecraft/server/network/PlayerConnection.h b/targets/minecraft/server/network/PlayerConnection.h index 9133a8cba..054b7c0e0 100644 --- a/targets/minecraft/server/network/PlayerConnection.h +++ b/targets/minecraft/server/network/PlayerConnection.h @@ -76,7 +76,7 @@ public: virtual void handleChat(std::shared_ptr packet); private: - void handleCommand(const std::wstring& message); + void handleCommand(const std::string& message); public: virtual void handleAnimate(std::shared_ptr packet); @@ -84,9 +84,9 @@ public: std::shared_ptr packet); virtual void handleDisconnect(std::shared_ptr packet); int countDelayedPackets(); - virtual void info(const std::wstring& string); - virtual void warn(const std::wstring& string); - virtual std::wstring getConsoleName(); + virtual void info(const std::string& string); + virtual void warn(const std::string& string); + virtual std::string getConsoleName(); virtual void handleInteract(std::shared_ptr packet); bool canHandleAsyncPackets(); virtual void handleClientCommand( @@ -153,8 +153,8 @@ public: // 4J Added so that we can send on textures that get received after this // connection requested them - void handleTextureReceived(const std::wstring& textureName); - void handleTextureAndGeometryReceived(const std::wstring& textureName); + void handleTextureReceived(const std::string& textureName); + void handleTextureAndGeometryReceived(const std::string& textureName); void setShowOnMaps(bool bVal); @@ -166,7 +166,7 @@ public: private: bool m_bCloseOnTick; - std::vector m_texturesRequested; + std::vector m_texturesRequested; bool m_bWasKicked; }; \ No newline at end of file diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp index ff517d840..6648b7a2b 100644 --- a/targets/minecraft/server/network/ServerConnection.cpp +++ b/targets/minecraft/server/network/ServerConnection.cpp @@ -30,7 +30,7 @@ void ServerConnection::NewIncomingSocket(Socket* socket) { std::shared_ptr unconnectedClient = std::make_shared( server, socket, - L"Connection #" + toWString(connectionCounter++)); + "Connection #" + toWString(connectionCounter++)); handleConnection(unconnectedClient); } @@ -111,7 +111,7 @@ void ServerConnection::tick() { } bool ServerConnection::addPendingTextureRequest( - const std::wstring& textureName) { + const std::string& textureName) { auto it = find(m_pendingTextureRequests.begin(), m_pendingTextureRequests.end(), textureName); if (it == m_pendingTextureRequests.end()) { @@ -128,7 +128,7 @@ bool ServerConnection::addPendingTextureRequest( return true; } -void ServerConnection::handleTextureReceived(const std::wstring& textureName) { +void ServerConnection::handleTextureReceived(const std::string& textureName) { auto it = find(m_pendingTextureRequests.begin(), m_pendingTextureRequests.end(), textureName); if (it != m_pendingTextureRequests.end()) { @@ -143,7 +143,7 @@ void ServerConnection::handleTextureReceived(const std::wstring& textureName) { } void ServerConnection::handleTextureAndGeometryReceived( - const std::wstring& textureName) { + const std::string& textureName) { auto it = find(m_pendingTextureRequests.begin(), m_pendingTextureRequests.end(), textureName); if (it != m_pendingTextureRequests.end()) { diff --git a/targets/minecraft/server/network/ServerConnection.h b/targets/minecraft/server/network/ServerConnection.h index 1a9e73509..d0d751018 100644 --- a/targets/minecraft/server/network/ServerConnection.h +++ b/targets/minecraft/server/network/ServerConnection.h @@ -30,7 +30,7 @@ private: // 4J - When the server requests a texture, it should add it to here while // we are waiting for it - std::vector m_pendingTextureRequests; + std::vector m_pendingTextureRequests; public: MinecraftServer* server; @@ -54,9 +54,9 @@ public: void tick(); // 4J Added - bool addPendingTextureRequest(const std::wstring& textureName); - void handleTextureReceived(const std::wstring& textureName); - void handleTextureAndGeometryReceived(const std::wstring& textureName); + bool addPendingTextureRequest(const std::string& textureName); + void handleTextureReceived(const std::string& textureName); + void handleTextureAndGeometryReceived(const std::string& textureName); void handleServerSettingsChanged( std::shared_ptr packet); std::vector >* getPlayers(); diff --git a/targets/minecraft/sounds/SoundTypes.h b/targets/minecraft/sounds/SoundTypes.h index f62ca2de8..3192bb1f5 100644 --- a/targets/minecraft/sounds/SoundTypes.h +++ b/targets/minecraft/sounds/SoundTypes.h @@ -239,125 +239,125 @@ enum eMATERIALSOUND_TYPE { /* enum eSOUND_TYPE { -L"mob.chicken", -L"mob.chickenhurt", -L"mob.chickenplop", +"mob.chicken", +"mob.chickenhurt", +"mob.chickenplop", -L"mob.cow", -L"mob.cowhurt", +"mob.cow", +"mob.cowhurt", -L"mob.pig", -L"mob.pigdeath", +"mob.pig", +"mob.pigdeath", -L"mob.sheep", +"mob.sheep", -L"mob.wolf.growl", -L"mob.wolf.whine", -L"mob.wolf.panting", -L"mob.wolf.bark", -L"mob.wolf.hurt", -L"mob.wolf.death", -L"mob.wolf.shake", +"mob.wolf.growl", +"mob.wolf.whine", +"mob.wolf.panting", +"mob.wolf.bark", +"mob.wolf.hurt", +"mob.wolf.death", +"mob.wolf.shake", -L"mob.blaze.breathe", -L"mob.blaze.hit", -L"mob.blaze.death", +"mob.blaze.breathe", +"mob.blaze.hit", +"mob.blaze.death", -L"mob.ghast.moan", -L"mob.ghast.scream", -L"mob.ghast.death", -L"mob.ghast.fireball", - L"mob.ghast.charge", +"mob.ghast.moan", +"mob.ghast.scream", +"mob.ghast.death", +"mob.ghast.fireball", + "mob.ghast.charge", - L"mob.endermen.idle", - L"mob.endermen.hit", - L"mob.endermen.death", - L"mob.endermen.portal", + "mob.endermen.idle", + "mob.endermen.hit", + "mob.endermen.death", + "mob.endermen.portal", - L"mob.zombiepig.zpig", - L"mob.zombiepig.zpighurt", - L"mob.zombiepig.zpigdeath", - L"mob.zombiepig.zpigangry", + "mob.zombiepig.zpig", + "mob.zombiepig.zpighurt", + "mob.zombiepig.zpigdeath", + "mob.zombiepig.zpigangry", - L"mob.silverfish.say", - L"mob.silverfish.hit", - L"mob.silverfish.kill", - L"mob.silverfish.step", + "mob.silverfish.say", + "mob.silverfish.hit", + "mob.silverfish.kill", + "mob.silverfish.step", - L"mob.skeleton", - L"mob.skeleton.hurt", + "mob.skeleton", + "mob.skeleton.hurt", - L"mob.spider", - L"mob.spiderdeath", + "mob.spider", + "mob.spiderdeath", - L"mob.slime", - L"mob.slimeattack", + "mob.slime", + "mob.slimeattack", - L"mob.creeper", - L"mob.creeperdeath", + "mob.creeper", + "mob.creeperdeath", - L"mob.zombie", - L"mob.zombiehurt", - L"mob.zombiedeath", - L"mob.zombie.wood", - L"mob.zombie.woodbreak", - L"mob.zombie.metal", + "mob.zombie", + "mob.zombiehurt", + "mob.zombiedeath", + "mob.zombie.wood", + "mob.zombie.woodbreak", + "mob.zombie.metal", - L"mob.magmacube.big", - L"mob.magmacube.small", + "mob.magmacube.big", + "mob.magmacube.small", - L"random.bow", - L"random.bowhit", - L"random.explode", - L"random.fizz", - L"random.pop", - L"random.fuse", - L"random.drink", - L"random.eat", - L"random.burp", - L"random.splash", - L"random.click", - L"random.glass", - L"random.orb", - L"random.break", - L"random.chestopen", - L"random.chestclosed", - L"random.door_open", - L"random.door_close", + "random.bow", + "random.bowhit", + "random.explode", + "random.fizz", + "random.pop", + "random.fuse", + "random.drink", + "random.eat", + "random.burp", + "random.splash", + "random.click", + "random.glass", + "random.orb", + "random.break", + "random.chestopen", + "random.chestclosed", + "random.door_open", + "random.door_close", - L"ambient.weather.rain", - L"ambient.weather.thunder", + "ambient.weather.rain", + "ambient.weather.thunder", - L"ambient.cave.cave", + "ambient.cave.cave", - L"portal.portal", + "portal.portal", - L"fire.ignite", - L"fire.fire", + "fire.ignite", + "fire.fire", - L"damage.hurtflesh", - L"damage.fallsmall", - L"damage.fallbig", + "damage.hurtflesh", + "damage.fallsmall", + "damage.fallbig", - L"note.harp", - L"note.bd", - L"note.snare", - L"note.hat", - L"note.bassattack", + "note.harp", + "note.bd", + "note.snare", + "note.hat", + "note.bassattack", - L"tile.piston.in", - L"tile.piston.out", + "tile.piston.in", + "tile.piston.out", - L"liquid.water", - L"liquid.lavapop", - L"liquid.lava", + "liquid.water", + "liquid.lavapop", + "liquid.lava", - L"step.stone", - L"step.wood", - L"step.gravel", - L"step.grass", - L"step.metal", - L"step.cloth", - L"step.sand", + "step.stone", + "step.wood", + "step.gravel", + "step.grass", + "step.metal", + "step.cloth", + "step.sand", };*/ \ No newline at end of file diff --git a/targets/minecraft/stats/Achievement.cpp b/targets/minecraft/stats/Achievement.cpp index 6643d2e1f..774b02595 100644 --- a/targets/minecraft/stats/Achievement.cpp +++ b/targets/minecraft/stats/Achievement.cpp @@ -48,35 +48,35 @@ void Achievement::_init() { * @param icon Item used as the achievement icon * @param prerequisite Achievement object that is required to unlock this one */ -Achievement::Achievement(int id, const std::wstring& name, int x, int y, +Achievement::Achievement(int id, const std::string& name, int x, int y, Item* icon, Achievement* prerequisite) : Stat(Achievements::ACHIEVEMENT_OFFSET + id, - I18n::get(std::wstring(L"achievement.").append(name))), + I18n::get(std::string("achievement.").append(name))), desc(I18n::get( - std::wstring(L"achievement.").append(name).append(L".desc"))), + std::string("achievement.").append(name).append(".desc"))), icon(new ItemInstance(icon)), x(x), y(y), prerequisite(prerequisite) {} -Achievement::Achievement(int id, const std::wstring& name, int x, int y, +Achievement::Achievement(int id, const std::string& name, int x, int y, Tile* icon, Achievement* prerequisite) : Stat(Achievements::ACHIEVEMENT_OFFSET + id, - I18n::get(std::wstring(L"achievement.").append(name))), + I18n::get(std::string("achievement.").append(name))), desc(I18n::get( - std::wstring(L"achievement.").append(name).append(L".desc"))), + std::string("achievement.").append(name).append(".desc"))), icon(new ItemInstance(icon)), x(x), y(y), prerequisite(prerequisite) {} -Achievement::Achievement(int id, const std::wstring& name, int x, int y, +Achievement::Achievement(int id, const std::string& name, int x, int y, std::shared_ptr icon, Achievement* prerequisite) : Stat(Achievements::ACHIEVEMENT_OFFSET + id, - I18n::get(std::wstring(L"achievement.").append(name))), + I18n::get(std::string("achievement.").append(name))), desc(I18n::get( - std::wstring(L"achievement.").append(name).append(L".desc"))), + std::string("achievement.").append(name).append(".desc"))), icon(icon), x(x), y(y), @@ -125,9 +125,9 @@ bool Achievement::isAchievement() { return true; } /** * @brief Gets the description of an Achivement according to it's DescFormatter' - * @return wstring + * @return string **/ -std::wstring Achievement::getDescription() { +std::string Achievement::getDescription() { if (descFormatter != nullptr) { return descFormatter->format(desc); } diff --git a/targets/minecraft/stats/Achievement.h b/targets/minecraft/stats/Achievement.h index 913b93886..039d1cb2b 100644 --- a/targets/minecraft/stats/Achievement.h +++ b/targets/minecraft/stats/Achievement.h @@ -16,7 +16,7 @@ public: Achievement* prerequisite; private: - const std::wstring desc; + const std::string desc; DescFormatter* descFormatter; public: @@ -27,18 +27,18 @@ private: void _init(); public: - Achievement(int id, const std::wstring& name, int x, int y, Item* icon, + Achievement(int id, const std::string& name, int x, int y, Item* icon, Achievement* prerequisite); - Achievement(int id, const std::wstring& name, int x, int y, Tile* icon, + Achievement(int id, const std::string& name, int x, int y, Tile* icon, Achievement* prerequisite); - Achievement(int id, const std::wstring& name, int x, int y, + Achievement(int id, const std::string& name, int x, int y, std::shared_ptr icon, Achievement* prerequisite); Achievement* setAwardLocallyOnly(); Achievement* setGolden(); Achievement* postConstruct(); bool isAchievement(); - std::wstring getDescription(); + std::string getDescription(); Achievement* setDescFormatter(DescFormatter* descFormatter); bool isGolden(); int getAchievementID(); diff --git a/targets/minecraft/stats/Achievements.cpp b/targets/minecraft/stats/Achievements.cpp index 8804318de..767edebbc 100644 --- a/targets/minecraft/stats/Achievements.cpp +++ b/targets/minecraft/stats/Achievements.cpp @@ -95,69 +95,69 @@ Achievement* Achievements::lionTamer = nullptr; void Achievements::staticCtor() { Achievements::openInventory = - (new Achievement(eAward_TakingInventory, L"openInventory", 0, 0, + (new Achievement(eAward_TakingInventory, "openInventory", 0, 0, Item::book, nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::mineWood = - (new Achievement(eAward_GettingWood, L"mineWood", 2, 1, Tile::treeTrunk, + (new Achievement(eAward_GettingWood, "mineWood", 2, 1, Tile::treeTrunk, (Achievement*)openInventory)) ->postConstruct(); Achievements::buildWorkbench = - (new Achievement(eAward_Benchmarking, L"buildWorkBench", 4, -1, + (new Achievement(eAward_Benchmarking, "buildWorkBench", 4, -1, Tile::workBench, (Achievement*)mineWood)) ->postConstruct(); Achievements::buildPickaxe = - (new Achievement(eAward_TimeToMine, L"buildPickaxe", 4, 2, + (new Achievement(eAward_TimeToMine, "buildPickaxe", 4, 2, Item::pickAxe_wood, (Achievement*)buildWorkbench)) ->postConstruct(); Achievements::buildFurnace = - (new Achievement(eAward_HotTopic, L"buildFurnace", 3, 4, + (new Achievement(eAward_HotTopic, "buildFurnace", 3, 4, Tile::furnace_lit, (Achievement*)buildPickaxe)) ->postConstruct(); Achievements::acquireIron = - (new Achievement(eAward_AquireHardware, L"acquireIron", 1, 4, + (new Achievement(eAward_AquireHardware, "acquireIron", 1, 4, Item::ironIngot, (Achievement*)buildFurnace)) ->postConstruct(); Achievements::buildHoe = - (new Achievement(eAward_TimeToFarm, L"buildHoe", 2, -3, Item::hoe_wood, + (new Achievement(eAward_TimeToFarm, "buildHoe", 2, -3, Item::hoe_wood, (Achievement*)buildWorkbench)) ->postConstruct(); Achievements::makeBread = - (new Achievement(eAward_BakeBread, L"makeBread", -1, -3, Item::bread, + (new Achievement(eAward_BakeBread, "makeBread", -1, -3, Item::bread, (Achievement*)buildHoe)) ->postConstruct(); Achievements::bakeCake = - (new Achievement(eAward_TheLie, L"bakeCake", 0, -5, Item::cake, + (new Achievement(eAward_TheLie, "bakeCake", 0, -5, Item::cake, (Achievement*)buildHoe)) ->postConstruct(); Achievements::buildBetterPickaxe = - (new Achievement(eAward_GettingAnUpgrade, L"buildBetterPickaxe", 6, 2, + (new Achievement(eAward_GettingAnUpgrade, "buildBetterPickaxe", 6, 2, Item::pickAxe_stone, (Achievement*)buildPickaxe)) ->postConstruct(); Achievements::cookFish = - (new Achievement(eAward_DeliciousFish, L"cookFish", 2, 6, + (new Achievement(eAward_DeliciousFish, "cookFish", 2, 6, Item::fish_cooked, (Achievement*)buildFurnace)) ->postConstruct(); Achievements::onARail = - (new Achievement(eAward_OnARail, L"onARail", 2, 3, Tile::rail, + (new Achievement(eAward_OnARail, "onARail", 2, 3, Tile::rail, (Achievement*)acquireIron)) ->setGolden() ->postConstruct(); Achievements::buildSword = - (new Achievement(eAward_TimeToStrike, L"buildSword", 6, -1, + (new Achievement(eAward_TimeToStrike, "buildSword", 6, -1, Item::sword_wood, (Achievement*)buildWorkbench)) ->postConstruct(); Achievements::killEnemy = - (new Achievement(eAward_MonsterHunter, L"killEnemy", 8, -1, Item::bone, + (new Achievement(eAward_MonsterHunter, "killEnemy", 8, -1, Item::bone, (Achievement*)buildSword)) ->postConstruct(); Achievements::killCow = - (new Achievement(eAward_CowTipper, L"killCow", 7, -3, Item::leather, + (new Achievement(eAward_CowTipper, "killCow", 7, -3, Item::leather, (Achievement*)buildSword)) ->postConstruct(); Achievements::flyPig = - (new Achievement(eAward_WhenPigsFly, L"flyPig", 8, -4, Item::saddle, + (new Achievement(eAward_WhenPigsFly, "flyPig", 8, -4, Item::saddle, (Achievement*)killCow)) ->setGolden() ->postConstruct(); @@ -169,58 +169,58 @@ void Achievements::staticCtor() { // 4J : WESTY : Added new achievements. Note, params "x", "y", "icon" and // "requires" are ignored on xbox. Achievements::leaderOfThePack = - (new Achievement(eAward_LeaderOfThePack, L"leaderOfThePack", 0, 0, + (new Achievement(eAward_LeaderOfThePack, "leaderOfThePack", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::MOARTools = - (new Achievement(eAward_MOARTools, L"MOARTools", 0, 0, Tile::treeTrunk, + (new Achievement(eAward_MOARTools, "MOARTools", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::dispenseWithThis = - (new Achievement(eAward_DispenseWithThis, L"dispenseWithThis", 0, 0, + (new Achievement(eAward_DispenseWithThis, "dispenseWithThis", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->postConstruct(); Achievements::InToTheNether = - (new Achievement(eAward_InToTheNether, L"InToTheNether", 0, 0, + (new Achievement(eAward_InToTheNether, "InToTheNether", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->postConstruct(); // 4J : WESTY : Added other awards. Achievements::mine100Blocks = - (new Achievement(eAward_mine100Blocks, L"mine100Blocks", 0, 0, + (new Achievement(eAward_mine100Blocks, "mine100Blocks", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::kill10Creepers = - (new Achievement(eAward_kill10Creepers, L"kill10Creepers", 0, 0, + (new Achievement(eAward_kill10Creepers, "kill10Creepers", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); #if defined(_EXTENDED_ACHIEVEMENTS) Achievements::eatPorkChop = - (new Achievement(eAward_eatPorkChop, L"eatPorkChop", 0, 0, + (new Achievement(eAward_eatPorkChop, "eatPorkChop", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); #else Achievements::eatPorkChop = - (new Achievement(eAward_eatPorkChop, L"eatPorkChop", 0, 0, + (new Achievement(eAward_eatPorkChop, "eatPorkChop", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->postConstruct(); #endif Achievements::play100Days = - (new Achievement(eAward_play100Days, L"play100Days", 0, 0, + (new Achievement(eAward_play100Days, "play100Days", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::arrowKillCreeper = - (new Achievement(eAward_arrowKillCreeper, L"arrowKillCreeper", 0, 0, + (new Achievement(eAward_arrowKillCreeper, "arrowKillCreeper", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->postConstruct(); Achievements::socialPost = - (new Achievement(eAward_socialPost, L"socialPost", 0, 0, + (new Achievement(eAward_socialPost, "socialPost", 0, 0, Tile::treeTrunk, (Achievement*)buildSword)) ->postConstruct(); @@ -235,146 +235,146 @@ void Achievements::staticCtor() { // 4J Stu - This achievment added in 1.8.2, but does not map to any Xbox // achievements Achievements::snipeSkeleton = - (new Achievement(eAward_snipeSkeleton, L"snipeSkeleton", 7, 0, + (new Achievement(eAward_snipeSkeleton, "snipeSkeleton", 7, 0, Item::bow, (Achievement*)killEnemy)) ->setGolden() ->postConstruct(); // 4J Stu - These added in 1.0.1, but do not map to any Xbox achievements Achievements::diamonds = - (new Achievement(eAward_diamonds, L"diamonds", -1, 5, Item::diamond, + (new Achievement(eAward_diamonds, "diamonds", -1, 5, Item::diamond, (Achievement*)acquireIron)) ->postConstruct(); // Achievements::portal = (new - // Achievement(eAward_portal, L"portal", + // Achievement(eAward_portal, "portal", // -1, 7, Tile::obsidian, (Achievement *)diamonds) // )->postConstruct(); Achievements::ghast = - (new Achievement(eAward_ghast, L"ghast", -4, 8, Item::ghastTear, + (new Achievement(eAward_ghast, "ghast", -4, 8, Item::ghastTear, (Achievement*)ghast)) ->setGolden() ->postConstruct(); Achievements::blazeRod = - (new Achievement(eAward_blazeRod, L"blazeRod", 0, 9, Item::blazeRod, + (new Achievement(eAward_blazeRod, "blazeRod", 0, 9, Item::blazeRod, (Achievement*)blazeRod)) ->postConstruct(); - Achievements::potion = (new Achievement(eAward_potion, L"potion", 2, 8, + Achievements::potion = (new Achievement(eAward_potion, "potion", 2, 8, Item::potion, (Achievement*)potion)) ->postConstruct(); Achievements::theEnd = - (new Achievement(eAward_theEnd, L"theEnd", 3, 10, Item::eyeOfEnder, + (new Achievement(eAward_theEnd, "theEnd", 3, 10, Item::eyeOfEnder, (Achievement*)theEnd)) ->setGolden() ->postConstruct(); Achievements::winGame = - (new Achievement(eAward_winGame, L"theEnd2", 4, 13, Tile::dragonEgg, + (new Achievement(eAward_winGame, "theEnd2", 4, 13, Tile::dragonEgg, (Achievement*)winGame)) ->setGolden() ->postConstruct(); Achievements::enchantments = - (new Achievement(eAward_enchantments, L"enchantments", -4, 4, + (new Achievement(eAward_enchantments, "enchantments", -4, 4, Tile::enchantTable, (Achievement*)enchantments)) ->postConstruct(); // Achievements::overkill = (new - // Achievement(eAward_overkill, L"overkill", + // Achievement(eAward_overkill, "overkill", // -4, 1, Item::sword_diamond, (Achievement *)enchantments) // )->setGolden()->postConstruct(); Achievements::bookcase // = (new Achievement(eAward_bookcase, - // L"bookcase", -3, 6, Tile::bookshelf, + // "bookcase", -3, 6, Tile::bookshelf, // (Achievement *)enchantments) )->postConstruct(); #if defined(_EXTENDED_ACHIEVEMENTS) Achievements::overkill = - (new Achievement(eAward_overkill, L"overkill", -4, 1, + (new Achievement(eAward_overkill, "overkill", -4, 1, Item::sword_diamond, (Achievement*)enchantments)) ->setGolden() ->postConstruct(); Achievements::bookcase = - (new Achievement(eAward_bookcase, L"bookcase", -3, 6, Tile::bookshelf, + (new Achievement(eAward_bookcase, "bookcase", -3, 6, Tile::bookshelf, (Achievement*)enchantments)) ->postConstruct(); Achievements::adventuringTime = - (new Achievement(eAward_adventuringTime, L"adventuringTime", 0, 0, + (new Achievement(eAward_adventuringTime, "adventuringTime", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::repopulation = - (new Achievement(eAward_repopulation, L"repopulation", 0, 0, + (new Achievement(eAward_repopulation, "repopulation", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); // Achievements::porkChoop // // // // // // // Achievements::diamondsToYou = - (new Achievement(eAward_diamondsToYou, L"diamondsToYou", 0, 0, + (new Achievement(eAward_diamondsToYou, "diamondsToYou", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); // Achievements::passingTheTime = (new - // Achievement(eAward_play100Days, L"passingTheTime", + // Achievement(eAward_play100Days, "passingTheTime", // 0,0, Tile::bookshelf, (Achievement*) nullptr) // )->postConstruct(); Achievements::archer = (new - // Achievement(eAward_arrowKillCreeper, L"archer", + // Achievement(eAward_arrowKillCreeper, "archer", // 0,0, Tile::bookshelf, (Achievement*) nullptr) // )->postConstruct(); Achievements::theHaggler = - (new Achievement(eAward_theHaggler, L"theHaggler", 0, 0, + (new Achievement(eAward_theHaggler, "theHaggler", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::potPlanter = - (new Achievement(eAward_potPlanter, L"potPlanter", 0, 0, + (new Achievement(eAward_potPlanter, "potPlanter", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::itsASign = - (new Achievement(eAward_itsASign, L"itsASign", 0, 0, Tile::bookshelf, + (new Achievement(eAward_itsASign, "itsASign", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::ironBelly = - (new Achievement(eAward_ironBelly, L"ironBelly", 0, 0, Tile::bookshelf, + (new Achievement(eAward_ironBelly, "ironBelly", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::haveAShearfulDay = - (new Achievement(eAward_haveAShearfulDay, L"haveAShearfulDay", 0, 0, + (new Achievement(eAward_haveAShearfulDay, "haveAShearfulDay", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::rainbowCollection = - (new Achievement(eAward_rainbowCollection, L"rainbowCollection", 0, 0, + (new Achievement(eAward_rainbowCollection, "rainbowCollection", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::stayinFrosty = - (new Achievement(eAward_stayinFrosty, L"stayingFrosty", 0, 0, + (new Achievement(eAward_stayinFrosty, "stayingFrosty", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::chestfulOfCobblestone = - (new Achievement(eAward_chestfulOfCobblestone, L"chestfulOfCobblestone", + (new Achievement(eAward_chestfulOfCobblestone, "chestfulOfCobblestone", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->setAwardLocallyOnly() ->postConstruct(); Achievements::renewableEnergy = - (new Achievement(eAward_renewableEnergy, L"renewableEnergy", 0, 0, + (new Achievement(eAward_renewableEnergy, "renewableEnergy", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::musicToMyEars = - (new Achievement(eAward_musicToMyEars, L"musicToMyEars", 0, 0, + (new Achievement(eAward_musicToMyEars, "musicToMyEars", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::bodyGuard = - (new Achievement(eAward_bodyGuard, L"bodyGuard", 0, 0, Tile::bookshelf, + (new Achievement(eAward_bodyGuard, "bodyGuard", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::ironMan = - (new Achievement(eAward_ironMan, L"ironMan", 0, 0, Tile::bookshelf, + (new Achievement(eAward_ironMan, "ironMan", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::zombieDoctor = - (new Achievement(eAward_zombieDoctor, L"zombieDoctor", 0, 0, + (new Achievement(eAward_zombieDoctor, "zombieDoctor", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); Achievements::lionTamer = - (new Achievement(eAward_lionTamer, L"lionTamer", 0, 0, Tile::bookshelf, + (new Achievement(eAward_lionTamer, "lionTamer", 0, 0, Tile::bookshelf, (Achievement*)nullptr)) ->postConstruct(); #endif diff --git a/targets/minecraft/stats/DescFormatter.h b/targets/minecraft/stats/DescFormatter.h index bd71d319e..1e75cba2c 100644 --- a/targets/minecraft/stats/DescFormatter.h +++ b/targets/minecraft/stats/DescFormatter.h @@ -3,5 +3,5 @@ class DescFormatter { public: virtual ~DescFormatter() = default; - virtual std::wstring format(const std::wstring& i18nValue) = 0; + virtual std::string format(const std::string& i18nValue) = 0; }; diff --git a/targets/minecraft/stats/DurangoStats.h b/targets/minecraft/stats/DurangoStats.h index b911c2fd3..baa3e524c 100644 --- a/targets/minecraft/stats/DurangoStats.h +++ b/targets/minecraft/stats/DurangoStats.h @@ -34,7 +34,7 @@ public: int methodId, itemId, itemAux, itemCount; } Param; - DsItemEvent(int id, const std::wstring& name); + DsItemEvent(int id, const std::string& name); bool onLeaderboard(ELeaderboardId leaderboard, eAcquisitionMethod methodId, Param* param); @@ -54,7 +54,7 @@ public: static const int SPIDER_JOCKEY_ID = 49; - DsMobKilled(int id, const std::wstring& name); + DsMobKilled(int id, const std::string& name); typedef struct { bool isRanged; @@ -81,7 +81,7 @@ public: eInteract_Sheared }; - DsMobInteract(int id, const std::wstring& name); + DsMobInteract(int id, const std::string& name); typedef struct { int interactionType, mobId; @@ -112,7 +112,7 @@ public: static unsigned int CACHE_SIZES[eMethod_MAX]; - DsTravel(int id, const std::wstring& name); + DsTravel(int id, const std::string& name); typedef struct { eMethod method; @@ -132,7 +132,7 @@ protected: class DsItemUsed : public Stat { public: - DsItemUsed(int id, const std::wstring& name); + DsItemUsed(int id, const std::string& name); typedef struct { int itemId, aux, count, health, hunger; } Param; @@ -144,7 +144,7 @@ public: class DsAchievement : public Stat { public: - DsAchievement(int id, const std::wstring& name); + DsAchievement(int id, const std::string& name); virtual void handleParamBlob(std::shared_ptr plr, std::vector& paramBlob); @@ -163,7 +163,7 @@ public: class DsChangedDimension : public Stat { public: - DsChangedDimension(int id, const std::wstring& name); + DsChangedDimension(int id, const std::string& name); typedef struct { int fromDimId, toDimId; } Param; @@ -174,7 +174,7 @@ public: class DsEnteredBiome : public Stat { public: - DsEnteredBiome(int id, const std::wstring& name); + DsEnteredBiome(int id, const std::string& name); typedef struct { int biomeId; } Param; @@ -327,10 +327,10 @@ public: static LPCGUID getPlayerSession(); static void setMultiplayerCorrelationId(Platform::String ^ mpcId); - static const wchar_t* getMultiplayerCorrelationId(); + static const char* getMultiplayerCorrelationId(); - static const wchar_t* getUserId(std::shared_ptr plr); - static const wchar_t* getUserId(int iPad); + static const char* getUserId(std::shared_ptr plr); + static const char* getUserId(int iPad); static void playerSessionStart(PlayerUID, std::shared_ptr); static void playerSessionStart(int iPad); diff --git a/targets/minecraft/stats/GeneralStat.cpp b/targets/minecraft/stats/GeneralStat.cpp index 76bf3edfb..0af752f4e 100644 --- a/targets/minecraft/stats/GeneralStat.cpp +++ b/targets/minecraft/stats/GeneralStat.cpp @@ -7,11 +7,11 @@ class StatFormatter; -GeneralStat::GeneralStat(int id, const std::wstring& name, +GeneralStat::GeneralStat(int id, const std::string& name, StatFormatter* formatter) : Stat(id, name, formatter) {} -GeneralStat::GeneralStat(int id, const std::wstring& name) : Stat(id, name) {} +GeneralStat::GeneralStat(int id, const std::string& name) : Stat(id, name) {} Stat* GeneralStat::postConstruct() { Stat::postConstruct(); diff --git a/targets/minecraft/stats/GeneralStat.h b/targets/minecraft/stats/GeneralStat.h index 70b9667ec..e59155488 100644 --- a/targets/minecraft/stats/GeneralStat.h +++ b/targets/minecraft/stats/GeneralStat.h @@ -8,7 +8,7 @@ class StatFormatter; class GeneralStat : public Stat { public: - GeneralStat(int id, const std::wstring& name, StatFormatter* formatter); - GeneralStat(int id, const std::wstring& name); + GeneralStat(int id, const std::string& name, StatFormatter* formatter); + GeneralStat(int id, const std::string& name); Stat* postConstruct(); }; diff --git a/targets/minecraft/stats/ItemStat.cpp b/targets/minecraft/stats/ItemStat.cpp index e07847ca3..10306521e 100644 --- a/targets/minecraft/stats/ItemStat.cpp +++ b/targets/minecraft/stats/ItemStat.cpp @@ -2,7 +2,7 @@ #include "minecraft/stats/Stat.h" -ItemStat::ItemStat(int id, const std::wstring& name, int itemId) +ItemStat::ItemStat(int id, const std::string& name, int itemId) : Stat(id, name), itemId(itemId) {} int ItemStat::getItemId() { return itemId; } diff --git a/targets/minecraft/stats/ItemStat.h b/targets/minecraft/stats/ItemStat.h index 1b75426fc..cdaf5b06a 100644 --- a/targets/minecraft/stats/ItemStat.h +++ b/targets/minecraft/stats/ItemStat.h @@ -9,6 +9,6 @@ private: const int itemId; public: - ItemStat(int id, const std::wstring& name, int itemId); + ItemStat(int id, const std::string& name, int itemId); int getItemId(); }; diff --git a/targets/minecraft/stats/NumberFormatters.h b/targets/minecraft/stats/NumberFormatters.h index 7151096af..3547dd13b 100644 --- a/targets/minecraft/stats/NumberFormatters.h +++ b/targets/minecraft/stats/NumberFormatters.h @@ -6,29 +6,29 @@ // going for a constant format here class NumberFormat { public: - static std::wstring format(int value) { + static std::string format(int value) { // TODO 4J Stu - Change the length of the formatted number - wchar_t output[256]; - swprintf(output, 256, L"%d", value); - std::wstring result = std::wstring(output); + char output[256]; + snprintf(output, 256, "%d", value); + std::string result = std::string(output); return result; } }; class DecimalFormat { private: - const std::wstring formatString; + const std::string formatString; public: - std::wstring format(double value) { + std::string format(double value) { // TODO 4J Stu - Change the length of the formatted number - wchar_t output[256]; - swprintf(output, 256, formatString.c_str(), value); - std::wstring result = std::wstring(output); + char output[256]; + snprintf(output, 256, formatString.c_str(), value); + std::string result = std::string(output); return result; } // 4J Stu - The java code took a string format, we take a printf format // string - DecimalFormat(std::wstring x) : formatString(x) {}; + DecimalFormat(std::string x) : formatString(x) {}; }; \ No newline at end of file diff --git a/targets/minecraft/stats/Stat.cpp b/targets/minecraft/stats/Stat.cpp index 0df732e05..9baeec673 100644 --- a/targets/minecraft/stats/Stat.cpp +++ b/targets/minecraft/stats/Stat.cpp @@ -14,16 +14,16 @@ Stat::TimeFormatter* Stat::timeFormatter = new TimeFormatter(); Stat::DistanceFormatter* Stat::distanceFormatter = new DistanceFormatter(); // 4J Stu - Changed this to take in a printf format string instead -DecimalFormat* Stat::decimalFormat = new DecimalFormat(L"%0(3).2f"); +DecimalFormat* Stat::decimalFormat = new DecimalFormat("%0(3).2f"); void Stat::_init() { awardLocallyOnly = false; } -Stat::Stat(int id, const std::wstring& name, StatFormatter* formatter) +Stat::Stat(int id, const std::string& name, StatFormatter* formatter) : id(id), name(name), formatter(formatter) { _init(); } -Stat::Stat(int id, const std::wstring& name) +Stat::Stat(int id, const std::string& name) : id(id), name(name), formatter(defaultFormatter) { _init(); } @@ -50,13 +50,13 @@ Stat* Stat::postConstruct() { bool Stat::isAchievement() { return false; } -std::wstring Stat::format(int value) { +std::string Stat::format(int value) { return ((StatFormatter*)formatter)->format(value); } -std::wstring Stat::toString() { return name; } +std::string Stat::toString() { return name; } -std::wstring Stat::TimeFormatter::format(int value) { +std::string Stat::TimeFormatter::format(int value) { double seconds = value / 20.0; double minutes = seconds / 60.0; double hours = minutes / 60.0; @@ -64,31 +64,31 @@ std::wstring Stat::TimeFormatter::format(int value) { double years = days / 365.0; if (years > 0.5) { - return decimalFormat->format(years) + L" y"; + return decimalFormat->format(years) + " y"; } else if (days > 0.5) { - return decimalFormat->format(days) + L" d"; + return decimalFormat->format(days) + " d"; } else if (hours > 0.5) { - return decimalFormat->format(hours) + L" h"; + return decimalFormat->format(hours) + " h"; } else if (minutes > 0.5) { - return decimalFormat->format(minutes) + L" m"; + return decimalFormat->format(minutes) + " m"; } - return toWString(seconds) + L" s"; + return toWString(seconds) + " s"; } -std::wstring Stat::DefaultFormat::format(int value) { +std::string Stat::DefaultFormat::format(int value) { return NumberFormat::format(value); // numberFormat->format(value); } -std::wstring Stat::DistanceFormatter::format(int cm) { +std::string Stat::DistanceFormatter::format(int cm) { double meters = cm / 100.0; double kilometers = meters / 1000.0; if (kilometers > 0.5) { - return decimalFormat->format(kilometers) + L" km"; + return decimalFormat->format(kilometers) + " km"; } else if (meters > 0.5) { - return decimalFormat->format(meters) + L" m"; + return decimalFormat->format(meters) + " m"; } - return toWString(cm) + L" cm"; + return toWString(cm) + " cm"; } diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h index a17acf774..e7ef7339e 100644 --- a/targets/minecraft/stats/Stat.h +++ b/targets/minecraft/stats/Stat.h @@ -18,7 +18,7 @@ class LocalPlayer; class Stat { public: const int id; - const std::wstring name; + const std::string name; bool awardLocallyOnly; private: @@ -26,13 +26,13 @@ private: void _init(); public: - Stat(int id, const std::wstring& name, StatFormatter* formatter); - Stat(int id, const std::wstring& name); + Stat(int id, const std::string& name, StatFormatter* formatter); + Stat(int id, const std::string& name); Stat* setAwardLocallyOnly(); virtual Stat* postConstruct(); virtual bool isAchievement(); - std::wstring format(int value); + std::string format(int value); private: // static NumberFormat *numberFormat; @@ -40,7 +40,7 @@ private: public: class DefaultFormat : public StatFormatter { public: - std::wstring format(int value); + std::string format(int value); } static* defaultFormatter; private: @@ -49,15 +49,15 @@ private: public: class TimeFormatter : public StatFormatter { public: - std::wstring format(int value); + std::string format(int value); } static* timeFormatter; class DistanceFormatter : public StatFormatter { public: - std::wstring format(int cm); + std::string format(int cm); } static* distanceFormatter; - std::wstring toString(); + std::string toString(); public: // 4J-JEV, for Durango stats diff --git a/targets/minecraft/stats/StatFormatter.h b/targets/minecraft/stats/StatFormatter.h index b69b1c242..f5df7b707 100644 --- a/targets/minecraft/stats/StatFormatter.h +++ b/targets/minecraft/stats/StatFormatter.h @@ -2,5 +2,5 @@ class StatFormatter { public: - virtual std::wstring format(int value) = 0; + virtual std::string format(int value) = 0; }; diff --git a/targets/minecraft/stats/Stats.cpp b/targets/minecraft/stats/Stats.cpp index b2edc48ac..804d6a6b2 100644 --- a/targets/minecraft/stats/Stats.cpp +++ b/targets/minecraft/stats/Stats.cpp @@ -80,70 +80,70 @@ Stat* Stats::completeTheEnd = // present when the Enderdragon has died void Stats::staticCtor() { - Stats::walkOneM = (new GeneralStat(2000, L"stat.walkOneM", + Stats::walkOneM = (new GeneralStat(2000, "stat.walkOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); - Stats::swimOneM = (new GeneralStat(2001, L"stat.swimOneM", + Stats::swimOneM = (new GeneralStat(2001, "stat.swimOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); - Stats::fallOneM = (new GeneralStat(2002, L"stat.fallOneM", + Stats::fallOneM = (new GeneralStat(2002, "stat.fallOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); Stats::climbOneM = - (new GeneralStat(2003, L"stat.climbOneM", + (new GeneralStat(2003, "stat.climbOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); Stats::minecartOneM = - (new GeneralStat(2004, L"stat.minecartOneM", + (new GeneralStat(2004, "stat.minecartOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); - Stats::boatOneM = (new GeneralStat(2005, L"stat.boatOneM", + Stats::boatOneM = (new GeneralStat(2005, "stat.boatOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); - Stats::pigOneM = (new GeneralStat(2006, L"stat.pigOneM", + Stats::pigOneM = (new GeneralStat(2006, "stat.pigOneM", (StatFormatter*)Stat::distanceFormatter)) ->setAwardLocallyOnly() ->postConstruct(); Stats::portalsCreated = - (new GeneralStat(2007, L"stat.portalsUsed"))->postConstruct(); + (new GeneralStat(2007, "stat.portalsUsed"))->postConstruct(); Stats::cowsMilked = - (new GeneralStat(2008, L"stat.cowsMilked"))->postConstruct(); + (new GeneralStat(2008, "stat.cowsMilked"))->postConstruct(); Stats::netherLavaCollected = - (new GeneralStat(2009, L"stat.netherLavaCollected"))->postConstruct(); + (new GeneralStat(2009, "stat.netherLavaCollected"))->postConstruct(); Stats::killsZombie = - (new GeneralStat(2010, L"stat.killsZombie"))->postConstruct(); + (new GeneralStat(2010, "stat.killsZombie"))->postConstruct(); Stats::killsSkeleton = - (new GeneralStat(2011, L"stat.killsSkeleton"))->postConstruct(); + (new GeneralStat(2011, "stat.killsSkeleton"))->postConstruct(); Stats::killsCreeper = - (new GeneralStat(2012, L"stat.killsCreeper"))->postConstruct(); + (new GeneralStat(2012, "stat.killsCreeper"))->postConstruct(); Stats::killsSpider = - (new GeneralStat(2013, L"stat.killsSpider"))->postConstruct(); + (new GeneralStat(2013, "stat.killsSpider"))->postConstruct(); Stats::killsSpiderJockey = - (new GeneralStat(2014, L"stat.killsSpiderJockey"))->postConstruct(); + (new GeneralStat(2014, "stat.killsSpiderJockey"))->postConstruct(); Stats::killsZombiePigman = - (new GeneralStat(2015, L"stat.killsZombiePigman"))->postConstruct(); + (new GeneralStat(2015, "stat.killsZombiePigman"))->postConstruct(); Stats::killsSlime = - (new GeneralStat(2016, L"stat.killsSlime"))->postConstruct(); + (new GeneralStat(2016, "stat.killsSlime"))->postConstruct(); Stats::killsGhast = - (new GeneralStat(2017, L"stat.killsGhast"))->postConstruct(); + (new GeneralStat(2017, "stat.killsGhast"))->postConstruct(); Stats::killsNetherZombiePigman = - (new GeneralStat(2018, L"stat.killsNetherZombiePigman")) + (new GeneralStat(2018, "stat.killsNetherZombiePigman")) ->postConstruct(); // 4J : WESTY : Added for new achievements. Stats::befriendsWolf = - (new GeneralStat(2019, L"stat.befriendsWolf"))->postConstruct(); + (new GeneralStat(2019, "stat.befriendsWolf"))->postConstruct(); Stats::totalBlocksMined = - (new GeneralStat(2020, L"stat.totalBlocksMined"))->postConstruct(); + (new GeneralStat(2020, "stat.totalBlocksMined"))->postConstruct(); // 4J-PB - don't want the time played going to the server - Stats::timePlayed = (new GeneralStat(2021, L"stat.timePlayed")) + Stats::timePlayed = (new GeneralStat(2021, "stat.timePlayed")) ->setAwardLocallyOnly() ->postConstruct(); @@ -171,7 +171,7 @@ bool Stats::blockStatsLoaded = false; void Stats::buildBlockStats() { blocksMined = std::vector(32000); - ItemStat* newStat = new ItemStat(BLOCKS_MINED_OFFSET + 0, L"mineBlock.dirt", + ItemStat* newStat = new ItemStat(BLOCKS_MINED_OFFSET + 0, "mineBlock.dirt", Tile::dirt->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::dirt->id] = newStat; @@ -179,98 +179,98 @@ void Stats::buildBlockStats() { blocksMined[Tile::farmland->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 1, L"mineBlock.stone", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 1, "mineBlock.stone", Tile::cobblestone->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::cobblestone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 2, L"mineBlock.sand", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 2, "mineBlock.sand", Tile::sand->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::sand->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 3, L"mineBlock.cobblestone", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 3, "mineBlock.cobblestone", Tile::stone->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::stone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 4, L"mineBlock.gravel", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 4, "mineBlock.gravel", Tile::gravel->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::gravel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 5, L"mineBlock.clay", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 5, "mineBlock.clay", Tile::clay->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::clay->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 6, L"mineBlock.obsidian", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 6, "mineBlock.obsidian", Tile::obsidian->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::obsidian->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 7, L"mineBlock.coal", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 7, "mineBlock.coal", Tile::coalOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::coalOre->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 8, L"mineBlock.iron", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 8, "mineBlock.iron", Tile::ironOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::ironOre->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 9, L"mineBlock.gold", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 9, "mineBlock.gold", Tile::goldOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::goldOre->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 10, L"mineBlock.diamond", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 10, "mineBlock.diamond", Tile::diamondOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::diamondOre->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 11, L"mineBlock.redstone", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 11, "mineBlock.redstone", Tile::redStoneOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::redStoneOre->id] = newStat; blocksMined[Tile::redStoneOre_lit->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 12, L"mineBlock.lapisLazuli", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 12, "mineBlock.lapisLazuli", Tile::lapisOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::lapisOre->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 13, L"mineBlock.netherrack", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 13, "mineBlock.netherrack", Tile::netherRack->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::netherRack->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 14, L"mineBlock.soulSand", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 14, "mineBlock.soulSand", Tile::soulsand->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::soulsand->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 15, L"mineBlock.glowstone", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 15, "mineBlock.glowstone", Tile::glowstone->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::glowstone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 16, L"mineBlock.wood", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 16, "mineBlock.wood", Tile::treeTrunk->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::treeTrunk->id] = newStat; @@ -310,7 +310,7 @@ void Stats::buildCraftableStats() { itemsCollected = std::vector(32000); ItemStat* newStat = new ItemStat(ITEMS_COLLECTED_OFFSET + 0, - L"collectItem.egg", Item::egg->id); + "collectItem.egg", Item::egg->id); itemsCollectedStats->push_back(newStat); itemsCollected[Item::egg->id] = newStat; newStat->postConstruct(); @@ -318,25 +318,25 @@ void Stats::buildCraftableStats() { // 4J Stu - The following stats were added as it was too easy to cheat the // leaderboards by dropping and picking up these items They are now changed // to mining the block which involves a tiny bit more effort - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 18, L"mineBlock.wheat", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 18, "mineBlock.wheat", Tile::wheat_Id); blocksMinedStats->push_back(newStat); blocksMined[Tile::wheat_Id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 19, L"mineBlock.mushroom1", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 19, "mineBlock.mushroom1", Tile::mushroom_brown_Id); blocksMinedStats->push_back(newStat); blocksMined[Tile::mushroom_brown_Id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(BLOCKS_MINED_OFFSET + 17, L"mineBlock.sugar", + newStat = new ItemStat(BLOCKS_MINED_OFFSET + 17, "mineBlock.sugar", Tile::reeds_Id); blocksMinedStats->push_back(newStat); blocksMined[Tile::reeds_Id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_COLLECTED_OFFSET + 4, L"collectItem.pumpkin", + newStat = new ItemStat(ITEMS_COLLECTED_OFFSET + 4, "collectItem.pumpkin", Tile::pumpkin->id); itemsCollectedStats->push_back(newStat); itemsCollected[Tile::pumpkin->id] = newStat; @@ -347,196 +347,196 @@ void Stats::buildCraftableStats() { itemsCrafted = std::vector(32000); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 0, L"craftItem.plank", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 0, "craftItem.plank", Tile::wood->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Tile::wood->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 1, L"craftItem.workbench", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 1, "craftItem.workbench", Tile::workBench->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Tile::workBench->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 2, L"craftItem.stick", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 2, "craftItem.stick", Item::stick->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::stick->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 3, L"craftItem.woodenShovel", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 3, "craftItem.woodenShovel", Item::shovel_wood->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::shovel_wood->id] = newStat; newStat->postConstruct(); // 4J : WESTY : Added for new achievements. - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 4, L"craftItem.woodenPickAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 4, "craftItem.woodenPickAxe", Item::pickAxe_wood->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::pickAxe_wood->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 5, L"craftItem.stonePickAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 5, "craftItem.stonePickAxe", Item::pickAxe_stone->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::pickAxe_stone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 6, L"craftItem.ironPickAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 6, "craftItem.ironPickAxe", Item::pickAxe_iron->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::pickAxe_iron->id] = newStat; newStat->postConstruct(); newStat = - new ItemStat(ITEMS_CRAFTED_OFFSET + 7, L"craftItem.diamondPickAxe", + new ItemStat(ITEMS_CRAFTED_OFFSET + 7, "craftItem.diamondPickAxe", Item::pickAxe_diamond->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::pickAxe_diamond->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 8, L"craftItem.goldPickAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 8, "craftItem.goldPickAxe", Item::pickAxe_gold->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::pickAxe_gold->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 9, L"craftItem.stoneShovel", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 9, "craftItem.stoneShovel", Item::shovel_stone->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::shovel_stone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 10, L"craftItem.ironShovel", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 10, "craftItem.ironShovel", Item::shovel_iron->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::shovel_iron->id] = newStat; newStat->postConstruct(); newStat = - new ItemStat(ITEMS_CRAFTED_OFFSET + 11, L"craftItem.diamondShovel", + new ItemStat(ITEMS_CRAFTED_OFFSET + 11, "craftItem.diamondShovel", Item::shovel_diamond->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::shovel_diamond->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 12, L"craftItem.goldShovel", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 12, "craftItem.goldShovel", Item::shovel_gold->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::shovel_gold->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 13, L"craftItem.woodenAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 13, "craftItem.woodenAxe", Item::hatchet_wood->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hatchet_wood->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 14, L"craftItem.stoneAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 14, "craftItem.stoneAxe", Item::hatchet_stone->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hatchet_stone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 15, L"craftItem.ironAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 15, "craftItem.ironAxe", Item::hatchet_iron->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hatchet_iron->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 16, L"craftItem.diamondAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 16, "craftItem.diamondAxe", Item::hatchet_diamond->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hatchet_diamond->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 17, L"craftItem.goldAxe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 17, "craftItem.goldAxe", Item::hatchet_gold->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hatchet_gold->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 18, L"craftItem.woodenHoe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 18, "craftItem.woodenHoe", Item::hoe_wood->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hoe_wood->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 19, L"craftItem.stoneHoe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 19, "craftItem.stoneHoe", Item::hoe_stone->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hoe_stone->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 20, L"craftItem.ironHoe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 20, "craftItem.ironHoe", Item::hoe_iron->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hoe_iron->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 21, L"craftItem.diamondHoe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 21, "craftItem.diamondHoe", Item::hoe_diamond->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hoe_diamond->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 22, L"craftItem.goldHoe", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 22, "craftItem.goldHoe", Item::hoe_gold->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::hoe_gold->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 23, L"craftItem.glowstone", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 23, "craftItem.glowstone", Tile::glowstone_Id); itemsCraftedStats->push_back(newStat); itemsCrafted[Tile::glowstone_Id] = newStat; newStat->postConstruct(); newStat = - new ItemStat(ITEMS_CRAFTED_OFFSET + 24, L"craftItem.tnt", Tile::tnt_Id); + new ItemStat(ITEMS_CRAFTED_OFFSET + 24, "craftItem.tnt", Tile::tnt_Id); itemsCraftedStats->push_back(newStat); itemsCrafted[Tile::tnt_Id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 25, L"craftItem.bowl", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 25, "craftItem.bowl", Item::bowl->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::bowl->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 26, L"craftItem.bucket", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 26, "craftItem.bucket", Item::bucket_empty->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::bucket_empty->id] = newStat; newStat->postConstruct(); newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 27, - L"craftItem.flintAndSteel", Item::flintAndSteel->id); + "craftItem.flintAndSteel", Item::flintAndSteel->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::flintAndSteel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 28, L"craftItem.fishingRod", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 28, "craftItem.fishingRod", Item::fishingRod->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::fishingRod->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 29, L"craftItem.clock", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 29, "craftItem.clock", Item::clock->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::clock->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 30, L"craftItem.compass", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 30, "craftItem.compass", Item::compass->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::compass->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 31, L"craftItem.map", + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 31, "craftItem.map", Item::map->id); itemsCraftedStats->push_back(newStat); itemsCrafted[Item::map->id] = newStat; @@ -561,28 +561,28 @@ void Stats::buildAdditionalStats() { // The number of times this player has dealt the killing blow to the // Enderdragon Stats::killsEnderdragon = - (new GeneralStat(offset++, L"stat.killsEnderdragon"))->postConstruct(); + (new GeneralStat(offset++, "stat.killsEnderdragon"))->postConstruct(); // The number of times this player has been present when the Enderdragon has // died Stats::completeTheEnd = - (new GeneralStat(offset++, L"stat.completeTheEnd"))->postConstruct(); + (new GeneralStat(offset++, "stat.completeTheEnd"))->postConstruct(); #if defined(_EXTENDED_ACHIEVEMENTS) { ItemStat* itemStat = - new ItemStat(offset++, L"craftItem.flowerPot", Item::flowerPot_Id); + new ItemStat(offset++, "craftItem.flowerPot", Item::flowerPot_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"craftItem.sign", Item::sign_Id); + itemStat = new ItemStat(offset++, "craftItem.sign", Item::sign_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); itemStat = - new ItemStat(offset++, L"mineBlock.emerald", Tile::emeraldOre_Id); + new ItemStat(offset++, "mineBlock.emerald", Tile::emeraldOre_Id); blocksMinedStats->push_back(itemStat); blocksMined[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); @@ -591,7 +591,7 @@ void Stats::buildAdditionalStats() { // stor itemsBought(emerald) so I don't have to make yet another massive // std::vector& for Items Bought. itemStat = - new ItemStat(offset++, L"itemsBought.emerald", Item::emerald_Id); + new ItemStat(offset++, "itemsBought.emerald", Item::emerald_Id); itemsCollectedStats->push_back(itemStat); itemsCollected[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); @@ -602,19 +602,19 @@ void Stats::buildAdditionalStats() { // we don't need those record items (and we only need 2). blocksPlaced = std::vector(1000); - itemStat = new ItemStat(offset++, L"blockPlaced.flowerPot", + itemStat = new ItemStat(offset++, "blockPlaced.flowerPot", Tile::flowerPot_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"blockPlaced.sign", Tile::sign_Id); + itemStat = new ItemStat(offset++, "blockPlaced.sign", Tile::sign_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); itemStat = - new ItemStat(offset++, L"blockPlaced.wallsign", Tile::wallSign_Id); + new ItemStat(offset++, "blockPlaced.wallsign", Tile::wallSign_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); @@ -624,7 +624,7 @@ void Stats::buildAdditionalStats() { rainbowCollection = std::vector(16); for (unsigned int i = 0; i < 16; i++) { generalStat = new GeneralStat( - offset++, L"rainbowCollection." + toWString(i)); + offset++, "rainbowCollection." + toWString(i)); generalStats->push_back(generalStat); rainbowCollection[i] = generalStat; generalStat->postConstruct(); @@ -633,19 +633,19 @@ void Stats::buildAdditionalStats() { biomesVisisted = std::vector(23); for (unsigned int i = 0; i < 23; i++) { generalStat = new GeneralStat( - offset++, L"biomesVisited." + toWString(i)); + offset++, "biomesVisited." + toWString(i)); generalStats->push_back(generalStat); biomesVisisted[i] = generalStat; generalStat->postConstruct(); } - itemStat = new ItemStat(offset++, L"itemCrafted.porkchop", + itemStat = new ItemStat(offset++, "itemCrafted.porkchop", Item::porkChop_cooked_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"itemEaten.porkchop", + itemStat = new ItemStat(offset++, "itemEaten.porkchop", Item::porkChop_cooked_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 7b5600d29..6f3e77bd2 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -356,7 +356,7 @@ void StatsCounter::dumpStatsToTTY() { std::vector::iterator statsEnd = Stats::all->end(); for (std::vector::iterator statsIter = Stats::all->begin(); statsIter != statsEnd; ++statsIter) { - Log::info("%ls\t\t%u\t%u\t%u\t%u\n", (*statsIter)->name.c_str(), + Log::info("%s\t\t%u\t%u\t%u\t%u\n", (*statsIter)->name.c_str(), getValue(*statsIter, 0), getValue(*statsIter, 1), getValue(*statsIter, 2), getValue(*statsIter, 3)); } diff --git a/targets/minecraft/stats/StatsSyncer.h b/targets/minecraft/stats/StatsSyncer.h index 293529a2f..4fff2e898 100644 --- a/targets/minecraft/stats/StatsSyncer.h +++ b/targets/minecraft/stats/StatsSyncer.h @@ -30,7 +30,7 @@ public: StatsSyncher(User* user, StatsCounter* statsCounter, File* dir); private: - void attemptRename(File* dir, const std::wstring& name, File* to); + void attemptRename(File* dir, const std::string& name, File* to); std::unordered_map* loadStatsFromDisk(File* file, File* tmp, File* old); std::unordered_map* loadStatsFromDisk(File* file); diff --git a/targets/minecraft/util/Hasher.cpp b/targets/minecraft/util/Hasher.cpp index c88ed7cd5..feeb01f38 100644 --- a/targets/minecraft/util/Hasher.cpp +++ b/targets/minecraft/util/Hasher.cpp @@ -9,13 +9,13 @@ #include "Hasher.h" -Hasher::Hasher(std::wstring& salt) { this->salt = salt; } +Hasher::Hasher(std::string& salt) { this->salt = salt; } -std::wstring Hasher::getHash(std::wstring& name) { +std::string Hasher::getHash(std::string& name) { #if defined(_WIN32) // 4J Stu - Removed try/catch // try { - std::wstring s = std::wstring(salt).append(name); + std::string s = std::string(salt).append(name); // MessageDigest m; // m = MessageDigest.getInstance("MD5"); // m.update(s.getBytes(), 0, s.length()); @@ -30,7 +30,7 @@ std::wstring Hasher::getHash(std::wstring& name) { //} #else // adapted from a SSL example - std::wstring combined = salt + name; + std::string combined = salt + name; std::string combined_str(combined.begin(), combined.end()); unsigned char result[EVP_MAX_MD_SIZE]; EVP_MD_CTX* md5_ctx = EVP_MD_CTX_new(); @@ -44,6 +44,6 @@ std::wstring Hasher::getHash(std::wstring& name) { ss << std::setw(2) << std::setfill('0') << std::hex << (int)result[i]; } std::string hash_str = ss.str(); - return std::wstring(hash_str.begin(), hash_str.end()); + return std::string(hash_str.begin(), hash_str.end()); #endif } diff --git a/targets/minecraft/util/Hasher.h b/targets/minecraft/util/Hasher.h index 099081124..158c7352c 100644 --- a/targets/minecraft/util/Hasher.h +++ b/targets/minecraft/util/Hasher.h @@ -4,9 +4,9 @@ class Hasher { private: - std::wstring salt; + std::string salt; public: - Hasher(std::wstring& salt); - std::wstring getHash(std::wstring& name); + Hasher(std::string& salt); + std::string getHash(std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp index 1de5a0876..20afa9845 100644 --- a/targets/minecraft/util/HtmlString.cpp +++ b/targets/minecraft/util/HtmlString.cpp @@ -7,7 +7,7 @@ #include "minecraft/IGameServices.h" #include "util/StringHelpers.h" -HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, +HtmlString::HtmlString(std::string text, eMinecraftColour hexColor, bool italics, bool indent) { this->text = escapeXML(text); this->color = hexColor; @@ -15,11 +15,11 @@ HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, this->indent = indent; } -std::wstring HtmlString::ToString() { - std::wstringstream ss; +std::string HtmlString::ToString() { + std::stringstream ss; if (indent) { - ss << L"  "; + ss << "  "; } if (italics) { @@ -29,8 +29,8 @@ std::wstring HtmlString::ToString() { eMinecraftColour color = this->color == eMinecraftColour_NOT_SET ? eHTMLColor_7 : this->color; - ss << L"" << text << ""; + ss << "" << text << ""; if (italics) { ss << ""; @@ -39,17 +39,17 @@ std::wstring HtmlString::ToString() { return ss.str(); } -std::wstring HtmlString::Compose(std::vector* strings) { - if (strings == nullptr) return L""; +std::string HtmlString::Compose(std::vector* strings) { + if (strings == nullptr) return ""; - std::wstringstream ss; + std::stringstream ss; for (int i = 0; i < strings->size(); i++) { ss << strings->at(i).ToString(); // Add a break if there's another line if (i + 1 < strings->size()) { - ss << L"
"; + ss << "
"; } } diff --git a/targets/minecraft/util/HtmlString.h b/targets/minecraft/util/HtmlString.h index 761e76cd2..c8c73bbb0 100644 --- a/targets/minecraft/util/HtmlString.h +++ b/targets/minecraft/util/HtmlString.h @@ -9,15 +9,15 @@ // 4J: Simple std::string wrapper that includes basic formatting information class HtmlString { public: - std::wstring text; // Text content of std::string + std::string text; // Text content of std::string eMinecraftColour color; // Hex color bool italics; // Show text in italics bool indent; // Indent text - HtmlString(std::wstring text, + HtmlString(std::string text, eMinecraftColour color = eMinecraftColour_NOT_SET, bool italics = false, bool indent = false); - std::wstring ToString(); + std::string ToString(); - static std::wstring Compose(std::vector* strings); + static std::string Compose(std::vector* strings); }; \ No newline at end of file diff --git a/targets/minecraft/util/Mth.cpp b/targets/minecraft/util/Mth.cpp index f48a580d1..dbc5369f5 100644 --- a/targets/minecraft/util/Mth.cpp +++ b/targets/minecraft/util/Mth.cpp @@ -34,44 +34,44 @@ float Mth::cos(float i) { } // 4J Changed this to remove the use of the actual UUID type -std::wstring Mth::createInsecureUUID(Random* random) { - wchar_t output[33]; +std::string Mth::createInsecureUUID(Random* random) { + char output[33]; output[32] = 0; int64_t high = (random->nextLong() & ~UUID_VERSION) | UUID_VERSION_TYPE_4; int64_t low = (random->nextLong() & ~UUID_VARIANT) | UUID_VARIANT_2; for (int i = 0; i < 16; i++) { - wchar_t nybbleHigh = high & 0xf; - wchar_t nybbleLow = low & 0xf; + char nybbleHigh = high & 0xf; + char nybbleLow = low & 0xf; nybbleHigh = - (nybbleHigh > 9) ? (nybbleHigh + (L'a' - 10)) : (nybbleHigh + L'0'); + (nybbleHigh > 9) ? (nybbleHigh + ('a' - 10)) : (nybbleHigh + '0'); nybbleLow = - (nybbleLow > 9) ? (nybbleLow + (L'a' - 10)) : (nybbleLow + L'0'); + (nybbleLow > 9) ? (nybbleLow + ('a' - 10)) : (nybbleLow + '0'); high >>= 4; low >>= 4; output[31 - i] = nybbleLow; output[15 - i] = nybbleHigh; } - return std::wstring(output); + return std::string(output); } -int Mth::getInt(const std::wstring& input, int def) { - std::wistringstream stream(input); +int Mth::getInt(const std::string& input, int def) { + std::istringstream stream(input); int result; return (stream >> result) ? result : def; } -int Mth::getInt(const std::wstring& input, int def, int min) { +int Mth::getInt(const std::string& input, int def, int min) { int result = getInt(input, def); return result < min ? min : result; } -double Mth::getDouble(const std::wstring& input, double def) { - std::wistringstream stream(input); +double Mth::getDouble(const std::string& input, double def) { + std::istringstream stream(input); double result; return (stream >> result) ? result : def; } -double Mth::getDouble(const std::wstring& input, double def, double min) { +double Mth::getDouble(const std::string& input, double def, double min) { double result = getDouble(input, def); return result < min ? min : result; } diff --git a/targets/minecraft/util/Mth.h b/targets/minecraft/util/Mth.h index ac494b605..ecec8c869 100644 --- a/targets/minecraft/util/Mth.h +++ b/targets/minecraft/util/Mth.h @@ -55,10 +55,10 @@ public: return ::remainder(input, 360.0); } - static std::wstring createInsecureUUID(Random* random); + static std::string createInsecureUUID(Random* random); - static int getInt(const std::wstring& input, int def); - static int getInt(const std::wstring& input, int def, int min); - static double getDouble(const std::wstring& input, double def); - static double getDouble(const std::wstring& input, double def, double min); + static int getInt(const std::string& input, int def); + static int getInt(const std::string& input, int def, int min); + static double getDouble(const std::string& input, double def); + static double getDouble(const std::string& input, double def, double min); }; diff --git a/targets/minecraft/util/ProgressListener.h b/targets/minecraft/util/ProgressListener.h index 36a677ef2..35fcc33b6 100644 --- a/targets/minecraft/util/ProgressListener.h +++ b/targets/minecraft/util/ProgressListener.h @@ -9,5 +9,5 @@ public: virtual void progressStage(int stringId) = 0; // 4J-PB - added to display bytes retrieved of a save transfer - virtual void progressStage(std::wstring& wstrText) = 0; + virtual void progressStage(std::string& wstrText) = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/CompoundContainer.cpp b/targets/minecraft/world/CompoundContainer.cpp index 68cda39c9..8672c3384 100644 --- a/targets/minecraft/world/CompoundContainer.cpp +++ b/targets/minecraft/world/CompoundContainer.cpp @@ -26,16 +26,16 @@ bool CompoundContainer::contains(std::shared_ptr c) { return c1 == c || c2 == c; } -std::wstring CompoundContainer::getName() { +std::string CompoundContainer::getName() { if (c1->hasCustomName()) return c1->getName(); if (c2->hasCustomName()) return c2->getName(); return gameServices().getString(name); } -std::wstring CompoundContainer::getCustomName() { +std::string CompoundContainer::getCustomName() { if (c1->hasCustomName()) return c1->getName(); if (c2->hasCustomName()) return c2->getName(); - return L""; + return ""; } bool CompoundContainer::hasCustomName() { diff --git a/targets/minecraft/world/CompoundContainer.h b/targets/minecraft/world/CompoundContainer.h index 7e1256741..a95c2a53b 100644 --- a/targets/minecraft/world/CompoundContainer.h +++ b/targets/minecraft/world/CompoundContainer.h @@ -20,8 +20,8 @@ public: virtual int getContainerType(); virtual unsigned int getContainerSize(); virtual bool contains(std::shared_ptr c); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); virtual std::shared_ptr getItem(unsigned int slot); virtual std::shared_ptr removeItem(unsigned int slot, int i); diff --git a/targets/minecraft/world/Container.h b/targets/minecraft/world/Container.h index c4cc51711..b86b9de8e 100644 --- a/targets/minecraft/world/Container.h +++ b/targets/minecraft/world/Container.h @@ -21,8 +21,8 @@ public: virtual std::shared_ptr removeItemNoUpdate(int slot) = 0; virtual void setItem(unsigned int slot, std::shared_ptr item) = 0; - virtual std::wstring getName() = 0; - virtual std::wstring + virtual std::string getName() = 0; + virtual std::string getCustomName() = 0; // 4J Stu added for sending over the network virtual bool hasCustomName() = 0; virtual int getMaxStackSize() = 0; diff --git a/targets/minecraft/world/FlippedIcon.cpp b/targets/minecraft/world/FlippedIcon.cpp index d4c24ff1f..c7d69e327 100644 --- a/targets/minecraft/world/FlippedIcon.cpp +++ b/targets/minecraft/world/FlippedIcon.cpp @@ -46,7 +46,7 @@ float FlippedIcon::getV(double offset, bool adjust /*=false*/) const { (diff * ((float)offset / SharedConstants::WORLD_RESOLUTION)); } -std::wstring FlippedIcon::getName() const { return base->getName(); } +std::string FlippedIcon::getName() const { return base->getName(); } int FlippedIcon::getSourceWidth() const { return base->getSourceWidth(); } diff --git a/targets/minecraft/world/FlippedIcon.h b/targets/minecraft/world/FlippedIcon.h index d15edca34..6dd76c6ee 100644 --- a/targets/minecraft/world/FlippedIcon.h +++ b/targets/minecraft/world/FlippedIcon.h @@ -23,7 +23,7 @@ public: float getV0(bool adjust = false) const; float getV1(bool adjust = false) const; float getV(double offset, bool adjust = false) const; - std::wstring getName() const; + std::string getName() const; int getSourceWidth() const; int getSourceHeight() const; int getFlags() const; // 4J added diff --git a/targets/minecraft/world/Icon.h b/targets/minecraft/world/Icon.h index 5a17df0df..a168e4820 100644 --- a/targets/minecraft/world/Icon.h +++ b/targets/minecraft/world/Icon.h @@ -20,7 +20,7 @@ public: virtual float getV0(bool adjust = false) const = 0; virtual float getV1(bool adjust = false) const = 0; virtual float getV(double offset, bool adjust = false) const = 0; - virtual std::wstring getName() const = 0; + virtual std::string getName() const = 0; virtual int getSourceWidth() const = 0; virtual int getSourceHeight() const = 0; virtual int getFlags() const = 0; // 4J added diff --git a/targets/minecraft/world/IconRegister.h b/targets/minecraft/world/IconRegister.h index 333e4d60b..69140fc28 100644 --- a/targets/minecraft/world/IconRegister.h +++ b/targets/minecraft/world/IconRegister.h @@ -5,6 +5,6 @@ class Icon; class IconRegister { public: // 4J Stu - register is a reserved keyword in C++ - virtual Icon* registerIcon(const std::wstring& name) = 0; + virtual Icon* registerIcon(const std::string& name) = 0; virtual int getIconType() = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp index 63ed1175a..4d62020c0 100644 --- a/targets/minecraft/world/SimpleContainer.cpp +++ b/targets/minecraft/world/SimpleContainer.cpp @@ -8,7 +8,7 @@ #include "minecraft/world/item/ItemInstance.h" #include "net.minecraft.world.ContainerListener.h" -SimpleContainer::SimpleContainer(int name, std::wstring stringName, +SimpleContainer::SimpleContainer(int name, std::string stringName, bool customName, int size) { this->name = name; this->stringName = stringName; @@ -81,17 +81,17 @@ void SimpleContainer::setItem(unsigned int slot, unsigned int SimpleContainer::getContainerSize() { return size; } -std::wstring SimpleContainer::getName() { +std::string SimpleContainer::getName() { return stringName.empty() ? gameServices().getString(name) : stringName; } -std::wstring SimpleContainer::getCustomName() { - return hasCustomName() ? stringName : L""; +std::string SimpleContainer::getCustomName() { + return hasCustomName() ? stringName : ""; } bool SimpleContainer::hasCustomName() { return customName; } -void SimpleContainer::setCustomName(const std::wstring& name) { +void SimpleContainer::setCustomName(const std::string& name) { customName = true; this->stringName = name; } diff --git a/targets/minecraft/world/SimpleContainer.h b/targets/minecraft/world/SimpleContainer.h index e77f2cf58..fc578e601 100644 --- a/targets/minecraft/world/SimpleContainer.h +++ b/targets/minecraft/world/SimpleContainer.h @@ -18,14 +18,14 @@ class ContainerListener; class SimpleContainer : public Container { private: int name; - std::wstring stringName; + std::string stringName; int size; std::vector>* items; std::vector* listeners; bool customName; public: - SimpleContainer(int name, std::wstring stringName, bool customName, + SimpleContainer(int name, std::string stringName, bool customName, int size); virtual void addListener(net_minecraft_world::ContainerListener* listener); @@ -38,10 +38,10 @@ public: virtual void setItem(unsigned int slot, std::shared_ptr item) override; virtual unsigned int getContainerSize() override; - virtual std::wstring getName() override; - virtual std::wstring getCustomName() override; + virtual std::string getName() override; + virtual std::string getCustomName() override; virtual bool hasCustomName() override; - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); virtual int getMaxStackSize() override; virtual void setChanged() override; virtual bool stillValid(std::shared_ptr player) override; diff --git a/targets/minecraft/world/damageSource/CombatEntry.cpp b/targets/minecraft/world/damageSource/CombatEntry.cpp index 68d7581ce..ecc3f1f8e 100644 --- a/targets/minecraft/world/damageSource/CombatEntry.cpp +++ b/targets/minecraft/world/damageSource/CombatEntry.cpp @@ -42,9 +42,9 @@ bool CombatEntry::isCombatRelated() { CombatTracker::eLOCATION CombatEntry::getLocation() { return location; } -std::wstring CombatEntry::getAttackerName() { +std::string CombatEntry::getAttackerName() { return getSource()->getEntity() == nullptr - ? L"" + ? "" : getSource()->getEntity()->getNetworkName(); } diff --git a/targets/minecraft/world/damageSource/CombatEntry.h b/targets/minecraft/world/damageSource/CombatEntry.h index 29c61b5d2..52f3c0667 100644 --- a/targets/minecraft/world/damageSource/CombatEntry.h +++ b/targets/minecraft/world/damageSource/CombatEntry.h @@ -27,6 +27,6 @@ public: float getHealthAfterDamage(); bool isCombatRelated(); CombatTracker::eLOCATION getLocation(); - std::wstring getAttackerName(); + std::string getAttackerName(); float getFallDistance(); }; \ No newline at end of file diff --git a/targets/minecraft/world/damageSource/DamageSource.cpp b/targets/minecraft/world/damageSource/DamageSource.cpp index 44e9d4e24..c8702a92e 100644 --- a/targets/minecraft/world/damageSource/DamageSource.cpp +++ b/targets/minecraft/world/damageSource/DamageSource.cpp @@ -150,7 +150,7 @@ float DamageSource::getFoodExhaustion() { return exhaustion; } bool DamageSource::isBypassInvul() { return _bypassInvul; } -// DamageSource::DamageSource(const wstring &msgId) +// DamageSource::DamageSource(const string &msgId) DamageSource::DamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId) { // 4J added initialisors @@ -205,10 +205,10 @@ DamageSource* DamageSource::setMagic() { return this; } -// wstring DamageSource::getLocalizedDeathMessage(shared_ptr player) +// string DamageSource::getLocalizedDeathMessage(shared_ptr player) //{ -// return L"death." + msgId + player->name; -// //return I18n.get(L"death." + msgId, player.name); +// return "death." + msgId + player->name; +// //return I18n.get("death." + msgId, player.name); // } std::shared_ptr DamageSource::getDeathMessagePacket( diff --git a/targets/minecraft/world/damageSource/DamageSource.h b/targets/minecraft/world/damageSource/DamageSource.h index 895a1442b..ce771c5fc 100644 --- a/targets/minecraft/world/damageSource/DamageSource.h +++ b/targets/minecraft/world/damageSource/DamageSource.h @@ -63,14 +63,14 @@ public: float getFoodExhaustion(); bool isBypassInvul(); - // std::wstring msgId; + // std::string msgId; ChatPacket::EChatPacketMessage m_msgId; // 4J Made int so we can localise ChatPacket::EChatPacketMessage m_msgWithItemId; // 4J: Renamed from m_msgWithSourceId (it was already // renamed in places, just made consistent) protected: - // DamageSource(const std::wstring &msgId); + // DamageSource(const std::string &msgId); DamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId = ChatPacket::e_ChatCustom); @@ -94,7 +94,7 @@ public: DamageSource* setMagic(); // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr + // virtual std::string getLocalizedDeathMessage(std::shared_ptr // player); virtual std::shared_ptr getDeathMessagePacket( std::shared_ptr player); diff --git a/targets/minecraft/world/damageSource/EntityDamageSource.cpp b/targets/minecraft/world/damageSource/EntityDamageSource.cpp index aab3291e8..3c5aab7a5 100644 --- a/targets/minecraft/world/damageSource/EntityDamageSource.cpp +++ b/targets/minecraft/world/damageSource/EntityDamageSource.cpp @@ -1,5 +1,5 @@ -// EntityDamageSource::EntityDamageSource(const wstring &msgId, +// EntityDamageSource::EntityDamageSource(const string &msgId, // shared_ptr entity) : DamageSource(msgId) #include "minecraft/world/damageSource/EntityDamageSource.h" @@ -25,10 +25,10 @@ EntityDamageSource::EntityDamageSource( std::shared_ptr EntityDamageSource::getEntity() { return entity; } -// wstring EntityDamageSource::getLocalizedDeathMessage(shared_ptr +// string EntityDamageSource::getLocalizedDeathMessage(shared_ptr // player) //{ -// return L"death." + msgId + player->name + entity->getAName(); +// return "death." + msgId + player->name + entity->getAName(); // //return I18n.get("death." + msgId, player.name, entity.getAName()); // } @@ -38,7 +38,7 @@ std::shared_ptr EntityDamageSource::getDeathMessagePacket( (entity != nullptr) && entity->instanceof(eTYPE_LIVINGENTITY) ? std::dynamic_pointer_cast(entity)->getCarriedItem() : nullptr; - std::wstring additional = L""; + std::string additional = ""; if (entity->instanceof(eTYPE_SERVERPLAYER)) { additional = std::dynamic_pointer_cast(entity)->name; diff --git a/targets/minecraft/world/damageSource/EntityDamageSource.h b/targets/minecraft/world/damageSource/EntityDamageSource.h index b9ae1c1e1..dd6662d54 100644 --- a/targets/minecraft/world/damageSource/EntityDamageSource.h +++ b/targets/minecraft/world/damageSource/EntityDamageSource.h @@ -13,7 +13,7 @@ protected: std::shared_ptr entity; public: - // EntityDamageSource(const std::wstring &msgId, std::shared_ptr + // EntityDamageSource(const std::string &msgId, std::shared_ptr // entity); EntityDamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, @@ -23,7 +23,7 @@ public: std::shared_ptr getEntity(); // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr + // virtual std::string getLocalizedDeathMessage(std::shared_ptr // player); virtual std::shared_ptr getDeathMessagePacket( std::shared_ptr player); diff --git a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp index d6def2995..fc5040d68 100644 --- a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp +++ b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.cpp @@ -1,5 +1,5 @@ -// IndirectEntityDamageSource::IndirectEntityDamageSource(const wstring &msgId, +// IndirectEntityDamageSource::IndirectEntityDamageSource(const string &msgId, // shared_ptr entity, shared_ptr owner) : // EntityDamageSource(msgId, entity) #include "minecraft/world/damageSource/IndirectEntityDamageSource.h" @@ -32,11 +32,11 @@ std::shared_ptr IndirectEntityDamageSource::getEntity() { return owner; } -// wstring +// string // IndirectEntityDamageSource::getLocalizedDeathMessage(shared_ptr // player) //{ -// return L"death." + msgId + player->name + owner->getAName(); +// return "death." + msgId + player->name + owner->getAName(); // //return I18n.get("death." + msgId, player.name, owner.getAName()); // } @@ -46,7 +46,7 @@ std::shared_ptr IndirectEntityDamageSource::getDeathMessagePacket( entity->instanceof(eTYPE_LIVINGENTITY) ? std::dynamic_pointer_cast(entity)->getCarriedItem() : nullptr; - std::wstring additional = L""; + std::string additional = ""; int type; if (owner != nullptr) { type = owner->GetType(); diff --git a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h index d411cce42..0f36ab990 100644 --- a/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h +++ b/targets/minecraft/world/damageSource/IndirectEntityDamageSource.h @@ -13,7 +13,7 @@ private: std::shared_ptr owner; public: - // IndirectEntityDamageSource(const std::wstring &msgId, + // IndirectEntityDamageSource(const std::string &msgId, // std::shared_ptr entity, std::shared_ptr owner); IndirectEntityDamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::EChatPacketMessage msgWithItemId, @@ -26,7 +26,7 @@ public: virtual std::shared_ptr getEntity(); // 4J Stu - Made return a packet - // virtual std::wstring getLocalizedDeathMessage(std::shared_ptr + // virtual std::string getLocalizedDeathMessage(std::shared_ptr // player); virtual std::shared_ptr getDeathMessagePacket( std::shared_ptr player); diff --git a/targets/minecraft/world/effect/MobEffect.cpp b/targets/minecraft/world/effect/MobEffect.cpp index c9bb46bcf..f282e7fc7 100644 --- a/targets/minecraft/world/effect/MobEffect.cpp +++ b/targets/minecraft/world/effect/MobEffect.cpp @@ -377,9 +377,9 @@ MobEffect::EMobEffectIcon MobEffect::getIcon() { return icon; } bool MobEffect::isHarmful() { return _isHarmful; } -std::wstring MobEffect::formatDuration(MobEffectInstance* instance) { +std::string MobEffect::formatDuration(MobEffectInstance* instance) { if (instance->isNoCounter()) { - return L"**:**"; + return "**:**"; } int duration = instance->getDuration(); @@ -387,14 +387,14 @@ std::wstring MobEffect::formatDuration(MobEffectInstance* instance) { int minutes = seconds / 60; seconds %= 60; - wchar_t temp[8]; - memset(&temp, 0, 8 * (sizeof(wchar_t))); + char temp[8]; + memset(&temp, 0, 8 * (sizeof(char))); if (seconds < 10) { - swprintf(temp, 8, L"%d:0%d", minutes, seconds); + snprintf(temp, 8, "%d:0%d", minutes, seconds); // return minutes + ":0" + seconds; } else { - swprintf(temp, 8, L"%d:%d", minutes, seconds); + snprintf(temp, 8, "%d:%d", minutes, seconds); // return minutes + ":" + seconds; } diff --git a/targets/minecraft/world/effect/MobEffect.h b/targets/minecraft/world/effect/MobEffect.h index e82a92e54..79a54fccf 100644 --- a/targets/minecraft/world/effect/MobEffect.h +++ b/targets/minecraft/world/effect/MobEffect.h @@ -117,7 +117,7 @@ public: bool hasIcon(); EMobEffectIcon getIcon(); // 4J changed return type bool isHarmful(); - static std::wstring formatDuration(MobEffectInstance* instance); + static std::string formatDuration(MobEffectInstance* instance); protected: MobEffect* setDurationModifier(double durationModifier); diff --git a/targets/minecraft/world/effect/MobEffectInstance.cpp b/targets/minecraft/world/effect/MobEffectInstance.cpp index fd087cff4..9363619a0 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.cpp +++ b/targets/minecraft/world/effect/MobEffectInstance.cpp @@ -118,10 +118,10 @@ int MobEffectInstance::hashCode() { ((duration & 0xffff) << 16); } -std::wstring MobEffectInstance::toString() { - std::wstring result = - L"MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION"; - // wstring result = ""; +std::string MobEffectInstance::toString() { + std::string result = + "MobEffectInstance::toString - NON IMPLEMENTED OR LOCALISED FUNCTION"; + // string result = ""; // if (getAmplifier() > 0) //{ // result = getDescriptionId() + " x " + (getAmplifier() + 1) + ", @@ -146,18 +146,18 @@ bool MobEffectInstance::equals(MobEffectInstance* instance) { } CompoundTag* MobEffectInstance::save(CompoundTag* tag) { - tag->putByte(L"Id", (uint8_t)getId()); - tag->putByte(L"Amplifier", (uint8_t)getAmplifier()); - tag->putInt(L"Duration", getDuration()); - tag->putBoolean(L"Ambient", isAmbient()); + tag->putByte("Id", (uint8_t)getId()); + tag->putByte("Amplifier", (uint8_t)getAmplifier()); + tag->putInt("Duration", getDuration()); + tag->putBoolean("Ambient", isAmbient()); return tag; } MobEffectInstance* MobEffectInstance::load(CompoundTag* tag) { - int id = tag->getByte(L"Id"); - int amplifier = tag->getByte(L"Amplifier"); - int duration = tag->getInt(L"Duration"); - bool ambient = tag->getBoolean(L"Ambient"); + int id = tag->getByte("Id"); + int amplifier = tag->getByte("Amplifier"); + int duration = tag->getInt("Duration"); + bool ambient = tag->getBoolean("Ambient"); return new MobEffectInstance(id, duration, amplifier, ambient); } diff --git a/targets/minecraft/world/effect/MobEffectInstance.h b/targets/minecraft/world/effect/MobEffectInstance.h index ee3e85460..1b456cc24 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.h +++ b/targets/minecraft/world/effect/MobEffectInstance.h @@ -48,7 +48,7 @@ public: int getPostfixDescriptionId(); // 4J Added int hashCode(); - std::wstring toString(); + std::string toString(); // Was bool equals(Object obj) bool equals(MobEffectInstance* obj); diff --git a/targets/minecraft/world/entity/AgeableMob.cpp b/targets/minecraft/world/entity/AgeableMob.cpp index 81736ece5..994a84b01 100644 --- a/targets/minecraft/world/entity/AgeableMob.cpp +++ b/targets/minecraft/world/entity/AgeableMob.cpp @@ -91,12 +91,12 @@ void AgableMob::setAge(int age) { void AgableMob::addAdditonalSaveData(CompoundTag* tag) { PathfinderMob::addAdditonalSaveData(tag); - tag->putInt(L"Age", getAge()); + tag->putInt("Age", getAge()); } void AgableMob::readAdditionalSaveData(CompoundTag* tag) { PathfinderMob::readAdditionalSaveData(tag); - setAge(tag->getInt(L"Age")); + setAge(tag->getInt("Age")); } void AgableMob::aiStep() { diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index cce8ff4d0..129aaa98d 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -51,7 +51,7 @@ thread_local bool Entity::m_tlsUseSmallIds = false; -const std::wstring Entity::RIDING_TAG = L"Riding"; +const std::string Entity::RIDING_TAG = "Riding"; int Entity::entityCounter = 2048; // 4J - changed initialiser to 2048, as we are using range 0 - 2047 // as special unique smaller ids for things that need network tracked @@ -353,7 +353,7 @@ void Entity::_init(bool useSmallId, Level* level) { portalEntranceDir = 0; invulnerable = false; if (useSmallId) { - uuid = L"ent" + Mth::createInsecureUUID(random); + uuid = "ent" + Mth::createInsecureUUID(random); } // 4J Added @@ -1233,56 +1233,56 @@ bool Entity::shouldRenderAtSqrDistance(double distance) { bool Entity::isCreativeModeAllowed() { return false; } bool Entity::saveAsMount(CompoundTag* entityTag) { - std::wstring id = getEncodeId(); + std::string id = getEncodeId(); if (removed || id.empty()) { return false; } // TODO Is this fine to be casting to a non-const char pointer? - entityTag->putString(L"id", id); + entityTag->putString("id", id); saveWithoutId(entityTag); return true; } bool Entity::save(CompoundTag* entityTag) { - std::wstring id = getEncodeId(); + std::string id = getEncodeId(); if (removed || id.empty() || (rider.lock() != nullptr)) { return false; } // TODO Is this fine to be casting to a non-const char pointer? - entityTag->putString(L"id", id); + entityTag->putString("id", id); saveWithoutId(entityTag); return true; } void Entity::saveWithoutId(CompoundTag* entityTag) { - entityTag->put(L"Pos", newDoubleList(3, x, y + ySlideOffset, z)); - entityTag->put(L"Motion", newDoubleList(3, xd, yd, zd)); - entityTag->put(L"Rotation", newFloatList(2, yRot, xRot)); + entityTag->put("Pos", newDoubleList(3, x, y + ySlideOffset, z)); + entityTag->put("Motion", newDoubleList(3, xd, yd, zd)); + entityTag->put("Rotation", newFloatList(2, yRot, xRot)); - entityTag->putFloat(L"FallDistance", fallDistance); - entityTag->putShort(L"Fire", (short)onFire); - entityTag->putShort(L"Air", (short)getAirSupply()); - entityTag->putBoolean(L"OnGround", onGround); - entityTag->putInt(L"Dimension", dimension); - entityTag->putBoolean(L"Invulnerable", invulnerable); - entityTag->putInt(L"PortalCooldown", changingDimensionDelay); + entityTag->putFloat("FallDistance", fallDistance); + entityTag->putShort("Fire", (short)onFire); + entityTag->putShort("Air", (short)getAirSupply()); + entityTag->putBoolean("OnGround", onGround); + entityTag->putInt("Dimension", dimension); + entityTag->putBoolean("Invulnerable", invulnerable); + entityTag->putInt("PortalCooldown", changingDimensionDelay); - entityTag->putString(L"UUID", uuid); + entityTag->putString("UUID", uuid); addAdditonalSaveData(entityTag); if (riding != nullptr) { CompoundTag* ridingTag = new CompoundTag(RIDING_TAG); if (riding->saveAsMount(ridingTag)) { - entityTag->put(L"Riding", ridingTag); + entityTag->put("Riding", ridingTag); } } } void Entity::load(CompoundTag* tag) { - ListTag* pos = (ListTag*)tag->getList(L"Pos"); - ListTag* motion = (ListTag*)tag->getList(L"Motion"); - ListTag* rotation = (ListTag*)tag->getList(L"Rotation"); + ListTag* pos = (ListTag*)tag->getList("Pos"); + ListTag* motion = (ListTag*)tag->getList("Motion"); + ListTag* rotation = (ListTag*)tag->getList("Rotation"); xd = motion->get(0)->data; yd = motion->get(1)->data; @@ -1305,16 +1305,16 @@ void Entity::load(CompoundTag* tag) { yRotO = yRot = rotation->get(0)->data; xRotO = xRot = rotation->get(1)->data; - fallDistance = tag->getFloat(L"FallDistance"); - onFire = tag->getShort(L"Fire"); - setAirSupply(tag->getShort(L"Air")); - onGround = tag->getBoolean(L"OnGround"); - dimension = tag->getInt(L"Dimension"); - invulnerable = tag->getBoolean(L"Invulnerable"); - changingDimensionDelay = tag->getInt(L"PortalCooldown"); + fallDistance = tag->getFloat("FallDistance"); + onFire = tag->getShort("Fire"); + setAirSupply(tag->getShort("Air")); + onGround = tag->getBoolean("OnGround"); + dimension = tag->getInt("Dimension"); + invulnerable = tag->getBoolean("Invulnerable"); + changingDimensionDelay = tag->getInt("PortalCooldown"); - if (tag->contains(L"UUID")) { - uuid = tag->getString(L"UUID"); + if (tag->contains("UUID")) { + uuid = tag->getString("UUID"); } setPos(x, y, z); @@ -1328,7 +1328,7 @@ void Entity::load(CompoundTag* tag) { bool Entity::repositionEntityAfterLoad() { return true; } -const std::wstring Entity::getEncodeId() { +const std::string Entity::getEncodeId() { return EntityIO::getEncodeId(shared_from_this()); } @@ -1343,7 +1343,7 @@ ListTag* Entity::newDoubleList(unsigned int number, ListTag* res = new ListTag(); // Add the first parameter to the ListTag - res->add(new DoubleTag(L"", firstValue)); + res->add(new DoubleTag("", firstValue)); va_list vl; va_start(vl, firstValue); @@ -1352,7 +1352,7 @@ ListTag* Entity::newDoubleList(unsigned int number, for (unsigned int i = 1; i < number; i++) { val = va_arg(vl, double); - res->add(new DoubleTag(L"", val)); + res->add(new DoubleTag("", val)); } va_end(vl); @@ -1365,12 +1365,12 @@ ListTag* Entity::newFloatList(unsigned int number, float firstValue, ListTag* res = new ListTag(); // Add the first parameter to the ListTag - res->add(new FloatTag(L"", firstValue)); + res->add(new FloatTag("", firstValue)); // TODO - 4J Stu For some reason the va_list wasn't working correctly here // We only make a list of two floats so just overriding and not using // va_list - res->add(new FloatTag(L"", secondValue)); + res->add(new FloatTag("", secondValue)); /* va_list vl; @@ -1728,13 +1728,13 @@ void Entity::makeStuckInWeb() { fallDistance = 0; } -std::wstring Entity::getAName() { +std::string Entity::getAName() { #ifdef _DEBUG - std::wstring id = EntityIO::getEncodeId(shared_from_this()); - if (id.empty()) id = L"generic"; - return L"entity." + id + toWString(entityId); + std::string id = EntityIO::getEncodeId(shared_from_this()); + if (id.empty()) id = "generic"; + return "entity." + id + toWString(entityId); #else - return L""; + return ""; #endif } @@ -1850,17 +1850,17 @@ bool Entity::isIgnoringTileTriggers() { return false; } bool Entity::displayFireAnimation() { return isOnFire(); } -void Entity::setUUID(const std::wstring& UUID) { uuid = UUID; } +void Entity::setUUID(const std::string& UUID) { uuid = UUID; } -std::wstring Entity::getUUID() { return uuid; } +std::string Entity::getUUID() { return uuid; } bool Entity::isPushedByWater() { return true; } -std::wstring Entity::getDisplayName() { return getAName(); } +std::string Entity::getDisplayName() { return getAName(); } // 4J: Added to retrieve name that should be sent in ChatPackets (important on // Xbox One for players) -std::wstring Entity::getNetworkName() { return getDisplayName(); } +std::string Entity::getNetworkName() { return getDisplayName(); } void Entity::setAnimOverrideBitmask(unsigned int uiBitmask) { m_uiAnimOverrideBitmask = uiBitmask; diff --git a/targets/minecraft/world/entity/Entity.h b/targets/minecraft/world/entity/Entity.h index 5b074e121..726691e50 100644 --- a/targets/minecraft/world/entity/Entity.h +++ b/targets/minecraft/world/entity/Entity.h @@ -61,7 +61,7 @@ public: } public: - static const std::wstring RIDING_TAG; + static const std::string RIDING_TAG; static const short TOTAL_AIR_SUPPLY = 20 * 15; private: @@ -178,7 +178,7 @@ protected: private: bool invulnerable; - std::wstring uuid; + std::string uuid; protected: // 4J Added so that client side simulations on the host are not affected by @@ -318,7 +318,7 @@ public: protected: virtual bool repositionEntityAfterLoad(); - const std::wstring getEncodeId(); + const std::string getEncodeId(); public: virtual void readAdditionalSaveData(CompoundTag* tag) = 0; @@ -408,7 +408,7 @@ protected: public: virtual void makeStuckInWeb(); - virtual std::wstring getAName(); + virtual std::string getAName(); // 4J - added to manage allocation of small ids private: @@ -467,11 +467,11 @@ public: virtual int getPortalEntranceDir(); virtual bool isIgnoringTileTriggers(); virtual bool displayFireAnimation(); - virtual void setUUID(const std::wstring& UUID); - virtual std::wstring getUUID(); + virtual void setUUID(const std::string& UUID); + virtual std::string getUUID(); virtual bool isPushedByWater(); - virtual std::wstring getDisplayName(); - virtual std::wstring getNetworkName(); // 4J: Added + virtual std::string getDisplayName(); + virtual std::string getNetworkName(); // 4J: Added private: unsigned int m_uiAnimOverrideBitmask; diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp index 5481afe51..d98e58ad2 100644 --- a/targets/minecraft/world/entity/EntityIO.cpp +++ b/targets/minecraft/world/entity/EntityIO.cpp @@ -68,11 +68,11 @@ #include "nbt/CompoundTag.h" #include "strings.h" -std::unordered_map* EntityIO::idCreateMap = - new std::unordered_map; -std::unordered_map* EntityIO::idCreateMap = + new std::unordered_map; +std::unordered_map* EntityIO::classIdMap = - new std::unordered_map; std::unordered_map* EntityIO::numCreateMap = new std::unordered_map; @@ -82,18 +82,18 @@ std::unordered_map* EntityIO::classNumMap = new std::unordered_map; -std::unordered_map* EntityIO::idNumMap = - new std::unordered_map; +std::unordered_map* EntityIO::idNumMap = + new std::unordered_map; std::unordered_map EntityIO::idsSpawnableInCreative; void EntityIO::setId(entityCreateFn createFn, eINSTANCEOF clas, - const std::wstring& id, int idNum) { + const std::string& id, int idNum) { idCreateMap->insert( - std::unordered_map::value_type(id, + std::unordered_map::value_type(id, createFn)); classIdMap->insert( - std::unordered_map::value_type(clas, id)); numCreateMap->insert( std::unordered_map::value_type(idNum, createFn)); @@ -103,11 +103,11 @@ void EntityIO::setId(entityCreateFn createFn, eINSTANCEOF clas, std::unordered_map::value_type(clas, idNum)); idNumMap->insert( - std::unordered_map::value_type(id, idNum)); + std::unordered_map::value_type(id, idNum)); } void EntityIO::setId(entityCreateFn createFn, eINSTANCEOF clas, - const std::wstring& id, int idNum, eMinecraftColour color1, + const std::string& id, int idNum, eMinecraftColour color1, eMinecraftColour color2, int nameId) { setId(createFn, clas, id, idNum); @@ -117,169 +117,169 @@ void EntityIO::setId(entityCreateFn createFn, eINSTANCEOF clas, } void EntityIO::staticCtor() { - setId(ItemEntity::create, eTYPE_ITEMENTITY, L"Item", 1); - setId(ExperienceOrb::create, eTYPE_EXPERIENCEORB, L"XPOrb", 2); + setId(ItemEntity::create, eTYPE_ITEMENTITY, "Item", 1); + setId(ExperienceOrb::create, eTYPE_EXPERIENCEORB, "XPOrb", 2); - setId(LeashFenceKnotEntity::create, eTYPE_LEASHFENCEKNOT, L"LeashKnot", 8); - setId(Painting::create, eTYPE_PAINTING, L"Painting", 9); - setId(Arrow::create, eTYPE_ARROW, L"Arrow", 10); - setId(Snowball::create, eTYPE_SNOWBALL, L"Snowball", 11); - setId(LargeFireball::create, eTYPE_FIREBALL, L"Fireball", 12); - setId(SmallFireball::create, eTYPE_SMALL_FIREBALL, L"SmallFireball", 13); - setId(ThrownEnderpearl::create, eTYPE_THROWNENDERPEARL, L"ThrownEnderpearl", + setId(LeashFenceKnotEntity::create, eTYPE_LEASHFENCEKNOT, "LeashKnot", 8); + setId(Painting::create, eTYPE_PAINTING, "Painting", 9); + setId(Arrow::create, eTYPE_ARROW, "Arrow", 10); + setId(Snowball::create, eTYPE_SNOWBALL, "Snowball", 11); + setId(LargeFireball::create, eTYPE_FIREBALL, "Fireball", 12); + setId(SmallFireball::create, eTYPE_SMALL_FIREBALL, "SmallFireball", 13); + setId(ThrownEnderpearl::create, eTYPE_THROWNENDERPEARL, "ThrownEnderpearl", 14); - setId(EyeOfEnderSignal::create, eTYPE_EYEOFENDERSIGNAL, L"EyeOfEnderSignal", + setId(EyeOfEnderSignal::create, eTYPE_EYEOFENDERSIGNAL, "EyeOfEnderSignal", 15); - setId(ThrownPotion::create, eTYPE_THROWNPOTION, L"ThrownPotion", 16); - setId(ThrownExpBottle::create, eTYPE_THROWNEXPBOTTLE, L"ThrownExpBottle", + setId(ThrownPotion::create, eTYPE_THROWNPOTION, "ThrownPotion", 16); + setId(ThrownExpBottle::create, eTYPE_THROWNEXPBOTTLE, "ThrownExpBottle", 17); - setId(ItemFrame::create, eTYPE_ITEM_FRAME, L"ItemFrame", 18); - setId(WitherSkull::create, eTYPE_WITHER_SKULL, L"WitherSkull", 19); + setId(ItemFrame::create, eTYPE_ITEM_FRAME, "ItemFrame", 18); + setId(WitherSkull::create, eTYPE_WITHER_SKULL, "WitherSkull", 19); - setId(PrimedTnt::create, eTYPE_PRIMEDTNT, L"PrimedTnt", 20); - setId(FallingTile::create, eTYPE_FALLINGTILE, L"FallingSand", 21); + setId(PrimedTnt::create, eTYPE_PRIMEDTNT, "PrimedTnt", 20); + setId(FallingTile::create, eTYPE_FALLINGTILE, "FallingSand", 21); setId(FireworksRocketEntity::create, eTYPE_FIREWORKS_ROCKET, - L"FireworksRocketEntity", 22); + "FireworksRocketEntity", 22); - setId(Boat::create, eTYPE_BOAT, L"Boat", 41); + setId(Boat::create, eTYPE_BOAT, "Boat", 41); setId(MinecartRideable::create, eTYPE_MINECART_RIDEABLE, - L"MinecartRideable", 42); - setId(MinecartChest::create, eTYPE_MINECART_CHEST, L"MinecartChest", 43); - setId(MinecartFurnace::create, eTYPE_MINECART_FURNACE, L"MinecartFurnace", + "MinecartRideable", 42); + setId(MinecartChest::create, eTYPE_MINECART_CHEST, "MinecartChest", 43); + setId(MinecartFurnace::create, eTYPE_MINECART_FURNACE, "MinecartFurnace", 44); - setId(MinecartTNT::create, eTYPE_MINECART_TNT, L"MinecartTNT", 45); - setId(MinecartHopper::create, eTYPE_MINECART_HOPPER, L"MinecartHopper", 46); - setId(MinecartSpawner::create, eTYPE_MINECART_SPAWNER, L"MinecartSpawner", + setId(MinecartTNT::create, eTYPE_MINECART_TNT, "MinecartTNT", 45); + setId(MinecartHopper::create, eTYPE_MINECART_HOPPER, "MinecartHopper", 46); + setId(MinecartSpawner::create, eTYPE_MINECART_SPAWNER, "MinecartSpawner", 47); - setId(Mob::create, eTYPE_MOB, L"Mob", 48); - setId(Monster::create, eTYPE_MONSTER, L"Monster", 49); + setId(Mob::create, eTYPE_MOB, "Mob", 48); + setId(Monster::create, eTYPE_MONSTER, "Monster", 49); - setId(Creeper::create, eTYPE_CREEPER, L"Creeper", 50, + setId(Creeper::create, eTYPE_CREEPER, "Creeper", 50, eMinecraftColour_Mob_Creeper_Colour1, eMinecraftColour_Mob_Creeper_Colour2, IDS_CREEPER); - setId(Skeleton::create, eTYPE_SKELETON, L"Skeleton", 51, + setId(Skeleton::create, eTYPE_SKELETON, "Skeleton", 51, eMinecraftColour_Mob_Skeleton_Colour1, eMinecraftColour_Mob_Skeleton_Colour2, IDS_SKELETON); - setId(Spider::create, eTYPE_SPIDER, L"Spider", 52, + setId(Spider::create, eTYPE_SPIDER, "Spider", 52, eMinecraftColour_Mob_Spider_Colour1, eMinecraftColour_Mob_Spider_Colour2, IDS_SPIDER); - setId(Giant::create, eTYPE_GIANT, L"Giant", 53); - setId(Zombie::create, eTYPE_ZOMBIE, L"Zombie", 54, + setId(Giant::create, eTYPE_GIANT, "Giant", 53); + setId(Zombie::create, eTYPE_ZOMBIE, "Zombie", 54, eMinecraftColour_Mob_Zombie_Colour1, eMinecraftColour_Mob_Zombie_Colour2, IDS_ZOMBIE); - setId(Slime::create, eTYPE_SLIME, L"Slime", 55, + setId(Slime::create, eTYPE_SLIME, "Slime", 55, eMinecraftColour_Mob_Slime_Colour1, eMinecraftColour_Mob_Slime_Colour2, IDS_SLIME); - setId(Ghast::create, eTYPE_GHAST, L"Ghast", 56, + setId(Ghast::create, eTYPE_GHAST, "Ghast", 56, eMinecraftColour_Mob_Ghast_Colour1, eMinecraftColour_Mob_Ghast_Colour2, IDS_GHAST); - setId(PigZombie::create, eTYPE_PIGZOMBIE, L"PigZombie", 57, + setId(PigZombie::create, eTYPE_PIGZOMBIE, "PigZombie", 57, eMinecraftColour_Mob_PigZombie_Colour1, eMinecraftColour_Mob_PigZombie_Colour2, IDS_PIGZOMBIE); - setId(EnderMan::create, eTYPE_ENDERMAN, L"Enderman", 58, + setId(EnderMan::create, eTYPE_ENDERMAN, "Enderman", 58, eMinecraftColour_Mob_Enderman_Colour1, eMinecraftColour_Mob_Enderman_Colour2, IDS_ENDERMAN); - setId(CaveSpider::create, eTYPE_CAVESPIDER, L"CaveSpider", 59, + setId(CaveSpider::create, eTYPE_CAVESPIDER, "CaveSpider", 59, eMinecraftColour_Mob_CaveSpider_Colour1, eMinecraftColour_Mob_CaveSpider_Colour2, IDS_CAVE_SPIDER); - setId(Silverfish::create, eTYPE_SILVERFISH, L"Silverfish", 60, + setId(Silverfish::create, eTYPE_SILVERFISH, "Silverfish", 60, eMinecraftColour_Mob_Silverfish_Colour1, eMinecraftColour_Mob_Silverfish_Colour2, IDS_SILVERFISH); - setId(Blaze::create, eTYPE_BLAZE, L"Blaze", 61, + setId(Blaze::create, eTYPE_BLAZE, "Blaze", 61, eMinecraftColour_Mob_Blaze_Colour1, eMinecraftColour_Mob_Blaze_Colour2, IDS_BLAZE); - setId(LavaSlime::create, eTYPE_LAVASLIME, L"LavaSlime", 62, + setId(LavaSlime::create, eTYPE_LAVASLIME, "LavaSlime", 62, eMinecraftColour_Mob_LavaSlime_Colour1, eMinecraftColour_Mob_LavaSlime_Colour2, IDS_LAVA_SLIME); - setId(EnderDragon::create, eTYPE_ENDERDRAGON, L"EnderDragon", 63, + setId(EnderDragon::create, eTYPE_ENDERDRAGON, "EnderDragon", 63, eMinecraftColour_Mob_Enderman_Colour1, eMinecraftColour_Mob_Enderman_Colour1, IDS_ENDERDRAGON); - setId(WitherBoss::create, eTYPE_WITHERBOSS, L"WitherBoss", 64); - setId(Bat::create, eTYPE_BAT, L"Bat", 65, eMinecraftColour_Mob_Bat_Colour1, + setId(WitherBoss::create, eTYPE_WITHERBOSS, "WitherBoss", 64); + setId(Bat::create, eTYPE_BAT, "Bat", 65, eMinecraftColour_Mob_Bat_Colour1, eMinecraftColour_Mob_Bat_Colour2, IDS_BAT); - setId(Witch::create, eTYPE_WITCH, L"Witch", 66, + setId(Witch::create, eTYPE_WITCH, "Witch", 66, eMinecraftColour_Mob_Witch_Colour1, eMinecraftColour_Mob_Witch_Colour2, IDS_WITCH); - setId(Pig::create, eTYPE_PIG, L"Pig", 90, eMinecraftColour_Mob_Pig_Colour1, + setId(Pig::create, eTYPE_PIG, "Pig", 90, eMinecraftColour_Mob_Pig_Colour1, eMinecraftColour_Mob_Pig_Colour2, IDS_PIG); - setId(Sheep::create, eTYPE_SHEEP, L"Sheep", 91, + setId(Sheep::create, eTYPE_SHEEP, "Sheep", 91, eMinecraftColour_Mob_Sheep_Colour1, eMinecraftColour_Mob_Sheep_Colour2, IDS_SHEEP); - setId(Cow::create, eTYPE_COW, L"Cow", 92, eMinecraftColour_Mob_Cow_Colour1, + setId(Cow::create, eTYPE_COW, "Cow", 92, eMinecraftColour_Mob_Cow_Colour1, eMinecraftColour_Mob_Cow_Colour2, IDS_COW); - setId(Chicken::create, eTYPE_CHICKEN, L"Chicken", 93, + setId(Chicken::create, eTYPE_CHICKEN, "Chicken", 93, eMinecraftColour_Mob_Chicken_Colour1, eMinecraftColour_Mob_Chicken_Colour2, IDS_CHICKEN); - setId(Squid::create, eTYPE_SQUID, L"Squid", 94, + setId(Squid::create, eTYPE_SQUID, "Squid", 94, eMinecraftColour_Mob_Squid_Colour1, eMinecraftColour_Mob_Squid_Colour2, IDS_SQUID); - setId(Wolf::create, eTYPE_WOLF, L"Wolf", 95, + setId(Wolf::create, eTYPE_WOLF, "Wolf", 95, eMinecraftColour_Mob_Wolf_Colour1, eMinecraftColour_Mob_Wolf_Colour2, IDS_WOLF); - setId(MushroomCow::create, eTYPE_MUSHROOMCOW, L"MushroomCow", 96, + setId(MushroomCow::create, eTYPE_MUSHROOMCOW, "MushroomCow", 96, eMinecraftColour_Mob_MushroomCow_Colour1, eMinecraftColour_Mob_MushroomCow_Colour2, IDS_MUSHROOM_COW); - setId(SnowMan::create, eTYPE_SNOWMAN, L"SnowMan", 97); - setId(Ocelot::create, eTYPE_OCELOT, L"Ozelot", 98, + setId(SnowMan::create, eTYPE_SNOWMAN, "SnowMan", 97); + setId(Ocelot::create, eTYPE_OCELOT, "Ozelot", 98, eMinecraftColour_Mob_Ocelot_Colour1, eMinecraftColour_Mob_Ocelot_Colour2, IDS_OZELOT); - setId(VillagerGolem::create, eTYPE_VILLAGERGOLEM, L"VillagerGolem", 99); - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", 100, + setId(VillagerGolem::create, eTYPE_VILLAGERGOLEM, "VillagerGolem", 99); + setId(EntityHorse::create, eTYPE_HORSE, "EntityHorse", 100, eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_HORSE); - setId(Villager::create, eTYPE_VILLAGER, L"Villager", 120, + setId(Villager::create, eTYPE_VILLAGER, "Villager", 120, eMinecraftColour_Mob_Villager_Colour1, eMinecraftColour_Mob_Villager_Colour2, IDS_VILLAGER); - setId(EnderCrystal::create, eTYPE_ENDER_CRYSTAL, L"EnderCrystal", 200); + setId(EnderCrystal::create, eTYPE_ENDER_CRYSTAL, "EnderCrystal", 200); // 4J Added - setId(DragonFireball::create, eTYPE_DRAGON_FIREBALL, L"DragonFireball", + setId(DragonFireball::create, eTYPE_DRAGON_FIREBALL, "DragonFireball", 1000); // 4J-PB - moved to allow the eggs to be named and coloured in the Creative // Mode menu 4J Added for custom spawn eggs - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", + setId(EntityHorse::create, eTYPE_HORSE, "EntityHorse", 100 | ((EntityHorse::TYPE_DONKEY + 1) << 12), eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_DONKEY); - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", + setId(EntityHorse::create, eTYPE_HORSE, "EntityHorse", 100 | ((EntityHorse::TYPE_MULE + 1) << 12), eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_MULE); #ifndef _CONTENT_PACKAGE - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", + setId(EntityHorse::create, eTYPE_HORSE, "EntityHorse", 100 | ((EntityHorse::TYPE_SKELETON + 1) << 12), eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_SKELETON_HORSE); - setId(EntityHorse::create, eTYPE_HORSE, L"EntityHorse", + setId(EntityHorse::create, eTYPE_HORSE, "EntityHorse", 100 | ((EntityHorse::TYPE_UNDEAD + 1) << 12), eMinecraftColour_Mob_Horse_Colour1, eMinecraftColour_Mob_Horse_Colour2, IDS_ZOMBIE_HORSE); - setId(Ocelot::create, eTYPE_OCELOT, L"Ozelot", + setId(Ocelot::create, eTYPE_OCELOT, "Ozelot", 98 | ((Ocelot::TYPE_BLACK + 1) << 12), eMinecraftColour_Mob_Ocelot_Colour1, eMinecraftColour_Mob_Ocelot_Colour2, IDS_OZELOT); - setId(Ocelot::create, eTYPE_OCELOT, L"Ozelot", + setId(Ocelot::create, eTYPE_OCELOT, "Ozelot", 98 | ((Ocelot::TYPE_RED + 1) << 12), eMinecraftColour_Mob_Ocelot_Colour1, eMinecraftColour_Mob_Ocelot_Colour2, IDS_OZELOT); - setId(Ocelot::create, eTYPE_OCELOT, L"Ozelot", + setId(Ocelot::create, eTYPE_OCELOT, "Ozelot", 98 | ((Ocelot::TYPE_SIAMESE + 1) << 12), eMinecraftColour_Mob_Ocelot_Colour1, eMinecraftColour_Mob_Ocelot_Colour2, IDS_OZELOT); - setId(Spider::create, eTYPE_SPIDER, L"Spider", 52 | (2 << 12), + setId(Spider::create, eTYPE_SPIDER, "Spider", 52 | (2 << 12), eMinecraftColour_Mob_Spider_Colour1, eMinecraftColour_Mob_Spider_Colour2, IDS_SKELETON); #endif } -std::shared_ptr EntityIO::newEntity(const std::wstring& id, +std::shared_ptr EntityIO::newEntity(const std::string& id, Level* level) { std::shared_ptr entity; @@ -299,25 +299,25 @@ std::shared_ptr EntityIO::newEntity(const std::wstring& id, std::shared_ptr EntityIO::loadStatic(CompoundTag* tag, Level* level) { std::shared_ptr entity; - if (tag->getString(L"id").compare(L"Minecart") == 0) { + if (tag->getString("id").compare("Minecart") == 0) { // I don't like this any more than you do. Sadly, compatibility... - switch (tag->getInt(L"Type")) { + switch (tag->getInt("Type")) { case Minecart::TYPE_CHEST: - tag->putString(L"id", L"MinecartChest"); + tag->putString("id", "MinecartChest"); break; case Minecart::TYPE_FURNACE: - tag->putString(L"id", L"MinecartFurnace"); + tag->putString("id", "MinecartFurnace"); break; case Minecart::TYPE_RIDEABLE: - tag->putString(L"id", L"MinecartRideable"); + tag->putString("id", "MinecartRideable"); break; } - tag->remove(L"Type"); + tag->remove("Type"); } - auto it = idCreateMap->find(tag->getString(L"id")); + auto it = idCreateMap->find(tag->getString("id")); if (it != idCreateMap->end()) { entityCreateFn create = it->second; if (create != nullptr) entity = std::shared_ptr(create(level)); @@ -331,8 +331,8 @@ std::shared_ptr EntityIO::loadStatic(CompoundTag* tag, Level* level) { entity->load(tag); } else { #ifdef _DEBUG - Log::info("Skipping Entity with id %ls\n", - tag->getString(L"id").c_str()); + Log::info("Skipping Entity with id %s\n", + tag->getString("id").c_str()); #endif } return entity; @@ -388,17 +388,17 @@ int EntityIO::getId(std::shared_ptr entity) { return (*it).second; } -std::wstring EntityIO::getEncodeId(std::shared_ptr entity) { - std::unordered_map entity) { + std::unordered_map::iterator it = classIdMap->find(entity->GetType()); if (it != classIdMap->end()) return (*it).second; else - return L""; + return ""; } -int EntityIO::getId(const std::wstring& encodeId) { +int EntityIO::getId(const std::string& encodeId) { auto it = idNumMap->find(encodeId); if (it == idNumMap->end()) { // defaults to pig... @@ -407,7 +407,7 @@ int EntityIO::getId(const std::wstring& encodeId) { return it->second; } -std::wstring EntityIO::getEncodeId(int entityIoValue) { +std::string EntityIO::getEncodeId(int entityIoValue) { // Class class1 = numClassMap.get(entityIoValue); // if (class1 != null) //{ @@ -416,16 +416,16 @@ std::wstring EntityIO::getEncodeId(int entityIoValue) { auto it = numClassMap->find(entityIoValue); if (it != numClassMap->end()) { - std::unordered_map::iterator classIdIt = classIdMap->find(it->second); if (classIdIt != classIdMap->end()) return (*classIdIt).second; else - return L""; + return ""; } - return L""; + return ""; } int EntityIO::getNameId(int entityIoValue) { @@ -439,7 +439,7 @@ int EntityIO::getNameId(int entityIoValue) { return id; } -eINSTANCEOF EntityIO::getType(const std::wstring& idString) { +eINSTANCEOF EntityIO::getType(const std::string& idString) { auto it = numClassMap->find(getId(idString)); if (it != numClassMap->end()) { return it->second; diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index f7c804d8b..8693f099a 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -35,40 +35,40 @@ public: }; private: - static std::unordered_map* idCreateMap; - static std::unordered_map* idCreateMap; + static std::unordered_map* classIdMap; static std::unordered_map* numCreateMap; static std::unordered_map* numClassMap; static std::unordered_map* classNumMap; - static std::unordered_map* idNumMap; + static std::unordered_map* idNumMap; public: static std::unordered_map idsSpawnableInCreative; private: static void setId(entityCreateFn createFn, eINSTANCEOF clas, - const std::wstring& id, int idNum); + const std::string& id, int idNum); static void setId(entityCreateFn createFn, eINSTANCEOF clas, - const std::wstring& id, int idNum, + const std::string& id, int idNum, eMinecraftColour color1, eMinecraftColour color2, int nameId); public: static void staticCtor(); - static std::shared_ptr newEntity(const std::wstring& id, + static std::shared_ptr newEntity(const std::string& id, Level* level); static std::shared_ptr loadStatic(CompoundTag* tag, Level* level); static std::shared_ptr newById(int id, Level* level); static std::shared_ptr newByEnumType(eINSTANCEOF eType, Level* level); static int getId(std::shared_ptr entity); - static std::wstring getEncodeId(std::shared_ptr entity); - static int getId(const std::wstring& encodeId); - static std::wstring getEncodeId(int entityIoValue); + static std::string getEncodeId(std::shared_ptr entity); + static int getId(const std::string& encodeId); + static std::string getEncodeId(int entityIoValue); static int getNameId(int entityIoValue); - static eINSTANCEOF getType(const std::wstring& idString); + static eINSTANCEOF getType(const std::string& idString); static eINSTANCEOF getClass(int id); // 4J-JEV, added for enumerating mobs. diff --git a/targets/minecraft/world/entity/ExperienceOrb.cpp b/targets/minecraft/world/entity/ExperienceOrb.cpp index ae2931421..73de05d64 100644 --- a/targets/minecraft/world/entity/ExperienceOrb.cpp +++ b/targets/minecraft/world/entity/ExperienceOrb.cpp @@ -171,15 +171,15 @@ bool ExperienceOrb::hurt(DamageSource* source, float damage) { } void ExperienceOrb::addAdditonalSaveData(CompoundTag* entityTag) { - entityTag->putShort(L"Health", (uint8_t)health); - entityTag->putShort(L"Age", (short)age); - entityTag->putShort(L"Value", (short)value); + entityTag->putShort("Health", (uint8_t)health); + entityTag->putShort("Age", (short)age); + entityTag->putShort("Value", (short)value); } void ExperienceOrb::readAdditionalSaveData(CompoundTag* tag) { - health = tag->getShort(L"Health") & 0xff; - age = tag->getShort(L"Age"); - value = tag->getShort(L"Value"); + health = tag->getShort("Health") & 0xff; + age = tag->getShort("Age"); + value = tag->getShort("Value"); } void ExperienceOrb::playerTouch(std::shared_ptr player) { diff --git a/targets/minecraft/world/entity/HangingEntity.cpp b/targets/minecraft/world/entity/HangingEntity.cpp index de45a3e56..23a7f5545 100644 --- a/targets/minecraft/world/entity/HangingEntity.cpp +++ b/targets/minecraft/world/entity/HangingEntity.cpp @@ -217,33 +217,33 @@ void HangingEntity::push(double xa, double ya, double za) { } void HangingEntity::addAdditonalSaveData(CompoundTag* tag) { - tag->putByte(L"Direction", (uint8_t)dir); - tag->putInt(L"TileX", xTile); - tag->putInt(L"TileY", yTile); - tag->putInt(L"TileZ", zTile); + tag->putByte("Direction", (uint8_t)dir); + tag->putInt("TileX", xTile); + tag->putInt("TileY", yTile); + tag->putInt("TileZ", zTile); // Back compat switch (dir) { case Direction::NORTH: - tag->putByte(L"Dir", (uint8_t)0); + tag->putByte("Dir", (uint8_t)0); break; case Direction::WEST: - tag->putByte(L"Dir", (uint8_t)1); + tag->putByte("Dir", (uint8_t)1); break; case Direction::SOUTH: - tag->putByte(L"Dir", (uint8_t)2); + tag->putByte("Dir", (uint8_t)2); break; case Direction::EAST: - tag->putByte(L"Dir", (uint8_t)3); + tag->putByte("Dir", (uint8_t)3); break; } } void HangingEntity::readAdditionalSaveData(CompoundTag* tag) { - if (tag->contains(L"Direction")) { - dir = tag->getByte(L"Direction"); + if (tag->contains("Direction")) { + dir = tag->getByte("Direction"); } else { - switch (tag->getByte(L"Dir")) { + switch (tag->getByte("Dir")) { case 0: dir = Direction::NORTH; break; @@ -258,9 +258,9 @@ void HangingEntity::readAdditionalSaveData(CompoundTag* tag) { break; } } - xTile = tag->getInt(L"TileX"); - yTile = tag->getInt(L"TileY"); - zTile = tag->getInt(L"TileZ"); + xTile = tag->getInt("TileX"); + yTile = tag->getInt("TileY"); + zTile = tag->getInt("TileZ"); setDir(dir); } diff --git a/targets/minecraft/world/entity/ItemFrame.cpp b/targets/minecraft/world/entity/ItemFrame.cpp index f57dd9a61..3fe0086d3 100644 --- a/targets/minecraft/world/entity/ItemFrame.cpp +++ b/targets/minecraft/world/entity/ItemFrame.cpp @@ -99,21 +99,21 @@ void ItemFrame::setRotation(int rotation) { void ItemFrame::addAdditonalSaveData(CompoundTag* tag) { if (getItem() != nullptr) { - tag->putCompound(L"Item", getItem()->save(new CompoundTag())); - tag->putByte(L"ItemRotation", (uint8_t)getRotation()); - tag->putFloat(L"ItemDropChance", dropChance); + tag->putCompound("Item", getItem()->save(new CompoundTag())); + tag->putByte("ItemRotation", (uint8_t)getRotation()); + tag->putFloat("ItemDropChance", dropChance); } HangingEntity::addAdditonalSaveData(tag); } void ItemFrame::readAdditionalSaveData(CompoundTag* tag) { - CompoundTag* itemTag = tag->getCompound(L"Item"); + CompoundTag* itemTag = tag->getCompound("Item"); if (itemTag != nullptr && !itemTag->isEmpty()) { setItem(ItemInstance::fromTag(itemTag)); - setRotation(tag->getByte(L"ItemRotation")); + setRotation(tag->getByte("ItemRotation")); - if (tag->contains(L"ItemDropChance")) - dropChance = tag->getFloat(L"ItemDropChance"); + if (tag->contains("ItemDropChance")) + dropChance = tag->getFloat("ItemDropChance"); } HangingEntity::readAdditionalSaveData(tag); } diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index 61b041535..3720cb360 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -381,12 +381,12 @@ void LivingEntity::setLastHurtMob(std::shared_ptr target) { int LivingEntity::getNoActionTime() { return noActionTime; } void LivingEntity::addAdditonalSaveData(CompoundTag* entityTag) { - entityTag->putFloat(L"HealF", getHealth()); - entityTag->putShort(L"Health", (short)ceil(getHealth())); - entityTag->putShort(L"HurtTime", (short)hurtTime); - entityTag->putShort(L"DeathTime", (short)deathTime); - entityTag->putShort(L"AttackTime", (short)attackTime); - entityTag->putFloat(L"AbsorptionAmount", getAbsorptionAmount()); + entityTag->putFloat("HealF", getHealth()); + entityTag->putShort("Health", (short)ceil(getHealth())); + entityTag->putShort("HurtTime", (short)hurtTime); + entityTag->putShort("DeathTime", (short)deathTime); + entityTag->putShort("AttackTime", (short)attackTime); + entityTag->putFloat("AbsorptionAmount", getAbsorptionAmount()); std::vector> items = getEquipmentSlots(); for (unsigned int i = 0; i < items.size(); ++i) { @@ -396,7 +396,7 @@ void LivingEntity::addAdditonalSaveData(CompoundTag* entityTag) { } } - entityTag->put(L"Attributes", + entityTag->put("Attributes", SharedMonsterAttributes::saveAttributes(getAttributes())); for (unsigned int i = 0; i < items.size(); ++i) { @@ -413,23 +413,23 @@ void LivingEntity::addAdditonalSaveData(CompoundTag* entityTag) { MobEffectInstance* effect = it->second; listTag->add(effect->save(new CompoundTag())); } - entityTag->put(L"ActiveEffects", listTag); + entityTag->put("ActiveEffects", listTag); } } void LivingEntity::readAdditionalSaveData(CompoundTag* tag) { - setAbsorptionAmount(tag->getFloat(L"AbsorptionAmount")); + setAbsorptionAmount(tag->getFloat("AbsorptionAmount")); - if (tag->contains(L"Attributes") && level != nullptr && + if (tag->contains("Attributes") && level != nullptr && !level->isClientSide) { SharedMonsterAttributes::loadAttributes( getAttributes(), - (ListTag*)tag->getList(L"Attributes")); + (ListTag*)tag->getList("Attributes")); } - if (tag->contains(L"ActiveEffects")) { + if (tag->contains("ActiveEffects")) { ListTag* effects = - (ListTag*)tag->getList(L"ActiveEffects"); + (ListTag*)tag->getList("ActiveEffects"); for (int i = 0; i < effects->size(); i++) { CompoundTag* effectTag = effects->get(i); MobEffectInstance* effect = MobEffectInstance::load(effectTag); @@ -439,10 +439,10 @@ void LivingEntity::readAdditionalSaveData(CompoundTag* tag) { } } - if (tag->contains(L"HealF")) { - setHealth(tag->getFloat(L"HealF")); + if (tag->contains("HealF")) { + setHealth(tag->getFloat("HealF")); } else { - Tag* healthTag = tag->get(L"Health"); + Tag* healthTag = tag->get("Health"); if (healthTag == nullptr) { setHealth(getMaxHealth()); } else if (healthTag->getId() == Tag::TAG_Float) { @@ -453,9 +453,9 @@ void LivingEntity::readAdditionalSaveData(CompoundTag* tag) { } } - hurtTime = tag->getShort(L"HurtTime"); - deathTime = tag->getShort(L"DeathTime"); - attackTime = tag->getShort(L"AttackTime"); + hurtTime = tag->getShort("HurtTime"); + deathTime = tag->getShort("DeathTime"); + attackTime = tag->getShort("AttackTime"); } void LivingEntity::tickEffects() { diff --git a/targets/minecraft/world/entity/Mob.cpp b/targets/minecraft/world/entity/Mob.cpp index 9fe0a5f95..80fda456d 100644 --- a/targets/minecraft/world/entity/Mob.cpp +++ b/targets/minecraft/world/entity/Mob.cpp @@ -144,7 +144,7 @@ void Mob::ate() {} void Mob::defineSynchedData() { LivingEntity::defineSynchedData(); entityData->define(DATA_CUSTOM_NAME_VISIBLE, (uint8_t)0); - entityData->define(DATA_CUSTOM_NAME, L""); + entityData->define(DATA_CUSTOM_NAME, ""); } int Mob::getAmbientSoundInterval() { return 20 * 4; } @@ -231,8 +231,8 @@ void Mob::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { void Mob::addAdditonalSaveData(CompoundTag* entityTag) { LivingEntity::addAdditonalSaveData(entityTag); - entityTag->putBoolean(L"CanPickUpLoot", canPickUpLoot()); - entityTag->putBoolean(L"PersistenceRequired", persistenceRequired); + entityTag->putBoolean("CanPickUpLoot", canPickUpLoot()); + entityTag->putBoolean("PersistenceRequired", persistenceRequired); ListTag* gear = new ListTag(); for (int i = 0; i < equipment.size(); i++) { @@ -240,65 +240,65 @@ void Mob::addAdditonalSaveData(CompoundTag* entityTag) { if (equipment[i] != nullptr) equipment[i]->save(tag); gear->add(tag); } - entityTag->put(L"Equipment", gear); + entityTag->put("Equipment", gear); ListTag* dropChanceList = new ListTag(); for (int i = 0; i < dropChances.size(); i++) { dropChanceList->add(new FloatTag(toWString(i), dropChances[i])); } - entityTag->put(L"DropChances", dropChanceList); - entityTag->putString(L"CustomName", getCustomName()); - entityTag->putBoolean(L"CustomNameVisible", isCustomNameVisible()); + entityTag->put("DropChances", dropChanceList); + entityTag->putString("CustomName", getCustomName()); + entityTag->putBoolean("CustomNameVisible", isCustomNameVisible()); // leash info - entityTag->putBoolean(L"Leashed", _isLeashed); + entityTag->putBoolean("Leashed", _isLeashed); if (leashHolder != nullptr) { - CompoundTag* leashTag = new CompoundTag(L"Leash"); + CompoundTag* leashTag = new CompoundTag("Leash"); if (leashHolder->instanceof(eTYPE_LIVINGENTITY)) { // a walking, talking, leash holder - leashTag->putString(L"UUID", leashHolder->getUUID()); + leashTag->putString("UUID", leashHolder->getUUID()); } else if (leashHolder->instanceof(eTYPE_HANGING_ENTITY)) { // a fixed holder (that doesn't save itself) std::shared_ptr hangInThere = std::dynamic_pointer_cast(leashHolder); - leashTag->putInt(L"X", hangInThere->xTile); - leashTag->putInt(L"Y", hangInThere->yTile); - leashTag->putInt(L"Z", hangInThere->zTile); + leashTag->putInt("X", hangInThere->xTile); + leashTag->putInt("Y", hangInThere->yTile); + leashTag->putInt("Z", hangInThere->zTile); } - entityTag->put(L"Leash", leashTag); + entityTag->put("Leash", leashTag); } } void Mob::readAdditionalSaveData(CompoundTag* tag) { LivingEntity::readAdditionalSaveData(tag); - setCanPickUpLoot(tag->getBoolean(L"CanPickUpLoot")); - persistenceRequired = tag->getBoolean(L"PersistenceRequired"); - if (tag->contains(L"CustomName") && - tag->getString(L"CustomName").length() > 0) - setCustomName(tag->getString(L"CustomName")); - setCustomNameVisible(tag->getBoolean(L"CustomNameVisible")); + setCanPickUpLoot(tag->getBoolean("CanPickUpLoot")); + persistenceRequired = tag->getBoolean("PersistenceRequired"); + if (tag->contains("CustomName") && + tag->getString("CustomName").length() > 0) + setCustomName(tag->getString("CustomName")); + setCustomNameVisible(tag->getBoolean("CustomNameVisible")); - if (tag->contains(L"Equipment")) { + if (tag->contains("Equipment")) { ListTag* gear = - (ListTag*)tag->getList(L"Equipment"); + (ListTag*)tag->getList("Equipment"); for (int i = 0; i < equipment.size(); i++) { equipment[i] = ItemInstance::fromTag(gear->get(i)); } } - if (tag->contains(L"DropChances")) { + if (tag->contains("DropChances")) { ListTag* items = - (ListTag*)tag->getList(L"DropChances"); + (ListTag*)tag->getList("DropChances"); for (int i = 0; i < items->size(); i++) { dropChances[i] = items->get(i)->data; } } - _isLeashed = tag->getBoolean(L"Leashed"); - if (_isLeashed && tag->contains(L"Leash")) { - leashInfoTag = (CompoundTag*)tag->getCompound(L"Leash")->copy(); + _isLeashed = tag->getBoolean("Leashed"); + if (_isLeashed && tag->contains("Leash")) { + leashInfoTag = (CompoundTag*)tag->getCompound("Leash")->copy(); } } @@ -706,18 +706,18 @@ void Mob::finalizeSpawnEggSpawn(int extraData) {} bool Mob::canBeControlledByRider() { return false; } -std::wstring Mob::getAName() { +std::string Mob::getAName() { if (hasCustomName()) return getCustomName(); return LivingEntity::getAName(); } void Mob::setPersistenceRequired() { persistenceRequired = true; } -void Mob::setCustomName(const std::wstring& name) { +void Mob::setCustomName(const std::string& name) { entityData->set(DATA_CUSTOM_NAME, name); } -std::wstring Mob::getCustomName() { +std::string Mob::getCustomName() { return entityData->getString(DATA_CUSTOM_NAME); } @@ -847,8 +847,8 @@ void Mob::setLeashedTo(std::shared_ptr holder, bool synch) { void Mob::restoreLeashFromSave() { // after being added to the world, attempt to recreate leash bond if (_isLeashed && leashInfoTag != nullptr) { - if (leashInfoTag->contains(L"UUID")) { - std::wstring leashUuid = leashInfoTag->getString(L"UUID"); + if (leashInfoTag->contains("UUID")) { + std::string leashUuid = leashInfoTag->getString("UUID"); AABB grown = bb.grow(10, 10, 10); std::vector>* livingEnts = level->getEntitiesOfClass(typeid(LivingEntity), &grown); @@ -862,12 +862,12 @@ void Mob::restoreLeashFromSave() { } } delete livingEnts; - } else if (leashInfoTag->contains(L"X") && - leashInfoTag->contains(L"Y") && - leashInfoTag->contains(L"Z")) { - int x = leashInfoTag->getInt(L"X"); - int y = leashInfoTag->getInt(L"Y"); - int z = leashInfoTag->getInt(L"Z"); + } else if (leashInfoTag->contains("X") && + leashInfoTag->contains("Y") && + leashInfoTag->contains("Z")) { + int x = leashInfoTag->getInt("X"); + int y = leashInfoTag->getInt("Y"); + int z = leashInfoTag->getInt("Z"); std::shared_ptr activeKnot = LeashFenceKnotEntity::findKnotAt(level, x, y, z); diff --git a/targets/minecraft/world/entity/Mob.h b/targets/minecraft/world/entity/Mob.h index 5e86805c8..200c0c2ac 100644 --- a/targets/minecraft/world/entity/Mob.h +++ b/targets/minecraft/world/entity/Mob.h @@ -194,10 +194,10 @@ public: int extraData = 0); // 4J Added extraData param virtual void finalizeSpawnEggSpawn(int extraData); // 4J Added virtual bool canBeControlledByRider(); - virtual std::wstring getAName(); + virtual std::string getAName(); virtual void setPersistenceRequired(); - virtual void setCustomName(const std::wstring& name); - virtual std::wstring getCustomName(); + virtual void setCustomName(const std::string& name); + virtual std::string getCustomName(); virtual bool hasCustomName(); virtual void setCustomNameVisible(bool visible); virtual bool isCustomNameVisible(); diff --git a/targets/minecraft/world/entity/OwnableEntity.h b/targets/minecraft/world/entity/OwnableEntity.h index ced499659..55cdceee4 100644 --- a/targets/minecraft/world/entity/OwnableEntity.h +++ b/targets/minecraft/world/entity/OwnableEntity.h @@ -7,6 +7,6 @@ class Entity; class OwnableEntity { public: - virtual std::wstring getOwnerUUID() = 0; + virtual std::string getOwnerUUID() = 0; virtual std::shared_ptr getOwner() = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp index ec9629088..7c48a5455 100644 --- a/targets/minecraft/world/entity/Painting.cpp +++ b/targets/minecraft/world/entity/Painting.cpp @@ -16,37 +16,37 @@ typedef Painting::Motive _Motive; const _Motive* Painting::Motive::values[] = { - new _Motive(L"Kebab", 16, 16, 0 * 16, 0 * 16), - new _Motive(L"Aztec", 16, 16, 1 * 16, 0 * 16), // - new _Motive(L"Alban", 16, 16, 2 * 16, 0 * 16), // - new _Motive(L"Aztec2", 16, 16, 3 * 16, 0 * 16), // - new _Motive(L"Bomb", 16, 16, 4 * 16, 0 * 16), // - new _Motive(L"Plant", 16, 16, 5 * 16, 0 * 16), // - new _Motive(L"Wasteland", 16, 16, 6 * 16, 0 * 16), // + new _Motive("Kebab", 16, 16, 0 * 16, 0 * 16), + new _Motive("Aztec", 16, 16, 1 * 16, 0 * 16), // + new _Motive("Alban", 16, 16, 2 * 16, 0 * 16), // + new _Motive("Aztec2", 16, 16, 3 * 16, 0 * 16), // + new _Motive("Bomb", 16, 16, 4 * 16, 0 * 16), // + new _Motive("Plant", 16, 16, 5 * 16, 0 * 16), // + new _Motive("Wasteland", 16, 16, 6 * 16, 0 * 16), // - new _Motive(L"Pool", 32, 16, 0 * 16, 2 * 16), // - new _Motive(L"Courbet", 32, 16, 2 * 16, 2 * 16), // - new _Motive(L"Sea", 32, 16, 4 * 16, 2 * 16), // - new _Motive(L"Sunset", 32, 16, 6 * 16, 2 * 16), // - new _Motive(L"Creebet", 32, 16, 8 * 16, 2 * 16), // + new _Motive("Pool", 32, 16, 0 * 16, 2 * 16), // + new _Motive("Courbet", 32, 16, 2 * 16, 2 * 16), // + new _Motive("Sea", 32, 16, 4 * 16, 2 * 16), // + new _Motive("Sunset", 32, 16, 6 * 16, 2 * 16), // + new _Motive("Creebet", 32, 16, 8 * 16, 2 * 16), // - new _Motive(L"Wanderer", 16, 32, 0 * 16, 4 * 16), // - new _Motive(L"Graham", 16, 32, 1 * 16, 4 * 16), // + new _Motive("Wanderer", 16, 32, 0 * 16, 4 * 16), // + new _Motive("Graham", 16, 32, 1 * 16, 4 * 16), // - new _Motive(L"Match", 32, 32, 0 * 16, 8 * 16), // - new _Motive(L"Bust", 32, 32, 2 * 16, 8 * 16), // - new _Motive(L"Stage", 32, 32, 4 * 16, 8 * 16), // - new _Motive(L"Void", 32, 32, 6 * 16, 8 * 16), // - new _Motive(L"SkullAndRoses", 32, 32, 8 * 16, 8 * 16), // - new _Motive(L"Wither", 32, 32, 10 * 16, 8 * 16), - new _Motive(L"Fighters", 64, 32, 0 * 16, 6 * 16), // + new _Motive("Match", 32, 32, 0 * 16, 8 * 16), // + new _Motive("Bust", 32, 32, 2 * 16, 8 * 16), // + new _Motive("Stage", 32, 32, 4 * 16, 8 * 16), // + new _Motive("Void", 32, 32, 6 * 16, 8 * 16), // + new _Motive("SkullAndRoses", 32, 32, 8 * 16, 8 * 16), // + new _Motive("Wither", 32, 32, 10 * 16, 8 * 16), + new _Motive("Fighters", 64, 32, 0 * 16, 6 * 16), // - new _Motive(L"Pointer", 64, 64, 0 * 16, 12 * 16), // - new _Motive(L"Pigscene", 64, 64, 4 * 16, 12 * 16), // - new _Motive(L"BurningSkull", 64, 64, 8 * 16, 12 * 16), // + new _Motive("Pointer", 64, 64, 0 * 16, 12 * 16), // + new _Motive("Pigscene", 64, 64, 4 * 16, 12 * 16), // + new _Motive("BurningSkull", 64, 64, 8 * 16, 12 * 16), // - new _Motive(L"Skeleton", 64, 48, 12 * 16, 4 * 16), // - new _Motive(L"DonkeyKong", 64, 48, 12 * 16, 7 * 16), // + new _Motive("Skeleton", 64, 48, 12 * 16, 4 * 16), // + new _Motive("DonkeyKong", 64, 48, 12 * 16, 7 * 16), // }; // 4J Stu - Rather than creating a new string object here I am just using the @@ -101,7 +101,7 @@ void Painting::PaintingPostConstructor(int dir, int motive) { } Painting::Painting(Level* level, int x, int y, int z, int dir, - std::wstring motiveName) + std::string motiveName) : HangingEntity(level, x, y, z, dir) { _init(level); @@ -116,13 +116,13 @@ Painting::Painting(Level* level, int x, int y, int z, int dir, void Painting::addAdditonalSaveData(CompoundTag* tag) { /// TODO Safe to cast to non-const type? - tag->putString(L"Motive", motive->name); + tag->putString("Motive", motive->name); HangingEntity::addAdditonalSaveData(tag); } void Painting::readAdditionalSaveData(CompoundTag* tag) { - std::wstring motiveName = tag->getString(L"Motive"); + std::string motiveName = tag->getString("Motive"); std::vector::iterator it; for (int i = 0; i < LAST_VALUE; i++) { if (Motive::values[i]->name.compare(motiveName) == 0) { diff --git a/targets/minecraft/world/entity/Painting.h b/targets/minecraft/world/entity/Painting.h index 360878229..1f94ce25e 100644 --- a/targets/minecraft/world/entity/Painting.h +++ b/targets/minecraft/world/entity/Painting.h @@ -63,12 +63,12 @@ public: static const int MAX_MOTIVE_NAME_LENGTH; - const std::wstring name; + const std::string name; const int w, h; const int uo, vo; // private: - Motive(std::wstring name, int w, int h, int uo, int vo) + Motive(std::string name, int w, int h, int uo, int vo) : name(name), w(w), h(h), uo(uo), vo(vo) {}; }; @@ -83,7 +83,7 @@ public: Painting(Level* level); Painting(Level* level, int xTile, int yTile, int zTile, int dir); Painting(Level* level, int x, int y, int z, int dir, - std::wstring motiveName); + std::string motiveName); // 4J Stu - Added this so that we can use some shared_ptr functions that // were needed in the ctor 4J Stu - Added motive param for debugging/artists diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp index 3894f020a..ba2034f53 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.cpp +++ b/targets/minecraft/world/entity/SyncedEntityData.cpp @@ -53,7 +53,7 @@ void SynchedEntityData::define(int id, float value) { m_isEmpty = false; } -void SynchedEntityData::define(int id, const std::wstring& value) { +void SynchedEntityData::define(int id, const std::string& value) { checkId(id); int type = TYPE_STRING; std::shared_ptr dataItem = @@ -89,7 +89,7 @@ float SynchedEntityData::getFloat(int id) { return itemsById[id]->getValue_float(); } -std::wstring SynchedEntityData::getString(int id) { +std::string SynchedEntityData::getString(int id) { return itemsById[id]->getValue_wstring(); } @@ -147,7 +147,7 @@ void SynchedEntityData::set(int id, float value) { } } -void SynchedEntityData::set(int id, const std::wstring& value) { +void SynchedEntityData::set(int id, const std::string& value) { std::shared_ptr dataItem = itemsById[id]; // update the value if it has changed @@ -463,7 +463,7 @@ SynchedEntityData::DataItem::DataItem(int type, int id, float value) } SynchedEntityData::DataItem::DataItem(int type, int id, - const std::wstring& value) + const std::string& value) : type(type), id(id) { this->value_wstring = value; this->dirty = true; @@ -494,7 +494,7 @@ void SynchedEntityData::DataItem::setValue(float value) { this->value_float = value; } -void SynchedEntityData::DataItem::setValue(const std::wstring& value) { +void SynchedEntityData::DataItem::setValue(const std::string& value) { this->value_wstring = value; } @@ -511,7 +511,7 @@ float SynchedEntityData::DataItem::getValue_float() { return value_float; } uint8_t SynchedEntityData::DataItem::getValue_byte() { return value_byte; } -std::wstring SynchedEntityData::DataItem::getValue_wstring() { +std::string SynchedEntityData::DataItem::getValue_wstring() { return value_wstring; } diff --git a/targets/minecraft/world/entity/SyncedEntityData.h b/targets/minecraft/world/entity/SyncedEntityData.h index 3a06aea25..fae7e8121 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.h +++ b/targets/minecraft/world/entity/SyncedEntityData.h @@ -29,7 +29,7 @@ public: short value_short; float value_float; }; - std::wstring value_wstring; + std::string value_wstring; std::shared_ptr value_itemInstance; bool dirty; @@ -38,7 +38,7 @@ public: // overloading here instead DataItem(int type, int id, uint8_t value); DataItem(int type, int id, int value); - DataItem(int type, int id, const std::wstring& value); + DataItem(int type, int id, const std::string& value); DataItem(int type, int id, std::shared_ptr itemInstance); DataItem(int type, int id, short value); DataItem(int type, int id, float value); @@ -48,13 +48,13 @@ public: void setValue(int value); void setValue(short value); void setValue(float value); - void setValue(const std::wstring& value); + void setValue(const std::string& value); void setValue(std::shared_ptr value); uint8_t getValue_byte(); int getValue_int(); short getValue_short(); float getValue_float(); - std::wstring getValue_wstring(); + std::string getValue_wstring(); std::shared_ptr getValue_itemInstance(); int getType(); bool isDirty(); @@ -96,7 +96,7 @@ public: // automatic Class to type sort of conversion that's a real pain for us to // actually do void define(int id, uint8_t value); - void define(int id, const std::wstring& value); + void define(int id, const std::string& value); void define(int id, int value); void define(int id, short value); void define(int id, float value); @@ -108,7 +108,7 @@ public: short getShort(int id); int getInteger(int id); float getFloat(int id); - std::wstring getString(int id); + std::string getString(int id); std::shared_ptr getItemInstance(int id); Pos* getPos(int id); // 4J - using overloads rather than template here @@ -116,7 +116,7 @@ public: void set(int id, int value); void set(int id, short value); void set(int id, float value); - void set(int id, const std::wstring& value); + void set(int id, const std::string& value); void set(int id, std::shared_ptr); void markDirty(int id); bool isDirty(); diff --git a/targets/minecraft/world/entity/TamableAnimal.cpp b/targets/minecraft/world/entity/TamableAnimal.cpp index b1b8c59d3..81c76952a 100644 --- a/targets/minecraft/world/entity/TamableAnimal.cpp +++ b/targets/minecraft/world/entity/TamableAnimal.cpp @@ -22,28 +22,28 @@ TamableAnimal::~TamableAnimal() { void TamableAnimal::defineSynchedData() { Animal::defineSynchedData(); entityData->define(DATA_FLAGS_ID, (uint8_t)0); - entityData->define(DATA_OWNERUUID_ID, L""); + entityData->define(DATA_OWNERUUID_ID, ""); } void TamableAnimal::addAdditonalSaveData(CompoundTag* tag) { Animal::addAdditonalSaveData(tag); if (getOwnerUUID().empty()) { - tag->putString(L"Owner", L""); + tag->putString("Owner", ""); } else { - tag->putString(L"Owner", getOwnerUUID()); + tag->putString("Owner", getOwnerUUID()); } - tag->putBoolean(L"Sitting", isSitting()); + tag->putBoolean("Sitting", isSitting()); } void TamableAnimal::readAdditionalSaveData(CompoundTag* tag) { Animal::readAdditionalSaveData(tag); - std::wstring owner = tag->getString(L"Owner"); + std::string owner = tag->getString("Owner"); if (owner.length() > 0) { setOwnerUUID(owner); setTame(true); } - sitGoal->wantToSit(tag->getBoolean(L"Sitting")); - setSitting(tag->getBoolean(L"Sitting")); + sitGoal->wantToSit(tag->getBoolean("Sitting")); + setSitting(tag->getBoolean("Sitting")); } void TamableAnimal::spawnTamingParticles(bool success) { @@ -98,11 +98,11 @@ void TamableAnimal::setSitting(bool value) { } } -std::wstring TamableAnimal::getOwnerUUID() { +std::string TamableAnimal::getOwnerUUID() { return entityData->getString(DATA_OWNERUUID_ID); } -void TamableAnimal::setOwnerUUID(const std::wstring& name) { +void TamableAnimal::setOwnerUUID(const std::string& name) { entityData->set(DATA_OWNERUUID_ID, name); } diff --git a/targets/minecraft/world/entity/TamableAnimal.h b/targets/minecraft/world/entity/TamableAnimal.h index a372af386..4ee16701f 100644 --- a/targets/minecraft/world/entity/TamableAnimal.h +++ b/targets/minecraft/world/entity/TamableAnimal.h @@ -39,8 +39,8 @@ public: virtual void setTame(bool value); virtual bool isSitting(); virtual void setSitting(bool value); - virtual std::wstring getOwnerUUID(); - virtual void setOwnerUUID(const std::wstring& name); + virtual std::string getOwnerUUID(); + virtual void setOwnerUUID(const std::string& name); virtual std::shared_ptr getOwner(); virtual SitGoal* getSitGoal(); bool wantsToAttack(std::shared_ptr target, diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index 229c476e5..a01a153d1 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -9,7 +9,7 @@ #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" -void AttributeModifier::_init(eMODIFIER_ID id, const std::wstring name, +void AttributeModifier::_init(eMODIFIER_ID id, const std::string name, double amount, int operation) { assert(operation < TOTAL_OPERATIONS); this->amount = amount; @@ -35,7 +35,7 @@ AttributeModifier::AttributeModifier(eMODIFIER_ID id, double amount, eMODIFIER_ID AttributeModifier::getId() { return id; } -std::wstring AttributeModifier::getName() { return name; } +std::string AttributeModifier::getName() { return name; } int AttributeModifier::getOperation() { return operation; } @@ -58,16 +58,16 @@ bool AttributeModifier::equals(AttributeModifier* modifier) { return true; } -std::wstring AttributeModifier::toString() { - return L""; +std::string AttributeModifier::toString() { + return ""; - /*return L"AttributeModifier{" + - L"amount=" + amount + - L", operation=" + operation + - L", name='" + name + '\'' + - L", id=" + id + - L", serialize=" + serialize + - L'}';*/ + /*return "AttributeModifier{" + + "amount=" + amount + + ", operation=" + operation + + ", name='" + name + '\'' + + ", id=" + id + + ", serialize=" + serialize + + '}';*/ } HtmlString AttributeModifier::getHoverText(eATTRIBUTE_ID attribute) { @@ -104,9 +104,9 @@ HtmlString AttributeModifier::getHoverText(eATTRIBUTE_ID attribute) { assert(0); } - wchar_t formatted[256]; - swprintf(formatted, 256, L"%ls%d%ls %ls", (amount > 0 ? L"+" : L"-"), - (int)displayAmount, (percentage ? L"%" : L""), + char formatted[256]; + snprintf(formatted, 256, "%s%d%s %s", (amount > 0 ? "+" : "-"), + (int)displayAmount, (percentage ? "%" : ""), gameServices().getString(Attribute::getName(attribute))); return HtmlString(formatted, color); diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h index 1eefc6249..b725dba92 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.h @@ -52,11 +52,11 @@ public: private: double amount; int operation; - std::wstring name; + std::string name; eMODIFIER_ID id; bool serialize; - void _init(eMODIFIER_ID id, const std::wstring name, double amount, + void _init(eMODIFIER_ID id, const std::string name, double amount, int operation); public: @@ -64,13 +64,13 @@ public: AttributeModifier(eMODIFIER_ID id, double amount, int operation); eMODIFIER_ID getId(); - std::wstring getName(); + std::string getName(); int getOperation(); double getAmount(); bool isSerializable(); AttributeModifier* setSerialize(bool serialize); bool equals(AttributeModifier* modifier); - std::wstring toString(); + std::string toString(); HtmlString getHoverText( eATTRIBUTE_ID attribute); // 4J: Added to keep modifier readable // std::string creation in one place diff --git a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h index b6bd3f2d8..cab020377 100644 --- a/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h +++ b/targets/minecraft/world/entity/ai/attributes/RangedAttribute.h @@ -17,6 +17,6 @@ public: double sanitizeValue(double value); // 4J: Removed legacy name - // RangedAttribute *importLegacyName(const std::wstring &name); - // std::wstring getImportLegacyName(); + // RangedAttribute *importLegacyName(const std::string &name); + // std::string getImportLegacyName(); }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp index fcc636786..81a5579d2 100644 --- a/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp +++ b/targets/minecraft/world/entity/ai/attributes/ServersideAttributeMap.cpp @@ -46,9 +46,9 @@ AttributeInstance* ServersideAttributeMap::registerAttribute( // If this is a ranged attribute also add to legacy name map /*RangedAttribute *rangedAttribute = dynamic_cast(attribute); if (rangedAttribute != nullptr && - rangedAttribute->getImportLegacyName() != L"") + rangedAttribute->getImportLegacyName() != "") { - attributesByLegacy.insert(std::pair(rangedAttribute->getImportLegacyName(), instance)); }*/ diff --git a/targets/minecraft/world/entity/ai/village/Village.cpp b/targets/minecraft/world/entity/ai/village/Village.cpp index aec9d4355..a483382d6 100644 --- a/targets/minecraft/world/entity/ai/village/Village.cpp +++ b/targets/minecraft/world/entity/ai/village/Village.cpp @@ -272,7 +272,7 @@ std::shared_ptr Village::getClosestBadStandingPlayer( // for (String player : playerStanding.keySet()) for (auto it = playerStanding.begin(); it != playerStanding.end(); ++it) { - std::wstring player = it->first; + std::string player = it->first; if (isVeryBadStanding(player)) { std::shared_ptr mob = level->getPlayerByName(player); if (mob != nullptr) { @@ -353,7 +353,7 @@ void Village::calcInfo() { radius = std::max(doorDist, (int)sqrt((float)maxRadiusSqr) + 1); } -int Village::getStanding(const std::wstring& playerName) { +int Village::getStanding(const std::string& playerName) { auto it = playerStanding.find(playerName); if (it != playerStanding.end()) { return it->second; @@ -361,98 +361,98 @@ int Village::getStanding(const std::wstring& playerName) { return 0; } -int Village::modifyStanding(const std::wstring& playerName, int delta) { +int Village::modifyStanding(const std::string& playerName, int delta) { int current = getStanding(playerName); int newValue = Mth::clamp(current + delta, -30, 10); - playerStanding.insert(std::pair(playerName, newValue)); + playerStanding.insert(std::pair(playerName, newValue)); return newValue; } -bool Village::isGoodStanding(const std::wstring& playerName) { +bool Village::isGoodStanding(const std::string& playerName) { return getStanding(playerName) >= 0; } -bool Village::isBadStanding(const std::wstring& playerName) { +bool Village::isBadStanding(const std::string& playerName) { return getStanding(playerName) <= -5; } -bool Village::isVeryBadStanding(const std::wstring playerName) { +bool Village::isVeryBadStanding(const std::string playerName) { return getStanding(playerName) <= -15; } void Village::readAdditionalSaveData(CompoundTag* tag) { - populationSize = tag->getInt(L"PopSize"); - radius = tag->getInt(L"Radius"); - golemCount = tag->getInt(L"Golems"); - stableSince = tag->getInt(L"Stable"); - _tick = tag->getInt(L"Tick"); - noBreedTimer = tag->getInt(L"MTick"); - center->x = tag->getInt(L"CX"); - center->y = tag->getInt(L"CY"); - center->z = tag->getInt(L"CZ"); - accCenter->x = tag->getInt(L"ACX"); - accCenter->y = tag->getInt(L"ACY"); - accCenter->z = tag->getInt(L"ACZ"); + populationSize = tag->getInt("PopSize"); + radius = tag->getInt("Radius"); + golemCount = tag->getInt("Golems"); + stableSince = tag->getInt("Stable"); + _tick = tag->getInt("Tick"); + noBreedTimer = tag->getInt("MTick"); + center->x = tag->getInt("CX"); + center->y = tag->getInt("CY"); + center->z = tag->getInt("CZ"); + accCenter->x = tag->getInt("ACX"); + accCenter->y = tag->getInt("ACY"); + accCenter->z = tag->getInt("ACZ"); ListTag* doorTags = - (ListTag*)tag->getList(L"Doors"); + (ListTag*)tag->getList("Doors"); for (int i = 0; i < doorTags->size(); i++) { CompoundTag* dTag = doorTags->get(i); std::shared_ptr door = std::make_shared( - dTag->getInt(L"X"), dTag->getInt(L"Y"), dTag->getInt(L"Z"), - dTag->getInt(L"IDX"), dTag->getInt(L"IDZ"), dTag->getInt(L"TS")); + dTag->getInt("X"), dTag->getInt("Y"), dTag->getInt("Z"), + dTag->getInt("IDX"), dTag->getInt("IDZ"), dTag->getInt("TS")); doorInfos.push_back(door); } ListTag* playerTags = - (ListTag*)tag->getList(L"Players"); + (ListTag*)tag->getList("Players"); for (int i = 0; i < playerTags->size(); i++) { CompoundTag* pTag = playerTags->get(i); - playerStanding.insert(std::pair( - pTag->getString(L"Name"), pTag->getInt(L"S"))); + playerStanding.insert(std::pair( + pTag->getString("Name"), pTag->getInt("S"))); } } void Village::addAdditonalSaveData(CompoundTag* tag) { - tag->putInt(L"PopSize", populationSize); - tag->putInt(L"Radius", radius); - tag->putInt(L"Golems", golemCount); - tag->putInt(L"Stable", stableSince); - tag->putInt(L"Tick", _tick); - tag->putInt(L"MTick", noBreedTimer); - tag->putInt(L"CX", center->x); - tag->putInt(L"CY", center->y); - tag->putInt(L"CZ", center->z); - tag->putInt(L"ACX", accCenter->x); - tag->putInt(L"ACY", accCenter->y); - tag->putInt(L"ACZ", accCenter->z); + tag->putInt("PopSize", populationSize); + tag->putInt("Radius", radius); + tag->putInt("Golems", golemCount); + tag->putInt("Stable", stableSince); + tag->putInt("Tick", _tick); + tag->putInt("MTick", noBreedTimer); + tag->putInt("CX", center->x); + tag->putInt("CY", center->y); + tag->putInt("CZ", center->z); + tag->putInt("ACX", accCenter->x); + tag->putInt("ACY", accCenter->y); + tag->putInt("ACZ", accCenter->z); - ListTag* doorTags = new ListTag(L"Doors"); + ListTag* doorTags = new ListTag("Doors"); // for (DoorInfo dm : doorInfos) for (auto it = doorInfos.begin(); it != doorInfos.end(); ++it) { std::shared_ptr dm = *it; - CompoundTag* doorTag = new CompoundTag(L"Door"); - doorTag->putInt(L"X", dm->x); - doorTag->putInt(L"Y", dm->y); - doorTag->putInt(L"Z", dm->z); - doorTag->putInt(L"IDX", dm->insideDx); - doorTag->putInt(L"IDZ", dm->insideDz); - doorTag->putInt(L"TS", dm->timeStamp); + CompoundTag* doorTag = new CompoundTag("Door"); + doorTag->putInt("X", dm->x); + doorTag->putInt("Y", dm->y); + doorTag->putInt("Z", dm->z); + doorTag->putInt("IDX", dm->insideDx); + doorTag->putInt("IDZ", dm->insideDz); + doorTag->putInt("TS", dm->timeStamp); doorTags->add(doorTag); } - tag->put(L"Doors", doorTags); + tag->put("Doors", doorTags); - ListTag* playerTags = new ListTag(L"Players"); + ListTag* playerTags = new ListTag("Players"); // for (String player : playerStanding.keySet()) for (auto it = playerStanding.begin(); it != playerStanding.end(); ++it) { - std::wstring player = it->first; + std::string player = it->first; CompoundTag* playerTag = new CompoundTag(player); - playerTag->putString(L"Name", player); - playerTag->putInt(L"S", it->second); + playerTag->putString("Name", player); + playerTag->putInt("S", it->second); playerTags->add(playerTag); } - tag->put(L"Players", playerTags); + tag->put("Players", playerTags); } void Village::resetNoBreedTimer() { noBreedTimer = _tick; } diff --git a/targets/minecraft/world/entity/ai/village/Village.h b/targets/minecraft/world/entity/ai/village/Village.h index b15fadab5..4210f4ad0 100644 --- a/targets/minecraft/world/entity/ai/village/Village.h +++ b/targets/minecraft/world/entity/ai/village/Village.h @@ -29,7 +29,7 @@ private: int populationSize; int noBreedTimer; - std::unordered_map playerStanding; + std::unordered_map playerStanding; class Aggressor { public: @@ -85,11 +85,11 @@ private: void calcInfo(); public: - int getStanding(const std::wstring& playerName); - int modifyStanding(const std::wstring& playerName, int delta); - bool isGoodStanding(const std::wstring& playerName); - bool isBadStanding(const std::wstring& playerName); - bool isVeryBadStanding(const std::wstring playerName); + int getStanding(const std::string& playerName); + int modifyStanding(const std::string& playerName, int delta); + bool isGoodStanding(const std::string& playerName); + bool isBadStanding(const std::string& playerName); + bool isVeryBadStanding(const std::string playerName); void readAdditionalSaveData(CompoundTag* tag); void addAdditonalSaveData(CompoundTag* tag); void resetNoBreedTimer(); diff --git a/targets/minecraft/world/entity/ai/village/Villages.cpp b/targets/minecraft/world/entity/ai/village/Villages.cpp index aef878477..17c9123bd 100644 --- a/targets/minecraft/world/entity/ai/village/Villages.cpp +++ b/targets/minecraft/world/entity/ai/village/Villages.cpp @@ -14,9 +14,9 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -const std::wstring Villages::VILLAGE_FILE_ID = L"villages"; +const std::string Villages::VILLAGE_FILE_ID = "villages"; -Villages::Villages(const std::wstring& id) : SavedData(id) { +Villages::Villages(const std::string& id) : SavedData(id) { _tick = 0; level = nullptr; } @@ -205,9 +205,9 @@ bool Villages::isDoor(int x, int y, int z) { } void Villages::load(CompoundTag* tag) { - _tick = tag->getInt(L"Tick"); + _tick = tag->getInt("Tick"); ListTag* villageTags = - (ListTag*)tag->getList(L"Villages"); + (ListTag*)tag->getList("Villages"); for (int i = 0; i < villageTags->size(); i++) { CompoundTag* compoundTag = villageTags->get(i); std::shared_ptr village = std::make_shared(); @@ -217,14 +217,14 @@ void Villages::load(CompoundTag* tag) { } void Villages::save(CompoundTag* tag) { - tag->putInt(L"Tick", _tick); - ListTag* villageTags = new ListTag(L"Villages"); + tag->putInt("Tick", _tick); + ListTag* villageTags = new ListTag("Villages"); // for (Village village : villages) for (auto it = villages.begin(); it != villages.end(); ++it) { std::shared_ptr village = *it; - CompoundTag* villageTag = new CompoundTag(L"Village"); + CompoundTag* villageTag = new CompoundTag("Village"); village->addAdditonalSaveData(villageTag); villageTags->add(villageTag); } - tag->put(L"Villages", villageTags); + tag->put("Villages", villageTags); } diff --git a/targets/minecraft/world/entity/ai/village/Villages.h b/targets/minecraft/world/entity/ai/village/Villages.h index d617e4bd5..508421e4e 100644 --- a/targets/minecraft/world/entity/ai/village/Villages.h +++ b/targets/minecraft/world/entity/ai/village/Villages.h @@ -15,7 +15,7 @@ class Pos; class Villages : public SavedData { public: - static const std::wstring VILLAGE_FILE_ID; + static const std::string VILLAGE_FILE_ID; static const int MaxDoorDist = 32; @@ -27,7 +27,7 @@ private: int _tick; public: - Villages(const std::wstring& id); + Villages(const std::string& id); Villages(Level* level); ~Villages(); diff --git a/targets/minecraft/world/entity/ambient/Bat.cpp b/targets/minecraft/world/entity/ambient/Bat.cpp index 17c9492f5..55b66af55 100644 --- a/targets/minecraft/world/entity/ambient/Bat.cpp +++ b/targets/minecraft/world/entity/ambient/Bat.cpp @@ -188,13 +188,13 @@ bool Bat::hurt(DamageSource* source, float dmg) { void Bat::readAdditionalSaveData(CompoundTag* tag) { AmbientCreature::readAdditionalSaveData(tag); - entityData->set(DATA_ID_FLAGS, tag->getByte(L"BatFlags")); + entityData->set(DATA_ID_FLAGS, tag->getByte("BatFlags")); } void Bat::addAdditonalSaveData(CompoundTag* entityTag) { AmbientCreature::addAdditonalSaveData(entityTag); - entityTag->putByte(L"BatFlags", entityData->getByte(DATA_ID_FLAGS)); + entityTag->putByte("BatFlags", entityData->getByte(DATA_ID_FLAGS)); } bool Bat::canSpawn() { diff --git a/targets/minecraft/world/entity/animal/Animal.cpp b/targets/minecraft/world/entity/animal/Animal.cpp index de1f2ee2b..8b2626a11 100644 --- a/targets/minecraft/world/entity/animal/Animal.cpp +++ b/targets/minecraft/world/entity/animal/Animal.cpp @@ -219,12 +219,12 @@ bool Animal::hurt(DamageSource* dmgSource, float dmg) { void Animal::addAdditonalSaveData(CompoundTag* tag) { AgableMob::addAdditonalSaveData(tag); - tag->putInt(L"InLove", getInLoveValue()); + tag->putInt("InLove", getInLoveValue()); } void Animal::readAdditionalSaveData(CompoundTag* tag) { AgableMob::readAdditionalSaveData(tag); - setInLoveValue(tag->getInt(L"InLove")); + setInLoveValue(tag->getInt("InLove")); setDespawnProtected(); } diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 334b7f955..de5831f7e 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -56,7 +56,7 @@ class EntitySelector; class Path; -const std::wstring EntityHorse::TEX_FOLDER = L"mob/horse/"; +const std::string EntityHorse::TEX_FOLDER = "mob/horse/"; const EntitySelector* EntityHorse::PARENT_HORSE_SELECTOR = new HorseEntitySelector(); @@ -65,36 +65,36 @@ Attribute* EntityHorse::JUMP_STRENGTH = (new RangedAttribute(eAttributeId_HORSE_JUMPSTRENGTH, .7, 0, 2.0)) ->setSyncable(true); -std::wstring EntityHorse::ARMOR_TEXTURES[EntityHorse::ARMORS] = { - L"", L"armor/horse_armor_iron.png", L"armor/horse_armor_gold.png", - L"armor/horse_armor_diamond.png"}; +std::string EntityHorse::ARMOR_TEXTURES[EntityHorse::ARMORS] = { + "", "armor/horse_armor_iron.png", "armor/horse_armor_gold.png", + "armor/horse_armor_diamond.png"}; int EntityHorse::ARMOR_TEXTURES_ID[EntityHorse::ARMORS] = { -1, TN_MOB_HORSE_ARMOR_IRON, TN_MOB_HORSE_ARMOR_GOLD, TN_MOB_HORSE_ARMOR_DIAMOND}; -std::wstring EntityHorse::ARMOR_HASHES[EntityHorse::ARMORS] = {L"", L"meo", - L"goo", L"dio"}; +std::string EntityHorse::ARMOR_HASHES[EntityHorse::ARMORS] = {"", "meo", + "goo", "dio"}; int EntityHorse::ARMOR_PROTECTION[EntityHorse::ARMORS] = {0, 5, 7, 11}; -std::wstring EntityHorse::VARIANT_TEXTURES[EntityHorse::VARIANTS] = { - L"horse_white.png", L"horse_creamy.png", L"horse_chestnut.png", - L"horse_brown.png", L"horse_black.png", L"horse_gray.png", - L"horse_darkbrown.png"}; +std::string EntityHorse::VARIANT_TEXTURES[EntityHorse::VARIANTS] = { + "horse_white.png", "horse_creamy.png", "horse_chestnut.png", + "horse_brown.png", "horse_black.png", "horse_gray.png", + "horse_darkbrown.png"}; int EntityHorse::VARIANT_TEXTURES_ID[EntityHorse::VARIANTS] = { TN_MOB_HORSE_WHITE, TN_MOB_HORSE_CREAMY, TN_MOB_HORSE_CHESTNUT, TN_MOB_HORSE_BROWN, TN_MOB_HORSE_BLACK, TN_MOB_HORSE_GRAY, TN_MOB_HORSE_DARKBROWN}; -std::wstring EntityHorse::VARIANT_HASHES[EntityHorse::VARIANTS] = { - L"hwh", L"hcr", L"hch", L"hbr", L"hbl", L"hgr", L"hdb"}; +std::string EntityHorse::VARIANT_HASHES[EntityHorse::VARIANTS] = { + "hwh", "hcr", "hch", "hbr", "hbl", "hgr", "hdb"}; -std::wstring EntityHorse::MARKING_TEXTURES[EntityHorse::MARKINGS] = { - L"", L"horse_markings_white.png", L"horse_markings_whitefield.png", - L"horse_markings_whitedots.png", L"horse_markings_blackdots.png"}; +std::string EntityHorse::MARKING_TEXTURES[EntityHorse::MARKINGS] = { + "", "horse_markings_white.png", "horse_markings_whitefield.png", + "horse_markings_whitedots.png", "horse_markings_blackdots.png"}; int EntityHorse::MARKING_TEXTURES_ID[EntityHorse::MARKINGS] = { -1, TN_MOB_HORSE_MARKINGS_WHITE, TN_MOB_HORSE_MARKINGS_WHITEFIELD, TN_MOB_HORSE_MARKINGS_WHITEDOTS, TN_MOB_HORSE_MARKINGS_BLACKDOTS}; -std::wstring EntityHorse::MARKING_HASHES[EntityHorse::MARKINGS] = { - L"", L"wo_", L"wmo", L"wdo", L"bdo"}; +std::string EntityHorse::MARKING_HASHES[EntityHorse::MARKINGS] = { + "", "wo_", "wmo", "wdo", "bdo"}; bool HorseEntitySelector::matches(std::shared_ptr entity) const { return entity->instanceof(eTYPE_HORSE) && @@ -124,7 +124,7 @@ EntityHorse::EntityHorse(Level* level) : Animal(level) { mouthAnim = mouthAnimO = 0.0f; gallopSoundCounter = 0; - layerTextureHashName = L""; + layerTextureHashName = ""; layerTextureLayers = std::vector(3); for (unsigned int i = 0; i < 3; ++i) { @@ -153,7 +153,7 @@ void EntityHorse::defineSynchedData() { entityData->define(DATA_ID_HORSE_FLAGS, 0); entityData->define(DATA_ID_TYPE, (uint8_t)0); entityData->define(DATA_ID_TYPE_VARIANT, 0); - entityData->define(DATA_ID_OWNER_NAME, L""); + entityData->define(DATA_ID_OWNER_NAME, ""); entityData->define(DATA_ID_ARMOR, 0); } @@ -173,25 +173,25 @@ int EntityHorse::getVariant() { return entityData->getInteger(DATA_ID_TYPE_VARIANT); } -std::wstring EntityHorse::getAName() { +std::string EntityHorse::getAName() { if (hasCustomName()) return getCustomName(); #ifdef _DEBUG int type = getType(); switch (type) { default: case TYPE_HORSE: - return L"entity.horse.name"; + return "entity.horse.name"; case TYPE_DONKEY: - return L"entity.donkey.name"; + return "entity.donkey.name"; case TYPE_MULE: - return L"entity.mule.name"; + return "entity.mule.name"; case TYPE_SKELETON: - return L"entity.skeletonhorse.name"; + return "entity.skeletonhorse.name"; case TYPE_UNDEAD: - return L"entity.zombiehorse.name"; + return "entity.zombiehorse.name"; } #else - return L""; + return ""; #endif } @@ -214,11 +214,11 @@ bool EntityHorse::isTamed() { return getHorseFlag(FLAG_TAME); } bool EntityHorse::isRidable() { return isAdult(); } -std::wstring EntityHorse::getOwnerName() { +std::string EntityHorse::getOwnerName() { return entityData->getString(DATA_ID_OWNER_NAME); } -void EntityHorse::setOwner(const std::wstring& par1Str) { +void EntityHorse::setOwner(const std::string& par1Str) { entityData->set(DATA_ID_OWNER_NAME, par1Str); } @@ -403,7 +403,7 @@ int EntityHorse::getInventorySize() { void EntityHorse::createInventory() { std::shared_ptr old = inventory; inventory = std::shared_ptr( - new AnimalChest(L"HorseChest", getInventorySize())); + new AnimalChest("HorseChest", getInventorySize())); inventory->setCustomName(getAName()); if (old != nullptr) { old->removeListener(this); @@ -626,10 +626,10 @@ bool EntityHorse::hasLayeredTextures() { return getType() == TYPE_HORSE || getArmorType() > 0; } -void EntityHorse::clearLayeredTextureInfo() { layerTextureHashName = L""; } +void EntityHorse::clearLayeredTextureInfo() { layerTextureHashName = ""; } void EntityHorse::rebuildLayeredTextureInfo() { - layerTextureHashName = L"horse/"; + layerTextureHashName = "horse/"; layerTextureLayers[0] = -1; layerTextureLayers[1] = -1; layerTextureLayers[2] = -1; @@ -651,7 +651,7 @@ void EntityHorse::rebuildLayeredTextureInfo() { } } else { layerTextureLayers[0] = -1; - layerTextureHashName += L"_" + toWString(type) + L"_"; + layerTextureHashName += "_" + toWString(type) + "_"; armorIndex = 1; } @@ -660,7 +660,7 @@ void EntityHorse::rebuildLayeredTextureInfo() { layerTextureHashName += ARMOR_HASHES[armor]; } -std::wstring EntityHorse::getLayeredTextureHashName() { +std::string EntityHorse::getLayeredTextureHashName() { if (layerTextureHashName.empty()) { rebuildLayeredTextureInfo(); } @@ -1195,15 +1195,15 @@ void EntityHorse::travel(float xa, float ya) { void EntityHorse::addAdditonalSaveData(CompoundTag* tag) { Animal::addAdditonalSaveData(tag); - tag->putBoolean(L"EatingHaystack", isEating()); - tag->putBoolean(L"ChestedHorse", isChestedHorse()); - tag->putBoolean(L"HasReproduced", getHasReproduced()); - tag->putBoolean(L"Bred", isBred()); - tag->putInt(L"Type", getType()); - tag->putInt(L"Variant", getVariant()); - tag->putInt(L"Temper", getTemper()); - tag->putBoolean(L"Tame", isTamed()); - tag->putString(L"OwnerName", getOwnerName()); + tag->putBoolean("EatingHaystack", isEating()); + tag->putBoolean("ChestedHorse", isChestedHorse()); + tag->putBoolean("HasReproduced", getHasReproduced()); + tag->putBoolean("Bred", isBred()); + tag->putInt("Type", getType()); + tag->putInt("Variant", getVariant()); + tag->putInt("Temper", getTemper()); + tag->putBoolean("Tame", isTamed()); + tag->putString("OwnerName", getOwnerName()); if (isChestedHorse()) { ListTag* listTag = new ListTag(); @@ -1214,37 +1214,37 @@ void EntityHorse::addAdditonalSaveData(CompoundTag* tag) { if (stack != nullptr) { CompoundTag* compoundTag = new CompoundTag(); - compoundTag->putByte(L"Slot", (uint8_t)i); + compoundTag->putByte("Slot", (uint8_t)i); stack->save(compoundTag); listTag->add(compoundTag); } } - tag->put(L"Items", listTag); + tag->put("Items", listTag); } if (inventory->getItem(INV_SLOT_ARMOR) != nullptr) { - tag->put(L"ArmorItem", inventory->getItem(INV_SLOT_ARMOR) - ->save(new CompoundTag(L"ArmorItem"))); + tag->put("ArmorItem", inventory->getItem(INV_SLOT_ARMOR) + ->save(new CompoundTag("ArmorItem"))); } if (inventory->getItem(INV_SLOT_SADDLE) != nullptr) { - tag->put(L"SaddleItem", inventory->getItem(INV_SLOT_SADDLE) - ->save(new CompoundTag(L"SaddleItem"))); + tag->put("SaddleItem", inventory->getItem(INV_SLOT_SADDLE) + ->save(new CompoundTag("SaddleItem"))); } } void EntityHorse::readAdditionalSaveData(CompoundTag* tag) { Animal::readAdditionalSaveData(tag); - setEating(tag->getBoolean(L"EatingHaystack")); - setBred(tag->getBoolean(L"Bred")); - setChestedHorse(tag->getBoolean(L"ChestedHorse")); - setReproduced(tag->getBoolean(L"HasReproduced")); - setType(tag->getInt(L"Type")); - setVariant(tag->getInt(L"Variant")); - setTemper(tag->getInt(L"Temper")); - setTamed(tag->getBoolean(L"Tame")); - if (tag->contains(L"OwnerName")) { - setOwner(tag->getString(L"OwnerName")); + setEating(tag->getBoolean("EatingHaystack")); + setBred(tag->getBoolean("Bred")); + setChestedHorse(tag->getBoolean("ChestedHorse")); + setReproduced(tag->getBoolean("HasReproduced")); + setType(tag->getInt("Type")); + setVariant(tag->getInt("Variant")); + setTemper(tag->getInt("Temper")); + setTamed(tag->getBoolean("Tame")); + if (tag->contains("OwnerName")) { + setOwner(tag->getString("OwnerName")); } // 4J: This is for handling old save data, not needed on console @@ -1259,12 +1259,12 @@ void EntityHorse::readAdditionalSaveData(CompoundTag* tag) { if (isChestedHorse()) { ListTag* nbttaglist = - (ListTag*)tag->getList(L"Items"); + (ListTag*)tag->getList("Items"); createInventory(); for (int i = 0; i < nbttaglist->size(); i++) { CompoundTag* compoundTag = nbttaglist->get(i); - int slot = compoundTag->getByte(L"Slot") & 0xFF; + int slot = compoundTag->getByte("Slot") & 0xFF; if (slot >= INV_BASE_COUNT && slot < inventory->getContainerSize()) { @@ -1273,21 +1273,21 @@ void EntityHorse::readAdditionalSaveData(CompoundTag* tag) { } } - if (tag->contains(L"ArmorItem")) { + if (tag->contains("ArmorItem")) { std::shared_ptr armor = - ItemInstance::fromTag(tag->getCompound(L"ArmorItem")); + ItemInstance::fromTag(tag->getCompound("ArmorItem")); if (armor != nullptr && isHorseArmor(armor->id)) { inventory->setItem(INV_SLOT_ARMOR, armor); } } - if (tag->contains(L"SaddleItem")) { + if (tag->contains("SaddleItem")) { std::shared_ptr saddleItem = - ItemInstance::fromTag(tag->getCompound(L"SaddleItem")); + ItemInstance::fromTag(tag->getCompound("SaddleItem")); if (saddleItem != nullptr && saddleItem->id == Item::saddle_Id) { inventory->setItem(INV_SLOT_SADDLE, saddleItem); } - } else if (tag->getBoolean(L"Saddle")) { + } else if (tag->getBoolean("Saddle")) { inventory->setItem(INV_SLOT_SADDLE, std::make_shared(Item::saddle)); } diff --git a/targets/minecraft/world/entity/animal/EntityHorse.h b/targets/minecraft/world/entity/animal/EntityHorse.h index ff7793525..2f51a0a39 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.h +++ b/targets/minecraft/world/entity/animal/EntityHorse.h @@ -32,7 +32,7 @@ public: static Entity* create(Level* level) { return new EntityHorse(level); } private: - static const std::wstring TEX_FOLDER; + static const std::string TEX_FOLDER; static const EntitySelector* PARENT_HORSE_SELECTOR; @@ -66,9 +66,9 @@ public: private: static const int ARMORS = 4; - static std::wstring ARMOR_TEXTURES[ARMORS]; + static std::string ARMOR_TEXTURES[ARMORS]; static int ARMOR_TEXTURES_ID[ARMORS]; - static std::wstring ARMOR_HASHES[ARMORS]; + static std::string ARMOR_HASHES[ARMORS]; static int ARMOR_PROTECTION[ARMORS]; public: @@ -88,9 +88,9 @@ public: private: static const int VARIANTS = 7; - static std::wstring VARIANT_TEXTURES[VARIANTS]; + static std::string VARIANT_TEXTURES[VARIANTS]; static int VARIANT_TEXTURES_ID[VARIANTS]; - static std::wstring VARIANT_HASHES[VARIANTS]; + static std::string VARIANT_HASHES[VARIANTS]; public: static const int MARKING_NONE = 0; @@ -101,9 +101,9 @@ public: private: static const int MARKINGS = 5; - static std::wstring MARKING_TEXTURES[MARKINGS]; + static std::string MARKING_TEXTURES[MARKINGS]; static int MARKING_TEXTURES_ID[MARKINGS]; - static std::wstring MARKING_HASHES[MARKINGS]; + static std::string MARKING_HASHES[MARKINGS]; private: int countEating; // eating timer @@ -145,7 +145,7 @@ public: virtual int getType(); virtual void setVariant(int i); virtual int getVariant(); - virtual std::wstring getAName(); + virtual std::string getAName(); private: virtual bool getHorseFlag(int flag); @@ -155,8 +155,8 @@ public: virtual bool isAdult(); virtual bool isTamed(); virtual bool isRidable(); - virtual std::wstring getOwnerName(); - virtual void setOwner(const std::wstring& par1Str); + virtual std::string getOwnerName(); + virtual void setOwner(const std::string& par1Str); virtual float getFoalScale(); virtual void updateSize(bool isBaby); virtual bool getIsJumping(); @@ -242,7 +242,7 @@ public: virtual bool hasLayeredTextures(); private: - std::wstring layerTextureHashName; + std::string layerTextureHashName; std::vector layerTextureLayers; private: @@ -250,7 +250,7 @@ private: virtual void rebuildLayeredTextureInfo(); public: - virtual std::wstring getLayeredTextureHashName(); + virtual std::string getLayeredTextureHashName(); virtual std::vector getLayeredTextureLayers(); virtual void openInventory(std::shared_ptr player); virtual bool mobInteract(std::shared_ptr player); diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index fbc292b91..df9299bf7 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -134,13 +134,13 @@ void Ocelot::causeFallDamage(float distance) { void Ocelot::addAdditonalSaveData(CompoundTag* tag) { TamableAnimal::addAdditonalSaveData(tag); - tag->putInt(L"CatType", getCatType()); + tag->putInt("CatType", getCatType()); } void Ocelot::readAdditionalSaveData(CompoundTag* tag) { TamableAnimal::readAdditionalSaveData(tag); if (isTame()) { - setCatType(tag->getInt(L"CatType")); + setCatType(tag->getInt("CatType")); } else { setCatType(TYPE_OCELOT); } @@ -288,15 +288,15 @@ bool Ocelot::canSpawn() { return false; } -std::wstring Ocelot::getAName() { +std::string Ocelot::getAName() { if (hasCustomName()) return getCustomName(); #ifdef _DEBUG if (isTame()) { - return L"entity.Cat.name"; + return "entity.Cat.name"; } return TamableAnimal::getAName(); #else - return L""; + return ""; #endif } diff --git a/targets/minecraft/world/entity/animal/Ocelot.h b/targets/minecraft/world/entity/animal/Ocelot.h index d878bac88..45ff746b2 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.h +++ b/targets/minecraft/world/entity/animal/Ocelot.h @@ -82,7 +82,7 @@ public: virtual int getCatType(); virtual void setCatType(int type); virtual bool canSpawn(); - virtual std::wstring getAName(); + virtual std::string getAName(); virtual MobGroupData* finalizeMobSpawn( MobGroupData* groupData, int extraData = 0); // 4J Added extraData param diff --git a/targets/minecraft/world/entity/animal/Pig.cpp b/targets/minecraft/world/entity/animal/Pig.cpp index b9c451e00..e432cbdaa 100644 --- a/targets/minecraft/world/entity/animal/Pig.cpp +++ b/targets/minecraft/world/entity/animal/Pig.cpp @@ -80,12 +80,12 @@ void Pig::defineSynchedData() { void Pig::addAdditonalSaveData(CompoundTag* tag) { Animal::addAdditonalSaveData(tag); - tag->putBoolean(L"Saddle", hasSaddle()); + tag->putBoolean("Saddle", hasSaddle()); } void Pig::readAdditionalSaveData(CompoundTag* tag) { Animal::readAdditionalSaveData(tag); - setSaddle(tag->getBoolean(L"Saddle")); + setSaddle(tag->getBoolean("Saddle")); } int Pig::getAmbientSound() { return eSoundType_MOB_PIG_AMBIENT; } diff --git a/targets/minecraft/world/entity/animal/Sheep.cpp b/targets/minecraft/world/entity/animal/Sheep.cpp index 1e5b5aeaf..f33e8e167 100644 --- a/targets/minecraft/world/entity/animal/Sheep.cpp +++ b/targets/minecraft/world/entity/animal/Sheep.cpp @@ -198,14 +198,14 @@ bool Sheep::mobInteract(std::shared_ptr player) { void Sheep::addAdditonalSaveData(CompoundTag* tag) { Animal::addAdditonalSaveData(tag); - tag->putBoolean(L"Sheared", isSheared()); - tag->putByte(L"Color", (uint8_t)getColor()); + tag->putBoolean("Sheared", isSheared()); + tag->putByte("Color", (uint8_t)getColor()); } void Sheep::readAdditionalSaveData(CompoundTag* tag) { Animal::readAdditionalSaveData(tag); - setSheared(tag->getBoolean(L"Sheared")); - setColor((int)tag->getByte(L"Color")); + setSheared(tag->getBoolean("Sheared")); + setColor((int)tag->getByte("Color")); } int Sheep::getAmbientSound() { return eSoundType_MOB_SHEEP_AMBIENT; } diff --git a/targets/minecraft/world/entity/animal/VillagerGolem.cpp b/targets/minecraft/world/entity/animal/VillagerGolem.cpp index 55ae94a50..bc1ee2630 100644 --- a/targets/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/targets/minecraft/world/entity/animal/VillagerGolem.cpp @@ -150,12 +150,12 @@ bool VillagerGolem::canAttackType(eINSTANCEOF targetType) { void VillagerGolem::addAdditonalSaveData(CompoundTag* tag) { Golem::addAdditonalSaveData(tag); - tag->putBoolean(L"PlayerCreated", isPlayerCreated()); + tag->putBoolean("PlayerCreated", isPlayerCreated()); } void VillagerGolem::readAdditionalSaveData(CompoundTag* tag) { Golem::readAdditionalSaveData(tag); - setPlayerCreated(tag->getBoolean(L"PlayerCreated")); + setPlayerCreated(tag->getBoolean("PlayerCreated")); } bool VillagerGolem::doHurtTarget(std::shared_ptr target) { diff --git a/targets/minecraft/world/entity/animal/Wolf.cpp b/targets/minecraft/world/entity/animal/Wolf.cpp index d63c22833..fb0ce2c3c 100644 --- a/targets/minecraft/world/entity/animal/Wolf.cpp +++ b/targets/minecraft/world/entity/animal/Wolf.cpp @@ -128,16 +128,16 @@ void Wolf::playStepSound(int xt, int yt, int zt, int t) { void Wolf::addAdditonalSaveData(CompoundTag* tag) { TamableAnimal::addAdditonalSaveData(tag); - tag->putBoolean(L"Angry", isAngry()); - tag->putByte(L"CollarColor", (uint8_t)getCollarColor()); + tag->putBoolean("Angry", isAngry()); + tag->putByte("CollarColor", (uint8_t)getCollarColor()); } void Wolf::readAdditionalSaveData(CompoundTag* tag) { TamableAnimal::readAdditionalSaveData(tag); - setAngry(tag->getBoolean(L"Angry")); - if (tag->contains(L"CollarColor")) - setCollarColor(tag->getByte(L"CollarColor")); + setAngry(tag->getBoolean("Angry")); + if (tag->contains("CollarColor")) + setCollarColor(tag->getByte("CollarColor")); } int Wolf::getAmbientSound() { @@ -299,7 +299,7 @@ void Wolf::setTame(bool value) { } } -void Wolf::tame(const std::wstring& wsOwnerUUID, bool bDisplayTamingParticles, +void Wolf::tame(const std::string& wsOwnerUUID, bool bDisplayTamingParticles, bool bSetSitting) { setTame(true); setPath(nullptr); diff --git a/targets/minecraft/world/entity/animal/Wolf.h b/targets/minecraft/world/entity/animal/Wolf.h index 80241f4ae..7ad00682a 100644 --- a/targets/minecraft/world/entity/animal/Wolf.h +++ b/targets/minecraft/world/entity/animal/Wolf.h @@ -79,7 +79,7 @@ public: void setAngry(bool value); int getCollarColor(); void setCollarColor(int color); - void tame(const std::wstring& wsOwnerUUID, bool bDisplayTamingParticles, + void tame(const std::string& wsOwnerUUID, bool bDisplayTamingParticles, bool bSetSitting); // For tooltips diff --git a/targets/minecraft/world/entity/boss/BossMob.h b/targets/minecraft/world/entity/boss/BossMob.h index c7ee39293..b25c641d5 100644 --- a/targets/minecraft/world/entity/boss/BossMob.h +++ b/targets/minecraft/world/entity/boss/BossMob.h @@ -4,5 +4,5 @@ class BossMob { public: virtual float getMaxHealth() = 0; virtual float getHealth() = 0; - virtual std::wstring getAName() = 0; + virtual std::string getAName() = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp index 8b78b5d25..de6850285 100644 --- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp +++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.cpp @@ -4,7 +4,7 @@ #include "minecraft/world/entity/Entity.h" MultiEntityMobPart::MultiEntityMobPart( - std::shared_ptr parentMob, const std::wstring& id, float w, + std::shared_ptr parentMob, const std::string& id, float w, float h) : Entity(parentMob->getLevel()), parentMob(parentMob), id(id) { // 4J Stu - This function call had to be moved here from the Entity ctor to diff --git a/targets/minecraft/world/entity/boss/MultiEntityMobPart.h b/targets/minecraft/world/entity/boss/MultiEntityMobPart.h index 0bd8d2454..4622319bb 100644 --- a/targets/minecraft/world/entity/boss/MultiEntityMobPart.h +++ b/targets/minecraft/world/entity/boss/MultiEntityMobPart.h @@ -14,10 +14,10 @@ public: public: std::weak_ptr parentMob; - const std::wstring id; + const std::string id; MultiEntityMobPart(std::shared_ptr parentMob, - const std::wstring& id, float w, float h); + const std::string& id, float w, float h); protected: virtual void defineSynchedData(); diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index 38d40462f..046b974e4 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -121,29 +121,29 @@ EnderDragon::EnderDragon(Level* level) : Mob(level) { // 4J - split off from ctor so we can use shared_from_this() void EnderDragon::AddParts() { head = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"head", + std::dynamic_pointer_cast(shared_from_this()), "head", 6, 6); neck = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"neck", + std::dynamic_pointer_cast(shared_from_this()), "neck", 6, 6); // 4J Added body = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"body", + std::dynamic_pointer_cast(shared_from_this()), "body", 8, 8); tail1 = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"tail", + std::dynamic_pointer_cast(shared_from_this()), "tail", 4, 4); tail2 = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"tail", + std::dynamic_pointer_cast(shared_from_this()), "tail", 4, 4); tail3 = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"tail", + std::dynamic_pointer_cast(shared_from_this()), "tail", 4, 4); wing1 = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"wing", + std::dynamic_pointer_cast(shared_from_this()), "wing", 4, 4); wing2 = std::make_shared( - std::dynamic_pointer_cast(shared_from_this()), L"wing", + std::dynamic_pointer_cast(shared_from_this()), "wing", 4, 4); subEntities.push_back(head); @@ -1757,20 +1757,20 @@ Path* EnderDragon::reconstruct_path(Node* from, Node* to) { void EnderDragon::addAdditonalSaveData(CompoundTag* entityTag) { Log::info("Adding EnderDragon additional save data\n"); - entityTag->putShort(L"RemainingCrystals", m_remainingCrystalsCount); - entityTag->putInt(L"DragonState", (int)getSynchedAction()); + entityTag->putShort("RemainingCrystals", m_remainingCrystalsCount); + entityTag->putInt("DragonState", (int)getSynchedAction()); Mob::addAdditonalSaveData(entityTag); } void EnderDragon::readAdditionalSaveData(CompoundTag* tag) { Log::info("Reading EnderDragon additional save data\n"); - m_remainingCrystalsCount = tag->getShort(L"RemainingCrystals"); - if (!tag->contains(L"RemainingCrystals")) + m_remainingCrystalsCount = tag->getShort("RemainingCrystals"); + if (!tag->contains("RemainingCrystals")) m_remainingCrystalsCount = CRYSTAL_COUNT; - if (tag->contains(L"DragonState")) - setSynchedAction((EEnderdragonAction)tag->getInt(L"DragonState"), true); + if (tag->contains("DragonState")) + setSynchedAction((EEnderdragonAction)tag->getInt("DragonState"), true); Mob::readAdditionalSaveData(tag); } diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h index bcdca72cf..63b05728a 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -207,7 +207,7 @@ public: std::vector& partPos); Vec3 getHeadLookVector(float a); - virtual std::wstring getAName() { return gameServices().getString(IDS_ENDERDRAGON); }; + virtual std::string getAName() { return gameServices().getString(IDS_ENDERDRAGON); }; virtual float getHealth() { return LivingEntity::getHealth(); }; virtual float getMaxHealth() { return LivingEntity::getMaxHealth(); }; }; diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp index 55ada0747..8dce2a1c3 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -108,13 +108,13 @@ void WitherBoss::defineSynchedData() { void WitherBoss::addAdditonalSaveData(CompoundTag* entityTag) { Monster::addAdditonalSaveData(entityTag); - entityTag->putInt(L"Invul", getInvulnerableTicks()); + entityTag->putInt("Invul", getInvulnerableTicks()); } void WitherBoss::readAdditionalSaveData(CompoundTag* tag) { Monster::readAdditionalSaveData(tag); - setInvulnerableTicks(tag->getInt(L"Invul")); + setInvulnerableTicks(tag->getInt("Invul")); } float WitherBoss::getShadowHeightOffs() { return bbHeight / 8; } diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h index 543d2671b..77031b494 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h @@ -120,5 +120,5 @@ public: // 4J Stu - These are required for the BossMob interface virtual float getMaxHealth() { return Monster::getMaxHealth(); }; virtual float getHealth() { return Monster::getHealth(); }; - virtual std::wstring getAName() { return gameServices().getString(IDS_WITHER); }; + virtual std::string getAName() { return gameServices().getString(IDS_WITHER); }; }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/item/Boat.cpp b/targets/minecraft/world/entity/item/Boat.cpp index 4e725fcc6..9c438d17d 100644 --- a/targets/minecraft/world/entity/item/Boat.cpp +++ b/targets/minecraft/world/entity/item/Boat.cpp @@ -376,7 +376,7 @@ void Boat::readAdditionalSaveData(CompoundTag* base) {} float Boat::getShadowHeightOffs() { return 0; } -std::wstring Boat::getName() { return L"Boat"; } +std::string Boat::getName() { return "Boat"; } bool Boat::interact(std::shared_ptr player) { if ((rider.lock() != nullptr) && rider.lock()->instanceof(eTYPE_PLAYER) && diff --git a/targets/minecraft/world/entity/item/Boat.h b/targets/minecraft/world/entity/item/Boat.h index d712696df..14c8338ca 100644 --- a/targets/minecraft/world/entity/item/Boat.h +++ b/targets/minecraft/world/entity/item/Boat.h @@ -71,7 +71,7 @@ protected: public: virtual float getShadowHeightOffs(); - std::wstring getName(); + std::string getName(); virtual bool interact(std::shared_ptr player); virtual void setDamage(float damage); diff --git a/targets/minecraft/world/entity/item/FallingTile.cpp b/targets/minecraft/world/entity/item/FallingTile.cpp index bed84e568..579b1c690 100644 --- a/targets/minecraft/world/entity/item/FallingTile.cpp +++ b/targets/minecraft/world/entity/item/FallingTile.cpp @@ -139,9 +139,9 @@ void FallingTile::tick() { for (auto it = allTags.begin(); it != allTags.end(); ++it) { Tag* tag = *it; - if (tag->getName().compare(L"x") == 0 || - tag->getName().compare(L"y") == 0 || - tag->getName().compare(L"z") == 0) + if (tag->getName().compare("x") == 0 || + tag->getName().compare("y") == 0 || + tag->getName().compare("z") == 0) continue; swap->put(tag->getName(), tag->copy()); } @@ -208,40 +208,40 @@ void FallingTile::causeFallDamage(float distance) { } void FallingTile::addAdditonalSaveData(CompoundTag* tag) { - tag->putByte(L"Tile", (uint8_t)tile); - tag->putInt(L"TileID", tile); - tag->putByte(L"Data", (uint8_t)data); - tag->putByte(L"Time", (uint8_t)time); - tag->putBoolean(L"DropItem", dropItem); - tag->putBoolean(L"HurtEntities", hurtEntities); - tag->putFloat(L"FallHurtAmount", fallDamageAmount); - tag->putInt(L"FallHurtMax", fallDamageMax); - if (tileData != nullptr) tag->putCompound(L"TileEntityData", tileData); + tag->putByte("Tile", (uint8_t)tile); + tag->putInt("TileID", tile); + tag->putByte("Data", (uint8_t)data); + tag->putByte("Time", (uint8_t)time); + tag->putBoolean("DropItem", dropItem); + tag->putBoolean("HurtEntities", hurtEntities); + tag->putFloat("FallHurtAmount", fallDamageAmount); + tag->putInt("FallHurtMax", fallDamageMax); + if (tileData != nullptr) tag->putCompound("TileEntityData", tileData); } void FallingTile::readAdditionalSaveData(CompoundTag* tag) { - if (tag->contains(L"TileID")) { - tile = tag->getInt(L"TileID"); + if (tag->contains("TileID")) { + tile = tag->getInt("TileID"); } else { - tile = tag->getByte(L"Tile") & 0xff; + tile = tag->getByte("Tile") & 0xff; } - data = tag->getByte(L"Data") & 0xff; - time = tag->getByte(L"Time") & 0xff; + data = tag->getByte("Data") & 0xff; + time = tag->getByte("Time") & 0xff; - if (tag->contains(L"HurtEntities")) { - hurtEntities = tag->getBoolean(L"HurtEntities"); - fallDamageAmount = tag->getFloat(L"FallHurtAmount"); - fallDamageMax = tag->getInt(L"FallHurtMax"); + if (tag->contains("HurtEntities")) { + hurtEntities = tag->getBoolean("HurtEntities"); + fallDamageAmount = tag->getFloat("FallHurtAmount"); + fallDamageMax = tag->getInt("FallHurtMax"); } else if (tile == Tile::anvil_Id) { hurtEntities = true; } - if (tag->contains(L"DropItem")) { - dropItem = tag->getBoolean(L"DropItem"); + if (tag->contains("DropItem")) { + dropItem = tag->getBoolean("DropItem"); } - if (tag->contains(L"TileEntityData")) { - tileData = tag->getCompound(L"TileEntityData"); + if (tag->contains("TileEntityData")) { + tileData = tag->getCompound("TileEntityData"); } if (tile == 0) { diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index b0983522c..9c3901bb2 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -203,16 +203,16 @@ bool ItemEntity::hurt(DamageSource* source, float damage) { } void ItemEntity::addAdditonalSaveData(CompoundTag* entityTag) { - entityTag->putShort(L"Health", (uint8_t)health); - entityTag->putShort(L"Age", (short)age); + entityTag->putShort("Health", (uint8_t)health); + entityTag->putShort("Age", (short)age); if (getItem() != nullptr) - entityTag->putCompound(L"Item", getItem()->save(new CompoundTag())); + entityTag->putCompound("Item", getItem()->save(new CompoundTag())); } void ItemEntity::readAdditionalSaveData(CompoundTag* tag) { - health = tag->getShort(L"Health") & 0xff; - age = tag->getShort(L"Age"); - CompoundTag* itemTag = tag->getCompound(L"Item"); + health = tag->getShort("Health") & 0xff; + age = tag->getShort("Age"); + CompoundTag* itemTag = tag->getCompound("Item"); setItem(ItemInstance::fromTag(itemTag)); if (getItem() == nullptr) remove(); } @@ -264,8 +264,8 @@ void ItemEntity::playerTouch(std::shared_ptr player) { } } -std::wstring ItemEntity::getAName() { - return L""; // L"item." + getItem()->getDescriptionId(); +std::string ItemEntity::getAName() { + return ""; // "item." + getItem()->getDescriptionId(); // return I18n.get("item." + item.getDescriptionId()); } @@ -298,8 +298,8 @@ void ItemEntity::setItem(std::shared_ptr item) { bool ItemEntity::isAttackable() { return false; } -void ItemEntity::setThrower(const std::wstring& thrower) { +void ItemEntity::setThrower(const std::string& thrower) { this->thrower = thrower; } -std::wstring ItemEntity::getThrower() { return this->thrower; } +std::string ItemEntity::getThrower() { return this->thrower; } diff --git a/targets/minecraft/world/entity/item/ItemEntity.h b/targets/minecraft/world/entity/item/ItemEntity.h index 54979ef90..8b23f92f4 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.h +++ b/targets/minecraft/world/entity/item/ItemEntity.h @@ -21,7 +21,7 @@ private: static const int LIFETIME = 5 * 60 * SharedConstants::TICKS_PER_SECOND; // Five miniutes. - std::wstring thrower; + std::string thrower; // 4J Added void _init(); @@ -70,12 +70,12 @@ public: virtual void readAdditionalSaveData(CompoundTag* tag); virtual void playerTouch(std::shared_ptr player); - virtual std::wstring getAName(); + virtual std::string getAName(); virtual void changeDimension(int i); std::shared_ptr getItem(); void setItem(std::shared_ptr item); virtual bool isAttackable(); - void setThrower(const std::wstring& thrower); - std::wstring getThrower(); + void setThrower(const std::string& thrower); + std::string getThrower(); }; diff --git a/targets/minecraft/world/entity/item/Minecart.cpp b/targets/minecraft/world/entity/item/Minecart.cpp index f686006ee..6a732674a 100644 --- a/targets/minecraft/world/entity/item/Minecart.cpp +++ b/targets/minecraft/world/entity/item/Minecart.cpp @@ -66,7 +66,7 @@ void Minecart::_init() { setSize(0.98f, 0.7f); heightOffset = bbHeight / 2.0f; soundUpdater = nullptr; - name = L""; + name = ""; // // 4J Added @@ -689,27 +689,27 @@ std::optional Minecart::getPos(double x, double y, double z) { } void Minecart::readAdditionalSaveData(CompoundTag* tag) { - if (tag->getBoolean(L"CustomDisplayTile")) { - setDisplayTile(tag->getInt(L"DisplayTile")); - setDisplayData(tag->getInt(L"DisplayData")); - setDisplayOffset(tag->getInt(L"DisplayOffset")); + if (tag->getBoolean("CustomDisplayTile")) { + setDisplayTile(tag->getInt("DisplayTile")); + setDisplayData(tag->getInt("DisplayData")); + setDisplayOffset(tag->getInt("DisplayOffset")); } - if (tag->contains(L"CustomName") && - tag->getString(L"CustomName").length() > 0) - name = tag->getString(L"CustomName"); + if (tag->contains("CustomName") && + tag->getString("CustomName").length() > 0) + name = tag->getString("CustomName"); } void Minecart::addAdditonalSaveData(CompoundTag* tag) { if (hasCustomDisplay()) { - tag->putBoolean(L"CustomDisplayTile", true); - tag->putInt(L"DisplayTile", + tag->putBoolean("CustomDisplayTile", true); + tag->putInt("DisplayTile", getDisplayTile() == nullptr ? 0 : getDisplayTile()->id); - tag->putInt(L"DisplayData", getDisplayData()); - tag->putInt(L"DisplayOffset", getDisplayOffset()); + tag->putInt("DisplayData", getDisplayData()); + tag->putInt("DisplayOffset", getDisplayOffset()); } - if (!name.empty()) tag->putString(L"CustomName", name); + if (!name.empty()) tag->putString("CustomName", name); } float Minecart::getShadowHeightOffs() { return 0; } @@ -914,13 +914,13 @@ void Minecart::setCustomDisplay(bool value) { getEntityData()->set(DATA_ID_CUSTOM_DISPLAY, (uint8_t)(value ? 1 : 0)); } -void Minecart::setCustomName(const std::wstring& name) { this->name = name; } +void Minecart::setCustomName(const std::string& name) { this->name = name; } -std::wstring Minecart::getAName() { +std::string Minecart::getAName() { if (!name.empty()) return name; return Entity::getAName(); } bool Minecart::hasCustomName() { return !name.empty(); } -std::wstring Minecart::getCustomName() { return name; } +std::string Minecart::getCustomName() { return name; } diff --git a/targets/minecraft/world/entity/item/Minecart.h b/targets/minecraft/world/entity/item/Minecart.h index 5b71c4b50..5099b843e 100644 --- a/targets/minecraft/world/entity/item/Minecart.h +++ b/targets/minecraft/world/entity/item/Minecart.h @@ -39,7 +39,7 @@ private: bool flipped; Tickable* soundUpdater; - std::wstring name; + std::string name; protected: // 4J Added @@ -128,8 +128,8 @@ public: virtual void setDisplayOffset(int offset); virtual bool hasCustomDisplay(); virtual void setCustomDisplay(bool value); - virtual void setCustomName(const std::wstring& name); - virtual std::wstring getAName(); + virtual void setCustomName(const std::string& name); + virtual std::string getAName(); virtual bool hasCustomName(); - virtual std::wstring getCustomName(); + virtual std::string getCustomName(); }; diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp index 5e3cb8fa9..6806f0070 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.cpp +++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp @@ -118,7 +118,7 @@ bool MinecartContainer::canPlaceItem(int slot, return true; } -std::wstring MinecartContainer::getName() { +std::string MinecartContainer::getName() { return hasCustomName() ? getCustomName() : gameServices().getString(IDS_CONTAINER_MINECART); } @@ -178,23 +178,23 @@ void MinecartContainer::addAdditonalSaveData(CompoundTag* base) { for (int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); + base->put("Items", listTag); } void MinecartContainer::readAdditionalSaveData(CompoundTag* base) { Minecart::readAdditionalSaveData(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); items = std::vector>(getContainerSize()); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - int slot = tag->getByte(L"Slot") & 0xff; + int slot = tag->getByte("Slot") & 0xff; if (slot >= 0 && slot < (int)items.size()) items[slot] = ItemInstance::fromTag(tag); } diff --git a/targets/minecraft/world/entity/item/MinecartContainer.h b/targets/minecraft/world/entity/item/MinecartContainer.h index adaf310e0..29ad78ceb 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.h +++ b/targets/minecraft/world/entity/item/MinecartContainer.h @@ -32,7 +32,7 @@ public: virtual void startOpen(); virtual void stopOpen(); virtual bool canPlaceItem(int slot, std::shared_ptr item); - virtual std::wstring getName(); + virtual std::string getName(); virtual int getMaxStackSize(); virtual void changeDimension(int i); virtual void remove(); @@ -50,5 +50,5 @@ protected: public: // 4J Stu - For container virtual bool hasCustomName() { return Minecart::hasCustomName(); } - virtual std::wstring getCustomName() { return Minecart::getCustomName(); } + virtual std::string getCustomName() { return Minecart::getCustomName(); } }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/item/MinecartFurnace.cpp b/targets/minecraft/world/entity/item/MinecartFurnace.cpp index 6b84e8494..87d0f10dd 100644 --- a/targets/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/targets/minecraft/world/entity/item/MinecartFurnace.cpp @@ -130,16 +130,16 @@ bool MinecartFurnace::interact(std::shared_ptr player) { void MinecartFurnace::addAdditonalSaveData(CompoundTag* base) { Minecart::addAdditonalSaveData(base); - base->putDouble(L"PushX", xPush); - base->putDouble(L"PushZ", zPush); - base->putShort(L"Fuel", (short)fuel); + base->putDouble("PushX", xPush); + base->putDouble("PushZ", zPush); + base->putShort("Fuel", (short)fuel); } void MinecartFurnace::readAdditionalSaveData(CompoundTag* base) { Minecart::readAdditionalSaveData(base); - xPush = base->getDouble(L"PushX"); - zPush = base->getDouble(L"PushZ"); - fuel = base->getShort(L"Fuel"); + xPush = base->getDouble("PushX"); + zPush = base->getDouble("PushZ"); + fuel = base->getShort("Fuel"); } bool MinecartFurnace::hasFuel() { diff --git a/targets/minecraft/world/entity/item/MinecartHopper.cpp b/targets/minecraft/world/entity/item/MinecartHopper.cpp index 3db1e597b..2a4819ddf 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.cpp +++ b/targets/minecraft/world/entity/item/MinecartHopper.cpp @@ -116,12 +116,12 @@ void MinecartHopper::destroy(DamageSource* source) { void MinecartHopper::addAdditonalSaveData(CompoundTag* base) { MinecartContainer::addAdditonalSaveData(base); - base->putInt(L"TransferCooldown", cooldownTime); + base->putInt("TransferCooldown", cooldownTime); } void MinecartHopper::readAdditionalSaveData(CompoundTag* base) { MinecartContainer::readAdditionalSaveData(base); - cooldownTime = base->getInt(L"TransferCooldown"); + cooldownTime = base->getInt("TransferCooldown"); } void MinecartHopper::setCooldown(int time) { cooldownTime = time; } diff --git a/targets/minecraft/world/entity/item/MinecartHopper.h b/targets/minecraft/world/entity/item/MinecartHopper.h index 05281dbc4..fc7f4b087 100644 --- a/targets/minecraft/world/entity/item/MinecartHopper.h +++ b/targets/minecraft/world/entity/item/MinecartHopper.h @@ -67,8 +67,8 @@ public: std::shared_ptr item) { MinecartContainer::setItem(slot, item); } - virtual std::wstring getName() { return MinecartContainer::getName(); } - virtual std::wstring getCustomName() { + virtual std::string getName() { return MinecartContainer::getName(); } + virtual std::string getCustomName() { return MinecartContainer::getCustomName(); } virtual bool hasCustomName() { return MinecartContainer::hasCustomName(); } diff --git a/targets/minecraft/world/entity/item/MinecartTNT.cpp b/targets/minecraft/world/entity/item/MinecartTNT.cpp index 693a0cb81..1620f18b4 100644 --- a/targets/minecraft/world/entity/item/MinecartTNT.cpp +++ b/targets/minecraft/world/entity/item/MinecartTNT.cpp @@ -138,10 +138,10 @@ bool MinecartTNT::shouldTileExplode(Explosion* explosion, Level* level, int x, void MinecartTNT::readAdditionalSaveData(CompoundTag* tag) { Minecart::readAdditionalSaveData(tag); - if (tag->contains(L"TNTFuse")) fuse = tag->getInt(L"TNTFuse"); + if (tag->contains("TNTFuse")) fuse = tag->getInt("TNTFuse"); } void MinecartTNT::addAdditonalSaveData(CompoundTag* tag) { Minecart::addAdditonalSaveData(tag); - tag->putInt(L"TNTFuse", fuse); + tag->putInt("TNTFuse", fuse); } \ No newline at end of file diff --git a/targets/minecraft/world/entity/item/PrimedTnt.cpp b/targets/minecraft/world/entity/item/PrimedTnt.cpp index 481dd4e0d..635ebcb6a 100644 --- a/targets/minecraft/world/entity/item/PrimedTnt.cpp +++ b/targets/minecraft/world/entity/item/PrimedTnt.cpp @@ -93,11 +93,11 @@ void PrimedTnt::explode() { } void PrimedTnt::addAdditonalSaveData(CompoundTag* entityTag) { - entityTag->putByte(L"Fuse", (uint8_t)life); + entityTag->putByte("Fuse", (uint8_t)life); } void PrimedTnt::readAdditionalSaveData(CompoundTag* tag) { - life = tag->getByte(L"Fuse"); + life = tag->getByte("Fuse"); } float PrimedTnt::getShadowHeightOffs() { return 0; } diff --git a/targets/minecraft/world/entity/monster/Creeper.cpp b/targets/minecraft/world/entity/monster/Creeper.cpp index b37050c35..a2efbdadf 100644 --- a/targets/minecraft/world/entity/monster/Creeper.cpp +++ b/targets/minecraft/world/entity/monster/Creeper.cpp @@ -92,18 +92,18 @@ void Creeper::defineSynchedData() { void Creeper::addAdditonalSaveData(CompoundTag* entityTag) { Monster::addAdditonalSaveData(entityTag); if (entityData->getByte(DATA_IS_POWERED) == 1) - entityTag->putBoolean(L"powered", true); - entityTag->putShort(L"Fuse", (short)maxSwell); - entityTag->putByte(L"ExplosionRadius", (uint8_t)explosionRadius); + entityTag->putBoolean("powered", true); + entityTag->putShort("Fuse", (short)maxSwell); + entityTag->putByte("ExplosionRadius", (uint8_t)explosionRadius); } void Creeper::readAdditionalSaveData(CompoundTag* tag) { Monster::readAdditionalSaveData(tag); entityData->set(DATA_IS_POWERED, - (uint8_t)(tag->getBoolean(L"powered") ? 1 : 0)); - if (tag->contains(L"Fuse")) maxSwell = tag->getShort(L"Fuse"); - if (tag->contains(L"ExplosionRadius")) - explosionRadius = tag->getByte(L"ExplosionRadius"); + (uint8_t)(tag->getBoolean("powered") ? 1 : 0)); + if (tag->contains("Fuse")) maxSwell = tag->getShort("Fuse"); + if (tag->contains("ExplosionRadius")) + explosionRadius = tag->getByte("ExplosionRadius"); } void Creeper::tick() { diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index 2b8782aea..92c7d094c 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -95,14 +95,14 @@ void EnderMan::defineSynchedData() { void EnderMan::addAdditonalSaveData(CompoundTag* tag) { Monster::addAdditonalSaveData(tag); - tag->putShort(L"carried", (short)getCarryingTile()); - tag->putShort(L"carriedData", (short)getCarryingData()); + tag->putShort("carried", (short)getCarryingTile()); + tag->putShort("carriedData", (short)getCarryingData()); } void EnderMan::readAdditionalSaveData(CompoundTag* tag) { Monster::readAdditionalSaveData(tag); - setCarryingTile(tag->getShort(L"carried")); - setCarryingData(tag->getShort(L"carryingData")); + setCarryingTile(tag->getShort("carried")); + setCarryingData(tag->getShort("carryingData")); } std::shared_ptr EnderMan::findAttackTarget() { diff --git a/targets/minecraft/world/entity/monster/Ghast.cpp b/targets/minecraft/world/entity/monster/Ghast.cpp index 4550f5b87..50d675a27 100644 --- a/targets/minecraft/world/entity/monster/Ghast.cpp +++ b/targets/minecraft/world/entity/monster/Ghast.cpp @@ -225,11 +225,11 @@ bool Ghast::canSpawn() { int Ghast::getMaxSpawnClusterSize() { return 1; } void Ghast::addAdditonalSaveData(CompoundTag* tag) { FlyingMob::addAdditonalSaveData(tag); - tag->putInt(L"ExplosionPower", explosionPower); + tag->putInt("ExplosionPower", explosionPower); } void Ghast::readAdditionalSaveData(CompoundTag* tag) { FlyingMob::readAdditionalSaveData(tag); - if (tag->contains(L"ExplosionPower")) - explosionPower = tag->getInt(L"ExplosionPower"); + if (tag->contains("ExplosionPower")) + explosionPower = tag->getInt("ExplosionPower"); } diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index 4fbd725d3..5cf607f37 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -83,12 +83,12 @@ bool PigZombie::canSpawn() { void PigZombie::addAdditonalSaveData(CompoundTag* tag) { Zombie::addAdditonalSaveData(tag); - tag->putShort(L"Anger", (short)angerTime); + tag->putShort("Anger", (short)angerTime); } void PigZombie::readAdditionalSaveData(CompoundTag* tag) { Zombie::readAdditionalSaveData(tag); - angerTime = tag->getShort(L"Anger"); + angerTime = tag->getShort("Anger"); } std::shared_ptr PigZombie::findAttackTarget() { diff --git a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp index 14eedd839..a8c66793c 100644 --- a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp +++ b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp @@ -51,8 +51,8 @@ CompoundTag* SharedMonsterAttributes::saveAttribute( CompoundTag* tag = new CompoundTag(); Attribute* attribute = instance->getAttribute(); - tag->putInt(L"ID", attribute->getId()); - tag->putDouble(L"Base", instance->getBaseValue()); + tag->putInt("ID", attribute->getId()); + tag->putDouble("Base", instance->getBaseValue()); std::unordered_set modifiers; instance->getModifiers(modifiers); @@ -67,7 +67,7 @@ CompoundTag* SharedMonsterAttributes::saveAttribute( } } - tag->put(L"Modifiers", list); + tag->put("Modifiers", list); } return tag; @@ -77,9 +77,9 @@ CompoundTag* SharedMonsterAttributes::saveAttributeModifier( AttributeModifier* modifier) { CompoundTag* tag = new CompoundTag(); - tag->putDouble(L"Amount", modifier->getAmount()); - tag->putInt(L"Operation", modifier->getOperation()); - tag->putInt(L"UUID", modifier->getId()); + tag->putDouble("Amount", modifier->getAmount()); + tag->putInt("Operation", modifier->getOperation()); + tag->putInt("UUID", modifier->getId()); return tag; } @@ -89,24 +89,24 @@ void SharedMonsterAttributes::loadAttributes(BaseAttributeMap* attributes, for (int i = 0; i < list->size(); i++) { CompoundTag* tag = list->get(i); AttributeInstance* instance = attributes->getInstance( - static_cast(tag->getInt(L"ID"))); + static_cast(tag->getInt("ID"))); if (instance != nullptr) { loadAttribute(instance, tag); } else { Log::info("Ignoring unknown attribute '%d'", - tag->getInt(L"ID")); + tag->getInt("ID")); } } } void SharedMonsterAttributes::loadAttribute(AttributeInstance* instance, CompoundTag* tag) { - instance->setBaseValue(tag->getDouble(L"Base")); + instance->setBaseValue(tag->getDouble("Base")); - if (tag->contains(L"Modifiers")) { + if (tag->contains("Modifiers")) { ListTag* list = - (ListTag*)tag->getList(L"Modifiers"); + (ListTag*)tag->getList("Modifiers"); for (int i = 0; i < list->size(); i++) { AttributeModifier* modifier = loadAttributeModifier(list->get(i)); @@ -119,7 +119,7 @@ void SharedMonsterAttributes::loadAttribute(AttributeInstance* instance, AttributeModifier* SharedMonsterAttributes::loadAttributeModifier( CompoundTag* tag) { - eMODIFIER_ID id = (eMODIFIER_ID)tag->getInt(L"UUID"); - return new AttributeModifier(id, tag->getDouble(L"Amount"), - tag->getInt(L"Operation")); + eMODIFIER_ID id = (eMODIFIER_ID)tag->getInt("UUID"); + return new AttributeModifier(id, tag->getDouble("Amount"), + tag->getInt("Operation")); } diff --git a/targets/minecraft/world/entity/monster/Skeleton.cpp b/targets/minecraft/world/entity/monster/Skeleton.cpp index 4906b8655..da25e0d57 100644 --- a/targets/minecraft/world/entity/monster/Skeleton.cpp +++ b/targets/minecraft/world/entity/monster/Skeleton.cpp @@ -320,8 +320,8 @@ void Skeleton::setSkeletonType(int type) { void Skeleton::readAdditionalSaveData(CompoundTag* tag) { Monster::readAdditionalSaveData(tag); - if (tag->contains(L"SkeletonType")) { - int value = tag->getByte(L"SkeletonType"); + if (tag->contains("SkeletonType")) { + int value = tag->getByte("SkeletonType"); setSkeletonType(value); } @@ -330,7 +330,7 @@ void Skeleton::readAdditionalSaveData(CompoundTag* tag) { void Skeleton::addAdditonalSaveData(CompoundTag* entityTag) { Monster::addAdditonalSaveData(entityTag); - entityTag->putByte(L"SkeletonType", (uint8_t)getSkeletonType()); + entityTag->putByte("SkeletonType", (uint8_t)getSkeletonType()); } void Skeleton::setEquippedSlot(int slot, std::shared_ptr item) { diff --git a/targets/minecraft/world/entity/monster/Slime.cpp b/targets/minecraft/world/entity/monster/Slime.cpp index 284175d16..00d42fd09 100644 --- a/targets/minecraft/world/entity/monster/Slime.cpp +++ b/targets/minecraft/world/entity/monster/Slime.cpp @@ -69,12 +69,12 @@ int Slime::getSize() { return entityData->getByte(ID_SIZE); } void Slime::addAdditonalSaveData(CompoundTag* tag) { Mob::addAdditonalSaveData(tag); - tag->putInt(L"Size", getSize() - 1); + tag->putInt("Size", getSize() - 1); } void Slime::readAdditionalSaveData(CompoundTag* tag) { Mob::readAdditionalSaveData(tag); - setSize(tag->getInt(L"Size") + 1); + setSize(tag->getInt("Size") + 1); } ePARTICLE_TYPE Slime::getParticleName() { return eParticleType_slime; } diff --git a/targets/minecraft/world/entity/monster/Zombie.cpp b/targets/minecraft/world/entity/monster/Zombie.cpp index a7ad70cc3..77df90fa1 100644 --- a/targets/minecraft/world/entity/monster/Zombie.cpp +++ b/targets/minecraft/world/entity/monster/Zombie.cpp @@ -312,19 +312,19 @@ void Zombie::populateDefaultEquipmentSlots() { void Zombie::addAdditonalSaveData(CompoundTag* tag) { Monster::addAdditonalSaveData(tag); - if (isBaby()) tag->putBoolean(L"IsBaby", true); - if (isVillager()) tag->putBoolean(L"IsVillager", true); - tag->putInt(L"ConversionTime", + if (isBaby()) tag->putBoolean("IsBaby", true); + if (isVillager()) tag->putBoolean("IsVillager", true); + tag->putInt("ConversionTime", isConverting() ? villagerConversionTime : -1); } void Zombie::readAdditionalSaveData(CompoundTag* tag) { Monster::readAdditionalSaveData(tag); - if (tag->getBoolean(L"IsBaby")) setBaby(true); - if (tag->getBoolean(L"IsVillager")) setVillager(true); - if (tag->contains(L"ConversionTime") && tag->getInt(L"ConversionTime") > -1) - startConverting(tag->getInt(L"ConversionTime")); + if (tag->getBoolean("IsBaby")) setBaby(true); + if (tag->getBoolean("IsVillager")) setVillager(true); + if (tag->contains("ConversionTime") && tag->getInt("ConversionTime") > -1) + startConverting(tag->getInt("ConversionTime")); } void Zombie::killed(std::shared_ptr mob) { diff --git a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp index bd048da23..877ac2e77 100644 --- a/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp +++ b/targets/minecraft/world/entity/npc/ClientSideMerchant.cpp @@ -8,7 +8,7 @@ class Container; class Player; ClientSideMerchant::ClientSideMerchant(std::shared_ptr source, - const std::wstring& name) { + const std::string& name) { this->source = source; // 4J Stu - Need to do this after creating as a shared_ptr container = nullptr; // new MerchantContainer(source, this); @@ -50,4 +50,4 @@ void ClientSideMerchant::notifyTrade(MerchantRecipe* activeRecipe) { void ClientSideMerchant::notifyTradeUpdated( std::shared_ptr item) {} -std::wstring ClientSideMerchant::getDisplayName() { return m_name; } \ No newline at end of file +std::string ClientSideMerchant::getDisplayName() { return m_name; } \ No newline at end of file diff --git a/targets/minecraft/world/entity/npc/ClientSideMerchant.h b/targets/minecraft/world/entity/npc/ClientSideMerchant.h index 5cfe7a088..6a594faa8 100644 --- a/targets/minecraft/world/entity/npc/ClientSideMerchant.h +++ b/targets/minecraft/world/entity/npc/ClientSideMerchant.h @@ -18,11 +18,11 @@ private: MerchantContainer* container; std::shared_ptr source; MerchantRecipeList* currentOffers; - std::wstring m_name; + std::string m_name; public: ClientSideMerchant(std::shared_ptr source, - const std::wstring& name); + const std::string& name); ~ClientSideMerchant(); void createContainer(); // 4J Added @@ -33,5 +33,5 @@ public: void overrideOffers(MerchantRecipeList* recipeList); void notifyTrade(MerchantRecipe* activeRecipe); void notifyTradeUpdated(std::shared_ptr item); - std::wstring getDisplayName(); + std::string getDisplayName(); }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index ba0369d5f..2b2e26511 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -97,7 +97,7 @@ void Villager::_init(int profession) { updateMerchantTimer = 0; addRecipeOnUpdate = false; riches = 0; - lastPlayerTradeName = L""; + lastPlayerTradeName = ""; rewardPlayersOnFirstVillage = false; baseRecipeChanceMod = 0.0f; @@ -220,19 +220,19 @@ void Villager::defineSynchedData() { void Villager::addAdditonalSaveData(CompoundTag* tag) { AgableMob::addAdditonalSaveData(tag); - tag->putInt(L"Profession", getProfession()); - tag->putInt(L"Riches", riches); + tag->putInt("Profession", getProfession()); + tag->putInt("Riches", riches); if (offers != nullptr) { - tag->putCompound(L"Offers", offers->createTag()); + tag->putCompound("Offers", offers->createTag()); } } void Villager::readAdditionalSaveData(CompoundTag* tag) { AgableMob::readAdditionalSaveData(tag); - setProfession(tag->getInt(L"Profession")); - riches = tag->getInt(L"Riches"); - if (tag->contains(L"Offers")) { - CompoundTag* compound = tag->getCompound(L"Offers"); + setProfession(tag->getInt("Profession")); + riches = tag->getInt("Riches"); + if (tag->contains("Offers")) { + CompoundTag* compound = tag->getCompound("Offers"); delete offers; offers = new MerchantRecipeList(compound); } @@ -337,7 +337,7 @@ void Villager::notifyTrade(MerchantRecipe* activeRecipe) { if (tradingPlayer.lock() != nullptr) { lastPlayerTradeName = tradingPlayer.lock()->getName(); } else { - lastPlayerTradeName = L""; + lastPlayerTradeName = ""; } } @@ -776,7 +776,7 @@ std::shared_ptr Villager::getBreedOffspring( bool Villager::canBeLeashed() { return false; } -std::wstring Villager::getDisplayName() { +std::string Villager::getDisplayName() { if (hasCustomName()) return getCustomName(); int name = IDS_VILLAGER; diff --git a/targets/minecraft/world/entity/npc/Villager.h b/targets/minecraft/world/entity/npc/Villager.h index 6610fc805..0873a49a8 100644 --- a/targets/minecraft/world/entity/npc/Villager.h +++ b/targets/minecraft/world/entity/npc/Villager.h @@ -51,7 +51,7 @@ private: int updateMerchantTimer; bool addRecipeOnUpdate; int riches; - std::wstring lastPlayerTradeName; + std::string lastPlayerTradeName; bool rewardPlayersOnFirstVillage; @@ -163,5 +163,5 @@ public: virtual std::shared_ptr getBreedOffspring( std::shared_ptr target); virtual bool canBeLeashed(); - virtual std::wstring getDisplayName(); + virtual std::string getDisplayName(); }; \ No newline at end of file diff --git a/targets/minecraft/world/entity/player/Abilities.cpp b/targets/minecraft/world/entity/player/Abilities.cpp index 7ea8b1726..d30b2f1cf 100644 --- a/targets/minecraft/world/entity/player/Abilities.cpp +++ b/targets/minecraft/world/entity/player/Abilities.cpp @@ -21,32 +21,32 @@ Abilities::Abilities() { void Abilities::addSaveData(CompoundTag* parentTag) { CompoundTag* tag = new CompoundTag(); - tag->putBoolean(L"invulnerable", invulnerable); - tag->putBoolean(L"flying", flying); - tag->putBoolean(L"mayfly", mayfly); - tag->putBoolean(L"instabuild", instabuild); - tag->putBoolean(L"mayBuild", mayBuild); - tag->putFloat(L"flySpeed", flyingSpeed); - tag->putFloat(L"walkSpeed", walkingSpeed); + tag->putBoolean("invulnerable", invulnerable); + tag->putBoolean("flying", flying); + tag->putBoolean("mayfly", mayfly); + tag->putBoolean("instabuild", instabuild); + tag->putBoolean("mayBuild", mayBuild); + tag->putFloat("flySpeed", flyingSpeed); + tag->putFloat("walkSpeed", walkingSpeed); - parentTag->put(L"abilities", tag); + parentTag->put("abilities", tag); } void Abilities::loadSaveData(CompoundTag* parentTag) { - if (parentTag->contains(L"abilities")) { - CompoundTag* tag = parentTag->getCompound(L"abilities"); + if (parentTag->contains("abilities")) { + CompoundTag* tag = parentTag->getCompound("abilities"); - invulnerable = tag->getBoolean(L"invulnerable"); - flying = tag->getBoolean(L"flying"); - mayfly = tag->getBoolean(L"mayfly"); - instabuild = tag->getBoolean(L"instabuild"); + invulnerable = tag->getBoolean("invulnerable"); + flying = tag->getBoolean("flying"); + mayfly = tag->getBoolean("mayfly"); + instabuild = tag->getBoolean("instabuild"); - if (tag->contains(L"flySpeed")) { - flyingSpeed = tag->getFloat(L"flySpeed"); - walkingSpeed = tag->getFloat(L"walkSpeed"); + if (tag->contains("flySpeed")) { + flyingSpeed = tag->getFloat("flySpeed"); + walkingSpeed = tag->getFloat("walkSpeed"); } - if (tag->contains(L"mayBuild")) { - mayBuild = tag->getBoolean(L"mayBuild"); + if (tag->contains("mayBuild")) { + mayBuild = tag->getBoolean("mayBuild"); } } } diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp index 4e853f9a6..043f96f45 100644 --- a/targets/minecraft/world/entity/player/Inventory.cpp +++ b/targets/minecraft/world/entity/player/Inventory.cpp @@ -392,7 +392,7 @@ std::shared_ptr Inventory::removeItemNoUpdate(int slot) { void Inventory::setItem(unsigned int slot, std::shared_ptr item) { #ifdef _DEBUG if (item != nullptr) { - std::wstring itemstring = item->toString(); + std::string itemstring = item->toString(); Log::info("Inventory::setItem - slot = %d,\t item = %d ", slot, item->id); // OutputDebugStringW(itemstring.c_str()); @@ -435,7 +435,7 @@ ListTag* Inventory::save(ListTag* listTag) { for (unsigned int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } @@ -443,7 +443,7 @@ ListTag* Inventory::save(ListTag* listTag) { for (unsigned int i = 0; i < armor.size(); i++) { if (armor[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)(i + 100)); + tag->putByte("Slot", (uint8_t)(i + 100)); armor[i]->save(tag); listTag->add(tag); } @@ -458,7 +458,7 @@ void Inventory::load(ListTag* inventoryList) { armor = std::vector>(4); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - unsigned int slot = tag->getByte(L"Slot") & 0xff; + unsigned int slot = tag->getByte("Slot") & 0xff; std::shared_ptr item = std::shared_ptr(ItemInstance::fromTag(tag)); if (item != nullptr) { @@ -490,9 +490,9 @@ std::shared_ptr Inventory::getItem(unsigned int slot) { */ } -std::wstring Inventory::getName() { return gameServices().getString(IDS_INVENTORY); } +std::string Inventory::getName() { return gameServices().getString(IDS_INVENTORY); } -std::wstring Inventory::getCustomName() { return L""; } +std::string Inventory::getCustomName() { return ""; } bool Inventory::hasCustomName() { return false; } diff --git a/targets/minecraft/world/entity/player/Inventory.h b/targets/minecraft/world/entity/player/Inventory.h index fbfca0df1..432f006f5 100644 --- a/targets/minecraft/world/entity/player/Inventory.h +++ b/targets/minecraft/world/entity/player/Inventory.h @@ -86,8 +86,8 @@ public: void load(ListTag* inventoryList); unsigned int getContainerSize(); std::shared_ptr getItem(unsigned int slot); - std::wstring getName(); - std::wstring getCustomName(); + std::string getName(); + std::string getCustomName(); bool hasCustomName(); int getMaxStackSize(); bool canDestroy(Tile* tile); diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 53af16211..e6477a1c3 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -106,8 +106,8 @@ void Player::_init() { m_isSleeping = false; - customTextureUrl = L""; - customTextureUrl2 = L""; + customTextureUrl = ""; + customTextureUrl2 = ""; m_uiPlayerCurrentSkin = 0; bedPosition = nullptr; @@ -154,7 +154,7 @@ void Player::_init() { m_bAwardedOnARail = false; } -Player::Player(Level* level, const std::wstring& name) : LivingEntity(level) { +Player::Player(Level* level, const std::string& name) : LivingEntity(level) { // 4J Stu - This function call had to be moved here from the Entity ctor to // ensure that the derived version of the function is called this->defineSynchedData(); @@ -483,7 +483,7 @@ void Player::spawnEatParticles(std::shared_ptr useItem, p.x, p.y, p.z, d.x, d.y + 0.05, d.z); } - // 4J Stu - Was L"mob.eat" which doesnt exist + // 4J Stu - Was "mob.eat" which doesnt exist playSound(eSoundType_RANDOM_EAT, 0.5f + 0.5f * random->nextInt(2), (random->nextFloat() - random->nextFloat()) * 0.2f + 1.0f); } @@ -535,14 +535,14 @@ void Player::ride(std::shared_ptr e) { void Player::setPlayerDefaultSkin(EDefaultSkins skin) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Setting default skin to %d for player %ls\n", std::to_underlying(skin), name.c_str()); + printf("Setting default skin to %d for player %s\n", std::to_underlying(skin), name.c_str()); #endif m_skinIndex = skin; } void Player::setCustomSkin(std::uint32_t skinId) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Attempting to set skin to %08X for player %ls\n", skinId, + printf("Attempting to set skin to %08X for player %s\n", skinId, name.c_str()); #endif EDefaultSkins playerSkin = EDefaultSkins::ServerSelected; @@ -663,7 +663,7 @@ void Player::setXuid(PlayerUID xuid) { m_xuid = xuid; } void Player::setCustomCape(std::uint32_t capeId) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Attempting to set cape to %08X for player %s\n", capeId, + printf("Attempting to set cape to %08X for player %s\n", capeId, name.c_str()); #endif @@ -679,34 +679,34 @@ void Player::setCustomCape(std::uint32_t capeId) { this->customTextureUrl2 = pMojangData->wchCape; } else { if (gameServices().defaultCapeExists()) { - this->customTextureUrl2 = std::wstring(L"Special_Cape.png"); + this->customTextureUrl2 = std::string("Special_Cape.png"); } else { - this->customTextureUrl2 = std::wstring(L""); + this->customTextureUrl2 = std::string(""); } } } else { // if there is a custom default cloak, then set it here if (gameServices().defaultCapeExists()) { - this->customTextureUrl2 = std::wstring(L"Special_Cape.png"); + this->customTextureUrl2 = std::string("Special_Cape.png"); } else { - this->customTextureUrl2 = std::wstring(L""); + this->customTextureUrl2 = std::string(""); } } } } -std::uint32_t Player::getCapeIdFromPath(const std::wstring& cape) { +std::uint32_t Player::getCapeIdFromPath(const std::string& cape) { bool dlcCape = false; std::uint32_t capeId = 0; if (cape.size() >= 14) { - dlcCape = cape.substr(0, 3).compare(L"dlc") == 0; + dlcCape = cape.substr(0, 3).compare("dlc") == 0; - std::wstring capeValue = cape.substr(7, cape.size()); - capeValue = capeValue.substr(0, capeValue.find_first_of(L'.')); + std::string capeValue = cape.substr(7, cape.size()); + capeValue = capeValue.substr(0, capeValue.find_first_of('.')); - std::wstringstream ss; + std::stringstream ss; // 4J Stu - dlc skins are numbered using decimal to make it easier for // artists/people to number manually Everything else is numbered using // hex @@ -721,15 +721,15 @@ std::uint32_t Player::getCapeIdFromPath(const std::wstring& cape) { return capeId; } -std::wstring Player::getCapePathFromId(std::uint32_t capeId) { +std::string Player::getCapePathFromId(std::uint32_t capeId) { // 4J Stu - This function maps the encoded uint32_t we store in the player // profile to a filename that is stored as a memory texture and shared // between systems in game - wchar_t chars[256]; + char chars[256]; if (GET_IS_DLC_SKIN_FROM_BITMASK(capeId)) { // 4J Stu - DLC skins are numbered using decimal rather than hex to make // it easier to number manually - swprintf(chars, 256, L"dlccape%08d.png", + snprintf(chars, 256, "dlccape%08d.png", GET_DLC_SKIN_ID_FROM_BITMASK(capeId)); } else { @@ -737,9 +737,9 @@ std::wstring Player::getCapePathFromId(std::uint32_t capeId) { std::uint32_t defaultCapeIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(capeId); if (ugcCapeIndex == 0) { - swprintf(chars, 256, L"defcape%08X.png", defaultCapeIndex); + snprintf(chars, 256, "defcape%08X.png", defaultCapeIndex); } else { - swprintf(chars, 256, L"ugccape%08X.png", ugcCapeIndex); + snprintf(chars, 256, "ugccape%08X.png", ugcCapeIndex); } } return chars; @@ -750,7 +750,7 @@ void Player::ChangePlayerSkin() { m_uiPlayerCurrentSkin++; if (m_uiPlayerCurrentSkin > gameServices().getSkinNames().size()) { m_uiPlayerCurrentSkin = 0; - this->customTextureUrl = L""; + this->customTextureUrl = ""; } else { if (m_uiPlayerCurrentSkin > 0) { // change this players custom texture url @@ -780,11 +780,11 @@ void Player::prepareCustomTextures() { //{ // if(gameServices().defaultCapeExists()) // { - // this->customTextureUrl2= wstring(L"Default_Cape.png"); + // this->customTextureUrl2= string("Default_Cape.png"); // } // else // { - // this->customTextureUrl2= wstring(L""); + // this->customTextureUrl2= string(""); // } //} @@ -793,17 +793,17 @@ void Player::prepareCustomTextures() { // if there is a custom default cloak, then set it here // if(gameServices().defaultCapeExists()) //{ - // this->customTextureUrl2= wstring(L"Default_Cape.png"); + // this->customTextureUrl2= string("Default_Cape.png"); //} // else //{ - // this->customTextureUrl2 =wstring(L""); + // this->customTextureUrl2 =string(""); //} } /*cloakTexture = - * wstring(L"http://s3.amazonaws.com/MinecraftCloaks/").append( name - * ).append( L".png" );*/ + * string("http://s3.amazonaws.com/MinecraftCloaks/").append( name + * ).append( ".png" );*/ // this->customTextureUrl2 = cloakTexture; } @@ -1082,69 +1082,69 @@ bool Player::canDestroy(Tile* tile) { return inventory->canDestroy(tile); } void Player::readAdditionalSaveData(CompoundTag* entityTag) { LivingEntity::readAdditionalSaveData(entityTag); ListTag* inventoryList = - (ListTag*)entityTag->getList(L"Inventory"); + (ListTag*)entityTag->getList("Inventory"); inventory->load(inventoryList); - inventory->selected = entityTag->getInt(L"SelectedItemSlot"); - m_isSleeping = entityTag->getBoolean(L"Sleeping"); - sleepCounter = entityTag->getShort(L"SleepTimer"); + inventory->selected = entityTag->getInt("SelectedItemSlot"); + m_isSleeping = entityTag->getBoolean("Sleeping"); + sleepCounter = entityTag->getShort("SleepTimer"); - experienceProgress = entityTag->getFloat(L"XpP"); - experienceLevel = entityTag->getInt(L"XpLevel"); - totalExperience = entityTag->getInt(L"XpTotal"); - setScore(entityTag->getInt(L"Score")); + experienceProgress = entityTag->getFloat("XpP"); + experienceLevel = entityTag->getInt("XpLevel"); + totalExperience = entityTag->getInt("XpTotal"); + setScore(entityTag->getInt("Score")); if (m_isSleeping) { bedPosition = new Pos(Mth::floor(x), Mth::floor(y), Mth::floor(z)); stopSleepInBed(true, true, false); } - if (entityTag->contains(L"SpawnX") && entityTag->contains(L"SpawnY") && - entityTag->contains(L"SpawnZ")) { + if (entityTag->contains("SpawnX") && entityTag->contains("SpawnY") && + entityTag->contains("SpawnZ")) { respawnPosition = - new Pos(entityTag->getInt(L"SpawnX"), entityTag->getInt(L"SpawnY"), - entityTag->getInt(L"SpawnZ")); - respawnForced = entityTag->getBoolean(L"SpawnForced"); + new Pos(entityTag->getInt("SpawnX"), entityTag->getInt("SpawnY"), + entityTag->getInt("SpawnZ")); + respawnForced = entityTag->getBoolean("SpawnForced"); } foodData.readAdditionalSaveData(entityTag); abilities.loadSaveData(entityTag); - if (entityTag->contains(L"EnderItems")) { + if (entityTag->contains("EnderItems")) { ListTag* enderItemsList = - (ListTag*)entityTag->getList(L"EnderItems"); + (ListTag*)entityTag->getList("EnderItems"); enderChestInventory->setItemsByTag(enderItemsList); } // 4J Added - m_uiGamePrivileges = entityTag->getInt(L"GamePrivileges"); + m_uiGamePrivileges = entityTag->getInt("GamePrivileges"); } void Player::addAdditonalSaveData(CompoundTag* entityTag) { LivingEntity::addAdditonalSaveData(entityTag); - entityTag->put(L"Inventory", inventory->save(new ListTag())); - entityTag->putInt(L"SelectedItemSlot", inventory->selected); - entityTag->putBoolean(L"Sleeping", m_isSleeping); - entityTag->putShort(L"SleepTimer", (short)sleepCounter); + entityTag->put("Inventory", inventory->save(new ListTag())); + entityTag->putInt("SelectedItemSlot", inventory->selected); + entityTag->putBoolean("Sleeping", m_isSleeping); + entityTag->putShort("SleepTimer", (short)sleepCounter); - entityTag->putFloat(L"XpP", experienceProgress); - entityTag->putInt(L"XpLevel", experienceLevel); - entityTag->putInt(L"XpTotal", totalExperience); - entityTag->putInt(L"Score", getScore()); + entityTag->putFloat("XpP", experienceProgress); + entityTag->putInt("XpLevel", experienceLevel); + entityTag->putInt("XpTotal", totalExperience); + entityTag->putInt("Score", getScore()); if (respawnPosition != nullptr) { - entityTag->putInt(L"SpawnX", respawnPosition->x); - entityTag->putInt(L"SpawnY", respawnPosition->y); - entityTag->putInt(L"SpawnZ", respawnPosition->z); - entityTag->putBoolean(L"SpawnForced", respawnForced); + entityTag->putInt("SpawnX", respawnPosition->x); + entityTag->putInt("SpawnY", respawnPosition->y); + entityTag->putInt("SpawnZ", respawnPosition->z); + entityTag->putBoolean("SpawnForced", respawnForced); } foodData.addAdditonalSaveData(entityTag); abilities.addSaveData(entityTag); - entityTag->put(L"EnderItems", enderChestInventory->createTag()); + entityTag->put("EnderItems", enderChestInventory->createTag()); // 4J Added - entityTag->putInt(L"GamePrivileges", m_uiGamePrivileges); + entityTag->putInt("GamePrivileges", m_uiGamePrivileges); } bool Player::openContainer(std::shared_ptr container) { @@ -1164,7 +1164,7 @@ bool Player::openHorseInventory(std::shared_ptr horse, return true; } -bool Player::startEnchanting(int x, int y, int z, const std::wstring& name) { +bool Player::startEnchanting(int x, int y, int z, const std::string& name) { return true; } @@ -1229,7 +1229,7 @@ bool Player::canHarmPlayer(std::shared_ptr target) { return team->isAllowFriendlyFire(); } -bool Player::canHarmPlayer(std::wstring targetName) { return true; } +bool Player::canHarmPlayer(std::string targetName) { return true; } void Player::hurtArmor(float damage) { inventory->hurtArmor(damage); } @@ -1284,7 +1284,7 @@ bool Player::openBeacon(std::shared_ptr beacon) { } bool Player::openTrading(std::shared_ptr traderTarget, - const std::wstring& name) { + const std::string& name) { return true; } @@ -2173,7 +2173,7 @@ bool Player::isAlwaysExperienceDropper() { return true; } -std::wstring Player::getAName() { return name; } +std::string Player::getAName() { return name; } bool Player::shouldShowName() { return true; } @@ -2208,16 +2208,16 @@ void Player::onUpdateAbilities() {} void Player::setGameMode(GameType* mode) {} -std::wstring Player::getName() { return name; } +std::string Player::getName() { return name; } -std::wstring Player::getDisplayName() { +std::string Player::getDisplayName() { // PlayerTeam.formatNameForTeam(getTeam(), name); // If player display name is not set, return name return m_displayName.size() > 0 ? m_displayName : name; } -std::wstring Player::getNetworkName() { +std::string Player::getNetworkName() { // 4J: We can only transmit gamertag in network packets return name; } @@ -2269,30 +2269,30 @@ float Player::getAbsorptionAmount() { int Player::getTexture() { switch (m_skinIndex) { case EDefaultSkins::Skin0: - return TN_MOB_CHAR; // 4J - was L"/mob/char.png"; + return TN_MOB_CHAR; // 4J - was "/mob/char.png"; case EDefaultSkins::Skin1: - return TN_MOB_CHAR1; // 4J - was L"/mob/char1.png"; + return TN_MOB_CHAR1; // 4J - was "/mob/char1.png"; case EDefaultSkins::Skin2: - return TN_MOB_CHAR2; // 4J - was L"/mob/char2.png"; + return TN_MOB_CHAR2; // 4J - was "/mob/char2.png"; case EDefaultSkins::Skin3: - return TN_MOB_CHAR3; // 4J - was L"/mob/char3.png"; + return TN_MOB_CHAR3; // 4J - was "/mob/char3.png"; case EDefaultSkins::Skin4: - return TN_MOB_CHAR4; // 4J - was L"/mob/char4.png"; + return TN_MOB_CHAR4; // 4J - was "/mob/char4.png"; case EDefaultSkins::Skin5: - return TN_MOB_CHAR5; // 4J - was L"/mob/char5.png"; + return TN_MOB_CHAR5; // 4J - was "/mob/char5.png"; case EDefaultSkins::Skin6: - return TN_MOB_CHAR6; // 4J - was L"/mob/char6.png"; + return TN_MOB_CHAR6; // 4J - was "/mob/char6.png"; case EDefaultSkins::Skin7: - return TN_MOB_CHAR7; // 4J - was L"/mob/char7.png"; + return TN_MOB_CHAR7; // 4J - was "/mob/char7.png"; default: - return TN_MOB_CHAR; // 4J - was L"/mob/char.png"; + return TN_MOB_CHAR; // 4J - was "/mob/char.png"; } } int Player::hash_fnct(const std::shared_ptr k) { // TODO 4J Stu - Should we just be using the pointers and hashing them? - return (int)std::hash()(k->name); + return (int)std::hash()(k->name); } bool Player::eq_test(const std::shared_ptr x, @@ -2670,7 +2670,7 @@ std::vector* Player::GetAdditionalModelParts() { if (m_ppAdditionalModelParts == nullptr && !m_bCheckedForModelParts) { bool hasCustomTexture = !customTextureUrl.empty(); bool customTextureIsDefaultSkin = - customTextureUrl.substr(0, 3).compare(L"def") == 0; + customTextureUrl.substr(0, 3).compare("def") == 0; // see if we can find the parts m_ppAdditionalModelParts = gameServices().getAdditionalModelParts(m_dwSkinId); diff --git a/targets/minecraft/world/entity/player/Player.h b/targets/minecraft/world/entity/player/Player.h index 506f9ff53..a529c1ca6 100644 --- a/targets/minecraft/world/entity/player/Player.h +++ b/targets/minecraft/world/entity/player/Player.h @@ -89,23 +89,23 @@ public: std::uint8_t userType; float oBob, bob; - std::wstring name; + std::string name; int takeXpDelay; // 4J-PB - track custom skin - std::wstring customTextureUrl; - std::wstring customTextureUrl2; + std::string customTextureUrl; + std::string customTextureUrl2; unsigned int m_uiPlayerCurrentSkin; void ChangePlayerSkin(); - // 4J-PB - not needed, since cutomtextureurl2 is the same thing wstring + // 4J-PB - not needed, since cutomtextureurl2 is the same thing string // cloakTexture; double xCloakO, yCloakO, zCloakO; double xCloak, yCloak, zCloak; // 4J-HG: store display name, added for Xbox One "game display name" - std::wstring m_displayName; + std::string m_displayName; protected: // player sleeping in bed? @@ -157,7 +157,7 @@ public: // 4J Added to default init void _init(); - Player(Level* level, const std::wstring& name); + Player(Level* level, const std::string& name); virtual ~Player(); protected: @@ -238,7 +238,7 @@ public: std::shared_ptr container); virtual bool startEnchanting( int x, int y, int z, - const std::wstring& name); // 4J - added bool return + const std::string& name); // 4J - added bool return virtual bool startRepairing(int x, int y, int z); // 4J - added bool return virtual bool startCrafting(int x, int y, int z); // 4J - added bool return virtual bool openFireworks(int x, int y, int z); // 4J - added @@ -258,7 +258,7 @@ public: virtual bool hurt(DamageSource* source, float dmg); virtual bool canHarmPlayer(std::shared_ptr target); virtual bool canHarmPlayer( - std::wstring targetName); // 4J: Added for ServerPlayer when only + std::string targetName); // 4J: Added for ServerPlayer when only // player name is provided protected: @@ -284,7 +284,7 @@ public: virtual bool openBeacon(std::shared_ptr beacon); virtual bool openTrading( std::shared_ptr traderTarget, - const std::wstring& name); // 4J - added bool return + const std::string& name); // 4J - added bool return virtual void openItemInstanceGui( std::shared_ptr itemInstance); virtual bool interact(std::shared_ptr entity); @@ -404,7 +404,7 @@ protected: virtual bool isAlwaysExperienceDropper(); public: - virtual std::wstring getAName(); + virtual std::string getAName(); virtual bool shouldShowName(); virtual void restoreFrom(std::shared_ptr oldPlayer, bool restoreAll); @@ -415,9 +415,9 @@ protected: public: void onUpdateAbilities(); void setGameMode(GameType* mode); - std::wstring getName(); - virtual std::wstring getDisplayName(); - virtual std::wstring getNetworkName(); // 4J: Added + std::string getName(); + virtual std::string getDisplayName(); + virtual std::string getNetworkName(); // 4J: Added virtual Level* getCommandSenderWorld(); @@ -446,7 +446,7 @@ public: virtual void onCrafted(std::shared_ptr item) {} // 4J Overriding this so that we can have some different default skins - virtual int getTexture(); // 4J changed from std::wstring to int + virtual int getTexture(); // 4J changed from std::string to int void setPlayerDefaultSkin(EDefaultSkins skin); EDefaultSkins getPlayerDefaultSkin() { return m_skinIndex; } virtual void setCustomSkin(std::uint32_t skinId); @@ -454,8 +454,8 @@ public: virtual void setCustomCape(std::uint32_t capeId); std::uint32_t getCustomCape() { return m_dwCapeId; } - static std::uint32_t getCapeIdFromPath(const std::wstring& cape); - static std::wstring getCapePathFromId(std::uint32_t capeId); + static std::uint32_t getCapeIdFromPath(const std::string& cape); + static std::string getCapePathFromId(std::uint32_t capeId); static unsigned int getSkinAnimOverrideBitmask(std::uint32_t skinId); // 4J Added @@ -477,9 +477,9 @@ public: } virtual void sendMessage( - const std::wstring& message, + const std::string& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L"") {} + int customData = -1, const std::string& additionalMessage = "") {} private: PlayerUID m_xuid; diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index 29e72035c..4775c8443 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -455,34 +455,34 @@ void Arrow::tick() { } void Arrow::addAdditonalSaveData(CompoundTag* tag) { - tag->putShort(L"xTile", (short)xTile); - tag->putShort(L"yTile", (short)yTile); - tag->putShort(L"zTile", (short)zTile); - tag->putByte(L"inTile", (uint8_t)lastTile); - tag->putByte(L"inData", (uint8_t)lastData); - tag->putByte(L"shake", (uint8_t)shakeTime); - tag->putByte(L"inGround", (uint8_t)(inGround ? 1 : 0)); - tag->putByte(L"pickup", (uint8_t)pickup); - tag->putDouble(L"damage", baseDamage); + tag->putShort("xTile", (short)xTile); + tag->putShort("yTile", (short)yTile); + tag->putShort("zTile", (short)zTile); + tag->putByte("inTile", (uint8_t)lastTile); + tag->putByte("inData", (uint8_t)lastData); + tag->putByte("shake", (uint8_t)shakeTime); + tag->putByte("inGround", (uint8_t)(inGround ? 1 : 0)); + tag->putByte("pickup", (uint8_t)pickup); + tag->putDouble("damage", baseDamage); } void Arrow::readAdditionalSaveData(CompoundTag* tag) { - xTile = tag->getShort(L"xTile"); - yTile = tag->getShort(L"yTile"); - zTile = tag->getShort(L"zTile"); - lastTile = tag->getByte(L"inTile") & 0xff; - lastData = tag->getByte(L"inData") & 0xff; - shakeTime = tag->getByte(L"shake") & 0xff; - inGround = tag->getByte(L"inGround") == 1; - if (tag->contains(L"damage")) { - baseDamage = tag->getDouble(L"damage"); + xTile = tag->getShort("xTile"); + yTile = tag->getShort("yTile"); + zTile = tag->getShort("zTile"); + lastTile = tag->getByte("inTile") & 0xff; + lastData = tag->getByte("inData") & 0xff; + shakeTime = tag->getByte("shake") & 0xff; + inGround = tag->getByte("inGround") == 1; + if (tag->contains("damage")) { + baseDamage = tag->getDouble("damage"); } - if (tag->contains(L"pickup")) { - pickup = tag->getByte(L"pickup"); - } else if (tag->contains(L"player")) { + if (tag->contains("pickup")) { + pickup = tag->getByte("pickup"); + } else if (tag->contains("player")) { pickup = - tag->getBoolean(L"player") ? PICKUP_ALLOWED : PICKUP_DISALLOWED; + tag->getBoolean("player") ? PICKUP_ALLOWED : PICKUP_DISALLOWED; } } diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp index 05a6b9eb2..f89d0ccd0 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.cpp +++ b/targets/minecraft/world/entity/projectile/Fireball.cpp @@ -278,26 +278,26 @@ void Fireball::tick() { float Fireball::getInertia() { return 0.95f; } void Fireball::addAdditonalSaveData(CompoundTag* tag) { - tag->putShort(L"xTile", (short)xTile); - tag->putShort(L"yTile", (short)yTile); - tag->putShort(L"zTile", (short)zTile); - tag->putByte(L"inTile", (uint8_t)lastTile); - tag->putByte(L"inGround", (uint8_t)(inGround ? 1 : 0)); - tag->put(L"direction", newDoubleList(3, xd, yd, zd)); + tag->putShort("xTile", (short)xTile); + tag->putShort("yTile", (short)yTile); + tag->putShort("zTile", (short)zTile); + tag->putByte("inTile", (uint8_t)lastTile); + tag->putByte("inGround", (uint8_t)(inGround ? 1 : 0)); + tag->put("direction", newDoubleList(3, xd, yd, zd)); } void Fireball::readAdditionalSaveData(CompoundTag* tag) { - xTile = tag->getShort(L"xTile"); - yTile = tag->getShort(L"yTile"); - zTile = tag->getShort(L"zTile"); - lastTile = tag->getByte(L"inTile") & 0xff; - inGround = tag->getByte(L"inGround") == 1; + xTile = tag->getShort("xTile"); + yTile = tag->getShort("yTile"); + zTile = tag->getShort("zTile"); + lastTile = tag->getByte("inTile") & 0xff; + inGround = tag->getByte("inGround") == 1; // Load the stored direction and apply it to the fireball // if it has no stored direction, remove it. - if (tag->contains(L"direction")) { + if (tag->contains("direction")) { ListTag* listTag = - (ListTag*)tag->getList(L"direction"); + (ListTag*)tag->getList("direction"); xd = ((DoubleTag*)listTag->get(0))->data; yd = ((DoubleTag*)listTag->get(1))->data; zd = ((DoubleTag*)listTag->get(2))->data; diff --git a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 7ca0bccfc..052f698ed 100644 --- a/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/targets/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -135,22 +135,22 @@ void FireworksRocketEntity::handleEntityEvent(uint8_t eventId) { } void FireworksRocketEntity::addAdditonalSaveData(CompoundTag* tag) { - tag->putInt(L"Life", life); - tag->putInt(L"LifeTime", lifetime); + tag->putInt("Life", life); + tag->putInt("LifeTime", lifetime); std::shared_ptr itemInstance = entityData->getItemInstance(DATA_ID_FIREWORKS_ITEM); if (itemInstance != nullptr) { CompoundTag* itemTag = new CompoundTag(); itemInstance->save(itemTag); - tag->putCompound(L"FireworksItem", itemTag); + tag->putCompound("FireworksItem", itemTag); } } void FireworksRocketEntity::readAdditionalSaveData(CompoundTag* tag) { - life = tag->getInt(L"Life"); - lifetime = tag->getInt(L"LifeTime"); + life = tag->getInt("Life"); + lifetime = tag->getInt("LifeTime"); - CompoundTag* itemTag = tag->getCompound(L"FireworksItem"); + CompoundTag* itemTag = tag->getCompound("FireworksItem"); if (itemTag != nullptr) { std::shared_ptr fromTag = ItemInstance::fromTag(itemTag); if (fromTag != nullptr) { diff --git a/targets/minecraft/world/entity/projectile/FishingHook.cpp b/targets/minecraft/world/entity/projectile/FishingHook.cpp index 4d111bdeb..4e01c1570 100644 --- a/targets/minecraft/world/entity/projectile/FishingHook.cpp +++ b/targets/minecraft/world/entity/projectile/FishingHook.cpp @@ -365,21 +365,21 @@ void FishingHook::tick() { } void FishingHook::addAdditonalSaveData(CompoundTag* tag) { - tag->putShort(L"xTile", (short)xTile); - tag->putShort(L"yTile", (short)yTile); - tag->putShort(L"zTile", (short)zTile); - tag->putByte(L"inTile", (uint8_t)lastTile); - tag->putByte(L"shake", (uint8_t)shakeTime); - tag->putByte(L"inGround", (uint8_t)(inGround ? 1 : 0)); + tag->putShort("xTile", (short)xTile); + tag->putShort("yTile", (short)yTile); + tag->putShort("zTile", (short)zTile); + tag->putByte("inTile", (uint8_t)lastTile); + tag->putByte("shake", (uint8_t)shakeTime); + tag->putByte("inGround", (uint8_t)(inGround ? 1 : 0)); } void FishingHook::readAdditionalSaveData(CompoundTag* tag) { - xTile = tag->getShort(L"xTile"); - yTile = tag->getShort(L"yTile"); - zTile = tag->getShort(L"zTile"); - lastTile = tag->getByte(L"inTile") & 0xff; - shakeTime = tag->getByte(L"shake") & 0xff; - inGround = tag->getByte(L"inGround") == 1; + xTile = tag->getShort("xTile"); + yTile = tag->getShort("yTile"); + zTile = tag->getShort("zTile"); + lastTile = tag->getByte("inTile") & 0xff; + shakeTime = tag->getByte("shake") & 0xff; + inGround = tag->getByte("inGround") == 1; } float FishingHook::getShadowHeightOffs() { return 0; } diff --git a/targets/minecraft/world/entity/projectile/LargeFireball.cpp b/targets/minecraft/world/entity/projectile/LargeFireball.cpp index 02de91210..a1254fad6 100644 --- a/targets/minecraft/world/entity/projectile/LargeFireball.cpp +++ b/targets/minecraft/world/entity/projectile/LargeFireball.cpp @@ -44,11 +44,11 @@ void LargeFireball::onHit(HitResult* res) { void LargeFireball::addAdditonalSaveData(CompoundTag* tag) { Fireball::addAdditonalSaveData(tag); - tag->putInt(L"ExplosionPower", explosionPower); + tag->putInt("ExplosionPower", explosionPower); } void LargeFireball::readAdditionalSaveData(CompoundTag* tag) { Fireball::readAdditionalSaveData(tag); - if (tag->contains(L"ExplosionPower")) - explosionPower = tag->getInt(L"ExplosionPower"); + if (tag->contains("ExplosionPower")) + explosionPower = tag->getInt("ExplosionPower"); } diff --git a/targets/minecraft/world/entity/projectile/Throwable.cpp b/targets/minecraft/world/entity/projectile/Throwable.cpp index 30bd4d4cf..728b15944 100644 --- a/targets/minecraft/world/entity/projectile/Throwable.cpp +++ b/targets/minecraft/world/entity/projectile/Throwable.cpp @@ -29,7 +29,7 @@ void Throwable::_throwableInit() { owner = nullptr; life = 0; flightTime = 0; - ownerName = L""; + ownerName = ""; } Throwable::Throwable(Level* level) : Entity(level) { @@ -242,30 +242,30 @@ void Throwable::tick() { float Throwable::getGravity() { return 0.03f; } void Throwable::addAdditonalSaveData(CompoundTag* tag) { - tag->putShort(L"xTile", (short)xTile); - tag->putShort(L"yTile", (short)yTile); - tag->putShort(L"zTile", (short)zTile); - tag->putByte(L"inTile", (uint8_t)lastTile); - tag->putByte(L"shake", (uint8_t)shakeTime); - tag->putByte(L"inGround", (uint8_t)(inGround ? 1 : 0)); + tag->putShort("xTile", (short)xTile); + tag->putShort("yTile", (short)yTile); + tag->putShort("zTile", (short)zTile); + tag->putByte("inTile", (uint8_t)lastTile); + tag->putByte("shake", (uint8_t)shakeTime); + tag->putByte("inGround", (uint8_t)(inGround ? 1 : 0)); if (ownerName.empty() && (owner != nullptr) && owner->instanceof(eTYPE_PLAYER)) { ownerName = owner->getAName(); } - tag->putString(L"ownerName", ownerName.empty() ? L"" : ownerName); + tag->putString("ownerName", ownerName.empty() ? "" : ownerName); } void Throwable::readAdditionalSaveData(CompoundTag* tag) { - xTile = tag->getShort(L"xTile"); - yTile = tag->getShort(L"yTile"); - zTile = tag->getShort(L"zTile"); - lastTile = tag->getByte(L"inTile") & 0xff; - shakeTime = tag->getByte(L"shake") & 0xff; - inGround = tag->getByte(L"inGround") == 1; - ownerName = tag->getString(L"ownerName"); - if (ownerName.empty()) ownerName = L""; + xTile = tag->getShort("xTile"); + yTile = tag->getShort("yTile"); + zTile = tag->getShort("zTile"); + lastTile = tag->getByte("inTile") & 0xff; + shakeTime = tag->getByte("shake") & 0xff; + inGround = tag->getByte("inGround") == 1; + ownerName = tag->getString("ownerName"); + if (ownerName.empty()) ownerName = ""; } float Throwable::getShadowHeightOffs() { return 0; } diff --git a/targets/minecraft/world/entity/projectile/Throwable.h b/targets/minecraft/world/entity/projectile/Throwable.h index 01db70537..72653df2d 100644 --- a/targets/minecraft/world/entity/projectile/Throwable.h +++ b/targets/minecraft/world/entity/projectile/Throwable.h @@ -27,7 +27,7 @@ public: std::shared_ptr owner; private: - std::wstring ownerName; + std::string ownerName; int life; int flightTime; diff --git a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp index c4543a671..fb2c2d53f 100644 --- a/targets/minecraft/world/entity/projectile/ThrownPotion.cpp +++ b/targets/minecraft/world/entity/projectile/ThrownPotion.cpp @@ -149,10 +149,10 @@ void ThrownPotion::onHit(HitResult* res) { void ThrownPotion::readAdditionalSaveData(CompoundTag* tag) { Throwable::readAdditionalSaveData(tag); - if (tag->contains(L"Potion")) { - potionItem = ItemInstance::fromTag(tag->getCompound(L"Potion")); + if (tag->contains("Potion")) { + potionItem = ItemInstance::fromTag(tag->getCompound("Potion")); } else { - setPotionValue(tag->getInt(L"potionValue")); + setPotionValue(tag->getInt("potionValue")); } if (potionItem == nullptr) remove(); @@ -162,5 +162,5 @@ void ThrownPotion::addAdditonalSaveData(CompoundTag* tag) { Throwable::addAdditonalSaveData(tag); if (potionItem != nullptr) - tag->putCompound(L"Potion", potionItem->save(new CompoundTag())); + tag->putCompound("Potion", potionItem->save(new CompoundTag())); } diff --git a/targets/minecraft/world/food/FoodData.cpp b/targets/minecraft/world/food/FoodData.cpp index 3d54ae913..dd94c3f68 100644 --- a/targets/minecraft/world/food/FoodData.cpp +++ b/targets/minecraft/world/food/FoodData.cpp @@ -85,19 +85,19 @@ void FoodData::tick(std::shared_ptr player) { } void FoodData::readAdditionalSaveData(CompoundTag* entityTag) { - if (entityTag->contains(L"foodLevel")) { - foodLevel = entityTag->getInt(L"foodLevel"); - tickTimer = entityTag->getInt(L"foodTickTimer"); - saturationLevel = entityTag->getFloat(L"foodSaturationLevel"); - exhaustionLevel = entityTag->getFloat(L"foodExhaustionLevel"); + if (entityTag->contains("foodLevel")) { + foodLevel = entityTag->getInt("foodLevel"); + tickTimer = entityTag->getInt("foodTickTimer"); + saturationLevel = entityTag->getFloat("foodSaturationLevel"); + exhaustionLevel = entityTag->getFloat("foodExhaustionLevel"); } } void FoodData::addAdditonalSaveData(CompoundTag* entityTag) { - entityTag->putInt(L"foodLevel", foodLevel); - entityTag->putInt(L"foodTickTimer", tickTimer); - entityTag->putFloat(L"foodSaturationLevel", saturationLevel); - entityTag->putFloat(L"foodExhaustionLevel", exhaustionLevel); + entityTag->putInt("foodLevel", foodLevel); + entityTag->putInt("foodTickTimer", tickTimer); + entityTag->putFloat("foodSaturationLevel", saturationLevel); + entityTag->putFloat("foodExhaustionLevel", exhaustionLevel); } int FoodData::getFoodLevel() { return foodLevel; } diff --git a/targets/minecraft/world/inventory/AnimalChest.cpp b/targets/minecraft/world/inventory/AnimalChest.cpp index 454a1fa7c..99e4f829c 100644 --- a/targets/minecraft/world/inventory/AnimalChest.cpp +++ b/targets/minecraft/world/inventory/AnimalChest.cpp @@ -3,9 +3,9 @@ #include "minecraft/world/SimpleContainer.h" #include "strings.h" -AnimalChest::AnimalChest(const std::wstring& name, int size) +AnimalChest::AnimalChest(const std::string& name, int size) : SimpleContainer(IDS_CONTAINER_ANIMAL, name, false, size) {} -AnimalChest::AnimalChest(int iTitle, const std::wstring& name, +AnimalChest::AnimalChest(int iTitle, const std::string& name, bool hasCustomName, int size) : SimpleContainer(iTitle, name, hasCustomName, size) {} \ No newline at end of file diff --git a/targets/minecraft/world/inventory/AnimalChest.h b/targets/minecraft/world/inventory/AnimalChest.h index 3465c12b9..73c53b3ad 100644 --- a/targets/minecraft/world/inventory/AnimalChest.h +++ b/targets/minecraft/world/inventory/AnimalChest.h @@ -6,7 +6,7 @@ class AnimalChest : public SimpleContainer { public: - AnimalChest(const std::wstring& name, int size); - AnimalChest(int iTitle, const std::wstring& name, bool hasCustomName, + AnimalChest(const std::string& name, int size); + AnimalChest(int iTitle, const std::string& name, bool hasCustomName, int size); // 4J Added iTitle param }; \ No newline at end of file diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index 5e9fae9de..57725a460 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -414,7 +414,7 @@ std::shared_ptr AnvilMenu::quickMoveStack( return clicked; } -void AnvilMenu::setItemName(const std::wstring& name) { +void AnvilMenu::setItemName(const std::string& name) { itemName = name; if (getSlot(RESULT_SLOT)->hasItem()) { std::shared_ptr item = getSlot(RESULT_SLOT)->getItem(); diff --git a/targets/minecraft/world/inventory/AnvilMenu.h b/targets/minecraft/world/inventory/AnvilMenu.h index d1e3001c2..a3d30c863 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.h +++ b/targets/minecraft/world/inventory/AnvilMenu.h @@ -43,7 +43,7 @@ public: private: int repairItemCountCost; - std::wstring itemName; + std::string itemName; std::shared_ptr player; public: @@ -61,5 +61,5 @@ public: bool stillValid(std::shared_ptr player); std::shared_ptr quickMoveStack(std::shared_ptr player, int slotIndex); - void setItemName(const std::wstring& name); + void setItemName(const std::string& name); }; diff --git a/targets/minecraft/world/inventory/CraftingContainer.cpp b/targets/minecraft/world/inventory/CraftingContainer.cpp index 8a36270ed..6a0c9791a 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.cpp +++ b/targets/minecraft/world/inventory/CraftingContainer.cpp @@ -34,9 +34,9 @@ std::shared_ptr CraftingContainer::getItem(unsigned int x, return getItem(pos); } -std::wstring CraftingContainer::getName() { return L""; } +std::string CraftingContainer::getName() { return ""; } -std::wstring CraftingContainer::getCustomName() { return L""; } +std::string CraftingContainer::getCustomName() { return ""; } bool CraftingContainer::hasCustomName() { return false; } diff --git a/targets/minecraft/world/inventory/CraftingContainer.h b/targets/minecraft/world/inventory/CraftingContainer.h index f35c1dfd8..9f49cdd6b 100644 --- a/targets/minecraft/world/inventory/CraftingContainer.h +++ b/targets/minecraft/world/inventory/CraftingContainer.h @@ -24,8 +24,8 @@ public: virtual unsigned int getContainerSize(); virtual std::shared_ptr getItem(unsigned int slot); std::shared_ptr getItem(unsigned int x, unsigned int y); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); virtual std::shared_ptr removeItemNoUpdate(int slot); virtual std::shared_ptr removeItem(unsigned int slot, diff --git a/targets/minecraft/world/inventory/EnchantmentContainer.cpp b/targets/minecraft/world/inventory/EnchantmentContainer.cpp index 00e378213..aa189dee7 100644 --- a/targets/minecraft/world/inventory/EnchantmentContainer.cpp +++ b/targets/minecraft/world/inventory/EnchantmentContainer.cpp @@ -8,7 +8,7 @@ #include "strings.h" EnchantmentContainer::EnchantmentContainer(EnchantmentMenu* menu) - : SimpleContainer(IDS_ENCHANT, L"", false, 1), m_menu(menu) {} + : SimpleContainer(IDS_ENCHANT, "", false, 1), m_menu(menu) {} int EnchantmentContainer::getMaxStackSize() { return 1; } diff --git a/targets/minecraft/world/inventory/MerchantContainer.cpp b/targets/minecraft/world/inventory/MerchantContainer.cpp index ffa25eda5..43fbda9ff 100644 --- a/targets/minecraft/world/inventory/MerchantContainer.cpp +++ b/targets/minecraft/world/inventory/MerchantContainer.cpp @@ -78,9 +78,9 @@ void MerchantContainer::setItem(unsigned int slot, } } -std::wstring MerchantContainer::getName() { return merchant->getDisplayName(); } +std::string MerchantContainer::getName() { return merchant->getDisplayName(); } -std::wstring MerchantContainer::getCustomName() { return L""; } +std::string MerchantContainer::getCustomName() { return ""; } bool MerchantContainer::hasCustomName() { return false; } diff --git a/targets/minecraft/world/inventory/MerchantContainer.h b/targets/minecraft/world/inventory/MerchantContainer.h index fbc682d62..1ea712972 100644 --- a/targets/minecraft/world/inventory/MerchantContainer.h +++ b/targets/minecraft/world/inventory/MerchantContainer.h @@ -34,8 +34,8 @@ private: public: std::shared_ptr removeItemNoUpdate(int slot); void setItem(unsigned int slot, std::shared_ptr item); - std::wstring getName(); - std::wstring getCustomName(); + std::string getName(); + std::string getCustomName(); bool hasCustomName(); int getMaxStackSize(); bool stillValid(std::shared_ptr player); diff --git a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp index b9e02583b..de82bfa53 100644 --- a/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp +++ b/targets/minecraft/world/inventory/PlayerEnderChestContainer.cpp @@ -13,7 +13,7 @@ #include "strings.h" PlayerEnderChestContainer::PlayerEnderChestContainer() - : SimpleContainer(IDS_TILE_ENDERCHEST, L"", false, 9 * 3) { + : SimpleContainer(IDS_TILE_ENDERCHEST, "", false, 9 * 3) { activeChest = nullptr; } @@ -33,19 +33,19 @@ void PlayerEnderChestContainer::setItemsByTag( } for (int i = 0; i < enderItemsList->size(); i++) { CompoundTag* tag = enderItemsList->get(i); - int slot = tag->getByte(L"Slot") & 0xff; + int slot = tag->getByte("Slot") & 0xff; if (slot >= 0 && slot < getContainerSize()) setItem(slot, ItemInstance::fromTag(tag)); } } ListTag* PlayerEnderChestContainer::createTag() { - ListTag* items = new ListTag(L"EnderItems"); + ListTag* items = new ListTag("EnderItems"); for (int i = 0; i < getContainerSize(); i++) { std::shared_ptr item = getItem(i); if (item != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); item->save(tag); items->add(tag); } diff --git a/targets/minecraft/world/inventory/RepairContainer.cpp b/targets/minecraft/world/inventory/RepairContainer.cpp index 00b0cda98..e090f21f5 100644 --- a/targets/minecraft/world/inventory/RepairContainer.cpp +++ b/targets/minecraft/world/inventory/RepairContainer.cpp @@ -7,7 +7,7 @@ RepairContainer::RepairContainer(AnvilMenu* menu, int name, bool customName, int size) - : SimpleContainer(name, L"", customName, size) { + : SimpleContainer(name, "", customName, size) { m_menu = menu; } diff --git a/targets/minecraft/world/inventory/ResultContainer.cpp b/targets/minecraft/world/inventory/ResultContainer.cpp index cd9860d59..ec084fd66 100644 --- a/targets/minecraft/world/inventory/ResultContainer.cpp +++ b/targets/minecraft/world/inventory/ResultContainer.cpp @@ -10,9 +10,9 @@ std::shared_ptr ResultContainer::getItem(unsigned int slot) { return items[0]; } -std::wstring ResultContainer::getName() { return L""; } +std::string ResultContainer::getName() { return ""; } -std::wstring ResultContainer::getCustomName() { return L""; } +std::string ResultContainer::getCustomName() { return ""; } bool ResultContainer::hasCustomName() { return false; } diff --git a/targets/minecraft/world/inventory/ResultContainer.h b/targets/minecraft/world/inventory/ResultContainer.h index a10469e6c..d0373f751 100644 --- a/targets/minecraft/world/inventory/ResultContainer.h +++ b/targets/minecraft/world/inventory/ResultContainer.h @@ -17,8 +17,8 @@ public: virtual unsigned int getContainerSize() override; virtual std::shared_ptr getItem(unsigned int slot) override; - virtual std::wstring getName() override; - virtual std::wstring getCustomName() override; + virtual std::string getName() override; + virtual std::string getCustomName() override; virtual bool hasCustomName() override; virtual std::shared_ptr removeItem(unsigned int slot, int count) override; diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index 1daa05977..0ef001e3e 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -29,13 +29,13 @@ class Icon; const int ArmorItem::healthPerSlot[] = {11, 16, 15, 13}; -const std::wstring ArmorItem::LEATHER_OVERLAYS[] = { - L"helmetCloth_overlay", L"chestplateCloth_overlay", - L"leggingsCloth_overlay", L"bootsCloth_overlay"}; +const std::string ArmorItem::LEATHER_OVERLAYS[] = { + "helmetCloth_overlay", "chestplateCloth_overlay", + "leggingsCloth_overlay", "bootsCloth_overlay"}; -const std::wstring ArmorItem::TEXTURE_EMPTY_SLOTS[] = { - L"slot_empty_helmet", L"slot_empty_chestplate", L"slot_empty_leggings", - L"slot_empty_boots"}; +const std::string ArmorItem::TEXTURE_EMPTY_SLOTS[] = { + "slot_empty_helmet", "slot_empty_chestplate", "slot_empty_leggings", + "slot_empty_boots"}; std::shared_ptr ArmorItem::ArmorDispenseItemBehavior::execute( BlockSource* source, std::shared_ptr dispensed, @@ -160,8 +160,8 @@ const _ArmorMaterial* ArmorItem::getMaterial() { return armorType; } bool ArmorItem::hasCustomColor(std::shared_ptr item) { if (armorType != ArmorMaterial::CLOTH) return false; if (!item->hasTag()) return false; - if (!item->getTag()->contains(L"display")) return false; - if (!item->getTag()->getCompound(L"display")->contains(L"color")) + if (!item->getTag()->contains("display")) return false; + if (!item->getTag()->getCompound("display")->contains("color")) return false; return true; @@ -174,13 +174,13 @@ int ArmorItem::getColor(std::shared_ptr item) { if (tag == nullptr) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR); - CompoundTag* display = tag->getCompound(L"display"); + CompoundTag* display = tag->getCompound("display"); if (display == nullptr) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR); - if (display->contains(L"color")) { - return display->getInt(L"color"); + if (display->contains("color")) { + return display->getInt("color"); } else { return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR); @@ -198,8 +198,8 @@ void ArmorItem::clearColor(std::shared_ptr item) { if (armorType != ArmorMaterial::CLOTH) return; CompoundTag* tag = item->getTag(); if (tag == nullptr) return; - CompoundTag* display = tag->getCompound(L"display"); - if (display->contains(L"color")) display->remove(L"color"); + CompoundTag* display = tag->getCompound("display"); + if (display->contains("color")) display->remove("color"); } void ArmorItem::setColor(std::shared_ptr item, int color) { @@ -218,10 +218,10 @@ void ArmorItem::setColor(std::shared_ptr item, int color) { item->setTag(tag); } - CompoundTag* display = tag->getCompound(L"display"); - if (!tag->contains(L"display")) tag->putCompound(L"display", display); + CompoundTag* display = tag->getCompound("display"); + if (!tag->contains("display")) tag->putCompound("display", display); - display->putInt(L"color", color); + display->putInt("color", color); } bool ArmorItem::isValidRepairItem(std::shared_ptr source, diff --git a/targets/minecraft/world/item/ArmorItem.h b/targets/minecraft/world/item/ArmorItem.h index afd47df02..48b921789 100644 --- a/targets/minecraft/world/item/ArmorItem.h +++ b/targets/minecraft/world/item/ArmorItem.h @@ -21,10 +21,10 @@ public: private: static const int healthPerSlot[]; - static const std::wstring LEATHER_OVERLAYS[]; + static const std::string LEATHER_OVERLAYS[]; public: - static const std::wstring TEXTURE_EMPTY_SLOTS[]; + static const std::string TEXTURE_EMPTY_SLOTS[]; private: class ArmorDispenseItemBehavior : public DefaultDispenseItemBehavior { diff --git a/targets/minecraft/world/item/BowItem.cpp b/targets/minecraft/world/item/BowItem.cpp index 4cee3a56a..ad63775d4 100644 --- a/targets/minecraft/world/item/BowItem.cpp +++ b/targets/minecraft/world/item/BowItem.cpp @@ -17,8 +17,8 @@ class Icon; -const std::wstring BowItem::TEXTURE_PULL[] = {L"bow_pull_0", L"bow_pull_1", - L"bow_pull_2"}; +const std::string BowItem::TEXTURE_PULL[] = {"bow_pull_0", "bow_pull_1", + "bow_pull_2"}; BowItem::BowItem(int id) : Item(id) { maxStackSize = 1; diff --git a/targets/minecraft/world/item/BowItem.h b/targets/minecraft/world/item/BowItem.h index 7612f73f8..5782875cd 100644 --- a/targets/minecraft/world/item/BowItem.h +++ b/targets/minecraft/world/item/BowItem.h @@ -11,7 +11,7 @@ class Icon; class BowItem : public Item { public: - static const std::wstring TEXTURE_PULL[]; + static const std::string TEXTURE_PULL[]; static const int MAX_DRAW_DURATION = 20 * 1; private: diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp index 7a953f5f4..ed17ba6e2 100644 --- a/targets/minecraft/world/item/BucketItem.cpp +++ b/targets/minecraft/world/item/BucketItem.cpp @@ -120,7 +120,7 @@ std::shared_ptr BucketItem::use( Log::info( "Sending ChatPacket::e_ChatCannotPlaceLava to player\n"); servPlayer->connection->send(std::shared_ptr( - new ChatPacket(L"", ChatPacket::e_ChatCannotPlaceLava))); + new ChatPacket("", ChatPacket::e_ChatCannotPlaceLava))); } delete hr; diff --git a/targets/minecraft/world/item/ClockItem.cpp b/targets/minecraft/world/item/ClockItem.cpp index 7650678e5..dc690cfb7 100644 --- a/targets/minecraft/world/item/ClockItem.cpp +++ b/targets/minecraft/world/item/ClockItem.cpp @@ -9,8 +9,8 @@ class Icon; -const std::wstring ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { - L"clockP0", L"clockP1", L"clockP2", L"clockP3"}; +const std::string ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { + "clockP0", "clockP1", "clockP2", "clockP3"}; ClockItem::ClockItem(int id) : Item(id) { icons = nullptr; } diff --git a/targets/minecraft/world/item/ClockItem.h b/targets/minecraft/world/item/ClockItem.h index 3631c95a3..f5628cebb 100644 --- a/targets/minecraft/world/item/ClockItem.h +++ b/targets/minecraft/world/item/ClockItem.h @@ -12,7 +12,7 @@ class Icon; class ClockItem : public Item { private: Icon** icons; - static const std::wstring TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT]; + static const std::string TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT]; public: ClockItem(int id); diff --git a/targets/minecraft/world/item/CoalItem.cpp b/targets/minecraft/world/item/CoalItem.cpp index d9c493105..4b33b8092 100644 --- a/targets/minecraft/world/item/CoalItem.cpp +++ b/targets/minecraft/world/item/CoalItem.cpp @@ -31,5 +31,5 @@ Icon* CoalItem::getIcon(int auxValue) { void CoalItem::registerIcons(IconRegister* iconRegister) { Item::registerIcons(iconRegister); - charcoalIcon = iconRegister->registerIcon(L"charcoal"); + charcoalIcon = iconRegister->registerIcon("charcoal"); } \ No newline at end of file diff --git a/targets/minecraft/world/item/CompassItem.cpp b/targets/minecraft/world/item/CompassItem.cpp index 3b1fe2db6..09f664bf1 100644 --- a/targets/minecraft/world/item/CompassItem.cpp +++ b/targets/minecraft/world/item/CompassItem.cpp @@ -9,8 +9,8 @@ class Icon; -const std::wstring CompassItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { - L"compassP0", L"compassP1", L"compassP2", L"compassP3"}; +const std::string CompassItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = { + "compassP0", "compassP1", "compassP2", "compassP3"}; CompassItem::CompassItem(int id) : Item(id) { icons = nullptr; } diff --git a/targets/minecraft/world/item/CompassItem.h b/targets/minecraft/world/item/CompassItem.h index ebc2977c5..c61ae9c57 100644 --- a/targets/minecraft/world/item/CompassItem.h +++ b/targets/minecraft/world/item/CompassItem.h @@ -12,7 +12,7 @@ class Icon; class CompassItem : public Item { private: Icon** icons; - static const std::wstring TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT]; + static const std::string TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT]; public: CompassItem(int id); diff --git a/targets/minecraft/world/item/DyePowderItem.cpp b/targets/minecraft/world/item/DyePowderItem.cpp index 5e11f00db..dd8c87191 100644 --- a/targets/minecraft/world/item/DyePowderItem.cpp +++ b/targets/minecraft/world/item/DyePowderItem.cpp @@ -52,10 +52,10 @@ const unsigned int DyePowderItem::COLOR_USE_DESCS[] = { IDS_DESC_DYE_LIGHTBLUE, IDS_DESC_DYE_MAGENTA, IDS_DESC_DYE_ORANGE, IDS_DESC_DYE_WHITE}; -const std::wstring DyePowderItem::COLOR_TEXTURES[] = { - L"black", L"red", L"green", L"brown", L"blue", L"purple", - L"cyan", L"silver", L"gray", L"pink", L"lime", L"yellow", - L"light_blue", L"magenta", L"orange", L"white"}; +const std::string DyePowderItem::COLOR_TEXTURES[] = { + "black", "red", "green", "brown", "blue", "purple", + "cyan", "silver", "gray", "pink", "lime", "yellow", + "light_blue", "magenta", "orange", "white"}; const int DyePowderItem::COLOR_RGB[] = {0x1e1b1b, 0xb3312c, 0x3b511a, 0x51301a, 0x253192, 0x7b2fbe, 0x287697, 0xababab, @@ -300,7 +300,7 @@ void DyePowderItem::registerIcons(IconRegister* iconRegister) { icons = new Icon*[DYE_POWDER_ITEM_TEXTURE_COUNT]; for (int i = 0; i < DYE_POWDER_ITEM_TEXTURE_COUNT; i++) { - icons[i] = iconRegister->registerIcon(getIconName() + L"_" + + icons[i] = iconRegister->registerIcon(getIconName() + "_" + COLOR_TEXTURES[i]); } } \ No newline at end of file diff --git a/targets/minecraft/world/item/DyePowderItem.h b/targets/minecraft/world/item/DyePowderItem.h index fbe562926..1e8168c03 100644 --- a/targets/minecraft/world/item/DyePowderItem.h +++ b/targets/minecraft/world/item/DyePowderItem.h @@ -15,7 +15,7 @@ class DyePowderItem : public Item { public: static const unsigned int COLOR_DESCS[]; static const unsigned int COLOR_USE_DESCS[]; - static const std::wstring COLOR_TEXTURES[]; + static const std::string COLOR_TEXTURES[]; static const int COLOR_RGB[]; static const int BLACK; diff --git a/targets/minecraft/world/item/EmptyMapItem.cpp b/targets/minecraft/world/item/EmptyMapItem.cpp index 73e6ceae5..0ce316e73 100644 --- a/targets/minecraft/world/item/EmptyMapItem.cpp +++ b/targets/minecraft/world/item/EmptyMapItem.cpp @@ -15,7 +15,7 @@ std::shared_ptr EmptyMapItem::use( std::shared_ptr itemInstance, Level* level, std::shared_ptr player) { // shared_ptr map = shared_ptr( new - // ItemInstance(Item::map, 1, level->getFreeAuxValueFor(L"map")) ); + // ItemInstance(Item::map, 1, level->getFreeAuxValueFor("map")) ); // String id = "map_" + map.getAuxValue(); // MapItemSavedData data = new MapItemSavedData(id); diff --git a/targets/minecraft/world/item/EnchantedBookItem.cpp b/targets/minecraft/world/item/EnchantedBookItem.cpp index 9772c5239..0d33cd2e9 100644 --- a/targets/minecraft/world/item/EnchantedBookItem.cpp +++ b/targets/minecraft/world/item/EnchantedBookItem.cpp @@ -13,8 +13,8 @@ #include "nbt/CompoundTag.h" #include "nbt/ListTag.h" -const std::wstring EnchantedBookItem::TAG_STORED_ENCHANTMENTS = - L"StoredEnchantments"; +const std::string EnchantedBookItem::TAG_STORED_ENCHANTMENTS = + "StoredEnchantments"; EnchantedBookItem::EnchantedBookItem(int id) : Item(id) {} @@ -40,12 +40,12 @@ const Rarity* EnchantedBookItem::getRarity( ListTag* EnchantedBookItem::getEnchantments( std::shared_ptr item) { if (item->tag == nullptr || - !item->tag->contains((wchar_t*)TAG_STORED_ENCHANTMENTS.c_str())) { + !item->tag->contains((char*)TAG_STORED_ENCHANTMENTS.c_str())) { return new ListTag(); } return (ListTag*)item->tag->get( - (wchar_t*)TAG_STORED_ENCHANTMENTS.c_str()); + (char*)TAG_STORED_ENCHANTMENTS.c_str()); } void EnchantedBookItem::appendHoverText( @@ -56,12 +56,12 @@ void EnchantedBookItem::appendHoverText( ListTag* list = getEnchantments(itemInstance); if (list != nullptr) { - std::wstring unformatted = L""; + std::string unformatted = ""; for (int i = 0; i < list->size(); i++) { int type = - list->get(i)->getShort((wchar_t*)ItemInstance::TAG_ENCH_ID); + list->get(i)->getShort((char*)ItemInstance::TAG_ENCH_ID); int level = - list->get(i)->getShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL); + list->get(i)->getShort((char*)ItemInstance::TAG_ENCH_LEVEL); if (Enchantment::enchantments[type] != nullptr) { lines->push_back( @@ -79,11 +79,11 @@ void EnchantedBookItem::addEnchantment(std::shared_ptr item, for (int i = 0; i < enchantments->size(); i++) { CompoundTag* tag = enchantments->get(i); - if (tag->getShort((wchar_t*)ItemInstance::TAG_ENCH_ID) == + if (tag->getShort((char*)ItemInstance::TAG_ENCH_ID) == enchantment->enchantment->id) { - if (tag->getShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL) < + if (tag->getShort((char*)ItemInstance::TAG_ENCH_LEVEL) < enchantment->level) { - tag->putShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL, + tag->putShort((char*)ItemInstance::TAG_ENCH_LEVEL, (short)enchantment->level); } @@ -95,16 +95,16 @@ void EnchantedBookItem::addEnchantment(std::shared_ptr item, if (add) { CompoundTag* tag = new CompoundTag(); - tag->putShort((wchar_t*)ItemInstance::TAG_ENCH_ID, + tag->putShort((char*)ItemInstance::TAG_ENCH_ID, (short)enchantment->enchantment->id); - tag->putShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL, + tag->putShort((char*)ItemInstance::TAG_ENCH_LEVEL, (short)enchantment->level); enchantments->add(tag); } if (!item->hasTag()) item->setTag(new CompoundTag()); - item->getTag()->put((wchar_t*)TAG_STORED_ENCHANTMENTS.c_str(), + item->getTag()->put((char*)TAG_STORED_ENCHANTMENTS.c_str(), enchantments); } diff --git a/targets/minecraft/world/item/EnchantedBookItem.h b/targets/minecraft/world/item/EnchantedBookItem.h index d33f916bb..9ffca3f90 100644 --- a/targets/minecraft/world/item/EnchantedBookItem.h +++ b/targets/minecraft/world/item/EnchantedBookItem.h @@ -18,7 +18,7 @@ class ListTag; class EnchantedBookItem : public Item { public: - static const std::wstring TAG_STORED_ENCHANTMENTS; + static const std::string TAG_STORED_ENCHANTMENTS; EnchantedBookItem(int id); diff --git a/targets/minecraft/world/item/FireChargeItem.cpp b/targets/minecraft/world/item/FireChargeItem.cpp index a0721cb40..5d97f8e12 100644 --- a/targets/minecraft/world/item/FireChargeItem.cpp +++ b/targets/minecraft/world/item/FireChargeItem.cpp @@ -62,5 +62,5 @@ Icon* FireChargeItem::getIcon(int itemAuxValue) { void FireChargeItem::registerIcons(IconRegister* iconRegister) { Item::registerIcons(iconRegister); - m_dragonFireballIcon = iconRegister->registerIcon(L"dragonFireball"); + m_dragonFireballIcon = iconRegister->registerIcon("dragonFireball"); } diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp index e1ff43021..07f5a8c6f 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.cpp +++ b/targets/minecraft/world/item/FireworksChargeItem.cpp @@ -56,7 +56,7 @@ int FireworksChargeItem::getColor(std::shared_ptr item, bool FireworksChargeItem::hasMultipleSpriteLayers() { return true; } Tag* FireworksChargeItem::getExplosionTagField( - std::shared_ptr instance, const std::wstring& field) { + std::shared_ptr instance, const std::string& field) { if (instance->hasTag()) { CompoundTag* explosion = instance->getTag()->getCompound(FireworksItem::TAG_EXPLOSION); @@ -110,12 +110,12 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, expTag->getIntArray(FireworksItem::TAG_E_COLORS); if (colorList.size() > 0) { bool first = true; - std::wstring output = L""; + std::string output = ""; for (unsigned int i = 0; i < colorList.size(); ++i) { int c = colorList[i]; if (!first) { output += - L",\n"; // 4J-PB - without the newline, they tend to go + ",\n"; // 4J-PB - without the newline, they tend to go // offscreen in split-screen or localised languages } first = false; @@ -141,13 +141,13 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, expTag->getIntArray(FireworksItem::TAG_E_FADECOLORS); if (fadeList.size() > 0) { bool first = true; - std::wstring output = - std::wstring(gameServices().getString(IDS_FIREWORKS_CHARGE_FADE_TO)) + L" "; + std::string output = + std::string(gameServices().getString(IDS_FIREWORKS_CHARGE_FADE_TO)) + " "; for (unsigned int i = 0; i < fadeList.size(); ++i) { int c = fadeList[i]; if (!first) { output += - L",\n"; // 4J-PB - without the newline, they tend to go + ",\n"; // 4J-PB - without the newline, they tend to go // offscreen in split-screen or localised languages } first = false; @@ -184,5 +184,5 @@ void FireworksChargeItem::appendHoverText(CompoundTag* expTag, void FireworksChargeItem::registerIcons(IconRegister* iconRegister) { Item::registerIcons(iconRegister); - overlay = iconRegister->registerIcon(getIconName() + L"_overlay"); + overlay = iconRegister->registerIcon(getIconName() + "_overlay"); } \ No newline at end of file diff --git a/targets/minecraft/world/item/FireworksChargeItem.h b/targets/minecraft/world/item/FireworksChargeItem.h index 6ae030def..48bcefe79 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.h +++ b/targets/minecraft/world/item/FireworksChargeItem.h @@ -26,7 +26,7 @@ public: virtual bool hasMultipleSpriteLayers(); static Tag* getExplosionTagField(std::shared_ptr instance, - const std::wstring& field); + const std::string& field); virtual void appendHoverText(std::shared_ptr itemInstance, std::shared_ptr player, diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index 50a1704b9..71e2086bd 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -18,15 +18,15 @@ #include "nbt/ListTag.h" #include "strings.h" -const std::wstring FireworksItem::TAG_FIREWORKS = L"Fireworks"; -const std::wstring FireworksItem::TAG_EXPLOSION = L"Explosion"; -const std::wstring FireworksItem::TAG_EXPLOSIONS = L"Explosions"; -const std::wstring FireworksItem::TAG_FLIGHT = L"Flight"; -const std::wstring FireworksItem::TAG_E_TYPE = L"Type"; -const std::wstring FireworksItem::TAG_E_TRAIL = L"Trail"; -const std::wstring FireworksItem::TAG_E_FLICKER = L"Flicker"; -const std::wstring FireworksItem::TAG_E_COLORS = L"Colors"; -const std::wstring FireworksItem::TAG_E_FADECOLORS = L"FadeColors"; +const std::string FireworksItem::TAG_FIREWORKS = "Fireworks"; +const std::string FireworksItem::TAG_EXPLOSION = "Explosion"; +const std::string FireworksItem::TAG_EXPLOSIONS = "Explosions"; +const std::string FireworksItem::TAG_FLIGHT = "Flight"; +const std::string FireworksItem::TAG_E_TYPE = "Type"; +const std::string FireworksItem::TAG_E_TRAIL = "Trail"; +const std::string FireworksItem::TAG_E_FLICKER = "Flicker"; +const std::string FireworksItem::TAG_E_COLORS = "Colors"; +const std::string FireworksItem::TAG_E_FADECOLORS = "FadeColors"; FireworksItem::FireworksItem(int id) : Item(id) {} @@ -66,7 +66,7 @@ void FireworksItem::appendHoverText(std::shared_ptr itemInstance, } if (fireTag->contains(TAG_FLIGHT)) { lines->push_back( - std::wstring(gameServices().getString(IDS_ITEM_FIREWORKS_FLIGHT)) + L" " + + std::string(gameServices().getString(IDS_ITEM_FIREWORKS_FLIGHT)) + " " + toWString((fireTag->getByte(TAG_FLIGHT)))); } diff --git a/targets/minecraft/world/item/FireworksItem.h b/targets/minecraft/world/item/FireworksItem.h index bbaa3b792..2db9e7dee 100644 --- a/targets/minecraft/world/item/FireworksItem.h +++ b/targets/minecraft/world/item/FireworksItem.h @@ -8,15 +8,15 @@ class FireworksItem : public Item { public: - static const std::wstring TAG_FIREWORKS; - static const std::wstring TAG_EXPLOSION; - static const std::wstring TAG_EXPLOSIONS; - static const std::wstring TAG_FLIGHT; - static const std::wstring TAG_E_TYPE; - static const std::wstring TAG_E_TRAIL; - static const std::wstring TAG_E_FLICKER; - static const std::wstring TAG_E_COLORS; - static const std::wstring TAG_E_FADECOLORS; + static const std::string TAG_FIREWORKS; + static const std::string TAG_EXPLOSION; + static const std::string TAG_EXPLOSIONS; + static const std::string TAG_FLIGHT; + static const std::string TAG_E_TYPE; + static const std::string TAG_E_TRAIL; + static const std::string TAG_E_FLICKER; + static const std::string TAG_E_COLORS; + static const std::string TAG_E_FADECOLORS; static const uint8_t TYPE_SMALL = 0; static const uint8_t TYPE_BIG = 1; diff --git a/targets/minecraft/world/item/FishingRodItem.cpp b/targets/minecraft/world/item/FishingRodItem.cpp index fc1a1af73..247377291 100644 --- a/targets/minecraft/world/item/FishingRodItem.cpp +++ b/targets/minecraft/world/item/FishingRodItem.cpp @@ -48,8 +48,8 @@ std::shared_ptr FishingRodItem::use( } void FishingRodItem::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(getIconName() + L"_uncast"); - emptyIcon = iconRegister->registerIcon(getIconName() + L"_cast"); + icon = iconRegister->registerIcon(getIconName() + "_uncast"); + emptyIcon = iconRegister->registerIcon(getIconName() + "_cast"); } Icon* FishingRodItem::getEmptyIcon() { return emptyIcon; } diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp index 8bd4ceb61..0e4fea560 100644 --- a/targets/minecraft/world/item/HangingEntityItem.cpp +++ b/targets/minecraft/world/item/HangingEntityItem.cpp @@ -111,14 +111,14 @@ void HangingEntityItem::appendHoverText( itemInstance->getAuxValue() > 0) { int motive = itemInstance->getAuxValue() - 1; - wchar_t formatted[256]; - memset(formatted, 0, 256 * sizeof(wchar_t)); - swprintf(formatted, 256, L"** %ls %dx%d", + char formatted[256]; + memset(formatted, 0, 256 * sizeof(char)); + snprintf(formatted, 256, "** %s %dx%d", Painting::Motive::values[motive]->name.c_str(), Painting::Motive::values[motive]->w / 16, Painting::Motive::values[motive]->h / 16); - std::wstring motiveName = formatted; + std::string motiveName = formatted; lines->push_back(HtmlString(motiveName.c_str(), eHTMLColor_c)); } else diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp index b2dccc72b..fc7b424ff 100644 --- a/targets/minecraft/world/item/Item.cpp +++ b/targets/minecraft/world/item/Item.cpp @@ -85,9 +85,9 @@ typedef Item::Tier _Tier; // const UUID Item::BASE_ATTACK_DAMAGE_UUID = -// UUID::fromWString(L"CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); +// UUID::fromWString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); -std::wstring Item::ICON_DESCRIPTION_PREFIX = L"item."; +std::string Item::ICON_DESCRIPTION_PREFIX = "item."; const _Tier* _Tier::WOOD = new _Tier(0, 59, 2, 0, 15); // const _Tier* _Tier::STONE = new _Tier(1, 131, 4, 1, 5); // @@ -321,168 +321,168 @@ void Item::staticCtor() { Item::sword_wood = (new WeaponItem(12, _Tier::WOOD)) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_wood) - ->setIconName(L"swordWood") + ->setIconName("swordWood") ->setDescriptionId(IDS_ITEM_SWORD_WOOD) ->setUseDescriptionId(IDS_DESC_SWORD); Item::sword_stone = (new WeaponItem(16, _Tier::STONE)) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_stone) - ->setIconName(L"swordStone") + ->setIconName("swordStone") ->setDescriptionId(IDS_ITEM_SWORD_STONE) ->setUseDescriptionId(IDS_DESC_SWORD); Item::sword_iron = (new WeaponItem(11, _Tier::IRON)) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_iron) - ->setIconName(L"swordIron") + ->setIconName("swordIron") ->setDescriptionId(IDS_ITEM_SWORD_IRON) ->setUseDescriptionId(IDS_DESC_SWORD); Item::sword_diamond = (new WeaponItem(20, _Tier::DIAMOND)) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_diamond) - ->setIconName(L"swordDiamond") + ->setIconName("swordDiamond") ->setDescriptionId(IDS_ITEM_SWORD_DIAMOND) ->setUseDescriptionId(IDS_DESC_SWORD); Item::sword_gold = (new WeaponItem(27, _Tier::GOLD)) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_gold) - ->setIconName(L"swordGold") + ->setIconName("swordGold") ->setDescriptionId(IDS_ITEM_SWORD_GOLD) ->setUseDescriptionId(IDS_DESC_SWORD); Item::shovel_wood = (new ShovelItem(13, _Tier::WOOD)) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_wood) - ->setIconName(L"shovelWood") + ->setIconName("shovelWood") ->setDescriptionId(IDS_ITEM_SHOVEL_WOOD) ->setUseDescriptionId(IDS_DESC_SHOVEL); Item::shovel_stone = (new ShovelItem(17, _Tier::STONE)) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_stone) - ->setIconName(L"shovelStone") + ->setIconName("shovelStone") ->setDescriptionId(IDS_ITEM_SHOVEL_STONE) ->setUseDescriptionId(IDS_DESC_SHOVEL); Item::shovel_iron = (new ShovelItem(0, _Tier::IRON)) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_iron) - ->setIconName(L"shovelIron") + ->setIconName("shovelIron") ->setDescriptionId(IDS_ITEM_SHOVEL_IRON) ->setUseDescriptionId(IDS_DESC_SHOVEL); Item::shovel_diamond = (new ShovelItem(21, _Tier::DIAMOND)) ->setBaseItemTypeAndMaterial( eBaseItemType_shovel, eMaterial_diamond) - ->setIconName(L"shovelDiamond") + ->setIconName("shovelDiamond") ->setDescriptionId(IDS_ITEM_SHOVEL_DIAMOND) ->setUseDescriptionId(IDS_DESC_SHOVEL); Item::shovel_gold = (new ShovelItem(28, _Tier::GOLD)) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_gold) - ->setIconName(L"shovelGold") + ->setIconName("shovelGold") ->setDescriptionId(IDS_ITEM_SHOVEL_GOLD) ->setUseDescriptionId(IDS_DESC_SHOVEL); Item::pickAxe_wood = (new PickaxeItem(14, _Tier::WOOD)) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_wood) - ->setIconName(L"pickaxeWood") + ->setIconName("pickaxeWood") ->setDescriptionId(IDS_ITEM_PICKAXE_WOOD) ->setUseDescriptionId(IDS_DESC_PICKAXE); Item::pickAxe_stone = (new PickaxeItem(18, _Tier::STONE)) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_stone) - ->setIconName(L"pickaxeStone") + ->setIconName("pickaxeStone") ->setDescriptionId(IDS_ITEM_PICKAXE_STONE) ->setUseDescriptionId(IDS_DESC_PICKAXE); Item::pickAxe_iron = (new PickaxeItem(1, _Tier::IRON)) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_iron) - ->setIconName(L"pickaxeIron") + ->setIconName("pickaxeIron") ->setDescriptionId(IDS_ITEM_PICKAXE_IRON) ->setUseDescriptionId(IDS_DESC_PICKAXE); Item::pickAxe_diamond = (new PickaxeItem(22, _Tier::DIAMOND)) ->setBaseItemTypeAndMaterial( eBaseItemType_pickaxe, eMaterial_diamond) - ->setIconName(L"pickaxeDiamond") + ->setIconName("pickaxeDiamond") ->setDescriptionId(IDS_ITEM_PICKAXE_DIAMOND) ->setUseDescriptionId(IDS_DESC_PICKAXE); Item::pickAxe_gold = (new PickaxeItem(29, _Tier::GOLD)) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_gold) - ->setIconName(L"pickaxeGold") + ->setIconName("pickaxeGold") ->setDescriptionId(IDS_ITEM_PICKAXE_GOLD) ->setUseDescriptionId(IDS_DESC_PICKAXE); Item::hatchet_wood = (new HatchetItem(15, _Tier::WOOD)) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_wood) - ->setIconName(L"hatchetWood") + ->setIconName("hatchetWood") ->setDescriptionId(IDS_ITEM_HATCHET_WOOD) ->setUseDescriptionId(IDS_DESC_HATCHET); Item::hatchet_stone = (new HatchetItem(19, _Tier::STONE)) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_stone) - ->setIconName(L"hatchetStone") + ->setIconName("hatchetStone") ->setDescriptionId(IDS_ITEM_HATCHET_STONE) ->setUseDescriptionId(IDS_DESC_HATCHET); Item::hatchet_iron = (new HatchetItem(2, _Tier::IRON)) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_iron) - ->setIconName(L"hatchetIron") + ->setIconName("hatchetIron") ->setDescriptionId(IDS_ITEM_HATCHET_IRON) ->setUseDescriptionId(IDS_DESC_HATCHET); Item::hatchet_diamond = (new HatchetItem(23, _Tier::DIAMOND)) ->setBaseItemTypeAndMaterial( eBaseItemType_hatchet, eMaterial_diamond) - ->setIconName(L"hatchetDiamond") + ->setIconName("hatchetDiamond") ->setDescriptionId(IDS_ITEM_HATCHET_DIAMOND) ->setUseDescriptionId(IDS_DESC_HATCHET); Item::hatchet_gold = (new HatchetItem(30, _Tier::GOLD)) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_gold) - ->setIconName(L"hatchetGold") + ->setIconName("hatchetGold") ->setDescriptionId(IDS_ITEM_HATCHET_GOLD) ->setUseDescriptionId(IDS_DESC_HATCHET); Item::hoe_wood = (new HoeItem(34, _Tier::WOOD)) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_wood) - ->setIconName(L"hoeWood") + ->setIconName("hoeWood") ->setDescriptionId(IDS_ITEM_HOE_WOOD) ->setUseDescriptionId(IDS_DESC_HOE); Item::hoe_stone = (new HoeItem(35, _Tier::STONE)) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_stone) - ->setIconName(L"hoeStone") + ->setIconName("hoeStone") ->setDescriptionId(IDS_ITEM_HOE_STONE) ->setUseDescriptionId(IDS_DESC_HOE); Item::hoe_iron = (new HoeItem(36, _Tier::IRON)) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_iron) - ->setIconName(L"hoeIron") + ->setIconName("hoeIron") ->setDescriptionId(IDS_ITEM_HOE_IRON) ->setUseDescriptionId(IDS_DESC_HOE); Item::hoe_diamond = (new HoeItem(37, _Tier::DIAMOND)) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_diamond) - ->setIconName(L"hoeDiamond") + ->setIconName("hoeDiamond") ->setDescriptionId(IDS_ITEM_HOE_DIAMOND) ->setUseDescriptionId(IDS_DESC_HOE); Item::hoe_gold = (new HoeItem(38, _Tier::GOLD)) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_gold) - ->setIconName(L"hoeGold") + ->setIconName("hoeGold") ->setDescriptionId(IDS_ITEM_HOE_GOLD) ->setUseDescriptionId(IDS_DESC_HOE); Item::door_wood = (new DoorItem(68, Material::wood)) ->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood) - ->setIconName(L"doorWood") + ->setIconName("doorWood") ->setDescriptionId(IDS_ITEM_DOOR_WOOD) ->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Item::door_iron = (new DoorItem(74, Material::metal)) ->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_iron) - ->setIconName(L"doorIron") + ->setIconName("doorIron") ->setDescriptionId(IDS_ITEM_DOOR_IRON) ->setUseDescriptionId(IDS_DESC_DOOR_IRON); @@ -491,7 +491,7 @@ void Item::staticCtor() { ArmorItem::SLOT_HEAD)) ->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_cloth) - ->setIconName(L"helmetCloth") + ->setIconName("helmetCloth") ->setDescriptionId(IDS_ITEM_HELMET_CLOTH) ->setUseDescriptionId(IDS_DESC_HELMET_LEATHER)); Item::helmet_iron = @@ -499,7 +499,7 @@ void Item::staticCtor() { ArmorItem::SLOT_HEAD)) ->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_iron) - ->setIconName(L"helmetIron") + ->setIconName("helmetIron") ->setDescriptionId(IDS_ITEM_HELMET_IRON) ->setUseDescriptionId(IDS_DESC_HELMET_IRON)); Item::helmet_diamond = @@ -507,7 +507,7 @@ void Item::staticCtor() { ArmorItem::SLOT_HEAD)) ->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_diamond) - ->setIconName(L"helmetDiamond") + ->setIconName("helmetDiamond") ->setDescriptionId(IDS_ITEM_HELMET_DIAMOND) ->setUseDescriptionId(IDS_DESC_HELMET_DIAMOND)); Item::helmet_gold = @@ -515,7 +515,7 @@ void Item::staticCtor() { ArmorItem::SLOT_HEAD)) ->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_gold) - ->setIconName(L"helmetGold") + ->setIconName("helmetGold") ->setDescriptionId(IDS_ITEM_HELMET_GOLD) ->setUseDescriptionId(IDS_DESC_HELMET_GOLD)); @@ -524,7 +524,7 @@ void Item::staticCtor() { ArmorItem::SLOT_TORSO)) ->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_cloth) - ->setIconName(L"chestplateCloth") + ->setIconName("chestplateCloth") ->setDescriptionId(IDS_ITEM_CHESTPLATE_CLOTH) ->setUseDescriptionId(IDS_DESC_CHESTPLATE_LEATHER)); Item::chestplate_iron = @@ -532,7 +532,7 @@ void Item::staticCtor() { ArmorItem::SLOT_TORSO)) ->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_iron) - ->setIconName(L"chestplateIron") + ->setIconName("chestplateIron") ->setDescriptionId(IDS_ITEM_CHESTPLATE_IRON) ->setUseDescriptionId(IDS_DESC_CHESTPLATE_IRON)); Item::chestplate_diamond = @@ -540,7 +540,7 @@ void Item::staticCtor() { ArmorItem::SLOT_TORSO)) ->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_diamond) - ->setIconName(L"chestplateDiamond") + ->setIconName("chestplateDiamond") ->setDescriptionId(IDS_ITEM_CHESTPLATE_DIAMOND) ->setUseDescriptionId(IDS_DESC_CHESTPLATE_DIAMOND)); Item::chestplate_gold = @@ -548,7 +548,7 @@ void Item::staticCtor() { ArmorItem::SLOT_TORSO)) ->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_gold) - ->setIconName(L"chestplateGold") + ->setIconName("chestplateGold") ->setDescriptionId(IDS_ITEM_CHESTPLATE_GOLD) ->setUseDescriptionId(IDS_DESC_CHESTPLATE_GOLD)); @@ -557,7 +557,7 @@ void Item::staticCtor() { ArmorItem::SLOT_LEGS)) ->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_cloth) - ->setIconName(L"leggingsCloth") + ->setIconName("leggingsCloth") ->setDescriptionId(IDS_ITEM_LEGGINGS_CLOTH) ->setUseDescriptionId(IDS_DESC_LEGGINGS_LEATHER)); Item::leggings_iron = @@ -565,7 +565,7 @@ void Item::staticCtor() { ArmorItem::SLOT_LEGS)) ->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_iron) - ->setIconName(L"leggingsIron") + ->setIconName("leggingsIron") ->setDescriptionId(IDS_ITEM_LEGGINGS_IRON) ->setUseDescriptionId(IDS_DESC_LEGGINGS_IRON)); Item::leggings_diamond = @@ -573,7 +573,7 @@ void Item::staticCtor() { ArmorItem::SLOT_LEGS)) ->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_diamond) - ->setIconName(L"leggingsDiamond") + ->setIconName("leggingsDiamond") ->setDescriptionId(IDS_ITEM_LEGGINGS_DIAMOND) ->setUseDescriptionId(IDS_DESC_LEGGINGS_DIAMOND)); Item::leggings_gold = @@ -581,7 +581,7 @@ void Item::staticCtor() { ArmorItem::SLOT_LEGS)) ->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_gold) - ->setIconName(L"leggingsGold") + ->setIconName("leggingsGold") ->setDescriptionId(IDS_ITEM_LEGGINGS_GOLD) ->setUseDescriptionId(IDS_DESC_LEGGINGS_GOLD)); @@ -590,7 +590,7 @@ void Item::staticCtor() { ArmorItem::SLOT_HEAD)) ->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_chain) - ->setIconName(L"helmetChain") + ->setIconName("helmetChain") ->setDescriptionId(IDS_ITEM_HELMET_CHAIN) ->setUseDescriptionId(IDS_DESC_HELMET_CHAIN)); Item::chestplate_chain = @@ -598,7 +598,7 @@ void Item::staticCtor() { ArmorItem::SLOT_TORSO)) ->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_chain) - ->setIconName(L"chestplateChain") + ->setIconName("chestplateChain") ->setDescriptionId(IDS_ITEM_CHESTPLATE_CHAIN) ->setUseDescriptionId(IDS_DESC_CHESTPLATE_CHAIN)); Item::leggings_chain = @@ -606,7 +606,7 @@ void Item::staticCtor() { ArmorItem::SLOT_LEGS)) ->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_chain) - ->setIconName(L"leggingsChain") + ->setIconName("leggingsChain") ->setDescriptionId(IDS_ITEM_LEGGINGS_CHAIN) ->setUseDescriptionId(IDS_DESC_LEGGINGS_CHAIN)); Item::boots_chain = @@ -614,7 +614,7 @@ void Item::staticCtor() { ArmorItem::SLOT_FEET)) ->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_chain) - ->setIconName(L"bootsChain") + ->setIconName("bootsChain") ->setDescriptionId(IDS_ITEM_BOOTS_CHAIN) ->setUseDescriptionId(IDS_DESC_BOOTS_CHAIN)); @@ -623,7 +623,7 @@ void Item::staticCtor() { ArmorItem::SLOT_FEET)) ->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_cloth) - ->setIconName(L"bootsCloth") + ->setIconName("bootsCloth") ->setDescriptionId(IDS_ITEM_BOOTS_CLOTH) ->setUseDescriptionId(IDS_DESC_BOOTS_LEATHER)); Item::boots_iron = @@ -631,7 +631,7 @@ void Item::staticCtor() { ArmorItem::SLOT_FEET)) ->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_iron) - ->setIconName(L"bootsIron") + ->setIconName("bootsIron") ->setDescriptionId(IDS_ITEM_BOOTS_IRON) ->setUseDescriptionId(IDS_DESC_BOOTS_IRON)); Item::boots_diamond = @@ -639,7 +639,7 @@ void Item::staticCtor() { ArmorItem::SLOT_FEET)) ->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_diamond) - ->setIconName(L"bootsDiamond") + ->setIconName("bootsDiamond") ->setDescriptionId(IDS_ITEM_BOOTS_DIAMOND) ->setUseDescriptionId(IDS_DESC_BOOTS_DIAMOND)); Item::boots_gold = @@ -647,19 +647,19 @@ void Item::staticCtor() { ArmorItem::SLOT_FEET)) ->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_gold) - ->setIconName(L"bootsGold") + ->setIconName("bootsGold") ->setDescriptionId(IDS_ITEM_BOOTS_GOLD) ->setUseDescriptionId(IDS_DESC_BOOTS_GOLD)); Item::ironIngot = (new Item(9)) - ->setIconName(L"ingotIron") + ->setIconName("ingotIron") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_iron) ->setDescriptionId(IDS_ITEM_INGOT_IRON) ->setUseDescriptionId(IDS_DESC_INGOT); Item::goldIngot = (new Item(10)) - ->setIconName(L"ingotGold") + ->setIconName("ingotGold") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold) ->setDescriptionId(IDS_ITEM_INGOT_GOLD) ->setUseDescriptionId(IDS_DESC_INGOT); @@ -668,61 +668,61 @@ void Item::staticCtor() { Item::bucket_empty = (new BucketItem(69, 0)) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_water) - ->setIconName(L"bucket") + ->setIconName("bucket") ->setDescriptionId(IDS_ITEM_BUCKET) ->setUseDescriptionId(IDS_DESC_BUCKET) ->setMaxStackSize(16); Item::bowl = (new Item(25)) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_wood) - ->setIconName(L"bowl") + ->setIconName("bowl") ->setDescriptionId(IDS_ITEM_BOWL) ->setUseDescriptionId(IDS_DESC_BOWL) ->setMaxStackSize(64); Item::bucket_water = (new BucketItem(70, Tile::water_Id)) - ->setIconName(L"bucketWater") + ->setIconName("bucketWater") ->setDescriptionId(IDS_ITEM_BUCKET_WATER) ->setCraftingRemainingItem(Item::bucket_empty) ->setUseDescriptionId(IDS_DESC_BUCKET_WATER); Item::bucket_lava = (new BucketItem(71, Tile::lava_Id)) - ->setIconName(L"bucketLava") + ->setIconName("bucketLava") ->setDescriptionId(IDS_ITEM_BUCKET_LAVA) ->setCraftingRemainingItem(Item::bucket_empty) ->setUseDescriptionId(IDS_DESC_BUCKET_LAVA); Item::bucket_milk = (new MilkBucketItem(79)) - ->setIconName(L"milk") + ->setIconName("milk") ->setDescriptionId(IDS_ITEM_BUCKET_MILK) ->setCraftingRemainingItem(Item::bucket_empty) ->setUseDescriptionId(IDS_DESC_BUCKET_MILK); Item::bow = (BowItem*)(new BowItem(5)) - ->setIconName(L"bow") + ->setIconName("bow") ->setBaseItemTypeAndMaterial(eBaseItemType_bow, eMaterial_bow) ->setDescriptionId(IDS_ITEM_BOW) ->setUseDescriptionId(IDS_DESC_BOW); Item::arrow = (new Item(6)) - ->setIconName(L"arrow") + ->setIconName("arrow") ->setBaseItemTypeAndMaterial(eBaseItemType_bow, eMaterial_arrow) ->setDescriptionId(IDS_ITEM_ARROW) ->setUseDescriptionId(IDS_DESC_ARROW); Item::compass = (new CompassItem(89)) - ->setIconName(L"compass") + ->setIconName("compass") ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_compass) ->setDescriptionId(IDS_ITEM_COMPASS) ->setUseDescriptionId(IDS_DESC_COMPASS); Item::clock = (new ClockItem(91)) - ->setIconName(L"clock") + ->setIconName("clock") ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_clock) ->setDescriptionId(IDS_ITEM_CLOCK) ->setUseDescriptionId(IDS_DESC_CLOCK); Item::map = (MapItem*)(new MapItem(102)) - ->setIconName(L"map") + ->setIconName("map") ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map) ->setDescriptionId(IDS_ITEM_MAP) @@ -730,87 +730,87 @@ void Item::staticCtor() { Item::flintAndSteel = (new FlintAndSteelItem(3)) - ->setIconName(L"flintAndSteel") + ->setIconName("flintAndSteel") ->setBaseItemTypeAndMaterial(eBaseItemType_devicetool, eMaterial_flintandsteel) ->setDescriptionId(IDS_ITEM_FLINT_AND_STEEL) ->setUseDescriptionId(IDS_DESC_FLINTANDSTEEL); Item::apple = (new FoodItem(4, 4, FoodConstants::FOOD_SATURATION_LOW, false)) - ->setIconName(L"apple") + ->setIconName("apple") ->setDescriptionId(IDS_ITEM_APPLE) ->setUseDescriptionId(IDS_DESC_APPLE); Item::coal = (new CoalItem(7)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_coal) - ->setIconName(L"coal") + ->setIconName("coal") ->setDescriptionId(IDS_ITEM_COAL) ->setUseDescriptionId(IDS_DESC_COAL); Item::diamond = (new Item(8)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_diamond) - ->setIconName(L"diamond") + ->setIconName("diamond") ->setDescriptionId(IDS_ITEM_DIAMOND) ->setUseDescriptionId(IDS_DESC_DIAMONDS); Item::stick = (new Item(24)) - ->setIconName(L"stick") + ->setIconName("stick") ->handEquipped() ->setDescriptionId(IDS_ITEM_STICK) ->setUseDescriptionId(IDS_DESC_STICK); Item::mushroomStew = (new BowlFoodItem(26, 6)) - ->setIconName(L"mushroomStew") + ->setIconName("mushroomStew") ->setDescriptionId(IDS_ITEM_MUSHROOM_STEW) ->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); Item::string = (new TilePlanterItem(31, Tile::tripWire)) - ->setIconName(L"string") + ->setIconName("string") ->setDescriptionId(IDS_ITEM_STRING) ->setUseDescriptionId(IDS_DESC_STRING); Item::feather = (new Item(32)) - ->setIconName(L"feather") + ->setIconName("feather") ->setDescriptionId(IDS_ITEM_FEATHER) ->setUseDescriptionId(IDS_DESC_FEATHER); Item::gunpowder = (new Item(33)) - ->setIconName(L"sulphur") + ->setIconName("sulphur") ->setDescriptionId(IDS_ITEM_SULPHUR) ->setUseDescriptionId(IDS_DESC_SULPHUR) ->setPotionBrewingFormula(PotionBrewing::MOD_GUNPOWDER); Item::seeds_wheat = (new SeedItem(39, Tile::wheat_Id, Tile::farmland_Id)) - ->setIconName(L"seeds") + ->setIconName("seeds") ->setDescriptionId(IDS_ITEM_WHEAT_SEEDS) ->setUseDescriptionId(IDS_DESC_WHEAT_SEEDS); Item::wheat = (new Item(40)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_wheat) - ->setIconName(L"wheat") + ->setIconName("wheat") ->setDescriptionId(IDS_ITEM_WHEAT) ->setUseDescriptionId(IDS_DESC_WHEAT); Item::bread = (new FoodItem(41, 5, FoodConstants::FOOD_SATURATION_NORMAL, false)) - ->setIconName(L"bread") + ->setIconName("bread") ->setDescriptionId(IDS_ITEM_BREAD) ->setUseDescriptionId(IDS_DESC_BREAD); Item::flint = (new Item(62)) - ->setIconName(L"flint") + ->setIconName("flint") ->setDescriptionId(IDS_ITEM_FLINT) ->setUseDescriptionId(IDS_DESC_FLINT); Item::porkChop_raw = (new FoodItem(63, 3, FoodConstants::FOOD_SATURATION_LOW, true)) - ->setIconName(L"porkchopRaw") + ->setIconName("porkchopRaw") ->setDescriptionId(IDS_ITEM_PORKCHOP_RAW) ->setUseDescriptionId(IDS_DESC_PORKCHOP_RAW); Item::porkChop_cooked = (new FoodItem(64, 8, FoodConstants::FOOD_SATURATION_GOOD, true)) - ->setIconName(L"porkchopCooked") + ->setIconName("porkchopCooked") ->setDescriptionId(IDS_ITEM_PORKCHOP_COOKED) ->setUseDescriptionId(IDS_DESC_PORKCHOP_COOKED); Item::painting = (new HangingEntityItem(65, eTYPE_PAINTING)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, eMaterial_cloth) - ->setIconName(L"painting") + ->setIconName("painting") ->setDescriptionId(IDS_ITEM_PAINTING) ->setUseDescriptionId(IDS_DESC_PICTURE); @@ -821,125 +821,125 @@ void Item::staticCtor() { ->setEatEffect(MobEffect::regeneration->id, 5, 1, 1.0f) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_apple) - ->setIconName(L"appleGold") + ->setIconName("appleGold") ->setDescriptionId( IDS_ITEM_APPLE_GOLD); //->setUseDescriptionId(IDS_DESC_GOLDENAPPLE); Item::sign = (new SignItem(67)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, eMaterial_wood) - ->setIconName(L"sign") + ->setIconName("sign") ->setDescriptionId(IDS_ITEM_SIGN) ->setUseDescriptionId(IDS_DESC_SIGN); Item::minecart = (new MinecartItem(72, Minecart::TYPE_RIDEABLE)) - ->setIconName(L"minecart") + ->setIconName("minecart") ->setDescriptionId(IDS_ITEM_MINECART) ->setUseDescriptionId(IDS_DESC_MINECART); Item::saddle = (new SaddleItem(73)) - ->setIconName(L"saddle") + ->setIconName("saddle") ->setDescriptionId(IDS_ITEM_SADDLE) ->setUseDescriptionId(IDS_DESC_SADDLE); Item::redStone = (new RedStoneItem(75)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_redstone) - ->setIconName(L"redstone") + ->setIconName("redstone") ->setDescriptionId(IDS_ITEM_REDSTONE) ->setUseDescriptionId(IDS_DESC_REDSTONE_DUST) ->setPotionBrewingFormula(PotionBrewing::MOD_REDSTONE); Item::snowBall = (new SnowballItem(76)) - ->setIconName(L"snowball") + ->setIconName("snowball") ->setDescriptionId(IDS_ITEM_SNOWBALL) ->setUseDescriptionId(IDS_DESC_SNOWBALL); Item::boat = (new BoatItem(77)) - ->setIconName(L"boat") + ->setIconName("boat") ->setDescriptionId(IDS_ITEM_BOAT) ->setUseDescriptionId(IDS_DESC_BOAT); Item::leather = (new Item(78)) - ->setIconName(L"leather") + ->setIconName("leather") ->setDescriptionId(IDS_ITEM_LEATHER) ->setUseDescriptionId(IDS_DESC_LEATHER); Item::brick = (new Item(80)) - ->setIconName(L"brick") + ->setIconName("brick") ->setDescriptionId(IDS_ITEM_BRICK) ->setUseDescriptionId(IDS_DESC_BRICK); Item::clay = (new Item(81)) - ->setIconName(L"clay") + ->setIconName("clay") ->setDescriptionId(IDS_ITEM_CLAY) ->setUseDescriptionId(IDS_DESC_CLAY); Item::reeds = (new TilePlanterItem(82, Tile::reeds)) - ->setIconName(L"reeds") + ->setIconName("reeds") ->setDescriptionId(IDS_ITEM_REEDS) ->setUseDescriptionId(IDS_DESC_REEDS); Item::paper = (new Item(83)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_paper) - ->setIconName(L"paper") + ->setIconName("paper") ->setDescriptionId(IDS_ITEM_PAPER) ->setUseDescriptionId(IDS_DESC_PAPER); Item::book = (new BookItem(84)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book) - ->setIconName(L"book") + ->setIconName("book") ->setDescriptionId(IDS_ITEM_BOOK) ->setUseDescriptionId(IDS_DESC_BOOK); Item::slimeBall = (new Item(85)) - ->setIconName(L"slimeball") + ->setIconName("slimeball") ->setDescriptionId(IDS_ITEM_SLIMEBALL) ->setUseDescriptionId(IDS_DESC_SLIMEBALL); Item::minecart_chest = (new MinecartItem(86, Minecart::TYPE_CHEST)) - ->setIconName(L"minecart_chest") + ->setIconName("minecart_chest") ->setDescriptionId(IDS_ITEM_MINECART_CHEST) ->setUseDescriptionId(IDS_DESC_MINECARTWITHCHEST); Item::minecart_furnace = (new MinecartItem(87, Minecart::TYPE_FURNACE)) - ->setIconName(L"minecart_furnace") + ->setIconName("minecart_furnace") ->setDescriptionId(IDS_ITEM_MINECART_FURNACE) ->setUseDescriptionId(IDS_DESC_MINECARTWITHFURNACE); Item::egg = (new EggItem(88)) - ->setIconName(L"egg") + ->setIconName("egg") ->setDescriptionId(IDS_ITEM_EGG) ->setUseDescriptionId(IDS_DESC_EGG); Item::fishingRod = (FishingRodItem*)(new FishingRodItem(90)) ->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_wood) - ->setIconName(L"fishingRod") + ->setIconName("fishingRod") ->setDescriptionId(IDS_ITEM_FISHING_ROD) ->setUseDescriptionId(IDS_DESC_FISHINGROD); Item::yellowDust = (new Item(92)) - ->setIconName(L"yellowDust") + ->setIconName("yellowDust") ->setDescriptionId(IDS_ITEM_YELLOW_DUST) ->setUseDescriptionId(IDS_DESC_YELLOW_DUST) ->setPotionBrewingFormula(PotionBrewing::MOD_GLOWSTONE); Item::fish_raw = (new FoodItem(93, 2, FoodConstants::FOOD_SATURATION_LOW, false)) - ->setIconName(L"fishRaw") + ->setIconName("fishRaw") ->setDescriptionId(IDS_ITEM_FISH_RAW) ->setUseDescriptionId(IDS_DESC_FISH_RAW); Item::fish_cooked = (new FoodItem(94, 5, FoodConstants::FOOD_SATURATION_NORMAL, false)) - ->setIconName(L"fishCooked") + ->setIconName("fishCooked") ->setDescriptionId(IDS_ITEM_FISH_COOKED) ->setUseDescriptionId(IDS_DESC_FISH_COOKED); Item::dye_powder = (new DyePowderItem(95)) ->setBaseItemTypeAndMaterial(eBaseItemType_dyepowder, eMaterial_dye) - ->setIconName(L"dyePowder") + ->setIconName("dyePowder") ->setDescriptionId(IDS_ITEM_DYE_POWDER) ->setUseDescriptionId(-1); Item::bone = (new Item(96)) - ->setIconName(L"bone") + ->setIconName("bone") ->setDescriptionId(IDS_ITEM_BONE) ->handEquipped() ->setUseDescriptionId(IDS_DESC_BONE); Item::sugar = (new Item(97)) - ->setIconName(L"sugar") + ->setIconName("sugar") ->setDescriptionId(IDS_ITEM_SUGAR) ->setUseDescriptionId(IDS_DESC_SUGAR) ->setPotionBrewingFormula(PotionBrewing::MOD_SUGAR); @@ -948,28 +948,28 @@ void Item::staticCtor() { // )->setMaxStackSize(1)->setIcon(13, // 1)->setDescriptionId(IDS_ITEM_CAKE)->setUseDescriptionId(IDS_DESC_CAKE); Item::cake = (new TilePlanterItem(98, Tile::cake)) - ->setIconName(L"cake") + ->setIconName("cake") ->setDescriptionId(IDS_ITEM_CAKE) ->setUseDescriptionId(IDS_DESC_CAKE); Item::bed = (new BedItem(99)) ->setMaxStackSize(1) - ->setIconName(L"bed") + ->setIconName("bed") ->setDescriptionId(IDS_ITEM_BED) ->setUseDescriptionId(IDS_DESC_BED); Item::repeater = (new TilePlanterItem(100, (Tile*)Tile::diode_off)) - ->setIconName(L"diode") + ->setIconName("diode") ->setDescriptionId(IDS_ITEM_DIODE) ->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER); Item::cookie = (new FoodItem(101, 2, FoodConstants::FOOD_SATURATION_POOR, false)) - ->setIconName(L"cookie") + ->setIconName("cookie") ->setDescriptionId(IDS_ITEM_COOKIE) ->setUseDescriptionId(IDS_DESC_COOKIE); Item::shears = (ShearsItem*)(new ShearsItem(103)) - ->setIconName(L"shears") + ->setIconName("shears") ->setBaseItemTypeAndMaterial(eBaseItemType_devicetool, eMaterial_shears) ->setDescriptionId(IDS_ITEM_SHEARS) @@ -977,115 +977,115 @@ void Item::staticCtor() { Item::melon = (new FoodItem(104, 2, FoodConstants::FOOD_SATURATION_LOW, false)) - ->setIconName(L"melon") + ->setIconName("melon") ->setDescriptionId(IDS_ITEM_MELON_SLICE) ->setUseDescriptionId(IDS_DESC_MELON_SLICE); Item::seeds_pumpkin = (new SeedItem(105, Tile::pumpkinStem_Id, Tile::farmland_Id)) - ->setIconName(L"seeds_pumpkin") + ->setIconName("seeds_pumpkin") ->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_pumpkin) ->setDescriptionId(IDS_ITEM_PUMPKIN_SEEDS) ->setUseDescriptionId(IDS_DESC_PUMPKIN_SEEDS); Item::seeds_melon = (new SeedItem(106, Tile::melonStem_Id, Tile::farmland_Id)) - ->setIconName(L"seeds_melon") + ->setIconName("seeds_melon") ->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_melon) ->setDescriptionId(IDS_ITEM_MELON_SEEDS) ->setUseDescriptionId(IDS_DESC_MELON_SEEDS); Item::beef_raw = (new FoodItem(107, 3, FoodConstants::FOOD_SATURATION_LOW, true)) - ->setIconName(L"beefRaw") + ->setIconName("beefRaw") ->setDescriptionId(IDS_ITEM_BEEF_RAW) ->setUseDescriptionId(IDS_DESC_BEEF_RAW); Item::beef_cooked = (new FoodItem(108, 8, FoodConstants::FOOD_SATURATION_GOOD, true)) - ->setIconName(L"beefCooked") + ->setIconName("beefCooked") ->setDescriptionId(IDS_ITEM_BEEF_COOKED) ->setUseDescriptionId(IDS_DESC_BEEF_COOKED); Item::chicken_raw = (new FoodItem(109, 2, FoodConstants::FOOD_SATURATION_LOW, true)) ->setEatEffect(MobEffect::hunger->id, 30, 0, .3f) - ->setIconName(L"chickenRaw") + ->setIconName("chickenRaw") ->setDescriptionId(IDS_ITEM_CHICKEN_RAW) ->setUseDescriptionId(IDS_DESC_CHICKEN_RAW); Item::chicken_cooked = (new FoodItem(110, 6, FoodConstants::FOOD_SATURATION_NORMAL, true)) - ->setIconName(L"chickenCooked") + ->setIconName("chickenCooked") ->setDescriptionId(IDS_ITEM_CHICKEN_COOKED) ->setUseDescriptionId(IDS_DESC_CHICKEN_COOKED); Item::rotten_flesh = (new FoodItem(111, 4, FoodConstants::FOOD_SATURATION_POOR, true)) ->setEatEffect(MobEffect::hunger->id, 30, 0, .8f) - ->setIconName(L"rottenFlesh") + ->setIconName("rottenFlesh") ->setDescriptionId(IDS_ITEM_ROTTEN_FLESH) ->setUseDescriptionId(IDS_DESC_ROTTEN_FLESH); Item::enderPearl = (new EnderpearlItem(112)) - ->setIconName(L"enderPearl") + ->setIconName("enderPearl") ->setDescriptionId(IDS_ITEM_ENDER_PEARL) ->setUseDescriptionId(IDS_DESC_ENDER_PEARL); Item::blazeRod = (new Item(113)) - ->setIconName(L"blazeRod") + ->setIconName("blazeRod") ->setDescriptionId(IDS_ITEM_BLAZE_ROD) ->setUseDescriptionId(IDS_DESC_BLAZE_ROD) ->handEquipped(); Item::ghastTear = (new Item(114)) - ->setIconName(L"ghastTear") + ->setIconName("ghastTear") ->setDescriptionId(IDS_ITEM_GHAST_TEAR) ->setUseDescriptionId(IDS_DESC_GHAST_TEAR) ->setPotionBrewingFormula(PotionBrewing::MOD_GHASTTEARS); Item::goldNugget = (new Item(115)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold) - ->setIconName(L"goldNugget") + ->setIconName("goldNugget") ->setDescriptionId(IDS_ITEM_GOLD_NUGGET) ->setUseDescriptionId(IDS_DESC_GOLD_NUGGET); Item::netherwart_seeds = (new SeedItem(116, Tile::netherStalk_Id, Tile::soulsand_Id)) - ->setIconName(L"netherStalkSeeds") + ->setIconName("netherStalkSeeds") ->setDescriptionId(IDS_ITEM_NETHER_STALK_SEEDS) ->setUseDescriptionId(IDS_DESC_NETHER_STALK_SEEDS) ->setPotionBrewingFormula(PotionBrewing::MOD_NETHERWART); Item::potion = (PotionItem*)((new PotionItem(117)) - ->setIconName(L"potion") + ->setIconName("potion") ->setDescriptionId(IDS_ITEM_POTION) ->setUseDescriptionId(IDS_DESC_POTION)); Item::glassBottle = (new BottleItem(118)) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_glass) - ->setIconName(L"glassBottle") + ->setIconName("glassBottle") ->setDescriptionId(IDS_ITEM_GLASS_BOTTLE) ->setUseDescriptionId(IDS_DESC_GLASS_BOTTLE); Item::spiderEye = (new FoodItem(119, 2, FoodConstants::FOOD_SATURATION_GOOD, false)) ->setEatEffect(MobEffect::poison->id, 5, 0, 1.0f) - ->setIconName(L"spiderEye") + ->setIconName("spiderEye") ->setDescriptionId(IDS_ITEM_SPIDER_EYE) ->setUseDescriptionId(IDS_DESC_SPIDER_EYE) ->setPotionBrewingFormula(PotionBrewing::MOD_SPIDEREYE); Item::fermentedSpiderEye = (new Item(120)) - ->setIconName(L"fermentedSpiderEye") + ->setIconName("fermentedSpiderEye") ->setDescriptionId(IDS_ITEM_FERMENTED_SPIDER_EYE) ->setUseDescriptionId(IDS_DESC_FERMENTED_SPIDER_EYE) ->setPotionBrewingFormula(PotionBrewing::MOD_FERMENTEDEYE); Item::blazePowder = (new Item(121)) - ->setIconName(L"blazePowder") + ->setIconName("blazePowder") ->setDescriptionId(IDS_ITEM_BLAZE_POWDER) ->setUseDescriptionId(IDS_DESC_BLAZE_POWDER) ->setPotionBrewingFormula(PotionBrewing::MOD_BLAZEPOWDER); Item::magmaCream = (new Item(122)) - ->setIconName(L"magmaCream") + ->setIconName("magmaCream") ->setDescriptionId(IDS_ITEM_MAGMA_CREAM) ->setUseDescriptionId(IDS_DESC_MAGMA_CREAM) ->setPotionBrewingFormula(PotionBrewing::MOD_MAGMACREAM); @@ -1093,89 +1093,89 @@ void Item::staticCtor() { Item::brewingStand = (new TilePlanterItem(123, Tile::brewingStand)) ->setBaseItemTypeAndMaterial(eBaseItemType_device, eMaterial_blaze) - ->setIconName(L"brewingStand") + ->setIconName("brewingStand") ->setDescriptionId(IDS_ITEM_BREWING_STAND) ->setUseDescriptionId(IDS_DESC_BREWING_STAND); Item::cauldron = (new TilePlanterItem(124, Tile::cauldron)) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_iron) - ->setIconName(L"cauldron") + ->setIconName("cauldron") ->setDescriptionId(IDS_ITEM_CAULDRON) ->setUseDescriptionId(IDS_DESC_CAULDRON); Item::eyeOfEnder = (new EnderEyeItem(125)) ->setBaseItemTypeAndMaterial( eBaseItemType_pockettool, eMaterial_ender) - ->setIconName(L"eyeOfEnder") + ->setIconName("eyeOfEnder") ->setDescriptionId(IDS_ITEM_EYE_OF_ENDER) ->setUseDescriptionId(IDS_DESC_EYE_OF_ENDER); Item::speckledMelon = (new Item(126)) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_melon) - ->setIconName(L"speckledMelon") + ->setIconName("speckledMelon") ->setDescriptionId(IDS_ITEM_SPECKLED_MELON) ->setUseDescriptionId(IDS_DESC_SPECKLED_MELON) ->setPotionBrewingFormula(PotionBrewing::MOD_SPECKLEDMELON); Item::spawnEgg = (new SpawnEggItem(127)) - ->setIconName(L"monsterPlacer") + ->setIconName("monsterPlacer") ->setDescriptionId(IDS_ITEM_MONSTER_SPAWNER) ->setUseDescriptionId(IDS_DESC_MONSTER_SPAWNER); // 4J Stu - Brought this forward Item::expBottle = (new ExperienceItem(128)) - ->setIconName(L"expBottle") + ->setIconName("expBottle") ->setDescriptionId(IDS_ITEM_EXP_BOTTLE) ->setUseDescriptionId(IDS_DESC_EXP_BOTTLE); - Item::record_01 = (new RecordingItem(2000, L"13")) - ->setIconName(L"record") + Item::record_01 = (new RecordingItem(2000, "13")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_01) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_02 = (new RecordingItem(2001, L"cat")) - ->setIconName(L"record") + Item::record_02 = (new RecordingItem(2001, "cat")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_02) ->setUseDescriptionId(IDS_DESC_RECORD); // 4J - new records brought forward from 1.2.3 - Item::record_03 = (new RecordingItem(2002, L"blocks")) - ->setIconName(L"record") + Item::record_03 = (new RecordingItem(2002, "blocks")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_03) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_04 = (new RecordingItem(2003, L"chirp")) - ->setIconName(L"record") + Item::record_04 = (new RecordingItem(2003, "chirp")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_04) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_05 = (new RecordingItem(2004, L"far")) - ->setIconName(L"record") + Item::record_05 = (new RecordingItem(2004, "far")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_05) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_06 = (new RecordingItem(2005, L"mall")) - ->setIconName(L"record") + Item::record_06 = (new RecordingItem(2005, "mall")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_06) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_07 = (new RecordingItem(2006, L"mellohi")) - ->setIconName(L"record") + Item::record_07 = (new RecordingItem(2006, "mellohi")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_07) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_09 = (new RecordingItem(2007, L"stal")) - ->setIconName(L"record") + Item::record_09 = (new RecordingItem(2007, "stal")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_08) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_10 = (new RecordingItem(2008, L"strad")) - ->setIconName(L"record") + Item::record_10 = (new RecordingItem(2008, "strad")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_09) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_11 = (new RecordingItem(2009, L"ward")) - ->setIconName(L"record") + Item::record_11 = (new RecordingItem(2009, "ward")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_10) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_12 = (new RecordingItem(2010, L"11")) - ->setIconName(L"record") + Item::record_12 = (new RecordingItem(2010, "11")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_11) ->setUseDescriptionId(IDS_DESC_RECORD); - Item::record_08 = (new RecordingItem(2011, L"where are we now")) - ->setIconName(L"record") + Item::record_08 = (new RecordingItem(2011, "where are we now")) + ->setIconName("record") ->setDescriptionId(IDS_ITEM_RECORD_12) ->setUseDescriptionId(IDS_DESC_RECORD); @@ -1185,19 +1185,19 @@ void Item::staticCtor() { Item::fireball = (new FireChargeItem(129)) ->setBaseItemTypeAndMaterial(eBaseItemType_torch, eMaterial_setfire) - ->setIconName(L"fireball") + ->setIconName("fireball") ->setDescriptionId(IDS_ITEM_FIREBALL) ->setUseDescriptionId(IDS_DESC_FIREBALL); Item::frame = (new HangingEntityItem(133, eTYPE_ITEM_FRAME)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, eMaterial_glass) - ->setIconName(L"frame") + ->setIconName("frame") ->setDescriptionId(IDS_ITEM_ITEMFRAME) ->setUseDescriptionId(IDS_DESC_ITEMFRAME); // TU12 Item::skull = (new SkullItem(141)) - ->setIconName(L"skull") + ->setIconName("skull") ->setDescriptionId(IDS_ITEM_SKULL) ->setUseDescriptionId(IDS_DESC_SKULL); @@ -1209,40 +1209,40 @@ void Item::staticCtor() { Item::emerald = (new Item(132)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_emerald) - ->setIconName(L"emerald") + ->setIconName("emerald") ->setDescriptionId(IDS_ITEM_EMERALD) ->setUseDescriptionId(IDS_DESC_EMERALD); Item::flowerPot = (new TilePlanterItem(134, Tile::flowerPot)) - ->setIconName(L"flowerPot") + ->setIconName("flowerPot") ->setDescriptionId(IDS_FLOWERPOT) ->setUseDescriptionId(IDS_DESC_FLOWERPOT); Item::carrots = (new SeedFoodItem(135, 4, FoodConstants::FOOD_SATURATION_NORMAL, Tile::carrots_Id, Tile::farmland_Id)) - ->setIconName(L"carrots") + ->setIconName("carrots") ->setDescriptionId(IDS_CARROTS) ->setUseDescriptionId(IDS_DESC_CARROTS); Item::potato = (new SeedFoodItem(136, 1, FoodConstants::FOOD_SATURATION_LOW, Tile::potatoes_Id, Tile::farmland_Id)) - ->setIconName(L"potato") + ->setIconName("potato") ->setDescriptionId(IDS_POTATO) ->setUseDescriptionId(IDS_DESC_POTATO); Item::potatoBaked = (new FoodItem(137, 6, FoodConstants::FOOD_SATURATION_NORMAL, false)) - ->setIconName(L"potatoBaked") + ->setIconName("potatoBaked") ->setDescriptionId(IDS_ITEM_POTATO_BAKED) ->setUseDescriptionId(IDS_DESC_POTATO_BAKED); Item::potatoPoisonous = (new FoodItem(138, 2, FoodConstants::FOOD_SATURATION_LOW, false)) ->setEatEffect(MobEffect::poison->id, 5, 0, .6f) - ->setIconName(L"potatoPoisonous") + ->setIconName("potatoPoisonous") ->setDescriptionId(IDS_ITEM_POTATO_POISONOUS) ->setUseDescriptionId(IDS_DESC_POTATO_POISONOUS); Item::emptyMap = (EmptyMapItem*)(new EmptyMapItem(139)) - ->setIconName(L"map_empty") + ->setIconName("map_empty") ->setDescriptionId(IDS_ITEM_MAP_EMPTY) ->setUseDescriptionId(IDS_DESC_MAP_EMPTY); @@ -1251,7 +1251,7 @@ void Item::staticCtor() { false)) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_carrot) - ->setIconName(L"carrotGolden") + ->setIconName("carrotGolden") ->setPotionBrewingFormula(PotionBrewing::MOD_GOLDENCARROT) ->setDescriptionId(IDS_ITEM_CARROT_GOLDEN) ->setUseDescriptionId(IDS_DESC_CARROT_GOLDEN); @@ -1259,84 +1259,84 @@ void Item::staticCtor() { Item::carrotOnAStick = (new CarrotOnAStickItem(142)) ->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_carrot) - ->setIconName(L"carrotOnAStick") + ->setIconName("carrotOnAStick") ->setDescriptionId(IDS_ITEM_CARROT_ON_A_STICK) ->setUseDescriptionId(IDS_DESC_CARROT_ON_A_STICK); Item::netherStar = (new SimpleFoiledItem(143)) - ->setIconName(L"nether_star") + ->setIconName("nether_star") ->setDescriptionId(IDS_NETHER_STAR) ->setUseDescriptionId(IDS_DESC_NETHER_STAR); Item::pumpkinPie = (new FoodItem(144, 8, FoodConstants::FOOD_SATURATION_LOW, false)) - ->setIconName(L"pumpkinPie") + ->setIconName("pumpkinPie") ->setDescriptionId(IDS_ITEM_PUMPKIN_PIE) ->setUseDescriptionId(IDS_DESC_PUMPKIN_PIE); Item::fireworks = (new FireworksItem(145)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined) - ->setIconName(L"fireworks") + ->setIconName("fireworks") ->setDescriptionId(IDS_FIREWORKS) ->setUseDescriptionId(IDS_DESC_FIREWORKS); Item::fireworksCharge = (new FireworksChargeItem(146)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined) - ->setIconName(L"fireworks_charge") + ->setIconName("fireworks_charge") ->setDescriptionId(IDS_FIREWORKS_CHARGE) ->setUseDescriptionId(IDS_DESC_FIREWORKS_CHARGE); EnchantedBookItem::enchantedBook = (EnchantedBookItem*)(new EnchantedBookItem(147)) ->setMaxStackSize(1) - ->setIconName(L"enchantedBook") + ->setIconName("enchantedBook") ->setDescriptionId(IDS_ITEM_ENCHANTED_BOOK) ->setUseDescriptionId(IDS_DESC_ENCHANTED_BOOK); Item::comparator = (new TilePlanterItem(148, Tile::comparator_off)) - ->setIconName(L"comparator") + ->setIconName("comparator") ->setDescriptionId(IDS_ITEM_COMPARATOR) ->setUseDescriptionId(IDS_DESC_COMPARATOR); Item::netherbrick = (new Item(149)) - ->setIconName(L"netherbrick") + ->setIconName("netherbrick") ->setDescriptionId(IDS_ITEM_NETHERBRICK) ->setUseDescriptionId(IDS_DESC_ITEM_NETHERBRICK); Item::netherQuartz = (new Item(150)) - ->setIconName(L"netherquartz") + ->setIconName("netherquartz") ->setDescriptionId(IDS_ITEM_NETHER_QUARTZ) ->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ); Item::minecart_tnt = (new MinecartItem(151, Minecart::TYPE_TNT)) - ->setIconName(L"minecart_tnt") + ->setIconName("minecart_tnt") ->setDescriptionId(IDS_ITEM_MINECART_TNT) ->setUseDescriptionId(IDS_DESC_MINECART_TNT); Item::minecart_hopper = (new MinecartItem(152, Minecart::TYPE_HOPPER)) - ->setIconName(L"minecart_hopper") + ->setIconName("minecart_hopper") ->setDescriptionId(IDS_ITEM_MINECART_HOPPER) ->setUseDescriptionId(IDS_DESC_MINECART_HOPPER); Item::horseArmorMetal = (new Item(161)) - ->setIconName(L"iron_horse_armor") + ->setIconName("iron_horse_armor") ->setMaxStackSize(1) ->setDescriptionId(IDS_ITEM_IRON_HORSE_ARMOR) ->setUseDescriptionId(IDS_DESC_IRON_HORSE_ARMOR); Item::horseArmorGold = (new Item(162)) - ->setIconName(L"gold_horse_armor") + ->setIconName("gold_horse_armor") ->setMaxStackSize(1) ->setDescriptionId(IDS_ITEM_GOLD_HORSE_ARMOR) ->setUseDescriptionId(IDS_DESC_GOLD_HORSE_ARMOR); Item::horseArmorDiamond = (new Item(163)) - ->setIconName(L"diamond_horse_armor") + ->setIconName("diamond_horse_armor") ->setMaxStackSize(1) ->setDescriptionId(IDS_ITEM_DIAMOND_HORSE_ARMOR) ->setUseDescriptionId(IDS_DESC_DIAMOND_HORSE_ARMOR); Item::lead = (new LeashItem(164)) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined) - ->setIconName(L"lead") + ->setIconName("lead") ->setDescriptionId(IDS_ITEM_LEAD) ->setUseDescriptionId(IDS_DESC_LEAD); Item::nameTag = (new NameTagItem(165)) - ->setIconName(L"name_tag") + ->setIconName("name_tag") ->setDescriptionId(IDS_ITEM_NAME_TAG) ->setUseDescriptionId(IDS_DESC_NAME_TAG); } @@ -1386,11 +1386,11 @@ Item::Item(int id) : id(256 + id) { m_isStackedByData = false; craftingRemainingItem = nullptr; - potionBrewingFormula = L""; + potionBrewingFormula = ""; m_iMaterial = eMaterial_undefined; m_iBaseItemType = eBaseItemType_undefined; - m_textureName = L""; + m_textureName = ""; // TODO Init this string // string descriptionId; @@ -1415,13 +1415,13 @@ int Item::getBaseItemType() { return this->m_iBaseItemType; } int Item::getMaterial() { return this->m_iMaterial; } -Item* Item::setIconName(const std::wstring& name) { +Item* Item::setIconName(const std::string& name) { m_textureName = name; return this; } -std::wstring Item::getIconName() { return m_textureName; } +std::string Item::getIconName() { return m_textureName; } Item* Item::setMaxStackSize(int max) { maxStackSize = max; @@ -1540,12 +1540,12 @@ Item* Item::setDescriptionId(unsigned int id) { return this; } -const wchar_t* Item::getDescription() { +const char* Item::getDescription() { return gameServices().getString(getDescriptionId()); // return I18n::get(getDescriptionId()); } -const wchar_t* Item::getDescription(std::shared_ptr instance) { +const char* Item::getDescription(std::shared_ptr instance) { return gameServices().getString(getDescriptionId(instance)); // return I18n::get(getDescriptionId(instance)); } @@ -1588,8 +1588,8 @@ bool Item::hasCraftingRemainingItem() { return craftingRemainingItem != nullptr; } -std::wstring Item::getName() { - return L""; // I18n::get(getDescriptionId() + L".name"); +std::string Item::getName() { + return ""; // I18n::get(getDescriptionId() + ".name"); } int Item::getColor(std::shared_ptr item, int spriteLayer) { @@ -1617,26 +1617,26 @@ void Item::releaseUsing(std::shared_ptr itemInstance, Level* level, std::shared_ptr player, int durationLeft) {} -Item* Item::setPotionBrewingFormula(const std::wstring& potionBrewingFormula) { +Item* Item::setPotionBrewingFormula(const std::string& potionBrewingFormula) { this->potionBrewingFormula = potionBrewingFormula; return this; } -std::wstring Item::getPotionBrewingFormula() { return potionBrewingFormula; } +std::string Item::getPotionBrewingFormula() { return potionBrewingFormula; } bool Item::hasPotionBrewingFormula() { return !potionBrewingFormula.empty(); } // 4jcraft: re-added old TU18 overload for java gui void Item::appendHoverText(std::shared_ptr itemInstance, std::shared_ptr player, - std::vector* lines, bool advanced, - std::vector& unformattedStrings) {} + std::vector* lines, bool advanced, + std::vector& unformattedStrings) {} void Item::appendHoverText(std::shared_ptr itemInstance, std::shared_ptr player, std::vector* lines, bool advanced) {} -std::wstring Item::getHoverName(std::shared_ptr itemInstance) { +std::string Item::getHoverName(std::shared_ptr itemInstance) { // String elementName = ("" + // Language.getInstance().getElementName(getDescription(itemInstance))).trim(); // return elementName; diff --git a/targets/minecraft/world/item/Item.h b/targets/minecraft/world/item/Item.h index ee99c4a89..3b4fc0cd8 100644 --- a/targets/minecraft/world/item/Item.h +++ b/targets/minecraft/world/item/Item.h @@ -149,7 +149,7 @@ public: protected: static const int ICON_COLUMNS = ITEM_ICON_COLUMNS; - static std::wstring + static std::string ICON_DESCRIPTION_PREFIX; // 4J Stu - Was const but we have to static // initialise it outside of this class @@ -640,7 +640,7 @@ protected: private: Item* craftingRemainingItem; - std::wstring potionBrewingFormula; + std::string potionBrewingFormula; // 4J Stu - A value from strings.h, that is the name of the item unsigned int descriptionId; @@ -648,15 +648,15 @@ private: // 4J Stu - A value from strings.h that says what this does unsigned int useDescriptionId; - std::wstring m_textureName; + std::string m_textureName; protected: Item(int id); public: // 4J Using per-item textures now - Item* setIconName(const std::wstring& name); - std::wstring getIconName(); + Item* setIconName(const std::string& name); + std::string getIconName(); Item* setMaxStackSize(int max); Item* setBaseItemTypeAndMaterial(int iType, int iMaterial); int getBaseItemType(); @@ -731,8 +731,8 @@ public: virtual bool isHandEquipped(); virtual bool isMirroredArt(); Item* setDescriptionId(unsigned int id); - const wchar_t* getDescription(); - const wchar_t* getDescription(std::shared_ptr instance); + const char* getDescription(); + const char* getDescription(std::shared_ptr instance); virtual unsigned int getDescriptionId(int iData = -1); virtual unsigned int getDescriptionId( std::shared_ptr instance); @@ -746,7 +746,7 @@ public: virtual bool shouldOverrideMultiplayerNBT(); Item* getCraftingRemainingItem(); bool hasCraftingRemainingItem(); - std::wstring getName(); + std::string getName(); virtual int getColor(std::shared_ptr item, int spriteLayer); virtual void inventoryTick(std::shared_ptr itemInstance, Level* level, std::shared_ptr owner, @@ -763,22 +763,22 @@ public: protected: virtual Item* setPotionBrewingFormula( - const std::wstring& potionBrewingFormula); + const std::string& potionBrewingFormula); public: - virtual std::wstring getPotionBrewingFormula(); + virtual std::string getPotionBrewingFormula(); virtual bool hasPotionBrewingFormula(); // 4jcraft: re-added old TU18 overload for java gui virtual void appendHoverText( std::shared_ptr itemInstance, - std::shared_ptr player, std::vector* lines, + std::shared_ptr player, std::vector* lines, bool advanced, - std::vector& + std::vector& unformattedStrings); // 4J Added unformattedStrings virtual void appendHoverText(std::shared_ptr itemInstance, std::shared_ptr player, std::vector* lines, bool advanced); - virtual std::wstring getHoverName( + virtual std::string getHoverName( std::shared_ptr itemInstance); virtual bool isFoil(std::shared_ptr itemInstance); virtual const Rarity* getRarity(std::shared_ptr itemInstance); diff --git a/targets/minecraft/world/item/ItemInstance.cpp b/targets/minecraft/world/item/ItemInstance.cpp index 6704b19a8..1bd665d2d 100644 --- a/targets/minecraft/world/item/ItemInstance.cpp +++ b/targets/minecraft/world/item/ItemInstance.cpp @@ -34,10 +34,10 @@ class Tag; -const std::wstring ItemInstance::ATTRIBUTE_MODIFIER_FORMAT = L"#.###"; +const std::string ItemInstance::ATTRIBUTE_MODIFIER_FORMAT = "#.###"; -const wchar_t* ItemInstance::TAG_ENCH_ID = L"id"; -const wchar_t* ItemInstance::TAG_ENCH_LEVEL = L"lvl"; +const char* ItemInstance::TAG_ENCH_ID = "id"; +const char* ItemInstance::TAG_ENCH_LEVEL = "lvl"; void ItemInstance::_init(int id, int count, int auxValue) { this->popTime = 0; @@ -134,24 +134,24 @@ std::shared_ptr ItemInstance::useTimeDepleted( } CompoundTag* ItemInstance::save(CompoundTag* compoundTag) { - compoundTag->putShort(L"id", (short)id); - compoundTag->putByte(L"Count", (uint8_t)count); - compoundTag->putShort(L"Damage", (short)auxValue); - if (tag != nullptr) compoundTag->put(L"tag", tag->copy()); + compoundTag->putShort("id", (short)id); + compoundTag->putByte("Count", (uint8_t)count); + compoundTag->putShort("Damage", (short)auxValue); + if (tag != nullptr) compoundTag->put("tag", tag->copy()); return compoundTag; } void ItemInstance::load(CompoundTag* compoundTag) { popTime = 0; - id = compoundTag->getShort(L"id"); - count = compoundTag->getByte(L"Count"); - auxValue = compoundTag->getShort(L"Damage"); + id = compoundTag->getShort("id"); + count = compoundTag->getByte("Count"); + auxValue = compoundTag->getShort("Damage"); if (auxValue < 0) { auxValue = 0; } - if (compoundTag->contains(L"tag")) { + if (compoundTag->contains("tag")) { delete tag; - tag = (CompoundTag*)compoundTag->getCompound(L"tag")->copy(); + tag = (CompoundTag*)compoundTag->getCompound("tag")->copy(); } } @@ -363,18 +363,18 @@ std::shared_ptr ItemInstance::clone( return item == nullptr ? nullptr : item->copy(); } -std::wstring ItemInstance::toString() { +std::string ItemInstance::toString() { // return count + "x" + Item::items[id]->getDescriptionId() + "@" + // auxValue; - std::wostringstream oss; + std::ostringstream oss; // 4J-PB - TODO - temp fix until ore recipe issue is fixed if (Item::items[id] == nullptr) { - oss << std::dec << count << L"x" << L" Item::items[id] is nullptr " - << L"@" << auxValue; + oss << std::dec << count << "x" << " Item::items[id] is nullptr " + << "@" << auxValue; } else { - oss << std::dec << count << L"x" - << Item::items[id]->getDescription(shared_from_this()) << L"@" + oss << std::dec << count << "x" + << Item::items[id]->getDescription(shared_from_this()) << "@" << auxValue; } return oss.str(); @@ -425,7 +425,7 @@ ListTag* ItemInstance::getEnchantmentTags() { if (tag == nullptr) { return nullptr; } - return (ListTag*)tag->get(L"ench"); + return (ListTag*)tag->get("ench"); } void ItemInstance::setTag(CompoundTag* tag) { @@ -433,35 +433,35 @@ void ItemInstance::setTag(CompoundTag* tag) { this->tag = tag; } -std::wstring ItemInstance::getHoverName() { - std::wstring title = getItem()->getHoverName(shared_from_this()); +std::string ItemInstance::getHoverName() { + std::string title = getItem()->getHoverName(shared_from_this()); - if (tag != nullptr && tag->contains(L"display")) { - CompoundTag* display = tag->getCompound(L"display"); + if (tag != nullptr && tag->contains("display")) { + CompoundTag* display = tag->getCompound("display"); - if (display->contains(L"Name")) { - title = display->getString(L"Name"); + if (display->contains("Name")) { + title = display->getString("Name"); } } return title; } -void ItemInstance::setHoverName(const std::wstring& name) { +void ItemInstance::setHoverName(const std::string& name) { if (tag == nullptr) tag = new CompoundTag(); - if (!tag->contains(L"display")) - tag->putCompound(L"display", new CompoundTag()); - tag->getCompound(L"display")->putString(L"Name", name); + if (!tag->contains("display")) + tag->putCompound("display", new CompoundTag()); + tag->getCompound("display")->putString("Name", name); } void ItemInstance::resetHoverName() { if (tag == nullptr) return; - if (!tag->contains(L"display")) return; - CompoundTag* display = tag->getCompound(L"display"); - display->remove(L"Name"); + if (!tag->contains("display")) return; + CompoundTag* display = tag->getCompound("display"); + display->remove("Name"); if (display->isEmpty()) { - tag->remove(L"display"); + tag->remove("display"); if (tag->isEmpty()) { setTag(nullptr); @@ -471,23 +471,23 @@ void ItemInstance::resetHoverName() { bool ItemInstance::hasCustomHoverName() { if (tag == nullptr) return false; - if (!tag->contains(L"display")) return false; - return tag->getCompound(L"display")->contains(L"Name"); + if (!tag->contains("display")) return false; + return tag->getCompound("display")->contains("Name"); } // 4jcraft: re-added old TU18 overload for java gui -std::vector* ItemInstance::getHoverText( +std::vector* ItemInstance::getHoverText( std::shared_ptr player, bool advanced, - std::vector& unformattedStrings) { - std::vector* lines = new std::vector(); + std::vector& unformattedStrings) { + std::vector* lines = new std::vector(); Item* item = Item::items[id]; - std::wstring title = getHoverName(); + std::string title = getHoverName(); // 4J Stu - We don't do italics, but do change colour. But handle this later // in the process due to text length measuring on the Xbox360 // if (hasCustomHoverName()) //{ - // title = L"" + title + L""; + // title = "" + title + ""; //} // 4J Stu - Don't currently have this @@ -514,7 +514,7 @@ std::vector* ItemInstance::getHoverText( //{ // if (id == Item::map_Id) // { - // title += L" #" + toWString(auxValue); + // title += " #" + toWString(auxValue); // } //} @@ -527,11 +527,11 @@ std::vector* ItemInstance::getHoverText( ListTag* list = getEnchantmentTags(); if (list != nullptr) { for (int i = 0; i < list->size(); i++) { - int type = list->get(i)->getShort((wchar_t*)TAG_ENCH_ID); - int level = list->get(i)->getShort((wchar_t*)TAG_ENCH_LEVEL); + int type = list->get(i)->getShort((char*)TAG_ENCH_ID); + int level = list->get(i)->getShort((char*)TAG_ENCH_LEVEL); if (Enchantment::enchantments[type] != nullptr) { - std::wstring unformatted = L""; + std::string unformatted = ""; lines->push_back( Enchantment::enchantments[type]->getFullname( level, unformatted)); @@ -557,12 +557,12 @@ std::vector* ItemInstance::getHoverText( /* if (advanced) { - wstring suffix = L""; + string suffix = ""; if (title.length() > 0) { - title += L" ("; - suffix = L")"; + title += " ("; + suffix = ")"; } if (isStackedByData()) @@ -579,7 +579,7 @@ std::vector* ItemInstance::getHoverText( /*if (!hasCustomHoverName() && id == Item::map_Id) { - title.text += L" #" + toWString(auxValue); + title.text += " #" + toWString(auxValue); }*/ lines->push_back(title); @@ -590,41 +590,41 @@ std::vector* ItemInstance::getHoverText( ListTag* list = getEnchantmentTags(); if (list != nullptr) { for (int i = 0; i < list->size(); i++) { - int type = list->get(i)->getShort((wchar_t*)TAG_ENCH_ID); - int level = list->get(i)->getShort((wchar_t*)TAG_ENCH_LEVEL); + int type = list->get(i)->getShort((char*)TAG_ENCH_ID); + int level = list->get(i)->getShort((char*)TAG_ENCH_LEVEL); if (Enchantment::enchantments[type] != nullptr) { - std::wstring unformatted = L""; + std::string unformatted = ""; lines->push_back( Enchantment::enchantments[type]->getFullname(level)); } } } - if (tag->contains(L"display")) { - // CompoundTag *display = tag->getCompound(L"display"); + if (tag->contains("display")) { + // CompoundTag *display = tag->getCompound("display"); - // if (display->contains(L"color")) + // if (display->contains("color")) //{ // if (advanced) // { - // wchar_t text [256]; - // swprintf(text, 256, L"Color: LOCALISE #%08X", - // display->getInt(L"color")); + // char text [256]; + // snprintf(text, 256, "Color: LOCALISE #%08X", + // display->getInt("color")); // lines->push_back(HtmlString(text)); // } // else // { - // lines->push_back(HtmlString(L"Dyed LOCALISE", + // lines->push_back(HtmlString("Dyed LOCALISE", // eMinecraftColour_NOT_SET, true)); // } // } // 4J: Lore isn't in use in game - /*if (display->contains(L"Lore")) + /*if (display->contains("Lore")) { ListTag *lore = (ListTag *) - display->getList(L"Lore"); if (lore->size() > 0) + display->getList("Lore"); if (lore->size() > 0) { for (int i = 0; i < lore->size(); i++) { @@ -641,7 +641,7 @@ std::vector* ItemInstance::getHoverText( if (!modifiers->empty()) { // New line - lines->push_back(HtmlString(L"")); + lines->push_back(HtmlString("")); // Modifier descriptions for (auto it = modifiers->begin(); it != modifiers->end(); ++it) { @@ -659,9 +659,9 @@ std::vector* ItemInstance::getHoverText( if (advanced) { if (isDamaged()) { - std::wstring damageStr = - L"Durability: LOCALISE " + - toWString((getMaxDamage()) - getDamageValue()) + L" / " + + std::string damageStr = + "Durability: LOCALISE " + + toWString((getMaxDamage()) - getDamageValue()) + " / " + toWString(getMaxDamage()); lines->push_back(HtmlString(damageStr)); } @@ -682,11 +682,11 @@ std::vector* ItemInstance::getHoverTextOnly( ListTag* list = getEnchantmentTags(); if (list != nullptr) { for (int i = 0; i < list->size(); i++) { - int type = list->get(i)->getShort((wchar_t*)TAG_ENCH_ID); - int level = list->get(i)->getShort((wchar_t*)TAG_ENCH_LEVEL); + int type = list->get(i)->getShort((char*)TAG_ENCH_ID); + int level = list->get(i)->getShort((char*)TAG_ENCH_LEVEL); if (Enchantment::enchantments[type] != nullptr) { - std::wstring unformatted = L""; + std::string unformatted = ""; lines->push_back( Enchantment::enchantments[type]->getFullname(level)); } @@ -710,26 +710,26 @@ bool ItemInstance::isEnchantable() { void ItemInstance::enchant(const Enchantment* enchantment, int level) { if (tag == nullptr) this->setTag(new CompoundTag()); - if (!tag->contains(L"ench")) - tag->put(L"ench", new ListTag(L"ench")); + if (!tag->contains("ench")) + tag->put("ench", new ListTag("ench")); - ListTag* list = (ListTag*)tag->get(L"ench"); + ListTag* list = (ListTag*)tag->get("ench"); CompoundTag* ench = new CompoundTag(); - ench->putShort((wchar_t*)TAG_ENCH_ID, (short)enchantment->id); - ench->putShort((wchar_t*)TAG_ENCH_LEVEL, (uint8_t)level); + ench->putShort((char*)TAG_ENCH_ID, (short)enchantment->id); + ench->putShort((char*)TAG_ENCH_LEVEL, (uint8_t)level); list->add(ench); } bool ItemInstance::isEnchanted() { - if (tag != nullptr && tag->contains(L"ench")) return true; + if (tag != nullptr && tag->contains("ench")) return true; return false; } -void ItemInstance::addTagElement(std::wstring name, Tag* tag) { +void ItemInstance::addTagElement(std::string name, Tag* tag) { if (this->tag == nullptr) { setTag(new CompoundTag()); } - this->tag->put((wchar_t*)name.c_str(), tag); + this->tag->put((char*)name.c_str(), tag); } bool ItemInstance::mayBePlacedInAdventureMode() { @@ -745,8 +745,8 @@ void ItemInstance::setFramed(std::shared_ptr frame) { std::shared_ptr ItemInstance::getFrame() { return frame; } int ItemInstance::getBaseRepairCost() { - if (hasTag() && tag->contains(L"RepairCost")) { - return tag->getInt(L"RepairCost"); + if (hasTag() && tag->contains("RepairCost")) { + return tag->getInt("RepairCost"); } else { return 0; } @@ -754,16 +754,16 @@ int ItemInstance::getBaseRepairCost() { void ItemInstance::setRepairCost(int cost) { if (!hasTag()) tag = new CompoundTag(); - tag->putInt(L"RepairCost", cost); + tag->putInt("RepairCost", cost); } attrAttrModMap* ItemInstance::getAttributeModifiers() { attrAttrModMap* result = nullptr; - if (hasTag() && tag->contains(L"AttributeModifiers")) { + if (hasTag() && tag->contains("AttributeModifiers")) { result = new attrAttrModMap(); ListTag* entries = - (ListTag*)tag->getList(L"AttributeModifiers"); + (ListTag*)tag->getList("AttributeModifiers"); for (int i = 0; i < entries->size(); i++) { CompoundTag* entry = entries->get(i); @@ -776,7 +776,7 @@ attrAttrModMap* ItemInstance::getAttributeModifiers() { attribute->getId()->getMostSignificantBits() != 0) {*/ result->insert(std::pair( - static_cast(entry->getInt(L"ID")), attribute)); + static_cast(entry->getInt("ID")), attribute)); /*}*/ } } else { @@ -790,19 +790,19 @@ void ItemInstance::set4JData(int data) { if (tag == nullptr && data == 0) return; if (tag == nullptr) this->setTag(new CompoundTag()); - if (tag->contains(L"4jdata")) { - IntTag* dataTag = (IntTag*)tag->get(L"4jdata"); + if (tag->contains("4jdata")) { + IntTag* dataTag = (IntTag*)tag->get("4jdata"); dataTag->data = data; } else if (data != 0) { - tag->put(L"4jdata", new IntTag(L"4jdata", data)); + tag->put("4jdata", new IntTag("4jdata", data)); } } int ItemInstance::get4JData() { - if (tag == nullptr || !tag->contains(L"4jdata")) + if (tag == nullptr || !tag->contains("4jdata")) return 0; else { - IntTag* dataTag = (IntTag*)tag->get(L"4jdata"); + IntTag* dataTag = (IntTag*)tag->get("4jdata"); return dataTag->data; } } diff --git a/targets/minecraft/world/item/ItemInstance.h b/targets/minecraft/world/item/ItemInstance.h index 0a5d5a3cf..de66dee6d 100644 --- a/targets/minecraft/world/item/ItemInstance.h +++ b/targets/minecraft/world/item/ItemInstance.h @@ -34,9 +34,9 @@ class ListTag; // fit well into out macroisation setup class ItemInstance : public std::enable_shared_from_this { public: - static const std::wstring ATTRIBUTE_MODIFIER_FORMAT; - static const wchar_t* TAG_ENCH_ID; - static const wchar_t* TAG_ENCH_LEVEL; + static const std::string ATTRIBUTE_MODIFIER_FORMAT; + static const char* TAG_ENCH_ID; + static const char* TAG_ENCH_LEVEL; int count; int popTime; @@ -146,7 +146,7 @@ public: virtual ItemInstance* setDescriptionId(unsigned int id); static std::shared_ptr clone( std::shared_ptr item); - std::wstring toString(); + std::string toString(); void inventoryTick(Level* level, std::shared_ptr owner, int slot, bool selected); void onCraftedBy(Level* level, std::shared_ptr player, @@ -163,14 +163,14 @@ public: CompoundTag* getTag(); ListTag* getEnchantmentTags(); void setTag(CompoundTag* tag); - std::wstring getHoverName(); - void setHoverName(const std::wstring& name); + std::string getHoverName(); + void setHoverName(const std::string& name); void resetHoverName(); bool hasCustomHoverName(); // 4jcraft: re-added old TU18 overload for java gui - std::vector* getHoverText( + std::vector* getHoverText( std::shared_ptr player, bool advanced, - std::vector& unformattedStrings); + std::vector& unformattedStrings); std::vector* getHoverText(std::shared_ptr player, bool advanced); std::vector* getHoverTextOnly(std::shared_ptr player, @@ -180,7 +180,7 @@ public: bool isEnchantable(); void enchant(const Enchantment* enchantment, int level); bool isEnchanted(); - void addTagElement(std::wstring name, Tag* tag); + void addTagElement(std::string name, Tag* tag); bool mayBePlacedInAdventureMode(); bool isFramed(); void setFramed(std::shared_ptr frame); diff --git a/targets/minecraft/world/item/MapItem.cpp b/targets/minecraft/world/item/MapItem.cpp index b9ddadcb4..a1fb0c5c1 100644 --- a/targets/minecraft/world/item/MapItem.cpp +++ b/targets/minecraft/world/item/MapItem.cpp @@ -33,7 +33,7 @@ MapItem::MapItem(int id) : ComplexItem(id) { setStackedByData(true); } std::shared_ptr MapItem::getSavedData(short idNum, Level* level) { - std::wstring id = std::wstring(L"map_") + toWString(idNum); + std::string id = std::string("map_") + toWString(idNum); std::shared_ptr mapItemSavedData = std::dynamic_pointer_cast( level->getSavedData(typeid(MapItemSavedData), id)); @@ -42,10 +42,10 @@ std::shared_ptr MapItem::getSavedData(short idNum, // 4J Stu - This call comes from ClientConnection, but i don't see why // we should be trying to work out the id again when it's passed as a // param. In any case that won't work with the new map setup - // int aux = level->getFreeAuxValueFor(L"map"); + // int aux = level->getFreeAuxValueFor("map"); int aux = idNum; - id = std::wstring(L"map_") + toWString(aux); + id = std::string("map_") + toWString(aux); mapItemSavedData = std::make_shared(id); level->setSavedData(id, (std::shared_ptr)mapItemSavedData); @@ -56,8 +56,8 @@ std::shared_ptr MapItem::getSavedData(short idNum, std::shared_ptr MapItem::getSavedData( std::shared_ptr itemInstance, Level* level) { - std::wstring id = - std::wstring(L"map_") + toWString(itemInstance->getAuxValue()); + std::string id = + std::string("map_") + toWString(itemInstance->getAuxValue()); std::shared_ptr mapItemSavedData = std::dynamic_pointer_cast( level->getSavedData(typeid(MapItemSavedData), id)); @@ -67,9 +67,9 @@ std::shared_ptr MapItem::getSavedData( // 4J Stu - I don't see why we should be trying to work out the id again // when it's passed as a param. In any case that won't work with the new // map setup - // itemInstance->setAuxValue(level->getFreeAuxValueFor(L"map")); + // itemInstance->setAuxValue(level->getFreeAuxValueFor("map")); - id = std::wstring(L"map_") + toWString(itemInstance->getAuxValue()); + id = std::string("map_") + toWString(itemInstance->getAuxValue()); mapItemSavedData = std::make_shared(id); newData = true; @@ -315,7 +315,7 @@ std::shared_ptr MapItem::getUpdatePacket( void MapItem::onCraftedBy(std::shared_ptr itemInstance, Level* level, std::shared_ptr player) { - wchar_t buf[64]; + char buf[64]; int mapScale = 3; #ifdef _LARGE_WORLDS @@ -332,8 +332,8 @@ void MapItem::onCraftedBy(std::shared_ptr itemInstance, itemInstance->setAuxValue(level->getAuxValueForMap( player->getXuid(), player->dimension, centreXC, centreZC, mapScale)); - swprintf(buf, 64, L"map_%d", itemInstance->getAuxValue()); - std::wstring id = std::wstring(buf); + snprintf(buf, 64, "map_%d", itemInstance->getAuxValue()); + std::string id = std::string(buf); std::shared_ptr data = getSavedData(itemInstance->getAuxValue(), level); diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 1eb8a864e..16e084eb5 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -30,9 +30,9 @@ class Icon; -const std::wstring PotionItem::DEFAULT_ICON = L"potion"; -const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash"; -const std::wstring PotionItem::CONTENTS_ICON = L"potion_contents"; +const std::string PotionItem::DEFAULT_ICON = "potion"; +const std::string PotionItem::THROWABLE_ICON = "potion_splash"; +const std::string PotionItem::CONTENTS_ICON = "potion_contents"; // 4J Added std::vector > PotionItem::s_uniquePotionValues; @@ -50,7 +50,7 @@ PotionItem::PotionItem(int id) : Item(id) { std::vector* PotionItem::getMobEffects( std::shared_ptr potion) { if (!potion->hasTag() || - !potion->getTag()->contains(L"CustomPotionEffects")) { + !potion->getTag()->contains("CustomPotionEffects")) { std::vector* effects = nullptr; auto it = cachedMobEffects.find(potion->getAuxValue()); if (it != cachedMobEffects.end()) effects = it->second; @@ -68,7 +68,7 @@ std::vector* PotionItem::getMobEffects( new std::vector(); ListTag* customList = (ListTag*)potion->getTag()->getList( - L"CustomPotionEffects"); + "CustomPotionEffects"); for (int i = 0; i < customList->size(); i++) { CompoundTag* tag = customList->get(i); @@ -203,21 +203,21 @@ bool PotionItem::hasInstantenousEffects(int itemAuxValue) { return false; } -std::wstring PotionItem::getHoverName( +std::string PotionItem::getHoverName( std::shared_ptr itemInstance) { if (itemInstance->getAuxValue() == 0) { return gameServices().getString( IDS_ITEM_WATER_BOTTLE); // I18n.get("item.emptyPotion.name").trim(); } - std::wstring elementName = Item::getHoverName(itemInstance); + std::string elementName = Item::getHoverName(itemInstance); if (isThrowable(itemInstance->getAuxValue())) { // elementName = I18n.get("potion.prefix.grenade").trim() + " " + // elementName; - elementName = replaceAll(elementName, L"{*splash*}", + elementName = replaceAll(elementName, "{*splash*}", gameServices().getString(IDS_POTION_PREFIX_GRENADE)); } else { - elementName = replaceAll(elementName, L"{*splash*}", L""); + elementName = replaceAll(elementName, "{*splash*}", ""); } std::vector* effects = @@ -227,19 +227,19 @@ std::wstring PotionItem::getHoverName( // postfixString += ".postfix"; // return elementName + " " + I18n.get(postfixString).trim(); - elementName = replaceAll(elementName, L"{*prefix*}", L""); + elementName = replaceAll(elementName, "{*prefix*}", ""); elementName = replaceAll( - elementName, L"{*postfix*}", + elementName, "{*postfix*}", gameServices().getString(effects->at(0)->getPostfixDescriptionId())); } else { // String appearanceName = // PotionBrewing.getAppearanceName(itemInstance.getAuxValue()); return // I18n.get(appearanceName).trim() + " " + elementName; - elementName = replaceAll(elementName, L"{*prefix*}", + elementName = replaceAll(elementName, "{*prefix*}", gameServices().getString(PotionBrewing::getAppearanceName( itemInstance->getAuxValue()))); - elementName = replaceAll(elementName, L"{*postfix*}", L""); + elementName = replaceAll(elementName, "{*postfix*}", ""); } return elementName; } @@ -258,7 +258,7 @@ void PotionItem::appendHoverText(std::shared_ptr itemInstance, // for (MobEffectInstance effect : effects) for (auto it = effects->begin(); it != effects->end(); ++it) { MobEffectInstance* effect = *it; - std::wstring effectString = + std::string effectString = gameServices().getString(effect->getDescriptionId()); MobEffect* mobEffect = MobEffect::effects[effect->getId()]; @@ -285,18 +285,18 @@ void PotionItem::appendHoverText(std::shared_ptr itemInstance, // internal vector of modifiers) delete effectModifiers; if (effect->getAmplifier() > 0) { - std::wstring potencyString = L""; + std::string potencyString = ""; switch (effect->getAmplifier()) { case 1: - potencyString = L" "; + potencyString = " "; potencyString += gameServices().getString(IDS_POTION_POTENCY_1); break; case 2: - potencyString = L" "; + potencyString = " "; potencyString += gameServices().getString(IDS_POTION_POTENCY_2); break; case 3: - potencyString = L" "; + potencyString = " "; potencyString += gameServices().getString(IDS_POTION_POTENCY_3); break; default: @@ -309,7 +309,7 @@ void PotionItem::appendHoverText(std::shared_ptr itemInstance, } if (effect->getDuration() > SharedConstants::TICKS_PER_SECOND) { effectString += - L" (" + MobEffect::formatDuration(effect) + L")"; + " (" + MobEffect::formatDuration(effect) + ")"; } eMinecraftColour color = eMinecraftColour_NOT_SET; @@ -323,7 +323,7 @@ void PotionItem::appendHoverText(std::shared_ptr itemInstance, lines->push_back(HtmlString(effectString, color)); } } else { - std::wstring effectString = gameServices().getString( + std::string effectString = gameServices().getString( IDS_POTION_EMPTY); // I18n.get("potion.empty").trim(); lines->push_back(HtmlString(effectString, eHTMLColor_7)); //"�7" @@ -331,7 +331,7 @@ void PotionItem::appendHoverText(std::shared_ptr itemInstance, if (!modifiers.empty()) { // Add new line - lines->push_back(HtmlString(L"")); + lines->push_back(HtmlString("")); lines->push_back(HtmlString(gameServices().getString(IDS_POTION_EFFECTS_WHENDRANK), eHTMLColor_5)); @@ -384,7 +384,7 @@ void PotionItem::registerIcons(IconRegister* iconRegister) { iconOverlay = iconRegister->registerIcon(CONTENTS_ICON); } -Icon* PotionItem::getTexture(const std::wstring& name) { +Icon* PotionItem::getTexture(const std::string& name) { if (name.compare(DEFAULT_ICON) == 0) return Item::potion->iconDrinkable; if (name.compare(THROWABLE_ICON) == 0) return Item::potion->iconThrowable; if (name.compare(CONTENTS_ICON) == 0) return Item::potion->iconOverlay; diff --git a/targets/minecraft/world/item/PotionItem.h b/targets/minecraft/world/item/PotionItem.h index bd44ff360..619c22eb7 100644 --- a/targets/minecraft/world/item/PotionItem.h +++ b/targets/minecraft/world/item/PotionItem.h @@ -18,9 +18,9 @@ private: static const int DRINK_DURATION = (int)(20 * 1.6); public: - static const std::wstring DEFAULT_ICON; - static const std::wstring THROWABLE_ICON; - static const std::wstring CONTENTS_ICON; + static const std::string DEFAULT_ICON; + static const std::string THROWABLE_ICON; + static const std::string CONTENTS_ICON; private: std::unordered_map*> cachedMobEffects; @@ -56,7 +56,7 @@ public: virtual int getColor(std::shared_ptr item, int spriteLayer); virtual bool hasMultipleSpriteLayers(); virtual bool hasInstantenousEffects(int itemAuxValue); - virtual std::wstring getHoverName( + virtual std::string getHoverName( std::shared_ptr itemInstance); virtual void appendHoverText(std::shared_ptr itemInstance, std::shared_ptr player, @@ -68,7 +68,7 @@ public: //@Override void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); + static Icon* getTexture(const std::string& name); // 4J Stu - Based loosely on a function that gets added in java much later // on (1.3) diff --git a/targets/minecraft/world/item/Rarity.cpp b/targets/minecraft/world/item/Rarity.cpp index 72eebb11b..cf67f39b5 100644 --- a/targets/minecraft/world/item/Rarity.cpp +++ b/targets/minecraft/world/item/Rarity.cpp @@ -1,9 +1,9 @@ #include "Rarity.h" -const Rarity* Rarity::common = new Rarity(eHTMLColor_f, L"Common"); -const Rarity* Rarity::uncommon = new Rarity(eHTMLColor_e, L"Uncommon"); -const Rarity* Rarity::rare = new Rarity(eHTMLColor_b, L"Rare"); -const Rarity* Rarity::epic = new Rarity(eHTMLColor_d, L"Epic"); +const Rarity* Rarity::common = new Rarity(eHTMLColor_f, "Common"); +const Rarity* Rarity::uncommon = new Rarity(eHTMLColor_e, "Uncommon"); +const Rarity* Rarity::rare = new Rarity(eHTMLColor_b, "Rare"); +const Rarity* Rarity::epic = new Rarity(eHTMLColor_d, "Epic"); -Rarity::Rarity(eMinecraftColour color, const std::wstring& name) +Rarity::Rarity(eMinecraftColour color, const std::string& name) : color(color), name(name) {} \ No newline at end of file diff --git a/targets/minecraft/world/item/Rarity.h b/targets/minecraft/world/item/Rarity.h index 49b9d3750..711280114 100644 --- a/targets/minecraft/world/item/Rarity.h +++ b/targets/minecraft/world/item/Rarity.h @@ -12,7 +12,7 @@ public: static const Rarity* epic; const eMinecraftColour color; - const std::wstring name; + const std::string name; - Rarity(eMinecraftColour color, const std::wstring& name); + Rarity(eMinecraftColour color, const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/world/item/RecordingItem.cpp b/targets/minecraft/world/item/RecordingItem.cpp index 37fdd790a..fca7258c2 100644 --- a/targets/minecraft/world/item/RecordingItem.cpp +++ b/targets/minecraft/world/item/RecordingItem.cpp @@ -19,9 +19,9 @@ #include "minecraft/world/level/tile/LevelEvent.h" #include "minecraft/world/level/tile/Tile.h" -std::unordered_map RecordingItem::BY_NAME; +std::unordered_map RecordingItem::BY_NAME; -RecordingItem::RecordingItem(int id, const std::wstring& recording) +RecordingItem::RecordingItem(int id, const std::string& recording) : Item(id), recording(recording) { this->maxStackSize = 1; BY_NAME[recording] = this; @@ -59,8 +59,8 @@ void RecordingItem::appendHoverText(std::shared_ptr itemInstance, bool advanced) { eMinecraftColour color = getRarity(std::shared_ptr())->color; - wchar_t text[256]; - swprintf(text, 256, L"%ls %ls", L"C418 -", recording.c_str()); + char text[256]; + snprintf(text, 256, "%s %s", "C418 -", recording.c_str()); lines->push_back(HtmlString(text, color)); } @@ -71,10 +71,10 @@ const Rarity* RecordingItem::getRarity( } void RecordingItem::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"record_" + recording); + icon = iconRegister->registerIcon("record_" + recording); } -RecordingItem* RecordingItem::getByName(const std::wstring& name) { +RecordingItem* RecordingItem::getByName(const std::string& name) { auto it = BY_NAME.find(name); if (it != BY_NAME.end()) { return it->second; diff --git a/targets/minecraft/world/item/RecordingItem.h b/targets/minecraft/world/item/RecordingItem.h index 12f2a5421..1e72d300f 100644 --- a/targets/minecraft/world/item/RecordingItem.h +++ b/targets/minecraft/world/item/RecordingItem.h @@ -7,14 +7,14 @@ class RecordingItem : public Item { private: - static std::unordered_map BY_NAME; + static std::unordered_map BY_NAME; public: - const std::wstring recording; + const std::string recording; public : // 4J Stu - Was protected in Java, but the can't access it where we need - RecordingItem(int id, const std::wstring& recording); + RecordingItem(int id, const std::string& recording); Icon* getIcon(int auxValue); virtual bool useOn(std::shared_ptr itemInstance, @@ -28,5 +28,5 @@ public virtual const Rarity* getRarity(std::shared_ptr itemInstance); void registerIcons(IconRegister* iconRegister); - static RecordingItem* getByName(const std::wstring& name); + static RecordingItem* getByName(const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/world/item/SkullItem.cpp b/targets/minecraft/world/item/SkullItem.cpp index 6e9b8dba0..cf294fe60 100644 --- a/targets/minecraft/world/item/SkullItem.cpp +++ b/targets/minecraft/world/item/SkullItem.cpp @@ -19,8 +19,8 @@ const unsigned int SkullItem::NAMES[SKULL_COUNT] = { IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_WITHER, IDS_ITEM_SKULL_ZOMBIE, IDS_ITEM_SKULL_CHARACTER, IDS_ITEM_SKULL_CREEPER}; -std::wstring SkullItem::ICON_NAMES[SKULL_COUNT] = { - L"skeleton", L"wither", L"zombie", L"char", L"creeper"}; +std::string SkullItem::ICON_NAMES[SKULL_COUNT] = { + "skeleton", "wither", "zombie", "char", "creeper"}; SkullItem::SkullItem(int id) : Item(id) { // setItemCategory(CreativeModeTab.TAB_DECORATIONS); @@ -63,10 +63,10 @@ bool SkullItem::useOn( std::dynamic_pointer_cast(skullTE); if (skull != nullptr) { - std::wstring extra = L""; + std::string extra = ""; if (instance->hasTag() && - instance->getTag()->contains(L"SkullOwner")) { - extra = instance->getTag()->getString(L"SkullOwner"); + instance->getTag()->contains("SkullOwner")) { + extra = instance->getTag()->getString("SkullOwner"); } skull->setSkullType(instance->getAuxValue(), extra); skull->setRotation(rot); @@ -123,7 +123,7 @@ unsigned int SkullItem::getDescriptionId( return NAMES[auxValue]; } -std::wstring SkullItem::getHoverName( +std::string SkullItem::getHoverName( std::shared_ptr itemInstance) { { return Item::getHoverName(itemInstance); @@ -133,6 +133,6 @@ std::wstring SkullItem::getHoverName( void SkullItem::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < SKULL_COUNT; i++) { icons[i] = - iconRegister->registerIcon(getIconName() + L"_" + ICON_NAMES[i]); + iconRegister->registerIcon(getIconName() + "_" + ICON_NAMES[i]); } } \ No newline at end of file diff --git a/targets/minecraft/world/item/SkullItem.h b/targets/minecraft/world/item/SkullItem.h index 4cbf3f2cf..59d5033df 100644 --- a/targets/minecraft/world/item/SkullItem.h +++ b/targets/minecraft/world/item/SkullItem.h @@ -17,7 +17,7 @@ private: static const unsigned int NAMES[SKULL_COUNT]; public: - static std::wstring ICON_NAMES[SKULL_COUNT]; + static std::string ICON_NAMES[SKULL_COUNT]; private: Icon* icons[SKULL_COUNT]; @@ -36,6 +36,6 @@ public: int getLevelDataForAuxValue(int auxValue); virtual unsigned int getDescriptionId(int iData = -1); unsigned int getDescriptionId(std::shared_ptr instance); - std::wstring getHoverName(std::shared_ptr itemInstance); + std::string getHoverName(std::shared_ptr itemInstance); void registerIcons(IconRegister* iconRegister); }; \ No newline at end of file diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index 3e4dfda45..a4261b0d7 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -34,17 +34,17 @@ SpawnEggItem::SpawnEggItem(int id) : Item(id) { overlay = nullptr; } -std::wstring SpawnEggItem::getHoverName( +std::string SpawnEggItem::getHoverName( std::shared_ptr itemInstance) { - std::wstring elementName = getDescription(); + std::string elementName = getDescription(); int nameId = EntityIO::getNameId(itemInstance->getAuxValue()); if (nameId >= 0) { elementName = - replaceAll(elementName, L"{*CREATURE*}", gameServices().getString(nameId)); + replaceAll(elementName, "{*CREATURE*}", gameServices().getString(nameId)); // elementName += " " + I18n.get("entity." + encodeId + ".name"); } else { - elementName = replaceAll(elementName, L"{*CREATURE*}", L""); + elementName = replaceAll(elementName, "{*CREATURE*}", ""); } return elementName; @@ -325,7 +325,7 @@ std::shared_ptr SpawnEggItem::spawnMobAt(Level* level, int auxVal, void SpawnEggItem::registerIcons(IconRegister* iconRegister) { Item::registerIcons(iconRegister); - overlay = iconRegister->registerIcon(getIconName() + L"_overlay"); + overlay = iconRegister->registerIcon(getIconName() + "_overlay"); } void SpawnEggItem::DisplaySpawnError(std::shared_ptr player, diff --git a/targets/minecraft/world/item/SpawnEggItem.h b/targets/minecraft/world/item/SpawnEggItem.h index db9608607..cde2cc063 100644 --- a/targets/minecraft/world/item/SpawnEggItem.h +++ b/targets/minecraft/world/item/SpawnEggItem.h @@ -33,7 +33,7 @@ public: SpawnEggItem(int id); - virtual std::wstring getHoverName( + virtual std::string getHoverName( std::shared_ptr itemInstance); virtual int getColor(std::shared_ptr item, int spriteLayer); virtual bool hasMultipleSpriteLayers(); diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index 1a38548fd..12b042728 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -225,7 +225,7 @@ unsigned int TileItem::getUseDescriptionId() { } void TileItem::registerIcons(IconRegister* iconRegister) { - std::wstring iconName = Tile::tiles[tileId]->getTileItemIconName(); + std::string iconName = Tile::tiles[tileId]->getTileItemIconName(); if (!iconName.empty()) { itemIcon = iconRegister->registerIcon(iconName); } diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index d77fc3283..c98b2924d 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -54,43 +54,43 @@ const int PotionBrewing::DEFAULT_APPEARANCES[] = { * Therefore if bit 13 is on, don't use netherwart! * Added "&!13" which requires that bit 13 be turned off. */ -const std::wstring PotionBrewing::MOD_NETHERWART = L"+4&!13"; // L"+4" +const std::string PotionBrewing::MOD_NETHERWART = "+4&!13"; // "+4" #if _SIMPLIFIED_BREWING -const std::wstring PotionBrewing::MOD_WATER = L""; -const std::wstring PotionBrewing::MOD_SUGAR = L"-0+1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_GHASTTEARS = L"+0-1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_SPIDEREYE = L"-0-1+2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_FERMENTEDEYE = L"-0+3-4+13"; -const std::wstring PotionBrewing::MOD_SPECKLEDMELON = L"+0-1+2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_BLAZEPOWDER = L"+0-1-2+3&4-4+13"; -const std::wstring PotionBrewing::MOD_GOLDENCARROT = L"-0+1+2-3+13&4-4"; -const std::wstring PotionBrewing::MOD_MAGMACREAM = L"+0+1-2-3&4-4+13"; -const std::wstring PotionBrewing::MOD_REDSTONE = - L"-5+6-7"; // redstone increases duration -const std::wstring PotionBrewing::MOD_GLOWSTONE = - L"+5-6-7"; // glowstone increases amplification +const std::string PotionBrewing::MOD_WATER = ""; +const std::string PotionBrewing::MOD_SUGAR = "-0+1-2-3&4-4+13"; +const std::string PotionBrewing::MOD_GHASTTEARS = "+0-1-2-3&4-4+13"; +const std::string PotionBrewing::MOD_SPIDEREYE = "-0-1+2-3&4-4+13"; +const std::string PotionBrewing::MOD_FERMENTEDEYE = "-0+3-4+13"; +const std::string PotionBrewing::MOD_SPECKLEDMELON = "+0-1+2-3&4-4+13"; +const std::string PotionBrewing::MOD_BLAZEPOWDER = "+0-1-2+3&4-4+13"; +const std::string PotionBrewing::MOD_GOLDENCARROT = "-0+1+2-3+13&4-4"; +const std::string PotionBrewing::MOD_MAGMACREAM = "+0+1-2-3&4-4+13"; +const std::string PotionBrewing::MOD_REDSTONE = + "-5+6-7"; // redstone increases duration +const std::string PotionBrewing::MOD_GLOWSTONE = + "+5-6-7"; // glowstone increases amplification // 4J Stu - Don't require bit 13 to be set. We don't use it in the creative // menu. Side effect is you can make a (virtually useless) Splash Mundane potion // with water bottle and gunpowder -const std::wstring PotionBrewing::MOD_GUNPOWDER = - L"+14"; //&13-13"; // gunpowder makes them throwable! // gunpowder requires +const std::string PotionBrewing::MOD_GUNPOWDER = + "+14"; //&13-13"; // gunpowder makes them throwable! // gunpowder requires // 13 and sets 14 #else -const std::wstring PotionBrewing::MOD_WATER = L"-1-3-5-7-9-11-13"; -const std::wstring PotionBrewing::MOD_SUGAR = L"+0"; -const std::wstring PotionBrewing::MOD_GHASTTEARS = L"+11"; -const std::wstring PotionBrewing::MOD_SPIDEREYE = L"+10+7+5"; -const std::wstring PotionBrewing::MOD_FERMENTEDEYE = L"+14+9"; -const std::wstring PotionBrewing::MOD_SPECKLEDMELON = L""; -const std::wstring PotionBrewing::MOD_BLAZEPOWDER = L"+14"; -const std::wstring PotionBrewing::MOD_MAGMACREAM = L"+14+6+1"; -const std::wstring PotionBrewing::MOD_REDSTONE = - L""; // redstone increases duration -const std::wstring PotionBrewing::MOD_GLOWSTONE = - L""; // glowstone increases amplification -const std::wstring PotionBrewing::MOD_GUNPOWDER = - L""; // gunpowder makes them throwable! // gunpowder requires 13 and sets +const std::string PotionBrewing::MOD_WATER = "-1-3-5-7-9-11-13"; +const std::string PotionBrewing::MOD_SUGAR = "+0"; +const std::string PotionBrewing::MOD_GHASTTEARS = "+11"; +const std::string PotionBrewing::MOD_SPIDEREYE = "+10+7+5"; +const std::string PotionBrewing::MOD_FERMENTEDEYE = "+14+9"; +const std::string PotionBrewing::MOD_SPECKLEDMELON = ""; +const std::string PotionBrewing::MOD_BLAZEPOWDER = "+14"; +const std::string PotionBrewing::MOD_MAGMACREAM = "+14+6+1"; +const std::string PotionBrewing::MOD_REDSTONE = + ""; // redstone increases duration +const std::string PotionBrewing::MOD_GLOWSTONE = + ""; // glowstone increases amplification +const std::string PotionBrewing::MOD_GUNPOWDER = + ""; // gunpowder makes them throwable! // gunpowder requires 13 and sets // 14 #endif @@ -102,45 +102,45 @@ std::unordered_map PotionBrewing::cachedColors; void PotionBrewing::staticCtor() { #if _SIMPLIFIED_BREWING potionEffectDuration.insert(intStringMap::value_type( - MobEffect::regeneration->getId(), L"0 & !1 & !2 & !3 & 0+6")); + MobEffect::regeneration->getId(), "0 & !1 & !2 & !3 & 0+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::movementSpeed->getId(), L"!0 & 1 & !2 & !3 & 1+6")); + MobEffect::movementSpeed->getId(), "!0 & 1 & !2 & !3 & 1+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::fireResistance->getId(), L"0 & 1 & !2 & !3 & 0+6")); + MobEffect::fireResistance->getId(), "0 & 1 & !2 & !3 & 0+6")); potionEffectDuration.insert( - intStringMap::value_type(MobEffect::heal->getId(), L"0 & !1 & 2 & !3")); + intStringMap::value_type(MobEffect::heal->getId(), "0 & !1 & 2 & !3")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::poison->getId(), L"!0 & !1 & 2 & !3 & 2+6")); + MobEffect::poison->getId(), "!0 & !1 & 2 & !3 & 2+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::weakness->getId(), L"!0 & !1 & !2 & 3 & 3+6")); + MobEffect::weakness->getId(), "!0 & !1 & !2 & 3 & 3+6")); potionEffectDuration.insert( - intStringMap::value_type(MobEffect::harm->getId(), L"!0 & !1 & 2 & 3")); + intStringMap::value_type(MobEffect::harm->getId(), "!0 & !1 & 2 & 3")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::movementSlowdown->getId(), L"!0 & 1 & !2 & 3 & 3+6")); + MobEffect::movementSlowdown->getId(), "!0 & 1 & !2 & 3 & 3+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::damageBoost->getId(), L"0 & !1 & !2 & 3 & 3+6")); + MobEffect::damageBoost->getId(), "0 & !1 & !2 & 3 & 3+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::nightVision->getId(), L"!0 & 1 & 2 & !3 & 2+6")); + MobEffect::nightVision->getId(), "!0 & 1 & 2 & !3 & 2+6")); potionEffectDuration.insert(intStringMap::value_type( - MobEffect::invisibility->getId(), L"!0 & 1 & 2 & 3 & 2+6")); + MobEffect::invisibility->getId(), "!0 & 1 & 2 & 3 & 2+6")); // glowstone increases amplification potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::movementSpeed->getId(), L"5")); + intStringMap::value_type(MobEffect::movementSpeed->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::digSpeed->getId(), L"5")); + intStringMap::value_type(MobEffect::digSpeed->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::damageBoost->getId(), L"5")); + intStringMap::value_type(MobEffect::damageBoost->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::regeneration->getId(), L"5")); + intStringMap::value_type(MobEffect::regeneration->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::harm->getId(), L"5")); + intStringMap::value_type(MobEffect::harm->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::heal->getId(), L"5")); + intStringMap::value_type(MobEffect::heal->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::damageResistance->getId(), L"5")); + intStringMap::value_type(MobEffect::damageResistance->getId(), "5")); potionEffectAmplifier.insert( - intStringMap::value_type(MobEffect::poison->getId(), L"5")); + intStringMap::value_type(MobEffect::poison->getId(), "5")); #else potionEffectDuration.put(movementSpeed.getId(), "!10 & !4 & 5*2+0 & >1 | !7 & !4 & 5*2+0 & >1"); @@ -319,14 +319,14 @@ int PotionBrewing::countOnes(int brew) { #if _SIMPLIFIED_BREWING // 4J Stu - Trimmed this function to remove all the unused features for // simplified brewing -int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, +int PotionBrewing::parseEffectFormulaValue(const std::string& definition, int start, int end, int brew) { if (start >= definition.length() || end < 0 || start >= end) { return 0; } // split by and - int andIndex = (int)definition.find_first_of(L'&', start); + int andIndex = (int)definition.find_first_of('&', start); if (andIndex >= 0 && andIndex < end) { int leftSide = parseEffectFormulaValue(definition, start, andIndex - 1, brew); @@ -356,11 +356,11 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, int result = 0; for (int i = start; i < end; i++) { char current = definition.at(i); - if (current >= L'0' && current <= L'9') { + if (current >= '0' && current <= '9') { valuePart *= 10; - valuePart += (int)(current - L'0'); + valuePart += (int)(current - '0'); hasValue = true; - } else if (current == L'!') { + } else if (current == '!') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -370,7 +370,7 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, } isNot = true; - } else if (current == L'-') { + } else if (current == '-') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -380,7 +380,7 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, } isNeg = true; - } else if (current == L'+') { + } else if (current == '+') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -398,14 +398,14 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, return result; } #else -int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, +int PotionBrewing::parseEffectFormulaValue(const std::string& definition, int start, int end, int brew) { if (start >= definition.length() || end < 0 || start >= end) { return 0; } // split by or - int orIndex = definition.find_first_of(L'|', start); + int orIndex = definition.find_first_of('|', start); if (orIndex >= 0 && orIndex < end) { int leftSide = parseEffectFormulaValue(definition, start, orIndex - 1, brew); @@ -421,7 +421,7 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, return 0; } // split by and - int andIndex = definition.find_first_of(L'&', start); + int andIndex = definition.find_first_of('&', start); if (andIndex >= 0 && andIndex < end) { int leftSide = parseEffectFormulaValue(definition, start, andIndex - 1, brew); @@ -452,18 +452,18 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, int result = 0; for (int i = start; i < end; i++) { char current = definition.at(i); - if (current >= L'0' && current <= L'9') { + if (current >= '0' && current <= '9') { if (isMultiplier) { - multiplierPart = (int)(current - L'0'); + multiplierPart = (int)(current - '0'); hasMultiplier = true; } else { valuePart *= 10; - valuePart += (int)(current - L'0'); + valuePart += (int)(current - '0'); hasValue = true; } - } else if (current == L'*') { + } else if (current == '*') { isMultiplier = true; - } else if (current == L'!') { + } else if (current == '!') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -474,7 +474,7 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, } isNot = true; - } else if (current == L'-') { + } else if (current == '-') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -485,7 +485,7 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, } isNeg = true; - } else if (current == L'=' || current == L'<' || current == L'>') { + } else if (current == '=' || current == '<' || current == '>') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -495,14 +495,14 @@ int PotionBrewing::parseEffectFormulaValue(const std::wstring& definition, bitCount = NO_COUNT; } - if (current == L'=') { + if (current == '=') { bitCount = EQUAL_COUNT; - } else if (current == L'<') { + } else if (current == '<') { bitCount = LESS_COUNT; - } else if (current == L'>') { + } else if (current == '>') { bitCount = GREATER_COUNT; } - } else if (current == L'+') { + } else if (current == '+') { if (hasValue) { result += constructParsedValue(isNot, hasMultiplier, isNeg, bitCount, @@ -533,12 +533,12 @@ std::vector* PotionBrewing::getEffects( (effect->isDisabled() && !includeDisabledEffects)) { continue; } - // wstring durationString = potionEffectDuration.get(effect->getId()); + // string durationString = potionEffectDuration.get(effect->getId()); auto effIt = potionEffectDuration.find(effect->getId()); if (effIt == potionEffectDuration.end()) { continue; } - std::wstring durationString = effIt->second; + std::string durationString = effIt->second; int duration = parseEffectFormulaValue( durationString, 0, (int)durationString.length(), brew); @@ -546,7 +546,7 @@ std::vector* PotionBrewing::getEffects( int amplifier = 0; auto ampIt = potionEffectAmplifier.find(effect->getId()); if (ampIt != potionEffectAmplifier.end()) { - std::wstring amplifierString = ampIt->second; + std::string amplifierString = ampIt->second; amplifier = parseEffectFormulaValue( amplifierString, 0, (int)amplifierString.length(), brew); if (amplifier < 0) { @@ -687,7 +687,7 @@ int PotionBrewing::applyBrewBit(int currentBrew, int bit, bool isNeg, return currentBrew; } -int PotionBrewing::applyBrew(int currentBrew, const std::wstring& formula) { +int PotionBrewing::applyBrew(int currentBrew, const std::string& formula) { int start = 0; int end = (int)formula.length(); @@ -698,11 +698,11 @@ int PotionBrewing::applyBrew(int currentBrew, const std::wstring& formula) { int valuePart = 0; for (int i = start; i < end; i++) { char current = formula.at(i); - if (current >= L'0' && current <= L'9') { + if (current >= '0' && current <= '9') { valuePart *= 10; - valuePart += (int)(current - L'0'); + valuePart += (int)(current - '0'); hasValue = true; - } else if (current == L'!') { + } else if (current == '!') { if (hasValue) { currentBrew = applyBrewBit(currentBrew, valuePart, isNeg, isNot, isRequired); @@ -711,7 +711,7 @@ int PotionBrewing::applyBrew(int currentBrew, const std::wstring& formula) { } isNot = true; - } else if (current == L'-') { + } else if (current == '-') { if (hasValue) { currentBrew = applyBrewBit(currentBrew, valuePart, isNeg, isNot, isRequired); @@ -720,14 +720,14 @@ int PotionBrewing::applyBrew(int currentBrew, const std::wstring& formula) { } isNeg = true; - } else if (current == L'+') { + } else if (current == '+') { if (hasValue) { currentBrew = applyBrewBit(currentBrew, valuePart, isNeg, isNot, isRequired); hasValue = isNeg = isNot = isRequired = false; valuePart = 0; } - } else if (current == L'&') { + } else if (current == '&') { if (hasValue) { currentBrew = applyBrewBit(currentBrew, valuePart, isNeg, isNot, isRequired); @@ -763,15 +763,15 @@ int PotionBrewing::valueOf(int brew, int p1, int p2, int p3, int p4, int p5) { (isLit(brew, p5) ? 0x01 : 0); } -std::wstring PotionBrewing::toString(int brew) { - std::wstring string; +std::string PotionBrewing::toString(int brew) { + std::string string; int bit = NUM_BITS - 1; while (bit >= 0) { if ((brew & (1 << bit)) != 0) { - string.append(L"O"); + string.append("O"); } else { - string.append(L"x"); + string.append("x"); } bit--; } diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.h b/targets/minecraft/world/item/alchemy/PotionBrewing.h index bdf632784..546e83747 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.h +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.h @@ -25,19 +25,19 @@ public: static inline constexpr int THROWABLE_BIT = 14; static inline constexpr int THROWABLE_MASK = (1 << THROWABLE_BIT); - static const std::wstring MOD_WATER; - static const std::wstring MOD_SUGAR; - static const std::wstring MOD_GHASTTEARS; - static const std::wstring MOD_SPIDEREYE; - static const std::wstring MOD_FERMENTEDEYE; - static const std::wstring MOD_SPECKLEDMELON; - static const std::wstring MOD_BLAZEPOWDER; - static const std::wstring MOD_MAGMACREAM; - static const std::wstring MOD_REDSTONE; - static const std::wstring MOD_GLOWSTONE; - static const std::wstring MOD_NETHERWART; - static const std::wstring MOD_GUNPOWDER; - static const std::wstring MOD_GOLDENCARROT; + static const std::string MOD_WATER; + static const std::string MOD_SUGAR; + static const std::string MOD_GHASTTEARS; + static const std::string MOD_SPIDEREYE; + static const std::string MOD_FERMENTEDEYE; + static const std::string MOD_SPECKLEDMELON; + static const std::string MOD_BLAZEPOWDER; + static const std::string MOD_MAGMACREAM; + static const std::string MOD_REDSTONE; + static const std::string MOD_GLOWSTONE; + static const std::string MOD_NETHERWART; + static const std::string MOD_GUNPOWDER; + static const std::string MOD_GOLDENCARROT; static inline constexpr int BITS_FOR_MAX_NORMAL_EFFECT = 0xF; static inline constexpr int BITS_FOR_DURATION = (1 << 5); @@ -46,7 +46,7 @@ public: static inline constexpr int BITS_FOR_SPLASH = (1 << 14); private: - typedef std::unordered_map intStringMap; + typedef std::unordered_map intStringMap; static intStringMap potionEffectDuration; static intStringMap potionEffectAmplifier; @@ -98,7 +98,7 @@ private: int countCompare, int valuePart, int multiplierPart, int brew); static int countOnes(int brew); - static int parseEffectFormulaValue(const std::wstring& definition, + static int parseEffectFormulaValue(const std::string& definition, int start, int end, int brew); public: @@ -116,10 +116,10 @@ private: bool isRequired); public: - static int applyBrew(int currentBrew, const std::wstring& formula); + static int applyBrew(int currentBrew, const std::string& formula); static int setBit(int brew, int position, bool onOff); static int valueOf(int brew, int p1, int p2, int p3, int p4); static int valueOf(int brew, int p1, int p2, int p3, int p4, int p5); - static std::wstring toString(int brew); + static std::string toString(int brew); // static void main(String[] args); }; \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp index ac2effdd5..25488a652 100644 --- a/targets/minecraft/world/item/crafting/ArmorRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ArmorRecipes.cpp @@ -11,20 +11,20 @@ #include "minecraft/world/item/ItemInstance.h" // 4J-PB - adding "" on the end of these so we can detect it -std::wstring ArmorRecipes::shapes[][4] = { - {L"XXX", // - L"X X", L""}, // +std::string ArmorRecipes::shapes[][4] = { + {"XXX", // + "X X", ""}, // - {L"X X", // - L"XXX", // - L"XXX", L""}, // + {"X X", // + "XXX", // + "XXX", ""}, // - {L"XXX", // - L"X X", // - L"X X", L""}, // + {"XXX", // + "X X", // + "X X", ""}, // - {L"X X", // - L"X X", L""}, // + {"X X", // + "X X", ""}, // }; /* @@ -117,7 +117,7 @@ ArmorRecipes::_eArmorType ArmorRecipes::GetArmorType(int iId) { } void ArmorRecipes::addRecipes(Recipes* r) { - wchar_t wchTypes[5]; + char wchTypes[5]; wchTypes[4] = 0; for (unsigned int m = 0; m < map[0].size(); m++) { @@ -126,22 +126,22 @@ void ArmorRecipes::addRecipes(Recipes* r) { for (int t = 0; t < MAX_ARMOUR_RECIPES - 1; t++) { Item* target = map[t + 1].at(m)->item; - wchTypes[0] = L'w'; - wchTypes[1] = L'c'; - wchTypes[3] = L'g'; + wchTypes[0] = 'w'; + wchTypes[1] = 'c'; + wchTypes[3] = 'g'; if (pObjMaterial->GetType() == eType_TILE) { - wchTypes[2] = L't'; + wchTypes[2] = 't'; r->addShapedRecipy(new ItemInstance(target), wchTypes, shapes[t], - L'X', pObjMaterial->tile, L'A'); + 'X', pObjMaterial->tile, 'A'); } else { // must be Item - wchTypes[2] = L'i'; + wchTypes[2] = 'i'; r->addShapedRecipy(new ItemInstance(target), wchTypes, shapes[t], - L'X', pObjMaterial->item, L'A'); + 'X', pObjMaterial->item, 'A'); } } } diff --git a/targets/minecraft/world/item/crafting/ArmorRecipes.h b/targets/minecraft/world/item/crafting/ArmorRecipes.h index 6486b9432..8988a7c26 100644 --- a/targets/minecraft/world/item/crafting/ArmorRecipes.h +++ b/targets/minecraft/world/item/crafting/ArmorRecipes.h @@ -28,7 +28,7 @@ public: private: // 4J-PB - this wasn't static in java, so might not be right - static std::wstring shapes[][4]; + static std::string shapes[][4]; private: std::vector* map; diff --git a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp index 63359ab1b..45717de60 100644 --- a/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ClothDyeRecipes.cpp @@ -15,96 +15,96 @@ void ClothDyeRecipes::addRecipes(Recipes* r) { r->addShapelessRecipy( new ItemInstance(Tile::wool, 1, ColoredTile::getItemAuxValueForTileData(i)), // - L"zzg", new ItemInstance(Item::dye_powder, 1, i), - new ItemInstance(Item::items[Tile::wool_Id], 1, 0), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, i), + new ItemInstance(Item::items[Tile::wool_Id], 1, 0), 'D'); r->addShapedRecipy( new ItemInstance(Tile::clayHardened_colored, 8, ColoredTile::getItemAuxValueForTileData(i)), // - L"sssczczg", L"###", L"#X#", L"###", L'#', - new ItemInstance(Tile::clayHardened), L'X', - new ItemInstance(Item::dye_powder, 1, i), L'D'); + "sssczczg", "###", "#X#", "###", '#', + new ItemInstance(Tile::clayHardened), 'X', + new ItemInstance(Item::dye_powder, 1, i), 'D'); } // some dye recipes r->addShapelessRecipy( - new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), L"tg", - Tile::flower, L'D'); + new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), "tg", + Tile::flower, 'D'); r->addShapelessRecipy( - new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED), L"tg", - Tile::rose, L'D'); + new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED), "tg", + Tile::rose, 'D'); r->addShapelessRecipy( - new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE), L"ig", - Item::bone, L'D'); + new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE), "ig", + Item::bone, 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIME), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::GRAY), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::SILVER), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 3, DyePowderItem::SILVER), // - L"zzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), + "zzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::CYAN), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::PURPLE), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), // - L"zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK), L'D'); + "zzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE), + new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 3, DyePowderItem::MAGENTA), // - L"zzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), + "zzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK), L'D'); + new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK), 'D'); r->addShapelessRecipy( new ItemInstance(Item::dye_powder, 4, DyePowderItem::MAGENTA), // - L"zzzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), + "zzzzg", new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), L'D'); + new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), 'D'); for (int i = 0; i < 16; i++) { - r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i), L"sczg", - L"##", L'#', new ItemInstance(Tile::wool, 1, i), - L'D'); + r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i), "sczg", + "##", '#', new ItemInstance(Tile::wool, 1, i), + 'D'); } } diff --git a/targets/minecraft/world/item/crafting/FoodRecipes.cpp b/targets/minecraft/world/item/crafting/FoodRecipes.cpp index f072061c4..f4d3b0467 100644 --- a/targets/minecraft/world/item/crafting/FoodRecipes.cpp +++ b/targets/minecraft/world/item/crafting/FoodRecipes.cpp @@ -9,77 +9,77 @@ void FoodRecipies::addRecipes(Recipes* r) { // 4J-JEV: Bumped up in the list to avoid a colision with the title. r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 0), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // - L'#', Item::goldIngot, L'X', Item::apple, L'F'); + "ssscicig", + "###", // + "#X#", // + "###", // + '#', Item::goldIngot, 'X', Item::apple, 'F'); r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 1), // - L"sssctcig", - L"###", // - L"#X#", // - L"###", // - L'#', Tile::goldBlock, L'X', Item::apple, L'F'); + "sssctcig", + "###", // + "#X#", // + "###", // + '#', Tile::goldBlock, 'X', Item::apple, 'F'); r->addShapedRecipy(new ItemInstance(Item::speckledMelon, 1), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // + "ssscicig", + "###", // + "#X#", // + "###", // - L'#', Item::goldNugget, L'X', Item::melon, L'F'); + '#', Item::goldNugget, 'X', Item::melon, 'F'); - r->addShapelessRecipy(new ItemInstance(Item::mushroomStew), L"ttig", + r->addShapelessRecipy(new ItemInstance(Item::mushroomStew), "ttig", Tile::mushroom_brown, Tile::mushroom_red, Item::bowl, - L'F'); + 'F'); r->addShapedRecipy( new ItemInstance(Item::cookie, 8), // - L"sczcig", - L"#X#", // + "sczcig", + "#X#", // - L'X', new ItemInstance(Item::dye_powder, 1, DyePowderItem::BROWN), L'#', - Item::wheat, L'F'); + 'X', new ItemInstance(Item::dye_powder, 1, DyePowderItem::BROWN), '#', + Item::wheat, 'F'); r->addShapedRecipy(new ItemInstance(Tile::melon), // - L"ssscig", - L"MMM", // - L"MMM", // - L"MMM", // + "ssscig", + "MMM", // + "MMM", // + "MMM", // - L'M', Item::melon, L'F'); + 'M', Item::melon, 'F'); r->addShapedRecipy(new ItemInstance(Item::seeds_melon), // - L"scig", - L"M", // + "scig", + "M", // - L'M', Item::melon, L'F'); + 'M', Item::melon, 'F'); r->addShapedRecipy(new ItemInstance(Item::seeds_pumpkin, 4), // - L"sctg", - L"M", // + "sctg", + "M", // - L'M', Tile::pumpkin, L'F'); + 'M', Tile::pumpkin, 'F'); r->addShapelessRecipy(new ItemInstance(Item::pumpkinPie), // - L"tiig", Tile::pumpkin, Item::sugar, Item::egg, L'F'); + "tiig", Tile::pumpkin, Item::sugar, Item::egg, 'F'); r->addShapedRecipy(new ItemInstance(Item::carrotGolden, 1, 0), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // + "ssscicig", + "###", // + "#X#", // + "###", // - L'#', Item::goldNugget, L'X', Item::carrots, L'F'); + '#', Item::goldNugget, 'X', Item::carrots, 'F'); r->addShapelessRecipy(new ItemInstance(Item::fermentedSpiderEye), // - L"itig", Item::spiderEye, Tile::mushroom_brown, - Item::sugar, L'F'); + "itig", Item::spiderEye, Tile::mushroom_brown, + Item::sugar, 'F'); r->addShapelessRecipy(new ItemInstance(Item::blazePowder, 2), // - L"ig", Item::blazeRod, L'F'); + "ig", Item::blazeRod, 'F'); r->addShapelessRecipy(new ItemInstance(Item::magmaCream), // - L"iig", Item::blazePowder, Item::slimeBall, L'F'); + "iig", Item::blazePowder, Item::slimeBall, 'F'); } diff --git a/targets/minecraft/world/item/crafting/OreRecipes.cpp b/targets/minecraft/world/item/crafting/OreRecipes.cpp index ab3a9a14f..f28054436 100644 --- a/targets/minecraft/world/item/crafting/OreRecipes.cpp +++ b/targets/minecraft/world/item/crafting/OreRecipes.cpp @@ -38,17 +38,17 @@ void OreRecipies::addRecipes(Recipes* r) { Tile* from = (Tile*)map[i].at(0)->tile; ItemInstance* to = (ItemInstance*)map[i].at(1)->iteminstance; r->addShapedRecipy(new ItemInstance(from), // - L"sssczg", - L"###", // - L"###", // - L"###", // + "sssczg", + "###", // + "###", // + "###", // - L'#', to, L'D'); + '#', to, 'D'); r->addShapedRecipy(to, // - L"sctg", - L"#", // + "sctg", + "#", // - L'#', from, L'D'); + '#', from, 'D'); } } diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp index 5adee83b7..b8d432582 100644 --- a/targets/minecraft/world/item/crafting/Recipes.cpp +++ b/targets/minecraft/world/item/crafting/Recipes.cpp @@ -74,41 +74,41 @@ Recipes::Recipes() { pFireworksRecipes = new FireworksRecipe(); addShapedRecipy(new ItemInstance(Tile::wood, 4, 0), // - L"sczg", - L"#", // + "sczg", + "#", // - L'#', new ItemInstance(Tile::treeTrunk, 1, 0), L'S'); + '#', new ItemInstance(Tile::treeTrunk, 1, 0), 'S'); // TU9 - adding coloured wood addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::BIRCH_TRUNK), // - L"sczg", - L"#", // + "sczg", + "#", // - L'#', + '#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::BIRCH_TRUNK), - L'S'); + 'S'); addShapedRecipy( new ItemInstance(Tile::wood, 4, TreeTile::DARK_TRUNK), // - L"sczg", - L"#", // + "sczg", + "#", // - L'#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::DARK_TRUNK), L'S'); + '#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::DARK_TRUNK), 'S'); addShapedRecipy( new ItemInstance(Tile::wood, 4, TreeTile::JUNGLE_TRUNK), // - L"sczg", - L"#", // + "sczg", + "#", // - L'#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::JUNGLE_TRUNK), - L'S'); + '#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::JUNGLE_TRUNK), + 'S'); addShapedRecipy(new ItemInstance(Item::stick, 4), // - L"ssctg", - L"#", // - L"#", // + "ssctg", + "#", // + "#", // - L'#', Tile::wood, L'S'); + '#', Tile::wood, 'S'); pToolRecipies->addRecipes(this); pFoodRecipies->addRecipes(this); @@ -117,185 +117,185 @@ Recipes::Recipes() { // 4J-PB - changing the order to the way we want to have things in the // crafting menu bed addShapedRecipy(new ItemInstance(Item::bed, 1), // - L"ssctctg", - L"###", // - L"XXX", // - L'#', Tile::wool, L'X', Tile::wood, L'S'); + "ssctctg", + "###", // + "XXX", // + '#', Tile::wool, 'X', Tile::wood, 'S'); addShapedRecipy(new ItemInstance(Tile::enchantTable, 1), // - L"sssctcicig", - L" B ", // - L"D#D", // - L"###", // + "sssctcicig", + " B ", // + "D#D", // + "###", // - L'#', Tile::obsidian, L'B', Item::book, L'D', Item::diamond, - L'S'); + '#', Tile::obsidian, 'B', Item::book, 'D', Item::diamond, + 'S'); addShapedRecipy(new ItemInstance(Tile::anvil, 1), // - L"sssctcig", - L"III", // - L" i ", // - L"iii", // + "sssctcig", + "III", // + " i ", // + "iii", // - L'I', Tile::ironBlock, L'i', Item::ironIngot, L'S'); + 'I', Tile::ironBlock, 'i', Item::ironIngot, 'S'); // 4J Stu - Reordered for crafting menu addShapedRecipy(new ItemInstance(Tile::ladder, 3), // - L"ssscig", - L"# #", // - L"###", // - L"# #", // + "ssscig", + "# #", // + "###", // + "# #", // - L'#', Item::stick, L'S'); + '#', Item::stick, 'S'); addShapedRecipy(new ItemInstance(Tile::fenceGate, 1), // - L"sscictg", - L"#W#", // - L"#W#", // + "sscictg", + "#W#", // + "#W#", // - L'#', Item::stick, L'W', Tile::wood, L'S'); + '#', Item::stick, 'W', Tile::wood, 'S'); addShapedRecipy(new ItemInstance(Tile::fence, 2), // - L"sscig", - L"###", // - L"###", // + "sscig", + "###", // + "###", // - L'#', Item::stick, L'S'); + '#', Item::stick, 'S'); addShapedRecipy(new ItemInstance(Tile::netherFence, 6), // - L"ssctg", - L"###", // - L"###", // + "ssctg", + "###", // + "###", // - L'#', Tile::netherBrick, L'S'); + '#', Tile::netherBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::ironFence, 16), // - L"sscig", - L"###", // - L"###", // + "sscig", + "###", // + "###", // - L'#', Item::ironIngot, L'S'); + '#', Item::ironIngot, 'S'); addShapedRecipy( new ItemInstance(Tile::cobbleWall, 6, WallTile::TYPE_NORMAL), // - L"ssctg", - L"###", // - L"###", // + "ssctg", + "###", // + "###", // - L'#', Tile::cobblestone, L'S'); + '#', Tile::cobblestone, 'S'); addShapedRecipy( new ItemInstance(Tile::cobbleWall, 6, WallTile::TYPE_MOSSY), // - L"ssctg", - L"###", // - L"###", // + "ssctg", + "###", // + "###", // - L'#', Tile::mossyCobblestone, L'S'); + '#', Tile::mossyCobblestone, 'S'); addShapedRecipy(new ItemInstance(Item::door_wood, 1), // - L"sssctg", - L"##", // - L"##", // - L"##", // + "sssctg", + "##", // + "##", // + "##", // - L'#', Tile::wood, L'S'); + '#', Tile::wood, 'S'); addShapedRecipy(new ItemInstance(Item::door_iron, 1), // - L"ssscig", - L"##", // - L"##", // - L"##", // + "ssscig", + "##", // + "##", // + "##", // - L'#', Item::ironIngot, L'S'); + '#', Item::ironIngot, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_wood, 4), // - L"sssczg", - L"# ", // - L"## ", // - L"###", // + "sssczg", + "# ", // + "## ", // + "###", // - L'#', new ItemInstance(Tile::wood, 1, 0), L'S'); + '#', new ItemInstance(Tile::wood, 1, 0), 'S'); addShapedRecipy(new ItemInstance(Tile::trapdoor, 2), // - L"ssctg", - L"###", // - L"###", // + "ssctg", + "###", // + "###", // - L'#', Tile::wood, L'S'); + '#', Tile::wood, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_stone, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::cobblestone, L'S'); + '#', Tile::cobblestone, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_bricks, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::redBrick, L'S'); + '#', Tile::redBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_stoneBrickSmooth, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::cobblestone, L'S'); + '#', Tile::cobblestone, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_netherBricks, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::netherBrick, L'S'); + '#', Tile::netherBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_sandstone, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::sandStone, L'S'); + '#', Tile::sandStone, 'S'); addShapedRecipy( new ItemInstance(Tile::woodStairsBirch, 4), // - L"sssczg", - L"# ", // - L"## ", // - L"###", // + "sssczg", + "# ", // + "## ", // + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), 'S'); addShapedRecipy(new ItemInstance(Tile::woodStairsDark, 4), // - L"sssczg", - L"# ", // - L"## ", // - L"###", // + "sssczg", + "# ", // + "## ", // + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), - L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), + 'S'); addShapedRecipy( new ItemInstance(Tile::woodStairsJungle, 4), // - L"sssczg", - L"# ", // - L"## ", // - L"###", // + "sssczg", + "# ", // + "## ", // + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), 'S'); addShapedRecipy(new ItemInstance(Tile::stairs_quartz, 4), // - L"sssctg", - L"# ", // - L"## ", // - L"###", // + "sssctg", + "# ", // + "## ", // + "###", // - L'#', Tile::quartzBlock, L'S'); + '#', Tile::quartzBlock, 'S'); pArmorRecipes->addRecipes(this); // iCount=getRecipies()->size(); @@ -303,620 +303,620 @@ Recipes::Recipes() { pClothDyeRecipes->addRecipes(this); addShapedRecipy(new ItemInstance(Tile::snow, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::snowBall, L'S'); + '#', Item::snowBall, 'S'); addShapedRecipy(new ItemInstance(Tile::topSnow, 6), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::snow, L'S'); + '#', Tile::snow, 'S'); addShapedRecipy(new ItemInstance(Tile::clay, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::clay, L'S'); + '#', Item::clay, 'S'); addShapedRecipy(new ItemInstance(Tile::redBrick, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::brick, L'S'); + '#', Item::brick, 'S'); addShapedRecipy(new ItemInstance(Tile::wool, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::string, L'D'); + '#', Item::string, 'D'); addShapedRecipy(new ItemInstance(Tile::tnt, 1), // - L"ssscictg", - L"X#X", // - L"#X#", // - L"X#X", // + "ssscictg", + "X#X", // + "#X#", // + "X#X", // - L'X', Item::gunpowder, // - L'#', Tile::sand, L'T'); + 'X', Item::gunpowder, // + '#', Tile::sand, 'T'); addShapedRecipy( new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::SAND_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::sandStone, L'S'); + '#', Tile::sandStone, 'S'); addShapedRecipy( new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::STONE_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::stone, L'S'); + '#', Tile::stone, 'S'); addShapedRecipy(new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::COBBLESTONE_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::cobblestone, L'S'); + '#', Tile::cobblestone, 'S'); addShapedRecipy( new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::BRICK_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::redBrick, L'S'); + '#', Tile::redBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::SMOOTHBRICK_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::stoneBrick, L'S'); + '#', Tile::stoneBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::NETHERBRICK_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::netherBrick, L'S'); + '#', Tile::netherBrick, 'S'); addShapedRecipy(new ItemInstance(Tile::stoneSlabHalf, 6, StoneSlabTile::QUARTZ_SLAB), // - L"sctg", - L"###", // + "sctg", + "###", // - L'#', Tile::quartzBlock, L'S'); + '#', Tile::quartzBlock, 'S'); addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, 0), // - L"sczg", - L"###", // + "sczg", + "###", // - L'#', new ItemInstance(Tile::wood, 1, 0), L'S'); + '#', new ItemInstance(Tile::wood, 1, 0), 'S'); // TU9 - adding wood slabs addShapedRecipy( new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::BIRCH_TRUNK), // - L"sczg", - L"###", // + "sczg", + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), 'S'); addShapedRecipy( new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::DARK_TRUNK), // - L"sczg", - L"###", // + "sczg", + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), 'S'); addShapedRecipy( new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::JUNGLE_TRUNK), // - L"sczg", - L"###", // + "sczg", + "###", // - L'#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), L'S'); + '#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), 'S'); // iCount=getRecipies()->size(); addShapedRecipy(new ItemInstance(Item::cake, 1), // - L"ssscicicicig", - L"AAA", // - L"BEB", // - L"CCC", // + "ssscicicicig", + "AAA", // + "BEB", // + "CCC", // - L'A', Item::bucket_milk, // - L'B', Item::sugar, // - L'C', Item::wheat, L'E', Item::egg, L'F'); + 'A', Item::bucket_milk, // + 'B', Item::sugar, // + 'C', Item::wheat, 'E', Item::egg, 'F'); addShapedRecipy(new ItemInstance(Item::sugar, 1), // - L"scig", - L"#", // + "scig", + "#", // - L'#', Item::reeds, L'F'); + '#', Item::reeds, 'F'); addShapedRecipy(new ItemInstance(Tile::rail, 16), // - L"ssscicig", - L"X X", // - L"X#X", // - L"X X", // + "ssscicig", + "X X", // + "X#X", // + "X X", // - L'X', Item::ironIngot, // - L'#', Item::stick, L'V'); + 'X', Item::ironIngot, // + '#', Item::stick, 'V'); addShapedRecipy(new ItemInstance(Tile::goldenRail, 6), // - L"ssscicicig", - L"X X", // - L"X#X", // - L"XRX", // + "ssscicicig", + "X X", // + "X#X", // + "XRX", // - L'X', Item::goldIngot, // - L'R', Item::redStone, // - L'#', Item::stick, L'V'); + 'X', Item::goldIngot, // + 'R', Item::redStone, // + '#', Item::stick, 'V'); addShapedRecipy(new ItemInstance(Tile::activatorRail, 6), // - L"ssscictcig", - L"XSX", // - L"X#X", // - L"XSX", // + "ssscictcig", + "XSX", // + "X#X", // + "XSX", // - L'X', Item::ironIngot, // - L'#', Tile::redstoneTorch_on, // - L'S', Item::stick, L'V'); + 'X', Item::ironIngot, // + '#', Tile::redstoneTorch_on, // + 'S', Item::stick, 'V'); addShapedRecipy(new ItemInstance(Tile::detectorRail, 6), // - L"ssscicictg", - L"X X", // - L"X#X", // - L"XRX", // + "ssscicictg", + "X X", // + "X#X", // + "XRX", // - L'X', Item::ironIngot, // - L'R', Item::redStone, // - L'#', Tile::pressurePlate_stone, L'V'); + 'X', Item::ironIngot, // + 'R', Item::redStone, // + '#', Tile::pressurePlate_stone, 'V'); addShapedRecipy(new ItemInstance(Item::minecart, 1), // - L"sscig", - L"# #", // - L"###", // + "sscig", + "# #", // + "###", // - L'#', Item::ironIngot, L'V'); + '#', Item::ironIngot, 'V'); addShapedRecipy(new ItemInstance(Item::minecart_chest, 1), // - L"ssctcig", - L"A", // - L"B", // + "ssctcig", + "A", // + "B", // - L'A', Tile::chest, L'B', Item::minecart, L'V'); + 'A', Tile::chest, 'B', Item::minecart, 'V'); addShapedRecipy(new ItemInstance(Item::minecart_furnace, 1), // - L"ssctcig", - L"A", // - L"B", // + "ssctcig", + "A", // + "B", // - L'A', Tile::furnace, L'B', Item::minecart, L'V'); + 'A', Tile::furnace, 'B', Item::minecart, 'V'); addShapedRecipy(new ItemInstance(Item::minecart_tnt, 1), // - L"ssctcig", - L"A", // - L"B", // + "ssctcig", + "A", // + "B", // - L'A', Tile::tnt, L'B', Item::minecart, L'V'); + 'A', Tile::tnt, 'B', Item::minecart, 'V'); addShapedRecipy(new ItemInstance(Item::minecart_hopper, 1), // - L"ssctcig", - L"A", // - L"B", // + "ssctcig", + "A", // + "B", // - L'A', Tile::hopper, L'B', Item::minecart, L'V'); + 'A', Tile::hopper, 'B', Item::minecart, 'V'); addShapedRecipy(new ItemInstance(Item::boat, 1), // - L"ssctg", - L"# #", // - L"###", // + "ssctg", + "# #", // + "###", // - L'#', Tile::wood, L'V'); + '#', Tile::wood, 'V'); addShapedRecipy(new ItemInstance((Item*)Item::fishingRod, 1), // - L"ssscicig", - L" #", // - L" #X", // - L"# X", // + "ssscicig", + " #", // + " #X", // + "# X", // - L'#', Item::stick, L'X', Item::string, L'T'); + '#', Item::stick, 'X', Item::string, 'T'); addShapedRecipy(new ItemInstance(Item::carrotOnAStick, 1), // - L"sscicig", - L"# ", // - L" X", // + "sscicig", + "# ", // + " X", // - L'#', Item::fishingRod, L'X', Item::carrots, L'T') + '#', Item::fishingRod, 'X', Item::carrots, 'T') ->keepTag(); addShapedRecipy(new ItemInstance(Item::flintAndSteel, 1), // - L"sscicig", - L"A ", // - L" B", // + "sscicig", + "A ", // + " B", // - L'A', Item::ironIngot, L'B', Item::flint, L'T'); + 'A', Item::ironIngot, 'B', Item::flint, 'T'); addShapedRecipy(new ItemInstance(Item::bread, 1), // - L"scig", - L"###", // + "scig", + "###", // - L'#', Item::wheat, L'F'); + '#', Item::wheat, 'F'); // Moved bow and arrow in from weapons to avoid stacking on the group name // display addShapedRecipy(new ItemInstance((Item*)Item::bow, 1), // - L"ssscicig", - L" #X", // - L"# X", // - L" #X", // + "ssscicig", + " #X", // + "# X", // + " #X", // - L'X', Item::string, // - L'#', Item::stick, L'T'); + 'X', Item::string, // + '#', Item::stick, 'T'); addShapedRecipy(new ItemInstance(Item::arrow, 4), // - L"ssscicicig", - L"X", // - L"#", // - L"Y", // + "ssscicicig", + "X", // + "#", // + "Y", // - L'Y', Item::feather, // - L'X', Item::flint, // - L'#', Item::stick, L'T'); + 'Y', Item::feather, // + 'X', Item::flint, // + '#', Item::stick, 'T'); pWeaponRecipies->addRecipes(this); addShapedRecipy(new ItemInstance(Item::bucket_empty, 1), // - L"sscig", - L"# #", // - L" # ", // + "sscig", + "# #", // + " # ", // - L'#', Item::ironIngot, L'T'); + '#', Item::ironIngot, 'T'); addShapedRecipy(new ItemInstance(Item::bowl, 4), // - L"ssctg", - L"# #", // - L" # ", // + "ssctg", + "# #", // + " # ", // - L'#', Tile::wood, L'T'); + '#', Tile::wood, 'T'); addShapedRecipy(new ItemInstance(Item::glassBottle, 3), // - L"ssctg", - L"# #", // - L" # ", // + "ssctg", + "# #", // + " # ", // - L'#', Tile::glass, L'T'); + '#', Tile::glass, 'T'); addShapedRecipy(new ItemInstance(Item::flowerPot, 1), // - L"sscig", - L"# #", // - L" # ", // + "sscig", + "# #", // + " # ", // - L'#', Item::brick, L'D'); + '#', Item::brick, 'D'); // torch made of charcoal - moved to be the default due to the tutorial // using it addShapedRecipy(new ItemInstance(Tile::torch, 4), // - L"ssczcig", - L"X", // - L"#", // + "ssczcig", + "X", // + "#", // - L'X', + 'X', new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), // - L'#', Item::stick, L'T'); + '#', Item::stick, 'T'); addShapedRecipy(new ItemInstance(Tile::torch, 4), // - L"ssczcig", - L"X", // - L"#", // - L'X', + "ssczcig", + "X", // + "#", // + 'X', new ItemInstance(Item::coal, 1, CoalItem::STONE_COAL), // - L'#', Item::stick, L'T'); + '#', Item::stick, 'T'); addShapedRecipy(new ItemInstance(Tile::glowstone, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::yellowDust, L'T'); + '#', Item::yellowDust, 'T'); addShapedRecipy(new ItemInstance(Tile::quartzBlock, 1), // - L"sscig", - L"##", // - L"##", // + "sscig", + "##", // + "##", // - L'#', Item::netherQuartz, L'S'); + '#', Item::netherQuartz, 'S'); addShapedRecipy(new ItemInstance(Tile::lever, 1), // - L"ssctcig", - L"X", // - L"#", // + "ssctcig", + "X", // + "#", // - L'#', Tile::cobblestone, L'X', Item::stick, L'M'); + '#', Tile::cobblestone, 'X', Item::stick, 'M'); addShapedRecipy(new ItemInstance(Tile::tripWireSource, 2), // - L"sssctcicig", - L"I", // - L"S", // - L"#", // + "sssctcicig", + "I", // + "S", // + "#", // - L'#', Tile::wood, L'S', Item::stick, L'I', Item::ironIngot, - L'M'); + '#', Tile::wood, 'S', Item::stick, 'I', Item::ironIngot, + 'M'); addShapedRecipy(new ItemInstance(Tile::redstoneTorch_on, 1), // - L"sscicig", - L"X", // - L"#", // + "sscicig", + "X", // + "#", // - L'#', Item::stick, L'X', Item::redStone, L'M'); + '#', Item::stick, 'X', Item::redStone, 'M'); addShapedRecipy(new ItemInstance(Item::repeater, 1), // - L"ssctcictg", - L"#X#", // - L"III", // + "ssctcictg", + "#X#", // + "III", // - L'#', Tile::redstoneTorch_on, L'X', Item::redStone, L'I', - Tile::stone, L'M'); + '#', Tile::redstoneTorch_on, 'X', Item::redStone, 'I', + Tile::stone, 'M'); addShapedRecipy(new ItemInstance(Item::comparator, 1), // - L"sssctcictg", - L" # ", // - L"#X#", // - L"III", // + "sssctcictg", + " # ", // + "#X#", // + "III", // - L'#', Tile::redstoneTorch_on, L'X', Item::netherQuartz, - L'I', Tile::stone, L'M'); + '#', Tile::redstoneTorch_on, 'X', Item::netherQuartz, + 'I', Tile::stone, 'M'); - addShapedRecipy(new ItemInstance(Tile::daylightDetector), L"sssctcictg", - L"GGG", L"QQQ", L"WWW", + addShapedRecipy(new ItemInstance(Tile::daylightDetector), "sssctcictg", + "GGG", "QQQ", "WWW", - L'G', Tile::glass, L'Q', Item::netherQuartz, L'W', - Tile::woodSlabHalf, L'M'); + 'G', Tile::glass, 'Q', Item::netherQuartz, 'W', + Tile::woodSlabHalf, 'M'); - addShapedRecipy(new ItemInstance(Tile::hopper), L"ssscictg", - L"I I", // - L"ICI", // - L" I ", // + addShapedRecipy(new ItemInstance(Tile::hopper), "ssscictg", + "I I", // + "ICI", // + " I ", // - L'I', Item::ironIngot, L'C', Tile::chest, L'M'); + 'I', Item::ironIngot, 'C', Tile::chest, 'M'); addShapedRecipy(new ItemInstance(Item::clock, 1), // - L"ssscicig", - L" # ", // - L"#X#", // - L" # ", // - L'#', Item::goldIngot, L'X', Item::redStone, L'T'); + "ssscicig", + " # ", // + "#X#", // + " # ", // + '#', Item::goldIngot, 'X', Item::redStone, 'T'); addShapelessRecipy(new ItemInstance(Item::eyeOfEnder, 1), // - L"iig", Item::enderPearl, Item::blazePowder, L'T'); + "iig", Item::enderPearl, Item::blazePowder, 'T'); addShapelessRecipy(new ItemInstance(Item::fireball, 3), // - L"iiig", Item::gunpowder, Item::blazePowder, Item::coal, - L'T'); + "iiig", Item::gunpowder, Item::blazePowder, Item::coal, + 'T'); addShapelessRecipy(new ItemInstance(Item::fireball, 3), // - L"iizg", Item::gunpowder, Item::blazePowder, + "iizg", Item::gunpowder, Item::blazePowder, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), - L'T'); + 'T'); addShapedRecipy(new ItemInstance(Item::lead, 2), // - L"ssscicig", - L"~~ ", // - L"~O ", // - L" ~", // + "ssscicig", + "~~ ", // + "~O ", // + " ~", // - L'~', Item::string, L'O', Item::slimeBall, L'T'); + '~', Item::string, 'O', Item::slimeBall, 'T'); addShapedRecipy(new ItemInstance(Item::compass, 1), // - L"ssscicig", - L" # ", // - L"#X#", // - L" # ", // + "ssscicig", + " # ", // + "#X#", // + " # ", // - L'#', Item::ironIngot, L'X', Item::redStone, L'T'); + '#', Item::ironIngot, 'X', Item::redStone, 'T'); addShapedRecipy(new ItemInstance(Item::map, 1), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // + "ssscicig", + "###", // + "#X#", // + "###", // - L'#', Item::paper, L'X', Item::compass, L'T'); + '#', Item::paper, 'X', Item::compass, 'T'); addShapedRecipy(new ItemInstance(Tile::button, 1), // - L"sctg", - L"#", // + "sctg", + "#", // - L'#', Tile::stone, L'M'); + '#', Tile::stone, 'M'); addShapedRecipy(new ItemInstance(Tile::button_wood, 1), // - L"sctg", - L"#", // + "sctg", + "#", // - L'#', Tile::wood, L'M'); + '#', Tile::wood, 'M'); addShapedRecipy(new ItemInstance(Tile::pressurePlate_wood, 1), // - L"sctg", - L"##", // - L'#', Tile::wood, L'M'); + "sctg", + "##", // + '#', Tile::wood, 'M'); addShapedRecipy(new ItemInstance(Tile::pressurePlate_stone, 1), // - L"sctg", - L"##", // - L'#', Tile::stone, L'M'); + "sctg", + "##", // + '#', Tile::stone, 'M'); addShapedRecipy(new ItemInstance(Tile::weightedPlate_heavy, 1), // - L"scig", - L"##", // + "scig", + "##", // - L'#', Item::ironIngot, L'M'); + '#', Item::ironIngot, 'M'); addShapedRecipy(new ItemInstance(Tile::weightedPlate_light, 1), // - L"scig", - L"##", // + "scig", + "##", // - L'#', Item::goldIngot, L'M'); + '#', Item::goldIngot, 'M'); addShapedRecipy(new ItemInstance(Tile::dispenser, 1), // - L"sssctcicig", - L"###", // - L"#X#", // - L"#R#", // - L'#', Tile::cobblestone, L'X', Item::bow, L'R', - Item::redStone, L'M'); + "sssctcicig", + "###", // + "#X#", // + "#R#", // + '#', Tile::cobblestone, 'X', Item::bow, 'R', + Item::redStone, 'M'); addShapedRecipy(new ItemInstance(Tile::dropper, 1), // - L"sssctcig", - L"###", // - L"# #", // - L"#R#", // + "sssctcig", + "###", // + "# #", // + "#R#", // - L'#', Tile::cobblestone, L'R', Item::redStone, L'M'); + '#', Tile::cobblestone, 'R', Item::redStone, 'M'); addShapedRecipy(new ItemInstance(Item::cauldron, 1), // - L"ssscig", - L"# #", // - L"# #", // - L"###", // + "ssscig", + "# #", // + "# #", // + "###", // - L'#', Item::ironIngot, L'T'); + '#', Item::ironIngot, 'T'); addShapedRecipy(new ItemInstance(Item::brewingStand, 1), // - L"ssctcig", - L" B ", // - L"###", // + "ssctcig", + " B ", // + "###", // - L'#', Tile::cobblestone, L'B', Item::blazeRod, L'S'); + '#', Tile::cobblestone, 'B', Item::blazeRod, 'S'); addShapedRecipy(new ItemInstance(Tile::litPumpkin, 1), // - L"ssctctg", - L"A", // - L"B", // + "ssctctg", + "A", // + "B", // - L'A', Tile::pumpkin, L'B', Tile::torch, L'T'); + 'A', Tile::pumpkin, 'B', Tile::torch, 'T'); addShapedRecipy(new ItemInstance(Tile::jukebox, 1), // - L"sssctcig", - L"###", // - L"#X#", // - L"###", // + "sssctcig", + "###", // + "#X#", // + "###", // - L'#', Tile::wood, L'X', Item::diamond, 'D'); + '#', Tile::wood, 'X', Item::diamond, 'D'); addShapedRecipy(new ItemInstance(Item::paper, 3), // - L"scig", - L"###", // + "scig", + "###", // - L'#', Item::reeds, L'D'); + '#', Item::reeds, 'D'); - addShapelessRecipy(new ItemInstance(Item::book, 1), L"iiiig", Item::paper, - Item::paper, Item::paper, Item::leather, L'D'); + addShapelessRecipy(new ItemInstance(Item::book, 1), "iiiig", Item::paper, + Item::paper, Item::paper, Item::leather, 'D'); // addShapelessRecipy(new ItemInstance(Item.writingBook, 1), // // Item.book, new ItemInstance(Item.dye_powder, 1, // DyePowderItem.BLACK), Item.feather); addShapedRecipy(new ItemInstance(Tile::noteblock, 1), // - L"sssctcig", - L"###", // - L"#X#", // - L"###", // + "sssctcig", + "###", // + "#X#", // + "###", // - L'#', Tile::wood, L'X', Item::redStone, L'M'); + '#', Tile::wood, 'X', Item::redStone, 'M'); addShapedRecipy(new ItemInstance(Tile::bookshelf, 1), // - L"sssctcig", - L"###", // - L"XXX", // - L"###", // + "sssctcig", + "###", // + "XXX", // + "###", // - L'#', Tile::wood, L'X', Item::book, L'D'); + '#', Tile::wood, 'X', Item::book, 'D'); addShapedRecipy(new ItemInstance(Item::painting, 1), // - L"ssscictg", - L"###", // - L"#X#", // - L"###", // + "ssscictg", + "###", // + "#X#", // + "###", // - L'#', Item::stick, L'X', Tile::wool, L'D'); + '#', Item::stick, 'X', Tile::wool, 'D'); addShapedRecipy(new ItemInstance(Item::frame, 1), // - L"ssscicig", - L"###", // - L"#X#", // - L"###", // + "ssscicig", + "###", // + "#X#", // + "###", // - L'#', Item::stick, L'X', Item::leather, L'D'); + '#', Item::stick, 'X', Item::leather, 'D'); pOreRecipies->addRecipes(this); addShapedRecipy(new ItemInstance(Item::goldIngot), // - L"ssscig", - L"###", // - L"###", // - L"###", // + "ssscig", + "###", // + "###", // + "###", // - L'#', Item::goldNugget, L'D'); + '#', Item::goldNugget, 'D'); addShapedRecipy(new ItemInstance(Item::goldNugget, 9), // - L"scig", - L"#", // - L'#', Item::goldIngot, L'D'); + "scig", + "#", // + '#', Item::goldIngot, 'D'); // 4J-PB - moving into decorations to make the structures list smaller addShapedRecipy(new ItemInstance(Item::sign, 3), // - L"sssctcig", - L"###", // - L"###", // - L" X ", // + "sssctcig", + "###", // + "###", // + " X ", // - L'#', Tile::wood, L'X', Item::stick, L'D'); + '#', Tile::wood, 'X', Item::stick, 'D'); // 4J - TODO - put these new 1.7.3 items in required place within recipes addShapedRecipy(new ItemInstance((Tile*)Tile::pistonBase, 1), // - L"sssctcicictg", - L"TTT", // - L"#X#", // - L"#R#", // + "sssctcicictg", + "TTT", // + "#X#", // + "#R#", // - L'#', Tile::cobblestone, L'X', Item::ironIngot, L'R', - Item::redStone, L'T', Tile::wood, L'M'); + '#', Tile::cobblestone, 'X', Item::ironIngot, 'R', + Item::redStone, 'T', Tile::wood, 'M'); addShapedRecipy(new ItemInstance((Tile*)Tile::pistonStickyBase, 1), // - L"sscictg", - L"S", // - L"P", // + "sscictg", + "S", // + "P", // - L'S', Item::slimeBall, L'P', Tile::pistonBase, L'M'); + 'S', Item::slimeBall, 'P', Tile::pistonBase, 'M'); // 4J Stu - Added some dummy firework recipes to allow us to navigate // forward to the fireworks scene addShapedRecipy(new ItemInstance(Item::fireworks, 1), // - L"sscicig", - L" P ", // - L" G ", // + "sscicig", + " P ", // + " G ", // - L'P', Item::paper, L'G', Item::gunpowder, L'D'); + 'P', Item::paper, 'G', Item::gunpowder, 'D'); addShapedRecipy(new ItemInstance(Item::fireworksCharge, 1), // - L"sscicig", - L" D ", // - L" G ", // + "sscicig", + " D ", // + " G ", // - L'D', Item::dye_powder, L'G', Item::gunpowder, L'D'); + 'D', Item::dye_powder, 'G', Item::gunpowder, 'D'); addShapedRecipy(new ItemInstance(Item::fireworksCharge, 1), // - L"sscicig", - L" D ", // - L" C ", // + "sscicig", + " D ", // + " C ", // - L'D', Item::dye_powder, L'C', Item::fireworksCharge, L'D'); + 'D', Item::dye_powder, 'C', Item::fireworksCharge, 'D'); // Sort so the largest recipes get checked first! /* 4J-PB - TODO @@ -944,7 +944,7 @@ Recipes::Recipes() { }); */ - // 4J-PB removed System.out.println(recipies->size() + L" recipes"); + // 4J-PB removed System.out.println(recipies->size() + " recipes"); // 4J-PB - build the array of ingredients required per recipe buildRecipeIngredientsArray(); @@ -953,24 +953,24 @@ Recipes::Recipes() { // 4J-PB - this function has been substantially changed due to the differences // with a va_list of classes in C++ and Java ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { - std::wstring map = L""; + std::string map = ""; int p = 0; int width = 0; int height = 0; int group = ShapedRecipy::eGroupType_Decoration; va_list vl; - wchar_t* wchTypes; - wchar_t* pwchString; - std::wstring wString; - std::wstring* wStringA; + char* wchTypes; + char* pwchString; + std::string wString; + std::string* wStringA; ItemInstance* pItemInstance; Tile* pTile; Item* pItem; - wchar_t wchFrom; + char wchFrom; int iCount; ItemInstance** ids = nullptr; - myMap* mappings = new std::unordered_map(); + myMap* mappings = new std::unordered_map(); va_start(vl, result); // 4J-PB - second argument is a list of the types @@ -984,30 +984,30 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { // g - group [wt] - which group does the item created by the recipe belong // in. Set a default until all recipes have a group - wchTypes = va_arg(vl, wchar_t*); + wchTypes = va_arg(vl, char*); - for (int i = 0; wchTypes[i] != L'\0'; ++i) { - if (wchTypes[i + 1] == L'\0' && wchTypes[i] != L'g') { + for (int i = 0; wchTypes[i] != '\0'; ++i) { + if (wchTypes[i + 1] == '\0' && wchTypes[i] != 'g') { Log::info("Missing group type\n"); } switch (wchTypes[i]) { - case L'a': - pwchString = va_arg(vl, wchar_t*); + case 'a': + pwchString = va_arg(vl, char*); wString = pwchString; height++; width = (int)wString.length(); map += wString; break; - case L's': - pwchString = va_arg(vl, wchar_t*); + case 's': + pwchString = va_arg(vl, char*); wString = pwchString; height++; width = (int)wString.length(); map += wString; break; - case L'w': - wStringA = va_arg(vl, std::wstring*); + case 'w': + wStringA = va_arg(vl, std::string*); iCount = 0; do { wString = wStringA[iCount++]; @@ -1019,48 +1019,48 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { } while (!wString.empty()); break; - case L'c': - wchFrom = (wchar_t)va_arg(vl, int); + case 'c': + wchFrom = (char)va_arg(vl, int); break; - case L'z': + case 'z': pItemInstance = va_arg(vl, ItemInstance*); mappings->insert(myMap::value_type(wchFrom, pItemInstance)); break; - case L'i': + case 'i': pItem = va_arg(vl, Item*); pItemInstance = new ItemInstance(pItem, 1, ANY_AUX_VALUE); mappings->insert(myMap::value_type(wchFrom, pItemInstance)); break; - case L't': + case 't': pTile = va_arg(vl, Tile*); pItemInstance = new ItemInstance(pTile, 1, ANY_AUX_VALUE); mappings->insert(myMap::value_type(wchFrom, pItemInstance)); break; - case L'g': - wchFrom = (wchar_t)va_arg(vl, int); + case 'g': + wchFrom = (char)va_arg(vl, int); switch (wchFrom) { - // case L'W': + // case 'W': // group=ShapedRecipy::eGroupType_Weapon; // break; - case L'T': + case 'T': group = ShapedRecipy::eGroupType_Tool; break; - case L'A': + case 'A': group = ShapedRecipy::eGroupType_Armour; break; - case L'S': + case 'S': group = ShapedRecipy::eGroupType_Structure; break; - case L'V': + case 'V': group = ShapedRecipy::eGroupType_Transport; break; - case L'M': + case 'M': group = ShapedRecipy::eGroupType_Mechanism; break; - case L'F': + case 'F': group = ShapedRecipy::eGroupType_Food; break; - case L'D': + case 'D': default: group = ShapedRecipy::eGroupType_Decoration; break; @@ -1071,7 +1071,7 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { ids = new ItemInstance*[width * height]; for (int j = 0; j < width * height; j++) { - wchar_t ch = map[j]; + char ch = map[j]; myMap::iterator it = mappings->find(ch); if (it != mappings->end()) { ids[j] = it->second; @@ -1090,13 +1090,13 @@ ShapedRecipy* Recipes::addShapedRecipy(ItemInstance* result, ...) { void Recipes::addShapelessRecipy(ItemInstance* result, ...) { va_list vl; - wchar_t* szTypes; - std::wstring String; + char* szTypes; + std::string String; ItemInstance* pItemInstance; Tile* pTile; Item* pItem; Recipy::_eGroupType group = Recipy::eGroupType_Decoration; - wchar_t wchFrom; + char wchFrom; std::vector* ingredients = new std::vector(); va_start(vl, result); @@ -1104,48 +1104,48 @@ void Recipes::addShapelessRecipy(ItemInstance* result, ...) { // z - ItemInstance * // i - Item * // t - Tile * - szTypes = va_arg(vl, wchar_t*); + szTypes = va_arg(vl, char*); - for (int i = 0; szTypes[i] != L'\0'; ++i) { + for (int i = 0; szTypes[i] != '\0'; ++i) { switch (szTypes[i]) { - case L'z': + case 'z': pItemInstance = va_arg(vl, ItemInstance*); // 4J-PB - original code copies the item instance, copy the // pointer isnt the same... // TODO ingredients->push_back(pItemInstance->copy_not_shared()); break; - case L'i': + case 'i': pItem = va_arg(vl, Item*); pItemInstance = new ItemInstance(pItem); ingredients->push_back(pItemInstance); break; - case L't': + case 't': pTile = va_arg(vl, Tile*); ingredients->push_back(new ItemInstance(pTile)); break; - case L'g': - wchFrom = (wchar_t)va_arg(vl, int); + case 'g': + wchFrom = (char)va_arg(vl, int); switch (wchFrom) { - case L'T': + case 'T': group = Recipy::eGroupType_Tool; break; - case L'A': + case 'A': group = Recipy::eGroupType_Armour; break; - case L'S': + case 'S': group = Recipy::eGroupType_Structure; break; - case L'V': + case 'V': group = Recipy::eGroupType_Transport; break; - case L'M': + case 'M': group = Recipy::eGroupType_Mechanism; break; - case L'F': + case 'F': group = Recipy::eGroupType_Food; break; - case L'D': + case 'D': default: group = Recipy::eGroupType_Decoration; break; @@ -1218,7 +1218,7 @@ void Recipes::buildRecipeIngredientsArray(void) { auto itEndRec = recipies->end(); for (auto it = recipies->begin(); it != itEndRec; it++) { Recipy* recipe = *it; - // wprintf(L"RECIPE - [%d] is + // printf("RECIPE - [%d] is // %w\n",iCount,recipe->getResultItem()->getItem()->getName()); recipe->collectRequirements(&m_pRecipeIngredientsRequired[iCount++]); } diff --git a/targets/minecraft/world/item/crafting/Recipes.h b/targets/minecraft/world/item/crafting/Recipes.h index c30125d0b..33f9bc0bc 100644 --- a/targets/minecraft/world/item/crafting/Recipes.h +++ b/targets/minecraft/world/item/crafting/Recipes.h @@ -43,7 +43,7 @@ class WeaponRecipies; class ShapedRecipy; class FireworksRecipe; -typedef std::unordered_map myMap; +typedef std::unordered_map myMap; #define ADD_OBJECT(a, b) a.push_back(new Object(b)) diff --git a/targets/minecraft/world/item/crafting/StructureRecipes.cpp b/targets/minecraft/world/item/crafting/StructureRecipes.cpp index f7e53c924..6d4a382d7 100644 --- a/targets/minecraft/world/item/crafting/StructureRecipes.cpp +++ b/targets/minecraft/world/item/crafting/StructureRecipes.cpp @@ -13,137 +13,137 @@ void StructureRecipies::addRecipes(Recipes* r) { r->addShapedRecipy(new ItemInstance(Tile::sandStone), // - L"ssctg", - L"##", // - L"##", // + "ssctg", + "##", // + "##", // - L'#', Tile::sand, L'S'); + '#', Tile::sand, 'S'); r->addShapedRecipy(new ItemInstance(Tile::sandStone, 4, SandStoneTile::TYPE_SMOOTHSIDE), // - L"ssczg", - L"##", // - L"##", // + "ssczg", + "##", // + "##", // - L'#', new ItemInstance(Tile::sandStone), L'S'); + '#', new ItemInstance(Tile::sandStone), 'S'); r->addShapedRecipy( new ItemInstance(Tile::sandStone, 1, SandStoneTile::TYPE_HEIROGLYPHS), // - L"ssczg", - L"#", // - L"#", // + "ssczg", + "#", // + "#", // - L'#', + '#', new ItemInstance(Tile::stoneSlabHalf, 1, StoneSlabTile::SAND_SLAB), - L'S'); + 'S'); r->addShapedRecipy( new ItemInstance(Tile::quartzBlock, 1, QuartzBlockTile::TYPE_CHISELED), // - L"ssczg", - L"#", // - L"#", // + "ssczg", + "#", // + "#", // - L'#', + '#', new ItemInstance(Tile::stoneSlabHalf, 1, StoneSlabTile::QUARTZ_SLAB), - L'S'); + 'S'); r->addShapedRecipy( new ItemInstance(Tile::quartzBlock, 2, QuartzBlockTile::TYPE_LINES_Y), // - L"ssczg", - L"#", // - L"#", // + "ssczg", + "#", // + "#", // - L'#', + '#', new ItemInstance(Tile::quartzBlock, 1, QuartzBlockTile::TYPE_DEFAULT), - L'S'); + 'S'); // 4J Stu - Changed the order, as the blocks that go with sandstone cause a // 3-icon scroll that touches the text "Structures" in the title in 720 // fullscreen. r->addShapedRecipy(new ItemInstance(Tile::workBench), // - L"ssctg", - L"##", // - L"##", // + "ssctg", + "##", // + "##", // - L'#', Tile::wood, L'S'); + '#', Tile::wood, 'S'); r->addShapedRecipy(new ItemInstance(Tile::furnace), // - L"sssctg", - L"###", // - L"# #", // - L"###", // + "sssctg", + "###", // + "# #", // + "###", // - L'#', Tile::cobblestone, L'S'); + '#', Tile::cobblestone, 'S'); r->addShapedRecipy(new ItemInstance((Tile*)Tile::chest), // - L"sssctg", - L"###", // - L"# #", // - L"###", // + "sssctg", + "###", // + "# #", // + "###", // - L'#', Tile::wood, L'S'); + '#', Tile::wood, 'S'); r->addShapedRecipy(new ItemInstance(Tile::chest_trap), // - L"sctctg", - L"#-", // + "sctctg", + "#-", // - L'#', Tile::chest, L'-', Tile::tripWireSource, L'S'); + '#', Tile::chest, '-', Tile::tripWireSource, 'S'); r->addShapedRecipy(new ItemInstance(Tile::enderChest), // - L"sssctcig", - L"###", // - L"#E#", // - L"###", // + "sssctcig", + "###", // + "#E#", // + "###", // - L'#', Tile::obsidian, L'E', Item::eyeOfEnder, L'S'); + '#', Tile::obsidian, 'E', Item::eyeOfEnder, 'S'); r->addShapedRecipy(new ItemInstance(Tile::stoneBrick, 4), // - L"ssctg", - L"##", // - L"##", // + "ssctg", + "##", // + "##", // - L'#', Tile::stone, L'S'); + '#', Tile::stone, 'S'); // 4J Stu - Move this into "Recipes" to change the order things are // displayed on the crafting menu // r->addShapedRecipy(new ItemInstance(Tile::ironFence, 16), // - // L"sscig", - // L"###", // - // L"###", // + // "sscig", + // "###", // + // "###", // - // L'#', Item::ironIngot, - // L'S'); + // '#', Item::ironIngot, + // 'S'); r->addShapedRecipy(new ItemInstance(Tile::thinGlass, 16), // - L"ssctg", - L"###", // - L"###", // + "ssctg", + "###", // + "###", // - L'#', Tile::glass, L'D'); + '#', Tile::glass, 'D'); r->addShapedRecipy(new ItemInstance(Tile::netherBrick, 1), // - L"sscig", - L"NN", // - L"NN", // + "sscig", + "NN", // + "NN", // - L'N', Item::netherbrick, L'S'); + 'N', Item::netherbrick, 'S'); r->addShapedRecipy(new ItemInstance(Tile::redstoneLight, 1), // - L"ssscictg", - L" R ", // - L"RGR", // - L" R ", // - L'R', Item::redStone, 'G', Tile::glowstone, L'M'); + "ssscictg", + " R ", // + "RGR", // + " R ", // + 'R', Item::redStone, 'G', Tile::glowstone, 'M'); r->addShapedRecipy(new ItemInstance(Tile::beacon, 1), // - L"sssctcictg", - L"GGG", // - L"GSG", // - L"OOO", // + "sssctcictg", + "GGG", // + "GSG", // + "OOO", // - L'G', Tile::glass, L'S', Item::netherStar, L'O', - Tile::obsidian, L'M'); + 'G', Tile::glass, 'S', Item::netherStar, 'O', + Tile::obsidian, 'M'); } \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.cpp b/targets/minecraft/world/item/crafting/ToolRecipes.cpp index 32f6f7374..80e4da3ca 100644 --- a/targets/minecraft/world/item/crafting/ToolRecipes.cpp +++ b/targets/minecraft/world/item/crafting/ToolRecipes.cpp @@ -10,22 +10,22 @@ #include "minecraft/world/level/tile/Tile.h" // 4J-PB - adding "" on the end of these so we can detect it -std::wstring ToolRecipies::shapes[][4] = { - {L"XXX", // - L" # ", // - L" # "}, // +std::string ToolRecipies::shapes[][4] = { + {"XXX", // + " # ", // + " # "}, // - {L"X", // - L"#", // - L"#"}, // + {"X", // + "#", // + "#"}, // - {L"XX", // - L"X#", // - L" #"}, // + {"XX", // + "X#", // + " #"}, // - {L"XX", // - L" #", // - L" #"}, // + {"XX", // + " #", // + " #"}, // }; void ToolRecipies::_init() { @@ -63,7 +63,7 @@ void ToolRecipies::_init() { } void ToolRecipies::addRecipes(Recipes* r) { - wchar_t wchTypes[7]; + char wchTypes[7]; wchTypes[6] = 0; for (unsigned int m = 0; m < map[0].size(); m++) { @@ -72,29 +72,29 @@ void ToolRecipies::addRecipes(Recipes* r) { for (int t = 0; t < MAX_TOOL_RECIPES - 1; t++) { Item* target = map[t + 1].at(m)->item; - wchTypes[0] = L'w'; - wchTypes[1] = L'c'; - wchTypes[2] = L'i'; - wchTypes[3] = L'c'; - wchTypes[5] = L'g'; + wchTypes[0] = 'w'; + wchTypes[1] = 'c'; + wchTypes[2] = 'i'; + wchTypes[3] = 'c'; + wchTypes[5] = 'g'; if (pObjMaterial->GetType() == eType_TILE) { - wchTypes[4] = L't'; + wchTypes[4] = 't'; r->addShapedRecipy( new ItemInstance(target), wchTypes, shapes[t], - L'#', Item::stick, L'X', pObjMaterial->tile, L'T'); + '#', Item::stick, 'X', pObjMaterial->tile, 'T'); } else { // must be Item - wchTypes[4] = L'i'; + wchTypes[4] = 'i'; r->addShapedRecipy( new ItemInstance(target), wchTypes, shapes[t], - L'#', Item::stick, L'X', pObjMaterial->item, L'T'); + '#', Item::stick, 'X', pObjMaterial->item, 'T'); } } } - r->addShapedRecipy(new ItemInstance((Item*)Item::shears), L"sscig", - L" #", // - L"# ", // - L'#', Item::ironIngot, L'T'); + r->addShapedRecipy(new ItemInstance((Item*)Item::shears), "sscig", + " #", // + "# ", // + '#', Item::ironIngot, 'T'); } \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/ToolRecipes.h b/targets/minecraft/world/item/crafting/ToolRecipes.h index 9a1f93239..20275070e 100644 --- a/targets/minecraft/world/item/crafting/ToolRecipes.h +++ b/targets/minecraft/world/item/crafting/ToolRecipes.h @@ -20,7 +20,7 @@ public: ToolRecipies() { _init(); } private: - static std::wstring shapes[][4]; + static std::string shapes[][4]; std::vector* map; public: diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp index 76d2bd1fa..a3c14af3c 100644 --- a/targets/minecraft/world/item/crafting/WeaponRecipes.cpp +++ b/targets/minecraft/world/item/crafting/WeaponRecipes.cpp @@ -9,10 +9,10 @@ #include "minecraft/world/level/tile/Tile.h" // 4J-PB - adding "" on the end of these so we can detect it -std::wstring WeaponRecipies::shapes[][4] = { - {L"X", // - L"X", // - L"#", L""}, // +std::string WeaponRecipies::shapes[][4] = { + {"X", // + "X", // + "#", ""}, // }; void WeaponRecipies::_init() { @@ -32,7 +32,7 @@ void WeaponRecipies::_init() { } void WeaponRecipies::addRecipes(Recipes* r) { - wchar_t wchTypes[7]; + char wchTypes[7]; wchTypes[6] = 0; for (unsigned int m = 0; m < map[0].size(); m++) { @@ -41,48 +41,48 @@ void WeaponRecipies::addRecipes(Recipes* r) { for (int t = 0; t < MAX_WEAPON_RECIPES - 1; t++) { Item* target = map[t + 1].at(m)->item; - wchTypes[0] = L'w'; - wchTypes[1] = L'c'; - wchTypes[2] = L'i'; - wchTypes[3] = L'c'; - wchTypes[5] = L'g'; + wchTypes[0] = 'w'; + wchTypes[1] = 'c'; + wchTypes[2] = 'i'; + wchTypes[3] = 'c'; + wchTypes[5] = 'g'; if (pObjMaterial->GetType() == eType_TILE) { - wchTypes[4] = L't'; + wchTypes[4] = 't'; r->addShapedRecipy( new ItemInstance(target), wchTypes, shapes[t], - L'#', Item::stick, L'X', pObjMaterial->tile, L'T'); + '#', Item::stick, 'X', pObjMaterial->tile, 'T'); } else { // must be Item - wchTypes[4] = L'i'; + wchTypes[4] = 'i'; r->addShapedRecipy( new ItemInstance(target), wchTypes, shapes[t], - L'#', Item::stick, L'X', pObjMaterial->item, L'T'); + '#', Item::stick, 'X', pObjMaterial->item, 'T'); } } } /* 4J-PB - moved out to main recipes so we can avoid them stacking on the group display name r->addShapedRecipy(new ItemInstance(Item::bow, 1), // - L"ssscicig", - L" #X", // - L"# X", // - L" #X", // + "ssscicig", + " #X", // + "# X", // + " #X", // - L'X', Item::string,// - L'#', Item::stick, - L'T'); + 'X', Item::string,// + '#', Item::stick, + 'T'); r->addShapedRecipy(new ItemInstance(Item::arrow, 4), // - L"ssscicicig", - L"X", // - L"#", // - L"Y", // + "ssscicicig", + "X", // + "#", // + "Y", // - L'Y', Item::feather,// - L'X', Item::flint,// - L'#', Item::stick, - L'T'); + 'Y', Item::feather,// + 'X', Item::flint,// + '#', Item::stick, + 'T'); */ } \ No newline at end of file diff --git a/targets/minecraft/world/item/crafting/WeaponRecipes.h b/targets/minecraft/world/item/crafting/WeaponRecipes.h index bc5a50668..414a995d0 100644 --- a/targets/minecraft/world/item/crafting/WeaponRecipes.h +++ b/targets/minecraft/world/item/crafting/WeaponRecipes.h @@ -20,7 +20,7 @@ public: WeaponRecipies() { _init(); } private: - static std::wstring shapes[][4]; + static std::string shapes[][4]; std::vector* map; public: diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp index 567b0b5e8..f4e3afedd 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.cpp +++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp @@ -160,19 +160,19 @@ Enchantment* Enchantment::setDescriptionId(int id) { int Enchantment::getDescriptionId() { return descriptionId; } // 4jcraft: re-added old TU18 overload for java gui -std::wstring Enchantment::getFullname(int level, std::wstring& unformatted) { - wchar_t formatted[256]; - swprintf(formatted, 256, L"%ls %ls", gameServices().getString(getDescriptionId()), +std::string Enchantment::getFullname(int level, std::string& unformatted) { + char formatted[256]; + snprintf(formatted, 256, "%s %s", gameServices().getString(getDescriptionId()), getLevelString(level).c_str()); unformatted = formatted; - swprintf(formatted, 256, L"%ls", + snprintf(formatted, 256, "%s", gameServices().getHTMLColour(eHTMLColor_f), unformatted.c_str()); return formatted; } HtmlString Enchantment::getFullname(int level) { - wchar_t formatted[256]; - swprintf(formatted, 256, L"%ls %ls", gameServices().getString(getDescriptionId()), + char formatted[256]; + snprintf(formatted, 256, "%s %s", gameServices().getString(getDescriptionId()), getLevelString(level).c_str()); return HtmlString(formatted, eHTMLColor_f); @@ -183,7 +183,7 @@ bool Enchantment::canEnchant(std::shared_ptr item) { } // 4J Added -std::wstring Enchantment::getLevelString(int level) { +std::string Enchantment::getLevelString(int level) { int stringId = IDS_ENCHANTMENT_LEVEL_1; switch (level) { case 2: diff --git a/targets/minecraft/world/item/enchantment/Enchantment.h b/targets/minecraft/world/item/enchantment/Enchantment.h index bc42a5c1c..603b1f33a 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.h +++ b/targets/minecraft/world/item/enchantment/Enchantment.h @@ -88,12 +88,12 @@ public: virtual Enchantment* setDescriptionId(int id); virtual int getDescriptionId(); // 4jcraft: re-added old TU18 overload for java gui - virtual std::wstring getFullname( - int level, std::wstring& unformatted); // 4J Stu added unformatted + virtual std::string getFullname( + int level, std::string& unformatted); // 4J Stu added unformatted virtual HtmlString getFullname(int level); virtual bool canEnchant(std::shared_ptr item); private: // 4J Added - std::wstring getLevelString(int level); + std::string getLevelString(int level); }; \ No newline at end of file diff --git a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp index b1c08938a..ec6a96030 100644 --- a/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp +++ b/targets/minecraft/world/item/enchantment/EnchantmentHelper.cpp @@ -30,9 +30,9 @@ int EnchantmentHelper::getEnchantmentLevel( } for (int i = 0; i < enchantmentTags->size(); i++) { int type = enchantmentTags->get(i)->getShort( - (wchar_t*)ItemInstance::TAG_ENCH_ID); + (char*)ItemInstance::TAG_ENCH_ID); int level = enchantmentTags->get(i)->getShort( - (wchar_t*)ItemInstance::TAG_ENCH_LEVEL); + (char*)ItemInstance::TAG_ENCH_LEVEL); if (type == enchantmentId) { return level; @@ -52,9 +52,9 @@ std::unordered_map* EnchantmentHelper::getEnchantments( if (list != nullptr) { for (int i = 0; i < list->size(); i++) { int type = - list->get(i)->getShort((wchar_t*)ItemInstance::TAG_ENCH_ID); + list->get(i)->getShort((char*)ItemInstance::TAG_ENCH_ID); int level = - list->get(i)->getShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL); + list->get(i)->getShort((char*)ItemInstance::TAG_ENCH_LEVEL); result->insert( std::unordered_map::value_type(type, level)); @@ -74,8 +74,8 @@ void EnchantmentHelper::setEnchantments( int id = it->first; CompoundTag* tag = new CompoundTag(); - tag->putShort((wchar_t*)ItemInstance::TAG_ENCH_ID, (short)id); - tag->putShort((wchar_t*)ItemInstance::TAG_ENCH_LEVEL, + tag->putShort((char*)ItemInstance::TAG_ENCH_ID, (short)id); + tag->putShort((char*)ItemInstance::TAG_ENCH_LEVEL, (short)(int)it->second); list->add(tag); @@ -88,10 +88,10 @@ void EnchantmentHelper::setEnchantments( if (list->size() > 0) { if (item->id != Item::enchantedBook_Id) { - item->addTagElement(L"ench", list); + item->addTagElement("ench", list); } } else if (item->hasTag()) { - item->getTag()->remove(L"ench"); + item->getTag()->remove("ench"); } } @@ -120,9 +120,9 @@ void EnchantmentHelper::runIterationOnItem( } for (int i = 0; i < enchantmentTags->size(); i++) { int type = enchantmentTags->get(i)->getShort( - (wchar_t*)ItemInstance::TAG_ENCH_ID); + (char*)ItemInstance::TAG_ENCH_ID); int level = enchantmentTags->get(i)->getShort( - (wchar_t*)ItemInstance::TAG_ENCH_LEVEL); + (char*)ItemInstance::TAG_ENCH_LEVEL); if (Enchantment::enchantments[type] != nullptr) { method.doEnchantment(Enchantment::enchantments[type], level); diff --git a/targets/minecraft/world/item/trading/Merchant.h b/targets/minecraft/world/item/trading/Merchant.h index 65cb6f347..93b1e46ce 100644 --- a/targets/minecraft/world/item/trading/Merchant.h +++ b/targets/minecraft/world/item/trading/Merchant.h @@ -18,5 +18,5 @@ public: virtual void overrideOffers(MerchantRecipeList* recipeList) = 0; virtual void notifyTrade(MerchantRecipe* activeRecipe) = 0; virtual void notifyTradeUpdated(std::shared_ptr item) = 0; - virtual std::wstring getDisplayName() = 0; + virtual std::string getDisplayName() = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/item/trading/MerchantRecipe.cpp b/targets/minecraft/world/item/trading/MerchantRecipe.cpp index bd34e4802..6bb95114a 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipe.cpp +++ b/targets/minecraft/world/item/trading/MerchantRecipe.cpp @@ -85,18 +85,18 @@ bool MerchantRecipe::isDeprecated() { return uses >= maxUses; } void MerchantRecipe::enforceDeprecated() { uses = maxUses; } void MerchantRecipe::load(CompoundTag* tag) { - CompoundTag* buyTag = tag->getCompound(L"buy"); + CompoundTag* buyTag = tag->getCompound("buy"); buyA = ItemInstance::fromTag(buyTag); - CompoundTag* sellTag = tag->getCompound(L"sell"); + CompoundTag* sellTag = tag->getCompound("sell"); sell = ItemInstance::fromTag(sellTag); - if (tag->contains(L"buyB")) { - buyB = ItemInstance::fromTag(tag->getCompound(L"buyB")); + if (tag->contains("buyB")) { + buyB = ItemInstance::fromTag(tag->getCompound("buyB")); } - if (tag->contains(L"uses")) { - uses = tag->getInt(L"uses"); + if (tag->contains("uses")) { + uses = tag->getInt("uses"); } - if (tag->contains(L"maxUses")) { - maxUses = tag->getInt(L"maxUses"); + if (tag->contains("maxUses")) { + maxUses = tag->getInt("maxUses"); } else { maxUses = 7; } @@ -104,12 +104,12 @@ void MerchantRecipe::load(CompoundTag* tag) { CompoundTag* MerchantRecipe::createTag() { CompoundTag* tag = new CompoundTag(); - tag->putCompound(L"buy", buyA->save(new CompoundTag(L"buy"))); - tag->putCompound(L"sell", sell->save(new CompoundTag(L"sell"))); + tag->putCompound("buy", buyA->save(new CompoundTag("buy"))); + tag->putCompound("sell", sell->save(new CompoundTag("sell"))); if (buyB != nullptr) { - tag->putCompound(L"buyB", buyB->save(new CompoundTag(L"buyB"))); + tag->putCompound("buyB", buyB->save(new CompoundTag("buyB"))); } - tag->putInt(L"uses", uses); - tag->putInt(L"maxUses", maxUses); + tag->putInt("uses", uses); + tag->putInt("maxUses", maxUses); return tag; } \ No newline at end of file diff --git a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp index 6ffddd8ca..6a8864d1c 100644 --- a/targets/minecraft/world/item/trading/MerchantRecipeList.cpp +++ b/targets/minecraft/world/item/trading/MerchantRecipeList.cpp @@ -136,7 +136,7 @@ MerchantRecipeList* MerchantRecipeList::createFromStream( void MerchantRecipeList::load(CompoundTag* tag) { ListTag* list = - (ListTag*)tag->getList(L"Recipes"); + (ListTag*)tag->getList("Recipes"); for (int i = 0; i < list->size(); i++) { CompoundTag* recipeTag = list->get(i); @@ -147,12 +147,12 @@ void MerchantRecipeList::load(CompoundTag* tag) { CompoundTag* MerchantRecipeList::createTag() { CompoundTag* tag = new CompoundTag(); - ListTag* list = new ListTag(L"Recipes"); + ListTag* list = new ListTag("Recipes"); for (int i = 0; i < m_recipes.size(); i++) { MerchantRecipe* merchantRecipe = m_recipes.at(i); list->add(merchantRecipe->createTag()); } - tag->put(L"Recipes", list); + tag->put("Recipes", list); return tag; } diff --git a/targets/minecraft/world/level/BaseMobSpawner.cpp b/targets/minecraft/world/level/BaseMobSpawner.cpp index 7177bf881..893085100 100644 --- a/targets/minecraft/world/level/BaseMobSpawner.cpp +++ b/targets/minecraft/world/level/BaseMobSpawner.cpp @@ -21,7 +21,7 @@ BaseMobSpawner::BaseMobSpawner() { spawnPotentials = nullptr; spawnDelay = 20; - entityId = L"Pig"; + entityId = "Pig"; nextSpawnData = nullptr; spin = oSpin = 0.0; @@ -44,10 +44,10 @@ BaseMobSpawner::~BaseMobSpawner() { } } -std::wstring BaseMobSpawner::getEntityId() { +std::string BaseMobSpawner::getEntityId() { if (getNextSpawnData() == nullptr) { - if (entityId.compare(L"Minecart") == 0) { - entityId = L"MinecartRideable"; + if (entityId.compare("Minecart") == 0) { + entityId = "MinecartRideable"; } return entityId; } else { @@ -55,7 +55,7 @@ std::wstring BaseMobSpawner::getEntityId() { } } -void BaseMobSpawner::setEntityId(const std::wstring& entityId) { +void BaseMobSpawner::setEntityId(const std::string& entityId) { this->entityId = entityId; } @@ -159,7 +159,7 @@ std::shared_ptr BaseMobSpawner::loadDataAndAddEntity( while (data->contains(Entity::RIDING_TAG)) { CompoundTag* ridingTag = data->getCompound(Entity::RIDING_TAG); std::shared_ptr mount = - EntityIO::newEntity(ridingTag->getString(L"id"), entity->level); + EntityIO::newEntity(ridingTag->getString("id"), entity->level); if (mount != nullptr) { CompoundTag* mountData = new CompoundTag(); mount->save(mountData); @@ -208,13 +208,13 @@ void BaseMobSpawner::delay() { } void BaseMobSpawner::load(CompoundTag* tag) { - entityId = tag->getString(L"EntityId"); - spawnDelay = tag->getShort(L"Delay"); + entityId = tag->getString("EntityId"); + spawnDelay = tag->getShort("Delay"); - if (tag->contains(L"SpawnPotentials")) { + if (tag->contains("SpawnPotentials")) { spawnPotentials = new std::vector(); ListTag* potentials = - (ListTag*)tag->getList(L"SpawnPotentials"); + (ListTag*)tag->getList("SpawnPotentials"); for (int i = 0; i < potentials->size(); i++) { spawnPotentials->push_back(new SpawnData(potentials->get(i))); @@ -223,25 +223,25 @@ void BaseMobSpawner::load(CompoundTag* tag) { spawnPotentials = nullptr; } - if (tag->contains(L"SpawnData")) { + if (tag->contains("SpawnData")) { setNextSpawnData( - new SpawnData(tag->getCompound(L"SpawnData"), entityId)); + new SpawnData(tag->getCompound("SpawnData"), entityId)); } else { setNextSpawnData(nullptr); } - if (tag->contains(L"MinSpawnDelay")) { - minSpawnDelay = tag->getShort(L"MinSpawnDelay"); - maxSpawnDelay = tag->getShort(L"MaxSpawnDelay"); - spawnCount = tag->getShort(L"SpawnCount"); + if (tag->contains("MinSpawnDelay")) { + minSpawnDelay = tag->getShort("MinSpawnDelay"); + maxSpawnDelay = tag->getShort("MaxSpawnDelay"); + spawnCount = tag->getShort("SpawnCount"); } - if (tag->contains(L"MaxNearbyEntities")) { - maxNearbyEntities = tag->getShort(L"MaxNearbyEntities"); - requiredPlayerRange = tag->getShort(L"RequiredPlayerRange"); + if (tag->contains("MaxNearbyEntities")) { + maxNearbyEntities = tag->getShort("MaxNearbyEntities"); + requiredPlayerRange = tag->getShort("RequiredPlayerRange"); } - if (tag->contains(L"SpawnRange")) spawnRange = tag->getShort(L"SpawnRange"); + if (tag->contains("SpawnRange")) spawnRange = tag->getShort("SpawnRange"); if (getLevel() != nullptr && getLevel()->isClientSide) { displayEntity = nullptr; @@ -249,17 +249,17 @@ void BaseMobSpawner::load(CompoundTag* tag) { } void BaseMobSpawner::save(CompoundTag* tag) { - tag->putString(L"EntityId", getEntityId()); - tag->putShort(L"Delay", (short)spawnDelay); - tag->putShort(L"MinSpawnDelay", (short)minSpawnDelay); - tag->putShort(L"MaxSpawnDelay", (short)maxSpawnDelay); - tag->putShort(L"SpawnCount", (short)spawnCount); - tag->putShort(L"MaxNearbyEntities", (short)maxNearbyEntities); - tag->putShort(L"RequiredPlayerRange", (short)requiredPlayerRange); - tag->putShort(L"SpawnRange", (short)spawnRange); + tag->putString("EntityId", getEntityId()); + tag->putShort("Delay", (short)spawnDelay); + tag->putShort("MinSpawnDelay", (short)minSpawnDelay); + tag->putShort("MaxSpawnDelay", (short)maxSpawnDelay); + tag->putShort("SpawnCount", (short)spawnCount); + tag->putShort("MaxNearbyEntities", (short)maxNearbyEntities); + tag->putShort("RequiredPlayerRange", (short)requiredPlayerRange); + tag->putShort("SpawnRange", (short)spawnRange); if (getNextSpawnData() != nullptr) { - tag->putCompound(L"SpawnData", + tag->putCompound("SpawnData", (CompoundTag*)getNextSpawnData()->tag->copy()); } @@ -277,7 +277,7 @@ void BaseMobSpawner::save(CompoundTag* tag) { list->add(getNextSpawnData()->save()); } - tag->put(L"SpawnPotentials", list); + tag->put("SpawnPotentials", list); } } @@ -308,25 +308,25 @@ void BaseMobSpawner::setNextSpawnData(SpawnData* nextSpawnData) { } BaseMobSpawner::SpawnData::SpawnData(CompoundTag* base) - : WeighedRandomItem(base->getInt(L"Weight")) { - CompoundTag* tag = base->getCompound(L"Properties"); - std::wstring _type = base->getString(L"Type"); + : WeighedRandomItem(base->getInt("Weight")) { + CompoundTag* tag = base->getCompound("Properties"); + std::string _type = base->getString("Type"); - if (_type.compare(L"Minecart") == 0) { + if (_type.compare("Minecart") == 0) { if (tag != nullptr) { - switch (tag->getInt(L"Type")) { + switch (tag->getInt("Type")) { case Minecart::TYPE_CHEST: - type = L"MinecartChest"; + type = "MinecartChest"; break; case Minecart::TYPE_FURNACE: - type = L"MinecartFurnace"; + type = "MinecartFurnace"; break; case Minecart::TYPE_RIDEABLE: - type = L"MinecartRideable"; + type = "MinecartRideable"; break; } } else { - type = L"MinecartRideable"; + type = "MinecartRideable"; } } @@ -334,23 +334,23 @@ BaseMobSpawner::SpawnData::SpawnData(CompoundTag* base) this->type = _type; } -BaseMobSpawner::SpawnData::SpawnData(CompoundTag* tag, std::wstring _type) +BaseMobSpawner::SpawnData::SpawnData(CompoundTag* tag, std::string _type) : WeighedRandomItem(1) { - if (_type.compare(L"Minecart") == 0) { + if (_type.compare("Minecart") == 0) { if (tag != nullptr) { - switch (tag->getInt(L"Type")) { + switch (tag->getInt("Type")) { case Minecart::TYPE_CHEST: - _type = L"MinecartChest"; + _type = "MinecartChest"; break; case Minecart::TYPE_FURNACE: - _type = L"MinecartFurnace"; + _type = "MinecartFurnace"; break; case Minecart::TYPE_RIDEABLE: - _type = L"MinecartRideable"; + _type = "MinecartRideable"; break; } } else { - _type = L"MinecartRideable"; + _type = "MinecartRideable"; } } @@ -363,9 +363,9 @@ BaseMobSpawner::SpawnData::~SpawnData() { delete tag; } CompoundTag* BaseMobSpawner::SpawnData::save() { CompoundTag* result = new CompoundTag(); - result->putCompound(L"Properties", tag); - result->putString(L"Type", type); - result->putInt(L"Weight", randomWeight); + result->putCompound("Properties", tag); + result->putString("Type", type); + result->putInt("Weight", randomWeight); return result; } diff --git a/targets/minecraft/world/level/BaseMobSpawner.h b/targets/minecraft/world/level/BaseMobSpawner.h index 4e9bee397..a9a094713 100644 --- a/targets/minecraft/world/level/BaseMobSpawner.h +++ b/targets/minecraft/world/level/BaseMobSpawner.h @@ -16,10 +16,10 @@ public: class SpawnData : public WeighedRandomItem { public: CompoundTag* tag; - std::wstring type; + std::string type; SpawnData(CompoundTag* base); - SpawnData(CompoundTag* tag, std::wstring type); + SpawnData(CompoundTag* tag, std::string type); ~SpawnData(); virtual CompoundTag* save(); @@ -32,7 +32,7 @@ public: int spawnDelay; private: - std::wstring entityId; + std::string entityId; std::vector* spawnPotentials; SpawnData* nextSpawnData; @@ -52,8 +52,8 @@ public: BaseMobSpawner(); virtual ~BaseMobSpawner(); - virtual std::wstring getEntityId(); - virtual void setEntityId(const std::wstring& entityId); + virtual std::string getEntityId(); + virtual void setEntityId(const std::string& entityId); virtual bool isNearPlayer(); virtual void tick(); virtual std::shared_ptr loadDataAndAddEntity( diff --git a/targets/minecraft/world/level/ChunkPos.cpp b/targets/minecraft/world/level/ChunkPos.cpp index f5523128d..7bd788bf9 100644 --- a/targets/minecraft/world/level/ChunkPos.cpp +++ b/targets/minecraft/world/level/ChunkPos.cpp @@ -51,8 +51,8 @@ TilePos ChunkPos::getMiddleBlockPosition(int y) { return TilePos(getMiddleBlockX(), y, getMiddleBlockZ()); } -std::wstring ChunkPos::toString() { - return L"[" + toWString(x) + L", " + toWString(z) + L"]"; +std::string ChunkPos::toString() { + return "[" + toWString(x) + ", " + toWString(z) + "]"; } int64_t ChunkPos::hash_fnct(const ChunkPos& k) { return k.hashCode(k.x, k.z); } diff --git a/targets/minecraft/world/level/ChunkPos.h b/targets/minecraft/world/level/ChunkPos.h index 7cb44997b..8cc0e2962 100644 --- a/targets/minecraft/world/level/ChunkPos.h +++ b/targets/minecraft/world/level/ChunkPos.h @@ -24,7 +24,7 @@ public: int getMiddleBlockZ(); TilePos getMiddleBlockPosition(int y); - std::wstring toString(); + std::string toString(); static int64_t hash_fnct(const ChunkPos& k); static bool eq_test(const ChunkPos& x, const ChunkPos& y); diff --git a/targets/minecraft/world/level/GameRules.cpp b/targets/minecraft/world/level/GameRules.cpp index 9fade251c..41943618e 100644 --- a/targets/minecraft/world/level/GameRules.cpp +++ b/targets/minecraft/world/level/GameRules.cpp @@ -20,15 +20,15 @@ const int GameRules::RULE_NATURAL_REGENERATION = 7; const int GameRules::RULE_DAYLIGHT = 8; GameRules::GameRules() { - /*registerRule(RULE_DOFIRETICK, L"1"); - registerRule(RULE_MOBGRIEFING, L"1"); - registerRule(RULE_KEEPINVENTORY, L"0"); - registerRule(RULE_DOMOBSPAWNING, L"1"); - registerRule(RULE_DOMOBLOOT, L"1"); - registerRule(RULE_DOTILEDROPS, L"1"); - registerRule(RULE_COMMANDBLOCKOUTPUT, L"1"); - registerRule(RULE_NATURAL_REGENERATION, L"1"); - registerRule(RULE_DAYLIGHT, L"1");*/ + /*registerRule(RULE_DOFIRETICK, "1"); + registerRule(RULE_MOBGRIEFING, "1"); + registerRule(RULE_KEEPINVENTORY, "0"); + registerRule(RULE_DOMOBSPAWNING, "1"); + registerRule(RULE_DOMOBLOOT, "1"); + registerRule(RULE_DOTILEDROPS, "1"); + registerRule(RULE_COMMANDBLOCKOUTPUT, "1"); + registerRule(RULE_NATURAL_REGENERATION, "1"); + registerRule(RULE_DAYLIGHT, "1");*/ } GameRules::~GameRules() { @@ -63,13 +63,13 @@ bool GameRules::getBoolean(const int rule) { } /* -void GameRules::registerRule(const std::wstring &name, const std::wstring +void GameRules::registerRule(const std::string &name, const std::string &startValue) { rules[name] = new GameRule(startValue); } -void GameRules::set(const std::wstring &ruleName, const std::wstring &newValue) +void GameRules::set(const std::string &ruleName, const std::string &newValue) { auto it = rules.find(ruleName); if(it != rules.end() ) @@ -83,7 +83,7 @@ void GameRules::set(const std::wstring &ruleName, const std::wstring &newValue) } } -std::wstring GameRules::get(const std::wstring &ruleName) +std::string GameRules::get(const std::string &ruleName) { auto it = rules.find(ruleName); if(it != rules.end() ) @@ -91,10 +91,10 @@ std::wstring GameRules::get(const std::wstring &ruleName) GameRule *gameRule = it->second; return gameRule->get(); } - return L""; + return ""; } -int GameRules::getInt(const std::wstring &ruleName) +int GameRules::getInt(const std::string &ruleName) { auto it = rules.find(ruleName); if(it != rules.end() ) @@ -105,7 +105,7 @@ int GameRules::getInt(const std::wstring &ruleName) return 0; } -double GameRules::getDouble(const std::wstring &ruleName) +double GameRules::getDouble(const std::string &ruleName) { auto it = rules.find(ruleName); if(it != rules.end() ) @@ -118,7 +118,7 @@ double GameRules::getDouble(const std::wstring &ruleName) CompoundTag *GameRules::createTag() { - CompoundTag *result = new CompoundTag(L"GameRules"); + CompoundTag *result = new CompoundTag("GameRules"); for(auto it = rules.begin(); it != rules.end(); ++it) { @@ -135,37 +135,37 @@ void GameRules::loadFromTag(CompoundTag *tag) for (auto it = allTags.begin(); it != allTags.end(); ++it) { Tag *ruleTag = *it; - std::wstring ruleName = ruleTag->getName(); - std::wstring value = tag->getString(ruleTag->getName()); + std::string ruleName = ruleTag->getName(); + std::string value = tag->getString(ruleTag->getName()); set(ruleName, value); } } // Need to delete returned vector. -vector *GameRules::getRuleNames() +vector *GameRules::getRuleNames() { - vector *out = new vector(); + vector *out = new vector(); for (auto it = rules.begin(); it != rules.end(); it++) out->push_back(it->first); return out; } -bool GameRules::contains(const std::wstring &rule) +bool GameRules::contains(const std::string &rule) { auto it = rules.find(rule); return it != rules.end(); } -GameRules::GameRule::GameRule(const std::wstring &startValue) +GameRules::GameRule::GameRule(const std::string &startValue) { - value = L""; + value = ""; booleanValue = false; intValue = 0; doubleValue = 0.0; set(startValue); } -void GameRules::GameRule::set(const std::wstring &newValue) +void GameRules::GameRule::set(const std::string &newValue) { value = newValue; booleanValue = fromWString(newValue); @@ -173,7 +173,7 @@ void GameRules::GameRule::set(const std::wstring &newValue) doubleValue = fromWString(newValue); } -std::wstring GameRules::GameRule::get() +std::string GameRules::GameRule::get() { return value; } diff --git a/targets/minecraft/world/level/GameRules.h b/targets/minecraft/world/level/GameRules.h index 4ae7da6fb..04dc3ea8a 100644 --- a/targets/minecraft/world/level/GameRules.h +++ b/targets/minecraft/world/level/GameRules.h @@ -7,16 +7,16 @@ class GameRules { private: class GameRule { private: - std::wstring value; + std::string value; bool booleanValue; int intValue; double doubleValue; public: - GameRule(const std::wstring& startValue); + GameRule(const std::string& startValue); - void set(const std::wstring& newValue); - std::wstring get(); + void set(const std::string& newValue); + std::string get(); bool getBoolean(); int getInt(); double getDouble(); @@ -36,7 +36,7 @@ public: static const int RULE_DAYLIGHT; private: - std::unordered_map rules; + std::unordered_map rules; public: GameRules(); @@ -45,13 +45,13 @@ public: bool getBoolean(const int rule); // 4J: Removed unused functions - /*void set(const std::wstring &ruleName, const std::wstring &newValue); - void registerRule(const std::wstring &name, const std::wstring &startValue); - std::wstring get(const std::wstring &ruleName); - int getInt(const std::wstring &ruleName); - double getDouble(const std::wstring &ruleName); + /*void set(const std::string &ruleName, const std::string &newValue); + void registerRule(const std::string &name, const std::string &startValue); + std::string get(const std::string &ruleName); + int getInt(const std::string &ruleName); + double getDouble(const std::string &ruleName); CompoundTag *createTag(); void loadFromTag(CompoundTag *tag); - vector *getRuleNames(); - bool contains(const std::wstring &rule);*/ + vector *getRuleNames(); + bool contains(const std::string &rule);*/ }; \ No newline at end of file diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index e760030ea..5dfb7be27 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -568,7 +568,7 @@ Biome* Level::getBiome(int x, int z) { BiomeSource* Level::getBiomeSource() { return dimension->biomeSource; } Level::Level(std::shared_ptr levelStorage, - const std::wstring& name, Dimension* dimension, + const std::string& name, Dimension* dimension, LevelSettings* levelSettings, bool doCreateChunkSource) : seaLevel(constSeaLevel) { _init(); @@ -602,13 +602,13 @@ Level::Level(std::shared_ptr levelStorage, } Level::Level(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings) + const std::string& levelName, LevelSettings* levelSettings) : seaLevel(constSeaLevel) { _init(levelStorage, levelName, levelSettings, nullptr, true); } Level::Level(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings, + const std::string& levelName, LevelSettings* levelSettings, Dimension* fixedDimension, bool doCreateChunkSource) : seaLevel(constSeaLevel) { _init(levelStorage, levelName, levelSettings, fixedDimension, @@ -616,7 +616,7 @@ Level::Level(std::shared_ptr levelStorage, } void Level::_init(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings, + const std::string& levelName, LevelSettings* levelSettings, Dimension* fixedDimension, bool doCreateChunkSource) { _init(); this->levelStorage = @@ -1517,7 +1517,7 @@ void Level::playPlayerSound(std::shared_ptr entity, int iSound, } } -// void Level::playSound(double x, double y, double z, const wstring& name, +// void Level::playSound(double x, double y, double z, const string& name, // float volume, float pitch) void Level::playSound(double x, double y, double z, int iSound, float volume, float pitch, float fClipSoundDist) { @@ -1531,19 +1531,19 @@ void Level::playLocalSound(double x, double y, double z, int iSound, float volume, float pitch, bool distanceDelay, float fClipSoundDist) {} -void Level::playStreamingMusic(const std::wstring& name, int x, int y, int z) { +void Level::playStreamingMusic(const std::string& name, int x, int y, int z) { auto itEnd = listeners.end(); for (auto it = listeners.begin(); it != itEnd; it++) { (*it)->playStreamingMusic(name, x, y, z); } } -void Level::playMusic(double x, double y, double z, const std::wstring& string, +void Level::playMusic(double x, double y, double z, const std::string& string, float volume) {} // 4J removed - /* -void Level::addParticle(const wstring& id, double x, double y, double z, double +void Level::addParticle(const string& id, double x, double y, double z, double xd, double yd, double zd) { auto itEnd = listeners.end(); @@ -2568,16 +2568,16 @@ return shared_ptr(); } */ -std::wstring Level::gatherStats() { - wchar_t buf[64]; +std::string Level::gatherStats() { + char buf[64]; { std::lock_guard lock(m_entitiesCS); - swprintf(buf, 64, L"All:%d", entities.size()); + snprintf(buf, 64, "All:%d", entities.size()); } - return std::wstring(buf); + return std::string(buf); } -std::wstring Level::gatherChunkSourceStats() { +std::string Level::gatherChunkSourceStats() { return chunkSource->gatherStats(); } @@ -3746,7 +3746,7 @@ std::shared_ptr Level::getNearestAttackablePlayer(double x, double y, return result; } -std::shared_ptr Level::getPlayerByName(const std::wstring& name) { +std::shared_ptr Level::getPlayerByName(const std::string& name) { auto itEnd = players.end(); for (auto it = players.begin(); it != itEnd; it++) { if (name.compare((*it)->getName()) == 0) { @@ -3756,7 +3756,7 @@ std::shared_ptr Level::getPlayerByName(const std::wstring& name) { return std::shared_ptr(); } -std::shared_ptr Level::getPlayerByUUID(const std::wstring& name) { +std::shared_ptr Level::getPlayerByUUID(const std::string& name) { auto itEnd = players.end(); for (auto it = players.begin(); it != itEnd; it++) { if (name.compare((*it)->getUUID()) == 0) { @@ -3986,17 +3986,17 @@ bool Level::isHumidAt(int x, int y, int z) { return biome->isHumid(); } -void Level::setSavedData(const std::wstring& id, +void Level::setSavedData(const std::string& id, std::shared_ptr data) { savedDataStorage->set(id, data); } std::shared_ptr Level::getSavedData(const std::type_info& clazz, - const std::wstring& id) { + const std::string& id) { return savedDataStorage->get(clazz, id); } -int Level::getFreeAuxValueFor(const std::wstring& id) { +int Level::getFreeAuxValueFor(const std::string& id) { return savedDataStorage->getFreeAuxValueFor(id); } @@ -4044,7 +4044,7 @@ Random* Level::getRandomFor(int x, int z, int blend) { return random; } -TilePos* Level::findNearestMapFeature(const std::wstring& featureName, int x, +TilePos* Level::findNearestMapFeature(const std::string& featureName, int x, int y, int z) { return getChunkSource()->findNearestMapFeature(this, featureName, x, y, z); } diff --git a/targets/minecraft/world/level/Level.h b/targets/minecraft/world/level/Level.h index 137bd7bbf..64ff774f0 100644 --- a/targets/minecraft/world/level/Level.h +++ b/targets/minecraft/world/level/Level.h @@ -202,17 +202,17 @@ private: // 4J Stu - Added these ctors to handle init of member variables void _init(); void _init(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings, + const std::string& levelName, LevelSettings* levelSettings, Dimension* fixedDimension, bool doCreateChunkSource = true); public: - Level(std::shared_ptr levelStorage, const std::wstring& name, + Level(std::shared_ptr levelStorage, const std::string& name, Dimension* dimension, LevelSettings* levelSettings, bool doCreateChunkSource = true); Level(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings); + const std::string& levelName, LevelSettings* levelSettings); Level(std::shared_ptr levelStorage, - const std::wstring& levelName, LevelSettings* levelSettings, + const std::string& levelName, LevelSettings* levelSettings, Dimension* fixedDimension, bool doCreateChunkSource = true); virtual ~Level(); @@ -349,10 +349,10 @@ public: float volume, float pitch, bool distanceDelay, float fClipSoundDist = 16.0f); - void playStreamingMusic(const std::wstring& name, int x, int y, int z); - void playMusic(double x, double y, double z, const std::wstring& string, + void playStreamingMusic(const std::string& name, int x, int y, int z); + void playMusic(double x, double y, double z, const std::string& string, float volume); - // 4J removed - void addParticle(const std::wstring& id, double x, double y, + // 4J removed - void addParticle(const std::string& id, double x, double y, // double z, double xd, double yd, double zd); void addParticle(ePARTICLE_TYPE id, double x, double y, double z, double xd, double yd, double zd); // 4J added @@ -429,8 +429,8 @@ public: float getSeenPercent(Vec3* center, AABB* bb); bool extinguishFire(std::shared_ptr player, int x, int y, int z, int face); - std::wstring gatherStats(); - std::wstring gatherChunkSourceStats(); + std::string gatherStats(); + std::string gatherChunkSourceStats(); virtual std::shared_ptr getTileEntity(int x, int y, int z); void setTileEntity(int x, int y, int z, std::shared_ptr tileEntity); @@ -571,9 +571,9 @@ public: double z, double maxDist); - std::shared_ptr getPlayerByName(const std::wstring& name); + std::shared_ptr getPlayerByName(const std::string& name); std::shared_ptr getPlayerByUUID( - const std::wstring& name); // 4J Added + const std::string& name); // 4J Added std::vector getBlocksAndData(int x, int y, int z, int xs, int ys, int zs, bool includeLighting = true); void setBlocksAndData(int x, int y, int z, int xs, int ys, int zs, @@ -611,10 +611,10 @@ public: bool isRaining(); bool isRainingAt(int x, int y, int z); bool isHumidAt(int x, int y, int z); - void setSavedData(const std::wstring& id, std::shared_ptr data); + void setSavedData(const std::string& id, std::shared_ptr data); std::shared_ptr getSavedData(const std::type_info& clazz, - const std::wstring& id); - int getFreeAuxValueFor(const std::wstring& id); + const std::string& id); + int getFreeAuxValueFor(const std::string& id); void globalLevelEvent(int type, int sourceX, int sourceY, int sourceZ, int data); void levelEvent(int type, int x, int y, int z, int data); @@ -635,7 +635,7 @@ public: int source); virtual float getDifficulty(double x, double y, double z); virtual float getDifficulty(int x, int y, int z); - TilePos* findNearestMapFeature(const std::wstring& featureName, int x, + TilePos* findNearestMapFeature(const std::string& featureName, int x, int y, int z); // 4J Added diff --git a/targets/minecraft/world/level/LevelConflictException.cpp b/targets/minecraft/world/level/LevelConflictException.cpp index 1d211f034..361236f1d 100644 --- a/targets/minecraft/world/level/LevelConflictException.cpp +++ b/targets/minecraft/world/level/LevelConflictException.cpp @@ -1,4 +1,4 @@ #include "LevelConflictException.h" -LevelConflictException::LevelConflictException(const std::wstring& msg) +LevelConflictException::LevelConflictException(const std::string& msg) : RuntimeException(msg) {} \ No newline at end of file diff --git a/targets/minecraft/world/level/LevelConflictException.h b/targets/minecraft/world/level/LevelConflictException.h index be09b5c9f..8122a6e6f 100644 --- a/targets/minecraft/world/level/LevelConflictException.h +++ b/targets/minecraft/world/level/LevelConflictException.h @@ -7,5 +7,5 @@ private: static const int32_t serialVersionUID = 1L; public: - LevelConflictException(const std::wstring& msg); + LevelConflictException(const std::string& msg); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/LevelListener.h b/targets/minecraft/world/level/LevelListener.h index 5b075623d..7cb7bbb33 100644 --- a/targets/minecraft/world/level/LevelListener.h +++ b/targets/minecraft/world/level/LevelListener.h @@ -15,7 +15,7 @@ public: virtual void allChanged() = 0; - // virtual void playSound(const wstring& name, double x, double y, double z, + // virtual void playSound(const string& name, double x, double y, double z, // float volume, float pitch) = 0; virtual void playSound(int iSound, double x, double y, double z, float volume, float pitch, @@ -25,7 +25,7 @@ public: float volume, float pitch, float fSoundClipDist = 16.0f) = 0; - // 4J removed - virtual void addParticle(const wstring& name, double x, + // 4J removed - virtual void addParticle(const string& name, double x, // double y, double z, double xa, double ya, double za) = 0; virtual void addParticle(ePARTICLE_TYPE name, double x, double y, double z, @@ -42,7 +42,7 @@ public: virtual void skyColorChanged() = 0; - virtual void playStreamingMusic(const std::wstring& name, int x, int y, + virtual void playStreamingMusic(const std::string& name, int x, int y, int z) = 0; virtual void globalLevelEvent(int type, int sourceX, int sourceY, int sourceZ, int data) = 0; diff --git a/targets/minecraft/world/level/LevelSettings.cpp b/targets/minecraft/world/level/LevelSettings.cpp index ebdbce5b8..1544a694e 100644 --- a/targets/minecraft/world/level/LevelSettings.cpp +++ b/targets/minecraft/world/level/LevelSettings.cpp @@ -9,20 +9,20 @@ GameType* GameType::CREATIVE = nullptr; GameType* GameType::ADVENTURE = nullptr; void GameType::staticCtor() { - NOT_SET = new GameType(-1, L""); - SURVIVAL = new GameType(0, L"survival"); - CREATIVE = new GameType(1, L"creative"); - ADVENTURE = new GameType(2, L"adventure"); + NOT_SET = new GameType(-1, ""); + SURVIVAL = new GameType(0, "survival"); + CREATIVE = new GameType(1, "creative"); + ADVENTURE = new GameType(2, "adventure"); } -GameType::GameType(int id, const std::wstring& name) { +GameType::GameType(int id, const std::string& name) { this->id = id; this->name = name; } int GameType::getId() { return id; } -std::wstring GameType::getName() { return name; } +std::string GameType::getName() { return name; } void GameType::updatePlayerAbilities(Abilities* abilities) { if (this == CREATIVE) { @@ -57,7 +57,7 @@ GameType* GameType::byId(int id) { return SURVIVAL; } -GameType* GameType::byName(const std::wstring& name) { +GameType* GameType::byName(const std::string& name) { if (name.compare(NOT_SET->name) == 0) return NOT_SET; else if (name.compare(SURVIVAL->name) == 0) @@ -82,7 +82,7 @@ void LevelSettings::_init(int64_t seed, GameType* gameType, this->levelType = levelType; this->allowCommands = false; this->startingBonusItems = false; - levelTypeOptions = L""; + levelTypeOptions = ""; m_xzSize = xzSize; m_hellScale = hellScale; } @@ -119,7 +119,7 @@ LevelSettings* LevelSettings::enableSinglePlayerCommands() { return this; } -LevelSettings* LevelSettings::setLevelTypeOptions(const std::wstring& options) { +LevelSettings* LevelSettings::setLevelTypeOptions(const std::string& options) { levelTypeOptions = options; return this; } @@ -149,4 +149,4 @@ int LevelSettings::getXZSize() { return m_xzSize; } int LevelSettings::getHellScale() { return m_hellScale; } -std::wstring LevelSettings::getLevelTypeOptions() { return levelTypeOptions; } \ No newline at end of file +std::string LevelSettings::getLevelTypeOptions() { return levelTypeOptions; } \ No newline at end of file diff --git a/targets/minecraft/world/level/LevelSettings.h b/targets/minecraft/world/level/LevelSettings.h index 30a20bf30..665770de1 100644 --- a/targets/minecraft/world/level/LevelSettings.h +++ b/targets/minecraft/world/level/LevelSettings.h @@ -21,19 +21,19 @@ public: private: int id; - std::wstring name; + std::string name; - GameType(int id, const std::wstring& name); + GameType(int id, const std::string& name); public: int getId(); - std::wstring getName(); + std::string getName(); void updatePlayerAbilities(Abilities* abilities); bool isAdventureRestricted(); bool isCreative(); bool isSurvival(); static GameType* byId(int id); - static GameType* byName(const std::wstring& name); + static GameType* byName(const std::string& name); }; class LevelSettings { @@ -46,7 +46,7 @@ private: LevelType* levelType; bool allowCommands; bool startingBonusItems; // 4J - brought forward from 1.3.2 - std::wstring levelTypeOptions; + std::string levelTypeOptions; int m_xzSize; // 4J Added int m_hellScale; @@ -64,7 +64,7 @@ public: LevelSettings* enableStartingBonusItems(); // 4J - brought forward from 1.3.2 LevelSettings* enableSinglePlayerCommands(); - LevelSettings* setLevelTypeOptions(const std::wstring& options); + LevelSettings* setLevelTypeOptions(const std::string& options); bool hasStartingBonusItems(); // 4J - brought forward from 1.3.2 int64_t getSeed(); GameType* getGameType(); @@ -76,5 +76,5 @@ public: int getXZSize(); // 4J Added int getHellScale(); // 4J Added static GameType* validateGameType(int gameType); - std::wstring getLevelTypeOptions(); + std::string getLevelTypeOptions(); }; diff --git a/targets/minecraft/world/level/LevelType.cpp b/targets/minecraft/world/level/LevelType.cpp index c1026eea2..3758e1701 100644 --- a/targets/minecraft/world/level/LevelType.cpp +++ b/targets/minecraft/world/level/LevelType.cpp @@ -26,26 +26,26 @@ LevelType* LevelType::lvl_normal_1_1 = void LevelType::staticCtor() { for (int i = 0; i < 16; i++) levelTypes[i] = nullptr; - lvl_normal = new LevelType(0, L"default", 1); + lvl_normal = new LevelType(0, "default", 1); lvl_normal->setHasReplacement(); - lvl_flat = new LevelType(1, L"flat"); - lvl_largeBiomes = new LevelType(2, L"largeBiomes"); - lvl_normal_1_1 = new LevelType(8, L"default_1_1", 0); + lvl_flat = new LevelType(1, "flat"); + lvl_largeBiomes = new LevelType(2, "largeBiomes"); + lvl_normal_1_1 = new LevelType(8, "default_1_1", 0); lvl_normal_1_1->setSelectableByUser(false); } -LevelType::LevelType(int id, std::wstring generatorName) { +LevelType::LevelType(int id, std::string generatorName) { init(id, generatorName, 0); } -LevelType::LevelType(int id, std::wstring generatorName, int version) { +LevelType::LevelType(int id, std::string generatorName, int version) { m_generatorName = generatorName; m_version = version; m_selectable = true; levelTypes[id] = this; } -void LevelType::init(int id, std::wstring generatorName, int version) { +void LevelType::init(int id, std::string generatorName, int version) { this->id = id; m_generatorName = generatorName; m_version = version; @@ -53,10 +53,10 @@ void LevelType::init(int id, std::wstring generatorName, int version) { levelTypes[id] = this; } -std::wstring LevelType::getGeneratorName() { return m_generatorName; } +std::string LevelType::getGeneratorName() { return m_generatorName; } -std::wstring LevelType::getDescriptionId() { - return L"generator." + m_generatorName; +std::string LevelType::getDescriptionId() { + return "generator." + m_generatorName; } int LevelType::getVersion() { return m_version; } @@ -82,10 +82,10 @@ LevelType* LevelType::setHasReplacement() { bool LevelType::hasReplacement() { return m_replacement; } -LevelType* LevelType::getLevelType(std::wstring name) { +LevelType* LevelType::getLevelType(std::string name) { if (name.length() > 0) { for (int i = 0; i < 16; i++) { - std::wstring genname = levelTypes[i]->m_generatorName; + std::string genname = levelTypes[i]->m_generatorName; if (levelTypes[i] != nullptr && (genname.compare(name) == 0)) { return levelTypes[i]; diff --git a/targets/minecraft/world/level/LevelType.h b/targets/minecraft/world/level/LevelType.h index 353f833cb..81ca20487 100644 --- a/targets/minecraft/world/level/LevelType.h +++ b/targets/minecraft/world/level/LevelType.h @@ -15,18 +15,18 @@ public: private: int id; - std::wstring m_generatorName; + std::string m_generatorName; int m_version; bool m_selectable; bool m_replacement; - LevelType(int id, std::wstring generatorName); - LevelType(int id, std::wstring generatorName, int version); - void init(int id, std::wstring generatorName, int version); + LevelType(int id, std::string generatorName); + LevelType(int id, std::string generatorName, int version); + void init(int id, std::string generatorName, int version); public: - std::wstring getGeneratorName(); - std::wstring getDescriptionId(); + std::string getGeneratorName(); + std::string getDescriptionId(); int getVersion(); LevelType* getReplacementForVersion(int oldVersion); @@ -41,6 +41,6 @@ private: public: bool hasReplacement(); - static LevelType* getLevelType(std::wstring name); + static LevelType* getLevelType(std::string name); int getId(); }; diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index ac9dd9663..f617b1f30 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -73,7 +73,7 @@ void Biome::staticCtor() { Biome::ocean = (new OceanBiome(0)) ->setColor(0x000070) - ->setName(L"Ocean") + ->setName("Ocean") ->setDepthAndScale(-1, 0.4f) ->setLeafFoliageWaterSkyColor( eMinecraftColour_Grass_Ocean, eMinecraftColour_Foliage_Ocean, @@ -81,7 +81,7 @@ void Biome::staticCtor() { Biome::plains = (new PlainsBiome(1)) ->setColor(0x8db360) - ->setName(L"Plains") + ->setName("Plains") ->setTemperatureAndDownfall(0.8f, 0.4f) ->setLeafFoliageWaterSkyColor( eMinecraftColour_Grass_Plains, eMinecraftColour_Foliage_Plains, @@ -89,7 +89,7 @@ void Biome::staticCtor() { Biome::desert = (new DesertBiome(2)) ->setColor(0xFA9418) - ->setName(L"Desert") + ->setName("Desert") ->setNoRain() ->setTemperatureAndDownfall(2, 0) ->setDepthAndScale(0.1f, 0.2f) @@ -100,7 +100,7 @@ void Biome::staticCtor() { Biome::extremeHills = (new ExtremeHillsBiome(3)) ->setColor(0x606060) - ->setName(L"Extreme Hills") + ->setName("Extreme Hills") ->setDepthAndScale(0.3f, 1.5f) ->setTemperatureAndDownfall(0.2f, 0.3f) ->setLeafFoliageWaterSkyColor(eMinecraftColour_Grass_ExtremeHills, @@ -110,7 +110,7 @@ void Biome::staticCtor() { Biome::forest = (new ForestBiome(4)) ->setColor(0x056621) - ->setName(L"Forest") + ->setName("Forest") ->setLeafColor(0x4EBA31) ->setTemperatureAndDownfall(0.7f, 0.8f) ->setLeafFoliageWaterSkyColor( @@ -121,7 +121,7 @@ void Biome::staticCtor() { Biome::taiga = (new TaigaBiome(5)) ->setColor(0x0b6659) - ->setName(L"Taiga") + ->setName("Taiga") ->setLeafColor(0x4EBA31) ->setSnowCovered() ->setTemperatureAndDownfall(0.05f, 0.8f) @@ -133,7 +133,7 @@ void Biome::staticCtor() { Biome::swampland = (new SwampBiome(6)) ->setColor(0x07F9B2) - ->setName(L"Swampland") + ->setName("Swampland") ->setLeafColor(0x8BAF48) ->setDepthAndScale(-0.2f, 0.1f) ->setTemperatureAndDownfall(0.8f, 0.9f) @@ -144,7 +144,7 @@ void Biome::staticCtor() { Biome::river = (new RiverBiome(7)) ->setColor(0x0000ff) - ->setName(L"River") + ->setName("River") ->setDepthAndScale(-0.5f, 0) ->setLeafFoliageWaterSkyColor( eMinecraftColour_Grass_River, eMinecraftColour_Foliage_River, @@ -153,7 +153,7 @@ void Biome::staticCtor() { Biome::hell = (new HellBiome(8)) ->setColor(0xff0000) - ->setName(L"Hell") + ->setName("Hell") ->setNoRain() ->setTemperatureAndDownfall(2, 0) ->setLeafFoliageWaterSkyColor( @@ -161,7 +161,7 @@ void Biome::staticCtor() { eMinecraftColour_Water_Hell, eMinecraftColour_Sky_Hell); Biome::sky = (new TheEndBiome(9)) ->setColor(0x8080ff) - ->setName(L"Sky") + ->setName("Sky") ->setNoRain() ->setLeafFoliageWaterSkyColor(eMinecraftColour_Grass_Sky, eMinecraftColour_Foliage_Sky, @@ -171,7 +171,7 @@ void Biome::staticCtor() { Biome::frozenOcean = (new OceanBiome(10)) ->setColor(0x9090a0) - ->setName(L"FrozenOcean") + ->setName("FrozenOcean") ->setSnowCovered() ->setDepthAndScale(-1, 0.5f) ->setTemperatureAndDownfall(0, 0.5f) @@ -182,7 +182,7 @@ void Biome::staticCtor() { Biome::frozenRiver = (new RiverBiome(11)) ->setColor(0xa0a0ff) - ->setName(L"FrozenRiver") + ->setName("FrozenRiver") ->setSnowCovered() ->setDepthAndScale(-0.5f, 0) ->setTemperatureAndDownfall(0, 0.5f) @@ -193,7 +193,7 @@ void Biome::staticCtor() { Biome::iceFlats = (new IceBiome(12)) ->setColor(0xffffff) - ->setName(L"Ice Plains") + ->setName("Ice Plains") ->setSnowCovered() ->setTemperatureAndDownfall(0, 0.5f) ->setLeafFoliageWaterSkyColor(eMinecraftColour_Grass_IcePlains, @@ -203,7 +203,7 @@ void Biome::staticCtor() { Biome::iceMountains = (new IceBiome(13)) ->setColor(0xa0a0a0) - ->setName(L"Ice Mountains") + ->setName("Ice Mountains") ->setSnowCovered() ->setDepthAndScale(0.3f, 1.3f) ->setTemperatureAndDownfall(0, 0.5f) @@ -214,7 +214,7 @@ void Biome::staticCtor() { Biome::mushroomIsland = (new MushroomIslandBiome(14)) ->setColor(0xff00ff) - ->setName(L"MushroomIsland") + ->setName("MushroomIsland") ->setTemperatureAndDownfall(0.9f, 1.0f) ->setDepthAndScale(0.2f, 1.0f) ->setLeafFoliageWaterSkyColor( @@ -225,7 +225,7 @@ void Biome::staticCtor() { Biome::mushroomIslandShore = (new MushroomIslandBiome(15)) ->setColor(0xa000ff) - ->setName(L"MushroomIslandShore") + ->setName("MushroomIslandShore") ->setTemperatureAndDownfall(0.9f, 1.0f) ->setDepthAndScale(-1, 0.1f) ->setLeafFoliageWaterSkyColor( @@ -237,7 +237,7 @@ void Biome::staticCtor() { Biome::beaches = (new BeachBiome(16)) ->setColor(0xfade55) - ->setName(L"Beach") + ->setName("Beach") ->setTemperatureAndDownfall(0.8f, 0.4f) ->setDepthAndScale(0.0f, 0.1f) ->setLeafFoliageWaterSkyColor( @@ -246,7 +246,7 @@ void Biome::staticCtor() { Biome::desertHills = (new DesertBiome(17)) ->setColor(0xd25f12) - ->setName(L"DesertHills") + ->setName("DesertHills") ->setNoRain() ->setTemperatureAndDownfall(2, 0) ->setDepthAndScale(0.3f, 0.8f) @@ -257,7 +257,7 @@ void Biome::staticCtor() { Biome::forestHills = (new ForestBiome(18)) ->setColor(0x22551c) - ->setName(L"ForestHills") + ->setName("ForestHills") ->setLeafColor(0x4EBA31) ->setTemperatureAndDownfall(0.7f, 0.8f) ->setDepthAndScale(0.3f, 0.7f) @@ -268,7 +268,7 @@ void Biome::staticCtor() { Biome::taigaHills = (new TaigaBiome(19)) ->setColor(0x163933) - ->setName(L"TaigaHills") + ->setName("TaigaHills") ->setSnowCovered() ->setLeafColor(0x4EBA31) ->setTemperatureAndDownfall(0.05f, 0.8f) @@ -280,7 +280,7 @@ void Biome::staticCtor() { Biome::smallerExtremeHills = (new ExtremeHillsBiome(20)) ->setColor(0x72789a) - ->setName(L"Extreme Hills Edge") + ->setName("Extreme Hills Edge") ->setDepthAndScale(0.2f, 0.8f) ->setTemperatureAndDownfall(0.2f, 0.3f) ->setLeafFoliageWaterSkyColor( @@ -292,7 +292,7 @@ void Biome::staticCtor() { Biome::jungle = (new JungleBiome(21)) ->setColor(0x537b09) - ->setName(L"Jungle") + ->setName("Jungle") ->setLeafColor(0x537b09) ->setTemperatureAndDownfall(1.2f, 0.9f) ->setDepthAndScale(0.2f, 0.4f) @@ -302,7 +302,7 @@ void Biome::staticCtor() { Biome::jungleHills = (new JungleBiome(22)) ->setColor(0x2c4205) - ->setName(L"JungleHills") + ->setName("JungleHills") ->setLeafColor(0x537b09) ->setTemperatureAndDownfall(1.2f, 0.9f) ->setDepthAndScale(1.8f, 0.5f) @@ -420,7 +420,7 @@ Biome* Biome::setSnowCovered() { return this; } -Biome* Biome::setName(const std::wstring& name) { +Biome* Biome::setName(const std::string& name) { this->m_name = name; return this; } diff --git a/targets/minecraft/world/level/biome/Biome.h b/targets/minecraft/world/level/biome/Biome.h index 70ee2f20b..57a1fe990 100644 --- a/targets/minecraft/world/level/biome/Biome.h +++ b/targets/minecraft/world/level/biome/Biome.h @@ -59,7 +59,7 @@ public: static const int BIOME_COUNT = 23; // 4J Stu added public: - std::wstring m_name; + std::string m_name; int color; uint8_t topMaterial; uint8_t material; @@ -131,7 +131,7 @@ public: protected: Biome* setSnowCovered(); - Biome* setName(const std::wstring& name); + Biome* setName(const std::string& name); Biome* setLeafColor(int leafColor); Biome* setColor(int color); diff --git a/targets/minecraft/world/level/chunk/ChunkSource.h b/targets/minecraft/world/level/chunk/ChunkSource.h index b09594148..d37bf3c2f 100644 --- a/targets/minecraft/world/level/chunk/ChunkSource.h +++ b/targets/minecraft/world/level/chunk/ChunkSource.h @@ -80,12 +80,12 @@ public: /** * Returns some stats that are rendered when the user holds F3. */ - virtual std::wstring gatherStats() = 0; + virtual std::string gatherStats() = 0; virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z) = 0; virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z) = 0; /** diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index 765a6888d..8cf7e6b07 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -1350,7 +1350,7 @@ void LevelChunk::load() { if (m_bUnloaded && m_unloadedEntitiesTag) { ListTag* entityTags = (ListTag*)m_unloadedEntitiesTag->getList( - L"Entities"); + "Entities"); if (entityTags != nullptr) { for (int i = 0; i < entityTags->size(); i++) { CompoundTag* teTag = entityTags->get(i); @@ -1365,7 +1365,7 @@ void LevelChunk::load() { ListTag* tileEntityTags = (ListTag*)m_unloadedEntitiesTag->getList( - L"TileEntities"); + "TileEntities"); if (tileEntityTags != nullptr) { for (int i = 0; i < tileEntityTags->size(); i++) { CompoundTag* teTag = tileEntityTags->get(i); @@ -1464,7 +1464,7 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter } } - m_unloadedEntitiesTag->put(L"Entities", entityTags); + m_unloadedEntitiesTag->put("Entities", entityTags); ListTag* tileEntityTags = new ListTag(); @@ -1481,7 +1481,7 @@ void LevelChunk::unload(bool unloadTileEntities) // 4J - added parameter // Clear out the tileEntities list tileEntities.clear(); - m_unloadedEntitiesTag->put(L"TileEntities", tileEntityTags); + m_unloadedEntitiesTag->put("TileEntities", tileEntityTags); } } #endif diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp index 204c62952..954d10542 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.cpp @@ -63,7 +63,7 @@ bool ReadOnlyChunkCache::tick() { return false; } bool ReadOnlyChunkCache::shouldSave() { return false; } -std::wstring ReadOnlyChunkCache::gatherStats() { return L"ReadOnlyChunkCache"; } +std::string ReadOnlyChunkCache::gatherStats() { return "ReadOnlyChunkCache"; } std::vector* ReadOnlyChunkCache::getMobsAt( MobCategory* mobCategory, int x, int y, int z) { @@ -71,6 +71,6 @@ std::vector* ReadOnlyChunkCache::getMobsAt( } TilePos* ReadOnlyChunkCache::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return nullptr; } diff --git a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h index 6ef1ba569..c8cf3085b 100644 --- a/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h +++ b/targets/minecraft/world/level/chunk/ReadOnlyChunkCache.h @@ -41,11 +41,11 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); }; diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index d6952cf88..784abea6c 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -44,31 +44,31 @@ int McRegionChunkStorage::s_runningThreadCount = 0; C4JThread* McRegionChunkStorage::s_saveThreads[3]; McRegionChunkStorage::McRegionChunkStorage(ConsoleSaveFile* saveFile, - const std::wstring& prefix) + const std::string& prefix) : m_prefix(prefix) { m_saveFile = saveFile; // Make sure that if there are any files for regions to be created, that // they are created in the order that suits us for making the initial level // save work fast - if (prefix == L"") { - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM-1r.-1.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"DIM1/r.-1.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.-1.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.0.-1.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.0.0.mcr")); - m_saveFile->createFile(ConsoleSavePath(L"r.-1.0.mcr")); + if (prefix == "") { + m_saveFile->createFile(ConsoleSavePath("DIM-1r.-1.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM-1r.0.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM-1r.0.0.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM-1r.-1.0.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM1/r.-1.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM1/r.0.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM1/r.0.0.mcr")); + m_saveFile->createFile(ConsoleSavePath("DIM1/r.-1.0.mcr")); + m_saveFile->createFile(ConsoleSavePath("r.-1.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("r.0.-1.mcr")); + m_saveFile->createFile(ConsoleSavePath("r.0.0.mcr")); + m_saveFile->createFile(ConsoleSavePath("r.-1.0.mcr")); } #if defined(SPLIT_SAVES) ConsoleSavePath currentFile = - ConsoleSavePath(m_prefix + std::wstring(L"entities.dat")); + ConsoleSavePath(m_prefix + std::string("entities.dat")); if (m_saveFile->doesFileExist(currentFile)) { ConsoleSaveFileInputStream fis = @@ -140,7 +140,7 @@ LevelChunk* McRegionChunkStorage::load(Level* level, int x, int z) { regionChunkInputStream->deleteChildStream(); delete regionChunkInputStream; - if (!chunkData->contains(L"Level")) { + if (!chunkData->contains("Level")) { char buf[256]; sprintf(buf, "Chunk file at %d, %d is missing level data, skipping\n", x, @@ -149,7 +149,7 @@ LevelChunk* McRegionChunkStorage::load(Level* level, int x, int z) { delete chunkData; return nullptr; } - if (!chunkData->getCompound(L"Level")->contains(L"Blocks")) { + if (!chunkData->getCompound("Level")->contains("Blocks")) { char buf[256]; sprintf(buf, "Chunk file at %d, %d is missing block data, skipping\n", x, @@ -159,7 +159,7 @@ LevelChunk* McRegionChunkStorage::load(Level* level, int x, int z) { return nullptr; } levelChunk = - OldChunkStorage::load(level, chunkData->getCompound(L"Level")); + OldChunkStorage::load(level, chunkData->getCompound("Level")); if (!levelChunk->isAt(x, z)) { char buf[256]; sprintf(buf, @@ -173,8 +173,8 @@ LevelChunk* McRegionChunkStorage::load(Level* level, int x, int z) { // 4J Stu - We delete the data within OldChunkStorage::load, so we // can never reload from it - // chunkData->putInt(L"xPos", x); - // chunkData->putInt(L"zPos", z); + // chunkData->putInt("xPos", x); + // chunkData->putInt("zPos", z); // levelChunk = OldChunkStorage::load(level, } #if defined(SPLIT_SAVES) @@ -223,7 +223,7 @@ void McRegionChunkStorage::save(Level* level, LevelChunk* levelChunk) { std::lock_guard lock(cs_memory); tag = new CompoundTag(); CompoundTag* levelData = new CompoundTag(); - tag->put(L"Level", levelData); + tag->put("Level", levelData); OldChunkStorage::save(levelChunk, level, levelData); NbtIo::write(tag, output); @@ -306,7 +306,7 @@ void McRegionChunkStorage::tick() { m_saveFile->tick(); } void McRegionChunkStorage::flush() { #if defined(SPLIT_SAVES) ConsoleSavePath currentFile = - ConsoleSavePath(m_prefix + std::wstring(L"entities.dat")); + ConsoleSavePath(m_prefix + std::string("entities.dat")); ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(m_saveFile, currentFile); BufferedOutputStream bos(&fos, 1024 * 1024); diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index 7cfec8d33..2938d9a37 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -24,7 +24,7 @@ class LevelChunk; class McRegionChunkStorage : public ChunkStorage { private: - const std::wstring m_prefix; + const std::string m_prefix; ConsoleSaveFile* m_saveFile; static std::mutex cs_memory; @@ -35,7 +35,7 @@ private: static C4JThread* s_saveThreads[3]; public: - McRegionChunkStorage(ConsoleSaveFile* saveFile, const std::wstring& prefix); + McRegionChunkStorage(ConsoleSaveFile* saveFile, const std::string& prefix); ~McRegionChunkStorage(); static void staticCtor(); diff --git a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp index d45069c35..2e4fb78ee 100644 --- a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.cpp @@ -7,9 +7,9 @@ namespace { std::FILE* OpenBinaryFileForReadWrite(const File& file) { #if defined(_WIN32) - std::FILE* stream = _wfopen(file.getPath().c_str(), L"r+b"); + std::FILE* stream = _wfopen(file.getPath().c_str(), "r+b"); if (stream == nullptr) { - stream = _wfopen(file.getPath().c_str(), L"w+b"); + stream = _wfopen(file.getPath().c_str(), "w+b"); } #else const std::string nativePath = std::filesystem::path(file.getPath()).string(); @@ -186,11 +186,11 @@ void NbtSlotFile::replaceSlot(int slot, std::vector* tags) { CompoundTag* tag = *it; // tags->at(i); std::vector compressed = NbtIo::compress(tag); if (compressed.size() > largest) { - wchar_t buf[256]; + char buf[256]; largest = compressed.size(); #ifndef _CONTENT_PACKAGE - swprintf(buf, 256, L"New largest: %I64d (%ls)\n", largest, - tag->getString(L"id").c_str()); + snprintf(buf, 256, "New largest: %I64d (%s)\n", largest, + tag->getString("id").c_str()); OutputDebugStringW(buf); #endif } diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index c4c5d5651..40cb60a7c 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -74,49 +74,49 @@ OldChunkStorage::OldChunkStorage(File dir, bool create) { } File OldChunkStorage::getFile(int x, int z) { - wchar_t name[MAX_PATH_SIZE]; - wchar_t path1[MAX_PATH_SIZE]; - wchar_t path2[MAX_PATH_SIZE]; + char name[MAX_PATH_SIZE]; + char path1[MAX_PATH_SIZE]; + char path2[MAX_PATH_SIZE]; - wchar_t xRadix36[64]; - wchar_t zRadix36[64]; + char xRadix36[64]; + char zRadix36[64]; #if defined(__linux__) assert(0); // need a gcc verison of _itow ? #else _itow(x, xRadix36, 36); _itow(z, zRadix36, 36); - swprintf(name, MAX_PATH_SIZE, L"c.%ls.%ls.dat", xRadix36, zRadix36); + snprintf(name, MAX_PATH_SIZE, "c.%s.%s.dat", xRadix36, zRadix36); _itow(x & 63, path1, 36); _itow(z & 63, path2, 36); #endif // sprintf(file,"%s\\%s",dir,path1); - File file(dir, std::wstring(path1)); + File file(dir, std::string(path1)); if (!file.exists()) { if (create) file.mkdir(); else { - return File(L""); + return File(""); } } // strcat(file,"\\"); // strcat(file,path2); - file = File(file, std::wstring(path2)); + file = File(file, std::string(path2)); if (!file.exists()) { if (create) file.mkdir(); else { - return File(L""); + return File(""); } } // strcat(file,"\\"); // strcat(file,name); // sprintf(file,"%s\\%s",file,name); - file = File(file, std::wstring(name)); + file = File(file, std::string(name)); if (!file.exists()) { if (!create) { - return File(L""); + return File(""); } } return file; @@ -130,7 +130,7 @@ LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { // System.out.println("Loading chunk "+x+", "+z); FileInputStream fis = FileInputStream(file); CompoundTag* tag = NbtIo::readCompressed(&fis); - if (!tag->contains(L"Level")) { + if (!tag->contains("Level")) { char buf[256]; sprintf(buf, "Chunk file at %d, %d is missing level data, skipping\n", x, @@ -138,7 +138,7 @@ LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { Log::info(buf); return nullptr; } - if (!tag->getCompound(L"Level")->contains(L"Blocks")) { + if (!tag->getCompound("Level")->contains("Blocks")) { char buf[256]; sprintf(buf, "Chunk file at %d, %d is missing block data, skipping\n", x, @@ -147,7 +147,7 @@ LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { return nullptr; } LevelChunk* levelChunk = - OldChunkStorage::load(level, tag->getCompound(L"Level")); + OldChunkStorage::load(level, tag->getCompound("Level")); if (!levelChunk->isAt(x, z)) { char buf[256]; sprintf(buf, @@ -155,10 +155,10 @@ LevelChunk* OldChunkStorage::load(Level* level, int x, int z) { "Expected %d, %d, got %d, %d\n", x, z, x, z, levelChunk->x, levelChunk->z); Log::info(buf); - tag->putInt(L"xPos", x); - tag->putInt(L"zPos", z); + tag->putInt("xPos", x); + tag->putInt("zPos", z); levelChunk = - OldChunkStorage::load(level, tag->getCompound(L"Level")); + OldChunkStorage::load(level, tag->getCompound("Level")); } return levelChunk; @@ -181,14 +181,14 @@ void OldChunkStorage::save(Level* level, LevelChunk* levelChunk) { // try { // char tmpFileName[MAX_PATH_SIZE]; // sprintf(tmpFileName,"%s\\%s",dir,"tmp_chunk.dat"); - File tmpFile(dir, L"tmp_chunk.dat"); + File tmpFile(dir, "tmp_chunk.dat"); // System.out.println("Saving chunk "+levelChunk.x+", // "+levelChunk.z); FileOutputStream fos = FileOutputStream(tmpFile); CompoundTag* tag = new CompoundTag(); CompoundTag* levelData = new CompoundTag(); - tag->put(L"Level", levelData); + tag->put("Level", levelData); OldChunkStorage::save(levelChunk, level, levelData); NbtIo::writeCompressed(tag, &fos); fos.close(); @@ -233,7 +233,7 @@ bool OldChunkStorage::saveEntities(LevelChunk* lc, Level* level, } } - tag->put(L"Entities", entityTags); + tag->put("Entities", entityTags); return lc->lastSaveHadEntities; } @@ -274,7 +274,7 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, te->save(teTag); tileEntityTags->add(teTag); } - tag->put(L"TileEntities", tileEntityTags); + tag->put("TileEntities", tileEntityTags); std::vector* ticksInChunk = level->fetchTicksInChunk(lc, false); @@ -285,15 +285,15 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, for (int i = 0; i < ticksInChunk->size(); i++) { TickNextTickData td = ticksInChunk->at(i); CompoundTag* teTag = new CompoundTag(); - teTag->putInt(L"i", td.tileId); - teTag->putInt(L"x", td.x); - teTag->putInt(L"y", td.y); - teTag->putInt(L"z", td.z); - teTag->putInt(L"t", (int)(td.m_delay - levelTime)); + teTag->putInt("i", td.tileId); + teTag->putInt("x", td.x); + teTag->putInt("y", td.y); + teTag->putInt("z", td.z); + teTag->putInt("t", (int)(td.m_delay - levelTime)); tickTags->add(teTag); } - tag->put(L"TileTicks", tickTags); + tag->put("TileTicks", tickTags); } delete ticksInChunk; @@ -303,10 +303,10 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { level->checkSession(); - tag->putInt(L"xPos", lc->x); - tag->putInt(L"zPos", lc->z); - tag->putLong(L"LastUpdate", level->getGameTime()); - tag->putLong(L"InhabitedTime", lc->inhabitedTime); + tag->putInt("xPos", lc->x); + tag->putInt("zPos", lc->z); + tag->putLong("LastUpdate", level->getGameTime()); + tag->putLong("InhabitedTime", lc->inhabitedTime); // 4J - changes here for new storage. Now have static storage for getting // lighting data for block, data, and sky & block lighting. This wasn't // required in the original version as we could just reference the @@ -323,27 +323,27 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { // static std::vector blockData = std::vector(32768); lc->getBlockData(tls->blockData); - tag->putByteArray(L"Blocks", tls->blockData); + tag->putByteArray("Blocks", tls->blockData); // static std::vector dataData = std::vector(16384); lc->getDataData(tls->dataData); - tag->putByteArray(L"Data", tls->dataData); + tag->putByteArray("Data", tls->dataData); // static std::vector skyLightData = std::vector(16384); // static std::vector blockLightData = std::vector(16384); lc->getSkyLightData(tls->skyLightData); lc->getBlockLightData(tls->blockLightData); - tag->putByteArray(L"SkyLight", tls->skyLightData); - tag->putByteArray(L"BlockLight", tls->blockLightData); + tag->putByteArray("SkyLight", tls->skyLightData); + tag->putByteArray("BlockLight", tls->blockLightData); - tag->putByteArray(L"HeightMap", lc->heightmap); + tag->putByteArray("HeightMap", lc->heightmap); tag->putShort( - L"TerrainPopulatedFlags", + "TerrainPopulatedFlags", lc->terrainPopulated); // 4J - changed from "TerrainPopulated" to // "TerrainPopulatedFlags" as now stores a // bitfield, java stores a bool std::vector biomeData = lc->getBiomes(); - tag->putByteArray(L"Biomes", biomeData); + tag->putByteArray("Biomes", biomeData); #if !defined(SPLIT_SAVES) saveEntities(lc, level, tag); @@ -361,7 +361,7 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { te->save(teTag); tileEntityTags->add(teTag); } - tag->put(L"TileEntities", tileEntityTags); + tag->put("TileEntities", tileEntityTags); std::vector* ticksInChunk = level->fetchTicksInChunk(lc, false); @@ -372,16 +372,16 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { for (int i = 0; i < ticksInChunk->size(); i++) { TickNextTickData td = ticksInChunk->at(i); CompoundTag* teTag = new CompoundTag(); - teTag->putInt(L"i", td.tileId); - teTag->putInt(L"x", td.x); - teTag->putInt(L"y", td.y); - teTag->putInt(L"z", td.z); - teTag->putInt(L"t", (int)(td.m_delay - levelTime)); - teTag->putInt(L"p", td.priorityTilt); + teTag->putInt("i", td.tileId); + teTag->putInt("x", td.x); + teTag->putInt("y", td.y); + teTag->putInt("z", td.z); + teTag->putInt("t", (int)(td.m_delay - levelTime)); + teTag->putInt("p", td.priorityTilt); tickTags->add(teTag); } - tag->put(L"TileTicks", tickTags); + tag->put("TileTicks", tickTags); } delete ticksInChunk; } @@ -389,7 +389,7 @@ void OldChunkStorage::save(LevelChunk* lc, Level* level, CompoundTag* tag) { void OldChunkStorage::loadEntities(LevelChunk* lc, Level* level, CompoundTag* tag) { ListTag* entityTags = - (ListTag*)tag->getList(L"Entities"); + (ListTag*)tag->getList("Entities"); if (entityTags != nullptr) { for (int i = 0; i < entityTags->size(); i++) { CompoundTag* teTag = entityTags->get(i); @@ -402,7 +402,7 @@ void OldChunkStorage::loadEntities(LevelChunk* lc, Level* level, } ListTag* tileEntityTags = - (ListTag*)tag->getList(L"TileEntities"); + (ListTag*)tag->getList("TileEntities"); if (tileEntityTags != nullptr) { for (int i = 0; i < tileEntityTags->size(); i++) { CompoundTag* teTag = tileEntityTags->get(i); @@ -462,18 +462,18 @@ LevelChunk* OldChunkStorage::load(Level* level, DataInputStream* dis) { loadEntities(levelChunk, level, tag); - if (tag->contains(L"TileTicks")) { + if (tag->contains("TileTicks")) { ListTag* tileTicks = - (ListTag*)tag->getList(L"TileTicks"); + (ListTag*)tag->getList("TileTicks"); if (tileTicks != nullptr) { for (int i = 0; i < tileTicks->size(); i++) { CompoundTag* teTag = tileTicks->get(i); level->forceAddTileTick( - teTag->getInt(L"x"), teTag->getInt(L"y"), - teTag->getInt(L"z"), teTag->getInt(L"i"), - teTag->getInt(L"t"), teTag->getInt(L"p")); + teTag->getInt("x"), teTag->getInt("y"), + teTag->getInt("z"), teTag->getInt("i"), + teTag->getInt("t"), teTag->getInt("p")); } } } @@ -484,34 +484,34 @@ LevelChunk* OldChunkStorage::load(Level* level, DataInputStream* dis) { } LevelChunk* OldChunkStorage::load(Level* level, CompoundTag* tag) { - int x = tag->getInt(L"xPos"); - int z = tag->getInt(L"zPos"); + int x = tag->getInt("xPos"); + int z = tag->getInt("zPos"); LevelChunk* levelChunk = new LevelChunk(level, x, z); // 4J - the original code uses the data in the tag directly, but this is now // just used as a source when creating the compressed data, so we need to // free up the data in the tag once we are done { - auto blocks = tag->getByteArray(L"Blocks"); + auto blocks = tag->getByteArray("Blocks"); levelChunk->setBlockData(blocks); } - // levelChunk->blocks = tag->getByteArray(L"Blocks"); + // levelChunk->blocks = tag->getByteArray("Blocks"); // 4J - the original code uses the data in the tag directly, but this is now // just used as a source when creating the compressed data, so we need to // free up the data in the tag once we are done { - auto data = tag->getByteArray(L"Data"); + auto data = tag->getByteArray("Data"); levelChunk->setDataData(data); } // 4J - changed to use our new methods for accessing lighting { - auto skyLight = tag->getByteArray(L"SkyLight"); + auto skyLight = tag->getByteArray("SkyLight"); levelChunk->setSkyLightData(skyLight); } { - auto blockLight = tag->getByteArray(L"BlockLight"); + auto blockLight = tag->getByteArray("BlockLight"); levelChunk->setBlockLightData(blockLight); } @@ -520,17 +520,17 @@ LevelChunk* OldChunkStorage::load(Level* level, CompoundTag* tag) { // new setSkyLightData/setBlockLightData take a copy of the data so we need // to delete the local one now - // levelChunk->skyLight = new DataLayer(tag->getByteArray(L"SkyLight"), + // levelChunk->skyLight = new DataLayer(tag->getByteArray("SkyLight"), // level->depthBits); levelChunk->blockLight = new - // DataLayer(tag->getByteArray(L"BlockLight"), level->depthBits); + // DataLayer(tag->getByteArray("BlockLight"), level->depthBits); - levelChunk->heightmap = tag->getByteArray(L"HeightMap"); + levelChunk->heightmap = tag->getByteArray("HeightMap"); // 4J - TerrainPopulated was a bool (java), then changed to be a byte // bitfield, then replaced with TerrainPopulatedShort to store a wider // bitfield - if (tag->get(L"TerrainPopulated")) { + if (tag->get("TerrainPopulated")) { // Java bool type or byte bitfield - levelChunk->terrainPopulated = tag->getByte(L"TerrainPopulated"); + levelChunk->terrainPopulated = tag->getByte("TerrainPopulated"); if (levelChunk->terrainPopulated >= 1) levelChunk->terrainPopulated = LevelChunk::sTerrainPopulatedAllNeighbours | @@ -538,7 +538,7 @@ LevelChunk* OldChunkStorage::load(Level* level, CompoundTag* tag) { // type to new bitfield } else { // New style short - levelChunk->terrainPopulated = tag->getShort(L"TerrainPopulatedFlags"); + levelChunk->terrainPopulated = tag->getShort("TerrainPopulatedFlags"); // If all neighbours have been post-processed, then we should have done // the post-post-processing now. Check that this is set as if it isn't // then we won't be able to send network data for chunks, and we won't @@ -563,26 +563,26 @@ LevelChunk* OldChunkStorage::load(Level* level, CompoundTag* tag) { } else #endif { - if (tag->contains(L"Biomes")) { - auto biomes = tag->getByteArray(L"Biomes"); + if (tag->contains("Biomes")) { + auto biomes = tag->getByteArray("Biomes"); levelChunk->setBiomes(biomes); } } loadEntities(levelChunk, level, tag); - if (tag->contains(L"TileTicks")) { + if (tag->contains("TileTicks")) { ListTag* tileTicks = - (ListTag*)tag->getList(L"TileTicks"); + (ListTag*)tag->getList("TileTicks"); if (tileTicks != nullptr) { for (int i = 0; i < tileTicks->size(); i++) { CompoundTag* teTag = tileTicks->get(i); level->forceAddTileTick( - teTag->getInt(L"x"), teTag->getInt(L"y"), - teTag->getInt(L"z"), teTag->getInt(L"i"), - teTag->getInt(L"t"), teTag->getInt(L"p")); + teTag->getInt("x"), teTag->getInt("y"), + teTag->getInt("z"), teTag->getInt("i"), + teTag->getInt("t"), teTag->getInt("p")); } } } diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp index ac6abe580..273cf8266 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.cpp @@ -24,24 +24,24 @@ bool RegionFileCache::useSplitSaves(ESavePlatform platform) { } RegionFile* RegionFileCache::_getRegionFile( - ConsoleSaveFile* saveFile, const std::wstring& prefix, int chunkX, + ConsoleSaveFile* saveFile, const std::string& prefix, int chunkX, int chunkZ) // 4J - TODO was synchronized { // 4J Jev - changed back to use of the File class. // char file[MAX_PATH_SIZE]; // sprintf(file,"%s\\region\\r.%d.%d.mcr",basePath,chunkX >> 5,chunkZ >> 5); - // File regionDir(basePath, L"region"); + // File regionDir(basePath, "region"); - // File file(regionDir, wstring(L"r.") + toWString(chunkX>>5) + L"." + - // toWString(chunkZ>>5) + L".mcr" ); + // File file(regionDir, string("r.") + toWString(chunkX>>5) + "." + + // toWString(chunkZ>>5) + ".mcr" ); File file; if (useSplitSaves(saveFile->getSavePlatform())) { - file = File(prefix + std::wstring(L"r.") + toWString(chunkX >> 4) + - L"." + toWString(chunkZ >> 4) + L".mcr"); + file = File(prefix + std::string("r.") + toWString(chunkX >> 4) + + "." + toWString(chunkZ >> 4) + ".mcr"); } else { - file = File(prefix + std::wstring(L"r.") + toWString(chunkX >> 5) + - L"." + toWString(chunkZ >> 5) + L".mcr"); + file = File(prefix + std::string("r.") + toWString(chunkX >> 5) + + "." + toWString(chunkZ >> 5) + ".mcr"); } RegionFile* ref = nullptr; @@ -88,14 +88,14 @@ void RegionFileCache::_clear() // 4J - TODO was synchronized } int RegionFileCache::_getSizeDelta(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, + const std::string& prefix, int chunkX, int chunkZ) { RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, chunkZ); return r->getSizeDelta(); } DataInputStream* RegionFileCache::_getChunkDataInputStream( - ConsoleSaveFile* saveFile, const std::wstring& prefix, int chunkX, + ConsoleSaveFile* saveFile, const std::string& prefix, int chunkX, int chunkZ) { RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, chunkZ); if (useSplitSaves(saveFile->getSavePlatform())) { @@ -106,7 +106,7 @@ DataInputStream* RegionFileCache::_getChunkDataInputStream( } DataOutputStream* RegionFileCache::_getChunkDataOutputStream( - ConsoleSaveFile* saveFile, const std::wstring& prefix, int chunkX, + ConsoleSaveFile* saveFile, const std::string& prefix, int chunkX, int chunkZ) { RegionFile* r = _getRegionFile(saveFile, prefix, chunkX, chunkZ); if (useSplitSaves(saveFile->getSavePlatform())) { diff --git a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h index 05d407906..36dfe0547 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFileCache.h +++ b/targets/minecraft/world/level/chunk/storage/RegionFileCache.h @@ -29,38 +29,38 @@ public: ~RegionFileCache(); RegionFile* _getRegionFile(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, + const std::string& prefix, int chunkX, int chunkZ); // 4J - TODO was synchronized void _clear(); // 4J - TODO was synchronized - int _getSizeDelta(ConsoleSaveFile* saveFile, const std::wstring& prefix, + int _getSizeDelta(ConsoleSaveFile* saveFile, const std::string& prefix, int chunkX, int chunkZ); DataInputStream* _getChunkDataInputStream(ConsoleSaveFile* saveFile, - const std::wstring& prefix, + const std::string& prefix, int chunkX, int chunkZ); DataOutputStream* _getChunkDataOutputStream(ConsoleSaveFile* saveFile, - const std::wstring& prefix, + const std::string& prefix, int chunkX, int chunkZ); // Keep static version for general game usage static RegionFile* getRegionFile(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, + const std::string& prefix, int chunkX, int chunkZ) { return s_defaultCache._getRegionFile(saveFile, prefix, chunkX, chunkZ); } static void clear() { s_defaultCache._clear(); } static int getSizeDelta(ConsoleSaveFile* saveFile, - const std::wstring& prefix, int chunkX, + const std::string& prefix, int chunkX, int chunkZ) { return s_defaultCache._getSizeDelta(saveFile, prefix, chunkX, chunkZ); } static DataInputStream* getChunkDataInputStream(ConsoleSaveFile* saveFile, - const std::wstring& prefix, + const std::string& prefix, int chunkX, int chunkZ) { return s_defaultCache._getChunkDataInputStream(saveFile, prefix, chunkX, chunkZ); } static DataOutputStream* getChunkDataOutputStream( - ConsoleSaveFile* saveFile, const std::wstring& prefix, int chunkX, + ConsoleSaveFile* saveFile, const std::string& prefix, int chunkX, int chunkZ) { return s_defaultCache._getChunkDataOutputStream(saveFile, prefix, chunkX, chunkZ); diff --git a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp index deff8d4df..7babd8962 100644 --- a/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/ZoneFile.cpp @@ -8,9 +8,9 @@ namespace { std::FILE* OpenBinaryFileForReadWrite(const File& file) { #if defined(_WIN32) - std::FILE* stream = _wfopen(file.getPath().c_str(), L"r+b"); + std::FILE* stream = _wfopen(file.getPath().c_str(), "r+b"); if (stream == nullptr) { - stream = _wfopen(file.getPath().c_str(), L"w+b"); + stream = _wfopen(file.getPath().c_str(), "w+b"); } #else const std::string nativePath = std::filesystem::path(file.getPath()).string(); diff --git a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp index 8b351ab29..7dfd1135e 100644 --- a/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/ZonedChunkStorage.cpp @@ -38,7 +38,7 @@ ZonedChunkStorage::ZonedChunkStorage(File dir) { tickCount = 0; // this->dir = dir; - this->dir = File(dir, std::wstring(L"data")); + this->dir = File(dir, std::string("data")); if (!this->dir.exists()) this->dir.mkdirs(); } @@ -59,12 +59,12 @@ ZoneFile* ZonedChunkStorage::getZoneFile(int x, int z, bool create) { int64_t key = xZone + (zZone << 20l); // 4J - was !zoneFiles.containsKey(key) if (zoneFiles.find(key) == zoneFiles.end()) { - wchar_t xRadix36[64]; - wchar_t zRadix36[64]; + char xRadix36[64]; + char zRadix36[64]; _itow(x, xRadix36, 36); _itow(z, zRadix36, 36); - File file = File(dir, std::wstring(L"zone_") + toString(xRadix36) + - L"_" + toString(zRadix36) + L".dat"); + File file = File(dir, std::string("zone_") + toString(xRadix36) + + "_" + toString(zRadix36) + ".dat"); if (!file.exists()) { if (!create) return nullptr; @@ -75,8 +75,8 @@ ZoneFile* ZonedChunkStorage::getZoneFile(int x, int z, bool create) { } File entityFile = - File(dir, std::wstring(L"entities_") + toString(xRadix36) + L"_" + - toString(zRadix36) + L".dat"); + File(dir, std::string("entities_") + toString(xRadix36) + "_" + + toString(zRadix36) + ".dat"); zoneFiles[key] = new ZoneFile(key, file, entityFile); } @@ -201,7 +201,7 @@ void ZonedChunkStorage::loadEntities(Level* level, LevelChunk* lc) { auto itEnd = tags->end(); for (auto it = tags->begin(); it != itEnd; it++) { CompoundTag* tag = *it; // tags->at(i); - int type = tag->getInt(L"_TYPE"); + int type = tag->getInt("_TYPE"); if (type == 0) { std::shared_ptr e = EntityIO::loadStatic(tag, level); if (e != nullptr) lc->addEntity(e); @@ -228,7 +228,7 @@ void ZonedChunkStorage::saveEntities(Level* level, LevelChunk* lc) { for (auto it = entities->begin(); it != itEndTags; it++) { std::shared_ptr e = *it; // entities->at(j); CompoundTag* cp = new CompoundTag(); - cp->putInt(L"_TYPE", 0); + cp->putInt("_TYPE", 0); e->save(cp); tags.push_back(cp); } @@ -241,7 +241,7 @@ void ZonedChunkStorage::saveEntities(Level* level, LevelChunk* lc) { it != lc->tileEntities.end(); it++) { std::shared_ptr te = it->second; CompoundTag* cp = new CompoundTag(); - cp->putInt(L"_TYPE", 1); + cp->putInt("_TYPE", 1); te->save(cp); tags.push_back(cp); } diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index ea1e22252..dab92411b 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -76,7 +76,7 @@ Dimension::Dimension() { hasCeiling = false; brightnessRamp = new float[Level::MAX_BRIGHTNESS + 1]; id = 0; - levelTypeOptions = L""; + levelTypeOptions = ""; } Dimension::~Dimension() { diff --git a/targets/minecraft/world/level/dimension/Dimension.h b/targets/minecraft/world/level/dimension/Dimension.h index f64863169..8c520a684 100644 --- a/targets/minecraft/world/level/dimension/Dimension.h +++ b/targets/minecraft/world/level/dimension/Dimension.h @@ -21,7 +21,7 @@ public: Level* level; LevelType* levelType; - std::wstring levelTypeOptions; + std::string levelTypeOptions; BiomeSource* biomeSource; bool ultraWarm; bool hasCeiling; diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 036e5436c..1fe5a7f3f 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -568,7 +568,7 @@ bool CustomLevelSource::tick() { return false; } bool CustomLevelSource::shouldSave() { return true; } -std::wstring CustomLevelSource::gatherStats() { return L"CustomLevelSource"; } +std::string CustomLevelSource::gatherStats() { return "CustomLevelSource"; } std::vector* CustomLevelSource::getMobsAt( MobCategory* mobCategory, int x, int y, int z) { @@ -588,7 +588,7 @@ std::vector* CustomLevelSource::getMobsAt( } TilePos* CustomLevelSource::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { #if defined(_OVERRIDE_HEIGHTMAP) if (LargeFeature::STRONGHOLD == featureName && strongholdFeature != nullptr) { diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.h b/targets/minecraft/world/level/levelgen/CustomLevelSource.h index 019ae32d3..7191a17ec 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.h @@ -81,13 +81,13 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); public: virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp index aa2a15c4d..c5281f80a 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -117,7 +117,7 @@ bool FlatLevelSource::tick() { return false; } bool FlatLevelSource::shouldSave() { return true; } -std::wstring FlatLevelSource::gatherStats() { return L"FlatLevelSource"; } +std::string FlatLevelSource::gatherStats() { return "FlatLevelSource"; } std::vector* FlatLevelSource::getMobsAt( MobCategory* mobCategory, int x, int y, int z) { @@ -129,7 +129,7 @@ std::vector* FlatLevelSource::getMobsAt( } TilePos* FlatLevelSource::findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z) { return nullptr; } diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.h b/targets/minecraft/world/level/levelgen/FlatLevelSource.h index 3fcf40da5..1fdd228ea 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.h @@ -46,11 +46,11 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 2b8c7b5d8..f4d8feb11 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -193,8 +193,8 @@ bool HellFlatLevelSource::tick() { return false; } bool HellFlatLevelSource::shouldSave() { return true; } -std::wstring HellFlatLevelSource::gatherStats() { - return L"HellFlatLevelSource"; +std::string HellFlatLevelSource::gatherStats() { + return "HellFlatLevelSource"; } std::vector* HellFlatLevelSource::getMobsAt( @@ -207,7 +207,7 @@ std::vector* HellFlatLevelSource::getMobsAt( } TilePos* HellFlatLevelSource::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return nullptr; } diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h index a6070ac8c..f02acad9a 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.h @@ -53,11 +53,11 @@ public: bool save(bool force, ProgressListener* progressListener); bool tick(); bool shouldSave(); - std::wstring gatherStats(); + std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index aa04a7543..420d4bf5a 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -541,8 +541,8 @@ bool HellRandomLevelSource::tick() { return false; } bool HellRandomLevelSource::shouldSave() { return true; } -std::wstring HellRandomLevelSource::gatherStats() { - return L"HellRandomLevelSource"; +std::string HellRandomLevelSource::gatherStats() { + return "HellRandomLevelSource"; } std::vector* HellRandomLevelSource::getMobsAt( @@ -566,7 +566,7 @@ std::vector* HellRandomLevelSource::getMobsAt( } TilePos* HellRandomLevelSource::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return nullptr; } diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h index 067205ba5..45d6ae109 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.h @@ -77,12 +77,12 @@ public: bool save(bool force, ProgressListener* progressListener); bool tick(); bool shouldSave(); - std::wstring gatherStats(); + std::string gatherStats(); virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/LargeFeature.cpp b/targets/minecraft/world/level/levelgen/LargeFeature.cpp index 499cc828c..6497846af 100644 --- a/targets/minecraft/world/level/levelgen/LargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/LargeFeature.cpp @@ -11,7 +11,7 @@ class ChunkSource; -const std::wstring LargeFeature::STRONGHOLD = L"StrongHold"; +const std::string LargeFeature::STRONGHOLD = "StrongHold"; LargeFeature::LargeFeature() { radius = 8; diff --git a/targets/minecraft/world/level/levelgen/LargeFeature.h b/targets/minecraft/world/level/levelgen/LargeFeature.h index 024ddcfb9..29285ebf2 100644 --- a/targets/minecraft/world/level/levelgen/LargeFeature.h +++ b/targets/minecraft/world/level/levelgen/LargeFeature.h @@ -12,7 +12,7 @@ class Random; class LargeFeature { public: - static const std::wstring STRONGHOLD; + static const std::string STRONGHOLD; protected: int radius; diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index 29b610e64..d7cba474e 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -833,7 +833,7 @@ bool RandomLevelSource::tick() { return false; } bool RandomLevelSource::shouldSave() { return true; } -std::wstring RandomLevelSource::gatherStats() { return L"RandomLevelSource"; } +std::string RandomLevelSource::gatherStats() { return "RandomLevelSource"; } std::vector* RandomLevelSource::getMobsAt( MobCategory* mobCategory, int x, int y, int z) { @@ -849,7 +849,7 @@ std::vector* RandomLevelSource::getMobsAt( } TilePos* RandomLevelSource::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { if (LargeFeature::STRONGHOLD == featureName && strongholdFeature != nullptr) { return strongholdFeature->getNearestGeneratedFeature(level, x, y, z); diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.h b/targets/minecraft/world/level/levelgen/RandomLevelSource.h index 023c361d6..141a36e16 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.h @@ -101,13 +101,13 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); public: virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index 19bf567a3..c13ef9a67 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -415,8 +415,8 @@ bool TheEndLevelRandomLevelSource::tick() { return false; } bool TheEndLevelRandomLevelSource::shouldSave() { return true; } -std::wstring TheEndLevelRandomLevelSource::gatherStats() { - return L"RandomLevelSource"; +std::string TheEndLevelRandomLevelSource::gatherStats() { + return "RandomLevelSource"; } std::vector* TheEndLevelRandomLevelSource::getMobsAt( @@ -429,7 +429,7 @@ std::vector* TheEndLevelRandomLevelSource::getMobsAt( } TilePos* TheEndLevelRandomLevelSource::findNearestMapFeature( - Level* level, const std::wstring& featureName, int x, int y, int z) { + Level* level, const std::string& featureName, int x, int y, int z) { return nullptr; } diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h index 1657216c1..72371a514 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.h @@ -67,13 +67,13 @@ public: virtual bool save(bool force, ProgressListener* progressListener); virtual bool tick(); virtual bool shouldSave(); - virtual std::wstring gatherStats(); + virtual std::string gatherStats(); public: virtual std::vector* getMobsAt( MobCategory* mobCategory, int x, int y, int z); virtual TilePos* findNearestMapFeature(Level* level, - const std::wstring& featureName, + const std::string& featureName, int x, int y, int z); virtual void recreateLogicStructuresForChunk(int chunkX, int chunkZ); }; diff --git a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp index ffe7c1b58..87ccc5232 100644 --- a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.cpp @@ -133,11 +133,11 @@ bool MonsterRoomFeature::place(Level* level, Random* random, int x, int y, return true; } -std::wstring MonsterRoomFeature::randomEntityId(Random* random) { +std::string MonsterRoomFeature::randomEntityId(Random* random) { int id = random->nextInt(4); - if (id == 0) return std::wstring(L"Skeleton"); - if (id == 1) return std::wstring(L"Zombie"); - if (id == 2) return std::wstring(L"Zombie"); - if (id == 3) return std::wstring(L"Spider"); - return std::wstring(L""); + if (id == 0) return std::string("Skeleton"); + if (id == 1) return std::string("Zombie"); + if (id == 2) return std::string("Zombie"); + if (id == 3) return std::string("Spider"); + return std::string(""); } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h index 7627e8eba..94a01eb71 100644 --- a/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h +++ b/targets/minecraft/world/level/levelgen/feature/MonsterRoomFeature.h @@ -16,5 +16,5 @@ public: virtual bool place(Level* level, Random* random, int x, int y, int z); private: - std::wstring randomEntityId(Random* random); + std::string randomEntityId(Random* random); }; diff --git a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp index 9d9c5a353..b3e577f17 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp +++ b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp @@ -5,15 +5,15 @@ #include "minecraft/world/level/levelgen/flat/FlatLayerInfo.h" #include "minecraft/world/level/tile/Tile.h" -const std::wstring FlatGeneratorInfo::STRUCTURE_VILLAGE = L"village"; -const std::wstring FlatGeneratorInfo::STRUCTURE_BIOME_SPECIFIC = L"biome_1"; -const std::wstring FlatGeneratorInfo::STRUCTURE_STRONGHOLD = L"stronghold"; -const std::wstring FlatGeneratorInfo::STRUCTURE_MINESHAFT = L"mineshaft"; -const std::wstring FlatGeneratorInfo::STRUCTURE_BIOME_DECORATION = - L"decoration"; -const std::wstring FlatGeneratorInfo::STRUCTURE_LAKE = L"lake"; -const std::wstring FlatGeneratorInfo::STRUCTURE_LAVA_LAKE = L"lava_lake"; -const std::wstring FlatGeneratorInfo::STRUCTURE_DUNGEON = L"dungeon"; +const std::string FlatGeneratorInfo::STRUCTURE_VILLAGE = "village"; +const std::string FlatGeneratorInfo::STRUCTURE_BIOME_SPECIFIC = "biome_1"; +const std::string FlatGeneratorInfo::STRUCTURE_STRONGHOLD = "stronghold"; +const std::string FlatGeneratorInfo::STRUCTURE_MINESHAFT = "mineshaft"; +const std::string FlatGeneratorInfo::STRUCTURE_BIOME_DECORATION = + "decoration"; +const std::string FlatGeneratorInfo::STRUCTURE_LAKE = "lake"; +const std::string FlatGeneratorInfo::STRUCTURE_LAVA_LAKE = "lava_lake"; +const std::string FlatGeneratorInfo::STRUCTURE_DUNGEON = "dungeon"; FlatGeneratorInfo::FlatGeneratorInfo() { biome = 0; } @@ -27,8 +27,8 @@ int FlatGeneratorInfo::getBiome() { return biome; } void FlatGeneratorInfo::setBiome(int biome) { this->biome = biome; } -std::unordered_map >* +std::unordered_map >* FlatGeneratorInfo::getStructures() { return &structures; } @@ -45,19 +45,19 @@ void FlatGeneratorInfo::updateLayers() { } } -std::wstring FlatGeneratorInfo::toString() { return L""; } +std::string FlatGeneratorInfo::toString() { return ""; } -FlatLayerInfo* FlatGeneratorInfo::getLayerFromString(const std::wstring& input, +FlatLayerInfo* FlatGeneratorInfo::getLayerFromString(const std::string& input, int yOffset) { return nullptr; } std::vector* FlatGeneratorInfo::getLayersFromString( - const std::wstring& input) { + const std::string& input) { if (input.empty()) return nullptr; std::vector* result = new std::vector(); - std::vector depths = stringSplit(input, L','); + std::vector depths = stringSplit(input, ','); int yOffset = 0; @@ -71,7 +71,7 @@ std::vector* FlatGeneratorInfo::getLayersFromString( return result; } -FlatGeneratorInfo* FlatGeneratorInfo::fromValue(const std::wstring& input) { +FlatGeneratorInfo* FlatGeneratorInfo::fromValue(const std::string& input) { return getDefault(); } @@ -84,7 +84,7 @@ FlatGeneratorInfo* FlatGeneratorInfo::getDefault() { result->getLayers()->push_back(new FlatLayerInfo(1, Tile::grass_Id)); result->updateLayers(); (*(result->getStructures()))[STRUCTURE_VILLAGE] = - std::unordered_map(); + std::unordered_map(); return result; } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h index 9d7afb9cc..bb4602ec0 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h +++ b/targets/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.h @@ -10,19 +10,19 @@ class FlatLayerInfo; class FlatGeneratorInfo { public: static const int SERIALIZATION_VERSION = 2; - static const std::wstring STRUCTURE_VILLAGE; - static const std::wstring STRUCTURE_BIOME_SPECIFIC; - static const std::wstring STRUCTURE_STRONGHOLD; - static const std::wstring STRUCTURE_MINESHAFT; - static const std::wstring STRUCTURE_BIOME_DECORATION; - static const std::wstring STRUCTURE_LAKE; - static const std::wstring STRUCTURE_LAVA_LAKE; - static const std::wstring STRUCTURE_DUNGEON; + static const std::string STRUCTURE_VILLAGE; + static const std::string STRUCTURE_BIOME_SPECIFIC; + static const std::string STRUCTURE_STRONGHOLD; + static const std::string STRUCTURE_MINESHAFT; + static const std::string STRUCTURE_BIOME_DECORATION; + static const std::string STRUCTURE_LAKE; + static const std::string STRUCTURE_LAVA_LAKE; + static const std::string STRUCTURE_DUNGEON; private: std::vector layers; - std::unordered_map > + std::unordered_map > structures; int biome; @@ -32,20 +32,20 @@ public: int getBiome(); void setBiome(int biome); - std::unordered_map >* + std::unordered_map >* getStructures(); std::vector* getLayers(); void updateLayers(); - std::wstring toString(); + std::string toString(); private: - static FlatLayerInfo* getLayerFromString(const std::wstring& input, + static FlatLayerInfo* getLayerFromString(const std::string& input, int yOffset); static std::vector* getLayersFromString( - const std::wstring& input); + const std::string& input); public: - static FlatGeneratorInfo* fromValue(const std::wstring& input); + static FlatGeneratorInfo* fromValue(const std::string& input); static FlatGeneratorInfo* getDefault(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp index 4389e81d6..f976de12e 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp +++ b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp @@ -32,14 +32,14 @@ int FlatLayerInfo::getStart() { return start; } void FlatLayerInfo::setStart(int start) { this->start = start; } -std::wstring FlatLayerInfo::toString() { - std::wstring result = toWString(id); +std::string FlatLayerInfo::toString() { + std::string result = toWString(id); if (height > 1) { - result = toWString(height) + L"x" + result; + result = toWString(height) + "x" + result; } if (data > 0) { - result += L":" + toWString(data); + result += ":" + toWString(data); } return result; diff --git a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.h b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.h index dd74925e6..a28e40975 100644 --- a/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.h +++ b/targets/minecraft/world/level/levelgen/flat/FlatLayerInfo.h @@ -23,5 +23,5 @@ public: void setData(int data); int getStart(); void setStart(int start); - std::wstring toString(); + std::string toString(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp index 0755f03e3..aa7b4061d 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.cpp @@ -166,13 +166,13 @@ int BoundingBox::getYCenter() { return y0 + (y1 - y0 + 1) / 2; } int BoundingBox::getZCenter() { return z0 + (z1 - z0 + 1) / 2; } -std::wstring BoundingBox::toString() { - return L"(" + toWString(x0) + L", " + toWString(y0) + L", " + - toWString(z0) + L"; " + toWString(x1) + L", " + - toWString(y1) + L", " + toWString(z1) + L")"; +std::string BoundingBox::toString() { + return "(" + toWString(x0) + ", " + toWString(y0) + ", " + + toWString(z0) + "; " + toWString(x1) + ", " + + toWString(y1) + ", " + toWString(z1) + ")"; } -IntArrayTag* BoundingBox::createTag(const std::wstring& name) { +IntArrayTag* BoundingBox::createTag(const std::string& name) { // 4J-JEV: If somebody knows a better way to do this, please tell me. int* data = new int[6](); data[0] = x0; diff --git a/targets/minecraft/world/level/levelgen/structure/BoundingBox.h b/targets/minecraft/world/level/levelgen/structure/BoundingBox.h index b57b78c9b..2b4a1eedb 100644 --- a/targets/minecraft/world/level/levelgen/structure/BoundingBox.h +++ b/targets/minecraft/world/level/levelgen/structure/BoundingBox.h @@ -36,6 +36,6 @@ public: int getYCenter(); int getZCenter(); - std::wstring toString(); - IntArrayTag* createTag(const std::wstring& name); + std::string toString(); + IntArrayTag* createTag(const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index 8e3f98a02..ab45ebf0a 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -16,14 +16,14 @@ #include "minecraft/util/Mth.h" #include "minecraft/world/level/levelgen/structure/MineShaftStart.h" -const std::wstring MineShaftFeature::OPTION_CHANCE = L"chance"; +const std::string MineShaftFeature::OPTION_CHANCE = "chance"; MineShaftFeature::MineShaftFeature() { chance = 0.01; } -std::wstring MineShaftFeature::getFeatureName() { return L"Mineshaft"; } +std::string MineShaftFeature::getFeatureName() { return "Mineshaft"; } MineShaftFeature::MineShaftFeature( - std::unordered_map options) { + std::unordered_map options) { chance = 0.01; for (auto it = options.begin(); it != options.end(); ++it) { diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.h b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.h index 6c0eb1d76..4a122621e 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.h @@ -8,7 +8,7 @@ class MineShaftFeature : public StructureFeature { public: - static const std::wstring OPTION_CHANCE; + static const std::string OPTION_CHANCE; private: double chance; @@ -16,9 +16,9 @@ private: public: MineShaftFeature(); - std::wstring getFeatureName(); + std::string getFeatureName(); - MineShaftFeature(std::unordered_map options); + MineShaftFeature(std::unordered_map options); protected: virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat = false); diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp index bdf088ced..ea81d3eff 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftPieces.cpp @@ -57,13 +57,13 @@ void MineShaftPieces::staticCtor() { void MineShaftPieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_MineShaftCorridor, - MineShaftCorridor::Create, L"MSCorridor"); + MineShaftCorridor::Create, "MSCorridor"); StructureFeatureIO::setPieceId(eStructurePiece_MineShaftCrossing, - MineShaftCrossing::Create, L"MSCrossing"); + MineShaftCrossing::Create, "MSCrossing"); StructureFeatureIO::setPieceId(eStructurePiece_MineShaftRoom, - MineShaftRoom::Create, L"MSRoom"); + MineShaftRoom::Create, "MSRoom"); StructureFeatureIO::setPieceId(eStructurePiece_MineShaftStairs, - MineShaftStairs::Create, L"MSStairs"); + MineShaftStairs::Create, "MSStairs"); } StructurePiece* MineShaftPieces::createRandomShaftPiece( @@ -257,18 +257,18 @@ bool MineShaftPieces::MineShaftRoom::postProcess(Level* level, Random* random, } void MineShaftPieces::MineShaftRoom::addAdditonalSaveData(CompoundTag* tag) { - ListTag* entrances = new ListTag(L"Entrances"); + ListTag* entrances = new ListTag("Entrances"); for (auto it = childEntranceBoxes.begin(); it != childEntranceBoxes.end(); ++it) { BoundingBox* bb = *it; - entrances->add(bb->createTag(L"")); + entrances->add(bb->createTag("")); } - tag->put(L"Entrances", entrances); + tag->put("Entrances", entrances); } void MineShaftPieces::MineShaftRoom::readAdditonalSaveData(CompoundTag* tag) { ListTag* entrances = - (ListTag*)tag->getList(L"Entrances"); + (ListTag*)tag->getList("Entrances"); for (int i = 0; i < entrances->size(); i++) { childEntranceBoxes.push_back(new BoundingBox(entrances->get(i)->data)); } @@ -280,18 +280,18 @@ MineShaftPieces::MineShaftCorridor::MineShaftCorridor() { void MineShaftPieces::MineShaftCorridor::addAdditonalSaveData( CompoundTag* tag) { - tag->putBoolean(L"hr", hasRails); - tag->putBoolean(L"sc", spiderCorridor); - tag->putBoolean(L"hps", hasPlacedSpider); - tag->putInt(L"Num", numSections); + tag->putBoolean("hr", hasRails); + tag->putBoolean("sc", spiderCorridor); + tag->putBoolean("hps", hasPlacedSpider); + tag->putInt("Num", numSections); } void MineShaftPieces::MineShaftCorridor::readAdditonalSaveData( CompoundTag* tag) { - hasRails = tag->getBoolean(L"hr"); - spiderCorridor = tag->getBoolean(L"sc"); - hasPlacedSpider = tag->getBoolean(L"hps"); - numSections = tag->getInt(L"Num"); + hasRails = tag->getBoolean("hr"); + spiderCorridor = tag->getBoolean("sc"); + hasPlacedSpider = tag->getBoolean("hps"); + numSections = tag->getInt("Num"); } MineShaftPieces::MineShaftCorridor::MineShaftCorridor(int genDepth, @@ -596,7 +596,7 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level* level, std::dynamic_pointer_cast( level->getTileEntity(x, y, newZ)); if (entity != nullptr) - entity->getSpawner()->setEntityId(L"CaveSpider"); + entity->getSpawner()->setEntityId("CaveSpider"); } } } @@ -632,14 +632,14 @@ MineShaftPieces::MineShaftCrossing::MineShaftCrossing() { void MineShaftPieces::MineShaftCrossing::addAdditonalSaveData( CompoundTag* tag) { - tag->putBoolean(L"tf", isTwoFloored); - tag->putInt(L"D", direction); + tag->putBoolean("tf", isTwoFloored); + tag->putInt("D", direction); } void MineShaftPieces::MineShaftCrossing::readAdditonalSaveData( CompoundTag* tag) { - isTwoFloored = tag->getBoolean(L"tf"); - direction = tag->getInt(L"D"); + isTwoFloored = tag->getBoolean("tf"); + direction = tag->getInt("D"); } MineShaftPieces::MineShaftCrossing::MineShaftCrossing(int genDepth, diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index e1d850262..a80b781a2 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -33,7 +33,7 @@ NetherBridgeFeature::~NetherBridgeFeature() { if (netherFortressPos != nullptr) delete netherFortressPos; } -std::wstring NetherBridgeFeature::getFeatureName() { return L"Fortress"; } +std::string NetherBridgeFeature::getFeatureName() { return "Fortress"; } std::vector* NetherBridgeFeature::getBridgeEnemies() { return &bridgeEnemies; diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h index 73bfa458e..7c9d6ffbb 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.h @@ -22,7 +22,7 @@ private: public: NetherBridgeFeature(); ~NetherBridgeFeature(); - std::wstring getFeatureName(); + std::string getFeatureName(); std::vector* getBridgeEnemies(); protected: diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp index 84c1bb667..daf1ff301 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgePieces.cpp @@ -21,39 +21,39 @@ void NetherBridgePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_BridgeCrossing, - BridgeCrossing::Create, L"NeBCr"); + BridgeCrossing::Create, "NeBCr"); StructureFeatureIO::setPieceId(eStructurePiece_BridgeEndFiller, - BridgeEndFiller::Create, L"NeBEF"); + BridgeEndFiller::Create, "NeBEF"); StructureFeatureIO::setPieceId(eStructurePiece_BridgeStraight, - BridgeStraight::Create, L"NeBS"); + BridgeStraight::Create, "NeBS"); StructureFeatureIO::setPieceId(eStructurePiece_CastleCorridorStairsPiece, - CastleCorridorStairsPiece::Create, L"NeCCS"); + CastleCorridorStairsPiece::Create, "NeCCS"); StructureFeatureIO::setPieceId(eStructurePiece_CastleCorridorTBalconyPiece, CastleCorridorTBalconyPiece::Create, - L"NeCTB"); + "NeCTB"); StructureFeatureIO::setPieceId(eStructurePiece_CastleEntrance, - CastleEntrance::Create, L"NeCE"); + CastleEntrance::Create, "NeCE"); StructureFeatureIO::setPieceId( eStructurePiece_CastleSmallCorridorCrossingPiece, - CastleSmallCorridorCrossingPiece::Create, L"NeSCSC"); + CastleSmallCorridorCrossingPiece::Create, "NeSCSC"); StructureFeatureIO::setPieceId( eStructurePiece_CastleSmallCorridorLeftTurnPiece, - CastleSmallCorridorLeftTurnPiece::Create, L"NeSCLT"); + CastleSmallCorridorLeftTurnPiece::Create, "NeSCLT"); StructureFeatureIO::setPieceId(eStructurePiece_CastleSmallCorridorPiece, - CastleSmallCorridorPiece::Create, L"NeSC"); + CastleSmallCorridorPiece::Create, "NeSC"); StructureFeatureIO::setPieceId( eStructurePiece_CastleSmallCorridorRightTurnPiece, - CastleSmallCorridorRightTurnPiece::Create, L"NeSCRT"); + CastleSmallCorridorRightTurnPiece::Create, "NeSCRT"); StructureFeatureIO::setPieceId(eStructurePiece_CastleStalkRoom, - CastleStalkRoom::Create, L"NeCSR"); + CastleStalkRoom::Create, "NeCSR"); StructureFeatureIO::setPieceId(eStructurePiece_MonsterThrone, - MonsterThrone::Create, L"NeMT"); + MonsterThrone::Create, "NeMT"); StructureFeatureIO::setPieceId(eStructurePiece_RoomCrossing, - RoomCrossing::Create, L"NeRC"); + RoomCrossing::Create, "NeRC"); StructureFeatureIO::setPieceId(eStructurePiece_StairsRoom, - StairsRoom::Create, L"NeSR"); + StairsRoom::Create, "NeSR"); StructureFeatureIO::setPieceId(eStructurePiece_NetherBridgeStartPiece, - StartPiece::Create, L"NeStart"); + StartPiece::Create, "NeStart"); } NetherBridgePieces::PieceWeight::PieceWeight(EPieceClass pieceClass, int weight, @@ -605,14 +605,14 @@ void NetherBridgePieces::BridgeEndFiller::readAdditonalSaveData( CompoundTag* tag) { NetherBridgePiece::readAdditonalSaveData(tag); - selfSeed = tag->getInt(L"Seed"); + selfSeed = tag->getInt("Seed"); } void NetherBridgePieces::BridgeEndFiller::addAdditonalSaveData( CompoundTag* tag) { NetherBridgePiece::addAdditonalSaveData(tag); - tag->putInt(L"Seed", selfSeed); + tag->putInt("Seed", selfSeed); } NetherBridgePieces::BridgeCrossing::BridgeCrossing() { @@ -994,13 +994,13 @@ void NetherBridgePieces::MonsterThrone::readAdditonalSaveData( CompoundTag* tag) { NetherBridgePiece::readAdditonalSaveData(tag); - hasPlacedMobSpawner = tag->getBoolean(L"Mob"); + hasPlacedMobSpawner = tag->getBoolean("Mob"); } void NetherBridgePieces::MonsterThrone::addAdditonalSaveData(CompoundTag* tag) { NetherBridgePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Mob", hasPlacedMobSpawner); + tag->putBoolean("Mob", hasPlacedMobSpawner); } bool NetherBridgePieces::MonsterThrone::postProcess(Level* level, @@ -1054,7 +1054,7 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level* level, std::shared_ptr entity = std::dynamic_pointer_cast( level->getTileEntity(x, y, z)); - if (entity != nullptr) entity->getSpawner()->setEntityId(L"Blaze"); + if (entity != nullptr) entity->getSpawner()->setEntityId("Blaze"); } } @@ -1594,14 +1594,14 @@ void NetherBridgePieces::CastleSmallCorridorRightTurnPiece:: readAdditonalSaveData(CompoundTag* tag) { NetherBridgePiece::readAdditonalSaveData(tag); - isNeedingChest = tag->getBoolean(L"Chest"); + isNeedingChest = tag->getBoolean("Chest"); } void NetherBridgePieces::CastleSmallCorridorRightTurnPiece:: addAdditonalSaveData(CompoundTag* tag) { NetherBridgePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Chest", isNeedingChest); + tag->putBoolean("Chest", isNeedingChest); } void NetherBridgePieces::CastleSmallCorridorRightTurnPiece::addChildren( @@ -1704,14 +1704,14 @@ void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece:: readAdditonalSaveData(CompoundTag* tag) { NetherBridgePiece::readAdditonalSaveData(tag); - isNeedingChest = tag->getBoolean(L"Chest"); + isNeedingChest = tag->getBoolean("Chest"); } void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::addAdditonalSaveData( CompoundTag* tag) { NetherBridgePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Chest", isNeedingChest); + tag->putBoolean("Chest", isNeedingChest); } void NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::addChildren( diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 22a6317b3..2c2d41041 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -16,7 +16,7 @@ #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" -const std::wstring RandomScatteredLargeFeature::OPTION_SPACING = L"distance"; +const std::string RandomScatteredLargeFeature::OPTION_SPACING = "distance"; std::vector RandomScatteredLargeFeature::allowedBiomes; void RandomScatteredLargeFeature::staticCtor() { @@ -37,7 +37,7 @@ void RandomScatteredLargeFeature::_init() { RandomScatteredLargeFeature::RandomScatteredLargeFeature() { _init(); } RandomScatteredLargeFeature::RandomScatteredLargeFeature( - std::unordered_map options) { + std::unordered_map options) { _init(); for (auto it = options.begin(); it != options.end(); ++it) { @@ -47,7 +47,7 @@ RandomScatteredLargeFeature::RandomScatteredLargeFeature( } } -std::wstring RandomScatteredLargeFeature::getFeatureName() { return L"Temple"; } +std::string RandomScatteredLargeFeature::getFeatureName() { return "Temple"; } bool RandomScatteredLargeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat) { diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h index 27c87ac06..f2858569a 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.h @@ -16,7 +16,7 @@ class Random; class RandomScatteredLargeFeature : public StructureFeature { public: - static const std::wstring OPTION_SPACING; + static const std::string OPTION_SPACING; static void staticCtor(); static std::vector allowedBiomes; @@ -31,9 +31,9 @@ private: public: RandomScatteredLargeFeature(); RandomScatteredLargeFeature( - std::unordered_map options); + std::unordered_map options); - std::wstring getFeatureName(); + std::string getFeatureName(); protected: virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat = false); diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index c07076160..7204abd45 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -35,11 +35,11 @@ void ScatteredFeaturePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_DesertPyramidPiece, - DesertPyramidPiece::Create, L"TeDP"); + DesertPyramidPiece::Create, "TeDP"); StructureFeatureIO::setPieceId(eStructurePiece_JunglePyramidPiece, - DesertPyramidPiece::Create, L"TeJP"); + DesertPyramidPiece::Create, "TeJP"); StructureFeatureIO::setPieceId(eStructurePiece_SwamplandHut, - DesertPyramidPiece::Create, L"TeSH"); + DesertPyramidPiece::Create, "TeSH"); } ScatteredFeaturePieces::ScatteredFeaturePiece::ScatteredFeaturePiece() { @@ -88,18 +88,18 @@ ScatteredFeaturePieces::ScatteredFeaturePiece::ScatteredFeaturePiece( void ScatteredFeaturePieces::ScatteredFeaturePiece::addAdditonalSaveData( CompoundTag* tag) { - tag->putInt(L"Width", width); - tag->putInt(L"Height", height); - tag->putInt(L"Depth", depth); - tag->putInt(L"HPos", heightPosition); + tag->putInt("Width", width); + tag->putInt("Height", height); + tag->putInt("Depth", depth); + tag->putInt("HPos", heightPosition); } void ScatteredFeaturePieces::ScatteredFeaturePiece::readAdditonalSaveData( CompoundTag* tag) { - width = tag->getInt(L"Width"); - height = tag->getInt(L"Height"); - depth = tag->getInt(L"Depth"); - heightPosition = tag->getInt(L"HPos"); + width = tag->getInt("Width"); + height = tag->getInt("Height"); + depth = tag->getInt("Depth"); + heightPosition = tag->getInt("HPos"); } bool ScatteredFeaturePieces::ScatteredFeaturePiece::updateAverageGroundHeight( @@ -165,19 +165,19 @@ ScatteredFeaturePieces::DesertPyramidPiece::DesertPyramidPiece(Random* random, void ScatteredFeaturePieces::DesertPyramidPiece::addAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"hasPlacedChest0", hasPlacedChest[0]); - tag->putBoolean(L"hasPlacedChest1", hasPlacedChest[1]); - tag->putBoolean(L"hasPlacedChest2", hasPlacedChest[2]); - tag->putBoolean(L"hasPlacedChest3", hasPlacedChest[3]); + tag->putBoolean("hasPlacedChest0", hasPlacedChest[0]); + tag->putBoolean("hasPlacedChest1", hasPlacedChest[1]); + tag->putBoolean("hasPlacedChest2", hasPlacedChest[2]); + tag->putBoolean("hasPlacedChest3", hasPlacedChest[3]); } void ScatteredFeaturePieces::DesertPyramidPiece::readAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::readAdditonalSaveData(tag); - hasPlacedChest[0] = tag->getBoolean(L"hasPlacedChest0"); - hasPlacedChest[1] = tag->getBoolean(L"hasPlacedChest1"); - hasPlacedChest[2] = tag->getBoolean(L"hasPlacedChest2"); - hasPlacedChest[3] = tag->getBoolean(L"hasPlacedChest3"); + hasPlacedChest[0] = tag->getBoolean("hasPlacedChest0"); + hasPlacedChest[1] = tag->getBoolean("hasPlacedChest1"); + hasPlacedChest[2] = tag->getBoolean("hasPlacedChest2"); + hasPlacedChest[3] = tag->getBoolean("hasPlacedChest3"); } bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess( @@ -526,19 +526,19 @@ ScatteredFeaturePieces::JunglePyramidPiece::JunglePyramidPiece(Random* random, void ScatteredFeaturePieces::JunglePyramidPiece::addAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"placedMainChest", placedMainChest); - tag->putBoolean(L"placedHiddenChest", placedHiddenChest); - tag->putBoolean(L"placedTrap1", placedTrap1); - tag->putBoolean(L"placedTrap2", placedTrap2); + tag->putBoolean("placedMainChest", placedMainChest); + tag->putBoolean("placedHiddenChest", placedHiddenChest); + tag->putBoolean("placedTrap1", placedTrap1); + tag->putBoolean("placedTrap2", placedTrap2); } void ScatteredFeaturePieces::JunglePyramidPiece::readAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::readAdditonalSaveData(tag); - placedMainChest = tag->getBoolean(L"placedMainChest"); - placedHiddenChest = tag->getBoolean(L"placedHiddenChest"); - placedTrap1 = tag->getBoolean(L"placedTrap1"); - placedTrap2 = tag->getBoolean(L"placedTrap2"); + placedMainChest = tag->getBoolean("placedMainChest"); + placedHiddenChest = tag->getBoolean("placedHiddenChest"); + placedTrap1 = tag->getBoolean("placedTrap1"); + placedTrap2 = tag->getBoolean("placedTrap2"); } bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess( @@ -869,13 +869,13 @@ ScatteredFeaturePieces::SwamplandHut::SwamplandHut(Random* random, int west, void ScatteredFeaturePieces::SwamplandHut::addAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Witch", spawnedWitch); + tag->putBoolean("Witch", spawnedWitch); } void ScatteredFeaturePieces::SwamplandHut::readAdditonalSaveData( CompoundTag* tag) { ScatteredFeaturePiece::readAdditonalSaveData(tag); - spawnedWitch = tag->getBoolean(L"Witch"); + spawnedWitch = tag->getBoolean("Witch"); } bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level* level, diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index 6f7c741da..ee429ebb7 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -29,9 +29,9 @@ #include "minecraft/world/level/levelgen/structure/StructurePiece.h" #include "minecraft/world/level/levelgen/structure/StructureStart.h" -const std::wstring StrongholdFeature::OPTION_DISTANCE = L"distance"; -const std::wstring StrongholdFeature::OPTION_COUNT = L"count"; -const std::wstring StrongholdFeature::OPTION_SPREAD = L"spread"; +const std::string StrongholdFeature::OPTION_DISTANCE = "distance"; +const std::string StrongholdFeature::OPTION_COUNT = "count"; +const std::string StrongholdFeature::OPTION_SPREAD = "spread"; std::vector StrongholdFeature::allowedBiomes; @@ -65,7 +65,7 @@ void StrongholdFeature::_init() { StrongholdFeature::StrongholdFeature() : StructureFeature() { _init(); } StrongholdFeature::StrongholdFeature( - std::unordered_map options) { + std::unordered_map options) { _init(); for (auto it = options.begin(); it != options.end(); ++it) { @@ -88,7 +88,7 @@ StrongholdFeature::~StrongholdFeature() { } } -std::wstring StrongholdFeature::getFeatureName() { +std::string StrongholdFeature::getFeatureName() { return LargeFeature::STRONGHOLD; } diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h index 522ec2bb7..0b6abe10f 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.h @@ -27,9 +27,9 @@ class TilePos; class StrongholdFeature : public StructureFeature { public: - static const std::wstring OPTION_DISTANCE; - static const std::wstring OPTION_COUNT; - static const std::wstring OPTION_SPREAD; + static const std::string OPTION_DISTANCE; + static const std::string OPTION_COUNT; + static const std::string OPTION_SPREAD; public: static void staticCtor(); @@ -49,10 +49,10 @@ private: public: StrongholdFeature(); - StrongholdFeature(std::unordered_map options); + StrongholdFeature(std::unordered_map options); ~StrongholdFeature(); - std::wstring getFeatureName(); + std::string getFeatureName(); protected: virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat = false); diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 8d5ffd42b..d3c1590ef 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -39,31 +39,31 @@ const bool StrongholdPieces::CHECK_AIR = true; void StrongholdPieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_ChestCorridor, - ChestCorridor::Create, L"SHCC"); + ChestCorridor::Create, "SHCC"); StructureFeatureIO::setPieceId(eStructurePiece_FillerCorridor, - FillerCorridor::Create, L"SHFC"); + FillerCorridor::Create, "SHFC"); StructureFeatureIO::setPieceId(eStructurePiece_FiveCrossing, - FiveCrossing::Create, L"SH5C"); + FiveCrossing::Create, "SH5C"); StructureFeatureIO::setPieceId(eStructurePiece_LeftTurn, LeftTurn::Create, - L"SHLT"); + "SHLT"); StructureFeatureIO::setPieceId(eStructurePiece_Library, Library::Create, - L"SHLi"); + "SHLi"); StructureFeatureIO::setPieceId(eStructurePiece_PortalRoom, - PortalRoom::Create, L"SHPR"); + PortalRoom::Create, "SHPR"); StructureFeatureIO::setPieceId(eStructurePiece_PrisonHall, - PrisonHall::Create, L"SHPH"); + PrisonHall::Create, "SHPH"); StructureFeatureIO::setPieceId(eStructurePiece_RightTurn, RightTurn::Create, - L"SHRT"); + "SHRT"); StructureFeatureIO::setPieceId(eStructurePiece_StrongholdRoomCrossing, - RoomCrossing::Create, L"SHRC"); + RoomCrossing::Create, "SHRC"); StructureFeatureIO::setPieceId(eStructurePiece_StairsDown, - StairsDown::Create, L"SHSD"); + StairsDown::Create, "SHSD"); StructureFeatureIO::setPieceId(eStructurePiece_StrongholdStartPiece, - StartPiece::Create, L"SHStart"); + StartPiece::Create, "SHStart"); StructureFeatureIO::setPieceId(eStructurePiece_Straight, Straight::Create, - L"SHS"); + "SHS"); StructureFeatureIO::setPieceId(eStructurePiece_StraightStairsDown, - StraightStairsDown::Create, L"SHSSD"); + StraightStairsDown::Create, "SHSSD"); } StrongholdPieces::PieceWeight::PieceWeight(EPieceClass pieceClass, int weight, @@ -284,12 +284,12 @@ StrongholdPieces::StrongholdPiece::StrongholdPiece(int genDepth) } void StrongholdPieces::StrongholdPiece::addAdditonalSaveData(CompoundTag* tag) { - tag->putString(L"EntryDoor", toWString(entryDoor)); + tag->putString("EntryDoor", toWString(entryDoor)); } void StrongholdPieces::StrongholdPiece::readAdditonalSaveData( CompoundTag* tag) { - entryDoor = (SmallDoorType)fromWString(tag->getString(L"EntryDoor")); + entryDoor = (SmallDoorType)fromWString(tag->getString("EntryDoor")); } void StrongholdPieces::StrongholdPiece::generateSmallDoor( @@ -515,12 +515,12 @@ StrongholdPieces::FillerCorridor::FillerCorridor(int genDepth, Random* random, void StrongholdPieces::FillerCorridor::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putInt(L"Steps", steps); + tag->putInt("Steps", steps); } void StrongholdPieces::FillerCorridor::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - steps = tag->getInt(L"Steps"); + steps = tag->getInt("Steps"); } BoundingBox* StrongholdPieces::FillerCorridor::findPieceBox( @@ -627,12 +627,12 @@ StrongholdPieces::StairsDown::StairsDown(int genDepth, Random* random, void StrongholdPieces::StairsDown::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Source", isSource); + tag->putBoolean("Source", isSource); } void StrongholdPieces::StairsDown::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - isSource = tag->getBoolean(L"Source"); + isSource = tag->getBoolean("Source"); } void StrongholdPieces::StairsDown::addChildren( @@ -746,14 +746,14 @@ StrongholdPieces::Straight::Straight(int genDepth, Random* random, void StrongholdPieces::Straight::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Left", leftChild); - tag->putBoolean(L"Right", rightChild); + tag->putBoolean("Left", leftChild); + tag->putBoolean("Right", rightChild); } void StrongholdPieces::Straight::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - leftChild = tag->getBoolean(L"Left"); - rightChild = tag->getBoolean(L"Right"); + leftChild = tag->getBoolean("Left"); + rightChild = tag->getBoolean("Right"); } void StrongholdPieces::Straight::addChildren(StructurePiece* startPiece, @@ -857,12 +857,12 @@ StrongholdPieces::ChestCorridor::ChestCorridor(int genDepth, Random* random, void StrongholdPieces::ChestCorridor::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Chest", hasPlacedChest); + tag->putBoolean("Chest", hasPlacedChest); } void StrongholdPieces::ChestCorridor::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - hasPlacedChest = tag->getBoolean(L"Chest"); + hasPlacedChest = tag->getBoolean("Chest"); } void StrongholdPieces::ChestCorridor::addChildren( @@ -1145,12 +1145,12 @@ StrongholdPieces::RoomCrossing::RoomCrossing(int genDepth, Random* random, void StrongholdPieces::RoomCrossing::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putInt(L"Type", type); + tag->putInt("Type", type); } void StrongholdPieces::RoomCrossing::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - type = tag->getInt(L"Type"); + type = tag->getInt("Type"); } void StrongholdPieces::RoomCrossing::addChildren( @@ -1405,12 +1405,12 @@ StrongholdPieces::Library::Library(int genDepth, Random* random, void StrongholdPieces::Library::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Tall", isTall); + tag->putBoolean("Tall", isTall); } void StrongholdPieces::Library::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - isTall = tag->getBoolean(L"Tall"); + isTall = tag->getBoolean("Tall"); } StrongholdPieces::Library* StrongholdPieces::Library::createPiece( @@ -1641,18 +1641,18 @@ StrongholdPieces::FiveCrossing::FiveCrossing(int genDepth, Random* random, void StrongholdPieces::FiveCrossing::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"leftLow", leftLow); - tag->putBoolean(L"leftHigh", leftHigh); - tag->putBoolean(L"rightLow", rightLow); - tag->putBoolean(L"rightHigh", rightHigh); + tag->putBoolean("leftLow", leftLow); + tag->putBoolean("leftHigh", leftHigh); + tag->putBoolean("rightLow", rightLow); + tag->putBoolean("rightHigh", rightHigh); } void StrongholdPieces::FiveCrossing::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - leftLow = tag->getBoolean(L"leftLow"); - leftHigh = tag->getBoolean(L"leftHigh"); - rightLow = tag->getBoolean(L"rightLow"); - rightHigh = tag->getBoolean(L"rightHigh"); + leftLow = tag->getBoolean("leftLow"); + leftHigh = tag->getBoolean("leftHigh"); + rightLow = tag->getBoolean("rightLow"); + rightHigh = tag->getBoolean("rightHigh"); } void StrongholdPieces::FiveCrossing::addChildren( @@ -1774,12 +1774,12 @@ StrongholdPieces::PortalRoom::PortalRoom(int genDepth, Random* random, void StrongholdPieces::PortalRoom::addAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Mob", hasPlacedMobSpawner); + tag->putBoolean("Mob", hasPlacedMobSpawner); } void StrongholdPieces::PortalRoom::readAdditonalSaveData(CompoundTag* tag) { StrongholdPiece::readAdditonalSaveData(tag); - hasPlacedMobSpawner = tag->getBoolean(L"Mob"); + hasPlacedMobSpawner = tag->getBoolean("Mob"); } void StrongholdPieces::PortalRoom::addChildren( @@ -1984,7 +1984,7 @@ bool StrongholdPieces::PortalRoom::postProcess(Level* level, Random* random, std::dynamic_pointer_cast( level->getTileEntity(x, y, z)); if (entity != nullptr) - entity->getSpawner()->setEntityId(L"Silverfish"); + entity->getSpawner()->setEntityId("Silverfish"); } } diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp index ee70f58d3..064b0d56b 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.cpp @@ -270,9 +270,9 @@ void StructureFeature::restoreSavedData(Level* level) { if (featureTag->getId() == Tag::TAG_Compound) { CompoundTag* ct = (CompoundTag*)featureTag; - if (ct->contains(L"ChunkX") && ct->contains(L"ChunkZ")) { - int cx = ct->getInt(L"ChunkX"); - int cz = ct->getInt(L"ChunkZ"); + if (ct->contains("ChunkX") && ct->contains("ChunkZ")) { + int cx = ct->getInt("ChunkX"); + int cz = ct->getInt("ChunkZ"); StructureStart* start = StructureFeatureIO::loadStaticStart(ct, level); diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h index 77e88a615..ae19b6538 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeature.h @@ -38,7 +38,7 @@ public: StructureFeature(); ~StructureFeature(); - virtual std::wstring getFeatureName() = 0; + virtual std::string getFeatureName() = 0; virtual void addFeature(Level* level, int x, int z, int xOffs, int zOffs, std::vector& blocks); diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index 84d15d80c..b2da6a4a4 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -22,42 +22,42 @@ class Level; -std::unordered_map +std::unordered_map StructureFeatureIO::startIdClassMap; -std::unordered_map +std::unordered_map StructureFeatureIO::startClassIdMap; -std::unordered_map +std::unordered_map StructureFeatureIO::pieceIdClassMap; -std::unordered_map +std::unordered_map StructureFeatureIO::pieceClassIdMap; void StructureFeatureIO::setStartId(EStructureStart clas, structureStartCreateFn createFn, - const std::wstring& id) { + const std::string& id) { startIdClassMap[id] = createFn; startClassIdMap[clas] = id; } void StructureFeatureIO::setPieceId(EStructurePiece clas, structurePieceCreateFn createFn, - const std::wstring& id) { + const std::string& id) { pieceIdClassMap[id] = createFn; pieceClassIdMap[clas] = id; } void StructureFeatureIO::staticCtor() { setStartId(eStructureStart_MineShaftStart, MineShaftStart::Create, - L"Mineshaft"); + "Mineshaft"); setStartId(eStructureStart_VillageStart, - VillageFeature::VillageStart::Create, L"Village"); + VillageFeature::VillageStart::Create, "Village"); setStartId(eStructureStart_NetherBridgeStart, - NetherBridgeFeature::NetherBridgeStart::Create, L"Fortress"); + NetherBridgeFeature::NetherBridgeStart::Create, "Fortress"); setStartId(eStructureStart_StrongholdStart, - StrongholdFeature::StrongholdStart::Create, L"Stronghold"); + StrongholdFeature::StrongholdStart::Create, "Stronghold"); setStartId(eStructureStart_ScatteredFeatureStart, RandomScatteredLargeFeature::ScatteredFeatureStart::Create, - L"Temple"); + "Temple"); MineShaftPieces::loadStatic(); VillagePieces::loadStatic(); @@ -66,21 +66,21 @@ void StructureFeatureIO::staticCtor() { ScatteredFeaturePieces::loadStatic(); } -std::wstring StructureFeatureIO::getEncodeId(StructureStart* start) { +std::string StructureFeatureIO::getEncodeId(StructureStart* start) { auto it = startClassIdMap.find(start->GetType()); if (it != startClassIdMap.end()) { return it->second; } else { - return L""; + return ""; } } -std::wstring StructureFeatureIO::getEncodeId(StructurePiece* piece) { +std::string StructureFeatureIO::getEncodeId(StructurePiece* piece) { auto it = pieceClassIdMap.find(piece->GetType()); if (it != pieceClassIdMap.end()) { return it->second; } else { - return L""; + return ""; } } @@ -88,7 +88,7 @@ StructureStart* StructureFeatureIO::loadStaticStart(CompoundTag* tag, Level* level) { StructureStart* start = nullptr; - auto it = startIdClassMap.find(tag->getString(L"id")); + auto it = startIdClassMap.find(tag->getString("id")); if (it != startIdClassMap.end()) { start = (it->second)(); } @@ -96,8 +96,8 @@ StructureStart* StructureFeatureIO::loadStaticStart(CompoundTag* tag, if (start != nullptr) { start->load(level, tag); } else { - Log::info("Skipping Structure with id %ls", - tag->getString(L"id").c_str()); + Log::info("Skipping Structure with id %s", + tag->getString("id").c_str()); } return start; } @@ -106,7 +106,7 @@ StructurePiece* StructureFeatureIO::loadStaticPiece(CompoundTag* tag, Level* level) { StructurePiece* piece = nullptr; - auto it = pieceIdClassMap.find(tag->getString(L"id")); + auto it = pieceIdClassMap.find(tag->getString("id")); if (it != pieceIdClassMap.end()) { piece = (it->second)(); } @@ -114,8 +114,8 @@ StructurePiece* StructureFeatureIO::loadStaticPiece(CompoundTag* tag, if (piece != nullptr) { piece->load(level, tag); } else { - Log::info("Skipping Piece with id %ls", - tag->getString(L"id").c_str()); + Log::info("Skipping Piece with id %s", + tag->getString("id").c_str()); } return piece; } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h index ede7705c3..8944174f0 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.h @@ -78,26 +78,26 @@ enum EStructurePiece { class StructureFeatureIO { private: - static std::unordered_map + static std::unordered_map startIdClassMap; - static std::unordered_map startClassIdMap; + static std::unordered_map startClassIdMap; - static std::unordered_map + static std::unordered_map pieceIdClassMap; - static std::unordered_map pieceClassIdMap; + static std::unordered_map pieceClassIdMap; public: static void setStartId(EStructureStart clas, structureStartCreateFn createFn, - const std::wstring& id); + const std::string& id); static void setPieceId(EStructurePiece clas, structurePieceCreateFn createFn, - const std::wstring& id); + const std::string& id); public: static void staticCtor(); - static std::wstring getEncodeId(StructureStart* start); - static std::wstring getEncodeId(StructurePiece* piece); + static std::string getEncodeId(StructureStart* start); + static std::string getEncodeId(StructurePiece* piece); static StructureStart* loadStaticStart(CompoundTag* tag, Level* level); static StructurePiece* loadStaticPiece(CompoundTag* tag, Level* level); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp index dd9cfd2f2..3efefcfd8 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp @@ -6,9 +6,9 @@ #include "minecraft/world/level/saveddata/SavedData.h" #include "nbt/CompoundTag.h" -std::wstring StructureFeatureSavedData::TAG_FEATURES = L"Features"; +std::string StructureFeatureSavedData::TAG_FEATURES = "Features"; -StructureFeatureSavedData::StructureFeatureSavedData(const std::wstring& idName) +StructureFeatureSavedData::StructureFeatureSavedData(const std::string& idName) : SavedData(idName) { this->pieceTags = new CompoundTag(TAG_FEATURES); } @@ -29,14 +29,14 @@ CompoundTag* StructureFeatureSavedData::getFeatureTag(int chunkX, int chunkZ) { void StructureFeatureSavedData::putFeatureTag(CompoundTag* tag, int chunkX, int chunkZ) { - std::wstring name = createFeatureTagId(chunkX, chunkZ); + std::string name = createFeatureTagId(chunkX, chunkZ); tag->setName(name); pieceTags->put(name, tag); } -std::wstring StructureFeatureSavedData::createFeatureTagId(int chunkX, +std::string StructureFeatureSavedData::createFeatureTagId(int chunkX, int chunkZ) { - return L"[" + toWString(chunkX) + L"," + toWString(chunkZ) + L"]"; + return "[" + toWString(chunkX) + "," + toWString(chunkZ) + "]"; } CompoundTag* StructureFeatureSavedData::getFullTag() { return pieceTags; } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h index a92d04097..05156a276 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h @@ -8,17 +8,17 @@ class CompoundTag; class StructureFeatureSavedData : public SavedData { private: - static std::wstring TAG_FEATURES; + static std::string TAG_FEATURES; CompoundTag* pieceTags; public: - StructureFeatureSavedData(const std::wstring& idName); + StructureFeatureSavedData(const std::string& idName); ~StructureFeatureSavedData(); void load(CompoundTag* tag); void save(CompoundTag* tag); CompoundTag* getFeatureTag(int chunkX, int chunkZ); void putFeatureTag(CompoundTag* tag, int chunkX, int chunkZ); - std::wstring createFeatureTagId(int chunkX, int chunkZ); + std::string createFeatureTagId(int chunkX, int chunkZ); CompoundTag* getFullTag(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp index 696d502ac..30f7e9b23 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructurePiece.cpp @@ -75,10 +75,10 @@ StructurePiece::~StructurePiece() { CompoundTag* StructurePiece::createTag() { CompoundTag* tag = new CompoundTag(); - tag->putString(L"id", StructureFeatureIO::getEncodeId(this)); - tag->put(L"BB", boundingBox->createTag(L"BB")); - tag->putInt(L"O", orientation); - tag->putInt(L"GD", genDepth); + tag->putString("id", StructureFeatureIO::getEncodeId(this)); + tag->put("BB", boundingBox->createTag("BB")); + tag->putInt("O", orientation); + tag->putInt("GD", genDepth); addAdditonalSaveData(tag); @@ -86,11 +86,11 @@ CompoundTag* StructurePiece::createTag() { } void StructurePiece::load(Level* level, CompoundTag* tag) { - if (tag->contains(L"BB")) { - boundingBox = new BoundingBox(tag->getIntArray(L"BB")); + if (tag->contains("BB")) { + boundingBox = new BoundingBox(tag->getIntArray("BB")); } - orientation = tag->getInt(L"O"); - genDepth = tag->getInt(L"GD"); + orientation = tag->getInt("O"); + genDepth = tag->getInt("GD"); readAdditonalSaveData(tag); } diff --git a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp index 3777bc18a..3a5eed52e 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureStart.cpp @@ -61,17 +61,17 @@ void StructureStart::calculateBoundingBox() { CompoundTag* StructureStart::createTag(int chunkX, int chunkZ) { CompoundTag* tag = new CompoundTag(); - tag->putString(L"id", StructureFeatureIO::getEncodeId(this)); - tag->putInt(L"ChunkX", chunkX); - tag->putInt(L"ChunkZ", chunkZ); - tag->put(L"BB", boundingBox->createTag(L"BB")); + tag->putString("id", StructureFeatureIO::getEncodeId(this)); + tag->putInt("ChunkX", chunkX); + tag->putInt("ChunkZ", chunkZ); + tag->put("BB", boundingBox->createTag("BB")); - ListTag* childrenTags = new ListTag(L"Children"); + ListTag* childrenTags = new ListTag("Children"); for (auto it = pieces.begin(); it != pieces.end(); ++it) { StructurePiece* piece = *it; childrenTags->add(piece->createTag()); } - tag->put(L"Children", childrenTags); + tag->put("Children", childrenTags); addAdditonalSaveData(tag); @@ -81,14 +81,14 @@ CompoundTag* StructureStart::createTag(int chunkX, int chunkZ) { void StructureStart::addAdditonalSaveData(CompoundTag* tag) {} void StructureStart::load(Level* level, CompoundTag* tag) { - chunkX = tag->getInt(L"ChunkX"); - chunkZ = tag->getInt(L"ChunkZ"); - if (tag->contains(L"BB")) { - boundingBox = new BoundingBox(tag->getIntArray(L"BB")); + chunkX = tag->getInt("ChunkX"); + chunkZ = tag->getInt("ChunkZ"); + if (tag->contains("BB")) { + boundingBox = new BoundingBox(tag->getIntArray("BB")); } ListTag* children = - (ListTag*)tag->getList(L"Children"); + (ListTag*)tag->getList("Children"); for (int i = 0; i < children->size(); i++) { pieces.push_back( StructureFeatureIO::loadStaticPiece(children->get(i), level)); diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 0f9c3ed28..b1ba967a9 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -21,8 +21,8 @@ #include "minecraft/world/level/levelgen/structure/StructureStart.h" #include "nbt/CompoundTag.h" -const std::wstring VillageFeature::OPTION_SIZE_MODIFIER = L"size"; -const std::wstring VillageFeature::OPTION_SPACING = L"distance"; +const std::string VillageFeature::OPTION_SIZE_MODIFIER = "size"; +const std::string VillageFeature::OPTION_SPACING = "distance"; std::vector VillageFeature::allowedBiomes; @@ -42,7 +42,7 @@ void VillageFeature::_init(int iXZSize) { VillageFeature::VillageFeature(int iXZSize) { _init(iXZSize); } VillageFeature::VillageFeature( - std::unordered_map options, int iXZSize) { + std::unordered_map options, int iXZSize) { _init(iXZSize); for (auto it = options.begin(); it != options.end(); ++it) { @@ -56,7 +56,7 @@ VillageFeature::VillageFeature( } } -std::wstring VillageFeature::getFeatureName() { return L"Village"; } +std::string VillageFeature::getFeatureName() { return "Village"; } bool VillageFeature::isFeatureChunk(int x, int z, bool bIsSuperflat) { int townSpacing = this->townSpacing; @@ -182,10 +182,10 @@ bool VillageFeature::VillageStart::isValid() { void VillageFeature::VillageStart::addAdditonalSaveData(CompoundTag* tag) { StructureStart::addAdditonalSaveData(tag); - tag->putBoolean(L"Valid", valid); + tag->putBoolean("Valid", valid); } void VillageFeature::VillageStart::readAdditonalSaveData(CompoundTag* tag) { StructureStart::readAdditonalSaveData(tag); - valid = tag->getBoolean(L"Valid"); + valid = tag->getBoolean("Valid"); } \ No newline at end of file diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.h b/targets/minecraft/world/level/levelgen/structure/VillageFeature.h index c61b61d7b..4afa3bad4 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.h +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.h @@ -15,8 +15,8 @@ class Random; class VillageFeature : public StructureFeature { public: - static const std::wstring OPTION_SIZE_MODIFIER; - static const std::wstring OPTION_SPACING; + static const std::string OPTION_SIZE_MODIFIER; + static const std::string OPTION_SPACING; private: int villageSizeModifier; @@ -29,9 +29,9 @@ public: static void staticCtor(); static std::vector allowedBiomes; VillageFeature(int iXZSize); - VillageFeature(std::unordered_map options, + VillageFeature(std::unordered_map options, int iXZSize); - std::wstring getFeatureName(); + std::string getFeatureName(); protected: virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat = false); diff --git a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp index af8f34297..01feae33e 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillagePieces.cpp @@ -28,30 +28,30 @@ std::vector VillagePieces::Smithy::treasureItems; void VillagePieces::loadStatic() { StructureFeatureIO::setPieceId(eStructurePiece_BookHouse, BookHouse::Create, - L"ViBH"); + "ViBH"); StructureFeatureIO::setPieceId(eStructurePiece_DoubleFarmland, - DoubleFarmland::Create, L"ViDF"); + DoubleFarmland::Create, "ViDF"); StructureFeatureIO::setPieceId(eStructurePiece_Farmland, Farmland::Create, - L"ViF"); + "ViF"); StructureFeatureIO::setPieceId(eStructurePiece_LightPost, LightPost::Create, - L"ViL"); + "ViL"); StructureFeatureIO::setPieceId(eStructurePiece_PigHouse, PigHouse::Create, - L"ViPH"); + "ViPH"); StructureFeatureIO::setPieceId(eStructurePiece_SimpleHouse, - SimpleHouse::Create, L"ViSH"); + SimpleHouse::Create, "ViSH"); StructureFeatureIO::setPieceId(eStructurePiece_SmallHut, SmallHut::Create, - L"ViSmH"); + "ViSmH"); StructureFeatureIO::setPieceId(eStructurePiece_SmallTemple, - SmallTemple::Create, L"ViST"); + SmallTemple::Create, "ViST"); StructureFeatureIO::setPieceId(eStructurePiece_Smithy, Smithy::Create, - L"ViS"); + "ViS"); StructureFeatureIO::setPieceId(eStructurePiece_VillageStartPiece, - StartPiece::Create, L"ViStart"); + StartPiece::Create, "ViStart"); StructureFeatureIO::setPieceId(eStructurePiece_StraightRoad, - StraightRoad::Create, L"ViSR"); + StraightRoad::Create, "ViSR"); StructureFeatureIO::setPieceId(eStructurePiece_TwoRoomHouse, - TwoRoomHouse::Create, L"ViTRH"); - StructureFeatureIO::setPieceId(eStructurePiece_Well, Well::Create, L"ViW"); + TwoRoomHouse::Create, "ViTRH"); + StructureFeatureIO::setPieceId(eStructurePiece_Well, Well::Create, "ViW"); } VillagePieces::PieceWeight::PieceWeight(VillagePieces::EPieceClass pieceClass, @@ -307,15 +307,15 @@ VillagePieces::VillagePiece::VillagePiece(StartPiece* startPiece, int genDepth) } void VillagePieces::VillagePiece::addAdditonalSaveData(CompoundTag* tag) { - tag->putInt(L"HPos", heightPosition); - tag->putInt(L"VCount", spawnedVillagerCount); - tag->putBoolean(L"Desert", isDesertVillage); + tag->putInt("HPos", heightPosition); + tag->putInt("VCount", spawnedVillagerCount); + tag->putBoolean("Desert", isDesertVillage); } void VillagePieces::VillagePiece::readAdditonalSaveData(CompoundTag* tag) { - heightPosition = tag->getInt(L"HPos"); - spawnedVillagerCount = tag->getInt(L"VCount"); - isDesertVillage = tag->getBoolean(L"Desert"); + heightPosition = tag->getInt("HPos"); + spawnedVillagerCount = tag->getInt("VCount"); + isDesertVillage = tag->getBoolean("Desert"); } StructurePiece* VillagePieces::VillagePiece::generateHouseNorthernLeft( @@ -641,12 +641,12 @@ VillagePieces::StraightRoad::StraightRoad(StartPiece* startPiece, int genDepth, void VillagePieces::StraightRoad::addAdditonalSaveData(CompoundTag* tag) { VillageRoadPiece::addAdditonalSaveData(tag); - tag->putInt(L"Length", length); + tag->putInt("Length", length); } void VillagePieces::StraightRoad::readAdditonalSaveData(CompoundTag* tag) { VillageRoadPiece::readAdditonalSaveData(tag); - length = tag->getInt(L"Length"); + length = tag->getInt("Length"); } void VillagePieces::StraightRoad::addChildren( @@ -788,12 +788,12 @@ VillagePieces::SimpleHouse::SimpleHouse(StartPiece* startPiece, int genDepth, void VillagePieces::SimpleHouse::addAdditonalSaveData(CompoundTag* tag) { VillagePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Terrace", hasTerrace); + tag->putBoolean("Terrace", hasTerrace); } void VillagePieces::SimpleHouse::readAdditonalSaveData(CompoundTag* tag) { VillagePiece::readAdditonalSaveData(tag); - hasTerrace = tag->getBoolean(L"Terrace"); + hasTerrace = tag->getBoolean("Terrace"); } VillagePieces::SimpleHouse* VillagePieces::SimpleHouse::createPiece( @@ -1252,14 +1252,14 @@ VillagePieces::SmallHut::SmallHut(StartPiece* startPiece, int genDepth, void VillagePieces::SmallHut::addAdditonalSaveData(CompoundTag* tag) { VillagePiece::addAdditonalSaveData(tag); - tag->putInt(L"T", tablePlacement); - tag->putBoolean(L"C", lowCeiling); + tag->putInt("T", tablePlacement); + tag->putBoolean("C", lowCeiling); } void VillagePieces::SmallHut::readAdditonalSaveData(CompoundTag* tag) { VillagePiece::readAdditonalSaveData(tag); - tablePlacement = tag->getInt(L"T"); - lowCeiling = tag->getBoolean(L"C"); + tablePlacement = tag->getInt("T"); + lowCeiling = tag->getBoolean("C"); } VillagePieces::SmallHut* VillagePieces::SmallHut::createPiece( @@ -1770,12 +1770,12 @@ VillagePieces::Smithy* VillagePieces::Smithy::createPiece( void VillagePieces::Smithy::addAdditonalSaveData(CompoundTag* tag) { VillagePiece::addAdditonalSaveData(tag); - tag->putBoolean(L"Chest", hasPlacedChest); + tag->putBoolean("Chest", hasPlacedChest); } void VillagePieces::Smithy::readAdditonalSaveData(CompoundTag* tag) { VillagePiece::readAdditonalSaveData(tag); - hasPlacedChest = tag->getBoolean(L"Chest"); + hasPlacedChest = tag->getBoolean("Chest"); } bool VillagePieces::Smithy::postProcess(Level* level, Random* random, @@ -1921,14 +1921,14 @@ int VillagePieces::Farmland::selectCrops(Random* random) { void VillagePieces::Farmland::addAdditonalSaveData(CompoundTag* tag) { VillagePiece::addAdditonalSaveData(tag); - tag->putInt(L"CA", cropsA); - tag->putInt(L"CB", cropsB); + tag->putInt("CA", cropsA); + tag->putInt("CB", cropsB); } void VillagePieces::Farmland::readAdditonalSaveData(CompoundTag* tag) { VillagePiece::readAdditonalSaveData(tag); - cropsA = tag->getInt(L"CA"); - cropsB = tag->getInt(L"CB"); + cropsA = tag->getInt("CA"); + cropsB = tag->getInt("CB"); } VillagePieces::Farmland* VillagePieces::Farmland::createPiece( @@ -2019,18 +2019,18 @@ VillagePieces::DoubleFarmland::DoubleFarmland(StartPiece* startPiece, void VillagePieces::DoubleFarmland::addAdditonalSaveData(CompoundTag* tag) { VillagePiece::addAdditonalSaveData(tag); - tag->putInt(L"CA", cropsA); - tag->putInt(L"CB", cropsB); - tag->putInt(L"CC", cropsC); - tag->putInt(L"CD", cropsD); + tag->putInt("CA", cropsA); + tag->putInt("CB", cropsB); + tag->putInt("CC", cropsC); + tag->putInt("CD", cropsD); } void VillagePieces::DoubleFarmland::readAdditonalSaveData(CompoundTag* tag) { VillagePiece::readAdditonalSaveData(tag); - cropsA = tag->getInt(L"CA"); - cropsB = tag->getInt(L"CB"); - cropsC = tag->getInt(L"CC"); - cropsD = tag->getInt(L"CD"); + cropsA = tag->getInt("CA"); + cropsB = tag->getInt("CB"); + cropsC = tag->getInt("CC"); + cropsD = tag->getInt("CD"); } int VillagePieces::DoubleFarmland::selectCrops(Random* random) { diff --git a/targets/minecraft/world/level/pathfinder/Node.cpp b/targets/minecraft/world/level/pathfinder/Node.cpp index 6112dfb37..e5fe4fb07 100644 --- a/targets/minecraft/world/level/pathfinder/Node.cpp +++ b/targets/minecraft/world/level/pathfinder/Node.cpp @@ -63,7 +63,7 @@ int Node::hashCode() { return hash; } bool Node::inOpenSet() { return heapIdx >= 0; } -std::wstring Node::toString() { - return toWString(x) + L", " + toWString(y) + L", " + +std::string Node::toString() { + return toWString(x) + ", " + toWString(y) + ", " + toWString(z); } diff --git a/targets/minecraft/world/level/pathfinder/Node.h b/targets/minecraft/world/level/pathfinder/Node.h index a419393d1..e01c7ac27 100644 --- a/targets/minecraft/world/level/pathfinder/Node.h +++ b/targets/minecraft/world/level/pathfinder/Node.h @@ -41,5 +41,5 @@ public: bool equals(Node* o); int hashCode(); bool inOpenSet(); - std::wstring toString(); + std::string toString(); }; diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp index 957498ced..3a9d66e5e 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.cpp @@ -160,7 +160,7 @@ std::vector MapItemSavedData::HoldingPlayer::nextUpdatePacket( return std::vector(); } -MapItemSavedData::MapItemSavedData(const std::wstring& id) : SavedData(id) { +MapItemSavedData::MapItemSavedData(const std::string& id) : SavedData(id) { x = z = 0; dimension = 0; scale = 0; @@ -174,19 +174,19 @@ MapItemSavedData::~MapItemSavedData() { } void MapItemSavedData::load(CompoundTag* tag) { - dimension = tag->getByte(L"dimension"); - x = tag->getInt(L"xCenter"); - z = tag->getInt(L"zCenter"); - scale = tag->getByte(L"scale"); + dimension = tag->getByte("dimension"); + x = tag->getInt("xCenter"); + z = tag->getInt("zCenter"); + scale = tag->getByte("scale"); if (scale < 0) scale = 0; if (scale > MAX_SCALE) scale = MAX_SCALE; - int width = tag->getShort(L"width"); - int height = tag->getShort(L"height"); + int width = tag->getShort("width"); + int height = tag->getShort("height"); if (width == MapItem::IMAGE_WIDTH && height == MapItem::IMAGE_HEIGHT) { - colors = tag->getByteArray(L"colors"); + colors = tag->getByteArray("colors"); } else { - std::vector newColors = tag->getByteArray(L"colors"); + std::vector newColors = tag->getByteArray("colors"); // 4J - vector manages its own memory, no need to delete old colors // End4J colors = @@ -207,13 +207,13 @@ void MapItemSavedData::load(CompoundTag* tag) { } void MapItemSavedData::save(CompoundTag* tag) { - tag->putByte(L"dimension", dimension); - tag->putInt(L"xCenter", x); - tag->putInt(L"zCenter", z); - tag->putByte(L"scale", scale); - tag->putShort(L"width", (short)MapItem::IMAGE_WIDTH); - tag->putShort(L"height", (short)MapItem::IMAGE_HEIGHT); - tag->putByteArray(L"colors", colors); + tag->putByte("dimension", dimension); + tag->putInt("xCenter", x); + tag->putInt("zCenter", z); + tag->putByte("scale", scale); + tag->putShort("width", (short)MapItem::IMAGE_WIDTH); + tag->putShort("height", (short)MapItem::IMAGE_HEIGHT); + tag->putByteArray("colors", colors); } void MapItemSavedData::tickCarriedBy(std::shared_ptr player, diff --git a/targets/minecraft/world/level/saveddata/MapItemSavedData.h b/targets/minecraft/world/level/saveddata/MapItemSavedData.h index 9868c694a..53626ae25 100644 --- a/targets/minecraft/world/level/saveddata/MapItemSavedData.h +++ b/targets/minecraft/world/level/saveddata/MapItemSavedData.h @@ -94,7 +94,7 @@ private: static const int END_PORTAL_DECORATION_KEY; public: - MapItemSavedData(const std::wstring& id); + MapItemSavedData(const std::string& id); ~MapItemSavedData(); virtual void load(CompoundTag* tag); diff --git a/targets/minecraft/world/level/saveddata/SavedData.cpp b/targets/minecraft/world/level/saveddata/SavedData.cpp index 25680d2fa..f358fbc9b 100644 --- a/targets/minecraft/world/level/saveddata/SavedData.cpp +++ b/targets/minecraft/world/level/saveddata/SavedData.cpp @@ -3,7 +3,7 @@ #include -SavedData::SavedData(const std::wstring& id) : id(id) { dirty = false; } +SavedData::SavedData(const std::string& id) : id(id) { dirty = false; } void SavedData::setDirty() { setDirty(true); } diff --git a/targets/minecraft/world/level/saveddata/SavedData.h b/targets/minecraft/world/level/saveddata/SavedData.h index 5e33855ae..29a638b4c 100644 --- a/targets/minecraft/world/level/saveddata/SavedData.h +++ b/targets/minecraft/world/level/saveddata/SavedData.h @@ -9,13 +9,13 @@ class CompoundTag; class SavedData : public std::enable_shared_from_this { public: - const std::wstring id; + const std::string id; private: bool dirty; public: - SavedData(const std::wstring& id); + SavedData(const std::string& id); virtual ~SavedData() {} virtual void load(CompoundTag* tag) = 0; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h index 29ca0ac9e..b58a8dd20 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h @@ -37,9 +37,9 @@ public: unsigned int compressedDataSize = 0) = 0; #endif virtual unsigned int getSizeOnDisk() = 0; - virtual std::wstring getFilename() = 0; + virtual std::string getFilename() = 0; virtual std::vector* getFilesWithPrefix( - const std::wstring& prefix) = 0; + const std::string& prefix) = 0; virtual std::vector* getRegionFilesByDimension( unsigned int dimensionIndex) = 0; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index ad6efcbd5..dc3b599ae 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -83,7 +83,7 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, ConsoleSaveFile* targetSave, ProgressListener* progress) { // Process level.dat - ConsoleSavePath ldatPath(std::wstring(L"level.dat")); + ConsoleSavePath ldatPath(std::string("level.dat")); FileEntry* sourceLdatFe = sourceSave->createFile(ldatPath); FileEntry* targetLdatFe = targetSave->createFile(ldatPath); printf("Processing level.dat\n"); @@ -115,7 +115,7 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, sourceSave->createFile(sourcePlayerDatPath); FileEntry* targetFe = targetSave->createFile(targetPlayerDatPath); - wprintf(L"Processing player dat file %ls\n", + printf("Processing player dat file %s\n", playerFiles->at(fileIdx)->data.filename); ProcessSimpleFile(sourceSave, sourceFe, targetSave, targetFe); @@ -133,7 +133,7 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(sourceSave, ldatPath); CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); + CompoundTag* tag = root->getCompound("Data"); LevelData ret(tag); xzSize = ret.getXZSize(); @@ -164,12 +164,12 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, for (int z = -halfXZSize; z < halfXZSize; ++z) { // printf("Processing overworld chunk %d,%d\n",x,z); DataInputStream* dis = - sourceCache._getChunkDataInputStream(sourceSave, L"", x, z); + sourceCache._getChunkDataInputStream(sourceSave, "", x, z); if (dis) { int read = dis->read(); DataOutputStream* dos = - targetCache._getChunkDataOutputStream(targetSave, L"", + targetCache._getChunkDataOutputStream(targetSave, "", x, z); BufferedOutputStream bos(dos, 1024 * 1024); while (read != -1) { @@ -209,13 +209,13 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, for (int z = -halfXZSize; z < halfXZSize; ++z) { // printf("Processing nether chunk %d,%d\n",x,z); DataInputStream* dis = sourceCache._getChunkDataInputStream( - sourceSave, L"DIM-1", x, z); + sourceSave, "DIM-1", x, z); if (dis) { int read = dis->read(); DataOutputStream* dos = targetCache._getChunkDataOutputStream(targetSave, - L"DIM-1", x, z); + "DIM-1", x, z); BufferedOutputStream bos(dos, 1024 * 1024); while (read != -1) { bos.write(read & 0xff); @@ -253,13 +253,13 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, for (int z = -halfXZSize; z < halfXZSize; ++z) { // printf("Processing end chunk %d,%d\n",x,z); DataInputStream* dis = sourceCache._getChunkDataInputStream( - sourceSave, L"DIM1/", x, z); + sourceSave, "DIM1/", x, z); if (dis) { int read = dis->read(); DataOutputStream* dos = targetCache._getChunkDataOutputStream(targetSave, - L"DIM1/", x, z); + "DIM1/", x, z); BufferedOutputStream bos(dos, 1024 * 1024); while (read != -1) { bos.write(read & 0xff); @@ -287,22 +287,22 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile* sourceSave, // usable for XboxOne style split saves or compressed tile formats Process // region files std::vector* allFilesInSave = - sourceSave->getFilesWithPrefix(std::wstring(L"")); + sourceSave->getFilesWithPrefix(std::string("")); for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { FileEntry* fe = *it; if (fe != sourceLdatFe) { - std::wstring fName(fe->data.filename); - std::wstring suffix(L".mcr"); + std::string fName(fe->data.filename); + std::string suffix(".mcr"); if (fName.compare(fName.length() - suffix.length(), suffix.length(), suffix) == 0) { #if !defined(_CONTENT_PACKAGE) - wprintf(L"Processing a region file: %s\n", fe->data.filename); + printf("Processing a region file: %s\n", fe->data.filename); #endif ProcessStandardRegionFile(sourceSave, File(fe->data.filename), targetSave, File(fe->data.filename)); } else { #if !defined(_CONTENT_PACKAGE) - wprintf(L"%s is not a region file, ignoring\n", + printf("%s is not a region file, ignoring\n", fe->data.filename); #endif } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index c34ce5774..2e071866e 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -43,7 +43,7 @@ unsigned int ConsoleSaveFileOriginal::pagesCommitted = 0; void* ConsoleSaveFileOriginal::pvHeap = nullptr; ConsoleSaveFileOriginal::ConsoleSaveFileOriginal( - const std::wstring& fileName, void* pvSaveData /*= nullptr*/, + const std::string& fileName, void* pvSaveData /*= nullptr*/, unsigned int initialFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/) { // One time initialise of static stuff required for our storage @@ -316,7 +316,7 @@ bool ConsoleSaveFileOriginal::writeFile(FileEntry* file, const void* lpBuffer, file->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", + // printf("Wrote %d bytes to %s, new file pointer is %I64d\n", // *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer); file->updateLastModifiedTime(); @@ -350,7 +350,7 @@ bool ConsoleSaveFileOriginal::zeroFile(FileEntry* file, file->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", + // printf("Wrote %d bytes to %s, new file pointer is %I64d\n", // *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer); file->updateLastModifiedTime(); @@ -390,7 +390,7 @@ bool ConsoleSaveFileOriginal::readFile(FileEntry* file, void* lpBuffer, file->currentFilePointer += *lpNumberOfBytesRead; - // wprintf(L"Read %d bytes from %s, new file pointer is %I64d\n", + // printf("Read %d bytes from %s, new file pointer is %I64d\n", // *lpNumberOfBytesRead, file->data.filename, file->currentFilePointer); ReleaseSaveAccess(); @@ -719,11 +719,11 @@ void ConsoleSaveFileOriginal::DebugFlushToFile( unsigned int fileSize = header.GetFileSize(); unsigned int numberOfBytesWritten = 0; - File targetFileDir(L"Saves"); + File targetFileDir("Saves"); if (!targetFileDir.exists()) targetFileDir.mkdir(); - wchar_t* fileName = new wchar_t[XCONTENT_MAX_FILENAME_LENGTH + 1]; + char* fileName = new char[XCONTENT_MAX_FILENAME_LENGTH + 1]; std::time_t now = std::time(nullptr); std::tm t = *std::gmtime(&now); @@ -731,17 +731,17 @@ void ConsoleSaveFileOriginal::DebugFlushToFile( // 14 chars for the digits // 11 chars for the separators + suffix // 25 chars total - std::wstring cutFileName = m_fileName; + std::string cutFileName = m_fileName; if (m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25) { cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25); } - swprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, - L"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, + snprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, + "\\v%04d-%s%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, cutFileName.c_str(), t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec); - const std::wstring outputPath = - targetFileDir.getPath() + std::wstring(fileName); + const std::string outputPath = + targetFileDir.getPath() + std::string(fileName); bool writeSucceeded = false; if (compressedData != nullptr && compressedDataSize > 0) { @@ -766,10 +766,10 @@ unsigned int ConsoleSaveFileOriginal::getSizeOnDisk() { return header.GetFileSize(); } -std::wstring ConsoleSaveFileOriginal::getFilename() { return m_fileName; } +std::string ConsoleSaveFileOriginal::getFilename() { return m_fileName; } std::vector* ConsoleSaveFileOriginal::getFilesWithPrefix( - const std::wstring& prefix) { + const std::string& prefix) { return header.getFilesWithPrefix(prefix); } @@ -862,17 +862,17 @@ void ConsoleSaveFileOriginal::ConvertToLocalPlatform() { } // convert each of the region files to the local platform std::vector* allFilesInSave = - getFilesWithPrefix(std::wstring(L"")); + getFilesWithPrefix(std::string("")); for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { FileEntry* fe = *it; - std::wstring fName(fe->data.filename); - std::wstring suffix(L".mcr"); + std::string fName(fe->data.filename); + std::string suffix(".mcr"); if (fName.compare(fName.length() - suffix.length(), suffix.length(), suffix) == 0) { - Log::info("Processing a region file: %ls\n", fName.c_str()); + Log::info("Processing a region file: %s\n", fName.c_str()); ConvertRegionFile(File(fe->data.filename)); } else { - Log::info("%ls is not a region file, ignoring\n", + Log::info("%s is not a region file, ignoring\n", fName.c_str()); } } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index d0193e7b0..2d8fcbd27 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -11,7 +11,7 @@ class ConsoleSaveFileOriginal : public ConsoleSaveFile { private: FileHeader header; - std::wstring m_fileName; + std::string m_fileName; // void* hHeap; static void* pvHeap; @@ -35,7 +35,7 @@ public: #if defined(_WINDOWS64) static int SaveSaveDataCallback(void* lpParam, bool bRes); #endif - ConsoleSaveFileOriginal(const std::wstring& fileName, + ConsoleSaveFileOriginal(const std::string& fileName, void* pvSaveData = nullptr, unsigned int fileSize = 0, bool forceCleanSave = false, @@ -72,10 +72,10 @@ public: #endif virtual unsigned int getSizeOnDisk(); - virtual std::wstring getFilename(); + virtual std::string getFilename(); virtual std::vector* getFilesWithPrefix( - const std::wstring& prefix); + const std::string& prefix); virtual std::vector* getRegionFilesByDimension( unsigned int dimensionIndex); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 663aa8942..134178e25 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -362,7 +362,7 @@ FileEntry* ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex) { } ConsoleSaveFileSplit::ConsoleSaveFileSplit( - const std::wstring& fileName, void* pvSaveData /*= nullptr*/, + const std::string& fileName, void* pvSaveData /*= nullptr*/, unsigned int initialFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/) { unsigned int fileSize = initialFileSize; @@ -398,7 +398,7 @@ ConsoleSaveFileSplit::ConsoleSaveFileSplit(ConsoleSaveFile* sourceSave, if (alreadySmallRegions) { std::vector* sourceFiles = - sourceSave->getFilesWithPrefix(L""); + sourceSave->getFilesWithPrefix(""); unsigned int bytesWritten = 0; for (auto it = sourceFiles->begin(); it != sourceFiles->end(); ++it) { @@ -419,7 +419,7 @@ ConsoleSaveFileSplit::ConsoleSaveFileSplit(ConsoleSaveFile* sourceSave, } } -void ConsoleSaveFileSplit::_init(const std::wstring& fileName, void* pvSaveData, +void ConsoleSaveFileSplit::_init(const std::string& fileName, void* pvSaveData, unsigned int fileSize, ESavePlatform plat) { m_lastTickTime = 0; @@ -746,7 +746,7 @@ bool ConsoleSaveFileSplit::writeFile(FileEntry* file, const void* lpBuffer, file->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", + // printf("Wrote %d bytes to %s, new file pointer is %I64d\n", // *lpNumberOfBytesWritten, file->data.filename, // file->currentFilePointer); @@ -813,7 +813,7 @@ bool ConsoleSaveFileSplit::zeroFile(FileEntry* file, file->currentFilePointer += *lpNumberOfBytesWritten; - // wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", + // printf("Wrote %d bytes to %s, new file pointer is %I64d\n", // *lpNumberOfBytesWritten, file->data.filename, // file->currentFilePointer); @@ -868,7 +868,7 @@ bool ConsoleSaveFileSplit::readFile(FileEntry* file, void* lpBuffer, file->currentFilePointer += *lpNumberOfBytesRead; - // wprintf(L"Read %d bytes from %s, new file pointer is %I64d\n", + // printf("Read %d bytes from %s, new file pointer is %I64d\n", // *lpNumberOfBytesRead, file->data.filename, file->currentFilePointer); } @@ -1171,26 +1171,26 @@ void ConsoleSaveFileSplit::MoveDataBeyond(FileEntry* file, // DIM1/r.x.z.mcr 00 02 xx zz bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( - const std::wstring& fileName, unsigned int* idOut) { + const std::string& fileName, unsigned int* idOut) { // Determine whether it is one of our region file names if the file // extension is ".mbr" if (fileName.length() < 4) return false; - std::wstring extension = fileName.substr(fileName.length() - 4, 4); - if (extension != std::wstring(L".mcr")) return false; + std::string extension = fileName.substr(fileName.length() - 4, 4); + if (extension != std::string(".mcr")) return false; unsigned int id = 0; int x, z; - const wchar_t* cstr = fileName.c_str(); - const wchar_t* body = cstr + 2; + const char* cstr = fileName.c_str(); + const char* body = cstr + 2; // If this filename starts with a "r" then assume it is of the format // "r.x.z.mcr" - don't do anything as default value we've set are correct - if (cstr[0] != L'r') { + if (cstr[0] != 'r') { // Must be prefixed by "DIM-1r." or "DIM1/r." body = cstr + 7; // Differentiate between these 2 options - if (cstr[3] == L'-') { + if (cstr[3] == '-') { // "DIM-1r." id = 0x00010000; } else { @@ -1199,7 +1199,7 @@ bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( } } // Get x/z coords - swscanf(body, L"%d.%d.mcr", &x, &z); + sscanf(body, "%d.%d.mcr", &x, &z); // Pack full id // 4jcraft added cast to unsigned @@ -1214,25 +1214,25 @@ bool ConsoleSaveFileSplit::GetNumericIdentifierFromName( // Convert a numeric file identifier (for region files) back into a normal // filename. See comment above. -std::wstring ConsoleSaveFileSplit::GetNameFromNumericIdentifier( +std::string ConsoleSaveFileSplit::GetNameFromNumericIdentifier( unsigned int idIn) { - std::wstring prefix; + std::string prefix; switch (idIn & 0x00ff0000) { case 0: - prefix = L""; + prefix = ""; break; case 1: - prefix = L"DIM-1"; + prefix = "DIM-1"; break; case 2: - prefix = L"DIM1/"; + prefix = "DIM1/"; break; } signed char regionX = (idIn >> 8) & 255; signed char regionZ = idIn & 255; - std::wstring region = (prefix + std::wstring(L"r.") + toWString(regionX) + - L"." + toWString(regionZ) + L".mcr"); + std::string region = (prefix + std::string("r.") + toWString(regionX) + + "." + toWString(regionZ) + ".mcr"); return region; } @@ -1432,11 +1432,11 @@ void ConsoleSaveFileSplit::DebugFlushToFile( unsigned int numberOfBytesWritten = 0; - File targetFileDir(L"Saves"); + File targetFileDir("Saves"); if (!targetFileDir.exists()) targetFileDir.mkdir(); - wchar_t* fileName = new wchar_t[XCONTENT_MAX_FILENAME_LENGTH + 1]; + char* fileName = new char[XCONTENT_MAX_FILENAME_LENGTH + 1]; auto now_tp = std::chrono::system_clock::now(); std::time_t now_tt = std::chrono::system_clock::to_time_t(now_tp); @@ -1450,17 +1450,17 @@ void ConsoleSaveFileSplit::DebugFlushToFile( // 14 chars for the digits // 11 chars for the separators + suffix // 25 chars total - std::wstring cutFileName = m_fileName; + std::string cutFileName = m_fileName; if (m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25) { cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25); } - swprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, - L"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, + snprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1, + "\\v%04d-%s%02d.%02d.%02d.%02d.%02d.mcs", VER_PRODUCTBUILD, cutFileName.c_str(), t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec); - const std::wstring outputPath = - targetFileDir.getPath() + std::wstring(fileName); + const std::string outputPath = + targetFileDir.getPath() + std::string(fileName); bool writeSucceeded = false; if (compressedData != nullptr && compressedDataSize > 0) { @@ -1485,10 +1485,10 @@ unsigned int ConsoleSaveFileSplit::getSizeOnDisk() { return header.GetFileSize(); } -std::wstring ConsoleSaveFileSplit::getFilename() { return m_fileName; } +std::string ConsoleSaveFileSplit::getFilename() { return m_fileName; } std::vector* ConsoleSaveFileSplit::getFilesWithPrefix( - const std::wstring& prefix) { + const std::string& prefix) { return header.getFilesWithPrefix(prefix); } @@ -1588,17 +1588,17 @@ void ConsoleSaveFileSplit::ConvertToLocalPlatform() { } // convert each of the region files to the local platform std::vector* allFilesInSave = - getFilesWithPrefix(std::wstring(L"")); + getFilesWithPrefix(std::string("")); for (auto it = allFilesInSave->begin(); it < allFilesInSave->end(); ++it) { FileEntry* fe = *it; - std::wstring fName(fe->data.filename); - std::wstring suffix(L".mcr"); + std::string fName(fe->data.filename); + std::string suffix(".mcr"); if (fName.compare(fName.length() - suffix.length(), suffix.length(), suffix) == 0) { - Log::info("Processing a region file: %ls\n", fName.c_str()); + Log::info("Processing a region file: %s\n", fName.c_str()); ConvertRegionFile(File(fe->data.filename)); } else { - Log::info("%ls is not a region file, ignoring\n", + Log::info("%s is not a region file, ignoring\n", fName.c_str()); } } diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index 0ec06afac..a1e93f573 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -70,7 +70,7 @@ private: FileEntry* GetRegionFileEntry(unsigned int regionIndex); - std::wstring m_fileName; + std::string m_fileName; bool m_autosave; // void* hHeap; @@ -91,9 +91,9 @@ private: void PrepareForWrite(FileEntry* file, unsigned int nNumberOfBytesToWrite); void MoveDataBeyond(FileEntry* file, unsigned int nNumberOfBytesToWrite); - bool GetNumericIdentifierFromName(const std::wstring& fileName, + bool GetNumericIdentifierFromName(const std::string& fileName, unsigned int* idOut); - std::wstring GetNameFromNumericIdentifier(unsigned int idIn); + std::string GetNameFromNumericIdentifier(unsigned int idIn); void processSubfilesForWrite(); void processSubfilesAfterWrite(); @@ -102,11 +102,11 @@ public: static int SaveRegionFilesCallback(void* lpParam, bool bRes); private: - void _init(const std::wstring& fileName, void* pvSaveData, + void _init(const std::string& fileName, void* pvSaveData, unsigned int fileSize, ESavePlatform plat); public: - ConsoleSaveFileSplit(const std::wstring& fileName, + ConsoleSaveFileSplit(const std::string& fileName, void* pvSaveData = nullptr, unsigned int fileSize = 0, bool forceCleanSave = false, ESavePlatform plat = SAVE_FILE_PLATFORM_LOCAL); @@ -146,10 +146,10 @@ public: #endif virtual unsigned int getSizeOnDisk(); - virtual std::wstring getFilename(); + virtual std::string getFilename(); virtual std::vector* getFilesWithPrefix( - const std::wstring& prefix); + const std::string& prefix); virtual std::vector* getRegionFilesByDimension( unsigned int dimensionIndex); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h index cbfb9f906..b82b35fec 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h @@ -4,12 +4,12 @@ class ConsoleSavePath { private: - std::wstring path; + std::string path; public: - ConsoleSavePath(const std::wstring& newPath) { path = newPath; } + ConsoleSavePath(const std::string& newPath) { path = newPath; } - std::wstring getName() const { return path; } + std::string getName() const { return path; } - std::wstring operator+(std::wstring& b) { return path + b; } + std::string operator+(std::string& b) { return path + b; } }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 43ee5a88f..a3ff514d5 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -36,19 +36,19 @@ FileHeader::~FileHeader() { } } -FileEntry* FileHeader::AddFile(const std::wstring& name, +FileEntry* FileHeader::AddFile(const std::string& name, unsigned int length /* = 0 */) { assert(name.length() < 64); - wchar_t filename[64]; - memset(&filename, 0, sizeof(wchar_t) * 64); + char filename[64]; + memset(&filename, 0, sizeof(char) * 64); memcpy(&filename, name.c_str(), - std::min(sizeof(wchar_t) * 64, sizeof(wchar_t) * name.length())); + std::min(sizeof(char) * 64, sizeof(char) * name.length())); // Would a map be more efficient? Our file tables probably won't be very big // so better to avoid hashing all the time? Does the file exist? for (unsigned int i = 0; i < fileTable.size(); ++i) { - if (wcscmp(fileTable[i]->data.filename, filename) == 0) { + if (strcmp(fileTable[i]->data.filename, filename) == 0) { // If so, return it return fileTable[i]; } @@ -72,7 +72,7 @@ void FileHeader::RemoveFile(FileEntry* file) { } #if !defined(_CONTENT_PACKAGE) - wprintf(L"Removed file %ls\n", file->data.filename); + printf("Removed file %s\n", file->data.filename); #endif delete file; @@ -121,7 +121,7 @@ void FileHeader::WriteHeader(void* saveMem) { // Write the header for (unsigned int i = 0; i < fileTable.size(); ++i) { - // wprintf(L"File: %ls, Start = %d, Length = %d, End = %d\n", + // printf("File: %s, Start = %d, Length = %d, End = %d\n", // fileTable[i]->data.filename, fileTable[i]->data.startOffset, // fileTable[i]->data.size(), fileTable[i]->data.startOffset + // fileTable[i]->data.size()); @@ -238,7 +238,7 @@ void FileHeader::ReadHeader( fileTable.push_back(entry); #if defined(_DEBUG_FILE_HEADER) Log::info( - "File: %ls, Start = %d, Length = %d, End = %d, Timestamp = " + "File: %s, Start = %d, Length = %d, End = %d, Timestamp = " "%lld\n", entry->data.filename, entry->data.startOffset, entry->data.length, @@ -270,7 +270,7 @@ void FileHeader::ReadHeader( fileTable.push_back(entry); #if defined(_DEBUG_FILE_HEADER) Log::info( - "File: %ls, Start = %d, Length = %d, End = %d\n", + "File: %s, Start = %d, Length = %d, End = %d\n", entry->data.filename, entry->data.startOffset, entry->data.length, entry->data.startOffset + entry->data.length); @@ -327,9 +327,9 @@ void FileHeader::AdjustStartOffsets(FileEntry* file, } } -bool FileHeader::fileExists(const std::wstring& name) { +bool FileHeader::fileExists(const std::string& name) { for (unsigned int i = 0; i < fileTable.size(); ++i) { - if (wcscmp(fileTable[i]->data.filename, name.c_str()) == 0) { + if (strcmp(fileTable[i]->data.filename, name.c_str()) == 0) { // If so, return it return true; } @@ -338,11 +338,11 @@ bool FileHeader::fileExists(const std::wstring& name) { } std::vector* FileHeader::getFilesWithPrefix( - const std::wstring& prefix) { + const std::string& prefix) { std::vector* files = nullptr; for (unsigned int i = 0; i < fileTable.size(); ++i) { - if (wcsncmp(fileTable[i]->data.filename, prefix.c_str(), + if (strncmp(fileTable[i]->data.filename, prefix.c_str(), prefix.size()) == 0) { if (files == nullptr) { files = new std::vector(); diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h index ba63ee694..c0955c660 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h @@ -81,7 +81,7 @@ enum ESavePlatform { struct FileEntrySaveDataV1 { public: - wchar_t filename[64]; // 64 * 2B + char filename[64]; // 64 * 2B unsigned int length; // In bytes // 4B // This is only valid once the save file has been written/loaded at least @@ -93,7 +93,7 @@ public: // updating 4J Stu - As of writing the tutorial level uses a V1 save file struct FileEntrySaveDataV2 { public: - wchar_t filename[64]; // 64 * 2B + char filename[64]; // 64 * 2B unsigned int length; // In bytes // 4B union { @@ -120,11 +120,11 @@ public: FileEntry() { memset(&data, 0, sizeof(FileEntrySaveData)); } - FileEntry(wchar_t name[64], unsigned int length, unsigned int startOffset) { + FileEntry(char name[64], unsigned int length, unsigned int startOffset) { data.length = length; data.startOffset = startOffset; - memset(&data.filename, 0, sizeof(wchar_t) * 64); - memcpy(&data.filename, name, sizeof(wchar_t) * 64); + memset(&data.filename, 0, sizeof(char) * 64); + memcpy(&data.filename, name, sizeof(char) * 64); data.lastModifiedTime = 0; @@ -178,7 +178,7 @@ public: ~FileHeader(); protected: - FileEntry* AddFile(const std::wstring& name, unsigned int length = 0); + FileEntry* AddFile(const std::string& name, unsigned int length = 0); void RemoveFile(FileEntry*); void WriteHeader(void* saveMem); void ReadHeader(void* saveMem, @@ -191,9 +191,9 @@ protected: void AdjustStartOffsets(FileEntry* file, unsigned int nNumberOfBytesToWrite, bool subtract = false); - bool fileExists(const std::wstring& name); + bool fileExists(const std::string& name); - std::vector* getFilesWithPrefix(const std::wstring& prefix); + std::vector* getFilesWithPrefix(const std::string& prefix); std::vector* getValidPlayerDatFiles(); diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.cpp b/targets/minecraft/world/level/storage/DerivedLevelData.cpp index 2ec417152..6a4da8059 100644 --- a/targets/minecraft/world/level/storage/DerivedLevelData.cpp +++ b/targets/minecraft/world/level/storage/DerivedLevelData.cpp @@ -38,7 +38,7 @@ CompoundTag* DerivedLevelData::getLoadedPlayerTag() { return wrapped->getLoadedPlayerTag(); } -std::wstring DerivedLevelData::getLevelName() { +std::string DerivedLevelData::getLevelName() { return wrapped->getLevelName(); } @@ -76,7 +76,7 @@ void DerivedLevelData::setDimension(int dimension) {} void DerivedLevelData::setSpawn(int xSpawn, int ySpawn, int zSpawn) {} -void DerivedLevelData::setLevelName(const std::wstring& levelName) {} +void DerivedLevelData::setLevelName(const std::string& levelName) {} void DerivedLevelData::setVersion(int version) {} diff --git a/targets/minecraft/world/level/storage/DerivedLevelData.h b/targets/minecraft/world/level/storage/DerivedLevelData.h index 7f265e781..a7776f734 100644 --- a/targets/minecraft/world/level/storage/DerivedLevelData.h +++ b/targets/minecraft/world/level/storage/DerivedLevelData.h @@ -33,7 +33,7 @@ public: int64_t getDayTime(); int64_t getSizeOnDisk(); CompoundTag* getLoadedPlayerTag(); - std::wstring getLevelName(); + std::string getLevelName(); int getVersion(); int64_t getLastPlayed(); bool isThundering(); @@ -51,7 +51,7 @@ public: void setLoadedPlayerTag(CompoundTag* loadedPlayerTag); void setDimension(int dimension); void setSpawn(int xSpawn, int ySpawn, int zSpawn); - void setLevelName(const std::wstring& levelName); + void setLevelName(const std::string& levelName); void setVersion(int version); void setThundering(bool thundering); void setThunderTime(int thunderTime); diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index be4abd24d..44e804b71 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -44,7 +44,7 @@ #include "nbt/NbtIo.h" #include "platform/storage/storage.h" -const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/"); +const std::string DirectoryLevelStorage::sc_szPlayerDir("players/"); _MapDataMappings::_MapDataMappings() { memset(xuids, 0, sizeof(PlayerUID) * MAXIMUM_MAP_SAVE_DATA); @@ -186,12 +186,12 @@ void DirectoryLevelStorage::PlayerMappings::readMappings(DataInputStream* dis) { DirectoryLevelStorage::DirectoryLevelStorage(ConsoleSaveFile* saveFile, const File dir, - const std::wstring& levelId, + const std::string& levelId, bool createPlayerDir) : sessionId(System::currentTimeMillis()), - dir(L""), + dir(""), playerDir(sc_szPlayerDir), - dataDir(std::wstring(L"data/")), + dataDir(std::string("data/")), levelId(levelId) { m_saveFile = saveFile; m_bHasLoadedMapDataMappings = false; @@ -213,7 +213,7 @@ DirectoryLevelStorage::~DirectoryLevelStorage() { void DirectoryLevelStorage::initiateSession() { // 4J Jev, removed try/catch. - File dataFile = File(dir, std::wstring(L"session.lock")); + File dataFile = File(dir, std::string("session.lock")); FileOutputStream fos = FileOutputStream(dataFile); DataOutputStream dos = DataOutputStream(&fos); dos.writeLong(sessionId); @@ -226,7 +226,7 @@ void DirectoryLevelStorage::checkSession() { // 4J-PB - Not in the Xbox game /* - File dataFile = File( dir, wstring(L"session.lock")); + File dataFile = File( dir, string("session.lock")); FileInputStream fis = FileInputStream(dataFile); DataInputStream dis = DataInputStream(&fis); dis.close(); @@ -253,9 +253,9 @@ ChunkStorage* DirectoryLevelStorage::createChunkStorage(Dimension* dimension) { LevelData* DirectoryLevelStorage::prepareLevel() { // 4J Stu Added #if defined(_LARGE_WORLDS) - ConsoleSavePath mapFile = getDataFile(L"largeMapDataMappings"); + ConsoleSavePath mapFile = getDataFile("largeMapDataMappings"); #else - ConsoleSavePath mapFile = getDataFile(L"mapDataMappings"); + ConsoleSavePath mapFile = getDataFile("mapDataMappings"); #endif if (!m_bHasLoadedMapDataMappings && !mapFile.getName().empty() && getSaveFile()->doesFileExist(mapFile)) { @@ -285,7 +285,7 @@ LevelData* DirectoryLevelStorage::prepareLevel() { #if defined(__linux__) Log::info(" -- %d\n", playerUid); #else - Log::info(" -- %ls\n", playerUid.toWString().c_str()); + Log::info(" -- %s\n", playerUid.toWString().c_str()); #endif #endif m_playerMappings[playerUid].readMappings(&dis); @@ -334,13 +334,13 @@ LevelData* DirectoryLevelStorage::prepareLevel() { // 4J Jev, removed try/catch - ConsoleSavePath dataFile = ConsoleSavePath(std::wstring(L"level.dat")); + ConsoleSavePath dataFile = ConsoleSavePath(std::string("level.dat")); if (m_saveFile->doesFileExist(dataFile)) { ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(m_saveFile, dataFile); CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); + CompoundTag* tag = root->getCompound("Data"); LevelData* ret = new LevelData(tag); delete root; return ret; @@ -356,9 +356,9 @@ void DirectoryLevelStorage::saveLevelData( CompoundTag* dataTag = levelData->createTag(players); CompoundTag* root = new CompoundTag(); - root->put(L"Data", dataTag); + root->put("Data", dataTag); - ConsoleSavePath currentFile = ConsoleSavePath(std::wstring(L"level.dat")); + ConsoleSavePath currentFile = ConsoleSavePath(std::string("level.dat")); ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(m_saveFile, currentFile); @@ -373,9 +373,9 @@ void DirectoryLevelStorage::saveLevelData(LevelData* levelData) { CompoundTag* dataTag = levelData->createTag(); CompoundTag* root = new CompoundTag(); - root->put(L"Data", dataTag); + root->put("Data", dataTag); - ConsoleSavePath currentFile = ConsoleSavePath(std::wstring(L"level.dat")); + ConsoleSavePath currentFile = ConsoleSavePath(std::string("level.dat")); ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(m_saveFile, currentFile); @@ -391,7 +391,7 @@ void DirectoryLevelStorage::save(std::shared_ptr player) { CompoundTag* tag = new CompoundTag(); player->saveWithoutId(tag); ConsoleSavePath realFile = ConsoleSavePath( - playerDir.getName() + toWString(player->getXuid()) + L".dat"); + playerDir.getName() + toWString(player->getXuid()) + ".dat"); // If saves are disabled (e.g. because we are writing the save buffer to // disk) then cache this player data if (PlatformStorage.GetSaveDisabled()) { @@ -404,7 +404,7 @@ void DirectoryLevelStorage::save(std::shared_ptr player) { } m_cachedSaveData[realFile.getName()] = bos; Log::info( - "Cached saving of file %ls due to saves being disabled\n", + "Cached saving of file %s due to saves being disabled\n", realFile.getName().c_str()); } else { ConsoleSaveFileOutputStream fos = @@ -430,14 +430,14 @@ CompoundTag* DirectoryLevelStorage::load(std::shared_ptr player) { CompoundTag* DirectoryLevelStorage::loadPlayerDataTag(PlayerUID xuid) { // 4J Jev, removed try/catch. ConsoleSavePath realFile = - ConsoleSavePath(playerDir.getName() + toWString(xuid) + L".dat"); + ConsoleSavePath(playerDir.getName() + toWString(xuid) + ".dat"); auto it = m_cachedSaveData.find(realFile.getName()); if (it != m_cachedSaveData.end()) { ByteArrayOutputStream* bos = it->second; ByteArrayInputStream bis(bos->buf, 0, bos->size()); CompoundTag* tag = NbtIo::readCompressed(&bis); bis.reset(); - Log::info("Loaded player data from cached file %ls\n", + Log::info("Loaded player data from cached file %s\n", realFile.getName().c_str()); return tag; } else if (m_saveFile->doesFileExist(realFile)) { @@ -462,9 +462,9 @@ void DirectoryLevelStorage::clearOldPlayerFiles() { (1L << eDebugSetting_DistributableSave)) { for (unsigned int i = 0; i < playerFiles->size(); ++i) { FileEntry* file = playerFiles->at(i); - std::wstring xuidStr = replaceAll( - replaceAll(file->data.filename, playerDir.getName(), L""), - L".dat", L""); + std::string xuidStr = replaceAll( + replaceAll(file->data.filename, playerDir.getName(), ""), + ".dat", ""); PlayerUID xuid = fromWString(xuidStr); deleteMapFilesForPlayer(xuid); m_saveFile->deleteFile(playerFiles->at(i)); @@ -478,9 +478,9 @@ void DirectoryLevelStorage::clearOldPlayerFiles() { for (unsigned int i = MAX_PLAYER_DATA_SAVES; i < playerFiles->size(); ++i) { FileEntry* file = playerFiles->at(i); - std::wstring xuidStr = replaceAll( - replaceAll(file->data.filename, playerDir.getName(), L""), - L".dat", L""); + std::string xuidStr = replaceAll( + replaceAll(file->data.filename, playerDir.getName(), ""), + ".dat", ""); PlayerUID xuid = fromWString(xuidStr); deleteMapFilesForPlayer(xuid); m_saveFile->deleteFile(playerFiles->at(i)); @@ -495,11 +495,11 @@ PlayerIO* DirectoryLevelStorage::getPlayerIO() { return this; } void DirectoryLevelStorage::closeAll() {} -ConsoleSavePath DirectoryLevelStorage::getDataFile(const std::wstring& id) { - return ConsoleSavePath(dataDir.getName() + id + L".dat"); +ConsoleSavePath DirectoryLevelStorage::getDataFile(const std::string& id) { + return ConsoleSavePath(dataDir.getName() + id + ".dat"); } -std::wstring DirectoryLevelStorage::getLevelId() { return levelId; } +std::string DirectoryLevelStorage::getLevelId() { return levelId; } void DirectoryLevelStorage::flushSaveFile(bool autosave) { #if !defined(_CONTENT_PACKAGE) @@ -535,12 +535,12 @@ void DirectoryLevelStorage::resetNetherPlayerPositions() { // above the top of the nether This will force the player to // be spawned in a valid position in the overworld when they // are loaded - if (tag->contains(L"Dimension") && - tag->getInt(L"Dimension") == + if (tag->contains("Dimension") && + tag->getInt("Dimension") == LevelData::DIMENSION_NETHER && - tag->contains(L"Pos")) { + tag->contains("Pos")) { ListTag* pos = - (ListTag*)tag->getList(L"Pos"); + (ListTag*)tag->getList("Pos"); pos->get(1)->data = DBL_MAX; ConsoleSaveFileOutputStream fos = @@ -603,7 +603,7 @@ int DirectoryLevelStorage::getAuxValueForMap(PlayerUID xuid, int dimension, // If we had an old map file for a mapping that is no longer valid, // delete it - std::wstring id = std::wstring(L"map_") + toWString(mapId); + std::string id = std::string("map_") + toWString(mapId); ConsoleSavePath file = getDataFile(id); if (m_saveFile->doesFileExist(file)) { @@ -622,9 +622,9 @@ void DirectoryLevelStorage::saveMapIdLookup() { if (PlatformStorage.GetSaveDisabled()) return; #if defined(_LARGE_WORLDS) - ConsoleSavePath file = getDataFile(L"largeMapDataMappings"); + ConsoleSavePath file = getDataFile("largeMapDataMappings"); #else - ConsoleSavePath file = getDataFile(L"mapDataMappings"); + ConsoleSavePath file = getDataFile("mapDataMappings"); #endif if (!file.getName().empty()) { @@ -645,7 +645,7 @@ void DirectoryLevelStorage::saveMapIdLookup() { #if defined(__linux__) Log::info(" -- %d\n", it->first); #else - Log::info(" -- %ls\n", it->first.toWString().c_str()); + Log::info(" -- %s\n", it->first.toWString().c_str()); #endif #endif dos.writePlayerUID(it->first); @@ -702,7 +702,7 @@ void DirectoryLevelStorage::deleteMapFilesForPlayer(PlayerUID xuid) { if (it != m_playerMappings.end()) { for (auto itMap = it->second.m_mappings.begin(); itMap != it->second.m_mappings.end(); ++itMap) { - std::wstring id = std::wstring(L"map_") + toWString(itMap->second); + std::string id = std::string("map_") + toWString(itMap->second); ConsoleSavePath file = getDataFile(id); if (m_saveFile->doesFileExist(file)) { @@ -726,7 +726,7 @@ void DirectoryLevelStorage::deleteMapFilesForPlayer(PlayerUID xuid) { if (m_mapDataMappings.xuids[i] == xuid) { changed = true; - std::wstring id = std::wstring(L"map_") + toWString(i); + std::string id = std::string("map_") + toWString(i); ConsoleSavePath file = getDataFile(id); if (m_saveFile->doesFileExist(file)) { @@ -757,7 +757,7 @@ void DirectoryLevelStorage::saveAllCachedData() { ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(m_saveFile, realFile); - Log::info("Actually writing cached file %ls\n", + Log::info("Actually writing cached file %s\n", it->first.c_str()); fos.write(bos->buf, 0, bos->size()); delete bos; @@ -766,7 +766,7 @@ void DirectoryLevelStorage::saveAllCachedData() { for (auto it = m_mapFilesToDelete.begin(); it != m_mapFilesToDelete.end(); ++it) { - std::wstring id = std::wstring(L"map_") + toWString(*it); + std::string id = std::string("map_") + toWString(*it); ConsoleSavePath file = getDataFile(id); if (m_saveFile->doesFileExist(file)) { m_saveFile->deleteFile(m_saveFile->createFile(file)); diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h index c0379cd2f..2c47e9d8a 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.h @@ -77,9 +77,9 @@ private: // const File dataDir; const ConsoleSavePath dataDir; const int64_t sessionId; - const std::wstring levelId; + const std::string levelId; - static const std::wstring sc_szPlayerDir; + static const std::string sc_szPlayerDir; // 4J Added #if defined(_LARGE_WORLDS) class PlayerMappings { @@ -104,7 +104,7 @@ private: #endif bool m_bHasLoadedMapDataMappings; - std::unordered_map m_cachedSaveData; + std::unordered_map m_cachedSaveData; std::vector m_mapFilesToDelete; // Temp list of files that couldn't be deleted // immediately due to saving being disabled @@ -118,7 +118,7 @@ public: public: DirectoryLevelStorage(ConsoleSaveFile* saveFile, const File dir, - const std::wstring& levelId, bool createPlayerDir); + const std::string& levelId, bool createPlayerDir); ~DirectoryLevelStorage(); private: @@ -143,8 +143,8 @@ public: virtual void clearOldPlayerFiles(); // 4J Added PlayerIO* getPlayerIO(); virtual void closeAll(); - ConsoleSavePath getDataFile(const std::wstring& id); - std::wstring getLevelId(); + ConsoleSavePath getDataFile(const std::string& id); + std::string getLevelId(); // 4J Added virtual int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, @@ -153,7 +153,7 @@ public: virtual void deleteMapFilesForPlayer(std::shared_ptr player); virtual void saveAllCachedData(); void resetNetherPlayerPositions(); // 4J Added - static std::wstring getPlayerDir() { return sc_szPlayerDir; } + static std::string getPlayerDir() { return sc_szPlayerDir; } private: void dontSaveMapMappingForPlayer(PlayerUID xuid); diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp index d736776c0..3b3a90340 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp @@ -20,7 +20,7 @@ DirectoryLevelStorageSource::DirectoryLevelStorageSource(const File dir) // this->baseDir = dir; } -std::wstring DirectoryLevelStorageSource::getName() { return L"Old Format"; } +std::string DirectoryLevelStorageSource::getName() { return "Old Format"; } std::vector* DirectoryLevelStorageSource::getLevelList() { // 4J Stu - We don't use directory list with the Xbox save locations @@ -31,14 +31,14 @@ std::vector* DirectoryLevelStorageSource::getLevelList() { void DirectoryLevelStorageSource::clearAll() {} LevelData* DirectoryLevelStorageSource::getDataTagFor( - ConsoleSaveFile* saveFile, const std::wstring& levelId) { - // File dataFile(dir, L"level.dat"); - ConsoleSavePath dataFile = ConsoleSavePath(std::wstring(L"level.dat")); + ConsoleSaveFile* saveFile, const std::string& levelId) { + // File dataFile(dir, "level.dat"); + ConsoleSavePath dataFile = ConsoleSavePath(std::string("level.dat")); if (saveFile->doesFileExist(dataFile)) { ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(saveFile, dataFile); CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); + CompoundTag* tag = root->getCompound("Data"); LevelData* ret = new LevelData(tag); delete root; return ret; @@ -48,17 +48,17 @@ LevelData* DirectoryLevelStorageSource::getDataTagFor( } void DirectoryLevelStorageSource::renameLevel( - const std::wstring& levelId, const std::wstring& newLevelName) { + const std::string& levelId, const std::string& newLevelName) { ConsoleSaveFileOriginal tempSave(levelId); - // File dataFile = File(dir, L"level.dat"); - ConsoleSavePath dataFile = ConsoleSavePath(std::wstring(L"level.dat")); + // File dataFile = File(dir, "level.dat"); + ConsoleSavePath dataFile = ConsoleSavePath(std::string("level.dat")); if (tempSave.doesFileExist(dataFile)) { ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(&tempSave, dataFile); CompoundTag* root = NbtIo::readCompressed(&fis); - CompoundTag* tag = root->getCompound(L"Data"); - tag->putString(L"LevelName", newLevelName); + CompoundTag* tag = root->getCompound("Data"); + tag->putString("LevelName", newLevelName); ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(&tempSave, dataFile); @@ -67,7 +67,7 @@ void DirectoryLevelStorageSource::renameLevel( } bool DirectoryLevelStorageSource::isNewLevelIdAcceptable( - const std::wstring& levelId) { + const std::string& levelId) { // 4J Jev, removed try/catch. File levelFolder = File(baseDir, levelId); @@ -80,7 +80,7 @@ bool DirectoryLevelStorageSource::isNewLevelIdAcceptable( return true; } -void DirectoryLevelStorageSource::deleteLevel(const std::wstring& levelId) { +void DirectoryLevelStorageSource::deleteLevel(const std::string& levelId) { File dir = File(baseDir, levelId); if (!dir.exists()) return; @@ -100,24 +100,24 @@ void DirectoryLevelStorageSource::deleteRecursive(std::vector* files) { } std::shared_ptr DirectoryLevelStorageSource::selectLevel( - ConsoleSaveFile* saveFile, const std::wstring& levelId, + ConsoleSaveFile* saveFile, const std::string& levelId, bool createPlayerDir) { return std::shared_ptr( new DirectoryLevelStorage(saveFile, baseDir, levelId, createPlayerDir)); } bool DirectoryLevelStorageSource::isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId) { + const std::string& levelId) { return false; } bool DirectoryLevelStorageSource::requiresConversion( - ConsoleSaveFile* saveFile, const std::wstring& levelId) { + ConsoleSaveFile* saveFile, const std::string& levelId) { return false; } bool DirectoryLevelStorageSource::convertLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, + const std::string& levelId, ProgressListener* progress) { return false; } diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h index 75870e2b3..0892244a7 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorageSource.h @@ -17,28 +17,28 @@ protected: public: DirectoryLevelStorageSource(const File dir); - virtual std::wstring getName(); + virtual std::string getName(); virtual std::vector* getLevelList(); virtual void clearAll(); virtual LevelData* getDataTagFor(ConsoleSaveFile* saveFile, - const std::wstring& levelId); - virtual void renameLevel(const std::wstring& levelId, - const std::wstring& newLevelName); - virtual bool isNewLevelIdAcceptable(const std::wstring& levelId); - virtual void deleteLevel(const std::wstring& levelId); + const std::string& levelId); + virtual void renameLevel(const std::string& levelId, + const std::string& newLevelName); + virtual bool isNewLevelIdAcceptable(const std::string& levelId); + virtual void deleteLevel(const std::string& levelId); protected: static void deleteRecursive(std::vector* files); public: virtual std::shared_ptr selectLevel( - ConsoleSaveFile* saveFile, const std::wstring& levelId, + ConsoleSaveFile* saveFile, const std::string& levelId, bool createPlayerDir); virtual bool isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId); + const std::string& levelId); virtual bool requiresConversion(ConsoleSaveFile* saveFile, - const std::wstring& levelId); + const std::string& levelId); virtual bool convertLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, + const std::string& levelId, ProgressListener* progress); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/LevelData.cpp b/targets/minecraft/world/level/storage/LevelData.cpp index c416a7f37..f92f56ea8 100644 --- a/targets/minecraft/world/level/storage/LevelData.cpp +++ b/targets/minecraft/world/level/storage/LevelData.cpp @@ -19,110 +19,110 @@ LevelData::LevelData() {} LevelData::LevelData(CompoundTag* tag) { - seed = tag->getLong(L"RandomSeed"); + seed = tag->getLong("RandomSeed"); m_pGenerator = LevelType::lvl_normal; - if (tag->contains(L"generatorName")) { - std::wstring generatorName = tag->getString(L"generatorName"); + if (tag->contains("generatorName")) { + std::string generatorName = tag->getString("generatorName"); m_pGenerator = LevelType::getLevelType(generatorName); if (m_pGenerator == nullptr) { m_pGenerator = LevelType::lvl_normal; } else if (m_pGenerator->hasReplacement()) { int generatorVersion = 0; - if (tag->contains(L"generatorVersion")) { - generatorVersion = tag->getInt(L"generatorVersion"); + if (tag->contains("generatorVersion")) { + generatorVersion = tag->getInt("generatorVersion"); } m_pGenerator = m_pGenerator->getReplacementForVersion(generatorVersion); } - if (tag->contains(L"generatorOptions")) - generatorOptions = tag->getString(L"generatorOptions"); + if (tag->contains("generatorOptions")) + generatorOptions = tag->getString("generatorOptions"); } - gameType = GameType::byId(tag->getInt(L"GameType")); - if (tag->contains(L"MapFeatures")) { - generateMapFeatures = tag->getBoolean(L"MapFeatures"); + gameType = GameType::byId(tag->getInt("GameType")); + if (tag->contains("MapFeatures")) { + generateMapFeatures = tag->getBoolean("MapFeatures"); } else { generateMapFeatures = true; } - spawnBonusChest = tag->getBoolean(L"spawnBonusChest"); + spawnBonusChest = tag->getBoolean("spawnBonusChest"); - xSpawn = tag->getInt(L"SpawnX"); - ySpawn = tag->getInt(L"SpawnY"); - zSpawn = tag->getInt(L"SpawnZ"); - gameTime = tag->getLong(L"Time"); - if (tag->contains(L"DayTime")) { - dayTime = tag->getLong(L"DayTime"); + xSpawn = tag->getInt("SpawnX"); + ySpawn = tag->getInt("SpawnY"); + zSpawn = tag->getInt("SpawnZ"); + gameTime = tag->getLong("Time"); + if (tag->contains("DayTime")) { + dayTime = tag->getLong("DayTime"); } else { dayTime = gameTime; } - lastPlayed = tag->getLong(L"LastPlayed"); - sizeOnDisk = tag->getLong(L"SizeOnDisk"); - levelName = tag->getString(L"LevelName"); - version = tag->getInt(L"version"); - rainTime = tag->getInt(L"rainTime"); - raining = tag->getBoolean(L"raining"); - thunderTime = tag->getInt(L"thunderTime"); - thundering = tag->getBoolean(L"thundering"); - hardcore = tag->getBoolean(L"hardcore"); + lastPlayed = tag->getLong("LastPlayed"); + sizeOnDisk = tag->getLong("SizeOnDisk"); + levelName = tag->getString("LevelName"); + version = tag->getInt("version"); + rainTime = tag->getInt("rainTime"); + raining = tag->getBoolean("raining"); + thunderTime = tag->getInt("thunderTime"); + thundering = tag->getBoolean("thundering"); + hardcore = tag->getBoolean("hardcore"); - if (tag->contains(L"initialized")) { - initialized = tag->getBoolean(L"initialized"); + if (tag->contains("initialized")) { + initialized = tag->getBoolean("initialized"); } else { initialized = true; } - if (tag->contains(L"allowCommands")) { - allowCommands = tag->getBoolean(L"allowCommands"); + if (tag->contains("allowCommands")) { + allowCommands = tag->getBoolean("allowCommands"); } else { allowCommands = gameType == GameType::CREATIVE; } // 4J: Game rules are now stored with app game host options - /*if (tag->contains(L"GameRules")) + /*if (tag->contains("GameRules")) { - gameRules.loadFromTag(tag->getCompound(L"GameRules")); + gameRules.loadFromTag(tag->getCompound("GameRules")); }*/ newSeaLevel = tag->getBoolean( - L"newSeaLevel"); // 4J added - only use new sea level for newly created + "newSeaLevel"); // 4J added - only use new sea level for newly created // maps. This read defaults to false. (sea level // changes in 1.8.2) hasBeenInCreative = tag->getBoolean( - L"hasBeenInCreative"); // 4J added so we can not award achievements to + "hasBeenInCreative"); // 4J added so we can not award achievements to // levels modified in creative // 4J added - for stronghold position - bStronghold = tag->getBoolean(L"hasStronghold"); + bStronghold = tag->getBoolean("hasStronghold"); if (bStronghold == false) { // we need to generate the position xStronghold = yStronghold = zStronghold = 0; } else { - xStronghold = tag->getInt(L"StrongholdX"); - yStronghold = tag->getInt(L"StrongholdY"); - zStronghold = tag->getInt(L"StrongholdZ"); + xStronghold = tag->getInt("StrongholdX"); + yStronghold = tag->getInt("StrongholdY"); + zStronghold = tag->getInt("StrongholdZ"); } // 4J added - for stronghold end portal position - bStrongholdEndPortal = tag->getBoolean(L"hasStrongholdEndPortal"); + bStrongholdEndPortal = tag->getBoolean("hasStrongholdEndPortal"); if (bStrongholdEndPortal == false) { // we need to generate the position xStrongholdEndPortal = zStrongholdEndPortal = 0; } else { - xStrongholdEndPortal = tag->getInt(L"StrongholdEndPortalX"); - zStrongholdEndPortal = tag->getInt(L"StrongholdEndPortalZ"); + xStrongholdEndPortal = tag->getInt("StrongholdEndPortalX"); + zStrongholdEndPortal = tag->getInt("StrongholdEndPortalZ"); } // 4J Added - m_xzSize = tag->getInt(L"XZSize"); - m_hellScale = tag->getInt(L"HellScale"); + m_xzSize = tag->getInt("XZSize"); + m_hellScale = tag->getInt("HellScale"); #ifdef _LARGE_WORLDS - m_classicEdgeMoat = tag->getInt(L"ClassicMoat"); - m_smallEdgeMoat = tag->getInt(L"SmallMoat"); - m_mediumEdgeMoat = tag->getInt(L"MediumMoat"); + m_classicEdgeMoat = tag->getInt("ClassicMoat"); + m_smallEdgeMoat = tag->getInt("SmallMoat"); + m_mediumEdgeMoat = tag->getInt("MediumMoat"); int newWorldSize = gameServices().getGameNewWorldSize(); int newHellScale = gameServices().getGameNewHellScale(); @@ -187,10 +187,10 @@ LevelData::LevelData(CompoundTag* tag) { #endif /* 4J - we don't store this anymore - if (tag->contains(L"Player")) + if (tag->contains("Player")) { - loadedPlayerTag = tag->getCompound(L"Player"); - dimension = loadedPlayerTag->getInt(L"Dimension"); + loadedPlayerTag = tag->getCompound("Player"); + dimension = loadedPlayerTag->getInt("Dimension"); } else { @@ -201,7 +201,7 @@ LevelData::LevelData(CompoundTag* tag) { } LevelData::LevelData(LevelSettings* levelSettings, - const std::wstring& levelName) { + const std::string& levelName) { seed = levelSettings->getSeed(); gameType = levelSettings->getGameType(); generateMapFeatures = levelSettings->isGenerateMapFeatures(); @@ -334,50 +334,50 @@ CompoundTag* LevelData::createTag( } void LevelData::setTagData(CompoundTag* tag) { - tag->putLong(L"RandomSeed", seed); - tag->putString(L"generatorName", m_pGenerator->getGeneratorName()); - tag->putInt(L"generatorVersion", m_pGenerator->getVersion()); - tag->putString(L"generatorOptions", generatorOptions); - tag->putInt(L"GameType", gameType->getId()); - tag->putBoolean(L"MapFeatures", generateMapFeatures); - tag->putBoolean(L"spawnBonusChest", spawnBonusChest); - tag->putInt(L"SpawnX", xSpawn); - tag->putInt(L"SpawnY", ySpawn); - tag->putInt(L"SpawnZ", zSpawn); - tag->putLong(L"Time", gameTime); - tag->putLong(L"DayTime", dayTime); - tag->putLong(L"SizeOnDisk", sizeOnDisk); - tag->putLong(L"LastPlayed", System::currentTimeMillis()); - tag->putString(L"LevelName", levelName); - tag->putInt(L"version", version); - tag->putInt(L"rainTime", rainTime); - tag->putBoolean(L"raining", raining); - tag->putInt(L"thunderTime", thunderTime); - tag->putBoolean(L"thundering", thundering); - tag->putBoolean(L"hardcore", hardcore); - tag->putBoolean(L"allowCommands", allowCommands); - tag->putBoolean(L"initialized", initialized); + tag->putLong("RandomSeed", seed); + tag->putString("generatorName", m_pGenerator->getGeneratorName()); + tag->putInt("generatorVersion", m_pGenerator->getVersion()); + tag->putString("generatorOptions", generatorOptions); + tag->putInt("GameType", gameType->getId()); + tag->putBoolean("MapFeatures", generateMapFeatures); + tag->putBoolean("spawnBonusChest", spawnBonusChest); + tag->putInt("SpawnX", xSpawn); + tag->putInt("SpawnY", ySpawn); + tag->putInt("SpawnZ", zSpawn); + tag->putLong("Time", gameTime); + tag->putLong("DayTime", dayTime); + tag->putLong("SizeOnDisk", sizeOnDisk); + tag->putLong("LastPlayed", System::currentTimeMillis()); + tag->putString("LevelName", levelName); + tag->putInt("version", version); + tag->putInt("rainTime", rainTime); + tag->putBoolean("raining", raining); + tag->putInt("thunderTime", thunderTime); + tag->putBoolean("thundering", thundering); + tag->putBoolean("hardcore", hardcore); + tag->putBoolean("allowCommands", allowCommands); + tag->putBoolean("initialized", initialized); // 4J: Game rules are now stored with app game host options - // tag->putCompound(L"GameRules", gameRules.createTag()); - tag->putBoolean(L"newSeaLevel", newSeaLevel); - tag->putBoolean(L"hasBeenInCreative", hasBeenInCreative); + // tag->putCompound("GameRules", gameRules.createTag()); + tag->putBoolean("newSeaLevel", newSeaLevel); + tag->putBoolean("hasBeenInCreative", hasBeenInCreative); // store the stronghold position - tag->putBoolean(L"hasStronghold", bStronghold); - tag->putInt(L"StrongholdX", xStronghold); - tag->putInt(L"StrongholdY", yStronghold); - tag->putInt(L"StrongholdZ", zStronghold); + tag->putBoolean("hasStronghold", bStronghold); + tag->putInt("StrongholdX", xStronghold); + tag->putInt("StrongholdY", yStronghold); + tag->putInt("StrongholdZ", zStronghold); // store the stronghold end portal position - tag->putBoolean(L"hasStrongholdEndPortal", bStrongholdEndPortal); - tag->putInt(L"StrongholdEndPortalX", xStrongholdEndPortal); - tag->putInt(L"StrongholdEndPortalZ", zStrongholdEndPortal); - tag->putInt(L"XZSize", m_xzSize); + tag->putBoolean("hasStrongholdEndPortal", bStrongholdEndPortal); + tag->putInt("StrongholdEndPortalX", xStrongholdEndPortal); + tag->putInt("StrongholdEndPortalZ", zStrongholdEndPortal); + tag->putInt("XZSize", m_xzSize); #ifdef _LARGE_WORLDS - tag->putInt(L"ClassicMoat", m_classicEdgeMoat); - tag->putInt(L"SmallMoat", m_smallEdgeMoat); - tag->putInt(L"MediumMoat", m_mediumEdgeMoat); + tag->putInt("ClassicMoat", m_classicEdgeMoat); + tag->putInt("SmallMoat", m_smallEdgeMoat); + tag->putInt("MediumMoat", m_mediumEdgeMoat); #endif - tag->putInt(L"HellScale", m_hellScale); + tag->putInt("HellScale", m_hellScale); } int64_t LevelData::getSeed() { return seed; } @@ -473,9 +473,9 @@ void LevelData::setSpawn(int xSpawn, int ySpawn, int zSpawn) { this->zSpawn = zSpawn; } -std::wstring LevelData::getLevelName() { return levelName; } +std::string LevelData::getLevelName() { return levelName; } -void LevelData::setLevelName(const std::wstring& levelName) { +void LevelData::setLevelName(const std::string& levelName) { this->levelName = levelName; } @@ -530,9 +530,9 @@ LevelType* LevelData::getGenerator() { return m_pGenerator; } void LevelData::setGenerator(LevelType* generator) { m_pGenerator = generator; } -std::wstring LevelData::getGeneratorOptions() { return generatorOptions; } +std::string LevelData::getGeneratorOptions() { return generatorOptions; } -void LevelData::setGeneratorOptions(const std::wstring& options) { +void LevelData::setGeneratorOptions(const std::string& options) { generatorOptions = options; } diff --git a/targets/minecraft/world/level/storage/LevelData.h b/targets/minecraft/world/level/storage/LevelData.h index abdff145c..ac50b71d6 100644 --- a/targets/minecraft/world/level/storage/LevelData.h +++ b/targets/minecraft/world/level/storage/LevelData.h @@ -21,7 +21,7 @@ class LevelData { private: int64_t seed; LevelType* m_pGenerator; // = LevelType.normal; - std::wstring generatorOptions; + std::string generatorOptions; int xSpawn; int ySpawn; int zSpawn; @@ -31,7 +31,7 @@ private: int64_t sizeOnDisk; // CompoundTag *loadedPlayerTag; // 4J removed int dimension; - std::wstring levelName; + std::string levelName; int version; bool raining; @@ -74,7 +74,7 @@ protected: public: LevelData(CompoundTag* tag); - LevelData(LevelSettings* levelSettings, const std::wstring& levelName); + LevelData(LevelSettings* levelSettings, const std::string& levelName); LevelData(LevelData* copy); CompoundTag* createTag(); CompoundTag* createTag(std::vector >* players); @@ -118,8 +118,8 @@ public: virtual void setLoadedPlayerTag(CompoundTag* loadedPlayerTag); // void setDimension(int dimension); // 4J Removed TU 9 as it's never used virtual void setSpawn(int xSpawn, int ySpawn, int zSpawn); - virtual std::wstring getLevelName(); - virtual void setLevelName(const std::wstring& levelName); + virtual std::string getLevelName(); + virtual void setLevelName(const std::string& levelName); virtual int getVersion(); virtual void setVersion(int version); virtual int64_t getLastPlayed(); @@ -140,8 +140,8 @@ public: virtual void setHasBeenInCreative(bool value); // 4J Added virtual LevelType* getGenerator(); virtual void setGenerator(LevelType* generator); - virtual std::wstring getGeneratorOptions(); - virtual void setGeneratorOptions(const std::wstring& options); + virtual std::string getGeneratorOptions(); + virtual void setGeneratorOptions(const std::string& options); virtual bool isHardcore(); virtual bool getAllowCommands(); virtual void setAllowCommands(bool allowCommands); diff --git a/targets/minecraft/world/level/storage/LevelStorage.cpp b/targets/minecraft/world/level/storage/LevelStorage.cpp index 5e5996da5..2db67acd9 100644 --- a/targets/minecraft/world/level/storage/LevelStorage.cpp +++ b/targets/minecraft/world/level/storage/LevelStorage.cpp @@ -1,4 +1,4 @@ #include "LevelStorage.h" -const std::wstring LevelStorage::NETHER_FOLDER = L"DIM-1"; -const std::wstring LevelStorage::ENDER_FOLDER = L"DIM1/"; \ No newline at end of file +const std::string LevelStorage::NETHER_FOLDER = "DIM-1"; +const std::string LevelStorage::ENDER_FOLDER = "DIM1/"; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/LevelStorage.h b/targets/minecraft/world/level/storage/LevelStorage.h index ea61968fc..84aecf363 100644 --- a/targets/minecraft/world/level/storage/LevelStorage.h +++ b/targets/minecraft/world/level/storage/LevelStorage.h @@ -17,8 +17,8 @@ class ConsoleSaveFile; class LevelStorage { public: - static const std::wstring NETHER_FOLDER; - static const std::wstring ENDER_FOLDER; + static const std::string NETHER_FOLDER; + static const std::string ENDER_FOLDER; virtual ~LevelStorage() {} virtual LevelData* prepareLevel() = 0; @@ -30,8 +30,8 @@ public: virtual void saveLevelData(LevelData* levelData) = 0; virtual PlayerIO* getPlayerIO() = 0; virtual void closeAll() = 0; - virtual ConsoleSavePath getDataFile(const std::wstring& id) = 0; - virtual std::wstring getLevelId() = 0; + virtual ConsoleSavePath getDataFile(const std::string& id) = 0; + virtual std::string getLevelId() = 0; public: virtual ConsoleSaveFile* getSaveFile() { return nullptr; } diff --git a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp index e3e52e19d..65b50215d 100644 --- a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp +++ b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp @@ -40,10 +40,10 @@ PlayerIO* LevelStorageProfilerDecorator::getPlayerIO() { void LevelStorageProfilerDecorator::closeAll() { capsulated->closeAll(); } ConsoleSavePath LevelStorageProfilerDecorator::getDataFile( - const std::wstring& id) { + const std::string& id) { return capsulated->getDataFile(id); } -std::wstring LevelStorageProfilerDecorator::getLevelId() { +std::string LevelStorageProfilerDecorator::getLevelId() { return capsulated->getLevelId(); } \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h index 3f6ddb2d4..50c0eaad1 100644 --- a/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h +++ b/targets/minecraft/world/level/storage/LevelStorageProfilerDecorator.h @@ -23,6 +23,6 @@ public: void saveLevelData(LevelData* levelData); PlayerIO* getPlayerIO(); void closeAll(); - ConsoleSavePath getDataFile(const std::wstring& id); - std::wstring getLevelId(); + ConsoleSavePath getDataFile(const std::string& id); + std::string getLevelId(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/LevelStorageSource.h b/targets/minecraft/world/level/storage/LevelStorageSource.h index 54aeffe71..9e8ddec24 100644 --- a/targets/minecraft/world/level/storage/LevelStorageSource.h +++ b/targets/minecraft/world/level/storage/LevelStorageSource.h @@ -12,14 +12,14 @@ class ConsoleSaveFile; class LevelStorageSource { public: - virtual std::wstring getName() = 0; + virtual std::string getName() = 0; virtual std::shared_ptr selectLevel( - ConsoleSaveFile* saveFile, const std::wstring& levelId, + ConsoleSaveFile* saveFile, const std::string& levelId, bool createPlayerDir) = 0; virtual std::vector* getLevelList() = 0; virtual void clearAll() = 0; virtual LevelData* getDataTagFor(ConsoleSaveFile* saveFile, - const std::wstring& levelId) = 0; + const std::string& levelId) = 0; /** * Tests if a levelId can be used to store a level. For example, a levelId @@ -31,15 +31,15 @@ public: * @param levelId * @return */ - virtual bool isNewLevelIdAcceptable(const std::wstring& levelId) = 0; - virtual void deleteLevel(const std::wstring& levelId) = 0; - virtual void renameLevel(const std::wstring& levelId, - const std::wstring& newLevelName) = 0; + virtual bool isNewLevelIdAcceptable(const std::string& levelId) = 0; + virtual void deleteLevel(const std::string& levelId) = 0; + virtual void renameLevel(const std::string& levelId, + const std::string& newLevelName) = 0; virtual bool isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId) = 0; + const std::string& levelId) = 0; virtual bool requiresConversion(ConsoleSaveFile* saveFile, - const std::wstring& levelId) = 0; + const std::string& levelId) = 0; virtual bool convertLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, + const std::string& levelId, ProgressListener* progress) = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/LevelSummary.cpp b/targets/minecraft/world/level/storage/LevelSummary.cpp index 24547f044..5e84af6b7 100644 --- a/targets/minecraft/world/level/storage/LevelSummary.cpp +++ b/targets/minecraft/world/level/storage/LevelSummary.cpp @@ -1,7 +1,7 @@ #include "LevelSummary.h" -LevelSummary::LevelSummary(const std::wstring& levelId, - const std::wstring& levelName, int64_t lastPlayed, +LevelSummary::LevelSummary(const std::string& levelId, + const std::string& levelName, int64_t lastPlayed, int64_t sizeOnDisk, GameType* gameMode, bool requiresConversion, bool hardcore, bool hasCheats) @@ -14,9 +14,9 @@ LevelSummary::LevelSummary(const std::wstring& levelId, hardcore(hardcore), _hasCheats(hasCheats) {} -std::wstring LevelSummary::getLevelId() { return levelId; } +std::string LevelSummary::getLevelId() { return levelId; } -std::wstring LevelSummary::getLevelName() { return levelName; } +std::string LevelSummary::getLevelName() { return levelName; } int64_t LevelSummary::getSizeOnDisk() { return sizeOnDisk; } diff --git a/targets/minecraft/world/level/storage/LevelSummary.h b/targets/minecraft/world/level/storage/LevelSummary.h index e4f41630f..3929a7ed0 100644 --- a/targets/minecraft/world/level/storage/LevelSummary.h +++ b/targets/minecraft/world/level/storage/LevelSummary.h @@ -7,8 +7,8 @@ class GameType; class LevelSummary { - const std::wstring levelId; - const std::wstring levelName; + const std::string levelId; + const std::string levelName; const int64_t lastPlayed; const int64_t sizeOnDisk; const bool requiresConversion; @@ -17,11 +17,11 @@ class LevelSummary { const bool _hasCheats; public: - LevelSummary(const std::wstring& levelId, const std::wstring& levelName, + LevelSummary(const std::string& levelId, const std::string& levelName, int64_t lastPlayed, int64_t sizeOnDisk, GameType* gameMode, bool requiresConversion, bool hardcore, bool hasCheats); - std::wstring getLevelId(); - std::wstring getLevelName(); + std::string getLevelId(); + std::string getLevelName(); int64_t getSizeOnDisk(); bool isRequiresConversion(); int64_t getLastPlayed(); diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp index e03642af4..a8292a53c 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -21,7 +21,7 @@ #include "minecraft/world/level/storage/LevelStorage.h" McRegionLevelStorage::McRegionLevelStorage(ConsoleSaveFile* saveFile, File dir, - const std::wstring& levelName, + const std::string& levelName, bool createPlayerDir) : DirectoryLevelStorage(saveFile, dir, levelName, createPlayerDir) { RegionFileCache::clear(); @@ -100,7 +100,7 @@ ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { return new McRegionChunkStorage(m_saveFile, LevelStorage::ENDER_FOLDER); } - return new McRegionChunkStorage(m_saveFile, L""); + return new McRegionChunkStorage(m_saveFile, ""); } void McRegionLevelStorage::saveLevelData( diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.h b/targets/minecraft/world/level/storage/McRegionLevelStorage.h index 7f9efd429..f9ad6710d 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.h +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.h @@ -18,7 +18,7 @@ protected: public: McRegionLevelStorage(ConsoleSaveFile* saveFile, File dir, - const std::wstring& levelName, bool createPlayerDir); + const std::string& levelName, bool createPlayerDir); ~McRegionLevelStorage(); virtual ChunkStorage* createChunkStorage(Dimension* dimension); diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp index 7bacb0eb2..fbba4bd67 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.cpp @@ -14,8 +14,8 @@ McRegionLevelStorageSource::McRegionLevelStorageSource(File dir) : DirectoryLevelStorageSource(dir) {} -std::wstring McRegionLevelStorageSource::getName() { - return L"Scaevolus' McRegion"; +std::string McRegionLevelStorageSource::getName() { + return "Scaevolus' McRegion"; } std::vector* McRegionLevelStorageSource::getLevelList() { @@ -27,7 +27,7 @@ std::vector* McRegionLevelStorageSource::getLevelList() { void McRegionLevelStorageSource::clearAll() {} std::shared_ptr McRegionLevelStorageSource::selectLevel( - ConsoleSaveFile* saveFile, const std::wstring& levelId, + ConsoleSaveFile* saveFile, const std::string& levelId, bool createPlayerDir) { // return new LevelStorageProfilerDecorator(new // McRegionLevelStorage(baseDir, levelId, createPlayerDir)); @@ -36,7 +36,7 @@ std::shared_ptr McRegionLevelStorageSource::selectLevel( } bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId) { + const std::string& levelId) { // check if there is old file format level data LevelData* levelData = getDataTagFor(saveFile, levelId); if (levelData == nullptr || levelData->getVersion() != 0) { @@ -49,7 +49,7 @@ bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile* saveFile, } bool McRegionLevelStorageSource::requiresConversion( - ConsoleSaveFile* saveFile, const std::wstring& levelId) { + ConsoleSaveFile* saveFile, const std::string& levelId) { LevelData* levelData = getDataTagFor(saveFile, levelId); if (levelData == nullptr || levelData->getVersion() != 0) { delete levelData; @@ -61,7 +61,7 @@ bool McRegionLevelStorageSource::requiresConversion( } bool McRegionLevelStorageSource::convertLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, + const std::string& levelId, ProgressListener* progress) { assert(false); // I removed this while updating the saves to use the single save file diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h index 69dbcd037..26d6e9ee7 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h +++ b/targets/minecraft/world/level/storage/McRegionLevelStorageSource.h @@ -17,18 +17,18 @@ public: class ChunkFile; McRegionLevelStorageSource(File dir); - virtual std::wstring getName(); + virtual std::string getName(); virtual std::vector* getLevelList(); virtual void clearAll(); virtual std::shared_ptr selectLevel( - ConsoleSaveFile* saveFile, const std::wstring& levelId, + ConsoleSaveFile* saveFile, const std::string& levelId, bool createPlayerDir); virtual bool isConvertible(ConsoleSaveFile* saveFile, - const std::wstring& levelId); + const std::string& levelId); virtual bool requiresConversion(ConsoleSaveFile* saveFile, - const std::wstring& levelId); + const std::string& levelId); virtual bool convertLevel(ConsoleSaveFile* saveFile, - const std::wstring& levelId, + const std::string& levelId, ProgressListener* progress); private: diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp index 52b002e15..f233a29b9 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp @@ -31,10 +31,10 @@ void MemoryLevelStorage::save(std::shared_ptr player) {} bool MemoryLevelStorage::load(std::shared_ptr player) { return false; } CompoundTag* MemoryLevelStorage::loadPlayerDataTag( - const std::wstring& playerName) { + const std::string& playerName) { return nullptr; } -ConsoleSavePath MemoryLevelStorage::getDataFile(const std::wstring& id) { - return ConsoleSaveFile(std::wstring(L"")); +ConsoleSavePath MemoryLevelStorage::getDataFile(const std::string& id) { + return ConsoleSaveFile(std::string("")); } \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.h b/targets/minecraft/world/level/storage/MemoryLevelStorage.h index ea078a6b6..5a00c45b6 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.h @@ -22,6 +22,6 @@ public: virtual void closeAll(); virtual void save(std::shared_ptr player); virtual bool load(std::shared_ptr player); - virtual CompoundTag* loadPlayerDataTag(const std::wstring& playerName); - virtual ConsoleSavePath getDataFile(const std::wstring& id); + virtual CompoundTag* loadPlayerDataTag(const std::string& playerName); + virtual ConsoleSavePath getDataFile(const std::string& id); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp index d06349fa5..2ff75f643 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp +++ b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.cpp @@ -6,10 +6,10 @@ MemoryLevelStorageSource::MemoryLevelStorageSource() {} -std::wstring MemoryLevelStorageSource::getName() { return L"Memory Storage"; } +std::string MemoryLevelStorageSource::getName() { return "Memory Storage"; } std::shared_ptr MemoryLevelStorageSource::selectLevel( - const std::wstring& levelId, bool createPlayerDir) { + const std::string& levelId, bool createPlayerDir) { return std::shared_ptr () new MemoryLevelStorage()); } @@ -20,29 +20,29 @@ std::vector* MemoryLevelStorageSource::getLevelList() { void MemoryLevelStorageSource::clearAll() {} LevelData* MemoryLevelStorageSource::getDataTagFor( - const std::wstring& levelId) { + const std::string& levelId) { return nullptr; } bool MemoryLevelStorageSource::isNewLevelIdAcceptable( - const std::wstring& levelId) { + const std::string& levelId) { return true; } -void MemoryLevelStorageSource::deleteLevel(const std::wstring& levelId) {} +void MemoryLevelStorageSource::deleteLevel(const std::string& levelId) {} -void MemoryLevelStorageSource::renameLevel(const std::wstring& levelId, - const std::wstring& newLevelName) {} +void MemoryLevelStorageSource::renameLevel(const std::string& levelId, + const std::string& newLevelName) {} -bool MemoryLevelStorageSource::isConvertible(const std::wstring& levelId) { +bool MemoryLevelStorageSource::isConvertible(const std::string& levelId) { return false; } -bool MemoryLevelStorageSource::requiresConversion(const std::wstring& levelId) { +bool MemoryLevelStorageSource::requiresConversion(const std::string& levelId) { return false; } -bool MemoryLevelStorageSource::convertLevel(const std::wstring& levelId, +bool MemoryLevelStorageSource::convertLevel(const std::string& levelId, ProgressListener* progress) { return false; } \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.h b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.h index 827f29fe8..a4c3afbe2 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorageSource.h +++ b/targets/minecraft/world/level/storage/MemoryLevelStorageSource.h @@ -5,17 +5,17 @@ class MemoryLevelStorageSource : public LevelStorageSource { public: MemoryLevelStorageSource(); - std::wstring getName(); - std::shared_ptr selectLevel(const std::wstring& levelId, + std::string getName(); + std::shared_ptr selectLevel(const std::string& levelId, bool createPlayerDir); std::vector* getLevelList(); void clearAll(); - LevelData* getDataTagFor(const std::wstring& levelId); - bool isNewLevelIdAcceptable(const std::wstring& levelId); - void deleteLevel(const std::wstring& levelId); - void renameLevel(const std::wstring& levelId, - const std::wstring& newLevelName); - bool isConvertible(const std::wstring& levelId); - bool requiresConversion(const std::wstring& levelId); - bool convertLevel(const std::wstring& levelId, ProgressListener* progress); + LevelData* getDataTagFor(const std::string& levelId); + bool isNewLevelIdAcceptable(const std::string& levelId); + void deleteLevel(const std::string& levelId); + void renameLevel(const std::string& levelId, + const std::string& newLevelName); + bool isConvertible(const std::string& levelId); + bool requiresConversion(const std::string& levelId); + bool convertLevel(const std::string& levelId, ProgressListener* progress); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/MockedLevelStorage.cpp b/targets/minecraft/world/level/storage/MockedLevelStorage.cpp index 61d5df9cf..71c17718d 100644 --- a/targets/minecraft/world/level/storage/MockedLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/MockedLevelStorage.cpp @@ -19,8 +19,8 @@ PlayerIO* MockedLevelStorage::getPlayerIO() { return nullptr; } void MockedLevelStorage::closeAll() {} -ConsoleSavePath MockedLevelStorage::getDataFile(const std::wstring& id) { - return ConsoleSavePath(std::wstring(L"")); +ConsoleSavePath MockedLevelStorage::getDataFile(const std::string& id) { + return ConsoleSavePath(std::string("")); } -std::wstring MockedLevelStorage::getLevelId() { return L"none"; } \ No newline at end of file +std::string MockedLevelStorage::getLevelId() { return "none"; } \ No newline at end of file diff --git a/targets/minecraft/world/level/storage/MockedLevelStorage.h b/targets/minecraft/world/level/storage/MockedLevelStorage.h index d176a9236..a1bbe004f 100644 --- a/targets/minecraft/world/level/storage/MockedLevelStorage.h +++ b/targets/minecraft/world/level/storage/MockedLevelStorage.h @@ -15,8 +15,8 @@ public: virtual void saveLevelData(LevelData* levelData); virtual PlayerIO* getPlayerIO(); virtual void closeAll(); - virtual ConsoleSavePath getDataFile(const std::wstring& id); - virtual std::wstring getLevelId(); + virtual ConsoleSavePath getDataFile(const std::string& id); + virtual std::string getLevelId(); public: virtual ConsoleSaveFile* getSaveFile() { return nullptr; } diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.cpp b/targets/minecraft/world/level/storage/SavedDataStorage.cpp index 4be1c0ccc..c39f5140b 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/targets/minecraft/world/level/storage/SavedDataStorage.cpp @@ -25,9 +25,9 @@ SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) { /* - cache = new unordered_map >; + cache = new unordered_map >; savedDatas = new vector >; - usedAuxIds = new unordered_map; + usedAuxIds = new unordered_map; */ this->levelStorage = levelStorage; @@ -35,7 +35,7 @@ SavedDataStorage::SavedDataStorage(LevelStorage* levelStorage) { } std::shared_ptr SavedDataStorage::get(const std::type_info& clazz, - const std::wstring& id) { + const std::string& id) { auto it = cache.find(id); if (it != cache.end()) return (*it).second; @@ -71,13 +71,13 @@ std::shared_ptr SavedDataStorage::get(const std::type_info& clazz, CompoundTag* root = NbtIo::readCompressed(&fis); fis.close(); - data->load(root->getCompound(L"data")); + data->load(root->getCompound("data")); } } if (data != nullptr) { cache.insert( - std::unordered_map >::value_type(id, data)); savedDatas.push_back(data); @@ -85,7 +85,7 @@ std::shared_ptr SavedDataStorage::get(const std::type_info& clazz, return data; } -void SavedDataStorage::set(const std::wstring& id, +void SavedDataStorage::set(const std::string& id, std::shared_ptr data) { if (data == nullptr) { // TODO 4J Stu - throw new RuntimeException("Can't set null data"); @@ -123,7 +123,7 @@ void SavedDataStorage::save(std::shared_ptr data) { data->save(dataTag); CompoundTag* tag = new CompoundTag(); - tag->putCompound(L"data", dataTag); + tag->putCompound("data", dataTag); ConsoleSaveFileOutputStream fos = ConsoleSaveFileOutputStream(levelStorage->getSaveFile(), file); @@ -138,8 +138,8 @@ void SavedDataStorage::loadAuxValues() { usedAuxIds.clear(); if (levelStorage == nullptr) return; - // File file = levelStorage->getDataFile(L"idcounts"); - ConsoleSavePath file = levelStorage->getDataFile(L"idcounts"); + // File file = levelStorage->getDataFile("idcounts"); + ConsoleSavePath file = levelStorage->getDataFile("idcounts"); if (!file.getName().empty() && levelStorage->getSaveFile()->doesFileExist(file)) { ConsoleSaveFileInputStream fis = @@ -156,7 +156,7 @@ void SavedDataStorage::loadAuxValues() { if (dynamic_cast(tag) != nullptr) { ShortTag* sTag = (ShortTag*)tag; - std::wstring id = sTag->getName(); + std::string id = sTag->getName(); short val = sTag->data; usedAuxIds.insert(uaiMapType::value_type(id, val)); } @@ -164,7 +164,7 @@ void SavedDataStorage::loadAuxValues() { } } -int SavedDataStorage::getFreeAuxValueFor(const std::wstring& id) { +int SavedDataStorage::getFreeAuxValueFor(const std::string& id) { auto it = usedAuxIds.find(id); short val = 0; if (it != usedAuxIds.end()) { @@ -174,8 +174,8 @@ int SavedDataStorage::getFreeAuxValueFor(const std::wstring& id) { usedAuxIds[id] = val; if (levelStorage == nullptr) return val; - // File file = levelStorage->getDataFile(L"idcounts"); - ConsoleSavePath file = levelStorage->getDataFile(L"idcounts"); + // File file = levelStorage->getDataFile("idcounts"); + ConsoleSavePath file = levelStorage->getDataFile("idcounts"); if (!file.getName().empty()) { CompoundTag* tag = new CompoundTag(); @@ -185,7 +185,7 @@ int SavedDataStorage::getFreeAuxValueFor(const std::wstring& id) { for (uaiMapType::iterator it2 = usedAuxIds.begin(); it2 != itEndAuxIds; it2++) { short value = it2->second; - tag->putShort((wchar_t*)it2->first.c_str(), value); + tag->putShort((char*)it2->first.c_str(), value); } ConsoleSaveFileOutputStream fos = diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.h b/targets/minecraft/world/level/storage/SavedDataStorage.h index 2df0ee744..707e967c6 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.h +++ b/targets/minecraft/world/level/storage/SavedDataStorage.h @@ -16,20 +16,20 @@ class SavedDataStorage { private: LevelStorage* levelStorage; - typedef std::unordered_map > + typedef std::unordered_map > cacheMapType; cacheMapType cache; std::vector > savedDatas; - typedef std::unordered_map uaiMapType; + typedef std::unordered_map uaiMapType; uaiMapType usedAuxIds; public: SavedDataStorage(LevelStorage*); std::shared_ptr get(const std::type_info& clazz, - const std::wstring& id); - void set(const std::wstring& id, std::shared_ptr data); + const std::string& id); + void set(const std::string& id, std::shared_ptr data); void save(); private: @@ -37,7 +37,7 @@ private: void loadAuxValues(); public: - int getFreeAuxValueFor(const std::wstring& id); + int getFreeAuxValueFor(const std::string& id); // 4J Added int getAuxValueForMap(PlayerUID xuid, int dimension, int centreXC, diff --git a/targets/minecraft/world/level/tile/AnvilTile.cpp b/targets/minecraft/world/level/tile/AnvilTile.cpp index c66205906..399e645eb 100644 --- a/targets/minecraft/world/level/tile/AnvilTile.cpp +++ b/targets/minecraft/world/level/tile/AnvilTile.cpp @@ -23,8 +23,8 @@ const unsigned int AnvilTile::ANVIL_NAMES[ANVIL_NAMES_LENGTH] = { IDS_TILE_ANVIL_VERYDAMAGED, }; -std::wstring AnvilTile::TEXTURE_DAMAGE_NAMES[ANVIL_NAMES_LENGTH] = { - L"anvil_top", L"anvil_top_damaged_1", L"anvil_top_damaged_2"}; +std::string AnvilTile::TEXTURE_DAMAGE_NAMES[ANVIL_NAMES_LENGTH] = { + "anvil_top", "anvil_top_damaged_1", "anvil_top_damaged_2"}; AnvilTile::AnvilTile(int id) : HeavyTile(id, Material::heavyMetal, false) { part = PART_BASE; @@ -45,7 +45,7 @@ Icon* AnvilTile::getTexture(int face, int data) { } void AnvilTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"anvil_base"); + icon = iconRegister->registerIcon("anvil_base"); icons = new Icon*[ANVIL_NAMES_LENGTH]; for (int i = 0; i < ANVIL_NAMES_LENGTH; i++) { diff --git a/targets/minecraft/world/level/tile/AnvilTile.h b/targets/minecraft/world/level/tile/AnvilTile.h index 7e5b38bc0..37c720b11 100644 --- a/targets/minecraft/world/level/tile/AnvilTile.h +++ b/targets/minecraft/world/level/tile/AnvilTile.h @@ -23,7 +23,7 @@ public: static const unsigned int ANVIL_NAMES[ANVIL_NAMES_LENGTH]; private: - static std::wstring TEXTURE_DAMAGE_NAMES[ANVIL_NAMES_LENGTH]; + static std::string TEXTURE_DAMAGE_NAMES[ANVIL_NAMES_LENGTH]; public: int part; diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp index 4fec9b410..b0770e9db 100644 --- a/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.cpp @@ -14,7 +14,7 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -BasePressurePlateTile::BasePressurePlateTile(int id, const std::wstring& tex, +BasePressurePlateTile::BasePressurePlateTile(int id, const std::string& tex, Material* material) : Tile(id, material, false) { texture = tex; diff --git a/targets/minecraft/world/level/tile/BasePressurePlateTile.h b/targets/minecraft/world/level/tile/BasePressurePlateTile.h index 405868b69..b45580a16 100644 --- a/targets/minecraft/world/level/tile/BasePressurePlateTile.h +++ b/targets/minecraft/world/level/tile/BasePressurePlateTile.h @@ -11,10 +11,10 @@ class Material; class BasePressurePlateTile : public Tile { private: - std::wstring texture; + std::string texture; protected: - BasePressurePlateTile(int id, const std::wstring& tex, Material* material); + BasePressurePlateTile(int id, const std::string& tex, Material* material); public: virtual void updateShape(LevelSource* level, int x, int y, int z, diff --git a/targets/minecraft/world/level/tile/BedTile.cpp b/targets/minecraft/world/level/tile/BedTile.cpp index 337bafbb4..e4656b748 100644 --- a/targets/minecraft/world/level/tile/BedTile.cpp +++ b/targets/minecraft/world/level/tile/BedTile.cpp @@ -170,16 +170,16 @@ Icon* BedTile::getTexture(int face, int data) { void BedTile::registerIcons(IconRegister* iconRegister) { iconTop = new Icon*[2]; - iconTop[0] = iconRegister->registerIcon(L"bed_feet_top"); - iconTop[1] = iconRegister->registerIcon(L"bed_head_top"); + iconTop[0] = iconRegister->registerIcon("bed_feet_top"); + iconTop[1] = iconRegister->registerIcon("bed_head_top"); iconEnd = new Icon*[2]; - iconEnd[0] = iconRegister->registerIcon(L"bed_feet_end"); - iconEnd[1] = iconRegister->registerIcon(L"bed_head_end"); + iconEnd[0] = iconRegister->registerIcon("bed_feet_end"); + iconEnd[1] = iconRegister->registerIcon("bed_head_end"); iconSide = new Icon*[2]; - iconSide[0] = iconRegister->registerIcon(L"bed_feet_side"); - iconSide[1] = iconRegister->registerIcon(L"bed_head_side"); + iconSide[0] = iconRegister->registerIcon("bed_feet_side"); + iconSide[1] = iconRegister->registerIcon("bed_head_side"); } int BedTile::getRenderShape() { return Tile::SHAPE_BED; } diff --git a/targets/minecraft/world/level/tile/BrewingStandTile.cpp b/targets/minecraft/world/level/tile/BrewingStandTile.cpp index 048296eff..82a5e1151 100644 --- a/targets/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/targets/minecraft/world/level/tile/BrewingStandTile.cpp @@ -150,7 +150,7 @@ int BrewingStandTile::getAnalogOutputSignal(Level* level, int x, int y, int z, void BrewingStandTile::registerIcons(IconRegister* iconRegister) { BaseEntityTile::registerIcons(iconRegister); - iconBase = iconRegister->registerIcon(getIconName() + L"_base"); + iconBase = iconRegister->registerIcon(getIconName() + "_base"); } Icon* BrewingStandTile::getBaseTexture() { return iconBase; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/CactusTile.cpp b/targets/minecraft/world/level/tile/CactusTile.cpp index 324730887..e0ce4e7b0 100644 --- a/targets/minecraft/world/level/tile/CactusTile.cpp +++ b/targets/minecraft/world/level/tile/CactusTile.cpp @@ -90,9 +90,9 @@ void CactusTile::entityInside(Level* level, int x, int y, int z, } void CactusTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"cactus_side"); - iconTop = iconRegister->registerIcon(L"cactus_top"); - iconBottom = iconRegister->registerIcon(L"cactus_bottom"); + icon = iconRegister->registerIcon("cactus_side"); + iconTop = iconRegister->registerIcon("cactus_top"); + iconBottom = iconRegister->registerIcon("cactus_bottom"); } bool CactusTile::shouldTileTick(Level* level, int x, int y, int z) { diff --git a/targets/minecraft/world/level/tile/CakeTile.cpp b/targets/minecraft/world/level/tile/CakeTile.cpp index bc2849c90..2bd4d275d 100644 --- a/targets/minecraft/world/level/tile/CakeTile.cpp +++ b/targets/minecraft/world/level/tile/CakeTile.cpp @@ -66,10 +66,10 @@ Icon* CakeTile::getTexture(int face, int data) { } void CakeTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"cake_side"); - iconInner = iconRegister->registerIcon(L"cake_inner"); - iconTop = iconRegister->registerIcon(L"cake_top"); - iconBottom = iconRegister->registerIcon(L"cake_bottom"); + icon = iconRegister->registerIcon("cake_side"); + iconInner = iconRegister->registerIcon("cake_inner"); + iconTop = iconRegister->registerIcon("cake_top"); + iconBottom = iconRegister->registerIcon("cake_bottom"); } bool CakeTile::isCubeShaped() { return false; } diff --git a/targets/minecraft/world/level/tile/CarrotTile.cpp b/targets/minecraft/world/level/tile/CarrotTile.cpp index 0efc57d2d..1ad45648a 100644 --- a/targets/minecraft/world/level/tile/CarrotTile.cpp +++ b/targets/minecraft/world/level/tile/CarrotTile.cpp @@ -26,7 +26,7 @@ int CarrotTile::getBasePlantId() { return Item::carrots_Id; } void CarrotTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < 4; i++) { - icons[i] = iconRegister->registerIcon(getIconName() + L"_stage_" + + icons[i] = iconRegister->registerIcon(getIconName() + "_stage_" + toWString(i)); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/CauldronTile.cpp b/targets/minecraft/world/level/tile/CauldronTile.cpp index 003565cd0..923512936 100644 --- a/targets/minecraft/world/level/tile/CauldronTile.cpp +++ b/targets/minecraft/world/level/tile/CauldronTile.cpp @@ -21,8 +21,8 @@ class Icon; -const std::wstring CauldronTile::TEXTURE_INSIDE = L"cauldron_inner"; -const std::wstring CauldronTile::TEXTURE_BOTTOM = L"cauldron_bottom"; +const std::string CauldronTile::TEXTURE_INSIDE = "cauldron_inner"; +const std::string CauldronTile::TEXTURE_BOTTOM = "cauldron_bottom"; CauldronTile::CauldronTile(int id) : Tile(id, Material::metal, false) { iconInner = nullptr; @@ -41,13 +41,13 @@ Icon* CauldronTile::getTexture(int face, int data) { } void CauldronTile::registerIcons(IconRegister* iconRegister) { - iconInner = iconRegister->registerIcon(L"cauldron_inner"); - iconTop = iconRegister->registerIcon(L"cauldron_top"); - iconBottom = iconRegister->registerIcon(L"cauldron_bottom"); - icon = iconRegister->registerIcon(L"cauldron_side"); + iconInner = iconRegister->registerIcon("cauldron_inner"); + iconTop = iconRegister->registerIcon("cauldron_top"); + iconBottom = iconRegister->registerIcon("cauldron_bottom"); + icon = iconRegister->registerIcon("cauldron_side"); } -Icon* CauldronTile::getTexture(const std::wstring& name) { +Icon* CauldronTile::getTexture(const std::string& name) { if (name.compare(TEXTURE_INSIDE) == 0) return Tile::cauldron->iconInner; if (name.compare(TEXTURE_BOTTOM) == 0) return Tile::cauldron->iconBottom; return nullptr; diff --git a/targets/minecraft/world/level/tile/CauldronTile.h b/targets/minecraft/world/level/tile/CauldronTile.h index 7c23da0ed..7974d9d38 100644 --- a/targets/minecraft/world/level/tile/CauldronTile.h +++ b/targets/minecraft/world/level/tile/CauldronTile.h @@ -8,8 +8,8 @@ class Icon; class CauldronTile : public Tile { public: - static const std::wstring TEXTURE_INSIDE; - static const std::wstring TEXTURE_BOTTOM; + static const std::string TEXTURE_INSIDE; + static const std::string TEXTURE_BOTTOM; private: Icon* iconInner; @@ -22,7 +22,7 @@ public: virtual Icon* getTexture(int face, int data); //@Override void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); + static Icon* getTexture(const std::string& name); virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, std::vector* boxes, std::shared_ptr source); diff --git a/targets/minecraft/world/level/tile/ChestTile.cpp b/targets/minecraft/world/level/tile/ChestTile.cpp index 0c6cdb2d4..f40156aef 100644 --- a/targets/minecraft/world/level/tile/ChestTile.cpp +++ b/targets/minecraft/world/level/tile/ChestTile.cpp @@ -385,5 +385,5 @@ int ChestTile::getAnalogOutputSignal(Level* level, int x, int y, int z, void ChestTile::registerIcons(IconRegister* iconRegister) { // Register wood as the chest's icon, because it's used by the particles // when destroying the chest - icon = iconRegister->registerIcon(L"planks_oak"); + icon = iconRegister->registerIcon("planks_oak"); } diff --git a/targets/minecraft/world/level/tile/CocoaTile.cpp b/targets/minecraft/world/level/tile/CocoaTile.cpp index e776eb490..a318de664 100644 --- a/targets/minecraft/world/level/tile/CocoaTile.cpp +++ b/targets/minecraft/world/level/tile/CocoaTile.cpp @@ -20,8 +20,8 @@ class Icon; -const std::wstring CocoaTile::TEXTURE_AGES[] = {L"cocoa_0", L"cocoa_1", - L"cocoa_2"}; +const std::string CocoaTile::TEXTURE_AGES[] = {"cocoa_0", "cocoa_1", + "cocoa_2"}; CocoaTile::CocoaTile(int id) : DirectionalTile(id, Material::plant, false) { setTicking(true); diff --git a/targets/minecraft/world/level/tile/CocoaTile.h b/targets/minecraft/world/level/tile/CocoaTile.h index 856ff79f6..6a9857b2a 100644 --- a/targets/minecraft/world/level/tile/CocoaTile.h +++ b/targets/minecraft/world/level/tile/CocoaTile.h @@ -11,7 +11,7 @@ class Icon; class CocoaTile : public DirectionalTile { public: static const int COCOA_TEXTURES_LENGTH = 3; - static const std::wstring TEXTURE_AGES[]; + static const std::string TEXTURE_AGES[]; private: Icon** icons; diff --git a/targets/minecraft/world/level/tile/ColoredTile.cpp b/targets/minecraft/world/level/tile/ColoredTile.cpp index cceb3e2f8..1d25394ae 100644 --- a/targets/minecraft/world/level/tile/ColoredTile.cpp +++ b/targets/minecraft/world/level/tile/ColoredTile.cpp @@ -25,7 +25,7 @@ int ColoredTile::getItemAuxValueForTileData(int data) { return (~data & 0xf); } void ColoredTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < ICON_COUNT; i++) { icons[i] = iconRegister->registerIcon( - getIconName() + L"_" + + getIconName() + "_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForTileData(i)]); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/CoralTile.cpp b/targets/minecraft/world/level/tile/CoralTile.cpp index a189d020c..af573b0f5 100644 --- a/targets/minecraft/world/level/tile/CoralTile.cpp +++ b/targets/minecraft/world/level/tile/CoralTile.cpp @@ -6,7 +6,7 @@ #include "minecraft/world/level/tile/HalfTransparentTile.h" CoralTile::CoralTile(int id) - : HalfTransparentTile(id, L"coral", Material::coral, true) { + : HalfTransparentTile(id, "coral", Material::coral, true) { float r = 1 / 16.0f; setShape(0 - r, 0 - r, 0 - r, 1 + r, 1 + r, 1 + r); } diff --git a/targets/minecraft/world/level/tile/CropTile.cpp b/targets/minecraft/world/level/tile/CropTile.cpp index 28d4be5dc..301bdc6d6 100644 --- a/targets/minecraft/world/level/tile/CropTile.cpp +++ b/targets/minecraft/world/level/tile/CropTile.cpp @@ -142,6 +142,6 @@ void CropTile::registerIcons(IconRegister* iconRegister) { icons = new Icon*[8]; for (int i = 0; i < 8; i++) { - icons[i] = iconRegister->registerIcon(L"crops_" + toWString(i)); + icons[i] = iconRegister->registerIcon("crops_" + toWString(i)); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp index 52e2d2b33..9fc0eb408 100644 --- a/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp +++ b/targets/minecraft/world/level/tile/DaylightDetectorTile.cpp @@ -100,6 +100,6 @@ Icon* DaylightDetectorTile::getTexture(int face, int data) { } void DaylightDetectorTile::registerIcons(IconRegister* iconRegister) { - icons[0] = iconRegister->registerIcon(getIconName() + L"_top"); - icons[1] = iconRegister->registerIcon(getIconName() + L"_side"); + icons[0] = iconRegister->registerIcon(getIconName() + "_top"); + icons[1] = iconRegister->registerIcon(getIconName() + "_side"); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/DetectorRailTile.cpp b/targets/minecraft/world/level/tile/DetectorRailTile.cpp index 867a8efc5..f722e26c2 100644 --- a/targets/minecraft/world/level/tile/DetectorRailTile.cpp +++ b/targets/minecraft/world/level/tile/DetectorRailTile.cpp @@ -136,8 +136,8 @@ int DetectorRailTile::getAnalogOutputSignal(Level* level, int x, int y, int z, void DetectorRailTile::registerIcons(IconRegister* iconRegister) { icons = new Icon*[2]; - icons[0] = iconRegister->registerIcon(L"detectorRail"); - icons[1] = iconRegister->registerIcon(L"detectorRail_on"); + icons[0] = iconRegister->registerIcon("detectorRail"); + icons[1] = iconRegister->registerIcon("detectorRail_on"); } Icon* DetectorRailTile::getTexture(int face, int data) { diff --git a/targets/minecraft/world/level/tile/DispenserTile.cpp b/targets/minecraft/world/level/tile/DispenserTile.cpp index 5fdf064b3..5e9fd8445 100644 --- a/targets/minecraft/world/level/tile/DispenserTile.cpp +++ b/targets/minecraft/world/level/tile/DispenserTile.cpp @@ -85,10 +85,10 @@ Icon* DispenserTile::getTexture(int face, int data) { } void DispenserTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"furnace_side"); - iconTop = iconRegister->registerIcon(L"furnace_top"); - iconFront = iconRegister->registerIcon(L"dispenser_front"); - iconFrontVertical = iconRegister->registerIcon(L"dispenser_front_vertical"); + icon = iconRegister->registerIcon("furnace_side"); + iconTop = iconRegister->registerIcon("furnace_top"); + iconFront = iconRegister->registerIcon("dispenser_front"); + iconFrontVertical = iconRegister->registerIcon("dispenser_front_vertical"); } // 4J-PB - Adding a TestUse for tooltip display diff --git a/targets/minecraft/world/level/tile/DoorTile.cpp b/targets/minecraft/world/level/tile/DoorTile.cpp index a06bd5647..c1d90edb0 100644 --- a/targets/minecraft/world/level/tile/DoorTile.cpp +++ b/targets/minecraft/world/level/tile/DoorTile.cpp @@ -15,8 +15,8 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/phys/AABB.h" -const std::wstring DoorTile::TEXTURES[] = { - L"doorWood_lower", L"doorWood_upper", L"doorIron_lower", L"doorIron_upper"}; +const std::string DoorTile::TEXTURES[] = { + "doorWood_lower", "doorWood_upper", "doorIron_lower", "doorIron_upper"}; DoorTile::DoorTile(int id, Material* material) : Tile(id, material, false) { if (material == Material::metal) { @@ -74,9 +74,9 @@ Icon* DoorTile::getTexture(LevelSource* level, int x, int y, int z, int face) { void DoorTile::registerIcons(IconRegister* iconRegister) { iconTop[TEXTURE_NORMAL] = - iconRegister->registerIcon(getIconName() + L"_upper"); + iconRegister->registerIcon(getIconName() + "_upper"); iconBottom[TEXTURE_NORMAL] = - iconRegister->registerIcon(getIconName() + L"_lower"); + iconRegister->registerIcon(getIconName() + "_lower"); iconTop[TEXTURE_FLIPPED] = new FlippedIcon(iconTop[TEXTURE_NORMAL], true, false); iconBottom[TEXTURE_FLIPPED] = diff --git a/targets/minecraft/world/level/tile/DoorTile.h b/targets/minecraft/world/level/tile/DoorTile.h index e0fedbc62..1ef5102e7 100644 --- a/targets/minecraft/world/level/tile/DoorTile.h +++ b/targets/minecraft/world/level/tile/DoorTile.h @@ -30,7 +30,7 @@ public: private: static const int DOOR_TILE_TEXTURE_COUNT = 4; - static const std::wstring TEXTURES[]; + static const std::string TEXTURES[]; int texBase; Icon* iconTop[2]; Icon* iconBottom[2]; diff --git a/targets/minecraft/world/level/tile/DropperTile.cpp b/targets/minecraft/world/level/tile/DropperTile.cpp index 2a11a1fb8..2fba41574 100644 --- a/targets/minecraft/world/level/tile/DropperTile.cpp +++ b/targets/minecraft/world/level/tile/DropperTile.cpp @@ -23,12 +23,12 @@ DropperTile::DropperTile(int id) : DispenserTile(id) { } void DropperTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"furnace_side"); - iconTop = iconRegister->registerIcon(L"furnace_top"); + icon = iconRegister->registerIcon("furnace_side"); + iconTop = iconRegister->registerIcon("furnace_top"); iconFront = - iconRegister->registerIcon(getIconName() + L"_front_horizontal"); + iconRegister->registerIcon(getIconName() + "_front_horizontal"); iconFrontVertical = - iconRegister->registerIcon(getIconName() + L"_front_vertical"); + iconRegister->registerIcon(getIconName() + "_front_vertical"); } DispenseItemBehavior* DropperTile::getDispenseMethod( diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp index 9586676a3..80f3c489d 100644 --- a/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -14,9 +14,9 @@ #include "minecraft/world/level/tile/Tile.h" #include "minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -const std::wstring EnchantmentTableTile::TEXTURE_SIDE = L"enchantment_side"; -const std::wstring EnchantmentTableTile::TEXTURE_TOP = L"enchantment_top"; -const std::wstring EnchantmentTableTile::TEXTURE_BOTTOM = L"enchantment_bottom"; +const std::string EnchantmentTableTile::TEXTURE_SIDE = "enchantment_side"; +const std::string EnchantmentTableTile::TEXTURE_TOP = "enchantment_top"; +const std::string EnchantmentTableTile::TEXTURE_BOTTOM = "enchantment_bottom"; EnchantmentTableTile::EnchantmentTableTile(int id) : BaseEntityTile(id, Material::stone, false) { @@ -87,7 +87,7 @@ bool EnchantmentTableTile::use( std::dynamic_pointer_cast( level->getTileEntity(x, y, z)); player->startEnchanting(x, y, z, - table->hasCustomName() ? table->getName() : L""); + table->hasCustomName() ? table->getName() : ""); return true; } diff --git a/targets/minecraft/world/level/tile/EnchantmentTableTile.h b/targets/minecraft/world/level/tile/EnchantmentTableTile.h index f3c3f8b05..fc0d6df97 100644 --- a/targets/minecraft/world/level/tile/EnchantmentTableTile.h +++ b/targets/minecraft/world/level/tile/EnchantmentTableTile.h @@ -10,9 +10,9 @@ class EnchantmentTableTile : public BaseEntityTile { friend class ChunkRebuildData; public: - static const std::wstring TEXTURE_SIDE; - static const std::wstring TEXTURE_TOP; - static const std::wstring TEXTURE_BOTTOM; + static const std::string TEXTURE_SIDE; + static const std::string TEXTURE_TOP; + static const std::string TEXTURE_BOTTOM; private: Icon* iconTop; diff --git a/targets/minecraft/world/level/tile/EnderChestTile.cpp b/targets/minecraft/world/level/tile/EnderChestTile.cpp index 4796748a5..75ec32d6e 100644 --- a/targets/minecraft/world/level/tile/EnderChestTile.cpp +++ b/targets/minecraft/world/level/tile/EnderChestTile.cpp @@ -109,5 +109,5 @@ void EnderChestTile::animateTick(Level* level, int xt, int yt, int zt, void EnderChestTile::registerIcons(IconRegister* iconRegister) { // Register obsidian as the chest's icon, because it's used by the // particles when destroying the chest - icon = iconRegister->registerIcon(L"obsidian"); + icon = iconRegister->registerIcon("obsidian"); } diff --git a/targets/minecraft/world/level/tile/FarmTile.cpp b/targets/minecraft/world/level/tile/FarmTile.cpp index f7329cd0b..5aefb4056 100644 --- a/targets/minecraft/world/level/tile/FarmTile.cpp +++ b/targets/minecraft/world/level/tile/FarmTile.cpp @@ -127,6 +127,6 @@ int FarmTile::cloneTileId(Level* level, int x, int y, int z) { } void FarmTile::registerIcons(IconRegister* iconRegister) { - iconWet = iconRegister->registerIcon(L"farmland_wet"); - iconDry = iconRegister->registerIcon(L"farmland_dry"); + iconWet = iconRegister->registerIcon("farmland_wet"); + iconDry = iconRegister->registerIcon("farmland_dry"); } diff --git a/targets/minecraft/world/level/tile/FenceTile.cpp b/targets/minecraft/world/level/tile/FenceTile.cpp index ae181dbcc..d4fb315ff 100644 --- a/targets/minecraft/world/level/tile/FenceTile.cpp +++ b/targets/minecraft/world/level/tile/FenceTile.cpp @@ -7,7 +7,7 @@ #include "minecraft/world/level/material/Material.h" #include "minecraft/world/level/tile/Tile.h" -FenceTile::FenceTile(int id, const std::wstring& texture, Material* material) +FenceTile::FenceTile(int id, const std::string& texture, Material* material) : Tile(id, material, false) { this->texture = texture; } diff --git a/targets/minecraft/world/level/tile/FenceTile.h b/targets/minecraft/world/level/tile/FenceTile.h index 3d0b04981..e59f57b4c 100644 --- a/targets/minecraft/world/level/tile/FenceTile.h +++ b/targets/minecraft/world/level/tile/FenceTile.h @@ -9,10 +9,10 @@ class Material; class FenceTile : public Tile { private: - std::wstring texture; + std::string texture; public: - FenceTile(int id, const std::wstring& texture, Material* material); + FenceTile(int id, const std::string& texture, Material* material); virtual void addAABBs(Level* level, int x, int y, int z, AABB* box, std::vector* boxes, std::shared_ptr source); diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index d7f43dcc8..da189ff2a 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -25,8 +25,8 @@ class Icon; -const std::wstring FireTile::TEXTURE_FIRST = L"fire_0"; -const std::wstring FireTile::TEXTURE_SECOND = L"fire_1"; +const std::string FireTile::TEXTURE_FIRST = "fire_0"; +const std::string FireTile::TEXTURE_SECOND = "fire_1"; FireTile::FireTile(int id) : Tile(id, Material::fire, false) { flameOdds = new int[256]; diff --git a/targets/minecraft/world/level/tile/FireTile.h b/targets/minecraft/world/level/tile/FireTile.h index ea18df1e6..6483d2e71 100644 --- a/targets/minecraft/world/level/tile/FireTile.h +++ b/targets/minecraft/world/level/tile/FireTile.h @@ -14,8 +14,8 @@ class FireTile : public Tile { friend class ChunkRebuildData; public: - static const std::wstring TEXTURE_FIRST; - static const std::wstring TEXTURE_SECOND; + static const std::string TEXTURE_FIRST; + static const std::string TEXTURE_SECOND; static const int FLAME_INSTANT = 60; static const int FLAME_EASY = 30; diff --git a/targets/minecraft/world/level/tile/FurnaceTile.cpp b/targets/minecraft/world/level/tile/FurnaceTile.cpp index 28bb31e61..07c8535cc 100644 --- a/targets/minecraft/world/level/tile/FurnaceTile.cpp +++ b/targets/minecraft/world/level/tile/FurnaceTile.cpp @@ -71,10 +71,10 @@ Icon* FurnaceTile::getTexture(int face, int data) { } void FurnaceTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"furnace_side"); - iconFront = iconRegister->registerIcon(lit ? L"furnace_front_lit" - : L"furnace_front"); - iconTop = iconRegister->registerIcon(L"furnace_top"); + icon = iconRegister->registerIcon("furnace_side"); + iconFront = iconRegister->registerIcon(lit ? "furnace_front_lit" + : "furnace_front"); + iconTop = iconRegister->registerIcon("furnace_top"); } void FurnaceTile::animateTick(Level* level, int xt, int yt, int zt, diff --git a/targets/minecraft/world/level/tile/GlassTile.cpp b/targets/minecraft/world/level/tile/GlassTile.cpp index b6cd32201..a0cd2bba1 100644 --- a/targets/minecraft/world/level/tile/GlassTile.cpp +++ b/targets/minecraft/world/level/tile/GlassTile.cpp @@ -7,7 +7,7 @@ class Material; GlassTile::GlassTile(int id, Material* material, bool allowSame) - : HalfTransparentTile(id, L"glass", material, allowSame) {} + : HalfTransparentTile(id, "glass", material, allowSame) {} int GlassTile::getResourceCount(Random* random) { return 0; } diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp index 9c059ac8d..52c629a32 100644 --- a/targets/minecraft/world/level/tile/GrassTile.cpp +++ b/targets/minecraft/world/level/tile/GrassTile.cpp @@ -41,10 +41,10 @@ Icon* GrassTile::getTexture(LevelSource* level, int x, int y, int z, int face) { } void GrassTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"grass_side"); - iconTop = iconRegister->registerIcon(L"grass_top"); - iconSnowSide = iconRegister->registerIcon(L"snow_side"); - iconSideOverlay = iconRegister->registerIcon(L"grass_side_overlay"); + icon = iconRegister->registerIcon("grass_side"); + iconTop = iconRegister->registerIcon("grass_top"); + iconSnowSide = iconRegister->registerIcon("snow_side"); + iconSideOverlay = iconRegister->registerIcon("grass_side_overlay"); } int GrassTile::getColor() const { diff --git a/targets/minecraft/world/level/tile/HalfTransparentTile.cpp b/targets/minecraft/world/level/tile/HalfTransparentTile.cpp index d17ac98b6..fa3789933 100644 --- a/targets/minecraft/world/level/tile/HalfTransparentTile.cpp +++ b/targets/minecraft/world/level/tile/HalfTransparentTile.cpp @@ -6,7 +6,7 @@ class Material; -HalfTransparentTile::HalfTransparentTile(int id, const std::wstring& tex, +HalfTransparentTile::HalfTransparentTile(int id, const std::string& tex, Material* material, bool allowSame) : Tile(id, material, false) { this->allowSame = allowSame; diff --git a/targets/minecraft/world/level/tile/HalfTransparentTile.h b/targets/minecraft/world/level/tile/HalfTransparentTile.h index d07290bfc..134f00932 100644 --- a/targets/minecraft/world/level/tile/HalfTransparentTile.h +++ b/targets/minecraft/world/level/tile/HalfTransparentTile.h @@ -11,10 +11,10 @@ class HalfTransparentTile : public Tile { private: bool allowSame; - std::wstring texture; + std::string texture; protected: - HalfTransparentTile(int id, const std::wstring& tex, Material* material, + HalfTransparentTile(int id, const std::string& tex, Material* material, bool allowSame); public: diff --git a/targets/minecraft/world/level/tile/HayBlockTile.cpp b/targets/minecraft/world/level/tile/HayBlockTile.cpp index 5401ede41..68cdb16fa 100644 --- a/targets/minecraft/world/level/tile/HayBlockTile.cpp +++ b/targets/minecraft/world/level/tile/HayBlockTile.cpp @@ -13,6 +13,6 @@ int HayBlockTile::getRenderShape() { return SHAPE_TREE; } Icon* HayBlockTile::getTypeTexture(int type) { return icon; } void HayBlockTile::registerIcons(IconRegister* iconRegister) { - iconTop = iconRegister->registerIcon(getIconName() + L"_top"); - icon = iconRegister->registerIcon(getIconName() + L"_side"); + iconTop = iconRegister->registerIcon(getIconName() + "_top"); + icon = iconRegister->registerIcon(getIconName() + "_side"); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/HopperTile.cpp b/targets/minecraft/world/level/tile/HopperTile.cpp index 136a22e23..1b3dc6065 100644 --- a/targets/minecraft/world/level/tile/HopperTile.cpp +++ b/targets/minecraft/world/level/tile/HopperTile.cpp @@ -17,8 +17,8 @@ class Icon; -const std::wstring HopperTile::TEXTURE_OUTSIDE = L"hopper_outside"; -const std::wstring HopperTile::TEXTURE_INSIDE = L"hopper_inside"; +const std::string HopperTile::TEXTURE_OUTSIDE = "hopper_outside"; +const std::string HopperTile::TEXTURE_INSIDE = "hopper_inside"; HopperTile::HopperTile(int id) : BaseEntityTile(id, Material::metal, false) { setShape(0, 0, 0, 1, 1, 1); @@ -179,17 +179,17 @@ int HopperTile::getAnalogOutputSignal(Level* level, int x, int y, int z, void HopperTile::registerIcons(IconRegister* iconRegister) { hopperIcon = iconRegister->registerIcon(TEXTURE_OUTSIDE); - hopperTopIcon = iconRegister->registerIcon(L"hopper_top"); + hopperTopIcon = iconRegister->registerIcon("hopper_top"); hopperInnerIcon = iconRegister->registerIcon(TEXTURE_INSIDE); } -Icon* HopperTile::getTexture(const std::wstring& name) { +Icon* HopperTile::getTexture(const std::string& name) { if (name.compare(TEXTURE_OUTSIDE) == 0) return Tile::hopper->hopperIcon; if (name.compare(TEXTURE_INSIDE) == 0) return Tile::hopper->hopperInnerIcon; return nullptr; } -std::wstring HopperTile::getTileItemIconName() { return L"hopper"; } +std::string HopperTile::getTileItemIconName() { return "hopper"; } std::shared_ptr HopperTile::getHopper(LevelSource* level, int x, int y, int z) { diff --git a/targets/minecraft/world/level/tile/HopperTile.h b/targets/minecraft/world/level/tile/HopperTile.h index 4c953aa64..6cf74ce3d 100644 --- a/targets/minecraft/world/level/tile/HopperTile.h +++ b/targets/minecraft/world/level/tile/HopperTile.h @@ -19,8 +19,8 @@ private: static const int MASK_ATTACHED = 0x7; public: - static const std::wstring TEXTURE_OUTSIDE; - static const std::wstring TEXTURE_INSIDE; + static const std::string TEXTURE_OUTSIDE; + static const std::string TEXTURE_INSIDE; private: Random random; @@ -71,8 +71,8 @@ public: virtual int getAnalogOutputSignal(Level* level, int x, int y, int z, int dir); virtual void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); - virtual std::wstring getTileItemIconName(); + static Icon* getTexture(const std::string& name); + virtual std::string getTileItemIconName(); static std::shared_ptr getHopper(LevelSource* level, int x, int y, int z); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp index 5051008e2..cf9f036ef 100644 --- a/targets/minecraft/world/level/tile/HugeMushroomTile.cpp +++ b/targets/minecraft/world/level/tile/HugeMushroomTile.cpp @@ -7,10 +7,10 @@ class Icon; class Material; -const std::wstring HugeMushroomTile::TEXTURE_STEM = L"skin_stem"; -const std::wstring HugeMushroomTile::TEXTURE_INSIDE = L"inside"; -const std::wstring HugeMushroomTile::TEXTURE_TYPE[] = {L"skin_brown", - L"skin_red"}; +const std::string HugeMushroomTile::TEXTURE_STEM = "skin_stem"; +const std::string HugeMushroomTile::TEXTURE_INSIDE = "inside"; +const std::string HugeMushroomTile::TEXTURE_TYPE[] = {"skin_brown", + "skin_red"}; HugeMushroomTile::HugeMushroomTile(int id, Material* material, int type) : Tile(id, material) { @@ -63,10 +63,10 @@ void HugeMushroomTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < HUGE_MUSHROOM_TEXTURE_COUNT; i++) { icons[i] = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_TYPE[i]); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_TYPE[i]); } iconInside = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_INSIDE); - iconStem = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_STEM); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_INSIDE); + iconStem = iconRegister->registerIcon(getIconName() + "_" + TEXTURE_STEM); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/HugeMushroomTile.h b/targets/minecraft/world/level/tile/HugeMushroomTile.h index 8038ca55a..765bab3c5 100644 --- a/targets/minecraft/world/level/tile/HugeMushroomTile.h +++ b/targets/minecraft/world/level/tile/HugeMushroomTile.h @@ -14,12 +14,12 @@ public: static const int MUSHROOM_TYPE_BROWN = 0; static const int MUSHROOM_TYPE_RED = 1; - static const std::wstring TEXTURE_STEM; - static const std::wstring TEXTURE_INSIDE; + static const std::string TEXTURE_STEM; + static const std::string TEXTURE_INSIDE; private: static const int HUGE_MUSHROOM_TEXTURE_COUNT = 2; - static const std::wstring TEXTURE_TYPE[]; + static const std::string TEXTURE_TYPE[]; int type; Icon** icons; Icon* iconStem; diff --git a/targets/minecraft/world/level/tile/IceTile.cpp b/targets/minecraft/world/level/tile/IceTile.cpp index 0f84094e1..13ee345a3 100644 --- a/targets/minecraft/world/level/tile/IceTile.cpp +++ b/targets/minecraft/world/level/tile/IceTile.cpp @@ -17,7 +17,7 @@ class ItemInstance; IceTile::IceTile(int id) - : HalfTransparentTile(id, L"ice", Material::ice, false) { + : HalfTransparentTile(id, "ice", Material::ice, false) { friction = 0.98f; setTicking(true); } diff --git a/targets/minecraft/world/level/tile/JukeboxTile.cpp b/targets/minecraft/world/level/tile/JukeboxTile.cpp index 724302003..3683ffa27 100644 --- a/targets/minecraft/world/level/tile/JukeboxTile.cpp +++ b/targets/minecraft/world/level/tile/JukeboxTile.cpp @@ -22,11 +22,11 @@ JukeboxTile::Entity::Entity() : TileEntity() { record = nullptr; } void JukeboxTile::Entity::load(CompoundTag* tag) { TileEntity::load(tag); - if (tag->contains(L"RecordItem")) { - setRecord(ItemInstance::fromTag(tag->getCompound(L"RecordItem"))); - } else if (tag->getInt(L"Record") > 0) { + if (tag->contains("RecordItem")) { + setRecord(ItemInstance::fromTag(tag->getCompound("RecordItem"))); + } else if (tag->getInt("Record") > 0) { setRecord(std::shared_ptr( - new ItemInstance(tag->getInt(L"Record"), 1, 0))); + new ItemInstance(tag->getInt("Record"), 1, 0))); } } @@ -34,9 +34,9 @@ void JukeboxTile::Entity::save(CompoundTag* tag) { TileEntity::save(tag); if (getRecord() != nullptr) { - tag->putCompound(L"RecordItem", getRecord()->save(new CompoundTag())); + tag->putCompound("RecordItem", getRecord()->save(new CompoundTag())); - tag->putInt(L"Record", getRecord()->id); + tag->putInt("Record", getRecord()->id); } } @@ -116,7 +116,7 @@ void JukeboxTile::dropRecording(Level* level, int x, int y, int z) { level->levelEvent(LevelEvent::SOUND_PLAY_RECORDING, x, y, z, 0); // 4J-PB- the level event will play the music - // level->playStreamingMusic(L"", x, y, z); + // level->playStreamingMusic("", x, y, z); rte->setRecord(nullptr); rte->setChanged(); level->setData(x, y, z, 0, Tile::UPDATE_CLIENTS); @@ -151,8 +151,8 @@ std::shared_ptr JukeboxTile::newTileEntity(Level* level) { } void JukeboxTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(getIconName() + L"_side"); - iconTop = iconRegister->registerIcon(getIconName() + L"_top"); + icon = iconRegister->registerIcon(getIconName() + "_side"); + iconTop = iconRegister->registerIcon(getIconName() + "_top"); } bool JukeboxTile::hasAnalogOutputSignal() { return true; } diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index a72d1b6a4..3883be2e6 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -29,10 +29,10 @@ const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = { IDS_TILE_LEAVES_JUNGLE, }; -const std::wstring LeafTile::TEXTURES[2][4] = { - {L"leaves", L"leaves_spruce", L"leaves", L"leaves_jungle"}, - {L"leaves_opaque", L"leaves_spruce_opaque", L"leaves_opaque", - L"leaves_jungle_opaque"}, +const std::string LeafTile::TEXTURES[2][4] = { + {"leaves", "leaves_spruce", "leaves", "leaves_jungle"}, + {"leaves_opaque", "leaves_spruce_opaque", "leaves_opaque", + "leaves_jungle_opaque"}, }; // 4jcraft, this is the unitinialized vpointer fiassco of isSolidRender() diff --git a/targets/minecraft/world/level/tile/LeafTile.h b/targets/minecraft/world/level/tile/LeafTile.h index d6f9908cd..1202be745 100644 --- a/targets/minecraft/world/level/tile/LeafTile.h +++ b/targets/minecraft/world/level/tile/LeafTile.h @@ -13,7 +13,7 @@ class LeafTile : public TransparentTile { friend class ChunkRebuildData; public: - static const std::wstring TEXTURES[2][4]; + static const std::string TEXTURES[2][4]; static const int REQUIRED_WOOD_RANGE = 4; static const int UPDATE_LEAF_BIT = 8; diff --git a/targets/minecraft/world/level/tile/LiquidTile.cpp b/targets/minecraft/world/level/tile/LiquidTile.cpp index 3023d52d1..9aa0fdb55 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.cpp +++ b/targets/minecraft/world/level/tile/LiquidTile.cpp @@ -23,10 +23,10 @@ class Icon; -const std::wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava"; -const std::wstring LiquidTile::TEXTURE_WATER_STILL = L"water"; -const std::wstring LiquidTile::TEXTURE_WATER_FLOW = L"water_flow"; -const std::wstring LiquidTile::TEXTURE_LAVA_FLOW = L"lava_flow"; +const std::string LiquidTile::TEXTURE_LAVA_STILL = "lava"; +const std::string LiquidTile::TEXTURE_WATER_STILL = "water"; +const std::string LiquidTile::TEXTURE_WATER_FLOW = "water_flow"; +const std::string LiquidTile::TEXTURE_LAVA_FLOW = "lava_flow"; LiquidTile::LiquidTile(int id, Material* material) : Tile(id, material, false) { float yo = 0; @@ -384,7 +384,7 @@ void LiquidTile::registerIcons(IconRegister* iconRegister) { } } -Icon* LiquidTile::getTexture(const std::wstring& name) { +Icon* LiquidTile::getTexture(const std::string& name) { if (name.compare(TEXTURE_WATER_STILL) == 0) return Tile::water->icons[0]; if (name.compare(TEXTURE_WATER_FLOW) == 0) return Tile::water->icons[1]; if (name.compare(TEXTURE_LAVA_STILL) == 0) return Tile::lava->icons[0]; diff --git a/targets/minecraft/world/level/tile/LiquidTile.h b/targets/minecraft/world/level/tile/LiquidTile.h index 1471a1840..a8fe52ddc 100644 --- a/targets/minecraft/world/level/tile/LiquidTile.h +++ b/targets/minecraft/world/level/tile/LiquidTile.h @@ -16,10 +16,10 @@ class LiquidTile : public Tile { friend class ChunkRebuildData; public: - static const std::wstring TEXTURE_LAVA_STILL; - static const std::wstring TEXTURE_WATER_STILL; - static const std::wstring TEXTURE_WATER_FLOW; - static const std::wstring TEXTURE_LAVA_FLOW; + static const std::string TEXTURE_LAVA_STILL; + static const std::string TEXTURE_WATER_STILL; + static const std::string TEXTURE_WATER_FLOW; + static const std::string TEXTURE_LAVA_FLOW; private: Icon* icons[2]; @@ -78,5 +78,5 @@ protected: public: void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); + static Icon* getTexture(const std::string& name); }; diff --git a/targets/minecraft/world/level/tile/MelonTile.cpp b/targets/minecraft/world/level/tile/MelonTile.cpp index 2f8a1a3ae..0936840e2 100644 --- a/targets/minecraft/world/level/tile/MelonTile.cpp +++ b/targets/minecraft/world/level/tile/MelonTile.cpp @@ -35,6 +35,6 @@ int MelonTile::getResourceCountForLootBonus(int bonusLevel, Random* random) { } void MelonTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(getIconName() + L"_side"); - iconTop = iconRegister->registerIcon(getIconName() + L"_top"); + icon = iconRegister->registerIcon(getIconName() + "_side"); + iconTop = iconRegister->registerIcon(getIconName() + "_top"); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/MycelTile.cpp b/targets/minecraft/world/level/tile/MycelTile.cpp index 50183e604..b62b20dac 100644 --- a/targets/minecraft/world/level/tile/MycelTile.cpp +++ b/targets/minecraft/world/level/tile/MycelTile.cpp @@ -34,9 +34,9 @@ Icon* MycelTile::getTexture(LevelSource* level, int x, int y, int z, int face) { } void MycelTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"mycel_side"); - iconTop = iconRegister->registerIcon(L"mycel_top"); - iconSnowSide = iconRegister->registerIcon(L"snow_side"); + icon = iconRegister->registerIcon("mycel_side"); + iconTop = iconRegister->registerIcon("mycel_top"); + iconSnowSide = iconRegister->registerIcon("snow_side"); } void MycelTile::tick(Level* level, int x, int y, int z, Random* random) { diff --git a/targets/minecraft/world/level/tile/NetherWartTile.cpp b/targets/minecraft/world/level/tile/NetherWartTile.cpp index 3b6a2c7e4..976f203ef 100644 --- a/targets/minecraft/world/level/tile/NetherWartTile.cpp +++ b/targets/minecraft/world/level/tile/NetherWartTile.cpp @@ -91,7 +91,7 @@ int NetherWartTile::cloneTileId(Level* level, int x, int y, int z) { void NetherWartTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < NETHER_STALK_TEXTURE_COUNT; i++) { - icons[i] = iconRegister->registerIcon(getIconName() + L"_stage_" + + icons[i] = iconRegister->registerIcon(getIconName() + "_stage_" + toWString(i)); } } diff --git a/targets/minecraft/world/level/tile/PortalTile.cpp b/targets/minecraft/world/level/tile/PortalTile.cpp index 444eeca43..b02b12139 100644 --- a/targets/minecraft/world/level/tile/PortalTile.cpp +++ b/targets/minecraft/world/level/tile/PortalTile.cpp @@ -18,7 +18,7 @@ #include "minecraft/world/phys/AABB.h" PortalTile::PortalTile(int id) - : HalfTransparentTile(id, L"portal", Material::portal, false) { + : HalfTransparentTile(id, "portal", Material::portal, false) { setTicking(true); } diff --git a/targets/minecraft/world/level/tile/PotatoTile.cpp b/targets/minecraft/world/level/tile/PotatoTile.cpp index 51a7d9c5b..79519081f 100644 --- a/targets/minecraft/world/level/tile/PotatoTile.cpp +++ b/targets/minecraft/world/level/tile/PotatoTile.cpp @@ -46,7 +46,7 @@ void PotatoTile::spawnResources(Level* level, int x, int y, int z, int data, void PotatoTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < 4; i++) { - icons[i] = iconRegister->registerIcon(getIconName() + L"_stage_" + + icons[i] = iconRegister->registerIcon(getIconName() + "_stage_" + toWString(i)); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/PoweredRailTile.cpp b/targets/minecraft/world/level/tile/PoweredRailTile.cpp index b52191233..6b2211eb1 100644 --- a/targets/minecraft/world/level/tile/PoweredRailTile.cpp +++ b/targets/minecraft/world/level/tile/PoweredRailTile.cpp @@ -19,7 +19,7 @@ Icon* PoweredRailTile::getTexture(int face, int data) { void PoweredRailTile::registerIcons(IconRegister* iconRegister) { BaseRailTile::registerIcons(iconRegister); - iconPowered = iconRegister->registerIcon(getIconName() + L"_powered"); + iconPowered = iconRegister->registerIcon(getIconName() + "_powered"); } bool PoweredRailTile::findPoweredRailSignal(Level* level, int x, int y, int z, diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.cpp b/targets/minecraft/world/level/tile/PressurePlateTile.cpp index b1e198b1a..fc1b59016 100644 --- a/targets/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/PressurePlateTile.cpp @@ -15,7 +15,7 @@ class Material; -PressurePlateTile::PressurePlateTile(int id, const std::wstring& tex, +PressurePlateTile::PressurePlateTile(int id, const std::string& tex, Material* material, Sensitivity sensitivity) : BasePressurePlateTile(id, tex, material) { diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.h b/targets/minecraft/world/level/tile/PressurePlateTile.h index 85f4a2e0e..7c63bb808 100644 --- a/targets/minecraft/world/level/tile/PressurePlateTile.h +++ b/targets/minecraft/world/level/tile/PressurePlateTile.h @@ -13,7 +13,7 @@ private: Sensitivity sensitivity; public: - PressurePlateTile(int id, const std::wstring& tex, Material* material, + PressurePlateTile(int id, const std::string& tex, Material* material, Sensitivity sensitivity); protected: diff --git a/targets/minecraft/world/level/tile/PumpkinTile.cpp b/targets/minecraft/world/level/tile/PumpkinTile.cpp index 4c994166a..214100e4b 100644 --- a/targets/minecraft/world/level/tile/PumpkinTile.cpp +++ b/targets/minecraft/world/level/tile/PumpkinTile.cpp @@ -16,8 +16,8 @@ #include "minecraft/world/level/tile/DirectionalTile.h" #include "minecraft/world/level/tile/Tile.h" -const std::wstring PumpkinTile::TEXTURE_FACE = L"pumpkin_face"; -const std::wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack"; +const std::string PumpkinTile::TEXTURE_FACE = "pumpkin_face"; +const std::string PumpkinTile::TEXTURE_LANTERN = "pumpkin_jack"; PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable, false) { @@ -188,8 +188,8 @@ void PumpkinTile::setPlacedBy(Level* level, int x, int y, int z, } void PumpkinTile::registerIcons(IconRegister* iconRegister) { - iconFace = iconRegister->registerIcon(getIconName() + L"_face_" + - (lit ? L"on" : L"off")); - iconTop = iconRegister->registerIcon(getIconName() + L"_top"); - icon = iconRegister->registerIcon(getIconName() + L"_side"); + iconFace = iconRegister->registerIcon(getIconName() + "_face_" + + (lit ? "on" : "off")); + iconTop = iconRegister->registerIcon(getIconName() + "_top"); + icon = iconRegister->registerIcon(getIconName() + "_side"); } diff --git a/targets/minecraft/world/level/tile/PumpkinTile.h b/targets/minecraft/world/level/tile/PumpkinTile.h index 5a7e6628b..14a112161 100644 --- a/targets/minecraft/world/level/tile/PumpkinTile.h +++ b/targets/minecraft/world/level/tile/PumpkinTile.h @@ -18,8 +18,8 @@ public: static const int DIR_EAST = 3; private: - static const std::wstring TEXTURE_FACE; - static const std::wstring TEXTURE_LANTERN; + static const std::string TEXTURE_FACE; + static const std::string TEXTURE_LANTERN; bool lit; Icon* iconTop; Icon* iconFace; diff --git a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp index 2690dd32d..9b8f98dcb 100644 --- a/targets/minecraft/world/level/tile/QuartzBlockTile.cpp +++ b/targets/minecraft/world/level/tile/QuartzBlockTile.cpp @@ -14,12 +14,12 @@ int QuartzBlockTile::BLOCK_NAMES[QUARTZ_BLOCK_NAMES] = { IDS_TILE_QUARTZ_BLOCK_LINES, IDS_TILE_QUARTZ_BLOCK_LINES, IDS_TILE_QUARTZ_BLOCK_LINES}; -const std::wstring QuartzBlockTile::TEXTURE_TOP = L"top"; -const std::wstring QuartzBlockTile::TEXTURE_CHISELED_TOP = L"chiseled_top"; -const std::wstring QuartzBlockTile::TEXTURE_LINES_TOP = L"lines_top"; -const std::wstring QuartzBlockTile::TEXTURE_BOTTOM = L"bottom"; -const std::wstring QuartzBlockTile::TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES] = { - L"side", L"chiseled", L"lines", L"", L""}; +const std::string QuartzBlockTile::TEXTURE_TOP = "top"; +const std::string QuartzBlockTile::TEXTURE_CHISELED_TOP = "chiseled_top"; +const std::string QuartzBlockTile::TEXTURE_LINES_TOP = "lines_top"; +const std::string QuartzBlockTile::TEXTURE_BOTTOM = "bottom"; +const std::string QuartzBlockTile::TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES] = { + "side", "chiseled", "lines", "", ""}; QuartzBlockTile::QuartzBlockTile(int id) : Tile(id, Material::stone) {} @@ -97,16 +97,16 @@ void QuartzBlockTile::registerIcons(IconRegister* iconRegister) { if (TEXTURE_NAMES[i].empty()) { icons[i] = icons[i - 1]; } else { - icons[i] = iconRegister->registerIcon(getIconName() + L"_" + + icons[i] = iconRegister->registerIcon(getIconName() + "_" + TEXTURE_NAMES[i]); } } - iconTop = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_TOP); + iconTop = iconRegister->registerIcon(getIconName() + "_" + TEXTURE_TOP); iconChiseledTop = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_CHISELED_TOP); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_CHISELED_TOP); iconLinesTop = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_LINES_TOP); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_LINES_TOP); iconBottom = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_BOTTOM); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_BOTTOM); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/QuartzBlockTile.h b/targets/minecraft/world/level/tile/QuartzBlockTile.h index 90f989aa0..155ca62f3 100644 --- a/targets/minecraft/world/level/tile/QuartzBlockTile.h +++ b/targets/minecraft/world/level/tile/QuartzBlockTile.h @@ -23,11 +23,11 @@ public: private: static const int QUARTZ_BLOCK_TEXTURES = 5; - static const std::wstring TEXTURE_TOP; - static const std::wstring TEXTURE_CHISELED_TOP; - static const std::wstring TEXTURE_LINES_TOP; - static const std::wstring TEXTURE_BOTTOM; - static const std::wstring TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES]; + static const std::string TEXTURE_TOP; + static const std::string TEXTURE_CHISELED_TOP; + static const std::string TEXTURE_LINES_TOP; + static const std::string TEXTURE_BOTTOM; + static const std::string TEXTURE_NAMES[QUARTZ_BLOCK_TEXTURES]; Icon* icons[QUARTZ_BLOCK_TEXTURES]; Icon* iconChiseledTop; diff --git a/targets/minecraft/world/level/tile/RailTile.cpp b/targets/minecraft/world/level/tile/RailTile.cpp index d9d2a45ba..a5190f73e 100644 --- a/targets/minecraft/world/level/tile/RailTile.cpp +++ b/targets/minecraft/world/level/tile/RailTile.cpp @@ -18,7 +18,7 @@ Icon* RailTile::getTexture(int face, int data) { void RailTile::registerIcons(IconRegister* iconRegister) { BaseRailTile::registerIcons(iconRegister); - iconTurn = iconRegister->registerIcon(getIconName() + L"_turned"); + iconTurn = iconRegister->registerIcon(getIconName() + "_turned"); } void RailTile::updateState(Level* level, int x, int y, int z, int data, int dir, diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index b86cb2a52..f2cfe9409 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -26,10 +26,10 @@ class Icon; -const std::wstring RedStoneDustTile::TEXTURE_CROSS = L"_cross"; -const std::wstring RedStoneDustTile::TEXTURE_LINE = L"_line"; -const std::wstring RedStoneDustTile::TEXTURE_CROSS_OVERLAY = L"_cross_overlay"; -const std::wstring RedStoneDustTile::TEXTURE_LINE_OVERLAY = L"_line_overlay"; +const std::string RedStoneDustTile::TEXTURE_CROSS = "_cross"; +const std::string RedStoneDustTile::TEXTURE_LINE = "_line"; +const std::string RedStoneDustTile::TEXTURE_CROSS_OVERLAY = "_cross_overlay"; +const std::string RedStoneDustTile::TEXTURE_LINE_OVERLAY = "_line_overlay"; RedStoneDustTile::RedStoneDustTile(int id) : Tile(id, Material::decoration, false) { @@ -431,7 +431,7 @@ void RedStoneDustTile::registerIcons(IconRegister* iconRegister) { icon = iconCross; } -Icon* RedStoneDustTile::getTexture(const std::wstring& name) { +Icon* RedStoneDustTile::getTexture(const std::string& name) { if (name.compare(TEXTURE_CROSS) == 0) return Tile::redStoneDust->iconCross; if (name.compare(TEXTURE_LINE) == 0) return Tile::redStoneDust->iconLine; if (name.compare(TEXTURE_CROSS_OVERLAY) == 0) diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.h b/targets/minecraft/world/level/tile/RedStoneDustTile.h index f53fbe9c4..5cdb0cf08 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.h +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.h @@ -16,10 +16,10 @@ class RedStoneDustTile : public Tile { friend ChunkRebuildData; public: - static const std::wstring TEXTURE_CROSS; - static const std::wstring TEXTURE_LINE; - static const std::wstring TEXTURE_CROSS_OVERLAY; - static const std::wstring TEXTURE_LINE_OVERLAY; + static const std::string TEXTURE_CROSS; + static const std::string TEXTURE_LINE; + static const std::string TEXTURE_CROSS_OVERLAY; + static const std::string TEXTURE_LINE_OVERLAY; private: bool shouldSignal; @@ -72,5 +72,5 @@ public: virtual int cloneTileId(Level* level, int x, int y, int z); void registerIcons(IconRegister* iconRegister); - static Icon* getTexture(const std::wstring& name); + static Icon* getTexture(const std::string& name); }; diff --git a/targets/minecraft/world/level/tile/RedlightTile.cpp b/targets/minecraft/world/level/tile/RedlightTile.cpp index 300b14cd6..24713cf19 100644 --- a/targets/minecraft/world/level/tile/RedlightTile.cpp +++ b/targets/minecraft/world/level/tile/RedlightTile.cpp @@ -18,9 +18,9 @@ RedlightTile::RedlightTile(int id, bool isLit) void RedlightTile::registerIcons(IconRegister* iconRegister) { if (isLit) { - icon = iconRegister->registerIcon(L"redstoneLight_lit"); + icon = iconRegister->registerIcon("redstoneLight_lit"); } else { - icon = iconRegister->registerIcon(L"redstoneLight"); + icon = iconRegister->registerIcon("redstoneLight"); } } diff --git a/targets/minecraft/world/level/tile/SandStoneTile.cpp b/targets/minecraft/world/level/tile/SandStoneTile.cpp index 791e3ede7..7459bea69 100644 --- a/targets/minecraft/world/level/tile/SandStoneTile.cpp +++ b/targets/minecraft/world/level/tile/SandStoneTile.cpp @@ -8,10 +8,10 @@ class Icon; -const std::wstring SandStoneTile::TEXTURE_TOP = L"sandstone_top"; -const std::wstring SandStoneTile::TEXTURE_BOTTOM = L"sandstone_bottom"; -const std::wstring SandStoneTile::TEXTURE_NAMES[] = { - L"sandstone_side", L"sandstone_carved", L"sandstone_smooth"}; +const std::string SandStoneTile::TEXTURE_TOP = "sandstone_top"; +const std::string SandStoneTile::TEXTURE_BOTTOM = "sandstone_bottom"; +const std::string SandStoneTile::TEXTURE_NAMES[] = { + "sandstone_side", "sandstone_carved", "sandstone_smooth"}; int SandStoneTile::SANDSTONE_NAMES[SANDSTONE_BLOCK_NAMES] = { IDS_TILE_SANDSTONE, IDS_TILE_SANDSTONE_CHISELED, IDS_TILE_SANDSTONE_SMOOTH}; diff --git a/targets/minecraft/world/level/tile/SandStoneTile.h b/targets/minecraft/world/level/tile/SandStoneTile.h index 87b260c0f..91bec19b4 100644 --- a/targets/minecraft/world/level/tile/SandStoneTile.h +++ b/targets/minecraft/world/level/tile/SandStoneTile.h @@ -23,9 +23,9 @@ public: static int SANDSTONE_NAMES[SANDSTONE_BLOCK_NAMES]; private: - static const std::wstring TEXTURE_TOP; - static const std::wstring TEXTURE_BOTTOM; - static const std::wstring TEXTURE_NAMES[]; + static const std::string TEXTURE_TOP; + static const std::string TEXTURE_BOTTOM; + static const std::string TEXTURE_NAMES[]; static const int SANDSTONE_TILE_TEXTURE_COUNT = 3; Icon** icons; diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp index dea97d3b5..485029b31 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.cpp +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.cpp @@ -21,8 +21,8 @@ int Sapling::SAPLING_NAMES[SAPLING_NAMES_SIZE] = { IDS_TILE_SAPLING_OAK, IDS_TILE_SAPLING_SPRUCE, IDS_TILE_SAPLING_BIRCH, IDS_TILE_SAPLING_JUNGLE}; -const std::wstring Sapling::TEXTURE_NAMES[] = { - L"sapling", L"sapling_spruce", L"sapling_birch", L"sapling_jungle"}; +const std::string Sapling::TEXTURE_NAMES[] = { + "sapling", "sapling_spruce", "sapling_birch", "sapling_jungle"}; Sapling::Sapling(int id) : Bush(id) { this->updateDefaultShape(); diff --git a/targets/minecraft/world/level/tile/SaplingPlantTile.h b/targets/minecraft/world/level/tile/SaplingPlantTile.h index 939e0f985..855525eb5 100644 --- a/targets/minecraft/world/level/tile/SaplingPlantTile.h +++ b/targets/minecraft/world/level/tile/SaplingPlantTile.h @@ -25,7 +25,7 @@ public: static int SAPLING_NAMES[SAPLING_NAMES_SIZE]; private: - static const std::wstring TEXTURE_NAMES[]; + static const std::string TEXTURE_NAMES[]; Icon** icons; diff --git a/targets/minecraft/world/level/tile/SkullTile.cpp b/targets/minecraft/world/level/tile/SkullTile.cpp index e4da4b59b..6bb86570d 100644 --- a/targets/minecraft/world/level/tile/SkullTile.cpp +++ b/targets/minecraft/world/level/tile/SkullTile.cpp @@ -125,7 +125,7 @@ void SkullTile::onRemove(Level* level, int x, int y, int z, int id, int data) { if (entity->getSkullType() == SkullTileEntity::TYPE_CHAR && !entity->getExtraType().empty()) { item->setTag(new CompoundTag()); - item->getTag()->putString(L"SkullOwner", entity->getExtraType()); + item->getTag()->putString("SkullOwner", entity->getExtraType()); } popResource(level, x, y, z, item); @@ -331,6 +331,6 @@ Icon* SkullTile::getTexture(int face, int data) { return Tile::soulsand->getTexture(face); } -std::wstring SkullTile::getTileItemIconName() { - return getIconName() + L"_" + SkullItem::ICON_NAMES[0]; +std::string SkullTile::getTileItemIconName() { + return getIconName() + "_" + SkullItem::ICON_NAMES[0]; } diff --git a/targets/minecraft/world/level/tile/SkullTile.h b/targets/minecraft/world/level/tile/SkullTile.h index f7fdba1c0..982e7f1d4 100644 --- a/targets/minecraft/world/level/tile/SkullTile.h +++ b/targets/minecraft/world/level/tile/SkullTile.h @@ -53,5 +53,5 @@ private: public: void registerIcons(IconRegister* iconRegister); Icon* getTexture(int face, int data); - std::wstring getTileItemIconName(); + std::string getTileItemIconName(); }; diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp index d5f24ac70..6339f1add 100644 --- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp +++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.cpp @@ -7,8 +7,8 @@ class Icon; -const std::wstring SmoothStoneBrickTile::TEXTURE_NAMES[] = { - L"", L"mossy", L"cracked", L"carved"}; +const std::string SmoothStoneBrickTile::TEXTURE_NAMES[] = { + "", "mossy", "cracked", "carved"}; const unsigned int SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES [SMOOTH_STONE_BRICK_NAMES_LENGTH] = {IDS_TILE_STONE_BRICK_SMOOTH, @@ -36,8 +36,8 @@ void SmoothStoneBrickTile::registerIcons(IconRegister* iconRegister) { icons = new Icon*[SMOOTH_STONE_BRICK_NAMES_LENGTH]; for (int i = 0; i < SMOOTH_STONE_BRICK_NAMES_LENGTH; i++) { - std::wstring name = getIconName(); - if (!TEXTURE_NAMES[i].empty()) name += L"_" + TEXTURE_NAMES[i]; + std::string name = getIconName(); + if (!TEXTURE_NAMES[i].empty()) name += "_" + TEXTURE_NAMES[i]; icons[i] = iconRegister->registerIcon(name); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h index f37f1996f..2405f6b1f 100644 --- a/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h +++ b/targets/minecraft/world/level/tile/SmoothStoneBrickTile.h @@ -15,7 +15,7 @@ public: static const int TYPE_CRACKED = 2; static const int TYPE_DETAIL = 3; - static const std::wstring TEXTURE_NAMES[]; + static const std::string TEXTURE_NAMES[]; static const int SMOOTH_STONE_BRICK_NAMES_LENGTH = 4; diff --git a/targets/minecraft/world/level/tile/StainedGlassBlock.cpp b/targets/minecraft/world/level/tile/StainedGlassBlock.cpp index d87852dc7..9868285e4 100644 --- a/targets/minecraft/world/level/tile/StainedGlassBlock.cpp +++ b/targets/minecraft/world/level/tile/StainedGlassBlock.cpp @@ -12,7 +12,7 @@ class Material; Icon* StainedGlassBlock::ICONS[StainedGlassBlock::ICONS_LENGTH]; StainedGlassBlock::StainedGlassBlock(int id, Material* material) - : HalfTransparentTile(id, L"glass", material, false) {} + : HalfTransparentTile(id, "glass", material, false) {} Icon* StainedGlassBlock::getTexture(int face, int data) { return ICONS[data % ICONS_LENGTH]; @@ -29,7 +29,7 @@ int StainedGlassBlock::getRenderLayer() { return 1; } void StainedGlassBlock::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < ICONS_LENGTH; i++) { ICONS[i] = iconRegister->registerIcon( - getIconName() + L"_" + + getIconName() + "_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]); } } diff --git a/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp b/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp index dac15a1c7..e2e48cc15 100644 --- a/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp +++ b/targets/minecraft/world/level/tile/StainedGlassPaneBlock.cpp @@ -13,7 +13,7 @@ Icon* StainedGlassPaneBlock::ICONS[StainedGlassPaneBlock::ICONS_COUNT]; Icon* StainedGlassPaneBlock::EDGE_ICONS[StainedGlassPaneBlock::ICONS_COUNT]; StainedGlassPaneBlock::StainedGlassPaneBlock(int id) - : ThinFenceTile(id, L"glass", L"glass_pane_top", Material::glass, false) {} + : ThinFenceTile(id, "glass", "glass_pane_top", Material::glass, false) {} Icon* StainedGlassPaneBlock::getIconTexture(int face, int data) { return ICONS[data % ICONS_COUNT]; @@ -39,10 +39,10 @@ void StainedGlassPaneBlock::registerIcons(IconRegister* iconRegister) { ThinFenceTile::registerIcons(iconRegister); for (int i = 0; i < ICONS_COUNT; i++) { ICONS[i] = iconRegister->registerIcon( - getIconName() + L"_" + + getIconName() + "_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]); EDGE_ICONS[i] = iconRegister->registerIcon( - getIconName() + L"_pane_top_" + + getIconName() + "_pane_top_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp index bd269ffbb..e6bda67c5 100644 --- a/targets/minecraft/world/level/tile/StemTile.cpp +++ b/targets/minecraft/world/level/tile/StemTile.cpp @@ -16,7 +16,7 @@ class Icon; -const std::wstring StemTile::TEXTURE_ANGLED = L"stem_bent"; +const std::string StemTile::TEXTURE_ANGLED = "stem_bent"; StemTile::StemTile(int id, Tile* fruit) : Bush(id) { this->fruit = fruit; @@ -209,7 +209,7 @@ int StemTile::cloneTileId(Level* level, int x, int y, int z) { } void StemTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"stem_straight"); + icon = iconRegister->registerIcon("stem_straight"); iconAngled = iconRegister->registerIcon(TEXTURE_ANGLED); } diff --git a/targets/minecraft/world/level/tile/StemTile.h b/targets/minecraft/world/level/tile/StemTile.h index 055bd88a1..d2b45d864 100644 --- a/targets/minecraft/world/level/tile/StemTile.h +++ b/targets/minecraft/world/level/tile/StemTile.h @@ -14,7 +14,7 @@ class StemTile : public Bush { friend class ChunkRebuildData; public: - static const std::wstring TEXTURE_ANGLED; + static const std::string TEXTURE_ANGLED; private: Tile* fruit; diff --git a/targets/minecraft/world/level/tile/StoneSlabTile.cpp b/targets/minecraft/world/level/tile/StoneSlabTile.cpp index af40877e6..3d7103f3b 100644 --- a/targets/minecraft/world/level/tile/StoneSlabTile.cpp +++ b/targets/minecraft/world/level/tile/StoneSlabTile.cpp @@ -53,8 +53,8 @@ Icon* StoneSlabTile::getTexture(int face, int data) { } void StoneSlabTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"stoneslab_top"); - iconSide = iconRegister->registerIcon(L"stoneslab_side"); + icon = iconRegister->registerIcon("stoneslab_top"); + iconSide = iconRegister->registerIcon("stoneslab_side"); } int StoneSlabTile::getResource(int data, Random* random, int playerBonusLevel) { diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index 48cad4309..a66f5a3e5 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -30,8 +30,8 @@ const unsigned int IDS_TILE_FERN, }; -const std::wstring TallGrass::TEXTURE_NAMES[] = {L"deadbush", L"tallgrass", - L"fern"}; +const std::string TallGrass::TEXTURE_NAMES[] = {"deadbush", "tallgrass", + "fern"}; TallGrass::TallGrass(int id) : Bush(id, Material::replaceable_plant) { this->updateDefaultShape(); diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.h b/targets/minecraft/world/level/tile/TallGrassPlantTile.h index f785d5869..15d47613a 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.h +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.h @@ -22,7 +22,7 @@ public: TALL_GRASS_TILE_NAMES[TALL_GRASS_TILE_NAMES_LENGTH]; private: - static const std::wstring TEXTURE_NAMES[]; + static const std::string TEXTURE_NAMES[]; Icon** icons; protected: diff --git a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp index 2ea97ec62..cffd39cc6 100644 --- a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp +++ b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.cpp @@ -13,7 +13,7 @@ class Icon; -const std::wstring TheEndPortalFrameTile::TEXTURE_EYE = L"endframe_eye"; +const std::string TheEndPortalFrameTile::TEXTURE_EYE = "endframe_eye"; TheEndPortalFrameTile::TheEndPortalFrameTile(int id) : Tile(id, Material::glass, false) { @@ -32,9 +32,9 @@ Icon* TheEndPortalFrameTile::getTexture(int face, int data) { } void TheEndPortalFrameTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"endframe_side"); - iconTop = iconRegister->registerIcon(L"endframe_top"); - iconEye = iconRegister->registerIcon(L"endframe_eye"); + icon = iconRegister->registerIcon("endframe_side"); + iconTop = iconRegister->registerIcon("endframe_top"); + iconEye = iconRegister->registerIcon("endframe_eye"); } Icon* TheEndPortalFrameTile::getEye() { return iconEye; } diff --git a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.h b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.h index a67f0bd1c..bef726e18 100644 --- a/targets/minecraft/world/level/tile/TheEndPortalFrameTile.h +++ b/targets/minecraft/world/level/tile/TheEndPortalFrameTile.h @@ -8,7 +8,7 @@ class Icon; class TheEndPortalFrameTile : public Tile { public: static const int EYE_BIT = 4; - static const std::wstring TEXTURE_EYE; + static const std::string TEXTURE_EYE; private: Icon* iconTop; diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.cpp b/targets/minecraft/world/level/tile/ThinFenceTile.cpp index a6fd37713..d80979295 100644 --- a/targets/minecraft/world/level/tile/ThinFenceTile.cpp +++ b/targets/minecraft/world/level/tile/ThinFenceTile.cpp @@ -9,8 +9,8 @@ class Icon; -ThinFenceTile::ThinFenceTile(int id, const std::wstring& tex, - const std::wstring& edgeTex, Material* material, +ThinFenceTile::ThinFenceTile(int id, const std::string& tex, + const std::string& edgeTex, Material* material, bool dropsResources) : Tile(id, material, false) { iconSide = nullptr; diff --git a/targets/minecraft/world/level/tile/ThinFenceTile.h b/targets/minecraft/world/level/tile/ThinFenceTile.h index 041835b94..fea951725 100644 --- a/targets/minecraft/world/level/tile/ThinFenceTile.h +++ b/targets/minecraft/world/level/tile/ThinFenceTile.h @@ -9,13 +9,13 @@ class Material; class ThinFenceTile : public Tile { private: - std::wstring edgeTexture; + std::string edgeTexture; bool dropsResources; - std::wstring texture; + std::string texture; Icon* iconSide; public: - ThinFenceTile(int id, const std::wstring& tex, const std::wstring& edgeTex, + ThinFenceTile(int id, const std::string& tex, const std::string& edgeTex, Material* material, bool dropsResources); virtual int getResource(int data, Random* random, int playerBonusLevel); virtual bool isSolidRender(bool isServerLevel = false); diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index b4cc3c2c8..215f17f20 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -154,7 +154,7 @@ #include "minecraft/world/phys/Vec3.h" #include "strings.h" -std::wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile."; +std::string Tile::TILE_DESCRIPTION_PREFIX = "Tile."; const float Tile::INDESTRUCTIBLE_DESTROY_TIME = -1.0f; @@ -396,19 +396,19 @@ void Tile::staticCtor() { ->setDestroyTime(1.5f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"stone") + ->setIconName("stone") ->setDescriptionId(IDS_TILE_STONE) ->setUseDescriptionId(IDS_DESC_STONE); Tile::grass = (GrassTile*)(new GrassTile(2)) ->setDestroyTime(0.6f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"grass") + ->setIconName("grass") ->setDescriptionId(IDS_TILE_GRASS) ->setUseDescriptionId(IDS_DESC_GRASS); Tile::dirt = (new DirtTile(3)) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_GRAVEL) - ->setIconName(L"dirt") + ->setIconName("dirt") ->setDescriptionId(IDS_TILE_DIRT) ->setUseDescriptionId(IDS_DESC_DIRT); Tile::cobblestone = @@ -418,7 +418,7 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"cobblestone") + ->setIconName("cobblestone") ->setDescriptionId(IDS_TILE_STONE_BRICK) ->setUseDescriptionId(IDS_DESC_STONE_BRICK); Tile::wood = @@ -428,14 +428,14 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"planks") + ->setIconName("planks") ->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS) ->sendTileData() ->setUseDescriptionId(IDS_DESC_WOODENPLANKS); Tile::sapling = (new Sapling(6)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"sapling") + ->setIconName("sapling") ->setDescriptionId(IDS_TILE_SAPLING) ->sendTileData() ->setUseDescriptionId(IDS_DESC_SAPLING) @@ -444,14 +444,14 @@ void Tile::staticCtor() { ->setIndestructible() ->setExplodeable(6000000) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"bedrock") + ->setIconName("bedrock") ->setDescriptionId(IDS_TILE_BEDROCK) ->setNotCollectStatistics() ->setUseDescriptionId(IDS_DESC_BEDROCK); Tile::water = (LiquidTile*)(new LiquidTileDynamic(8, Material::water)) ->setDestroyTime(100.0f) ->setLightBlock(3) - ->setIconName(L"water_flow") + ->setIconName("water_flow") ->setDescriptionId(IDS_TILE_WATER) ->setNotCollectStatistics() ->sendTileData() @@ -459,7 +459,7 @@ void Tile::staticCtor() { Tile::calmWater = (new LiquidTileStatic(9, Material::water)) ->setDestroyTime(100.0f) ->setLightBlock(3) - ->setIconName(L"water_still") + ->setIconName("water_still") ->setDescriptionId(IDS_TILE_WATER) ->setNotCollectStatistics() ->sendTileData() @@ -468,7 +468,7 @@ void Tile::staticCtor() { ->setDestroyTime(00.0f) ->setLightEmission(1.0f) ->setLightBlock(255) - ->setIconName(L"lava_flow") + ->setIconName("lava_flow") ->setDescriptionId(IDS_TILE_LAVA) ->setNotCollectStatistics() ->sendTileData() @@ -478,7 +478,7 @@ void Tile::staticCtor() { ->setDestroyTime(100.0f) ->setLightEmission(1.0f) ->setLightBlock(255) - ->setIconName(L"lava_still") + ->setIconName("lava_still") ->setDescriptionId(IDS_TILE_LAVA) ->setNotCollectStatistics() ->sendTileData() @@ -486,40 +486,40 @@ void Tile::staticCtor() { Tile::sand = (new HeavyTile(12)) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_SAND) - ->setIconName(L"sand") + ->setIconName("sand") ->setDescriptionId(IDS_TILE_SAND) ->setUseDescriptionId(IDS_DESC_SAND); Tile::gravel = (new GravelTile(13)) ->setDestroyTime(0.6f) ->setSoundType(Tile::SOUND_GRAVEL) - ->setIconName(L"gravel") + ->setIconName("gravel") ->setDescriptionId(IDS_TILE_GRAVEL) ->setUseDescriptionId(IDS_DESC_GRAVEL); Tile::goldOre = (new OreTile(14)) ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"gold_ore") + ->setIconName("gold_ore") ->setDescriptionId(IDS_TILE_ORE_GOLD) ->setUseDescriptionId(IDS_DESC_ORE_GOLD); Tile::ironOre = (new OreTile(15)) ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"iron_ore") + ->setIconName("iron_ore") ->setDescriptionId(IDS_TILE_ORE_IRON) ->setUseDescriptionId(IDS_DESC_ORE_IRON); Tile::coalOre = (new OreTile(16)) ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"coal_ore") + ->setIconName("coal_ore") ->setDescriptionId(IDS_TILE_ORE_COAL) ->setUseDescriptionId(IDS_DESC_ORE_COAL); Tile::treeTrunk = (new TreeTile(17)) ->setDestroyTime(2.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"log") + ->setIconName("log") ->setDescriptionId(IDS_TILE_LOG) ->sendTileData() ->setUseDescriptionId(IDS_DESC_LOG); @@ -529,20 +529,20 @@ void Tile::staticCtor() { ->setDestroyTime(0.2f) ->setLightBlock(1) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"leaves") + ->setIconName("leaves") ->setDescriptionId(IDS_TILE_LEAVES) ->sendTileData(LeafTile::LEAF_TYPE_MASK) ->setUseDescriptionId(IDS_DESC_LEAVES); Tile::sponge = (new Sponge(19)) ->setDestroyTime(0.6f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"sponge") + ->setIconName("sponge") ->setDescriptionId(IDS_TILE_SPONGE) ->setUseDescriptionId(IDS_DESC_SPONGE); Tile::glass = (new GlassTile(20, Material::glass, false)) ->setDestroyTime(0.3f) ->setSoundType(Tile::SOUND_GLASS) - ->setIconName(L"glass") + ->setIconName("glass") ->setDescriptionId(IDS_TILE_GLASS) ->setUseDescriptionId(IDS_DESC_GLASS); @@ -550,7 +550,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"lapis_ore") + ->setIconName("lapis_ore") ->setDescriptionId(IDS_TILE_ORE_LAPIS) ->setUseDescriptionId(IDS_DESC_ORE_LAPIS); Tile::lapisBlock = (new Tile(22, Material::stone)) @@ -559,7 +559,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"lapis_block") + ->setIconName("lapis_block") ->setDescriptionId(IDS_TILE_BLOCK_LAPIS) ->setUseDescriptionId(IDS_DESC_BLOCK_LAPIS); Tile::dispenser = @@ -568,7 +568,7 @@ void Tile::staticCtor() { Item::eMaterial_undefined) ->setDestroyTime(3.5f) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"dispenser") + ->setIconName("dispenser") ->setDescriptionId(IDS_TILE_DISPENSER) ->sendTileData() ->setUseDescriptionId(IDS_DESC_DISPENSER); @@ -579,19 +579,19 @@ void Tile::staticCtor() { ->setSoundType(Tile::SOUND_STONE) ->setDestroyTime(0.8f) ->sendTileData() - ->setIconName(L"sandstone") + ->setIconName("sandstone") ->setDescriptionId(IDS_TILE_SANDSTONE) ->setUseDescriptionId(IDS_DESC_SANDSTONE) ->sendTileData(); Tile::noteblock = (new NoteBlockTile(25)) ->setDestroyTime(0.8f) - ->setIconName(L"noteblock") + ->setIconName("noteblock") ->setDescriptionId(IDS_TILE_MUSIC_BLOCK) ->sendTileData() ->setUseDescriptionId(IDS_DESC_NOTEBLOCK); Tile::bed = (new BedTile(26)) ->setDestroyTime(0.2f) - ->setIconName(L"bed") + ->setIconName("bed") ->setDescriptionId(IDS_TILE_BED) ->setNotCollectStatistics() ->sendTileData() @@ -601,7 +601,7 @@ void Tile::staticCtor() { Item::eBaseItemType_rail, Item::eMaterial_gold) ->setDestroyTime(0.7f) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"rail_golden") + ->setIconName("rail_golden") ->setDescriptionId(IDS_TILE_GOLDEN_RAIL) ->sendTileData() ->setUseDescriptionId(IDS_DESC_POWEREDRAIL) @@ -612,7 +612,7 @@ void Tile::staticCtor() { Item::eMaterial_detector) ->setDestroyTime(0.7f) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"rail_detector") + ->setIconName("rail_detector") ->setDescriptionId(IDS_TILE_DETECTOR_RAIL) ->sendTileData() ->setUseDescriptionId(IDS_DESC_DETECTORRAIL) @@ -621,28 +621,28 @@ void Tile::staticCtor() { (PistonBaseTile*)(new PistonBaseTile(29, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_stickypiston) - ->setIconName(L"pistonStickyBase") + ->setIconName("pistonStickyBase") ->setDescriptionId(IDS_TILE_PISTON_STICK_BASE) ->setUseDescriptionId(IDS_DESC_STICKY_PISTON) ->sendTileData(); Tile::web = (new WebTile(30)) ->setLightBlock(1) ->setDestroyTime(4.0f) - ->setIconName(L"web") + ->setIconName("web") ->setDescriptionId(IDS_TILE_WEB) ->setUseDescriptionId(IDS_DESC_WEB); Tile::tallgrass = (TallGrass*)(new TallGrass(31)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"tallgrass") + ->setIconName("tallgrass") ->setDescriptionId(IDS_TILE_TALL_GRASS) ->setUseDescriptionId(IDS_DESC_TALL_GRASS) ->disableMipmap(); Tile::deadBush = (DeadBushTile*)(new DeadBushTile(32)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"deadbush") + ->setIconName("deadbush") ->setDescriptionId(IDS_TILE_DEAD_BUSH) ->setUseDescriptionId(IDS_DESC_DEAD_BUSH) ->disableMipmap(); @@ -650,7 +650,7 @@ void Tile::staticCtor() { (PistonBaseTile*)(new PistonBaseTile(33, false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_piston) - ->setIconName(L"pistonBase") + ->setIconName("pistonBase") ->setDescriptionId(IDS_TILE_PISTON_BASE) ->setUseDescriptionId(IDS_DESC_PISTON) ->sendTileData(); @@ -663,7 +663,7 @@ void Tile::staticCtor() { Item::eMaterial_cloth) ->setDestroyTime(0.8f) ->setSoundType(Tile::SOUND_CLOTH) - ->setIconName(L"wool_colored") + ->setIconName("wool_colored") ->setDescriptionId(IDS_TILE_CLOTH) ->sendTileData() ->setUseDescriptionId(IDS_DESC_WOOL); @@ -673,14 +673,14 @@ void Tile::staticCtor() { Tile::flower = (Bush*)(new Bush(37)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"flower_dandelion") + ->setIconName("flower_dandelion") ->setDescriptionId(IDS_TILE_FLOWER) ->setUseDescriptionId(IDS_DESC_FLOWER) ->disableMipmap(); Tile::rose = (Bush*)(new Bush(38)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"flower_rose") + ->setIconName("flower_rose") ->setDescriptionId(IDS_TILE_ROSE) ->setUseDescriptionId(IDS_DESC_FLOWER) ->disableMipmap(); @@ -688,14 +688,14 @@ void Tile::staticCtor() { ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) ->setLightEmission(2 / 16.0f) - ->setIconName(L"mushroom_brown") + ->setIconName("mushroom_brown") ->setDescriptionId(IDS_TILE_MUSHROOM) ->setUseDescriptionId(IDS_DESC_MUSHROOM) ->disableMipmap(); Tile::mushroom_red = (Bush*)(new Mushroom(40)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"mushroom_red") + ->setIconName("mushroom_red") ->setDescriptionId(IDS_TILE_MUSHROOM) ->setUseDescriptionId(IDS_DESC_MUSHROOM) ->disableMipmap(); @@ -706,7 +706,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"gold_block") + ->setIconName("gold_block") ->setDescriptionId(IDS_TILE_BLOCK_GOLD) ->setUseDescriptionId(IDS_DESC_BLOCK_GOLD); Tile::ironBlock = (new MetalTile(42)) @@ -715,7 +715,7 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"iron_block") + ->setIconName("iron_block") ->setDescriptionId(IDS_TILE_BLOCK_IRON) ->setUseDescriptionId(IDS_DESC_BLOCK_IRON); Tile::stoneSlab = @@ -725,7 +725,7 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"stoneSlab") + ->setIconName("stoneSlab") ->setDescriptionId(IDS_TILE_STONESLAB) ->setUseDescriptionId(IDS_DESC_SLAB); Tile::stoneSlabHalf = @@ -735,7 +735,7 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"stoneSlab") + ->setIconName("stoneSlab") ->setDescriptionId(IDS_TILE_STONESLAB) ->setUseDescriptionId(IDS_DESC_HALFSLAB); Tile::redBrick = @@ -745,13 +745,13 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"brick") + ->setIconName("brick") ->setDescriptionId(IDS_TILE_BRICK) ->setUseDescriptionId(IDS_DESC_BRICK); Tile::tnt = (new TntTile(46)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"tnt") + ->setIconName("tnt") ->setDescriptionId(IDS_TILE_TNT) ->setUseDescriptionId(IDS_DESC_TNT); Tile::bookshelf = @@ -760,21 +760,21 @@ void Tile::staticCtor() { Item::eMaterial_bookshelf) ->setDestroyTime(1.5f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"bookshelf") + ->setIconName("bookshelf") ->setDescriptionId(IDS_TILE_BOOKSHELF) ->setUseDescriptionId(IDS_DESC_BOOKSHELF); Tile::mossyCobblestone = (new Tile(48, Material::stone)) ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"cobblestone_mossy") + ->setIconName("cobblestone_mossy") ->setDescriptionId(IDS_TILE_STONE_MOSS) ->setUseDescriptionId(IDS_DESC_MOSS_STONE); Tile::obsidian = (new ObsidianTile(49)) ->setDestroyTime(50.0f) ->setExplodeable(2000) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"obsidian") + ->setIconName("obsidian") ->setDescriptionId(IDS_TILE_OBSIDIAN) ->setUseDescriptionId(IDS_DESC_OBSIDIAN); Tile::torch = (new TorchTile(50)) @@ -783,7 +783,7 @@ void Tile::staticCtor() { ->setDestroyTime(0.0f) ->setLightEmission(15 / 16.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"torch_on") + ->setIconName("torch_on") ->setDescriptionId(IDS_TILE_TORCH) ->setUseDescriptionId(IDS_DESC_TORCH) ->disableMipmap(); @@ -792,14 +792,14 @@ void Tile::staticCtor() { ->setDestroyTime(0.0f) ->setLightEmission(1.0f) ->setSoundType(Tile::SOUND_WOOD)) - ->setIconName(L"fire") + ->setIconName("fire") ->setDescriptionId(IDS_TILE_FIRE) ->setNotCollectStatistics() ->setUseDescriptionId(-1); Tile::mobSpawner = (new MobSpawnerTile(52)) ->setDestroyTime(5.0f) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"mob_spawner") + ->setIconName("mob_spawner") ->setDescriptionId(IDS_TILE_MOB_SPAWNER) ->setNotCollectStatistics() ->setUseDescriptionId(IDS_DESC_MOB_SPAWNER); @@ -807,7 +807,7 @@ void Tile::staticCtor() { (new StairTile(53, Tile::wood, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_wood) - ->setIconName(L"stairsWood") + ->setIconName("stairsWood") ->setDescriptionId(IDS_TILE_STAIRS_WOOD) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); @@ -816,14 +816,14 @@ void Tile::staticCtor() { Item::eMaterial_wood) ->setDestroyTime(2.5f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"chest") + ->setIconName("chest") ->setDescriptionId(IDS_TILE_CHEST) ->sendTileData() ->setUseDescriptionId(IDS_DESC_CHEST); Tile::redStoneDust = (RedStoneDustTile*)(new RedStoneDustTile(55)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_NORMAL) - ->setIconName(L"redstone_dust") + ->setIconName("redstone_dust") ->setDescriptionId(IDS_TILE_REDSTONE_DUST) ->setNotCollectStatistics() ->sendTileData() @@ -832,7 +832,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"diamond_ore") + ->setIconName("diamond_ore") ->setDescriptionId(IDS_TILE_ORE_DIAMOND) ->setUseDescriptionId(IDS_DESC_ORE_DIAMOND); Tile::diamondBlock = @@ -842,7 +842,7 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"diamond_block") + ->setIconName("diamond_block") ->setDescriptionId(IDS_TILE_BLOCK_DIAMOND) ->setUseDescriptionId(IDS_DESC_BLOCK_DIAMOND); Tile::workBench = (new WorkbenchTile(58)) @@ -850,11 +850,11 @@ void Tile::staticCtor() { Item::eBaseItemType_device, Item::eMaterial_wood) ->setDestroyTime(2.5f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"crafting_table") + ->setIconName("crafting_table") ->setDescriptionId(IDS_TILE_WORKBENCH) ->setUseDescriptionId(IDS_DESC_CRAFTINGTABLE); Tile::wheat = (new CropTile(59)) - ->setIconName(L"wheat") + ->setIconName("wheat") ->setDescriptionId(IDS_TILE_CROPS) ->setNotCollectStatistics() ->sendTileData() @@ -863,7 +863,7 @@ void Tile::staticCtor() { Tile::farmland = (new FarmTile(60)) ->setDestroyTime(0.6f) ->setSoundType(Tile::SOUND_GRAVEL) - ->setIconName(L"farmland") + ->setIconName("farmland") ->setDescriptionId(IDS_TILE_FARMLAND) ->setUseDescriptionId(IDS_DESC_FARMLAND) ->sendTileData(); @@ -873,7 +873,7 @@ void Tile::staticCtor() { Item::eMaterial_stone) ->setDestroyTime(3.5f) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"furnace") + ->setIconName("furnace") ->setDescriptionId(IDS_TILE_FURNACE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_FURNACE); @@ -881,14 +881,14 @@ void Tile::staticCtor() { ->setDestroyTime(3.5f) ->setSoundType(Tile::SOUND_STONE) ->setLightEmission(14 / 16.0f) - ->setIconName(L"furnace") + ->setIconName("furnace") ->setDescriptionId(IDS_TILE_FURNACE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_FURNACE); Tile::sign = (new SignTile(63, eTYPE_SIGNTILEENTITY, true)) ->setDestroyTime(1.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"sign") + ->setIconName("sign") ->setDescriptionId(IDS_TILE_SIGN) ->setNotCollectStatistics() ->sendTileData() @@ -896,7 +896,7 @@ void Tile::staticCtor() { Tile::door_wood = (new DoorTile(64, Material::wood)) ->setDestroyTime(3.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"door_wood") + ->setIconName("door_wood") ->setDescriptionId(IDS_TILE_DOOR_WOOD) ->setNotCollectStatistics() ->sendTileData() @@ -904,7 +904,7 @@ void Tile::staticCtor() { Tile::ladder = (new LadderTile(65)) ->setDestroyTime(0.4f) ->setSoundType(Tile::SOUND_LADDER) - ->setIconName(L"ladder") + ->setIconName("ladder") ->setDescriptionId(IDS_TILE_LADDER) ->sendTileData() ->setUseDescriptionId(IDS_DESC_LADDER) @@ -914,7 +914,7 @@ void Tile::staticCtor() { Item::eMaterial_iron) ->setDestroyTime(0.7f) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"rail_normal") + ->setIconName("rail_normal") ->setDescriptionId(IDS_TILE_RAIL) ->sendTileData() ->setUseDescriptionId(IDS_DESC_RAIL) @@ -923,14 +923,14 @@ void Tile::staticCtor() { (new StairTile(67, Tile::cobblestone, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stone) - ->setIconName(L"stairsStone") + ->setIconName("stairsStone") ->setDescriptionId(IDS_TILE_STAIRS_STONE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); Tile::wallSign = (new SignTile(68, eTYPE_SIGNTILEENTITY, false)) ->setDestroyTime(1.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"sign") + ->setIconName("sign") ->setDescriptionId(IDS_TILE_SIGN) ->setNotCollectStatistics() ->sendTileData() @@ -940,12 +940,12 @@ void Tile::staticCtor() { Item::eMaterial_wood) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"lever") + ->setIconName("lever") ->setDescriptionId(IDS_TILE_LEVER) ->sendTileData() ->setUseDescriptionId(IDS_DESC_LEVER); Tile::pressurePlate_stone = - (Tile*)(new PressurePlateTile(70, L"stone", Material::stone, + (Tile*)(new PressurePlateTile(70, "stone", Material::stone, PressurePlateTile::mobs)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_stone) @@ -958,13 +958,13 @@ void Tile::staticCtor() { Tile::door_iron = (new DoorTile(71, Material::metal)) ->setDestroyTime(5.0f) ->setSoundType(Tile::SOUND_METAL) - ->setIconName(L"door_iron") + ->setIconName("door_iron") ->setDescriptionId(IDS_TILE_DOOR_IRON) ->setNotCollectStatistics() ->sendTileData() ->setUseDescriptionId(IDS_DESC_DOOR_IRON); Tile::pressurePlate_wood = - (new PressurePlateTile(72, L"planks_oak", Material::wood, + (new PressurePlateTile(72, "planks_oak", Material::wood, PressurePlateTile::everything)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_wood) @@ -977,7 +977,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"redstone_ore") + ->setIconName("redstone_ore") ->setDescriptionId(IDS_TILE_ORE_REDSTONE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); @@ -986,14 +986,14 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"redstone_ore") + ->setIconName("redstone_ore") ->setDescriptionId(IDS_TILE_ORE_REDSTONE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); Tile::redstoneTorch_off = (new NotGateTile(75, false)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"redstone_torch_off") + ->setIconName("redstone_torch_off") ->setDescriptionId(IDS_TILE_NOT_GATE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_REDSTONETORCH) @@ -1002,7 +1002,7 @@ void Tile::staticCtor() { ->setDestroyTime(0.0f) ->setLightEmission(8 / 16.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"redstone_torch_on") + ->setIconName("redstone_torch_on") ->setDescriptionId(IDS_TILE_NOT_GATE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_REDSTONETORCH) @@ -1012,7 +1012,7 @@ void Tile::staticCtor() { Item::eMaterial_stone) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"button") + ->setIconName("button") ->setDescriptionId(IDS_TILE_BUTTON) ->sendTileData() ->setUseDescriptionId(IDS_DESC_BUTTON); @@ -1022,7 +1022,7 @@ void Tile::staticCtor() { Item::eMaterial_snow) ->setDestroyTime(0.1f) ->setSoundType(Tile::SOUND_SNOW) - ->setIconName(L"snow") + ->setIconName("snow") ->setDescriptionId(IDS_TILE_SNOW) ->setUseDescriptionId(IDS_DESC_TOP_SNOW) ->sendTileData() @@ -1031,7 +1031,7 @@ void Tile::staticCtor() { ->setDestroyTime(0.5f) ->setLightBlock(3) ->setSoundType(Tile::SOUND_GLASS) - ->setIconName(L"ice") + ->setIconName("ice") ->setDescriptionId(IDS_TILE_ICE) ->setUseDescriptionId(IDS_DESC_ICE); Tile::snow = (new SnowTile(80)) @@ -1039,14 +1039,14 @@ void Tile::staticCtor() { Item::eBaseItemType_structblock, Item::eMaterial_snow) ->setDestroyTime(0.2f) ->setSoundType(Tile::SOUND_CLOTH) - ->setIconName(L"snow") + ->setIconName("snow") ->setDescriptionId(IDS_TILE_SNOW) ->setUseDescriptionId(IDS_DESC_SNOW); Tile::cactus = (new CactusTile(81)) ->setDestroyTime(0.4f) ->setSoundType(Tile::SOUND_CLOTH) - ->setIconName(L"cactus") + ->setIconName("cactus") ->setDescriptionId(IDS_TILE_CACTUS) ->setUseDescriptionId(IDS_DESC_CACTUS) ->disableMipmap(); @@ -1055,13 +1055,13 @@ void Tile::staticCtor() { Item::eBaseItemType_structblock, Item::eMaterial_clay) ->setDestroyTime(0.6f) ->setSoundType(Tile::SOUND_GRAVEL) - ->setIconName(L"clay") + ->setIconName("clay") ->setDescriptionId(IDS_TILE_CLAY) ->setUseDescriptionId(IDS_DESC_CLAY_TILE); Tile::reeds = (new ReedTile(83)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_GRASS) - ->setIconName(L"reeds") + ->setIconName("reeds") ->setDescriptionId(IDS_TILE_REEDS) ->setNotCollectStatistics() ->setUseDescriptionId(IDS_DESC_REEDS) @@ -1070,11 +1070,11 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"jukebox") + ->setIconName("jukebox") ->setDescriptionId(IDS_TILE_JUKEBOX) ->sendTileData() ->setUseDescriptionId(IDS_DESC_JUKEBOX); - Tile::fence = (new FenceTile(85, L"planks_oak", Material::wood)) + Tile::fence = (new FenceTile(85, "planks_oak", Material::wood)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_wood) ->setDestroyTime(2.0f) @@ -1085,20 +1085,20 @@ void Tile::staticCtor() { Tile::pumpkin = (new PumpkinTile(86, false)) ->setDestroyTime(1.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"pumpkin") + ->setIconName("pumpkin") ->setDescriptionId(IDS_TILE_PUMPKIN) ->sendTileData() ->setUseDescriptionId(IDS_DESC_PUMPKIN); Tile::netherRack = (new NetherrackTile(87)) ->setDestroyTime(0.4f) ->setSoundType(Tile::SOUND_STONE) - ->setIconName(L"netherrack") + ->setIconName("netherrack") ->setDescriptionId(IDS_TILE_HELL_ROCK) ->setUseDescriptionId(IDS_DESC_HELL_ROCK); Tile::soulsand = (new SoulSandTile(88)) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_SAND) - ->setIconName(L"soul_sand") + ->setIconName("soul_sand") ->setDescriptionId(IDS_TILE_HELL_SAND) ->setUseDescriptionId(IDS_DESC_HELL_SAND); Tile::glowstone = @@ -1108,14 +1108,14 @@ void Tile::staticCtor() { ->setDestroyTime(0.3f) ->setSoundType(Tile::SOUND_GLASS) ->setLightEmission(1.0f) - ->setIconName(L"glowstone") + ->setIconName("glowstone") ->setDescriptionId(IDS_TILE_LIGHT_GEM) ->setUseDescriptionId(IDS_DESC_GLOWSTONE); Tile::portalTile = (PortalTile*)((new PortalTile(90)) ->setDestroyTime(-1) ->setSoundType(Tile::SOUND_GLASS) ->setLightEmission(0.75f)) - ->setIconName(L"portal") + ->setIconName("portal") ->setDescriptionId(IDS_TILE_PORTAL) ->setUseDescriptionId(IDS_DESC_PORTAL); @@ -1126,14 +1126,14 @@ void Tile::staticCtor() { ->setDestroyTime(1.0f) ->setSoundType(Tile::SOUND_WOOD) ->setLightEmission(1.0f) - ->setIconName(L"pumpkin") + ->setIconName("pumpkin") ->setDescriptionId(IDS_TILE_LIT_PUMPKIN) ->sendTileData() ->setUseDescriptionId(IDS_DESC_JACKOLANTERN); Tile::cake = (new CakeTile(92)) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_CLOTH) - ->setIconName(L"cake") + ->setIconName("cake") ->setDescriptionId(IDS_TILE_CAKE) ->setNotCollectStatistics() ->sendTileData() @@ -1141,7 +1141,7 @@ void Tile::staticCtor() { Tile::diode_off = (RepeaterTile*)(new RepeaterTile(93, false)) ->setDestroyTime(0.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"repeater_off") + ->setIconName("repeater_off") ->setDescriptionId(IDS_ITEM_DIODE) ->setNotCollectStatistics() ->sendTileData() @@ -1151,7 +1151,7 @@ void Tile::staticCtor() { ->setDestroyTime(0.0f) ->setLightEmission(10 / 16.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"repeater_on") + ->setIconName("repeater_on") ->setDescriptionId(IDS_ITEM_DIODE) ->setNotCollectStatistics() ->sendTileData() @@ -1163,7 +1163,7 @@ void Tile::staticCtor() { Item::eMaterial_glass) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) - ->setIconName(L"glass") + ->setIconName("glass") ->setDescriptionId(IDS_TILE_STAINED_GLASS) ->setUseDescriptionId(IDS_DESC_STAINED_GLASS); Tile::trapdoor = (new TrapDoorTile(96, Material::wood)) @@ -1171,7 +1171,7 @@ void Tile::staticCtor() { Item::eMaterial_trap) ->setDestroyTime(3.0f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"trapdoor") + ->setIconName("trapdoor") ->setDescriptionId(IDS_TILE_TRAPDOOR) ->setNotCollectStatistics() ->sendTileData() @@ -1179,7 +1179,7 @@ void Tile::staticCtor() { Tile::monsterStoneEgg = (new StoneMonsterTile(97)) ->setDestroyTime(0.75f) - ->setIconName(L"monsterStoneEgg") + ->setIconName("monsterStoneEgg") ->setDescriptionId(IDS_TILE_STONE_SILVERFISH) ->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH); Tile::stoneBrick = @@ -1189,7 +1189,7 @@ void Tile::staticCtor() { ->setDestroyTime(1.5f) ->setExplodeable(10) ->setSoundType(SOUND_STONE) - ->setIconName(L"stonebrick") + ->setIconName("stonebrick") ->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH) ->setUseDescriptionId(IDS_DESC_STONE_BRICK_SMOOTH); Tile::hugeMushroom_brown = @@ -1197,7 +1197,7 @@ void Tile::staticCtor() { HugeMushroomTile::MUSHROOM_TYPE_BROWN)) ->setDestroyTime(0.2f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"mushroom_block") + ->setIconName("mushroom_block") ->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_1) ->setUseDescriptionId(IDS_DESC_MUSHROOM) ->sendTileData(); @@ -1206,12 +1206,12 @@ void Tile::staticCtor() { HugeMushroomTile::MUSHROOM_TYPE_RED)) ->setDestroyTime(0.2f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"mushroom_block") + ->setIconName("mushroom_block") ->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_2) ->setUseDescriptionId(IDS_DESC_MUSHROOM) ->sendTileData(); - Tile::ironFence = (new ThinFenceTile(101, L"iron_bars", L"iron_bars", + Tile::ironFence = (new ThinFenceTile(101, "iron_bars", "iron_bars", Material::metal, true)) ->setBaseItemTypeAndMaterial( Item::eBaseItemType_fence, Item::eMaterial_iron) @@ -1220,7 +1220,7 @@ void Tile::staticCtor() { ->setSoundType(SOUND_METAL) ->setDescriptionId(IDS_TILE_IRON_FENCE) ->setUseDescriptionId(IDS_DESC_IRON_FENCE); - Tile::thinGlass = (new ThinFenceTile(102, L"glass", L"glass_pane_top", + Tile::thinGlass = (new ThinFenceTile(102, "glass", "glass_pane_top", Material::glass, false)) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) @@ -1229,25 +1229,25 @@ void Tile::staticCtor() { Tile::melon = (new MelonTile(103)) ->setDestroyTime(1.0f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"melon") + ->setIconName("melon") ->setDescriptionId(IDS_TILE_MELON) ->setUseDescriptionId(IDS_DESC_MELON_BLOCK); Tile::pumpkinStem = (new StemTile(104, Tile::pumpkin)) ->setDestroyTime(0.0f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"pumpkin_stem") + ->setIconName("pumpkin_stem") ->setDescriptionId(IDS_TILE_PUMPKIN_STEM) ->sendTileData(); Tile::melonStem = (new StemTile(105, Tile::melon)) ->setDestroyTime(0.0f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"melon_stem") + ->setIconName("melon_stem") ->setDescriptionId(IDS_TILE_MELON_STEM) ->sendTileData(); Tile::vine = (new VineTile(106)) ->setDestroyTime(0.2f) ->setSoundType(SOUND_GRASS) - ->setIconName(L"vine") + ->setIconName("vine") ->setDescriptionId(IDS_TILE_VINE) ->setUseDescriptionId(IDS_DESC_VINE) ->sendTileData(); @@ -1255,7 +1255,7 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(5) ->setSoundType(SOUND_WOOD) - ->setIconName(L"fenceGate") + ->setIconName("fenceGate") ->setDescriptionId(IDS_TILE_FENCE_GATE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_FENCE_GATE); @@ -1263,7 +1263,7 @@ void Tile::staticCtor() { (new StairTile(108, Tile::redBrick, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_brick) - ->setIconName(L"stairsBrick") + ->setIconName("stairsBrick") ->setDescriptionId(IDS_TILE_STAIRS_BRICKS) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); @@ -1271,21 +1271,21 @@ void Tile::staticCtor() { (new StairTile(109, Tile::stoneBrick, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stoneSmooth) - ->setIconName(L"stairsStoneBrickSmooth") + ->setIconName("stairsStoneBrickSmooth") ->setDescriptionId(IDS_TILE_STAIRS_STONE_BRICKS_SMOOTH) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); Tile::mycel = (MycelTile*)(new MycelTile(110)) ->setDestroyTime(0.6f) ->setSoundType(SOUND_GRASS) - ->setIconName(L"mycelium") + ->setIconName("mycelium") ->setDescriptionId(IDS_TILE_MYCEL) ->setUseDescriptionId(IDS_DESC_MYCEL); Tile::waterLily = (new WaterlilyTile(111)) ->setDestroyTime(0.0f) ->setSoundType(SOUND_GRASS) - ->setIconName(L"waterlily") + ->setIconName("waterlily") ->setDescriptionId(IDS_TILE_WATERLILY) ->setUseDescriptionId(IDS_DESC_WATERLILY); Tile::netherBrick = @@ -1295,11 +1295,11 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(10) ->setSoundType(SOUND_STONE) - ->setIconName(L"nether_brick") + ->setIconName("nether_brick") ->setDescriptionId(IDS_TILE_NETHERBRICK) ->setUseDescriptionId(IDS_DESC_NETHERBRICK); Tile::netherFence = - (new FenceTile(113, L"nether_brick", Material::stone)) + (new FenceTile(113, "nether_brick", Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_netherbrick) ->setDestroyTime(2.0f) @@ -1311,12 +1311,12 @@ void Tile::staticCtor() { (new StairTile(114, Tile::netherBrick, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_netherbrick) - ->setIconName(L"stairsNetherBrick") + ->setIconName("stairsNetherBrick") ->setDescriptionId(IDS_TILE_STAIRS_NETHERBRICK) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); Tile::netherStalk = (new NetherWartTile(115)) - ->setIconName(L"nether_wart") + ->setIconName("nether_wart") ->setDescriptionId(IDS_TILE_NETHERSTALK) ->sendTileData() ->setUseDescriptionId(IDS_DESC_NETHERSTALK); @@ -1326,7 +1326,7 @@ void Tile::staticCtor() { Item::eMaterial_magic) ->setDestroyTime(5.0f) ->setExplodeable(2000) - ->setIconName(L"enchanting_table") + ->setIconName("enchanting_table") ->setDescriptionId(IDS_TILE_ENCHANTMENTTABLE) ->setUseDescriptionId(IDS_DESC_ENCHANTMENTTABLE); Tile::brewingStand = @@ -1335,13 +1335,13 @@ void Tile::staticCtor() { Item::eMaterial_blaze) ->setDestroyTime(0.5f) ->setLightEmission(2 / 16.0f) - ->setIconName(L"brewing_stand") + ->setIconName("brewing_stand") ->setDescriptionId(IDS_TILE_BREWINGSTAND) ->sendTileData() ->setUseDescriptionId(IDS_DESC_BREWING_STAND); Tile::cauldron = (CauldronTile*)(new CauldronTile(118)) ->setDestroyTime(2.0f) - ->setIconName(L"cauldron") + ->setIconName("cauldron") ->setDescriptionId(IDS_TILE_CAULDRON) ->sendTileData() ->setUseDescriptionId(IDS_DESC_CAULDRON); @@ -1355,7 +1355,7 @@ void Tile::staticCtor() { ->setSoundType(SOUND_GLASS) ->setLightEmission(2 / 16.0f) ->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME) - ->setIconName(L"endframe") + ->setIconName("endframe") ->setDescriptionId(IDS_TILE_ENDPORTALFRAME) ->sendTileData() ->setExplodeable(6000000) @@ -1365,7 +1365,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(15) ->setSoundType(SOUND_STONE) - ->setIconName(L"end_stone") + ->setIconName("end_stone") ->setDescriptionId(IDS_TILE_WHITESTONE) ->setUseDescriptionId(IDS_DESC_WHITESTONE); Tile::dragonEgg = (new EggTile(122)) @@ -1373,20 +1373,20 @@ void Tile::staticCtor() { ->setExplodeable(15) ->setSoundType(SOUND_STONE) ->setLightEmission(2.0f / 16.0f) - ->setIconName(L"dragon_egg") + ->setIconName("dragon_egg") ->setDescriptionId(IDS_TILE_DRAGONEGG) ->setUseDescriptionId(IDS_DESC_DRAGONEGG); Tile::redstoneLight = (new RedlightTile(123, false)) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) - ->setIconName(L"redstone_lamp_off") + ->setIconName("redstone_lamp_off") ->setDescriptionId(IDS_TILE_REDSTONE_LIGHT) ->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT); Tile::redstoneLight_lit = (new RedlightTile(124, true)) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) - ->setIconName(L"redstone_lamp_on") + ->setIconName("redstone_lamp_on") ->setDescriptionId(IDS_TILE_REDSTONE_LIGHT) ->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT); Tile::woodSlab = (HalfSlabTile*)(new WoodSlabTile(Tile::woodSlab_Id, true)) @@ -1395,7 +1395,7 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(5) ->setSoundType(SOUND_WOOD) - ->setIconName(L"woodSlab") + ->setIconName("woodSlab") ->setDescriptionId(IDS_DESC_WOODSLAB) ->setUseDescriptionId(IDS_DESC_WOODSLAB); Tile::woodSlabHalf = @@ -1405,14 +1405,14 @@ void Tile::staticCtor() { ->setDestroyTime(2.0f) ->setExplodeable(5) ->setSoundType(SOUND_WOOD) - ->setIconName(L"woodSlab") + ->setIconName("woodSlab") ->setDescriptionId(IDS_DESC_WOODSLAB) ->setUseDescriptionId(IDS_DESC_WOODSLAB); Tile::cocoa = (new CocoaTile(127)) ->setDestroyTime(0.2f) ->setExplodeable(5) ->setSoundType(SOUND_WOOD) - ->setIconName(L"cocoa") + ->setIconName("cocoa") ->sendTileData() ->setDescriptionId(IDS_TILE_COCOA) ->setUseDescriptionId(IDS_DESC_COCOA); @@ -1420,7 +1420,7 @@ void Tile::staticCtor() { (new StairTile(128, Tile::sandStone, 0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand) - ->setIconName(L"stairsSandstone") + ->setIconName("stairsSandstone") ->setDescriptionId(IDS_TILE_STAIRS_SANDSTONE) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); @@ -1428,7 +1428,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(SOUND_STONE) - ->setIconName(L"emerald_ore") + ->setIconName("emerald_ore") ->setDescriptionId(IDS_TILE_EMERALDORE) ->setUseDescriptionId(IDS_DESC_EMERALDORE); Tile::enderChest = (new EnderChestTile(130)) @@ -1437,7 +1437,7 @@ void Tile::staticCtor() { ->setDestroyTime(22.5f) ->setExplodeable(1000) ->setSoundType(SOUND_STONE) - ->setIconName(L"enderChest") + ->setIconName("enderChest") ->sendTileData() ->setLightEmission(.5f) ->setDescriptionId(IDS_TILE_ENDERCHEST) @@ -1447,12 +1447,12 @@ void Tile::staticCtor() { (TripWireSourceTile*)(new TripWireSourceTile(131)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_lever, Item::eMaterial_undefined) - ->setIconName(L"trip_wire_source") + ->setIconName("trip_wire_source") ->sendTileData() ->setDescriptionId(IDS_TILE_TRIPWIRE_SOURCE) ->setUseDescriptionId(IDS_DESC_TRIPWIRE_SOURCE); Tile::tripWire = (new TripWireTile(132)) - ->setIconName(L"trip_wire") + ->setIconName("trip_wire") ->sendTileData() ->setDescriptionId(IDS_TILE_TRIPWIRE) ->setUseDescriptionId(IDS_DESC_TRIPWIRE); @@ -1463,14 +1463,14 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setExplodeable(10) ->setSoundType(SOUND_METAL) - ->setIconName(L"emerald_block") + ->setIconName("emerald_block") ->setDescriptionId(IDS_TILE_EMERALDBLOCK) ->setUseDescriptionId(IDS_DESC_EMERALDBLOCK); Tile::woodStairsDark = (new StairTile(134, Tile::wood, TreeTile::DARK_TRUNK)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sprucewood) - ->setIconName(L"stairsWoodSpruce") + ->setIconName("stairsWoodSpruce") ->setDescriptionId(IDS_TILE_STAIRS_SPRUCEWOOD) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); @@ -1478,7 +1478,7 @@ void Tile::staticCtor() { (new StairTile(135, Tile::wood, TreeTile::BIRCH_TRUNK)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_birchwood) - ->setIconName(L"stairsWoodBirch") + ->setIconName("stairsWoodBirch") ->setDescriptionId(IDS_TILE_STAIRS_BIRCHWOOD) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); @@ -1486,41 +1486,41 @@ void Tile::staticCtor() { (new StairTile(136, Tile::wood, TreeTile::JUNGLE_TRUNK)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_junglewood) - ->setIconName(L"stairsWoodJungle") + ->setIconName("stairsWoodJungle") ->setDescriptionId(IDS_TILE_STAIRS_JUNGLEWOOD) ->sendTileData() ->setUseDescriptionId(IDS_DESC_STAIRS); Tile::commandBlock = (new CommandBlock(137)) ->setIndestructible() ->setExplodeable(6000000) - ->setIconName(L"command_block") + ->setIconName("command_block") ->setDescriptionId(IDS_TILE_COMMAND_BLOCK) ->setUseDescriptionId(IDS_DESC_COMMAND_BLOCK); Tile::beacon = (BeaconTile*)(new BeaconTile(138)) ->setLightEmission(1.0f) - ->setIconName(L"beacon") + ->setIconName("beacon") ->setDescriptionId(IDS_TILE_BEACON) ->setUseDescriptionId(IDS_DESC_BEACON); Tile::cobbleWall = (new WallTile(139, Tile::stoneBrick)) ->setBaseItemTypeAndMaterial( Item::eBaseItemType_fence, Item::eMaterial_stone) - ->setIconName(L"cobbleWall") + ->setIconName("cobbleWall") ->setDescriptionId(IDS_TILE_COBBLESTONE_WALL) ->setUseDescriptionId(IDS_DESC_COBBLESTONE_WALL); Tile::flowerPot = (new FlowerPotTile(140)) ->setDestroyTime(0.0f) ->setSoundType(SOUND_NORMAL) - ->setIconName(L"flower_pot") + ->setIconName("flower_pot") ->setDescriptionId(IDS_TILE_FLOWERPOT) ->setUseDescriptionId(IDS_DESC_FLOWERPOT); Tile::carrots = (new CarrotTile(141)) - ->setIconName(L"carrots") + ->setIconName("carrots") ->setDescriptionId(IDS_TILE_CARROTS) ->setUseDescriptionId(IDS_DESC_CARROTS) ->disableMipmap(); Tile::potatoes = (new PotatoTile(142)) - ->setIconName(L"potatoes") + ->setIconName("potatoes") ->setDescriptionId(IDS_TILE_POTATOES) ->setUseDescriptionId(IDS_DESC_POTATO) ->disableMipmap(); @@ -1530,14 +1530,14 @@ void Tile::staticCtor() { Item::eMaterial_wood) ->setDestroyTime(0.5f) ->setSoundType(Tile::SOUND_WOOD) - ->setIconName(L"button") + ->setIconName("button") ->setDescriptionId(IDS_TILE_BUTTON) ->sendTileData() ->setUseDescriptionId(IDS_DESC_BUTTON); Tile::skull = (new SkullTile(144)) ->setDestroyTime(1.0f) ->setSoundType(SOUND_STONE) - ->setIconName(L"skull") + ->setIconName("skull") ->setDescriptionId(IDS_TILE_SKULL) ->setUseDescriptionId(IDS_DESC_SKULL); Tile::anvil = (new AnvilTile(145)) @@ -1546,7 +1546,7 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setSoundType(SOUND_ANVIL) ->setExplodeable(2000) - ->setIconName(L"anvil") + ->setIconName("anvil") ->sendTileData() ->setDescriptionId(IDS_TILE_ANVIL) ->setUseDescriptionId(IDS_DESC_ANVIL); @@ -1558,7 +1558,7 @@ void Tile::staticCtor() { ->setDescriptionId(IDS_TILE_CHEST_TRAP) ->setUseDescriptionId(IDS_DESC_CHEST_TRAP); Tile::weightedPlate_light = - (new WeightedPressurePlateTile(147, L"gold_block", Material::metal, + (new WeightedPressurePlateTile(147, "gold_block", Material::metal, Redstone::SIGNAL_MAX)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_gold) @@ -1567,7 +1567,7 @@ void Tile::staticCtor() { ->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_LIGHT) ->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_LIGHT); Tile::weightedPlate_heavy = - (new WeightedPressurePlateTile(148, L"iron_block", Material::metal, + (new WeightedPressurePlateTile(148, "iron_block", Material::metal, Redstone::SIGNAL_MAX * 10)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_iron) @@ -1578,14 +1578,14 @@ void Tile::staticCtor() { Tile::comparator_off = (ComparatorTile*)(new ComparatorTile(149, false)) ->setDestroyTime(0.0f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"comparator_off") + ->setIconName("comparator_off") ->setDescriptionId(IDS_TILE_COMPARATOR) ->setUseDescriptionId(IDS_DESC_COMPARATOR); Tile::comparator_on = (ComparatorTile*)(new ComparatorTile(150, true)) ->setDestroyTime(0.0f) ->setLightEmission(10 / 16.0f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"comparator_on") + ->setIconName("comparator_on") ->setDescriptionId(IDS_TILE_COMPARATOR) ->setUseDescriptionId(IDS_DESC_COMPARATOR); @@ -1593,7 +1593,7 @@ void Tile::staticCtor() { (DaylightDetectorTile*)(new DaylightDetectorTile(151)) ->setDestroyTime(0.2f) ->setSoundType(SOUND_WOOD) - ->setIconName(L"daylight_detector") + ->setIconName("daylight_detector") ->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR) ->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR); Tile::redstoneBlock = @@ -1603,14 +1603,14 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setExplodeable(10) ->setSoundType(SOUND_METAL) - ->setIconName(L"redstone_block") + ->setIconName("redstone_block") ->setDescriptionId(IDS_TILE_REDSTONE_BLOCK) ->setUseDescriptionId(IDS_DESC_REDSTONE_BLOCK); Tile::netherQuartz = (new OreTile(153)) ->setDestroyTime(3.0f) ->setExplodeable(5) ->setSoundType(SOUND_STONE) - ->setIconName(L"quartz_ore") + ->setIconName("quartz_ore") ->setDescriptionId(IDS_TILE_NETHER_QUARTZ) ->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ_ORE); Tile::hopper = @@ -1620,7 +1620,7 @@ void Tile::staticCtor() { ->setDestroyTime(3.0f) ->setExplodeable(8) ->setSoundType(SOUND_WOOD) - ->setIconName(L"hopper") + ->setIconName("hopper") ->setDescriptionId(IDS_TILE_HOPPER) ->setUseDescriptionId(IDS_DESC_HOPPER); Tile::quartzBlock = @@ -1629,20 +1629,20 @@ void Tile::staticCtor() { Item::eMaterial_quartz) ->setSoundType(SOUND_STONE) ->setDestroyTime(0.8f) - ->setIconName(L"quartz_block") + ->setIconName("quartz_block") ->setDescriptionId(IDS_TILE_QUARTZ_BLOCK) ->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK); Tile::stairs_quartz = (new StairTile(156, Tile::quartzBlock, QuartzBlockTile::TYPE_DEFAULT)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_quartz) - ->setIconName(L"stairsQuartz") + ->setIconName("stairsQuartz") ->setDescriptionId(IDS_TILE_STAIRS_QUARTZ) ->setUseDescriptionId(IDS_DESC_STAIRS); Tile::activatorRail = (new PoweredRailTile(157)) ->setDestroyTime(0.7f) ->setSoundType(SOUND_METAL) - ->setIconName(L"rail_activator") + ->setIconName("rail_activator") ->setDescriptionId(IDS_TILE_ACTIVATOR_RAIL) ->setUseDescriptionId(IDS_DESC_ACTIVATOR_RAIL); Tile::dropper = @@ -1651,7 +1651,7 @@ void Tile::staticCtor() { Item::eMaterial_undefined) ->setDestroyTime(3.5f) ->setSoundType(SOUND_STONE) - ->setIconName(L"dropper") + ->setIconName("dropper") ->setDescriptionId(IDS_TILE_DROPPER) ->setUseDescriptionId(IDS_DESC_DROPPER); Tile::clayHardened_colored = @@ -1661,7 +1661,7 @@ void Tile::staticCtor() { ->setDestroyTime(1.25f) ->setExplodeable(7) ->setSoundType(SOUND_STONE) - ->setIconName(L"hardened_clay_stained") + ->setIconName("hardened_clay_stained") ->setDescriptionId(IDS_TILE_STAINED_CLAY) ->setUseDescriptionId(IDS_DESC_STAINED_CLAY); Tile::stained_glass_pane = @@ -1670,7 +1670,7 @@ void Tile::staticCtor() { Item::eMaterial_glass) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) - ->setIconName(L"glass") + ->setIconName("glass") ->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE) ->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE); @@ -1679,7 +1679,7 @@ void Tile::staticCtor() { Item::eMaterial_wheat) ->setDestroyTime(0.5f) ->setSoundType(SOUND_GRASS) - ->setIconName(L"hay_block") + ->setIconName("hay_block") ->setDescriptionId(IDS_TILE_HAY) ->setUseDescriptionId(IDS_DESC_HAY); Tile::woolCarpet = @@ -1688,7 +1688,7 @@ void Tile::staticCtor() { Item::eMaterial_cloth) ->setDestroyTime(0.1f) ->setSoundType(SOUND_CLOTH) - ->setIconName(L"woolCarpet") + ->setIconName("woolCarpet") ->setLightBlock(0) ->setDescriptionId(IDS_TILE_CARPET) ->setUseDescriptionId(IDS_DESC_CARPET); @@ -1698,7 +1698,7 @@ void Tile::staticCtor() { ->setDestroyTime(1.25f) ->setExplodeable(7) ->setSoundType(SOUND_STONE) - ->setIconName(L"hardened_clay") + ->setIconName("hardened_clay") ->setDescriptionId(IDS_TILE_HARDENED_CLAY) ->setUseDescriptionId(IDS_DESC_HARDENED_CLAY); Tile::coalBlock = (new Tile(173, Material::stone)) @@ -1707,51 +1707,51 @@ void Tile::staticCtor() { ->setDestroyTime(5.0f) ->setExplodeable(10) ->setSoundType(SOUND_STONE) - ->setIconName(L"coal_block") + ->setIconName("coal_block") ->setDescriptionId(IDS_TILE_COAL) ->setUseDescriptionId(IDS_DESC_COAL_BLOCK); // Special cases for certain items since they can have different icons Item::items[wool_Id] = (new WoolTileItem(Tile::wool_Id - 256)) - ->setIconName(L"cloth") + ->setIconName("cloth") ->setDescriptionId(IDS_TILE_CLOTH) ->setUseDescriptionId(IDS_DESC_WOOL); Item::items[clayHardened_colored_Id] = (new WoolTileItem(Tile::clayHardened_colored_Id - 256)) - ->setIconName(L"clayHardenedStained") + ->setIconName("clayHardenedStained") ->setDescriptionId(IDS_TILE_STAINED_CLAY) ->setUseDescriptionId(IDS_DESC_STAINED_CLAY); Item::items[stained_glass_Id] = (new WoolTileItem(Tile::stained_glass_Id - 256)) - ->setIconName(L"stainedGlass") + ->setIconName("stainedGlass") ->setDescriptionId(IDS_TILE_STAINED_GLASS) ->setUseDescriptionId(IDS_DESC_STAINED_GLASS); Item::items[stained_glass_pane_Id] = (new WoolTileItem(Tile::stained_glass_pane_Id - 256)) - ->setIconName(L"stainedGlassPane") + ->setIconName("stainedGlassPane") ->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE) ->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE); Item::items[woolCarpet_Id] = (new WoolTileItem(Tile::woolCarpet_Id - 256)) - ->setIconName(L"woolCarpet") + ->setIconName("woolCarpet") ->setDescriptionId(IDS_TILE_CARPET) ->setUseDescriptionId(IDS_DESC_CARPET); Item::items[treeTrunk_Id] = (new MultiTextureTileItem(Tile::treeTrunk_Id - 256, treeTrunk, (int*)TreeTile::TREE_NAMES, 4)) - ->setIconName(L"log") + ->setIconName("log") ->setDescriptionId(IDS_TILE_LOG) ->setUseDescriptionId(IDS_DESC_LOG); Item::items[wood_Id] = (new MultiTextureTileItem( Tile::wood_Id - 256, Tile::wood, (int*)WoodTile::WOOD_NAMES, 4, IDS_TILE_PLANKS)) - ->setIconName(L"wood") + ->setIconName("wood") ->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS) ->setUseDescriptionId(IDS_DESC_LOG); // <- TODO Item::items[monsterStoneEgg_Id] = (new MultiTextureTileItem( Tile::monsterStoneEgg_Id - 256, monsterStoneEgg, (int*)StoneMonsterTile::STONE_MONSTER_NAMES, 3)) - ->setIconName(L"monsterStoneEgg") + ->setIconName("monsterStoneEgg") ->setDescriptionId(IDS_TILE_STONE_SILVERFISH) ->setUseDescriptionId( IDS_DESC_STONE_SILVERFISH); // 4J - Brought forward from @@ -1760,54 +1760,54 @@ void Tile::staticCtor() { (new MultiTextureTileItem( Tile::stoneBrick_Id - 256, stoneBrick, (int*)SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES, 4)) - ->setIconName(L"stonebricksmooth") + ->setIconName("stonebricksmooth") ->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH); Item::items[sandStone_Id] = (new MultiTextureTileItem(sandStone_Id - 256, sandStone, SandStoneTile::SANDSTONE_NAMES, SandStoneTile::SANDSTONE_BLOCK_NAMES)) - ->setIconName(L"sandStone") + ->setIconName("sandStone") ->setDescriptionId(IDS_TILE_SANDSTONE) ->setUseDescriptionId(IDS_DESC_SANDSTONE); Item::items[quartzBlock_Id] = (new MultiTextureTileItem(quartzBlock_Id - 256, quartzBlock, QuartzBlockTile::BLOCK_NAMES, QuartzBlockTile::QUARTZ_BLOCK_NAMES)) - ->setIconName(L"quartzBlock") + ->setIconName("quartzBlock") ->setDescriptionId(IDS_TILE_QUARTZ_BLOCK) ->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK); Item::items[stoneSlabHalf_Id] = (new StoneSlabTileItem(Tile::stoneSlabHalf_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, false)) - ->setIconName(L"stoneSlab") + ->setIconName("stoneSlab") ->setDescriptionId(IDS_TILE_STONESLAB) ->setUseDescriptionId(IDS_DESC_HALFSLAB); Item::items[stoneSlab_Id] = (new StoneSlabTileItem(Tile::stoneSlab_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, true)) - ->setIconName(L"stoneSlab") + ->setIconName("stoneSlab") ->setDescriptionId(IDS_DESC_STONESLAB) ->setUseDescriptionId(IDS_DESC_SLAB); Item::items[woodSlabHalf_Id] = (new StoneSlabTileItem(Tile::woodSlabHalf_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, false)) - ->setIconName(L"woodSlab") + ->setIconName("woodSlab") ->setDescriptionId(IDS_DESC_WOODSLAB) ->setUseDescriptionId(IDS_DESC_WOODSLAB); Item::items[woodSlab_Id] = (new StoneSlabTileItem(Tile::woodSlab_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, true)) - ->setIconName(L"woodSlab") + ->setIconName("woodSlab") ->setDescriptionId(IDS_DESC_WOODSLAB) ->setUseDescriptionId(IDS_DESC_WOODSLAB); Item::items[sapling_Id] = (new MultiTextureTileItem(Tile::sapling_Id - 256, Tile::sapling, Sapling::SAPLING_NAMES, 4)) - ->setIconName(L"sapling") + ->setIconName("sapling") ->setDescriptionId(IDS_TILE_SAPLING) ->setUseDescriptionId(IDS_DESC_SAPLING); Item::items[leaves_Id] = (new LeafTileItem(Tile::leaves_Id - 256)) - ->setIconName(L"leaves") + ->setIconName("leaves") ->setDescriptionId(IDS_TILE_LEAVES) ->setUseDescriptionId(IDS_DESC_LEAVES); Item::items[vine_Id] = (new ColoredTileItem(Tile::vine_Id - 256, false)) @@ -1903,7 +1903,7 @@ void Tile::_init(int id, Material* material, bool isSolidRender) { lightBlock[id] = isSolidRender ? 255 : 0; transculent[id] = !material->blocksLight(); mipmapEnable[id] = true; // 4J added - iconName = L""; + iconName = ""; } Tile::Tile(int id, Material* material, bool isSolidRender) { @@ -2542,8 +2542,8 @@ Tile* Tile::setDescriptionId(unsigned int id) { return this; } -std::wstring Tile::getName() { - return L""; // I18n::get(getDescriptionId() + L".name"); +std::string Tile::getName() { + return ""; // I18n::get(getDescriptionId() + ".name"); } unsigned int Tile::getDescriptionId(int iData /*= -1*/) { @@ -2618,14 +2618,14 @@ int Tile::getAnalogOutputSignal(Level* level, int x, int y, int z, int dir) { return Redstone::SIGNAL_NONE; } -Tile* Tile::setIconName(const std::wstring& iconName) { +Tile* Tile::setIconName(const std::string& iconName) { this->iconName = iconName; return this; } -std::wstring Tile::getIconName() { - return iconName.empty() ? L"MISSING_ICON_TILE_" + toWString(id) + - L"_" + toWString(descriptionId) +std::string Tile::getIconName() { + return iconName.empty() ? "MISSING_ICON_TILE_" + toWString(id) + + "_" + toWString(descriptionId) : iconName; } @@ -2633,7 +2633,7 @@ void Tile::registerIcons(IconRegister* iconRegister) { icon = iconRegister->registerIcon(getIconName()); } -std::wstring Tile::getTileItemIconName() { return L""; } +std::string Tile::getTileItemIconName() { return ""; } Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, float pitch, int iBreakSound, int iPlaceSound) { @@ -2677,7 +2677,7 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, this->iBreakSound = -1; break; } - // this->breakSound = L"step." + this->name; + // this->breakSound = "step." + this->name; } if (iPlaceSound > -1) { @@ -2721,15 +2721,15 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, break; } - // this->stepSound = L"step." + this->name; + // this->stepSound = "step." + this->name; this->volume = volume; this->pitch = pitch; } float Tile::SoundType::getVolume() const { return volume; } float Tile::SoundType::getPitch() const { return pitch; } -// wstring getBreakSound() const { return breakSound; } -// wstring getStepSound() const { return stepSound; } +// string getBreakSound() const { return breakSound; } +// string getStepSound() const { return stepSound; } int Tile::SoundType::getBreakSound() const { return iBreakSound; } int Tile::SoundType::getStepSound() const { return iStepSound; } int Tile::SoundType::getPlaceSound() const { return iPlaceSound; } diff --git a/targets/minecraft/world/level/tile/Tile.h b/targets/minecraft/world/level/tile/Tile.h index 8a4c4717c..ebd3b42d7 100644 --- a/targets/minecraft/world/level/tile/Tile.h +++ b/targets/minecraft/world/level/tile/Tile.h @@ -97,19 +97,19 @@ public: private: // 4J Stu - Was const but had to change it so that we can initialise it in // TileStaticInit - static std::wstring TILE_DESCRIPTION_PREFIX; + static std::string TILE_DESCRIPTION_PREFIX; protected: static const float INDESTRUCTIBLE_DESTROY_TIME; - std::wstring iconName; + std::string iconName; public: class SoundType { public: - // std::wstring name; - // std::wstring breakSound; - // std::wstring stepSound; + // std::string name; + // std::string breakSound; + // std::string stepSound; eMATERIALSOUND_TYPE eMaterialSound; int iBreakSound, iStepSound, iPlaceSound; float volume; @@ -120,8 +120,8 @@ public: float getVolume() const; float getPitch() const; - // std::wstring getBreakSound() const { return breakSound; } - // std::wstring getStepSound() const { return stepSound; } + // std::string getBreakSound() const { return breakSound; } + // std::string getStepSound() const { return stepSound; } int getBreakSound() const; int getStepSound() const; int getPlaceSound() const; @@ -745,7 +745,7 @@ public: std::shared_ptr itemInstance); virtual void finalizePlacement(Level* level, int x, int y, int z, int data); virtual Tile* setDescriptionId(unsigned int id); - virtual std::wstring getName(); + virtual std::string getName(); virtual unsigned int getDescriptionId(int iData = -1); virtual Tile* setUseDescriptionId(unsigned int id); // 4J Added virtual unsigned int getUseDescriptionId(); // 4J Added @@ -786,12 +786,12 @@ public: int dir); protected: - virtual Tile* setIconName(const std::wstring& iconName); - virtual std::wstring getIconName(); + virtual Tile* setIconName(const std::string& iconName); + virtual std::string getIconName(); public: virtual void registerIcons(IconRegister* iconRegister); - virtual std::wstring getTileItemIconName(); + virtual std::string getTileItemIconName(); // AP - added this function so we can generate the faceFlags for a block in // a single fast function diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp index f0002b1f0..4b007ebb0 100644 --- a/targets/minecraft/world/level/tile/TntTile.cpp +++ b/targets/minecraft/world/level/tile/TntTile.cpp @@ -127,9 +127,9 @@ void TntTile::entityInside(Level* level, int x, int y, int z, } void TntTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"tnt_side"); - iconTop = iconRegister->registerIcon(L"tnt_top"); - iconBottom = iconRegister->registerIcon(L"tnt_bottom"); + icon = iconRegister->registerIcon("tnt_side"); + iconTop = iconRegister->registerIcon("tnt_top"); + iconBottom = iconRegister->registerIcon("tnt_bottom"); } bool TntTile::dropFromExplosion(Explosion* explosion) { return false; } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/TopSnowTile.cpp b/targets/minecraft/world/level/tile/TopSnowTile.cpp index 2a78dbb92..b69ebd177 100644 --- a/targets/minecraft/world/level/tile/TopSnowTile.cpp +++ b/targets/minecraft/world/level/tile/TopSnowTile.cpp @@ -24,7 +24,7 @@ TopSnowTile::TopSnowTile(int id) : Tile(id, Material::topSnow, false) { } void TopSnowTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"snow"); + icon = iconRegister->registerIcon("snow"); } std::optional TopSnowTile::getAABB(Level* level, int x, int y, int z) { diff --git a/targets/minecraft/world/level/tile/TreeTile.cpp b/targets/minecraft/world/level/tile/TreeTile.cpp index 3235adc3c..97c6acd97 100644 --- a/targets/minecraft/world/level/tile/TreeTile.cpp +++ b/targets/minecraft/world/level/tile/TreeTile.cpp @@ -15,11 +15,11 @@ const unsigned int TreeTile::TREE_NAMES[TreeTile::TREE_NAMES_LENGTH] = { IDS_TILE_LOG_OAK, IDS_TILE_LOG_SPRUCE, IDS_TILE_LOG_BIRCH, IDS_TILE_LOG_JUNGLE}; -const std::wstring TreeTile::TREE_STRING_NAMES[TreeTile::TREE_NAMES_LENGTH] = { - L"oak", L"spruce", L"birch", L"jungle"}; +const std::string TreeTile::TREE_STRING_NAMES[TreeTile::TREE_NAMES_LENGTH] = { + "oak", "spruce", "birch", "jungle"}; -const std::wstring TreeTile::TREE_TEXTURES[] = {L"tree_side", L"tree_spruce", - L"tree_birch", L"tree_jungle"}; +const std::string TreeTile::TREE_TEXTURES[] = {"tree_side", "tree_spruce", + "tree_birch", "tree_jungle"}; TreeTile::TreeTile(int id) : RotatedPillarTile(id, Material::wood) {} @@ -72,9 +72,9 @@ std::shared_ptr TreeTile::getSilkTouchItemInstance(int data) { void TreeTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < TREE_NAMES_LENGTH; i++) { - icons_side[i] = iconRegister->registerIcon(getIconName() + L"_" + + icons_side[i] = iconRegister->registerIcon(getIconName() + "_" + TREE_STRING_NAMES[i]); icons_top[i] = iconRegister->registerIcon( - getIconName() + L"_" + TREE_STRING_NAMES[i] + L"_top"); + getIconName() + "_" + TREE_STRING_NAMES[i] + "_top"); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/TreeTile.h b/targets/minecraft/world/level/tile/TreeTile.h index d09a160a0..edbd87640 100644 --- a/targets/minecraft/world/level/tile/TreeTile.h +++ b/targets/minecraft/world/level/tile/TreeTile.h @@ -27,9 +27,9 @@ public: static const unsigned int TREE_NAMES[TREE_NAMES_LENGTH]; - static const std::wstring TREE_STRING_NAMES[TREE_NAMES_LENGTH]; + static const std::string TREE_STRING_NAMES[TREE_NAMES_LENGTH]; - static const std::wstring TREE_TEXTURES[]; + static const std::string TREE_TEXTURES[]; private: Icon* icons_side[TREE_NAMES_LENGTH]; diff --git a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp index 76f90bb1b..eec3fac45 100644 --- a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.cpp @@ -14,7 +14,7 @@ class Material; WeightedPressurePlateTile::WeightedPressurePlateTile(int id, - const std::wstring& tex, + const std::string& tex, Material* material, int maxWeight) : BasePressurePlateTile(id, tex, material) { diff --git a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.h b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.h index 60ce95414..18fd47d76 100644 --- a/targets/minecraft/world/level/tile/WeightedPressurePlateTile.h +++ b/targets/minecraft/world/level/tile/WeightedPressurePlateTile.h @@ -11,7 +11,7 @@ private: int maxWeight; public: - WeightedPressurePlateTile(int id, const std::wstring& tex, + WeightedPressurePlateTile(int id, const std::string& tex, Material* material, int maxWeight); protected: diff --git a/targets/minecraft/world/level/tile/WoodTile.cpp b/targets/minecraft/world/level/tile/WoodTile.cpp index b1c548958..68743203a 100644 --- a/targets/minecraft/world/level/tile/WoodTile.cpp +++ b/targets/minecraft/world/level/tile/WoodTile.cpp @@ -14,8 +14,8 @@ const unsigned int WoodTile::WOOD_NAMES[WOOD_NAMES_LENGTH] = { IDS_TILE_JUNGLE_PLANKS, }; -const std::wstring WoodTile::TEXTURE_NAMES[] = {L"oak", L"spruce", L"birch", - L"jungle"}; +const std::string WoodTile::TEXTURE_NAMES[] = {"oak", "spruce", "birch", + "jungle"}; // public static final String[] WOOD_NAMES = { // "oak", "spruce", "birch", "jungle" @@ -43,6 +43,6 @@ void WoodTile::registerIcons(IconRegister* iconRegister) { for (int i = 0; i < WOOD_NAMES_LENGTH; i++) { icons[i] = - iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_NAMES[i]); + iconRegister->registerIcon(getIconName() + "_" + TEXTURE_NAMES[i]); } } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/WoodTile.h b/targets/minecraft/world/level/tile/WoodTile.h index 844ba12f9..5b24325a9 100644 --- a/targets/minecraft/world/level/tile/WoodTile.h +++ b/targets/minecraft/world/level/tile/WoodTile.h @@ -13,7 +13,7 @@ public: static const int WOOD_NAMES_LENGTH = 4; static const unsigned int WOOD_NAMES[WOOD_NAMES_LENGTH]; - static const std::wstring TEXTURE_NAMES[]; + static const std::string TEXTURE_NAMES[]; private: Icon** icons; diff --git a/targets/minecraft/world/level/tile/WorkbenchTile.cpp b/targets/minecraft/world/level/tile/WorkbenchTile.cpp index 420861199..b081e938a 100644 --- a/targets/minecraft/world/level/tile/WorkbenchTile.cpp +++ b/targets/minecraft/world/level/tile/WorkbenchTile.cpp @@ -23,9 +23,9 @@ Icon* WorkbenchTile::getTexture(int face, int data) { } void WorkbenchTile::registerIcons(IconRegister* iconRegister) { - icon = iconRegister->registerIcon(L"workbench_side"); - iconTop = iconRegister->registerIcon(L"workbench_top"); - iconFront = iconRegister->registerIcon(L"workbench_front"); + icon = iconRegister->registerIcon("workbench_side"); + iconTop = iconRegister->registerIcon("workbench_top"); + iconFront = iconRegister->registerIcon("workbench_front"); } // 4J-PB - Adding a TestUse for tooltip display diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index e9a6a6701..7f6776c20 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -63,7 +63,7 @@ BeaconTileEntity::BeaconTileEntity() { secondaryPower = 0; paymentItem = nullptr; - name = L""; + name = ""; } void BeaconTileEntity::tick() { @@ -226,18 +226,18 @@ double BeaconTileEntity::getViewDistance() { return 256 * 256; } void BeaconTileEntity::load(CompoundTag* tag) { TileEntity::load(tag); - primaryPower = tag->getInt(L"Primary"); - secondaryPower = tag->getInt(L"Secondary"); - levels = tag->getInt(L"Levels"); + primaryPower = tag->getInt("Primary"); + secondaryPower = tag->getInt("Secondary"); + levels = tag->getInt("Levels"); } void BeaconTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putInt(L"Primary", primaryPower); - tag->putInt(L"Secondary", secondaryPower); + tag->putInt("Primary", primaryPower); + tag->putInt("Secondary", secondaryPower); // this value is re-calculated, but save it anyway to avoid update lag - tag->putInt(L"Levels", levels); + tag->putInt("Levels", levels); } unsigned int BeaconTileEntity::getContainerSize() { return 1; } @@ -281,17 +281,17 @@ void BeaconTileEntity::setItem(unsigned int slot, } } -std::wstring BeaconTileEntity::getName() { +std::string BeaconTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_CONTAINER_BEACON); } -std::wstring BeaconTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string BeaconTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool BeaconTileEntity::hasCustomName() { return !name.empty(); } -void BeaconTileEntity::setCustomName(const std::wstring& name) { +void BeaconTileEntity::setCustomName(const std::string& name) { this->name = name; } diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h index 4fad971bc..0b64fa922 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.h @@ -42,7 +42,7 @@ private: int secondaryPower; std::shared_ptr paymentItem; - std::wstring name; + std::string name; public: BeaconTileEntity(); @@ -71,10 +71,10 @@ public: std::shared_ptr removeItem(unsigned int slot, int count); std::shared_ptr removeItemNoUpdate(int slot); void setItem(unsigned int slot, std::shared_ptr item); - std::wstring getName(); - std::wstring getCustomName(); + std::string getName(); + std::string getCustomName(); bool hasCustomName(); - void setCustomName(const std::wstring& name); + void setCustomName(const std::string& name); int getMaxStackSize(); bool stillValid(std::shared_ptr player); void startOpen(); diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index 7fbeaa2e3..69e07f88e 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -35,22 +35,22 @@ std::vector BrewingStandTileEntity::SLOTS_FOR_OTHER_FACES = BrewingStandTileEntity::BrewingStandTileEntity() { brewTime = 0; items = std::vector>(4); - name = L""; + name = ""; } BrewingStandTileEntity::~BrewingStandTileEntity() {} -std::wstring BrewingStandTileEntity::getName() { +std::string BrewingStandTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_TILE_BREWINGSTAND); } -std::wstring BrewingStandTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string BrewingStandTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool BrewingStandTileEntity::hasCustomName() { return !name.empty(); } -void BrewingStandTileEntity::setCustomName(const std::wstring& name) { +void BrewingStandTileEntity::setCustomName(const std::string& name) { this->name = name; } @@ -277,35 +277,35 @@ void BrewingStandTileEntity::load(CompoundTag* base) { TileEntity::load(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); items = std::vector>(getContainerSize()); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - int slot = tag->getByte(L"Slot"); + int slot = tag->getByte("Slot"); if (slot >= 0 && slot < items.size()) items[slot] = ItemInstance::fromTag(tag); } - brewTime = base->getShort(L"BrewTime"); - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); + brewTime = base->getShort("BrewTime"); + if (base->contains("CustomName")) name = base->getString("CustomName"); } void BrewingStandTileEntity::save(CompoundTag* base) { TileEntity::save(base); - base->putShort(L"BrewTime", (short)(brewTime)); + base->putShort("BrewTime", (short)(brewTime)); ListTag* listTag = new ListTag(); for (int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); - if (hasCustomName()) base->putString(L"CustomName", name); + base->put("Items", listTag); + if (hasCustomName()) base->putString("CustomName", name); } std::shared_ptr BrewingStandTileEntity::getItem( diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h index e04904400..39ca97a3a 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.h @@ -24,15 +24,15 @@ private: int brewTime; int lastPotionCount; int ingredientId; - std::wstring name; + std::string name; public: BrewingStandTileEntity(); ~BrewingStandTileEntity(); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); virtual unsigned int getContainerSize(); virtual void tick(); diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 4159c4131..f9f03704e 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -47,7 +47,7 @@ void ChestTileEntity::_init(bool isBonusChest) { tickInterval = 0; type = -1; - name = L""; + name = ""; } ChestTileEntity::ChestTileEntity(bool isBonusChest /* = false*/) @@ -109,36 +109,36 @@ void ChestTileEntity::setItem(unsigned int slot, this->setChanged(); } -std::wstring ChestTileEntity::getName() { +std::string ChestTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_TILE_CHEST); } -std::wstring ChestTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string ChestTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool ChestTileEntity::hasCustomName() { return !name.empty(); } -void ChestTileEntity::setCustomName(const std::wstring& name) { +void ChestTileEntity::setCustomName(const std::string& name) { this->name = name; } void ChestTileEntity::load(CompoundTag* base) { TileEntity::load(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); if (items) { delete items; } items = new std::vector>(getContainerSize()); - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); + if (base->contains("CustomName")) name = base->getString("CustomName"); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - unsigned int slot = tag->getByte(L"Slot") & 0xff; + unsigned int slot = tag->getByte("Slot") & 0xff; if (slot >= 0 && slot < items->size()) (*items)[slot] = ItemInstance::fromTag(tag); } - isBonusChest = base->getBoolean(L"bonus"); + isBonusChest = base->getBoolean("bonus"); } void ChestTileEntity::save(CompoundTag* base) { @@ -148,14 +148,14 @@ void ChestTileEntity::save(CompoundTag* base) { for (unsigned int i = 0; i < items->size(); i++) { if ((*items)[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); (*items)[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); - if (hasCustomName()) base->putString(L"CustomName", name); - base->putBoolean(L"bonus", isBonusChest); + base->put("Items", listTag); + if (hasCustomName()) base->putString("CustomName", name); + base->putBoolean("bonus", isBonusChest); } int ChestTileEntity::getMaxStackSize() { diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h index 6273db675..446a87ea6 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.h @@ -48,7 +48,7 @@ private: int tickInterval; int type; - std::wstring name; + std::string name; public: virtual unsigned int getContainerSize(); @@ -57,10 +57,10 @@ public: int count); virtual std::shared_ptr removeItemNoUpdate(int slot); virtual void setItem(unsigned int slot, std::shared_ptr item); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); virtual void load(CompoundTag* base); virtual void save(CompoundTag* base); virtual int getMaxStackSize(); diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp index 60327f8b4..654309fa7 100644 --- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.cpp @@ -15,16 +15,16 @@ class Level; CommandBlockEntity::CommandBlockEntity() { successCount = 0; - command = L""; - name = L"@"; + command = ""; + name = "@"; } -void CommandBlockEntity::setCommand(const std::wstring& command) { +void CommandBlockEntity::setCommand(const std::string& command) { this->command = command; setChanged(); } -std::wstring CommandBlockEntity::getCommand() { return command; } +std::string CommandBlockEntity::getCommand() { return command; } int CommandBlockEntity::performCommand(Level* level) { // 4J-JEV: Cannot decide what to do with the command field. @@ -32,31 +32,31 @@ int CommandBlockEntity::performCommand(Level* level) { return 0; } -std::wstring CommandBlockEntity::getName() { return name; } +std::string CommandBlockEntity::getName() { return name; } -void CommandBlockEntity::setName(const std::wstring& name) { +void CommandBlockEntity::setName(const std::string& name) { this->name = name; } -void CommandBlockEntity::sendMessage(const std::wstring& message, +void CommandBlockEntity::sendMessage(const std::string& message, ChatPacket::EChatPacketMessage type, int customData, - const std::wstring& additionalMessage) {} + const std::string& additionalMessage) {} bool CommandBlockEntity::hasPermission(EGameCommand command) { return false; } void CommandBlockEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putString(L"Command", command); - tag->putInt(L"SuccessCount", successCount); - tag->putString(L"CustomName", name); + tag->putString("Command", command); + tag->putInt("SuccessCount", successCount); + tag->putString("CustomName", name); } void CommandBlockEntity::load(CompoundTag* tag) { TileEntity::load(tag); - command = tag->getString(L"Command"); - successCount = tag->getInt(L"SuccessCount"); - if (tag->contains(L"CustomName")) name = tag->getString(L"CustomName"); + command = tag->getString("Command"); + successCount = tag->getInt("SuccessCount"); + if (tag->contains("CustomName")) name = tag->getString("CustomName"); } Pos* CommandBlockEntity::getCommandSenderWorldPosition() { diff --git a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h index c68b21c39..9f602369d 100644 --- a/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h +++ b/targets/minecraft/world/level/tile/entity/CommandBlockEntity.h @@ -22,24 +22,24 @@ public: private: int successCount; - std::wstring command; - std::wstring name; + std::string command; + std::string name; public: CommandBlockEntity(); - void setCommand(const std::wstring& command); - std::wstring getCommand(); + void setCommand(const std::string& command); + std::string getCommand(); int performCommand(Level* level); - std::wstring getName(); - void setName(const std::wstring& name); + std::string getName(); + void setName(const std::string& name); virtual void sendMessage( - const std::wstring& message, + const std::string& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, - int customData = -1, const std::wstring& additionalMessage = L""); + int customData = -1, const std::string& additionalMessage = ""); virtual bool hasPermission(EGameCommand command); // void sendMessage(ChatMessageComponent *message); - // bool hasPermission(int permissionLevel, const std::wstring &commandName); + // bool hasPermission(int permissionLevel, const std::string &commandName); void save(CompoundTag* tag); void load(CompoundTag* tag); Pos* getCommandSenderWorldPosition(); diff --git a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp index c04f3fe70..3796c599e 100644 --- a/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ComparatorTileEntity.cpp @@ -8,12 +8,12 @@ void ComparatorTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putInt(L"OutputSignal", output); + tag->putInt("OutputSignal", output); } void ComparatorTileEntity::load(CompoundTag* tag) { TileEntity::load(tag); - output = tag->getInt(L"OutputSignal"); + output = tag->getInt("OutputSignal"); } int ComparatorTileEntity::getOutputSignal() { return output; } diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 447debca7..ac6bc5d44 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -17,7 +17,7 @@ DispenserTileEntity::DispenserTileEntity() : TileEntity() { items = std::vector>(9); random = new Random(); - name = L""; + name = ""; } DispenserTileEntity::~DispenserTileEntity() { delete random; } @@ -124,15 +124,15 @@ int DispenserTileEntity::addItem(std::shared_ptr item) { return -1; } -std::wstring DispenserTileEntity::getName() { +std::string DispenserTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_TILE_DISPENSER); } -std::wstring DispenserTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string DispenserTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } -void DispenserTileEntity::setCustomName(const std::wstring& name) { +void DispenserTileEntity::setCustomName(const std::string& name) { this->name = name; } @@ -141,15 +141,15 @@ bool DispenserTileEntity::hasCustomName() { return !name.empty(); } void DispenserTileEntity::load(CompoundTag* base) { TileEntity::load(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); items = std::vector>(getContainerSize()); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - unsigned int slot = tag->getByte(L"Slot") & 0xff; + unsigned int slot = tag->getByte("Slot") & 0xff; if (slot >= 0 && slot < items.size()) items[slot] = ItemInstance::fromTag(tag); } - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); + if (base->contains("CustomName")) name = base->getString("CustomName"); } void DispenserTileEntity::save(CompoundTag* base) { @@ -159,13 +159,13 @@ void DispenserTileEntity::save(CompoundTag* base) { for (unsigned int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); - if (hasCustomName()) base->putString(L"CustomName", name); + base->put("Items", listTag); + if (hasCustomName()) base->putString("CustomName", name); } int DispenserTileEntity::getMaxStackSize() { diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h index 6765b6653..988350dab 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -27,7 +27,7 @@ private: Random* random; protected: - std::wstring name; + std::string name; public: DispenserTileEntity(); @@ -42,9 +42,9 @@ public: virtual int getRandomSlot(); virtual void setItem(unsigned int slot, std::shared_ptr item); virtual int addItem(std::shared_ptr item); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual std::string getName(); + virtual std::string getCustomName(); + virtual void setCustomName(const std::string& name); virtual bool hasCustomName(); virtual void load(CompoundTag* base); virtual void save(CompoundTag* base); diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp index c673ce788..8fda024dd 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -8,7 +8,7 @@ #include "minecraft/world/level/tile/entity/TileEntity.h" #include "strings.h" -std::wstring DropperTileEntity::getName() { +std::string DropperTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_CONTAINER_DROPPER); } diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h index 4f111b275..6f869ac2d 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.h @@ -15,5 +15,5 @@ public: virtual std::shared_ptr clone(); public: - std::wstring getName(); + std::string getName(); }; \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index fe25b339a..7667fa6c6 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -26,19 +26,19 @@ EnchantmentTableEntity::EnchantmentTableEntity() { rot = 0.0f; oRot = 0.0f; tRot = 0.0f; - name = L""; + name = ""; } EnchantmentTableEntity::~EnchantmentTableEntity() { delete random; } void EnchantmentTableEntity::save(CompoundTag* base) { TileEntity::save(base); - if (hasCustomName()) base->putString(L"CustomName", name); + if (hasCustomName()) base->putString("CustomName", name); } void EnchantmentTableEntity::load(CompoundTag* base) { TileEntity::load(base); - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); + if (base->contains("CustomName")) name = base->getString("CustomName"); } void EnchantmentTableEntity::tick() { @@ -93,17 +93,17 @@ void EnchantmentTableEntity::tick() { flip = flip + flipA; } -std::wstring EnchantmentTableEntity::getName() { +std::string EnchantmentTableEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_ENCHANT); } -std::wstring EnchantmentTableEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string EnchantmentTableEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool EnchantmentTableEntity::hasCustomName() { return !name.empty(); } -void EnchantmentTableEntity::setCustomName(const std::wstring& name) { +void EnchantmentTableEntity::setCustomName(const std::string& name) { this->name = name; } diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h index 8f657eaea..5fc248388 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h @@ -19,7 +19,7 @@ public: private: Random* random; - std::wstring name; + std::string name; public: EnchantmentTableEntity(); @@ -28,10 +28,10 @@ public: virtual void save(CompoundTag* base); virtual void load(CompoundTag* base); virtual void tick(); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); // 4J Added virtual std::shared_ptr clone(); diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index ba010f8ed..3b4bb3836 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -48,7 +48,7 @@ FurnaceTileEntity::FurnaceTileEntity() : TileEntity() { litDuration = 0; tickCount = 0; m_charcoalUsed = false; - name = L""; + name = ""; } unsigned int FurnaceTileEntity::getContainerSize() { return items.size(); } @@ -97,56 +97,56 @@ void FurnaceTileEntity::setItem(unsigned int slot, item->count = getMaxStackSize(); } -std::wstring FurnaceTileEntity::getName() { +std::string FurnaceTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_TILE_FURNACE); } -std::wstring FurnaceTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string FurnaceTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool FurnaceTileEntity::hasCustomName() { return !name.empty(); } -void FurnaceTileEntity::setCustomName(const std::wstring& name) { +void FurnaceTileEntity::setCustomName(const std::string& name) { this->name = name; } void FurnaceTileEntity::load(CompoundTag* base) { TileEntity::load(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); items = std::vector>(getContainerSize()); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - unsigned int slot = tag->getByte(L"Slot"); + unsigned int slot = tag->getByte("Slot"); if (slot >= 0 && slot < items.size()) items[slot] = ItemInstance::fromTag(tag); } - litTime = base->getShort(L"BurnTime"); - tickCount = base->getShort(L"CookTime"); + litTime = base->getShort("BurnTime"); + tickCount = base->getShort("CookTime"); litDuration = getBurnDuration(items[SLOT_FUEL]); - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); - m_charcoalUsed = base->getBoolean(L"CharcoalUsed"); + if (base->contains("CustomName")) name = base->getString("CustomName"); + m_charcoalUsed = base->getBoolean("CharcoalUsed"); } void FurnaceTileEntity::save(CompoundTag* base) { TileEntity::save(base); - base->putShort(L"BurnTime", (short)(litTime)); - base->putShort(L"CookTime", (short)(tickCount)); + base->putShort("BurnTime", (short)(litTime)); + base->putShort("CookTime", (short)(tickCount)); ListTag* listTag = new ListTag(); for (unsigned int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); - if (hasCustomName()) base->putString(L"CustomName", name); - base->putBoolean(L"CharcoalUsed", m_charcoalUsed); + base->put("Items", listTag); + if (hasCustomName()) base->putString("CustomName", name); + base->putBoolean("CharcoalUsed", m_charcoalUsed); } int FurnaceTileEntity::getMaxStackSize() { diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h index 719199d1b..739b0faab 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.h @@ -43,7 +43,7 @@ public: int tickCount; private: - std::wstring name; + std::string name; public: // 4J Stu - Need a ctor to initialise member variables @@ -56,10 +56,10 @@ public: int count); virtual std::shared_ptr removeItemNoUpdate(int slot); virtual void setItem(unsigned int slot, std::shared_ptr item); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); virtual void load(CompoundTag* base); virtual void save(CompoundTag* base); virtual int getMaxStackSize(); diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp index c601889e8..fc64a992a 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -30,7 +30,7 @@ class Entity; HopperTileEntity::HopperTileEntity() { items = std::vector>(5); - name = L""; + name = ""; cooldownTime = -1; } @@ -40,13 +40,13 @@ void HopperTileEntity::load(CompoundTag* base) { TileEntity::load(base); ListTag* inventoryList = - (ListTag*)base->getList(L"Items"); + (ListTag*)base->getList("Items"); items = std::vector>(getContainerSize()); - if (base->contains(L"CustomName")) name = base->getString(L"CustomName"); - cooldownTime = base->getInt(L"TransferCooldown"); + if (base->contains("CustomName")) name = base->getString("CustomName"); + cooldownTime = base->getInt("TransferCooldown"); for (int i = 0; i < inventoryList->size(); i++) { CompoundTag* tag = inventoryList->get(i); - int slot = tag->getByte(L"Slot"); + int slot = tag->getByte("Slot"); if (slot >= 0 && slot < items.size()) items[slot] = ItemInstance::fromTag(tag); } @@ -59,14 +59,14 @@ void HopperTileEntity::save(CompoundTag* base) { for (int i = 0; i < items.size(); i++) { if (items[i] != nullptr) { CompoundTag* tag = new CompoundTag(); - tag->putByte(L"Slot", (uint8_t)i); + tag->putByte("Slot", (uint8_t)i); items[i]->save(tag); listTag->add(tag); } } - base->put(L"Items", listTag); - base->putInt(L"TransferCooldown", cooldownTime); - if (hasCustomName()) base->putString(L"CustomName", name); + base->put("Items", listTag); + base->putInt("TransferCooldown", cooldownTime); + if (hasCustomName()) base->putString("CustomName", name); } void HopperTileEntity::setChanged() { TileEntity::setChanged(); } @@ -109,17 +109,17 @@ void HopperTileEntity::setItem(unsigned int slot, item->count = getMaxStackSize(); } -std::wstring HopperTileEntity::getName() { +std::string HopperTileEntity::getName() { return hasCustomName() ? name : gameServices().getString(IDS_CONTAINER_HOPPER); } -std::wstring HopperTileEntity::getCustomName() { - return hasCustomName() ? name : L""; +std::string HopperTileEntity::getCustomName() { + return hasCustomName() ? name : ""; } bool HopperTileEntity::hasCustomName() { return !name.empty(); } -void HopperTileEntity::setCustomName(const std::wstring& name) { +void HopperTileEntity::setCustomName(const std::string& name) { this->name = name; } diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h index 5be360922..8cd6570a3 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.h @@ -25,7 +25,7 @@ public: private: std::vector> items; - std::wstring name; + std::string name; int cooldownTime; public: @@ -41,10 +41,10 @@ public: int count); virtual std::shared_ptr removeItemNoUpdate(int slot); virtual void setItem(unsigned int slot, std::shared_ptr item); - virtual std::wstring getName(); - virtual std::wstring getCustomName(); + virtual std::string getName(); + virtual std::string getCustomName(); virtual bool hasCustomName(); - virtual void setCustomName(const std::wstring& name); + virtual void setCustomName(const std::string& name); virtual int getMaxStackSize(); virtual bool stillValid(std::shared_ptr player); virtual void startOpen(); diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp index 543d67472..5b5d6f13e 100644 --- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.cpp @@ -60,7 +60,7 @@ void MobSpawnerTileEntity::tick() { std::shared_ptr MobSpawnerTileEntity::getUpdatePacket() { CompoundTag* tag = new CompoundTag(); save(tag); - tag->remove(L"SpawnPotentials"); + tag->remove("SpawnPotentials"); return std::make_shared( x, y, z, TileEntityDataPacket::TYPE_MOB_SPAWNER, tag); } @@ -81,6 +81,6 @@ std::shared_ptr MobSpawnerTileEntity::clone() { return result; } -void MobSpawnerTileEntity::setEntityId(const std::wstring& id) { +void MobSpawnerTileEntity::setEntityId(const std::string& id) { spawner->setEntityId(id); } \ No newline at end of file diff --git a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h index 2cceaee2f..2c31fd1fa 100644 --- a/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/MobSpawnerTileEntity.h @@ -45,5 +45,5 @@ public: // 4J Added virtual std::shared_ptr clone(); - void setEntityId(const std::wstring& id); + void setEntityId(const std::string& id); }; diff --git a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp index 7c8ca9f41..74b00de99 100644 --- a/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/MusicTileEntity.cpp @@ -17,12 +17,12 @@ MusicTileEntity::MusicTileEntity() : TileEntity() { void MusicTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putByte(L"note", note); + tag->putByte("note", note); } void MusicTileEntity::load(CompoundTag* tag) { TileEntity::load(tag); - note = tag->getByte(L"note"); + note = tag->getByte("note"); if (note < 0) note = 0; if (note > 24) note = 24; } diff --git a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp index fd5c819ce..8cd6403f8 100644 --- a/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonMovingTileEntity.cpp @@ -192,7 +192,7 @@ std::shared_ptr PistonMovingPiece::getEntity( void PistonMovingPiece::registerIcons(IconRegister* iconRegister) { // don't register null, register piston top instead (to get proper // particle effect) - icon = iconRegister->registerIcon(L"piston_top"); + icon = iconRegister->registerIcon("piston_top"); } int PistonMovingPiece::cloneTileId(Level* level, int x, int y, int z) { diff --git a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp index 2dcb67ab1..c8e1fd931 100644 --- a/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/PistonPieceTileEntity.cpp @@ -148,21 +148,21 @@ void PistonPieceEntity::tick() { void PistonPieceEntity::load(CompoundTag* tag) { TileEntity::load(tag); - id = tag->getInt(L"blockId"); - data = tag->getInt(L"blockData"); - facing = tag->getInt(L"facing"); - progressO = progress = tag->getFloat(L"progress"); - extending = tag->getBoolean(L"extending"); + id = tag->getInt("blockId"); + data = tag->getInt("blockData"); + facing = tag->getInt("facing"); + progressO = progress = tag->getFloat("progress"); + extending = tag->getBoolean("extending"); } void PistonPieceEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putInt(L"blockId", id); - tag->putInt(L"blockData", data); - tag->putInt(L"facing", facing); - tag->putFloat(L"progress", progressO); - tag->putBoolean(L"extending", extending); + tag->putInt("blockId", id); + tag->putInt("blockData", data); + tag->putInt("facing", facing); + tag->putFloat("progress", progressO); + tag->putBoolean("extending", extending); } // 4J Added diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp index 0ad4eb0db..e25505c30 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -16,10 +16,10 @@ class Player; const int SignTileEntity::MAX_LINE_LENGTH = 15; SignTileEntity::SignTileEntity() : TileEntity() { - m_wsmessages[0] = L""; - m_wsmessages[1] = L""; - m_wsmessages[2] = L""; - m_wsmessages[3] = L""; + m_wsmessages[0] = ""; + m_wsmessages[1] = ""; + m_wsmessages[2] = ""; + m_wsmessages[3] = ""; m_bVerified = true; m_bCensored = false; @@ -38,15 +38,15 @@ SignTileEntity::~SignTileEntity() { void SignTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putString(L"Text1", m_wsmessages[0]); - tag->putString(L"Text2", m_wsmessages[1]); - tag->putString(L"Text3", m_wsmessages[2]); - tag->putString(L"Text4", m_wsmessages[3]); + tag->putString("Text1", m_wsmessages[0]); + tag->putString("Text2", m_wsmessages[1]); + tag->putString("Text3", m_wsmessages[2]); + tag->putString("Text4", m_wsmessages[3]); #if !defined(_CONTENT_PACKAGE) - fwprintf(stderr, L"### - Saving a sign with text - \n"); + fprintf(stderr, "### - Saving a sign with text - \n"); for (int i = 0; i < 4; i++) { - fwprintf(stderr, m_wsmessages[i].c_str()); - fwprintf(stderr, L"\n"); + fprintf(stderr, m_wsmessages[i].c_str()); + fprintf(stderr, "\n"); } #endif } @@ -55,17 +55,17 @@ void SignTileEntity::load(CompoundTag* tag) { _isEditable = false; TileEntity::load(tag); for (int i = 0; i < MAX_SIGN_LINES; i++) { - wchar_t* buf = new wchar_t[256]; - swprintf(buf, 256, L"Text%d", (i + 1)); + char* buf = new char[256]; + snprintf(buf, 256, "Text%d", (i + 1)); m_wsmessages[i] = tag->getString(buf); if (m_wsmessages[i].length() > MAX_LINE_LENGTH) m_wsmessages[i] = m_wsmessages[i].substr(0, MAX_LINE_LENGTH); } #if !defined(_CONTENT_PACKAGE) - fwprintf(stderr, L"### - Loaded a sign with text - \n"); + fprintf(stderr, "### - Loaded a sign with text - \n"); for (int i = 0; i < 4; i++) { - fwprintf(stderr, m_wsmessages[i].c_str()); - fwprintf(stderr, L"\n"); + fprintf(stderr, m_wsmessages[i].c_str()); + fprintf(stderr, "\n"); } #endif @@ -77,7 +77,7 @@ void SignTileEntity::load(CompoundTag* tag) { } std::shared_ptr SignTileEntity::getUpdatePacket() { - std::wstring copy[MAX_SIGN_LINES]; + std::string copy[MAX_SIGN_LINES]; for (int i = 0; i < MAX_SIGN_LINES; i++) { copy[i] = m_wsmessages[i]; } @@ -111,20 +111,20 @@ void SignTileEntity::setChanged() { if(!g_NetworkManager.IsLocalGame() && !m_bVerified) //if (pMinecraft->level->isClientSide) { - wchar_t *wcMessages[MAX_SIGN_LINES]; + char *wcMessages[MAX_SIGN_LINES]; for (int i = 0; i < MAX_SIGN_LINES; ++i) { - wcMessages[i]=new wchar_t [MAX_LINE_LENGTH+1]; + wcMessages[i]=new char [MAX_LINE_LENGTH+1]; memset(wcMessages[i], 0, -sizeof(wchar_t)*(MAX_LINE_LENGTH+1)); if(m_wsmessages[i].length()>0) +sizeof(char)*(MAX_LINE_LENGTH+1)); if(m_wsmessages[i].length()>0) { - memcpy(wcMessages[i],m_wsmessages[i].c_str(),m_wsmessages[i].length()*sizeof(wchar_t)); + memcpy(wcMessages[i],m_wsmessages[i].c_str(),m_wsmessages[i].length()*sizeof(char)); } } // at this point, we can ask the online string verifier if our sign text is ok #if 0 m_bVerified=true; #else - if(!PlatformInput.VerifyStrings((wchar_t**)&wcMessages,MAX_SIGN_LINES,[this](STRING_VERIFY_RESPONSE* r) { return handleStringVerify(r); })) + if(!PlatformInput.VerifyStrings((char**)&wcMessages,MAX_SIGN_LINES,[this](STRING_VERIFY_RESPONSE* r) { return handleStringVerify(r); })) { // Nothing to verify m_bVerified=true; @@ -143,7 +143,7 @@ text is ok #if 0 m_bVerified=true; #else */ } -void SignTileEntity::SetMessage(int iIndex, std::wstring& wsText) { +void SignTileEntity::SetMessage(int iIndex, std::string& wsText) { m_wsmessages[iIndex] = wsText; } diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.h b/targets/minecraft/world/level/tile/entity/SignTileEntity.h index 18dd87d5f..ea95b907a 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.h @@ -22,9 +22,9 @@ public: public: SignTileEntity(); virtual ~SignTileEntity(); - std::wstring GetMessage(int i) { return m_wsmessages[i]; } - std::wstring* GetMessages() { return m_wsmessages; } - void SetMessage(int iIndex, std::wstring& wsText); + std::string GetMessage(int i) { return m_wsmessages[i]; } + std::string* GetMessages() { return m_wsmessages; } + void SetMessage(int iIndex, std::string& wsText); int GetSelectedLine() { return m_iSelectedLine; } void SetSelectedLine(int iLine) { m_iSelectedLine = iLine; } bool IsVerified() { return m_bVerified; } @@ -40,7 +40,7 @@ private: bool m_bCensored; int m_iSelectedLine; - std::wstring m_wsmessages[MAX_SIGN_LINES]; + std::string m_wsmessages[MAX_SIGN_LINES]; public: virtual void save(CompoundTag* tag); diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp index 7aff9dd72..8e67097df 100644 --- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.cpp @@ -10,21 +10,21 @@ SkullTileEntity::SkullTileEntity() { skullType = 0; rotation = 0; - extraType = L""; + extraType = ""; } void SkullTileEntity::save(CompoundTag* tag) { TileEntity::save(tag); - tag->putByte(L"SkullType", static_cast(skullType & 0xff)); - tag->putByte(L"Rot", static_cast(rotation & 0xff)); - tag->putString(L"ExtraType", extraType); + tag->putByte("SkullType", static_cast(skullType & 0xff)); + tag->putByte("Rot", static_cast(rotation & 0xff)); + tag->putString("ExtraType", extraType); } void SkullTileEntity::load(CompoundTag* tag) { TileEntity::load(tag); - skullType = tag->getByte(L"SkullType"); - rotation = tag->getByte(L"Rot"); - if (tag->contains(L"ExtraType")) extraType = tag->getString(L"ExtraType"); + skullType = tag->getByte("SkullType"); + rotation = tag->getByte("Rot"); + if (tag->contains("ExtraType")) extraType = tag->getString("ExtraType"); } std::shared_ptr SkullTileEntity::getUpdatePacket() { @@ -34,7 +34,7 @@ std::shared_ptr SkullTileEntity::getUpdatePacket() { x, y, z, TileEntityDataPacket::TYPE_SKULL, tag); } -void SkullTileEntity::setSkullType(int skullType, const std::wstring& extra) { +void SkullTileEntity::setSkullType(int skullType, const std::string& extra) { this->skullType = skullType; this->extraType = extra; } @@ -45,7 +45,7 @@ int SkullTileEntity::getRotation() { return rotation; } void SkullTileEntity::setRotation(int rot) { rotation = rot; } -std::wstring SkullTileEntity::getExtraType() { return extraType; } +std::string SkullTileEntity::getExtraType() { return extraType; } // 4J Added std::shared_ptr SkullTileEntity::clone() { diff --git a/targets/minecraft/world/level/tile/entity/SkullTileEntity.h b/targets/minecraft/world/level/tile/entity/SkullTileEntity.h index dbddfd5a8..5f59bf46a 100644 --- a/targets/minecraft/world/level/tile/entity/SkullTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/SkullTileEntity.h @@ -20,7 +20,7 @@ public: private: int skullType; int rotation; - std::wstring extraType; + std::string extraType; public: SkullTileEntity(); @@ -28,11 +28,11 @@ public: void save(CompoundTag* tag); void load(CompoundTag* tag); std::shared_ptr getUpdatePacket(); - void setSkullType(int skullType, const std::wstring& extra); + void setSkullType(int skullType, const std::string& extra); int getSkullType(); int getRotation(); void setRotation(int rot); - std::wstring getExtraType(); + std::string getExtraType(); // 4J Added virtual std::shared_ptr clone(); diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index ce34769cc..183cd131d 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -110,5 +110,5 @@ int TheEndPortal::cloneTileId(Level* level, int x, int y, int z) { return 0; } void TheEndPortal::registerIcons(IconRegister* iconRegister) { // don't register null, because of particles - icon = iconRegister->registerIcon(L"portal"); + icon = iconRegister->registerIcon("portal"); } diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp index 6944e7d46..89de391e5 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp @@ -28,50 +28,50 @@ #include "nbt/CompoundTag.h" TileEntity::idToCreateMapType TileEntity::idCreateMap = - std::unordered_map(); + std::unordered_map(); TileEntity::classToIdMapType TileEntity::classIdMap = - std::unordered_map(); void TileEntity::staticCtor() { TileEntity::setId(FurnaceTileEntity::create, eTYPE_FURNACETILEENTITY, - L"Furnace"); - TileEntity::setId(ChestTileEntity::create, eTYPE_CHESTTILEENTITY, L"Chest"); + "Furnace"); + TileEntity::setId(ChestTileEntity::create, eTYPE_CHESTTILEENTITY, "Chest"); TileEntity::setId(EnderChestTileEntity::create, eTYPE_ENDERCHESTTILEENTITY, - L"EnderChest"); + "EnderChest"); TileEntity::setId(JukeboxTile::Entity::create, eTYPE_RECORDPLAYERTILE, - L"RecordPlayer"); + "RecordPlayer"); TileEntity::setId(DispenserTileEntity::create, eTYPE_DISPENSERTILEENTITY, - L"Trap"); + "Trap"); TileEntity::setId(DropperTileEntity::create, eTYPE_DROPPERTILEENTITY, - L"Dropper"); - TileEntity::setId(SignTileEntity::create, eTYPE_SIGNTILEENTITY, L"Sign"); + "Dropper"); + TileEntity::setId(SignTileEntity::create, eTYPE_SIGNTILEENTITY, "Sign"); TileEntity::setId(MobSpawnerTileEntity::create, eTYPE_MOBSPAWNERTILEENTITY, - L"MobSpawner"); - TileEntity::setId(MusicTileEntity::create, eTYPE_MUSICTILEENTITY, L"Music"); + "MobSpawner"); + TileEntity::setId(MusicTileEntity::create, eTYPE_MUSICTILEENTITY, "Music"); TileEntity::setId(PistonPieceEntity::create, eTYPE_PISTONPIECEENTITY, - L"Piston"); + "Piston"); TileEntity::setId(BrewingStandTileEntity::create, - eTYPE_BREWINGSTANDTILEENTITY, L"Cauldron"); + eTYPE_BREWINGSTANDTILEENTITY, "Cauldron"); TileEntity::setId(EnchantmentTableEntity::create, - eTYPE_ENCHANTMENTTABLEENTITY, L"EnchantTable"); + eTYPE_ENCHANTMENTTABLEENTITY, "EnchantTable"); TileEntity::setId(TheEndPortalTileEntity::create, - eTYPE_THEENDPORTALTILEENTITY, L"Airportal"); + eTYPE_THEENDPORTALTILEENTITY, "Airportal"); TileEntity::setId(CommandBlockEntity::create, eTYPE_COMMANDBLOCKTILEENTITY, - L"Control"); + "Control"); TileEntity::setId(BeaconTileEntity::create, eTYPE_BEACONTILEENTITY, - L"Beacon"); - TileEntity::setId(SkullTileEntity::create, eTYPE_SKULLTILEENTITY, L"Skull"); + "Beacon"); + TileEntity::setId(SkullTileEntity::create, eTYPE_SKULLTILEENTITY, "Skull"); TileEntity::setId(DaylightDetectorTileEntity::create, - eTYPE_DAYLIGHTDETECTORTILEENTITY, L"DLDetector"); + eTYPE_DAYLIGHTDETECTORTILEENTITY, "DLDetector"); TileEntity::setId(HopperTileEntity::create, eTYPE_HOPPERTILEENTITY, - L"Hopper"); + "Hopper"); TileEntity::setId(ComparatorTileEntity::create, eTYPE_COMPARATORTILEENTITY, - L"Comparator"); + "Comparator"); } void TileEntity::setId(tileEntityCreateFn createFn, eINSTANCEOF clas, - std::wstring id) { + std::string id) { // 4J Stu - Java has classIdMap.containsKey(id) which would never work as id // is not of the type of the key in classIdMap I have changed to use // idClassMap instead so that we can still search from the string key @@ -98,9 +98,9 @@ void TileEntity::setLevel(Level* level) { this->level = level; } bool TileEntity::hasLevel() { return level != nullptr; } void TileEntity::load(CompoundTag* tag) { - x = tag->getInt(L"x"); - y = tag->getInt(L"y"); - z = tag->getInt(L"z"); + x = tag->getInt("x"); + y = tag->getInt("y"); + z = tag->getInt("z"); } void TileEntity::save(CompoundTag* tag) { @@ -111,10 +111,10 @@ void TileEntity::save(CompoundTag* tag) { // This is a bug!"); return; } - tag->putString(L"id", ((*it).second)); - tag->putInt(L"x", x); - tag->putInt(L"y", y); - tag->putInt(L"z", z); + tag->putString("id", ((*it).second)); + tag->putInt("x", x); + tag->putInt("y", y); + tag->putInt("z", z); } void TileEntity::tick() {} @@ -124,7 +124,7 @@ std::shared_ptr TileEntity::loadStatic(CompoundTag* tag) { // try //{ - auto it = idCreateMap.find(tag->getString(L"id")); + auto it = idCreateMap.find(tag->getString("id")); if (it != idCreateMap.end()) entity = std::shared_ptr(it->second()); //} @@ -137,8 +137,8 @@ std::shared_ptr TileEntity::loadStatic(CompoundTag* tag) { entity->load(tag); } else { #ifdef _DEBUG - Log::info("Skipping TileEntity with id %ls.\n", - tag->getString(L"id").c_str()); + Log::info("Skipping TileEntity with id %s.\n", + tag->getString("id").c_str()); #endif } diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.h b/targets/minecraft/world/level/tile/entity/TileEntity.h index f54ad35c5..ccbb30e8f 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.h +++ b/targets/minecraft/world/level/tile/entity/TileEntity.h @@ -21,15 +21,15 @@ public: virtual eINSTANCEOF GetType() { return eTYPE_TILEENTITY; } private: - typedef std::unordered_map + typedef std::unordered_map idToCreateMapType; - typedef std::unordered_map classToIdMapType; static idToCreateMapType idCreateMap; static classToIdMapType classIdMap; static void setId(tileEntityCreateFn createFn, eINSTANCEOF clas, - std::wstring id); + std::string id); bool remove; unsigned char renderRemoveStage; // 4J added diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 2143d4bb3..336585def 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -25,11 +25,11 @@ class Icon; -const std::wstring PistonBaseTile::EDGE_TEX = L"piston_side"; -const std::wstring PistonBaseTile::PLATFORM_TEX = L"piston_top"; -const std::wstring PistonBaseTile::PLATFORM_STICKY_TEX = L"piston_top_sticky"; -const std::wstring PistonBaseTile::BACK_TEX = L"piston_bottom"; -const std::wstring PistonBaseTile::INSIDE_TEX = L"piston_inner_top"; +const std::string PistonBaseTile::EDGE_TEX = "piston_side"; +const std::string PistonBaseTile::PLATFORM_TEX = "piston_top"; +const std::string PistonBaseTile::PLATFORM_STICKY_TEX = "piston_top_sticky"; +const std::string PistonBaseTile::BACK_TEX = "piston_bottom"; +const std::string PistonBaseTile::INSIDE_TEX = "piston_inner_top"; const float PistonBaseTile::PLATFORM_THICKNESS = 4.0f; @@ -95,7 +95,7 @@ Icon* PistonBaseTile::getTexture(int face, int data) { return icon; } -Icon* PistonBaseTile::getTexture(const std::wstring& name) { +Icon* PistonBaseTile::getTexture(const std::string& name) { if (name.compare(EDGE_TEX) == 0) return Tile::pistonBase->icon; if (name.compare(PLATFORM_TEX) == 0) return Tile::pistonBase->iconPlatform; if (name.compare(PLATFORM_STICKY_TEX) == 0) diff --git a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h index 6efa246f9..1c1066bb4 100644 --- a/targets/minecraft/world/level/tile/piston/PistonBaseTile.h +++ b/targets/minecraft/world/level/tile/piston/PistonBaseTile.h @@ -20,11 +20,11 @@ public: static const int TRIGGER_EXTEND = 0; static const int TRIGGER_CONTRACT = 1; - static const std::wstring EDGE_TEX; - static const std::wstring PLATFORM_TEX; - static const std::wstring PLATFORM_STICKY_TEX; - static const std::wstring BACK_TEX; - static const std::wstring INSIDE_TEX; + static const std::string EDGE_TEX; + static const std::string PLATFORM_TEX; + static const std::string PLATFORM_STICKY_TEX; + static const std::string BACK_TEX; + static const std::string INSIDE_TEX; private: bool isSticky; @@ -47,7 +47,7 @@ public: float z1); virtual Icon* getTexture(int face, int data); - static Icon* getTexture(const std::wstring& name); + static Icon* getTexture(const std::string& name); void registerIcons(IconRegister* iconRegister); virtual int getRenderShape(); diff --git a/targets/minecraft/world/phys/AABB.cpp b/targets/minecraft/world/phys/AABB.cpp index a465d2d1b..7f1e239db 100644 --- a/targets/minecraft/world/phys/AABB.cpp +++ b/targets/minecraft/world/phys/AABB.cpp @@ -249,6 +249,6 @@ bool AABB::containsZ(const std::optional& v) const { return v->x >= x0 && v->x <= x1 && v->y >= y0 && v->y <= y1; } -std::wstring AABB::toString() const { - return std::format(L"box[{}, {}, {}, {}, {}, {}]", x0, y0, z0, x1, y1, z1); +std::string AABB::toString() const { + return std::format("box[{}, {}, {}, {}, {}, {}]", x0, y0, z0, x1, y1, z1); } diff --git a/targets/minecraft/world/phys/AABB.h b/targets/minecraft/world/phys/AABB.h index 201b94b4b..a3bb3a519 100644 --- a/targets/minecraft/world/phys/AABB.h +++ b/targets/minecraft/world/phys/AABB.h @@ -34,5 +34,5 @@ public: bool containsX(const std::optional& v) const; bool containsY(const std::optional& v) const; bool containsZ(const std::optional& v) const; - std::wstring toString() const; + std::string toString() const; }; diff --git a/targets/minecraft/world/phys/Vec3.cpp b/targets/minecraft/world/phys/Vec3.cpp index 5c611f556..9061415f9 100644 --- a/targets/minecraft/world/phys/Vec3.cpp +++ b/targets/minecraft/world/phys/Vec3.cpp @@ -91,8 +91,8 @@ std::optional Vec3::clipZ(const Vec3& b, const double zt) const { return Vec3{x + xd * d, y + yd * d, z + zd * d}; } -std::wstring Vec3::toString() const { - return std::format(L"({},{},{})", x, y, z); +std::string Vec3::toString() const { + return std::format("({},{},{})", x, y, z); } Vec3 Vec3::lerp(const Vec3& v, const double a) const { diff --git a/targets/minecraft/world/phys/Vec3.h b/targets/minecraft/world/phys/Vec3.h index a45cbebec..430d4c21e 100644 --- a/targets/minecraft/world/phys/Vec3.h +++ b/targets/minecraft/world/phys/Vec3.h @@ -26,7 +26,7 @@ public: std::optional clipX(const Vec3& b, double xt) const; std::optional clipY(const Vec3& b, double yt) const; std::optional clipZ(const Vec3& b, double zt) const; - std::wstring toString() const; + std::string toString() const; Vec3 lerp(const Vec3& v, double a) const; void xRot(float degs); void yRot(float degs); diff --git a/targets/minecraft/world/scores/Objective.cpp b/targets/minecraft/world/scores/Objective.cpp index 5ca767fd2..a0f6132a7 100644 --- a/targets/minecraft/world/scores/Objective.cpp +++ b/targets/minecraft/world/scores/Objective.cpp @@ -2,7 +2,7 @@ #include "minecraft/world/scores/Scoreboard.h" -Objective::Objective(Scoreboard* scoreboard, const std::wstring& name, +Objective::Objective(Scoreboard* scoreboard, const std::string& name, ObjectiveCriteria* criteria) { this->scoreboard = scoreboard; this->name = name; @@ -13,13 +13,13 @@ Objective::Objective(Scoreboard* scoreboard, const std::wstring& name, Scoreboard* Objective::getScoreboard() { return scoreboard; } -std::wstring Objective::getName() { return name; } +std::string Objective::getName() { return name; } ObjectiveCriteria* Objective::getCriteria() { return criteria; } -std::wstring Objective::getDisplayName() { return displayName; } +std::string Objective::getDisplayName() { return displayName; } -void Objective::setDisplayName(const std::wstring& name) { +void Objective::setDisplayName(const std::string& name) { displayName = name; scoreboard->onObjectiveChanged(this); } \ No newline at end of file diff --git a/targets/minecraft/world/scores/Objective.h b/targets/minecraft/world/scores/Objective.h index 4f2bb797a..b25f78325 100644 --- a/targets/minecraft/world/scores/Objective.h +++ b/targets/minecraft/world/scores/Objective.h @@ -12,17 +12,17 @@ public: private: Scoreboard* scoreboard; - std::wstring name; + std::string name; ObjectiveCriteria* criteria; - std::wstring displayName; + std::string displayName; public: - Objective(Scoreboard* scoreboard, const std::wstring& name, + Objective(Scoreboard* scoreboard, const std::string& name, ObjectiveCriteria* criteria); Scoreboard* getScoreboard(); - std::wstring getName(); + std::string getName(); ObjectiveCriteria* getCriteria(); - std::wstring getDisplayName(); - void setDisplayName(const std::wstring& name); + std::string getDisplayName(); + void setDisplayName(const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/world/scores/PlayerTeam.cpp b/targets/minecraft/world/scores/PlayerTeam.cpp index 137d27eec..c23229712 100644 --- a/targets/minecraft/world/scores/PlayerTeam.cpp +++ b/targets/minecraft/world/scores/PlayerTeam.cpp @@ -3,60 +3,60 @@ #include "minecraft/world/scores/Scoreboard.h" #include "minecraft/world/scores/Team.h" -PlayerTeam::PlayerTeam(Scoreboard* scoreboard, const std::wstring& name) { +PlayerTeam::PlayerTeam(Scoreboard* scoreboard, const std::string& name) { this->scoreboard = scoreboard; this->name = name; displayName = name; - prefix = L""; - suffix = L""; + prefix = ""; + suffix = ""; allowFriendlyFire = true; seeFriendlyInvisibles = true; } Scoreboard* PlayerTeam::getScoreboard() { return scoreboard; } -std::wstring PlayerTeam::getName() { return name; } +std::string PlayerTeam::getName() { return name; } -std::wstring PlayerTeam::getDisplayName() { return displayName; } +std::string PlayerTeam::getDisplayName() { return displayName; } -void PlayerTeam::setDisplayName(const std::wstring& displayName) { +void PlayerTeam::setDisplayName(const std::string& displayName) { // if (displayName == null) throw new IllegalArgumentException("Name cannot // be null"); this->displayName = displayName; scoreboard->onTeamChanged(this); } -std::unordered_set* PlayerTeam::getPlayers() { return &players; } +std::unordered_set* PlayerTeam::getPlayers() { return &players; } -std::wstring PlayerTeam::getPrefix() { return prefix; } +std::string PlayerTeam::getPrefix() { return prefix; } -void PlayerTeam::setPrefix(const std::wstring& prefix) { +void PlayerTeam::setPrefix(const std::string& prefix) { // if (prefix == null) throw new IllegalArgumentException("Prefix cannot be // null"); this->prefix = prefix; scoreboard->onTeamChanged(this); } -std::wstring PlayerTeam::getSuffix() { return suffix; } +std::string PlayerTeam::getSuffix() { return suffix; } -void PlayerTeam::setSuffix(const std::wstring& suffix) { +void PlayerTeam::setSuffix(const std::string& suffix) { // if (suffix == null) throw new IllegalArgumentException("Suffix cannot be // null"); this->suffix = suffix; scoreboard->onTeamChanged(this); } -std::wstring PlayerTeam::getFormattedName(const std::wstring& teamMemberName) { +std::string PlayerTeam::getFormattedName(const std::string& teamMemberName) { return getPrefix() + teamMemberName + getSuffix(); } -std::wstring PlayerTeam::formatNameForTeam(PlayerTeam* team) { +std::string PlayerTeam::formatNameForTeam(PlayerTeam* team) { return formatNameForTeam(team, team->getDisplayName()); } -std::wstring PlayerTeam::formatNameForTeam(Team* team, - const std::wstring& name) { +std::string PlayerTeam::formatNameForTeam(Team* team, + const std::string& name) { if (team == nullptr) return name; return team->getFormattedName(name); } diff --git a/targets/minecraft/world/scores/PlayerTeam.h b/targets/minecraft/world/scores/PlayerTeam.h index 2178b19f5..39ad670c4 100644 --- a/targets/minecraft/world/scores/PlayerTeam.h +++ b/targets/minecraft/world/scores/PlayerTeam.h @@ -19,29 +19,29 @@ private: static const int BIT_SEE_INVISIBLES = 1; Scoreboard* scoreboard; - std::wstring name; - std::unordered_set players; - std::wstring displayName; - std::wstring prefix; - std::wstring suffix; + std::string name; + std::unordered_set players; + std::string displayName; + std::string prefix; + std::string suffix; bool allowFriendlyFire; bool seeFriendlyInvisibles; public: - PlayerTeam(Scoreboard* scoreboard, const std::wstring& name); + PlayerTeam(Scoreboard* scoreboard, const std::string& name); Scoreboard* getScoreboard(); - std::wstring getName(); - std::wstring getDisplayName(); - void setDisplayName(const std::wstring& displayName); - std::unordered_set* getPlayers(); - std::wstring getPrefix(); - void setPrefix(const std::wstring& prefix); - std::wstring getSuffix(); - void setSuffix(const std::wstring& suffix); - std::wstring getFormattedName(const std::wstring& teamMemberName); - static std::wstring formatNameForTeam(PlayerTeam* team); - static std::wstring formatNameForTeam(Team* team, const std::wstring& name); + std::string getName(); + std::string getDisplayName(); + void setDisplayName(const std::string& displayName); + std::unordered_set* getPlayers(); + std::string getPrefix(); + void setPrefix(const std::string& prefix); + std::string getSuffix(); + void setSuffix(const std::string& suffix); + std::string getFormattedName(const std::string& teamMemberName); + static std::string formatNameForTeam(PlayerTeam* team); + static std::string formatNameForTeam(Team* team, const std::string& name); bool isAllowFriendlyFire(); void setAllowFriendlyFire(bool allowFriendlyFire); bool canSeeFriendlyInvisibles(); diff --git a/targets/minecraft/world/scores/Score.cpp b/targets/minecraft/world/scores/Score.cpp index c280691cc..4f20676a5 100644 --- a/targets/minecraft/world/scores/Score.cpp +++ b/targets/minecraft/world/scores/Score.cpp @@ -7,7 +7,7 @@ class Player; Score::Score(Scoreboard* scoreboard, Objective* objective, - const std::wstring& owner) { + const std::string& owner) { this->scoreboard = scoreboard; this->objective = objective; this->owner = owner; @@ -48,7 +48,7 @@ void Score::setScore(int score) { Objective* Score::getObjective() { return objective; } -std::wstring Score::getOwner() { return owner; } +std::string Score::getOwner() { return owner; } Scoreboard* Score::getScoreboard() { return scoreboard; } diff --git a/targets/minecraft/world/scores/Score.h b/targets/minecraft/world/scores/Score.h index ed03e04e1..a9e9ac09d 100644 --- a/targets/minecraft/world/scores/Score.h +++ b/targets/minecraft/world/scores/Score.h @@ -15,12 +15,12 @@ public: private: Scoreboard* scoreboard; Objective* objective; - std::wstring owner; + std::string owner; int count; public: Score(Scoreboard* scoreboard, Objective* objective, - const std::wstring& owner); + const std::string& owner); void add(int count); void remove(int count); @@ -29,7 +29,7 @@ public: int getScore(); void setScore(int score); Objective* getObjective(); - std::wstring getOwner(); + std::string getOwner(); Scoreboard* getScoreboard(); void updateFor(std::vector >* players); }; \ No newline at end of file diff --git a/targets/minecraft/world/scores/Scoreboard.cpp b/targets/minecraft/world/scores/Scoreboard.cpp index af12ee670..6162a5eb0 100644 --- a/targets/minecraft/world/scores/Scoreboard.cpp +++ b/targets/minecraft/world/scores/Scoreboard.cpp @@ -2,12 +2,12 @@ class Player; -Objective* Scoreboard::getObjective(const std::wstring& name) { +Objective* Scoreboard::getObjective(const std::string& name) { return nullptr; // return objectivesByName.find(name)->second; } -Objective* Scoreboard::addObjective(const std::wstring& name, +Objective* Scoreboard::addObjective(const std::string& name, ObjectiveCriteria* criteria) { return nullptr; // Objective *objective = getObjective(name); @@ -48,7 +48,7 @@ std::vector* Scoreboard::findObjectiveFor( // vector(objectives); } -Score* Scoreboard::getPlayerScore(const std::wstring& name, +Score* Scoreboard::getPlayerScore(const std::string& name, Objective* objective) { return nullptr; // unordered_map *scores = @@ -91,12 +91,12 @@ std::vector* Scoreboard::getObjectives() { // return objectivesByName.values(); } -std::vector* Scoreboard::getTrackedPlayers() { +std::vector* Scoreboard::getTrackedPlayers() { return nullptr; // return playerScores.keySet(); } -void Scoreboard::resetPlayerScore(const std::wstring& player) { +void Scoreboard::resetPlayerScore(const std::string& player) { // unordered_map *removed = // playerScores.remove(player); @@ -133,7 +133,7 @@ std::vector* Scoreboard::getScores(Objective* objective) { } std::unordered_map* Scoreboard::getPlayerScores( - const std::wstring& player) { + const std::string& player) { return nullptr; // Map result = playerScores.get(player); // if (result == null) result = new HashMap(); @@ -167,12 +167,12 @@ Objective* Scoreboard::getDisplayObjective(int slot) { // return displayObjectives[slot]; } -PlayerTeam* Scoreboard::getPlayerTeam(const std::wstring& name) { +PlayerTeam* Scoreboard::getPlayerTeam(const std::string& name) { return nullptr; // return teamsByName.get(name); } -PlayerTeam* Scoreboard::addPlayerTeam(const std::wstring& name) { +PlayerTeam* Scoreboard::addPlayerTeam(const std::string& name) { return nullptr; // PlayerTeam team = getPlayerTeam(name); // if (team != null) throw new IllegalArgumentException("An objective with @@ -197,7 +197,7 @@ void Scoreboard::removePlayerTeam(PlayerTeam* team) { // onTeamRemoved(team); } -void Scoreboard::addPlayerToTeam(const std::wstring& player, PlayerTeam* team) { +void Scoreboard::addPlayerToTeam(const std::string& player, PlayerTeam* team) { // if (getPlayersTeam(player) != null) { // removePlayerFromTeam(player); // } @@ -206,7 +206,7 @@ void Scoreboard::addPlayerToTeam(const std::wstring& player, PlayerTeam* team) { // team.getPlayers().add(player); } -bool Scoreboard::removePlayerFromTeam(const std::wstring& player) { +bool Scoreboard::removePlayerFromTeam(const std::string& player) { return false; // PlayerTeam team = getPlayersTeam(player); @@ -218,7 +218,7 @@ bool Scoreboard::removePlayerFromTeam(const std::wstring& player) { // } } -void Scoreboard::removePlayerFromTeam(const std::wstring& player, +void Scoreboard::removePlayerFromTeam(const std::string& player, PlayerTeam* team) { // if (getPlayersTeam(player) != team) { // throw new IllegalStateException("Player is either on another team or not @@ -229,7 +229,7 @@ void Scoreboard::removePlayerFromTeam(const std::wstring& player, // team.getPlayers().remove(player); } -std::vector* Scoreboard::getTeamNames() { +std::vector* Scoreboard::getTeamNames() { return nullptr; // return teamsByName.keySet(); } @@ -239,12 +239,12 @@ std::vector* Scoreboard::getPlayerTeams() { // return teamsByName.values(); } -std::shared_ptr Scoreboard::getPlayer(const std::wstring& name) { +std::shared_ptr Scoreboard::getPlayer(const std::string& name) { return nullptr; // return MinecraftServer.getInstance().getPlayers().getPlayer(name); } -PlayerTeam* Scoreboard::getPlayersTeam(const std::wstring& name) { +PlayerTeam* Scoreboard::getPlayersTeam(const std::string& name) { return nullptr; // return teamsByPlayer.get(name); } @@ -257,7 +257,7 @@ void Scoreboard::onObjectiveRemoved(Objective* objective) {} void Scoreboard::onScoreChanged(Score* score) {} -void Scoreboard::onPlayerRemoved(const std::wstring& player) {} +void Scoreboard::onPlayerRemoved(const std::string& player) {} void Scoreboard::onTeamAdded(PlayerTeam* team) {} @@ -265,20 +265,20 @@ void Scoreboard::onTeamChanged(PlayerTeam* team) {} void Scoreboard::onTeamRemoved(PlayerTeam* team) {} -std::wstring Scoreboard::getDisplaySlotName(int slot) { +std::string Scoreboard::getDisplaySlotName(int slot) { switch (slot) { case DISPLAY_SLOT_LIST: - return L"list"; + return "list"; case DISPLAY_SLOT_SIDEBAR: - return L"sidebar"; + return "sidebar"; case DISPLAY_SLOT_BELOW_NAME: - return L"belowName"; + return "belowName"; default: - return L""; + return ""; } } -int Scoreboard::getDisplaySlotByName(const std::wstring& name) { +int Scoreboard::getDisplaySlotByName(const std::string& name) { return -1; // if (name.equalsIgnoreCase("list")) //{ diff --git a/targets/minecraft/world/scores/Scoreboard.h b/targets/minecraft/world/scores/Scoreboard.h index 68f36d985..c2a1fd48f 100644 --- a/targets/minecraft/world/scores/Scoreboard.h +++ b/targets/minecraft/world/scores/Scoreboard.h @@ -21,50 +21,50 @@ public: static const int DISPLAY_SLOTS = 3; private: - std::unordered_map objectivesByName; + std::unordered_map objectivesByName; std::unordered_map*> objectivesByCriteria; - std::unordered_map > + std::unordered_map > playerScores; Objective* displayObjectives[DISPLAY_SLOTS]; - std::unordered_map teamsByName; - std::unordered_map teamsByPlayer; + std::unordered_map teamsByName; + std::unordered_map teamsByPlayer; public: - Objective* getObjective(const std::wstring& name); - Objective* addObjective(const std::wstring& name, + Objective* getObjective(const std::string& name); + Objective* addObjective(const std::string& name, ObjectiveCriteria* criteria); std::vector* findObjectiveFor(ObjectiveCriteria* criteria); - Score* getPlayerScore(const std::wstring& name, Objective* objective); + Score* getPlayerScore(const std::string& name, Objective* objective); std::vector* getPlayerScores(Objective* objective); std::vector* getObjectives(); - std::vector* getTrackedPlayers(); - void resetPlayerScore(const std::wstring& player); + std::vector* getTrackedPlayers(); + void resetPlayerScore(const std::string& player); std::vector* getScores(); std::vector* getScores(Objective* objective); std::unordered_map* getPlayerScores( - const std::wstring& player); + const std::string& player); void removeObjective(Objective* objective); void setDisplayObjective(int slot, Objective* objective); Objective* getDisplayObjective(int slot); - PlayerTeam* getPlayerTeam(const std::wstring& name); - PlayerTeam* addPlayerTeam(const std::wstring& name); + PlayerTeam* getPlayerTeam(const std::string& name); + PlayerTeam* addPlayerTeam(const std::string& name); void removePlayerTeam(PlayerTeam* team); - void addPlayerToTeam(const std::wstring& player, PlayerTeam* team); - bool removePlayerFromTeam(const std::wstring& player); - void removePlayerFromTeam(const std::wstring& player, PlayerTeam* team); - std::vector* getTeamNames(); + void addPlayerToTeam(const std::string& player, PlayerTeam* team); + bool removePlayerFromTeam(const std::string& player); + void removePlayerFromTeam(const std::string& player, PlayerTeam* team); + std::vector* getTeamNames(); std::vector* getPlayerTeams(); - std::shared_ptr getPlayer(const std::wstring& name); - PlayerTeam* getPlayersTeam(const std::wstring& name); + std::shared_ptr getPlayer(const std::string& name); + PlayerTeam* getPlayersTeam(const std::string& name); void onObjectiveAdded(Objective* objective); void onObjectiveChanged(Objective* objective); void onObjectiveRemoved(Objective* objective); void onScoreChanged(Score* score); - void onPlayerRemoved(const std::wstring& player); + void onPlayerRemoved(const std::string& player); void onTeamAdded(PlayerTeam* team); void onTeamChanged(PlayerTeam* team); void onTeamRemoved(PlayerTeam* team); - static std::wstring getDisplaySlotName(int slot); - static int getDisplaySlotByName(const std::wstring& name); + static std::string getDisplaySlotName(int slot); + static int getDisplaySlotByName(const std::string& name); }; \ No newline at end of file diff --git a/targets/minecraft/world/scores/Team.h b/targets/minecraft/world/scores/Team.h index f2ce3c037..e29ac65c4 100644 --- a/targets/minecraft/world/scores/Team.h +++ b/targets/minecraft/world/scores/Team.h @@ -6,9 +6,9 @@ class Team { public: virtual bool isAlliedTo(Team* other); - virtual std::wstring getName() = 0; - virtual std::wstring getFormattedName( - const std::wstring& teamMemberName) = 0; + virtual std::string getName() = 0; + virtual std::string getFormattedName( + const std::string& teamMemberName) = 0; virtual bool canSeeFriendlyInvisibles() = 0; virtual bool isAllowFriendlyFire() = 0; }; \ No newline at end of file diff --git a/targets/minecraft/world/scores/criteria/DummyCriteria.cpp b/targets/minecraft/world/scores/criteria/DummyCriteria.cpp index 2fadcf7fb..99fc2f1f9 100644 --- a/targets/minecraft/world/scores/criteria/DummyCriteria.cpp +++ b/targets/minecraft/world/scores/criteria/DummyCriteria.cpp @@ -4,12 +4,12 @@ #include "minecraft/world/scores/criteria/ObjectiveCriteria.h" -DummyCriteria::DummyCriteria(const std::wstring& name) { +DummyCriteria::DummyCriteria(const std::string& name) { this->name = name; ObjectiveCriteria::CRITERIA_BY_NAME[name] = this; } -std::wstring DummyCriteria::getName() { return name; } +std::string DummyCriteria::getName() { return name; } int DummyCriteria::getScoreModifier( std::vector >* players) { diff --git a/targets/minecraft/world/scores/criteria/DummyCriteria.h b/targets/minecraft/world/scores/criteria/DummyCriteria.h index b1b5a59b2..befad2a84 100644 --- a/targets/minecraft/world/scores/criteria/DummyCriteria.h +++ b/targets/minecraft/world/scores/criteria/DummyCriteria.h @@ -6,12 +6,12 @@ class DummyCriteria : public ObjectiveCriteria { private: - std::wstring name; + std::string name; public: - DummyCriteria(const std::wstring& name); + DummyCriteria(const std::string& name); - virtual std::wstring getName(); + virtual std::string getName(); virtual int getScoreModifier( std::vector >* players); virtual bool isReadOnly(); diff --git a/targets/minecraft/world/scores/criteria/HealthCriteria.cpp b/targets/minecraft/world/scores/criteria/HealthCriteria.cpp index d6bfaca87..18e084f8a 100644 --- a/targets/minecraft/world/scores/criteria/HealthCriteria.cpp +++ b/targets/minecraft/world/scores/criteria/HealthCriteria.cpp @@ -7,7 +7,7 @@ #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/scores/criteria/DummyCriteria.h" -HealthCriteria::HealthCriteria(const std::wstring& id) : DummyCriteria(id) {} +HealthCriteria::HealthCriteria(const std::string& id) : DummyCriteria(id) {} int HealthCriteria::getScoreModifier( std::vector >* players) { diff --git a/targets/minecraft/world/scores/criteria/HealthCriteria.h b/targets/minecraft/world/scores/criteria/HealthCriteria.h index 6c6825bf4..99eba254b 100644 --- a/targets/minecraft/world/scores/criteria/HealthCriteria.h +++ b/targets/minecraft/world/scores/criteria/HealthCriteria.h @@ -6,7 +6,7 @@ class HealthCriteria : public DummyCriteria { public: - HealthCriteria(const std::wstring& id); + HealthCriteria(const std::string& id); int getScoreModifier(std::vector >* players); bool isReadOnly(); diff --git a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp index 7a0c551ce..31abd4ca3 100644 --- a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp +++ b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.cpp @@ -3,14 +3,14 @@ #include "minecraft/world/scores/criteria/DummyCriteria.h" #include "minecraft/world/scores/criteria/HealthCriteria.h" -std::unordered_map +std::unordered_map ObjectiveCriteria::CRITERIA_BY_NAME; -ObjectiveCriteria* ObjectiveCriteria::DUMMY = new DummyCriteria(L"dummy"); +ObjectiveCriteria* ObjectiveCriteria::DUMMY = new DummyCriteria("dummy"); ObjectiveCriteria* ObjectiveCriteria::DEATH_COUNT = - new DummyCriteria(L"deathCount"); + new DummyCriteria("deathCount"); ObjectiveCriteria* ObjectiveCriteria::KILL_COUNT_PLAYERS = - new DummyCriteria(L"playerKillCount"); + new DummyCriteria("playerKillCount"); ObjectiveCriteria* ObjectiveCriteria::KILL_COUNT_ALL = - new DummyCriteria(L"totalKillCount"); -ObjectiveCriteria* ObjectiveCriteria::HEALTH = new HealthCriteria(L"health"); \ No newline at end of file + new DummyCriteria("totalKillCount"); +ObjectiveCriteria* ObjectiveCriteria::HEALTH = new HealthCriteria("health"); \ No newline at end of file diff --git a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.h b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.h index 798765b65..828fbc243 100644 --- a/targets/minecraft/world/scores/criteria/ObjectiveCriteria.h +++ b/targets/minecraft/world/scores/criteria/ObjectiveCriteria.h @@ -9,7 +9,7 @@ class Player; class ObjectiveCriteria { public: - static std::unordered_map + static std::unordered_map CRITERIA_BY_NAME; static ObjectiveCriteria* DUMMY; @@ -18,7 +18,7 @@ public: static ObjectiveCriteria* KILL_COUNT_ALL; static ObjectiveCriteria* HEALTH; - virtual std::wstring getName() = 0; + virtual std::string getName() = 0; virtual int getScoreModifier( std::vector >* players) = 0; virtual bool isReadOnly() = 0; diff --git a/targets/nbt/include/nbt/ByteArrayTag.h b/targets/nbt/include/nbt/ByteArrayTag.h index 70a3d4516..d5409c018 100644 --- a/targets/nbt/include/nbt/ByteArrayTag.h +++ b/targets/nbt/include/nbt/ByteArrayTag.h @@ -7,8 +7,8 @@ public: std::vector data; bool m_ownData; - ByteArrayTag(const std::wstring& name) : Tag(name) { m_ownData = false; } - ByteArrayTag(const std::wstring& name, std::vector& data, + ByteArrayTag(const std::string& name) : Tag(name) { m_ownData = false; } + ByteArrayTag(const std::string& name, std::vector& data, bool ownData = false) : Tag(name) { this->data = data; @@ -30,10 +30,10 @@ public: uint8_t getId() { return TAG_Byte_Array; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"[%d bytes]", data.size()); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "[%d bytes]", data.size()); + return std::string(buf); } bool equals(Tag* obj) { diff --git a/targets/nbt/include/nbt/ByteTag.h b/targets/nbt/include/nbt/ByteTag.h index 33d8929ba..3ebad7b71 100644 --- a/targets/nbt/include/nbt/ByteTag.h +++ b/targets/nbt/include/nbt/ByteTag.h @@ -4,8 +4,8 @@ class ByteTag : public Tag { public: uint8_t data; - ByteTag(const std::wstring& name) : Tag(name) {} - ByteTag(const std::wstring& name, uint8_t data) : Tag(name) { + ByteTag(const std::string& name) : Tag(name) {} + ByteTag(const std::string& name, uint8_t data) : Tag(name) { this->data = data; } @@ -13,10 +13,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readByte(); } uint8_t getId() { return TAG_Byte; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%d", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%d", data); + return std::string(buf); } bool equals(Tag* obj) { diff --git a/targets/nbt/include/nbt/CompoundTag.h b/targets/nbt/include/nbt/CompoundTag.h index 347b1f3e5..8169a5cbe 100644 --- a/targets/nbt/include/nbt/CompoundTag.h +++ b/targets/nbt/include/nbt/CompoundTag.h @@ -16,11 +16,11 @@ class CompoundTag : public Tag { private: - std::flat_map> tags; + std::flat_map> tags; public: - CompoundTag() : Tag(L"") {} - CompoundTag(const std::wstring& name) : Tag(name) {} + CompoundTag() : Tag("") {} + CompoundTag(const std::string& name) : Tag(name) {} void write(DataOutput* dos) { for (auto&& [key, value] : tags) { @@ -57,121 +57,121 @@ public: uint8_t getId() { return TAG_Compound; } - void put(const std::wstring& name, Tag* tag) { + void put(const std::string& name, Tag* tag) { tag->setName(name); tags[name] = std::unique_ptr(tag); } - void putByte(const std::wstring& name, uint8_t value) { + void putByte(const std::string& name, uint8_t value) { tags[name] = std::make_unique(name, value); } - void putShort(const std::wstring& name, short value) { + void putShort(const std::string& name, short value) { tags[name] = std::make_unique(name, value); } - void putInt(const std::wstring& name, int value) { + void putInt(const std::string& name, int value) { tags[name] = std::make_unique(name, value); } - void putLong(const std::wstring& name, int64_t value) { + void putLong(const std::string& name, int64_t value) { tags[name] = std::make_unique(name, value); } - void putFloat(const std::wstring& name, float value) { + void putFloat(const std::string& name, float value) { tags[name] = std::make_unique(name, value); } - void putDouble(const std::wstring& name, double value) { + void putDouble(const std::string& name, double value) { tags[name] = std::make_unique(name, value); } - void putString(const std::wstring& name, const std::wstring& value) { + void putString(const std::string& name, const std::string& value) { tags[name] = std::make_unique(name, value); } - void putByteArray(const std::wstring& name, std::vector& value) { + void putByteArray(const std::string& name, std::vector& value) { tags[name] = std::make_unique(name, value); } - void putIntArray(const std::wstring& name, std::vector& value) { + void putIntArray(const std::string& name, std::vector& value) { tags[name] = std::make_unique(name, value); } - void putCompound(const std::wstring& name, CompoundTag* value) { + void putCompound(const std::string& name, CompoundTag* value) { value->setName(name); tags[name] = std::unique_ptr(value); } - void putBoolean(const std::wstring& name, bool val) { + void putBoolean(const std::string& name, bool val) { putByte(name, val ? (uint8_t)1 : 0); } - Tag* get(const std::wstring& name) { + Tag* get(const std::string& name) { auto it = tags.find(name); if (it != tags.end()) return it->second.get(); return nullptr; } - bool contains(const std::wstring& name) { + bool contains(const std::string& name) { return tags.find(name) != tags.end(); } - uint8_t getByte(const std::wstring& name) { + uint8_t getByte(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - short getShort(const std::wstring& name) { + short getShort(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - int getInt(const std::wstring& name) { + int getInt(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - int64_t getLong(const std::wstring& name) { + int64_t getLong(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - float getFloat(const std::wstring& name) { + float getFloat(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - double getDouble(const std::wstring& name) { + double getDouble(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return 0; return static_cast(it->second.get())->data; } - std::wstring getString(const std::wstring& name) { + std::string getString(const std::string& name) { auto it = tags.find(name); - if (it == tags.end()) return std::wstring(L""); + if (it == tags.end()) return std::string(""); return static_cast(it->second.get())->data; } - std::vector getByteArray(const std::wstring& name) { + std::vector getByteArray(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return std::vector(); return static_cast(it->second.get())->data; } - std::vector getIntArray(const std::wstring& name) { + std::vector getIntArray(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) return std::vector(); return static_cast(it->second.get())->data; } - CompoundTag* getCompound(const std::wstring& name) { + CompoundTag* getCompound(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) { auto [it2, inserted] = @@ -181,7 +181,7 @@ public: return static_cast(it->second.get()); } - ListTag* getList(const std::wstring& name) { + ListTag* getList(const std::string& name) { auto it = tags.find(name); if (it == tags.end()) { auto [it2, inserted] = @@ -191,15 +191,15 @@ public: return static_cast*>(it->second.get()); } - bool getBoolean(const std::wstring& string) { return getByte(string) != 0; } + bool getBoolean(const std::string& string) { return getByte(string) != 0; } - void remove(const std::wstring& name) { tags.erase(name); } + void remove(const std::string& name) { tags.erase(name); } - std::wstring toString() { + std::string toString() { static const int bufSize = 32; - static wchar_t buf[bufSize]; - swprintf(buf, bufSize, L"%zu entries", tags.size()); - return std::wstring(buf); + static char buf[bufSize]; + snprintf(buf, bufSize, "%zu entries", tags.size()); + return std::string(buf); } void print(char* prefix, std::ostream out) { diff --git a/targets/nbt/include/nbt/DoubleTag.h b/targets/nbt/include/nbt/DoubleTag.h index 327a41e4a..fa3b591eb 100644 --- a/targets/nbt/include/nbt/DoubleTag.h +++ b/targets/nbt/include/nbt/DoubleTag.h @@ -5,8 +5,8 @@ class DoubleTag : public Tag { public: double data; - DoubleTag(const std::wstring& name) : Tag(name) {} - DoubleTag(const std::wstring& name, double data) : Tag(name) { + DoubleTag(const std::string& name) : Tag(name) {} + DoubleTag(const std::string& name, double data) : Tag(name) { this->data = data; } @@ -14,10 +14,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readDouble(); } uint8_t getId() { return TAG_Double; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%f", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%f", data); + return std::string(buf); } Tag* copy() { return new DoubleTag(getName(), data); } diff --git a/targets/nbt/include/nbt/EndTag.h b/targets/nbt/include/nbt/EndTag.h index 94b87c7e6..19e568ae6 100644 --- a/targets/nbt/include/nbt/EndTag.h +++ b/targets/nbt/include/nbt/EndTag.h @@ -3,14 +3,14 @@ class EndTag : public Tag { public: - EndTag() : Tag(L"") {} - EndTag(const std::wstring& name) : Tag(name) {} + EndTag() : Tag("") {} + EndTag(const std::string& name) : Tag(name) {} void load(DataInput* dis, int tagDepth) {}; void write(DataOutput* dos) {}; uint8_t getId() { return TAG_End; } - std::wstring toString() { return std::wstring(L"END"); } + std::string toString() { return std::string("END"); } Tag* copy() { return new EndTag(); } diff --git a/targets/nbt/include/nbt/FloatTag.h b/targets/nbt/include/nbt/FloatTag.h index ab7096d49..f8ee81b1a 100644 --- a/targets/nbt/include/nbt/FloatTag.h +++ b/targets/nbt/include/nbt/FloatTag.h @@ -5,8 +5,8 @@ class FloatTag : public Tag { public: float data; - FloatTag(const std::wstring& name) : Tag(name) {} - FloatTag(const std::wstring& name, float data) : Tag(name) { + FloatTag(const std::string& name) : Tag(name) {} + FloatTag(const std::string& name, float data) : Tag(name) { this->data = data; } @@ -14,10 +14,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readFloat(); } uint8_t getId() { return TAG_Float; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%f", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%f", data); + return std::string(buf); } Tag* copy() { return new FloatTag(getName(), data); } diff --git a/targets/nbt/include/nbt/IntArrayTag.h b/targets/nbt/include/nbt/IntArrayTag.h index f90fb295e..7c2525b7e 100644 --- a/targets/nbt/include/nbt/IntArrayTag.h +++ b/targets/nbt/include/nbt/IntArrayTag.h @@ -7,11 +7,11 @@ class IntArrayTag : public Tag { public: std::vector data; - IntArrayTag(const std::wstring& name) : Tag(name) { + IntArrayTag(const std::string& name) : Tag(name) { data = std::vector(); } - IntArrayTag(const std::wstring& name, const std::vector& data) + IntArrayTag(const std::string& name, const std::vector& data) : Tag(name) { this->data = data; } @@ -34,10 +34,10 @@ public: uint8_t getId() { return TAG_Int_Array; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"[%d bytes]", data.size()); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "[%d bytes]", data.size()); + return std::string(buf); } bool equals(Tag* obj) { diff --git a/targets/nbt/include/nbt/IntTag.h b/targets/nbt/include/nbt/IntTag.h index 5da7fb233..e7aaa2610 100644 --- a/targets/nbt/include/nbt/IntTag.h +++ b/targets/nbt/include/nbt/IntTag.h @@ -4,8 +4,8 @@ class IntTag : public Tag { public: int data; - IntTag(const std::wstring& name) : Tag(name) {} - IntTag(const std::wstring& name, int data) : Tag(name) { + IntTag(const std::string& name) : Tag(name) {} + IntTag(const std::string& name, int data) : Tag(name) { this->data = data; } @@ -13,10 +13,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readInt(); } uint8_t getId() { return TAG_Int; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%d", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%d", data); + return std::string(buf); } Tag* copy() { return new IntTag(getName(), data); } diff --git a/targets/nbt/include/nbt/ListTag.h b/targets/nbt/include/nbt/ListTag.h index 84308295a..5f123e4ae 100644 --- a/targets/nbt/include/nbt/ListTag.h +++ b/targets/nbt/include/nbt/ListTag.h @@ -12,8 +12,8 @@ private: uint8_t type; public: - ListTag() : Tag(L"") {} - ListTag(const std::wstring& name) : Tag(name) {} + ListTag() : Tag("") {} + ListTag(const std::string& name) : Tag(name) {} void write(DataOutput* dos) { if (list.size() > 0) @@ -40,7 +40,7 @@ public: list.clear(); for (int i = 0; i < size; i++) { - std::unique_ptr tag(Tag::newTag(type, L"")); + std::unique_ptr tag(Tag::newTag(type, "")); tag->load(dis, tagDepth); list.push_back(std::move(tag)); } @@ -48,14 +48,14 @@ public: uint8_t getId() { return TAG_List; } - std::wstring toString() { - static wchar_t buf[64]; - swprintf(buf, 64, L"%zu entries of type %ls", list.size(), + std::string toString() { + static char buf[64]; + snprintf(buf, 64, "%zu entries of type %s", list.size(), Tag::getTagName(type)); - return std::wstring(buf); + return std::string(buf); } - void print(char* prefix, std::wostream& out) { + void print(char* prefix, std::ostream& out) { Tag::print(prefix, out); out << prefix << "{" << std::endl; @@ -77,7 +77,7 @@ public: // this but this seems the least invasive, most complete fix (covers // other items that also use list tags and require equality checks to // work) considering we can't change the write/load functions. - tag->setName(L""); + tag->setName(""); list.push_back(std::unique_ptr(tag)); } diff --git a/targets/nbt/include/nbt/LongTag.h b/targets/nbt/include/nbt/LongTag.h index 5e8018669..9af3b75d0 100644 --- a/targets/nbt/include/nbt/LongTag.h +++ b/targets/nbt/include/nbt/LongTag.h @@ -4,8 +4,8 @@ class LongTag : public Tag { public: int64_t data; - LongTag(const std::wstring& name) : Tag(name) {} - LongTag(const std::wstring& name, int64_t data) : Tag(name) { + LongTag(const std::string& name) : Tag(name) {} + LongTag(const std::string& name, int64_t data) : Tag(name) { this->data = data; } @@ -13,10 +13,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readLong(); } uint8_t getId() { return TAG_Long; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%I64d", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%I64d", data); + return std::string(buf); } Tag* copy() { return new LongTag(getName(), data); } diff --git a/targets/nbt/include/nbt/ShortTag.h b/targets/nbt/include/nbt/ShortTag.h index e47b99341..8324b3de0 100644 --- a/targets/nbt/include/nbt/ShortTag.h +++ b/targets/nbt/include/nbt/ShortTag.h @@ -4,8 +4,8 @@ class ShortTag : public Tag { public: short data; - ShortTag(const std::wstring& name) : Tag(name) {} - ShortTag(const std::wstring& name, int data) : Tag(name) { + ShortTag(const std::string& name) : Tag(name) {} + ShortTag(const std::string& name, int data) : Tag(name) { this->data = data; } @@ -13,10 +13,10 @@ public: void load(DataInput* dis, int tagDepth) { data = dis->readShort(); } uint8_t getId() { return TAG_Short; } - std::wstring toString() { - static wchar_t buf[32]; - swprintf(buf, 32, L"%d", data); - return std::wstring(buf); + std::string toString() { + static char buf[32]; + snprintf(buf, 32, "%d", data); + return std::string(buf); } Tag* copy() { return new ShortTag(getName(), data); } diff --git a/targets/nbt/include/nbt/StringTag.h b/targets/nbt/include/nbt/StringTag.h index a7b72eee3..3bb5fd63d 100644 --- a/targets/nbt/include/nbt/StringTag.h +++ b/targets/nbt/include/nbt/StringTag.h @@ -3,9 +3,9 @@ class StringTag : public Tag { public: - std::wstring data; - StringTag(const std::wstring& name) : Tag(name) {} - StringTag(const std::wstring& name, const std::wstring& data) : Tag(name) { + std::string data; + StringTag(const std::string& name) : Tag(name) {} + StringTag(const std::string& name, const std::string& data) : Tag(name) { this->data = data; } @@ -15,7 +15,7 @@ public: uint8_t getId() { return TAG_String; } - std::wstring toString() { return data; } + std::string toString() { return data; } Tag* copy() { return new StringTag(getName(), data); } diff --git a/targets/nbt/include/nbt/Tag.h b/targets/nbt/include/nbt/Tag.h index 200118f89..b515f76b8 100644 --- a/targets/nbt/include/nbt/Tag.h +++ b/targets/nbt/include/nbt/Tag.h @@ -26,25 +26,25 @@ public: static const int MAX_DEPTH = static_cast(512); private: - std::wstring name; + std::string name; protected: - Tag(const std::wstring& name); + Tag(const std::string& name); public: virtual void write(DataOutput* dos) = 0; virtual void load(DataInput* dis, int tagDepth) = 0; - virtual std::wstring toString() = 0; + virtual std::string toString() = 0; virtual uint8_t getId() = 0; void print(std::ostream& out); - void print(char* prefix, std::wostream& out); - std::wstring getName(); - Tag* setName(const std::wstring& name); + void print(char* prefix, std::ostream& out); + std::string getName(); + Tag* setName(const std::string& name); static Tag* readNamedTag(DataInput* dis); static Tag* readNamedTag(DataInput* dis, int tagDepth); static void writeNamedTag(Tag* tag, DataOutput* dos); - static Tag* newTag(uint8_t type, const std::wstring& name); - static const wchar_t* getTagName(uint8_t type); + static Tag* newTag(uint8_t type, const std::string& name); + static const char* getTagName(uint8_t type); virtual ~Tag() {} virtual bool equals(Tag* obj); // 4J Brought forward from 1.2 virtual Tag* copy() = 0; // 4J Brought foward from 1.2 diff --git a/targets/nbt/src/Tag.cpp b/targets/nbt/src/Tag.cpp index 06d7707e6..3e0158dc1 100644 --- a/targets/nbt/src/Tag.cpp +++ b/targets/nbt/src/Tag.cpp @@ -17,9 +17,9 @@ #include "nbt/ShortTag.h" #include "nbt/StringTag.h" -Tag::Tag(const std::wstring& name) { +Tag::Tag(const std::string& name) { if (name.empty()) { - this->name = L""; + this->name = ""; } else { this->name = name; } @@ -47,21 +47,21 @@ bool Tag::equals(Tag* obj) { void Tag::print(std::ostream& out) { out << ""; } -void Tag::print(char* prefix, std::wostream& out) { - std::wstring name = getName(); +void Tag::print(char* prefix, std::ostream& out) { + std::string name = getName(); out << prefix; out << getTagName(getId()); if (name.length() > 0) { - out << L"(\"" << name << L"\")"; + out << "(\"" << name << "\")"; } - out << L": "; + out << ": "; out << toString() << std::endl; } -std::wstring Tag::getName() { return name; } +std::string Tag::getName() { return name; } -Tag* Tag::setName(const std::wstring& name) { +Tag* Tag::setName(const std::string& name) { this->name = name; return this; } @@ -79,7 +79,7 @@ Tag* Tag::readNamedTag(DataInput* dis, int tagDepth) { return new EndTag(); } - std::wstring name = dis->readUTF(); // new String(bytes, "UTF-8"); + std::string name = dis->readUTF(); // new String(bytes, "UTF-8"); Tag* tag = newTag(type, name); // short length = dis.readShort(); @@ -102,7 +102,7 @@ void Tag::writeNamedTag(Tag* tag, DataOutput* dos) { tag->write(dos); } -Tag* Tag::newTag(uint8_t type, const std::wstring& name) { +Tag* Tag::newTag(uint8_t type, const std::string& name) { switch (type) { case TAG_End: return new EndTag(name); @@ -132,32 +132,32 @@ Tag* Tag::newTag(uint8_t type, const std::wstring& name) { return nullptr; } -const wchar_t* Tag::getTagName(uint8_t type) { +const char* Tag::getTagName(uint8_t type) { switch (type) { case TAG_End: - return L"TAG_End"; + return "TAG_End"; case TAG_Byte: - return L"TAG_Byte"; + return "TAG_Byte"; case TAG_Short: - return L"TAG_Short"; + return "TAG_Short"; case TAG_Int: - return L"TAG_Int"; + return "TAG_Int"; case TAG_Long: - return L"TAG_Long"; + return "TAG_Long"; case TAG_Float: - return L"TAG_Float"; + return "TAG_Float"; case TAG_Double: - return L"TAG_Double"; + return "TAG_Double"; case TAG_Byte_Array: - return L"TAG_Byte_Array"; + return "TAG_Byte_Array"; case TAG_Int_Array: - return L"TAG_Int_Array"; + return "TAG_Int_Array"; case TAG_String: - return L"TAG_String"; + return "TAG_String"; case TAG_List: - return L"TAG_List"; + return "TAG_List"; case TAG_Compound: - return L"TAG_Compound"; + return "TAG_Compound"; } - return L"UNKNOWN"; + return "UNKNOWN"; } \ No newline at end of file diff --git a/targets/platform/C4JThread.cpp b/targets/platform/C4JThread.cpp index 112b5b8b3..fc793bc93 100644 --- a/targets/platform/C4JThread.cpp +++ b/targets/platform/C4JThread.cpp @@ -87,16 +87,16 @@ void setThreadNamePlatform([[maybe_unused]] std::uint32_t threadId, if (threadId == static_cast(-1) || threadId == ::GetCurrentThreadId()) { using SetThreadDescriptionFn = int32_t(WINAPI*)(void*, PCWSTR); - const HMODULE kernel = ::GetModuleHandleW(L"Kernel32.dll"); + const HMODULE kernel = ::GetModuleHandleW("Kernel32.dll"); if (kernel) { const auto fn = reinterpret_cast( ::GetProcAddress(kernel, "SetThreadDescription")); if (fn) { - wchar_t wide[64]; - const auto n = std::mbstowcs( + char wide[64]; + const auto n = std::strncpy( wide, name, (sizeof(wide) / sizeof(wide[0])) - 1); if (n != static_cast(-1)) { - wide[n] = L'\0'; + wide[n] = '\0'; (void)fn(::GetCurrentThread(), wide); return; } diff --git a/targets/platform/IPlatformLeaderboard.h b/targets/platform/IPlatformLeaderboard.h index 90cdfb21f..f0f164ba9 100644 --- a/targets/platform/IPlatformLeaderboard.h +++ b/targets/platform/IPlatformLeaderboard.h @@ -137,7 +137,7 @@ public: PlayerUID m_uid; unsigned long m_rank; - std::wstring m_name; + std::string m_name; unsigned long m_totalScore; unsigned short m_statsSize; unsigned long m_statsData[STATSDATA_MAX]; diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h index ce5c682b3..742a8d383 100644 --- a/targets/platform/IPlatformNetwork.h +++ b/targets/platform/IPlatformNetwork.h @@ -115,8 +115,8 @@ public: int index) = 0; // Stats - [[nodiscard]] virtual std::wstring GatherStats() = 0; - [[nodiscard]] virtual std::wstring GatherRTTStats() = 0; + [[nodiscard]] virtual std::string GatherStats() = 0; + [[nodiscard]] virtual std::string GatherRTTStats() = 0; // Session internals virtual void SetSessionTexturePackParentId(int id) = 0; diff --git a/targets/platform/IPlatformSound.h b/targets/platform/IPlatformSound.h index 10a7b1d29..cb22aff11 100644 --- a/targets/platform/IPlatformSound.h +++ b/targets/platform/IPlatformSound.h @@ -21,7 +21,7 @@ public: virtual void playUI(int iSound, float volume, float pitch) = 0; // Streaming / music - virtual void playStreaming(const std::wstring& name, float x, float y, + virtual void playStreaming(const std::string& name, float x, float y, float z, float volume, float pitch, bool bMusicDelay = true) = 0; virtual void playMusicTick() = 0; @@ -30,9 +30,9 @@ public: virtual void updateSoundEffectVolume(float fVal) = 0; // Asset registration - virtual void add(const std::wstring& name, File* file) = 0; - virtual void addMusic(const std::wstring& name, File* file) = 0; - virtual void addStreaming(const std::wstring& name, File* file) = 0; - virtual char* ConvertSoundPathToName(const std::wstring& name, + virtual void add(const std::string& name, File* file) = 0; + virtual void addMusic(const std::string& name, File* file) = 0; + virtual void addStreaming(const std::string& name, File* file) = 0; + virtual char* ConvertSoundPathToName(const std::string& name, bool bConvertSpaces = false) = 0; }; diff --git a/targets/platform/IPlatformUIController.h b/targets/platform/IPlatformUIController.h index b968a561e..2223546c0 100644 --- a/targets/platform/IPlatformUIController.h +++ b/targets/platform/IPlatformUIController.h @@ -70,7 +70,7 @@ public: // HUD virtual void DisplayGamertag(unsigned int iPad, bool show) = 0; virtual void SetSelectedItem(unsigned int iPad, - const std::wstring& name) = 0; + const std::string& name) = 0; virtual void UpdateSelectedItemPos(unsigned int iPad) = 0; // Events diff --git a/targets/platform/NetTypes.h b/targets/platform/NetTypes.h index a57baee6d..8c31bcaa7 100644 --- a/targets/platform/NetTypes.h +++ b/targets/platform/NetTypes.h @@ -72,7 +72,7 @@ public: bool IsGuest(); bool IsLocal(); PlayerUID GetXuid(); - const wchar_t* GetGamertag(); + const char* GetGamertag(); int GetSessionIndex(); bool IsTalking(); bool IsMutedByLocalUser(uint32_t dwUserIndex); diff --git a/targets/platform/PlatformTypes.h b/targets/platform/PlatformTypes.h index 3ab7f3766..ee942a9b5 100644 --- a/targets/platform/PlatformTypes.h +++ b/targets/platform/PlatformTypes.h @@ -74,7 +74,7 @@ using XCONTENTDEVICEID = int; struct XCONTENT_DATA { XCONTENTDEVICEID DeviceID; std::uint32_t dwContentType; - wchar_t szDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; + char szDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; char szFileName[XCONTENT_MAX_FILENAME_LENGTH]; }; using PXCONTENT_DATA = XCONTENT_DATA*; @@ -85,7 +85,7 @@ struct XMARKETPLACE_CONTENTOFFER_INFO { std::uint64_t qwOfferID; std::uint64_t qwPreviewOfferID; std::uint32_t dwOfferNameLength; - wchar_t* wszOfferName; + char* wszOfferName; std::uint32_t dwOfferType; std::uint8_t contentId[XMARKETPLACE_CONTENT_ID_LEN]; bool fIsUnrestrictedLicense; @@ -93,12 +93,12 @@ struct XMARKETPLACE_CONTENTOFFER_INFO { std::uint32_t dwTitleID; std::uint32_t dwContentCategory; std::uint32_t dwTitleNameLength; - wchar_t* wszTitleName; + char* wszTitleName; bool fUserHasPurchased; std::uint32_t dwPackageSize; std::uint32_t dwInstallSize; std::uint32_t dwSellTextLength; - wchar_t* wszSellText; + char* wszSellText; std::uint32_t dwAssetID; std::uint32_t dwPurchaseQuantity; std::uint32_t dwPointsPrice; diff --git a/targets/platform/XboxStubs.h b/targets/platform/XboxStubs.h index e3030b358..2128afc87 100644 --- a/targets/platform/XboxStubs.h +++ b/targets/platform/XboxStubs.h @@ -50,10 +50,10 @@ bool IsEqualXUID(PlayerUID a, PlayerUID b); // XUI string table class CXuiStringTable { public: - const wchar_t* Lookup(const wchar_t* szId); - const wchar_t* Lookup(uint32_t nIndex); + const char* Lookup(const char* szId); + const char* Lookup(uint32_t nIndex); void Clear(); - int32_t Load(const wchar_t* szId); + int32_t Load(const char* szId); }; // User sign-in diff --git a/targets/platform/input/IPlatformInput.h b/targets/platform/input/IPlatformInput.h index 4fe09aa4e..506839170 100644 --- a/targets/platform/input/IPlatformInput.h +++ b/targets/platform/input/IPlatformInput.h @@ -80,8 +80,8 @@ public: [[nodiscard]] virtual int GetScrollDelta() = 0; // Keyboard - virtual EKeyboardResult RequestKeyboard(const wchar_t* Title, - const wchar_t* Text, int iPad, + virtual EKeyboardResult RequestKeyboard(const char* Title, + const char* Text, int iPad, unsigned int uiMaxChars, std::function callback, EKeyboardMode eMode) = 0; @@ -89,7 +89,7 @@ public: // String verification (TCR 92) virtual bool VerifyStrings( - wchar_t** pwStringA, int iStringC, + char** pwStringA, int iStringC, std::function callback) = 0; virtual void CancelQueuedVerifyStrings( std::function callback) = 0; diff --git a/targets/platform/input/sdl2/SDL2Input.cpp b/targets/platform/input/sdl2/SDL2Input.cpp index 58c44ed67..29348e951 100644 --- a/targets/platform/input/sdl2/SDL2Input.cpp +++ b/targets/platform/input/sdl2/SDL2Input.cpp @@ -645,7 +645,7 @@ void SDL2Input::SetDebugSequence(const char*, std::function) {} float SDL2Input::GetIdleSeconds(int) { return 0.f; } bool SDL2Input::IsPadConnected(int iPad) { return iPad == 0; } -EKeyboardResult SDL2Input::RequestKeyboard(const wchar_t*, const wchar_t*, int, +EKeyboardResult SDL2Input::RequestKeyboard(const char*, const char*, int, unsigned int, std::function callback, SDL2Input::EKeyboardMode) { @@ -660,7 +660,7 @@ bool SDL2Input::GetMenuDisplayed(int iPad) { return false; } const char* SDL2Input::GetText() { return s_textInputBuf.c_str(); } -bool SDL2Input::VerifyStrings(wchar_t**, int, +bool SDL2Input::VerifyStrings(char**, int, std::function) { return true; } diff --git a/targets/platform/input/sdl2/SDL2Input.h b/targets/platform/input/sdl2/SDL2Input.h index d39ef1490..e2be82f51 100644 --- a/targets/platform/input/sdl2/SDL2Input.h +++ b/targets/platform/input/sdl2/SDL2Input.h @@ -50,7 +50,7 @@ public: // Legacy keyboard request overloads with integer string-table ids used to // live here. The remaining public API keeps the direct text/callback form. - EKeyboardResult RequestKeyboard(const wchar_t* Title, const wchar_t* Text, + EKeyboardResult RequestKeyboard(const char* Title, const char* Text, int iPad, unsigned int uiMaxChars, std::function callback, SDL2Input::EKeyboardMode eMode); @@ -80,7 +80,7 @@ public: // communication is in-game text chat. // // Intent Protect players from inappropriate language. - bool VerifyStrings(wchar_t** pwStringA, int iStringC, + bool VerifyStrings(char** pwStringA, int iStringC, std::function callback); void CancelQueuedVerifyStrings( std::function callback); @@ -93,5 +93,5 @@ public: int GetPrimaryPad(); void SetPrimaryPad(int iPad); - // bool InputDetected(int userIndex, wchar_t* inputText); + // bool InputDetected(int userIndex, char* inputText); }; diff --git a/targets/platform/profile/IPlatformProfile.h b/targets/platform/profile/IPlatformProfile.h index dd7d428f6..64ab8591c 100644 --- a/targets/platform/profile/IPlatformProfile.h +++ b/targets/platform/profile/IPlatformProfile.h @@ -61,7 +61,7 @@ public: [[nodiscard]] virtual int GetPrimaryPad() = 0; virtual void SetPrimaryPad(int iPad) = 0; [[nodiscard]] virtual char* GetGamertag(int iPad) = 0; - [[nodiscard]] virtual std::wstring GetDisplayName(int iPad) = 0; + [[nodiscard]] virtual std::string GetDisplayName(int iPad) = 0; virtual void SetSignInChangeCallback( std::function callback) = 0; virtual void SetNotificationsCallback( diff --git a/targets/platform/profile/stub/StubProfile.cpp b/targets/platform/profile/stub/StubProfile.cpp index 1bc200e75..9b019e519 100644 --- a/targets/platform/profile/stub/StubProfile.cpp +++ b/targets/platform/profile/stub/StubProfile.cpp @@ -51,7 +51,7 @@ static_assert(sizeof(ProfileGameSettings) == 204, void* s_profileData[XUSER_MAX_COUNT] = {}; IPlatformProfile::PROFILESETTINGS s_dashboardSettings[XUSER_MAX_COUNT] = {}; char s_gamertags[XUSER_MAX_COUNT][16] = {}; -std::wstring s_displayNames[XUSER_MAX_COUNT]; +std::string s_displayNames[XUSER_MAX_COUNT]; int s_lockedProfile = 0; std::function s_defaultOptionsCallback; @@ -65,7 +65,7 @@ void ensureFakeIdentity(int iPad) { std::snprintf(s_gamertags[iPad], sizeof(s_gamertags[iPad]), "Player%d", iPad + 1); - s_displayNames[iPad] = std::wstring(L"Player") + std::to_wstring(iPad + 1); + s_displayNames[iPad] = std::string("Player") + std::to_string(iPad + 1); } void initialiseDefaultGameSettings(ProfileGameSettings* gameSettings) { @@ -157,7 +157,7 @@ char* StubProfile::GetGamertag(int iPad) { return s_gamertags[p]; } -std::wstring StubProfile::GetDisplayName(int iPad) { +std::string StubProfile::GetDisplayName(int iPad) { const int p = isValidPad(iPad) ? iPad : 0; ensureFakeIdentity(p); return s_displayNames[p]; diff --git a/targets/platform/profile/stub/StubProfile.h b/targets/platform/profile/stub/StubProfile.h index 5d7f65d68..ba04e8a5f 100644 --- a/targets/platform/profile/stub/StubProfile.h +++ b/targets/platform/profile/stub/StubProfile.h @@ -33,7 +33,7 @@ public: bool GetChatAndContentRestrictions(int iPad, bool* pbChatRestricted, bool* pbContentRestricted, int* piAge); char* GetGamertag(int iPad); - std::wstring GetDisplayName(int iPad); + std::string GetDisplayName(int iPad); int SetDefaultOptionsCallback( std::function callback); PROFILESETTINGS* GetDashboardProfileSettings(int iPad); diff --git a/targets/platform/renderer/IPlatformRenderer.h b/targets/platform/renderer/IPlatformRenderer.h index b613786f7..186843472 100644 --- a/targets/platform/renderer/IPlatformRenderer.h +++ b/targets/platform/renderer/IPlatformRenderer.h @@ -203,6 +203,6 @@ public: XSOCIAL_PREVIEWIMAGE* previewOut) = 0; // Events - virtual void BeginEvent(const wchar_t* eventName) = 0; + virtual void BeginEvent(const char* eventName) = 0; virtual void EndEvent() = 0; }; diff --git a/targets/platform/renderer/gl/GLRenderer.h b/targets/platform/renderer/gl/GLRenderer.h index d1ac862a4..7ca98ad15 100644 --- a/targets/platform/renderer/gl/GLRenderer.h +++ b/targets/platform/renderer/gl/GLRenderer.h @@ -139,7 +139,7 @@ public: void StateSetActiveTexture(int tex); // Event tracking - void BeginEvent(const wchar_t* eventName); + void BeginEvent(const char* eventName); void EndEvent(); // PLM event handling diff --git a/targets/platform/renderer/gl/render_stubs.cpp b/targets/platform/renderer/gl/render_stubs.cpp index 29d8c3d4f..b4dc08d4b 100644 --- a/targets/platform/renderer/gl/render_stubs.cpp +++ b/targets/platform/renderer/gl/render_stubs.cpp @@ -34,7 +34,7 @@ void GLRenderer::BeginConditionalSurvey(int) {} void GLRenderer::EndConditionalSurvey() {} void GLRenderer::BeginConditionalRendering(int) {} void GLRenderer::EndConditionalRendering() {} -void GLRenderer::BeginEvent(const wchar_t*) {} +void GLRenderer::BeginEvent(const char*) {} void GLRenderer::EndEvent() {} void GLRenderer::Tick() {} diff --git a/targets/platform/storage/IPlatformStorage.h b/targets/platform/storage/IPlatformStorage.h index 6f835a119..e65b86211 100644 --- a/targets/platform/storage/IPlatformStorage.h +++ b/targets/platform/storage/IPlatformStorage.h @@ -140,14 +140,14 @@ public: unsigned int uiFileSize; std::uint32_t dwType; std::uint32_t dwWchCount; - wchar_t wchFile[1]; + char wchFile[1]; }; using PDLC_FILE_DETAILS = DLC_FILE_DETAILS*; struct DLC_FILE_PARAM { std::uint32_t dwType; std::uint32_t dwWchCount; - wchar_t wchData[1]; + char wchData[1]; }; using PDLC_FILE_PARAM = DLC_FILE_PARAM*; @@ -156,7 +156,7 @@ public: // Lifecycle virtual void Tick() = 0; virtual void Init(unsigned int uiSaveVersion, - const wchar_t* pwchDefaultSaveName, char* pszSavePackName, + const char* pwchDefaultSaveName, char* pszSavePackName, int iMinimumSaveSize, std::function callback, const char* szGroupID) = 0; @@ -168,7 +168,7 @@ public: unsigned int uiOptionC, unsigned int pad = XUSER_INDEX_ANY, std::function callback = nullptr, C4JStringTable* pStringTable = nullptr, - wchar_t* pwchFormatString = nullptr, unsigned int focusButton = 0) = 0; + char* pwchFormatString = nullptr, unsigned int focusButton = 0) = 0; virtual EMessageResult GetMessageBoxResult() = 0; // Save device @@ -179,8 +179,8 @@ public: // Save game virtual void SetDefaultSaveNameForKeyboardDisplay( - const wchar_t* pwchDefaultSaveName) = 0; - virtual void SetSaveTitle(const wchar_t* pwchDefaultSaveName) = 0; + const char* pwchDefaultSaveName) = 0; + virtual void SetSaveTitle(const char* pwchDefaultSaveName) = 0; virtual bool GetSaveUniqueNumber(int* piVal) = 0; virtual bool GetSaveUniqueFilename(char* pszName) = 0; virtual void SetSaveUniqueFilename(char* szFilename) = 0; @@ -200,7 +200,7 @@ public: std::function callback) = 0; virtual void CopySaveDataToNewSave( std::uint8_t* pbThumbnail, unsigned int cbThumbnail, - wchar_t* wchNewName, std::function callback) = 0; + char* wchNewName, std::function callback) = 0; virtual ESaveGameState DoesSaveExist(bool* pbExists) = 0; virtual bool EnoughSpaceForAMinSaveGame() = 0; virtual void SetSaveMessageVPosition(float fY) = 0; @@ -260,16 +260,16 @@ public: // Title storage virtual ETMSStatus ReadTMSFile( int iQuadrant, eGlobalStorage eStorageFacility, eTMS_FileType eFileType, - wchar_t* pwchFilename, std::uint8_t** ppBuffer, + char* pwchFilename, std::uint8_t** ppBuffer, unsigned int* pBufferSize, - std::function callback = nullptr, + std::function callback = nullptr, int iAction = 0) = 0; virtual bool WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename, std::uint8_t* pBuffer, + char* pwchFilename, std::uint8_t* pBuffer, unsigned int bufferSize) = 0; virtual bool DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename) = 0; - virtual void StoreTMSPathName(wchar_t* pwchName = nullptr) = 0; + char* pwchFilename) = 0; + virtual void StoreTMSPathName(char* pwchName = nullptr) = 0; virtual ETMSStatus TMSPP_ReadFile( int iPad, eGlobalStorage eStorageFacility, eTMS_FILETYPEVAL eFileTypeVal, const char* szFilename, diff --git a/targets/platform/storage/stub/StubStorage.cpp b/targets/platform/storage/stub/StubStorage.cpp index f93fcf86e..cd4ff1300 100644 --- a/targets/platform/storage/stub/StubStorage.cpp +++ b/targets/platform/storage/stub/StubStorage.cpp @@ -20,7 +20,7 @@ StubStorage::EMessageResult StubStorage::RequestMessageBox( unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA, unsigned int uiOptionC, unsigned int pad, std::function callback, - C4JStringTable* pStringTable, wchar_t* pwchFormatString, + C4JStringTable* pStringTable, char* pwchFormatString, unsigned int focusButton) { return EMessage_ResultAccept; } @@ -35,14 +35,14 @@ bool StubStorage::SetSaveDevice(std::function callback, } void StubStorage::Init(unsigned int uiSaveVersion, - const wchar_t* pwchDefaultSaveName, char* pszSavePackName, + const char* pwchDefaultSaveName, char* pszSavePackName, int iMinimumSaveSize, std::function callback, const char* szGroupID) {} void StubStorage::ResetSaveData() {} void StubStorage::SetDefaultSaveNameForKeyboardDisplay( - const wchar_t* pwchDefaultSaveName) {} -void StubStorage::SetSaveTitle(const wchar_t* pwchDefaultSaveName) {} + const char* pwchDefaultSaveName) {} +void StubStorage::SetSaveTitle(const char* pwchDefaultSaveName) {} bool StubStorage::GetSaveUniqueNumber(int* piVal) { if (piVal) *piVal = 0; return true; @@ -74,7 +74,7 @@ StubStorage::ESaveGameState StubStorage::SaveSaveData( } void StubStorage::CopySaveDataToNewSave(std::uint8_t* pbThumbnail, unsigned int cbThumbnail, - wchar_t* wchNewName, + char* wchNewName, std::function callback) {} void StubStorage::SetSaveDeviceSelected(unsigned int uiPad, bool bSelected) {} bool StubStorage::GetSaveDeviceSelected(unsigned int iPad) { return true; } @@ -165,21 +165,21 @@ void StubStorage::GetMountedDLCFileList(const char* szMountDrive, std::string StubStorage::GetMountedPath(std::string szMount) { return ""; } StubStorage::ETMSStatus StubStorage::ReadTMSFile( int iQuadrant, eGlobalStorage eStorageFacility, - StubStorage::eTMS_FileType eFileType, wchar_t* pwchFilename, + StubStorage::eTMS_FileType eFileType, char* pwchFilename, std::uint8_t** ppBuffer, unsigned int* pBufferSize, - std::function callback, int iAction) { + std::function callback, int iAction) { return ETMSStatus_Fail; } bool StubStorage::WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename, std::uint8_t* pBuffer, + char* pwchFilename, std::uint8_t* pBuffer, unsigned int bufferSize) { return false; } bool StubStorage::DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename) { + char* pwchFilename) { return false; } -void StubStorage::StoreTMSPathName(wchar_t* pwchName) {} +void StubStorage::StoreTMSPathName(char* pwchName) {} StubStorage::ETMSStatus StubStorage::TMSPP_ReadFile( int iPad, StubStorage::eGlobalStorage eStorageFacility, StubStorage::eTMS_FILETYPEVAL eFileTypeVal, const char* szFilename, diff --git a/targets/platform/storage/stub/StubStorage.h b/targets/platform/storage/stub/StubStorage.h index f2c3c2797..ce0d57440 100644 --- a/targets/platform/storage/stub/StubStorage.h +++ b/targets/platform/storage/stub/StubStorage.h @@ -18,7 +18,7 @@ typedef std::vector XContentDataArray; class StubStorage : public IPlatformStorage { public: struct CACHEINFOSTRUCT { - wchar_t wchDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; + char wchDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; char szFileName[XCONTENT_MAX_FILENAME_LENGTH]; std::uint32_t dwImageOffset; std::uint32_t dwImageBytes; @@ -72,7 +72,7 @@ public: std::function callback = nullptr, C4JStringTable* pStringTable = nullptr, - wchar_t* pwchFormatString = nullptr, unsigned int focusButton = 0); + char* pwchFormatString = nullptr, unsigned int focusButton = 0); StubStorage::EMessageResult GetMessageBoxResult(); @@ -81,15 +81,15 @@ public: bool bForceResetOfSaveDevice = false); // savegame - void Init(unsigned int uiSaveVersion, const wchar_t* pwchDefaultSaveName, + void Init(unsigned int uiSaveVersion, const char* pwchDefaultSaveName, char* pszSavePackName, int iMinimumSaveSize, std::function callback, const char* szGroupID); void ResetSaveData(); // Call before a new save to clear out stored save // file name void SetDefaultSaveNameForKeyboardDisplay( - const wchar_t* pwchDefaultSaveName); - void SetSaveTitle(const wchar_t* pwchDefaultSaveName); + const char* pwchDefaultSaveName); + void SetSaveTitle(const char* pwchDefaultSaveName); bool GetSaveUniqueNumber(int* piVal); bool GetSaveUniqueFilename(char* pszName); void SetSaveUniqueFilename(char* szFilename); @@ -110,7 +110,7 @@ public: StubStorage::ESaveGameState SaveSaveData( std::function callback); void CopySaveDataToNewSave(std::uint8_t* pbThumbnail, - unsigned int cbThumbnail, wchar_t* wchNewName, + unsigned int cbThumbnail, char* wchNewName, std::function callback); void SetSaveDeviceSelected(unsigned int uiPad, bool bSelected); bool GetSaveDeviceSelected(unsigned int iPad); @@ -179,16 +179,16 @@ public: // Global title storage StubStorage::ETMSStatus ReadTMSFile( int iQuadrant, eGlobalStorage eStorageFacility, - StubStorage::eTMS_FileType eFileType, wchar_t* pwchFilename, + StubStorage::eTMS_FileType eFileType, char* pwchFilename, std::uint8_t** ppBuffer, unsigned int* pBufferSize, - std::function callback = nullptr, + std::function callback = nullptr, int iAction = 0); bool WriteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename, std::uint8_t* pBuffer, + char* pwchFilename, std::uint8_t* pBuffer, unsigned int bufferSize); bool DeleteTMSFile(int iQuadrant, eGlobalStorage eStorageFacility, - wchar_t* pwchFilename); - void StoreTMSPathName(wchar_t* pwchName = nullptr); + char* pwchFilename); + void StoreTMSPathName(char* pwchName = nullptr); // TMS++ #ifdef _XBOX diff --git a/targets/platform/stubs.h b/targets/platform/stubs.h index afaced233..5c2f47b4a 100644 --- a/targets/platform/stubs.h +++ b/targets/platform/stubs.h @@ -223,7 +223,7 @@ class ZipFile { public: ZipFile(File* file) {} InputStream* getInputStream(ZipEntry* entry) { return nullptr; } - ZipEntry* getEntry(const std::wstring& name) { return nullptr; } + ZipEntry* getEntry(const std::string& name) { return nullptr; } void close() {} }; @@ -237,7 +237,7 @@ public: static void create() {} static void destroy() {} static bool isKeyDown(int) { return false; } - static std::wstring getKeyName(int) { return L"KEYNAME"; } + static std::string getKeyName(int) { return "KEYNAME"; } static void enableRepeatEvents(bool) {} static const int KEY_A = 0; static const int KEY_B = 1; diff --git a/targets/resources/XboxMedia/Media/xuiscene_DLCMain.h b/targets/resources/XboxMedia/Media/xuiscene_DLCMain.h index d88bb2c95..87ac5a062 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_DLCMain.h +++ b/targets/resources/XboxMedia/Media/xuiscene_DLCMain.h @@ -1,38 +1,38 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiOffersList L"XuiOffersList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_DLCMain L"DLCMain" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiOffersList "XuiOffersList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_DLCMain "DLCMain" diff --git a/targets/resources/XboxMedia/Media/xuiscene_DLCMain_480.h b/targets/resources/XboxMedia/Media/xuiscene_DLCMain_480.h index eab9212ac..b66b1a578 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_DLCMain_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_DLCMain_480.h @@ -1,33 +1,33 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiOffersList L"XuiOffersList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_DLCMain L"DLCMain" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiOffersList "XuiOffersList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_DLCMain "DLCMain" diff --git a/targets/resources/XboxMedia/Media/xuiscene_DLCOffers.h b/targets/resources/XboxMedia/Media/xuiscene_DLCOffers.h index cd7784ec4..35e82e159 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_DLCOffers.h +++ b/targets/resources/XboxMedia/Media/xuiscene_DLCOffers.h @@ -1,62 +1,62 @@ #pragma once -#define IDC_XuiDLCPriceTag L"XuiDLCPriceTag" -#define IDC_XuiDLCBackground L"XuiDLCBackground" -#define IDC_XuiDLCBanner L"XuiDLCBanner" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiOffersList L"XuiOffersList" -#define IDC_XuiHTMLSellText L"XuiHTMLSellText" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_DLCOffers L"DLCOffers" +#define IDC_XuiDLCPriceTag "XuiDLCPriceTag" +#define IDC_XuiDLCBackground "XuiDLCBackground" +#define IDC_XuiDLCBanner "XuiDLCBanner" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiOffersList "XuiOffersList" +#define IDC_XuiHTMLSellText "XuiHTMLSellText" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_DLCOffers "DLCOffers" diff --git a/targets/resources/XboxMedia/Media/xuiscene_DLCOffers_480.h b/targets/resources/XboxMedia/Media/xuiscene_DLCOffers_480.h index baba0457c..424f756e6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_DLCOffers_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_DLCOffers_480.h @@ -1,51 +1,51 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiOffersList L"XuiOffersList" -#define IDC_XuiHTMLSellText L"XuiHTMLSellText" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_XuiDLCBackground L"XuiDLCBackground" -#define IDC_XuiDLCPriceTag L"XuiDLCPriceTag" -#define IDC_XuiDLCBanner L"XuiDLCBanner" -#define IDC_DLCOffers L"DLCOffers" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiOffersList "XuiOffersList" +#define IDC_XuiHTMLSellText "XuiHTMLSellText" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_XuiDLCBackground "XuiDLCBackground" +#define IDC_XuiDLCPriceTag "XuiDLCPriceTag" +#define IDC_XuiDLCBanner "XuiDLCBanner" +#define IDC_DLCOffers "DLCOffers" diff --git a/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage.h b/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage.h index c8231ba42..921902a51 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage.h +++ b/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_XuiHTMLMessage L"XuiHTMLMessage" -#define IDC_NewUpdate L"NewUpdate" +#define IDC_XuiHTMLMessage "XuiHTMLMessage" +#define IDC_NewUpdate "NewUpdate" diff --git a/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage_480.h b/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage_480.h index c8231ba42..921902a51 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_NewUpdateMessage_480.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_XuiHTMLMessage L"XuiHTMLMessage" -#define IDC_NewUpdate L"NewUpdate" +#define IDC_XuiHTMLMessage "XuiHTMLMessage" +#define IDC_NewUpdate "NewUpdate" diff --git a/targets/resources/XboxMedia/Media/xuiscene_anvil.h b/targets/resources/XboxMedia/Media/xuiscene_anvil.h index 90f87e40a..94db53ff7 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_anvil.h +++ b/targets/resources/XboxMedia/Media/xuiscene_anvil.h @@ -1,313 +1,313 @@ #pragma once -#define IDC_AnvilText L"AnvilText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_AnvilTextInput L"AnvilTextInput" -#define IDC_LabelAffordable L"LabelAffordable" -#define IDC_LabelExpensive L"LabelExpensive" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_AnvilHammer L"AnvilHammer" -#define IDC_AnvilPlus L"AnvilPlus" -#define IDC_AnvilArrow L"AnvilArrow" -#define IDC_AnvilCross L"AnvilCross" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneAnvil L"XuiSceneAnvil" +#define IDC_AnvilText "AnvilText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_AnvilTextInput "AnvilTextInput" +#define IDC_LabelAffordable "LabelAffordable" +#define IDC_LabelExpensive "LabelExpensive" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_AnvilHammer "AnvilHammer" +#define IDC_AnvilPlus "AnvilPlus" +#define IDC_AnvilArrow "AnvilArrow" +#define IDC_AnvilCross "AnvilCross" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneAnvil "XuiSceneAnvil" diff --git a/targets/resources/XboxMedia/Media/xuiscene_anvil_480.h b/targets/resources/XboxMedia/Media/xuiscene_anvil_480.h index 9d59bc38b..d1b2c9a93 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_anvil_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_anvil_480.h @@ -1,369 +1,369 @@ -#define IDC_AnvilText L"AnvilText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_AnvilTextInput L"AnvilTextInput" -#define IDC_LabelAffordable L"LabelAffordable" -#define IDC_LabelExpensive L"LabelExpensive" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_AnvilHammer L"AnvilHammer" -#define IDC_AnvilPlus L"AnvilPlus" -#define IDC_AnvilArrow L"AnvilArrow" -#define IDC_AnvilCross L"AnvilCross" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneAnvil L"XuiSceneAnvil" +#define IDC_AnvilText "AnvilText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_AnvilTextInput "AnvilTextInput" +#define IDC_LabelAffordable "LabelAffordable" +#define IDC_LabelExpensive "LabelExpensive" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_AnvilHammer "AnvilHammer" +#define IDC_AnvilPlus "AnvilPlus" +#define IDC_AnvilArrow "AnvilArrow" +#define IDC_AnvilCross "AnvilCross" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneAnvil "XuiSceneAnvil" diff --git a/targets/resources/XboxMedia/Media/xuiscene_anvil_small.h b/targets/resources/XboxMedia/Media/xuiscene_anvil_small.h index fdedc7b58..356cdfc1d 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_anvil_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_anvil_small.h @@ -1,390 +1,390 @@ -#define IDC_AnvilText L"AnvilText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_AnvilTextInput L"AnvilTextInput" -#define IDC_LabelAffordable L"LabelAffordable" -#define IDC_LabelExpensive L"LabelExpensive" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_AnvilHammer L"AnvilHammer" -#define IDC_AnvilPlus L"AnvilPlus" -#define IDC_AnvilArrow L"AnvilArrow" -#define IDC_AnvilCross L"AnvilCross" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneAnvil L"XuiSceneAnvil" +#define IDC_AnvilText "AnvilText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_AnvilTextInput "AnvilTextInput" +#define IDC_LabelAffordable "LabelAffordable" +#define IDC_LabelExpensive "LabelExpensive" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_AnvilHammer "AnvilHammer" +#define IDC_AnvilPlus "AnvilPlus" +#define IDC_AnvilArrow "AnvilArrow" +#define IDC_AnvilCross "AnvilCross" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneAnvil "XuiSceneAnvil" diff --git a/targets/resources/XboxMedia/Media/xuiscene_base.h b/targets/resources/XboxMedia/Media/xuiscene_base.h index 1570bfc30..0eac43e9e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_base.h +++ b/targets/resources/XboxMedia/Media/xuiscene_base.h @@ -1,177 +1,177 @@ #pragma once -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_XuiGamertag L"XuiGamertag" -#define IDC_BasePlayer3 L"BasePlayer3" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_XuiGamertag L"XuiGamertag" -#define IDC_BasePlayer2 L"BasePlayer2" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_XuiGamertag L"XuiGamertag" -#define IDC_BasePlayer1 L"BasePlayer1" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_XuiGamertag L"XuiGamertag" -#define IDC_BasePlayer0 L"BasePlayer0" -#define IDC_XuiPressStartMessage L"XuiPressStartMessage" -#define IDC_XuiSceneDebugContainer L"XuiSceneDebugContainer" -#define IDC_XuiSavingIcon L"XuiSavingIcon" -#define IDC_XuiTrialTimer L"XuiTrialTimer" -#define IDC_SafeArea L"SafeArea" -#define IDC_XuiSoundXACTBack L"XuiSoundXACTBack" -#define IDC_XuiSoundXACTCraft L"XuiSoundXACTCraft" -#define IDC_XuiSoundXACTCraftFail L"XuiSoundXACTCraftFail" -#define IDC_XuiSoundXACTFocus L"XuiSoundXACTFocus" -#define IDC_XuiSoundXACTPress L"XuiSoundXACTPress" -#define IDC_XuiSoundXACTScroll L"XuiSoundXACTScroll" -#define IDC_XuiBaseScene L"XuiBaseScene" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_XuiGamertag "XuiGamertag" +#define IDC_BasePlayer3 "BasePlayer3" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_XuiGamertag "XuiGamertag" +#define IDC_BasePlayer2 "BasePlayer2" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_XuiGamertag "XuiGamertag" +#define IDC_BasePlayer1 "BasePlayer1" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_XuiGamertag "XuiGamertag" +#define IDC_BasePlayer0 "BasePlayer0" +#define IDC_XuiPressStartMessage "XuiPressStartMessage" +#define IDC_XuiSceneDebugContainer "XuiSceneDebugContainer" +#define IDC_XuiSavingIcon "XuiSavingIcon" +#define IDC_XuiTrialTimer "XuiTrialTimer" +#define IDC_SafeArea "SafeArea" +#define IDC_XuiSoundXACTBack "XuiSoundXACTBack" +#define IDC_XuiSoundXACTCraft "XuiSoundXACTCraft" +#define IDC_XuiSoundXACTCraftFail "XuiSoundXACTCraftFail" +#define IDC_XuiSoundXACTFocus "XuiSoundXACTFocus" +#define IDC_XuiSoundXACTPress "XuiSoundXACTPress" +#define IDC_XuiSoundXACTScroll "XuiSoundXACTScroll" +#define IDC_XuiBaseScene "XuiBaseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_base_480.h b/targets/resources/XboxMedia/Media/xuiscene_base_480.h index aea6be6ed..c7ba6fcea 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_base_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_base_480.h @@ -1,173 +1,173 @@ #pragma once -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_BasePlayer3 L"BasePlayer3" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_BasePlayer2 L"BasePlayer2" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_BasePlayer1 L"BasePlayer1" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneHudRoot L"XuiSceneHudRoot" -#define IDC_XuiSceneChatRoot L"XuiSceneChatRoot" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_LStick L"LStick" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_TooltipsSmall L"TooltipsSmall" -#define IDC_SelectedItem L"SelectedItem" -#define IDC_SelectedItemSmall L"SelectedItemSmall" -#define IDC_TitleText L"TitleText" -#define IDC_ProgressBar1 L"ProgressBar1" -#define IDC_ProgressBar2 L"ProgressBar2" -#define IDC_ProgressBar3 L"ProgressBar3" -#define IDC_ProgressBar1_small L"ProgressBar1_small" -#define IDC_ProgressBar2_small L"ProgressBar2_small" -#define IDC_ProgressBar3_small L"ProgressBar3_small" -#define IDC_BossHealth L"BossHealth" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_BasePlayer0 L"BasePlayer0" -#define IDC_XuiPressStartMessage L"XuiPressStartMessage" -#define IDC_XuiSceneDebugContainer L"XuiSceneDebugContainer" -#define IDC_XuiSavingIcon L"XuiSavingIcon" -#define IDC_XuiTrialTimer L"XuiTrialTimer" -#define IDC_SafeArea L"SafeArea" -#define IDC_XuiSoundXACTBack L"XuiSoundXACTBack" -#define IDC_XuiSoundXACTCraft L"XuiSoundXACTCraft" -#define IDC_XuiSoundXACTCraftFail L"XuiSoundXACTCraftFail" -#define IDC_XuiSoundXACTFocus L"XuiSoundXACTFocus" -#define IDC_XuiSoundXACTPress L"XuiSoundXACTPress" -#define IDC_XuiSoundXACTScroll L"XuiSoundXACTScroll" -#define IDC_XuiBaseScene L"XuiBaseScene" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_BasePlayer3 "BasePlayer3" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_BasePlayer2 "BasePlayer2" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_BasePlayer1 "BasePlayer1" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneHudRoot "XuiSceneHudRoot" +#define IDC_XuiSceneChatRoot "XuiSceneChatRoot" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_LStick "LStick" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_TooltipsSmall "TooltipsSmall" +#define IDC_SelectedItem "SelectedItem" +#define IDC_SelectedItemSmall "SelectedItemSmall" +#define IDC_TitleText "TitleText" +#define IDC_ProgressBar1 "ProgressBar1" +#define IDC_ProgressBar2 "ProgressBar2" +#define IDC_ProgressBar3 "ProgressBar3" +#define IDC_ProgressBar1_small "ProgressBar1_small" +#define IDC_ProgressBar2_small "ProgressBar2_small" +#define IDC_ProgressBar3_small "ProgressBar3_small" +#define IDC_BossHealth "BossHealth" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_BasePlayer0 "BasePlayer0" +#define IDC_XuiPressStartMessage "XuiPressStartMessage" +#define IDC_XuiSceneDebugContainer "XuiSceneDebugContainer" +#define IDC_XuiSavingIcon "XuiSavingIcon" +#define IDC_XuiTrialTimer "XuiTrialTimer" +#define IDC_SafeArea "SafeArea" +#define IDC_XuiSoundXACTBack "XuiSoundXACTBack" +#define IDC_XuiSoundXACTCraft "XuiSoundXACTCraft" +#define IDC_XuiSoundXACTCraftFail "XuiSoundXACTCraftFail" +#define IDC_XuiSoundXACTFocus "XuiSoundXACTFocus" +#define IDC_XuiSoundXACTPress "XuiSoundXACTPress" +#define IDC_XuiSoundXACTScroll "XuiSoundXACTScroll" +#define IDC_XuiBaseScene "XuiBaseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_base_small.h b/targets/resources/XboxMedia/Media/xuiscene_base_small.h index bff0322ee..da859f292 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_base_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_base_small.h @@ -1,81 +1,81 @@ #pragma once -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_BasePlayer3 L"BasePlayer3" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_BasePlayer2 L"BasePlayer2" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_BasePlayer1 L"BasePlayer1" -#define IDC_XuiDarkOverlay L"XuiDarkOverlay" -#define IDC_Background L"Background" -#define IDC_Logo L"Logo" -#define IDC_XuiSceneContainer L"XuiSceneContainer" -#define IDC_XuiSceneTutorialContainer L"XuiSceneTutorialContainer" -#define IDC_LBButton L"LBButton" -#define IDC_RBButton L"RBButton" -#define IDC_RTrigger L"RTrigger" -#define IDC_LTrigger L"LTrigger" -#define IDC_YButton L"YButton" -#define IDC_XButton L"XButton" -#define IDC_BButton L"BButton" -#define IDC_AButton L"AButton" -#define IDC_Tooltips L"Tooltips" -#define IDC_BottomLeftAnchorPoint L"BottomLeftAnchorPoint" -#define IDC_TopLeftAnchorPoint L"TopLeftAnchorPoint" -#define IDC_BasePlayer0 L"BasePlayer0" -#define IDC_XuiPressStartMessage L"XuiPressStartMessage" -#define IDC_XuiSceneDebugContainer L"XuiSceneDebugContainer" -#define IDC_XuiSavingIcon L"XuiSavingIcon" -#define IDC_XuiTrialTimer L"XuiTrialTimer" -#define IDC_SafeArea L"SafeArea" -#define IDC_XuiSoundXACTBack L"XuiSoundXACTBack" -#define IDC_XuiSoundXACTCraft L"XuiSoundXACTCraft" -#define IDC_XuiSoundXACTCraftFail L"XuiSoundXACTCraftFail" -#define IDC_XuiSoundXACTFocus L"XuiSoundXACTFocus" -#define IDC_XuiSoundXACTPress L"XuiSoundXACTPress" -#define IDC_XuiSoundXACTScroll L"XuiSoundXACTScroll" -#define IDC_XuiBaseScene L"XuiBaseScene" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_BasePlayer3 "BasePlayer3" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_BasePlayer2 "BasePlayer2" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_BasePlayer1 "BasePlayer1" +#define IDC_XuiDarkOverlay "XuiDarkOverlay" +#define IDC_Background "Background" +#define IDC_Logo "Logo" +#define IDC_XuiSceneContainer "XuiSceneContainer" +#define IDC_XuiSceneTutorialContainer "XuiSceneTutorialContainer" +#define IDC_LBButton "LBButton" +#define IDC_RBButton "RBButton" +#define IDC_RTrigger "RTrigger" +#define IDC_LTrigger "LTrigger" +#define IDC_YButton "YButton" +#define IDC_XButton "XButton" +#define IDC_BButton "BButton" +#define IDC_AButton "AButton" +#define IDC_Tooltips "Tooltips" +#define IDC_BottomLeftAnchorPoint "BottomLeftAnchorPoint" +#define IDC_TopLeftAnchorPoint "TopLeftAnchorPoint" +#define IDC_BasePlayer0 "BasePlayer0" +#define IDC_XuiPressStartMessage "XuiPressStartMessage" +#define IDC_XuiSceneDebugContainer "XuiSceneDebugContainer" +#define IDC_XuiSavingIcon "XuiSavingIcon" +#define IDC_XuiTrialTimer "XuiTrialTimer" +#define IDC_SafeArea "SafeArea" +#define IDC_XuiSoundXACTBack "XuiSoundXACTBack" +#define IDC_XuiSoundXACTCraft "XuiSoundXACTCraft" +#define IDC_XuiSoundXACTCraftFail "XuiSoundXACTCraftFail" +#define IDC_XuiSoundXACTFocus "XuiSoundXACTFocus" +#define IDC_XuiSoundXACTPress "XuiSoundXACTPress" +#define IDC_XuiSoundXACTScroll "XuiSoundXACTScroll" +#define IDC_XuiBaseScene "XuiBaseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_beacon.h b/targets/resources/XboxMedia/Media/xuiscene_beacon.h index 80fcd67f9..6a2e451c0 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_beacon.h +++ b/targets/resources/XboxMedia/Media/xuiscene_beacon.h @@ -1,406 +1,406 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_SecondaryPanel L"SecondaryPanel" -#define IDC_PrimaryPanel L"PrimaryPanel" -#define IDC_PrimaryText L"PrimaryText" -#define IDC_SecondaryText L"SecondaryText" -#define IDC_PrimaryTierOneOne L"PrimaryTierOneOne" -#define IDC_PrimaryTierOneTwo L"PrimaryTierOneTwo" -#define IDC_PrimaryTierTwoOne L"PrimaryTierTwoOne" -#define IDC_PrimaryTierTwoTwo L"PrimaryTierTwoTwo" -#define IDC_PrimaryTierThree L"PrimaryTierThree" -#define IDC_SecondaryOne L"SecondaryOne" -#define IDC_SecondaryTwo L"SecondaryTwo" -#define IDC_Confirm L"Confirm" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Payment L"Payment" -#define IDC_Emerald L"Emerald" -#define IDC_Diamond L"Diamond" -#define IDC_Gold L"Gold" -#define IDC_Iron L"Iron" -#define IDC_Beacon_4 L"Beacon_4" -#define IDC_Beacon_3 L"Beacon_3" -#define IDC_Beacon_2 L"Beacon_2" -#define IDC_Beacon_1 L"Beacon_1" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_BeaconMenu L"BeaconMenu" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_SecondaryPanel "SecondaryPanel" +#define IDC_PrimaryPanel "PrimaryPanel" +#define IDC_PrimaryText "PrimaryText" +#define IDC_SecondaryText "SecondaryText" +#define IDC_PrimaryTierOneOne "PrimaryTierOneOne" +#define IDC_PrimaryTierOneTwo "PrimaryTierOneTwo" +#define IDC_PrimaryTierTwoOne "PrimaryTierTwoOne" +#define IDC_PrimaryTierTwoTwo "PrimaryTierTwoTwo" +#define IDC_PrimaryTierThree "PrimaryTierThree" +#define IDC_SecondaryOne "SecondaryOne" +#define IDC_SecondaryTwo "SecondaryTwo" +#define IDC_Confirm "Confirm" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Payment "Payment" +#define IDC_Emerald "Emerald" +#define IDC_Diamond "Diamond" +#define IDC_Gold "Gold" +#define IDC_Iron "Iron" +#define IDC_Beacon_4 "Beacon_4" +#define IDC_Beacon_3 "Beacon_3" +#define IDC_Beacon_2 "Beacon_2" +#define IDC_Beacon_1 "Beacon_1" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_BeaconMenu "BeaconMenu" diff --git a/targets/resources/XboxMedia/Media/xuiscene_brewingstand.h b/targets/resources/XboxMedia/Media/xuiscene_brewingstand.h index 202f575d9..b440f7b2e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_brewingstand.h +++ b/targets/resources/XboxMedia/Media/xuiscene_brewingstand.h @@ -1,205 +1,205 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_BrewingStandText L"BrewingStandText" -#define IDC_BrewingStand L"BrewingStand" -#define IDC_Progress L"Progress" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Bubbles L"Bubbles" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle1 L"Bottle1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle2 L"Bottle2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle3 L"Bottle3" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneBrewingStand L"XuiSceneBrewingStand" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_BrewingStandText "BrewingStandText" +#define IDC_BrewingStand "BrewingStand" +#define IDC_Progress "Progress" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Bubbles "Bubbles" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle1 "Bottle1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle2 "Bottle2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle3 "Bottle3" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneBrewingStand "XuiSceneBrewingStand" diff --git a/targets/resources/XboxMedia/Media/xuiscene_brewingstand_480.h b/targets/resources/XboxMedia/Media/xuiscene_brewingstand_480.h index 2434e6fc5..0f57a4269 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_brewingstand_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_brewingstand_480.h @@ -1,233 +1,233 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_BrewingStandText L"BrewingStandText" -#define IDC_BrewingStand L"BrewingStand" -#define IDC_Progress L"Progress" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Bubbles L"Bubbles" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle1 L"Bottle1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle2 L"Bottle2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle3 L"Bottle3" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneBrewingStand L"XuiSceneBrewingStand" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_BrewingStandText "BrewingStandText" +#define IDC_BrewingStand "BrewingStand" +#define IDC_Progress "Progress" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Bubbles "Bubbles" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle1 "Bottle1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle2 "Bottle2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle3 "Bottle3" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneBrewingStand "XuiSceneBrewingStand" diff --git a/targets/resources/XboxMedia/Media/xuiscene_brewingstand_Small.h b/targets/resources/XboxMedia/Media/xuiscene_brewingstand_Small.h index f59c67da4..4027cfc1f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_brewingstand_Small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_brewingstand_Small.h @@ -1,171 +1,171 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_BrewingStandText L"BrewingStandText" -#define IDC_BrewingStand L"BrewingStand" -#define IDC_Progress L"Progress" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Bubbles L"Bubbles" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle1 L"Bottle1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle2 L"Bottle2" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Bottle3 L"Bottle3" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneBrewingStand L"XuiSceneBrewingStand" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_BrewingStandText "BrewingStandText" +#define IDC_BrewingStand "BrewingStand" +#define IDC_Progress "Progress" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Bubbles "Bubbles" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle1 "Bottle1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle2 "Bottle2" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Bottle3 "Bottle3" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneBrewingStand "XuiSceneBrewingStand" diff --git a/targets/resources/XboxMedia/Media/xuiscene_chat.h b/targets/resources/XboxMedia/Media/xuiscene_chat.h index 7b7764a04..a4cd4144e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_chat.h +++ b/targets/resources/XboxMedia/Media/xuiscene_chat.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_XuiBack1 L"XuiBack1" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiBack2 L"XuiBack2" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiBack3 L"XuiBack3" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiBack4 L"XuiBack4" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiBack5 L"XuiBack5" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiBack6 L"XuiBack6" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiBack7 L"XuiBack7" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiBack8 L"XuiBack8" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiBack9 L"XuiBack9" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiBack10 L"XuiBack10" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabelJukebox L"XuiLabelJukebox" -#define IDC_ChatScene L"ChatScene" +#define IDC_XuiBack1 "XuiBack1" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiBack2 "XuiBack2" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiBack3 "XuiBack3" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiBack4 "XuiBack4" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiBack5 "XuiBack5" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiBack6 "XuiBack6" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiBack7 "XuiBack7" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiBack8 "XuiBack8" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiBack9 "XuiBack9" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiBack10 "XuiBack10" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabelJukebox "XuiLabelJukebox" +#define IDC_ChatScene "ChatScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_chat_480.h b/targets/resources/XboxMedia/Media/xuiscene_chat_480.h index 7b7764a04..a4cd4144e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_chat_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_chat_480.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_XuiBack1 L"XuiBack1" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiBack2 L"XuiBack2" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiBack3 L"XuiBack3" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiBack4 L"XuiBack4" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiBack5 L"XuiBack5" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiBack6 L"XuiBack6" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiBack7 L"XuiBack7" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiBack8 L"XuiBack8" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiBack9 L"XuiBack9" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiBack10 L"XuiBack10" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabelJukebox L"XuiLabelJukebox" -#define IDC_ChatScene L"ChatScene" +#define IDC_XuiBack1 "XuiBack1" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiBack2 "XuiBack2" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiBack3 "XuiBack3" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiBack4 "XuiBack4" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiBack5 "XuiBack5" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiBack6 "XuiBack6" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiBack7 "XuiBack7" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiBack8 "XuiBack8" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiBack9 "XuiBack9" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiBack10 "XuiBack10" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabelJukebox "XuiLabelJukebox" +#define IDC_ChatScene "ChatScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_chat_small.h b/targets/resources/XboxMedia/Media/xuiscene_chat_small.h index 7b7764a04..a4cd4144e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_chat_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_chat_small.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_XuiBack1 L"XuiBack1" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiBack2 L"XuiBack2" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiBack3 L"XuiBack3" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiBack4 L"XuiBack4" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiBack5 L"XuiBack5" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiBack6 L"XuiBack6" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiBack7 L"XuiBack7" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiBack8 L"XuiBack8" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiBack9 L"XuiBack9" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiBack10 L"XuiBack10" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabelJukebox L"XuiLabelJukebox" -#define IDC_ChatScene L"ChatScene" +#define IDC_XuiBack1 "XuiBack1" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiBack2 "XuiBack2" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiBack3 "XuiBack3" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiBack4 "XuiBack4" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiBack5 "XuiBack5" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiBack6 "XuiBack6" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiBack7 "XuiBack7" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiBack8 "XuiBack8" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiBack9 "XuiBack9" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiBack10 "XuiBack10" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabelJukebox "XuiLabelJukebox" +#define IDC_ChatScene "ChatScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress.h b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress.h index 20bfbf7e6..20a8b85b1 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress.h +++ b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_ConnectingProgressScene L"ConnectingProgressScene" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_ConnectingProgressScene "ConnectingProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_480.h b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_480.h index 6d647b978..798cdb1f8 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_480.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_ConnectingProgressScene L"ConnectingProgressScene" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_ConnectingProgressScene "ConnectingProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_small.h b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_small.h index 20bfbf7e6..20a8b85b1 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_connectingprogress_small.h @@ -1,23 +1,23 @@ #pragma once -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_ConnectingProgressScene L"ConnectingProgressScene" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_ConnectingProgressScene "ConnectingProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_container.h b/targets/resources/XboxMedia/Media/xuiscene_container.h index fe3b91d54..eaa1b8f72 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_container.h +++ b/targets/resources/XboxMedia/Media/xuiscene_container.h @@ -1,66 +1,66 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_InventoryText L"InventoryText" -#define IDC_ChestText L"ChestText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneContainer L"XuiSceneContainer" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_InventoryText "InventoryText" +#define IDC_ChestText "ChestText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneContainer "XuiSceneContainer" diff --git a/targets/resources/XboxMedia/Media/xuiscene_container_480.h b/targets/resources/XboxMedia/Media/xuiscene_container_480.h index 93eae5c94..9838268bb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_container_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_container_480.h @@ -1,120 +1,120 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_InventoryText L"InventoryText" -#define IDC_ChestText L"ChestText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneContainer L"XuiSceneContainer" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_InventoryText "InventoryText" +#define IDC_ChestText "ChestText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneContainer "XuiSceneContainer" diff --git a/targets/resources/XboxMedia/Media/xuiscene_container_large_480.h b/targets/resources/XboxMedia/Media/xuiscene_container_large_480.h index 3f62911ff..f0d339e73 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_container_large_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_container_large_480.h @@ -1,174 +1,174 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_InventoryText L"InventoryText" -#define IDC_ChestText L"ChestText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneContainer L"XuiSceneContainer" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_InventoryText "InventoryText" +#define IDC_ChestText "ChestText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneContainer "XuiSceneContainer" diff --git a/targets/resources/XboxMedia/Media/xuiscene_container_large_Small.h b/targets/resources/XboxMedia/Media/xuiscene_container_large_Small.h index fe3b91d54..eaa1b8f72 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_container_large_Small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_container_large_Small.h @@ -1,66 +1,66 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_InventoryText L"InventoryText" -#define IDC_ChestText L"ChestText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneContainer L"XuiSceneContainer" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_InventoryText "InventoryText" +#define IDC_ChestText "ChestText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneContainer "XuiSceneContainer" diff --git a/targets/resources/XboxMedia/Media/xuiscene_container_small.h b/targets/resources/XboxMedia/Media/xuiscene_container_small.h index fe3b91d54..eaa1b8f72 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_container_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_container_small.h @@ -1,66 +1,66 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_InventoryText L"InventoryText" -#define IDC_ChestText L"ChestText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneContainer L"XuiSceneContainer" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_InventoryText "InventoryText" +#define IDC_ChestText "ChestText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneContainer "XuiSceneContainer" diff --git a/targets/resources/XboxMedia/Media/xuiscene_controls.h b/targets/resources/XboxMedia/Media/xuiscene_controls.h index d25f2826b..276852247 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_controls.h +++ b/targets/resources/XboxMedia/Media/xuiscene_controls.h @@ -1,66 +1,66 @@ #pragma once -#define IDC_Controller L"Controller" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_SchemeList L"SchemeList" -#define IDC_InvertLook L"InvertLook" -#define IDC_SouthPaw L"SouthPaw" -#define IDC_FigDpad L"FigDpad" -#define IDC_Dpad L"Dpad" -#define IDC_FigDpadL L"FigDpadL" -#define IDC_DpadL L"DpadL" -#define IDC_FigDpadR L"FigDpadR" -#define IDC_DpadR L"DpadR" -#define IDC_FigLT L"FigLT" -#define IDC_LT L"LT" -#define IDC_FigRT L"FigRT" -#define IDC_RT L"RT" -#define IDC_FigLStick L"FigLStick" -#define IDC_LStick L"LStick" -#define IDC_FigRStick L"FigRStick" -#define IDC_RStick L"RStick" -#define IDC_FigLStickButton L"FigLStickButton" -#define IDC_LStickButton L"LStickButton" -#define IDC_FigRStickButton L"FigRStickButton" -#define IDC_RStickButton L"RStickButton" -#define IDC_FigLB L"FigLB" -#define IDC_LB L"LB" -#define IDC_FigRB L"FigRB" -#define IDC_RB L"RB" -#define IDC_FigBack L"FigBack" -#define IDC_Back L"Back" -#define IDC_FigStart L"FigStart" -#define IDC_Start L"Start" -#define IDC_FigY L"FigY" -#define IDC_Y L"Y" -#define IDC_FigX L"FigX" -#define IDC_X L"X" -#define IDC_FigB L"FigB" -#define IDC_B L"B" -#define IDC_FigA L"FigA" -#define IDC_A L"A" -#define IDC_FigGroup L"FigGroup" -#define IDC_CurrentLayout L"CurrentLayout" -#define IDC_XuiBuildVer L"XuiBuildVer" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabel11 L"XuiLabel11" -#define IDC_XuiLabel12 L"XuiLabel12" -#define IDC_XuiLabel13 L"XuiLabel13" -#define IDC_XuiLabel14 L"XuiLabel14" -#define IDC_XuiLabel15 L"XuiLabel15" -#define IDC_XuiLabel16 L"XuiLabel16" -#define IDC_XuiLabel17 L"XuiLabel17" -#define IDC_SceneControls L"SceneControls" +#define IDC_Controller "Controller" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_SchemeList "SchemeList" +#define IDC_InvertLook "InvertLook" +#define IDC_SouthPaw "SouthPaw" +#define IDC_FigDpad "FigDpad" +#define IDC_Dpad "Dpad" +#define IDC_FigDpadL "FigDpadL" +#define IDC_DpadL "DpadL" +#define IDC_FigDpadR "FigDpadR" +#define IDC_DpadR "DpadR" +#define IDC_FigLT "FigLT" +#define IDC_LT "LT" +#define IDC_FigRT "FigRT" +#define IDC_RT "RT" +#define IDC_FigLStick "FigLStick" +#define IDC_LStick "LStick" +#define IDC_FigRStick "FigRStick" +#define IDC_RStick "RStick" +#define IDC_FigLStickButton "FigLStickButton" +#define IDC_LStickButton "LStickButton" +#define IDC_FigRStickButton "FigRStickButton" +#define IDC_RStickButton "RStickButton" +#define IDC_FigLB "FigLB" +#define IDC_LB "LB" +#define IDC_FigRB "FigRB" +#define IDC_RB "RB" +#define IDC_FigBack "FigBack" +#define IDC_Back "Back" +#define IDC_FigStart "FigStart" +#define IDC_Start "Start" +#define IDC_FigY "FigY" +#define IDC_Y "Y" +#define IDC_FigX "FigX" +#define IDC_X "X" +#define IDC_FigB "FigB" +#define IDC_B "B" +#define IDC_FigA "FigA" +#define IDC_A "A" +#define IDC_FigGroup "FigGroup" +#define IDC_CurrentLayout "CurrentLayout" +#define IDC_XuiBuildVer "XuiBuildVer" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabel11 "XuiLabel11" +#define IDC_XuiLabel12 "XuiLabel12" +#define IDC_XuiLabel13 "XuiLabel13" +#define IDC_XuiLabel14 "XuiLabel14" +#define IDC_XuiLabel15 "XuiLabel15" +#define IDC_XuiLabel16 "XuiLabel16" +#define IDC_XuiLabel17 "XuiLabel17" +#define IDC_SceneControls "SceneControls" diff --git a/targets/resources/XboxMedia/Media/xuiscene_controls_480.h b/targets/resources/XboxMedia/Media/xuiscene_controls_480.h index e85d8104e..7dc9e021f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_controls_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_controls_480.h @@ -1,68 +1,68 @@ #pragma once -#define IDC_Controller L"Controller" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_SchemeList L"SchemeList" -#define IDC_InvertLook L"InvertLook" -#define IDC_SouthPaw L"SouthPaw" -#define IDC_FigDpad L"FigDpad" -#define IDC_Dpad L"Dpad" -#define IDC_FigDpadL L"FigDpadL" -#define IDC_DpadL L"DpadL" -#define IDC_FigDpadR L"FigDpadR" -#define IDC_DpadR L"DpadR" -#define IDC_FigLT L"FigLT" -#define IDC_LT L"LT" -#define IDC_FigRT L"FigRT" -#define IDC_RT L"RT" -#define IDC_FigLStick L"FigLStick" -#define IDC_LStick L"LStick" -#define IDC_FigRStick L"FigRStick" -#define IDC_RStick L"RStick" -#define IDC_FigLStickButton L"FigLStickButton" -#define IDC_LStickButton L"LStickButton" -#define IDC_FigRStickButton L"FigRStickButton" -#define IDC_RStickButton L"RStickButton" -#define IDC_FigLB L"FigLB" -#define IDC_LB L"LB" -#define IDC_FigRB L"FigRB" -#define IDC_RB L"RB" -#define IDC_FigBack L"FigBack" -#define IDC_Back L"Back" -#define IDC_FigStart L"FigStart" -#define IDC_Start L"Start" -#define IDC_FigY L"FigY" -#define IDC_Y L"Y" -#define IDC_FigX L"FigX" -#define IDC_X L"X" -#define IDC_FigB L"FigB" -#define IDC_B L"B" -#define IDC_FigA L"FigA" -#define IDC_A L"A" -#define IDC_FigGroup L"FigGroup" -#define IDC_CurrentLayout L"CurrentLayout" -#define IDC_XuiBuildVer L"XuiBuildVer" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabel11 L"XuiLabel11" -#define IDC_XuiLabel12 L"XuiLabel12" -#define IDC_XuiLabel13 L"XuiLabel13" -#define IDC_XuiLabel14 L"XuiLabel14" -#define IDC_XuiLabel15 L"XuiLabel15" -#define IDC_XuiLabel16 L"XuiLabel16" -#define IDC_XuiLabel17 L"XuiLabel17" -#define IDC_SceneControls L"SceneControls" +#define IDC_Controller "Controller" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_SchemeList "SchemeList" +#define IDC_InvertLook "InvertLook" +#define IDC_SouthPaw "SouthPaw" +#define IDC_FigDpad "FigDpad" +#define IDC_Dpad "Dpad" +#define IDC_FigDpadL "FigDpadL" +#define IDC_DpadL "DpadL" +#define IDC_FigDpadR "FigDpadR" +#define IDC_DpadR "DpadR" +#define IDC_FigLT "FigLT" +#define IDC_LT "LT" +#define IDC_FigRT "FigRT" +#define IDC_RT "RT" +#define IDC_FigLStick "FigLStick" +#define IDC_LStick "LStick" +#define IDC_FigRStick "FigRStick" +#define IDC_RStick "RStick" +#define IDC_FigLStickButton "FigLStickButton" +#define IDC_LStickButton "LStickButton" +#define IDC_FigRStickButton "FigRStickButton" +#define IDC_RStickButton "RStickButton" +#define IDC_FigLB "FigLB" +#define IDC_LB "LB" +#define IDC_FigRB "FigRB" +#define IDC_RB "RB" +#define IDC_FigBack "FigBack" +#define IDC_Back "Back" +#define IDC_FigStart "FigStart" +#define IDC_Start "Start" +#define IDC_FigY "FigY" +#define IDC_Y "Y" +#define IDC_FigX "FigX" +#define IDC_X "X" +#define IDC_FigB "FigB" +#define IDC_B "B" +#define IDC_FigA "FigA" +#define IDC_A "A" +#define IDC_FigGroup "FigGroup" +#define IDC_CurrentLayout "CurrentLayout" +#define IDC_XuiBuildVer "XuiBuildVer" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabel11 "XuiLabel11" +#define IDC_XuiLabel12 "XuiLabel12" +#define IDC_XuiLabel13 "XuiLabel13" +#define IDC_XuiLabel14 "XuiLabel14" +#define IDC_XuiLabel15 "XuiLabel15" +#define IDC_XuiLabel16 "XuiLabel16" +#define IDC_XuiLabel17 "XuiLabel17" +#define IDC_SceneControls "SceneControls" diff --git a/targets/resources/XboxMedia/Media/xuiscene_controls_small.h b/targets/resources/XboxMedia/Media/xuiscene_controls_small.h index d25f2826b..276852247 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_controls_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_controls_small.h @@ -1,66 +1,66 @@ #pragma once -#define IDC_Controller L"Controller" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_SchemeList L"SchemeList" -#define IDC_InvertLook L"InvertLook" -#define IDC_SouthPaw L"SouthPaw" -#define IDC_FigDpad L"FigDpad" -#define IDC_Dpad L"Dpad" -#define IDC_FigDpadL L"FigDpadL" -#define IDC_DpadL L"DpadL" -#define IDC_FigDpadR L"FigDpadR" -#define IDC_DpadR L"DpadR" -#define IDC_FigLT L"FigLT" -#define IDC_LT L"LT" -#define IDC_FigRT L"FigRT" -#define IDC_RT L"RT" -#define IDC_FigLStick L"FigLStick" -#define IDC_LStick L"LStick" -#define IDC_FigRStick L"FigRStick" -#define IDC_RStick L"RStick" -#define IDC_FigLStickButton L"FigLStickButton" -#define IDC_LStickButton L"LStickButton" -#define IDC_FigRStickButton L"FigRStickButton" -#define IDC_RStickButton L"RStickButton" -#define IDC_FigLB L"FigLB" -#define IDC_LB L"LB" -#define IDC_FigRB L"FigRB" -#define IDC_RB L"RB" -#define IDC_FigBack L"FigBack" -#define IDC_Back L"Back" -#define IDC_FigStart L"FigStart" -#define IDC_Start L"Start" -#define IDC_FigY L"FigY" -#define IDC_Y L"Y" -#define IDC_FigX L"FigX" -#define IDC_X L"X" -#define IDC_FigB L"FigB" -#define IDC_B L"B" -#define IDC_FigA L"FigA" -#define IDC_A L"A" -#define IDC_FigGroup L"FigGroup" -#define IDC_CurrentLayout L"CurrentLayout" -#define IDC_XuiBuildVer L"XuiBuildVer" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_XuiLabel9 L"XuiLabel9" -#define IDC_XuiLabel10 L"XuiLabel10" -#define IDC_XuiLabel11 L"XuiLabel11" -#define IDC_XuiLabel12 L"XuiLabel12" -#define IDC_XuiLabel13 L"XuiLabel13" -#define IDC_XuiLabel14 L"XuiLabel14" -#define IDC_XuiLabel15 L"XuiLabel15" -#define IDC_XuiLabel16 L"XuiLabel16" -#define IDC_XuiLabel17 L"XuiLabel17" -#define IDC_SceneControls L"SceneControls" +#define IDC_Controller "Controller" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_SchemeList "SchemeList" +#define IDC_InvertLook "InvertLook" +#define IDC_SouthPaw "SouthPaw" +#define IDC_FigDpad "FigDpad" +#define IDC_Dpad "Dpad" +#define IDC_FigDpadL "FigDpadL" +#define IDC_DpadL "DpadL" +#define IDC_FigDpadR "FigDpadR" +#define IDC_DpadR "DpadR" +#define IDC_FigLT "FigLT" +#define IDC_LT "LT" +#define IDC_FigRT "FigRT" +#define IDC_RT "RT" +#define IDC_FigLStick "FigLStick" +#define IDC_LStick "LStick" +#define IDC_FigRStick "FigRStick" +#define IDC_RStick "RStick" +#define IDC_FigLStickButton "FigLStickButton" +#define IDC_LStickButton "LStickButton" +#define IDC_FigRStickButton "FigRStickButton" +#define IDC_RStickButton "RStickButton" +#define IDC_FigLB "FigLB" +#define IDC_LB "LB" +#define IDC_FigRB "FigRB" +#define IDC_RB "RB" +#define IDC_FigBack "FigBack" +#define IDC_Back "Back" +#define IDC_FigStart "FigStart" +#define IDC_Start "Start" +#define IDC_FigY "FigY" +#define IDC_Y "Y" +#define IDC_FigX "FigX" +#define IDC_X "X" +#define IDC_FigB "FigB" +#define IDC_B "B" +#define IDC_FigA "FigA" +#define IDC_A "A" +#define IDC_FigGroup "FigGroup" +#define IDC_CurrentLayout "CurrentLayout" +#define IDC_XuiBuildVer "XuiBuildVer" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_XuiLabel9 "XuiLabel9" +#define IDC_XuiLabel10 "XuiLabel10" +#define IDC_XuiLabel11 "XuiLabel11" +#define IDC_XuiLabel12 "XuiLabel12" +#define IDC_XuiLabel13 "XuiLabel13" +#define IDC_XuiLabel14 "XuiLabel14" +#define IDC_XuiLabel15 "XuiLabel15" +#define IDC_XuiLabel16 "XuiLabel16" +#define IDC_XuiLabel17 "XuiLabel17" +#define IDC_SceneControls "SceneControls" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2.h index f4ef5b691..621ad712d 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2.h @@ -1,198 +1,198 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_Grid L"Grid" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_Grid "Grid" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_480.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_480.h index 5b2eafc8c..ed102d8dd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_480.h @@ -1,212 +1,212 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_Grid L"Grid" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_Grid "Grid" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_small.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_small.h index 17a2d3090..9fc94eed9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_2x2_small.h @@ -1,194 +1,194 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_Grid L"Grid" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_Grid "Grid" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3.h index f2e673324..51436b47d 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3.h @@ -1,214 +1,214 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_Grid L"Grid" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_Grid "Grid" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_480.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_480.h index 9c4c336c3..cb1a99da5 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_480.h @@ -1,212 +1,212 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_Grid L"Grid" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_Grid "Grid" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_small.h b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_small.h index 9c4c336c3..cb1a99da5 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_craftingpanel_3x3_small.h @@ -1,212 +1,212 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_XuiImageScrollBar L"XuiImageScrollBar" -#define IDC_XuiImageScrollBar2Slot L"XuiImageScrollBar2Slot" -#define IDC_XuiVSlot0 L"XuiVSlot0" -#define IDC_XuiVSlot1 L"XuiVSlot1" -#define IDC_XuiHighlight L"XuiHighlight" -#define IDC_XuiVSlot2 L"XuiVSlot2" -#define IDC_XuiHSlot0 L"XuiHSlot0" -#define IDC_XuiHSlot1 L"XuiHSlot1" -#define IDC_XuiHSlot2 L"XuiHSlot2" -#define IDC_XuiHSlot3 L"XuiHSlot3" -#define IDC_XuiHSlot4 L"XuiHSlot4" -#define IDC_XuiHSlot5 L"XuiHSlot5" -#define IDC_XuiHSlot6 L"XuiHSlot6" -#define IDC_XuiHSlot7 L"XuiHSlot7" -#define IDC_XuiHSlot8 L"XuiHSlot8" -#define IDC_XuiHSlot9 L"XuiHSlot9" -#define IDC_XuiHSlot10 L"XuiHSlot10" -#define IDC_XuiHSlot11 L"XuiHSlot11" -#define IDC_SceneCraftScrollGroup L"SceneCraftScrollGroup" -#define IDC_CraftingArrow L"CraftingArrow" -#define IDC_CraftingOutputRed L"CraftingOutputRed" -#define IDC_CraftingInput1 L"CraftingInput1" -#define IDC_CraftingInput2 L"CraftingInput2" -#define IDC_CraftingInput3 L"CraftingInput3" -#define IDC_CraftingInput4 L"CraftingInput4" -#define IDC_CraftingInput5 L"CraftingInput5" -#define IDC_CraftingInput6 L"CraftingInput6" -#define IDC_CraftingInput7 L"CraftingInput7" -#define IDC_CraftingInput8 L"CraftingInput8" -#define IDC_CraftingInput9 L"CraftingInput9" -#define IDC_XuiHTMLText L"XuiHTMLText" -#define IDC_XuiItemName L"XuiItemName" -#define IDC_Inventory L"Inventory" -#define IDC_Ingredient4 L"Ingredient4" -#define IDC_Ingredient3 L"Ingredient3" -#define IDC_Ingredient2 L"Ingredient2" -#define IDC_Ingredient1 L"Ingredient1" -#define IDC_Grid L"Grid" -#define IDC_XuiGroupName L"XuiGroupName" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_Group L"Group" -#define IDC_XuiCraftingPanel L"XuiCraftingPanel" +#define IDC_MainPanel "MainPanel" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_XuiImageScrollBar "XuiImageScrollBar" +#define IDC_XuiImageScrollBar2Slot "XuiImageScrollBar2Slot" +#define IDC_XuiVSlot0 "XuiVSlot0" +#define IDC_XuiVSlot1 "XuiVSlot1" +#define IDC_XuiHighlight "XuiHighlight" +#define IDC_XuiVSlot2 "XuiVSlot2" +#define IDC_XuiHSlot0 "XuiHSlot0" +#define IDC_XuiHSlot1 "XuiHSlot1" +#define IDC_XuiHSlot2 "XuiHSlot2" +#define IDC_XuiHSlot3 "XuiHSlot3" +#define IDC_XuiHSlot4 "XuiHSlot4" +#define IDC_XuiHSlot5 "XuiHSlot5" +#define IDC_XuiHSlot6 "XuiHSlot6" +#define IDC_XuiHSlot7 "XuiHSlot7" +#define IDC_XuiHSlot8 "XuiHSlot8" +#define IDC_XuiHSlot9 "XuiHSlot9" +#define IDC_XuiHSlot10 "XuiHSlot10" +#define IDC_XuiHSlot11 "XuiHSlot11" +#define IDC_SceneCraftScrollGroup "SceneCraftScrollGroup" +#define IDC_CraftingArrow "CraftingArrow" +#define IDC_CraftingOutputRed "CraftingOutputRed" +#define IDC_CraftingInput1 "CraftingInput1" +#define IDC_CraftingInput2 "CraftingInput2" +#define IDC_CraftingInput3 "CraftingInput3" +#define IDC_CraftingInput4 "CraftingInput4" +#define IDC_CraftingInput5 "CraftingInput5" +#define IDC_CraftingInput6 "CraftingInput6" +#define IDC_CraftingInput7 "CraftingInput7" +#define IDC_CraftingInput8 "CraftingInput8" +#define IDC_CraftingInput9 "CraftingInput9" +#define IDC_XuiHTMLText "XuiHTMLText" +#define IDC_XuiItemName "XuiItemName" +#define IDC_Inventory "Inventory" +#define IDC_Ingredient4 "Ingredient4" +#define IDC_Ingredient3 "Ingredient3" +#define IDC_Ingredient2 "Ingredient2" +#define IDC_Ingredient1 "Ingredient1" +#define IDC_Grid "Grid" +#define IDC_XuiGroupName "XuiGroupName" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_Group "Group" +#define IDC_XuiCraftingPanel "XuiCraftingPanel" diff --git a/targets/resources/XboxMedia/Media/xuiscene_credits.h b/targets/resources/XboxMedia/Media/xuiscene_credits.h index 26727ff5a..510a4359f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_credits.h +++ b/targets/resources/XboxMedia/Media/xuiscene_credits.h @@ -1,32 +1,32 @@ #pragma once -#define IDC_Background L"Background" -#define IDC_XuiText1 L"XuiText1" -#define IDC_XuiText2 L"XuiText2" -#define IDC_XuiText3 L"XuiText3" -#define IDC_XuiText4 L"XuiText4" -#define IDC_XuiText5 L"XuiText5" -#define IDC_XuiText6 L"XuiText6" -#define IDC_XuiText7 L"XuiText7" -#define IDC_XuiText8 L"XuiText8" -#define IDC_XuiText9 L"XuiText9" -#define IDC_XuiText10 L"XuiText10" -#define IDC_XuiText11 L"XuiText11" -#define IDC_XuiText12 L"XuiText12" -#define IDC_XuiText13 L"XuiText13" -#define IDC_XuiText14 L"XuiText14" -#define IDC_XuiText15 L"XuiText15" -#define IDC_XuiText16 L"XuiText16" -#define IDC_XuiText17 L"XuiText17" -#define IDC_XuiText18 L"XuiText18" -#define IDC_XuiText19 L"XuiText19" -#define IDC_XuiText20 L"XuiText20" -#define IDC_XuiText21 L"XuiText21" -#define IDC_XuiText22 L"XuiText22" -#define IDC_XuiText23 L"XuiText23" -#define IDC_XuiText24 L"XuiText24" -#define IDC_XuiText25 L"XuiText25" -#define IDC_XuiText26 L"XuiText26" -#define IDC_XuiText27 L"XuiText27" -#define IDC_XuiText28 L"XuiText28" -#define IDC_Logo L"Logo" -#define IDC_SceneCredits L"SceneCredits" +#define IDC_Background "Background" +#define IDC_XuiText1 "XuiText1" +#define IDC_XuiText2 "XuiText2" +#define IDC_XuiText3 "XuiText3" +#define IDC_XuiText4 "XuiText4" +#define IDC_XuiText5 "XuiText5" +#define IDC_XuiText6 "XuiText6" +#define IDC_XuiText7 "XuiText7" +#define IDC_XuiText8 "XuiText8" +#define IDC_XuiText9 "XuiText9" +#define IDC_XuiText10 "XuiText10" +#define IDC_XuiText11 "XuiText11" +#define IDC_XuiText12 "XuiText12" +#define IDC_XuiText13 "XuiText13" +#define IDC_XuiText14 "XuiText14" +#define IDC_XuiText15 "XuiText15" +#define IDC_XuiText16 "XuiText16" +#define IDC_XuiText17 "XuiText17" +#define IDC_XuiText18 "XuiText18" +#define IDC_XuiText19 "XuiText19" +#define IDC_XuiText20 "XuiText20" +#define IDC_XuiText21 "XuiText21" +#define IDC_XuiText22 "XuiText22" +#define IDC_XuiText23 "XuiText23" +#define IDC_XuiText24 "XuiText24" +#define IDC_XuiText25 "XuiText25" +#define IDC_XuiText26 "XuiText26" +#define IDC_XuiText27 "XuiText27" +#define IDC_XuiText28 "XuiText28" +#define IDC_Logo "Logo" +#define IDC_SceneCredits "SceneCredits" diff --git a/targets/resources/XboxMedia/Media/xuiscene_credits_480.h b/targets/resources/XboxMedia/Media/xuiscene_credits_480.h index 26727ff5a..510a4359f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_credits_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_credits_480.h @@ -1,32 +1,32 @@ #pragma once -#define IDC_Background L"Background" -#define IDC_XuiText1 L"XuiText1" -#define IDC_XuiText2 L"XuiText2" -#define IDC_XuiText3 L"XuiText3" -#define IDC_XuiText4 L"XuiText4" -#define IDC_XuiText5 L"XuiText5" -#define IDC_XuiText6 L"XuiText6" -#define IDC_XuiText7 L"XuiText7" -#define IDC_XuiText8 L"XuiText8" -#define IDC_XuiText9 L"XuiText9" -#define IDC_XuiText10 L"XuiText10" -#define IDC_XuiText11 L"XuiText11" -#define IDC_XuiText12 L"XuiText12" -#define IDC_XuiText13 L"XuiText13" -#define IDC_XuiText14 L"XuiText14" -#define IDC_XuiText15 L"XuiText15" -#define IDC_XuiText16 L"XuiText16" -#define IDC_XuiText17 L"XuiText17" -#define IDC_XuiText18 L"XuiText18" -#define IDC_XuiText19 L"XuiText19" -#define IDC_XuiText20 L"XuiText20" -#define IDC_XuiText21 L"XuiText21" -#define IDC_XuiText22 L"XuiText22" -#define IDC_XuiText23 L"XuiText23" -#define IDC_XuiText24 L"XuiText24" -#define IDC_XuiText25 L"XuiText25" -#define IDC_XuiText26 L"XuiText26" -#define IDC_XuiText27 L"XuiText27" -#define IDC_XuiText28 L"XuiText28" -#define IDC_Logo L"Logo" -#define IDC_SceneCredits L"SceneCredits" +#define IDC_Background "Background" +#define IDC_XuiText1 "XuiText1" +#define IDC_XuiText2 "XuiText2" +#define IDC_XuiText3 "XuiText3" +#define IDC_XuiText4 "XuiText4" +#define IDC_XuiText5 "XuiText5" +#define IDC_XuiText6 "XuiText6" +#define IDC_XuiText7 "XuiText7" +#define IDC_XuiText8 "XuiText8" +#define IDC_XuiText9 "XuiText9" +#define IDC_XuiText10 "XuiText10" +#define IDC_XuiText11 "XuiText11" +#define IDC_XuiText12 "XuiText12" +#define IDC_XuiText13 "XuiText13" +#define IDC_XuiText14 "XuiText14" +#define IDC_XuiText15 "XuiText15" +#define IDC_XuiText16 "XuiText16" +#define IDC_XuiText17 "XuiText17" +#define IDC_XuiText18 "XuiText18" +#define IDC_XuiText19 "XuiText19" +#define IDC_XuiText20 "XuiText20" +#define IDC_XuiText21 "XuiText21" +#define IDC_XuiText22 "XuiText22" +#define IDC_XuiText23 "XuiText23" +#define IDC_XuiText24 "XuiText24" +#define IDC_XuiText25 "XuiText25" +#define IDC_XuiText26 "XuiText26" +#define IDC_XuiText27 "XuiText27" +#define IDC_XuiText28 "XuiText28" +#define IDC_Logo "Logo" +#define IDC_SceneCredits "SceneCredits" diff --git a/targets/resources/XboxMedia/Media/xuiscene_death.h b/targets/resources/XboxMedia/Media/xuiscene_death.h index b686a1678..61137b138 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_death.h +++ b/targets/resources/XboxMedia/Media/xuiscene_death.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_ExitGame L"ExitGame" -#define IDC_Respawn L"Respawn" -#define IDC_Title L"Title" -#define IDC_SceneDeath L"SceneDeath" +#define IDC_ExitGame "ExitGame" +#define IDC_Respawn "Respawn" +#define IDC_Title "Title" +#define IDC_SceneDeath "SceneDeath" diff --git a/targets/resources/XboxMedia/Media/xuiscene_death_480.h b/targets/resources/XboxMedia/Media/xuiscene_death_480.h index b686a1678..61137b138 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_death_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_death_480.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_ExitGame L"ExitGame" -#define IDC_Respawn L"Respawn" -#define IDC_Title L"Title" -#define IDC_SceneDeath L"SceneDeath" +#define IDC_ExitGame "ExitGame" +#define IDC_Respawn "Respawn" +#define IDC_Title "Title" +#define IDC_SceneDeath "SceneDeath" diff --git a/targets/resources/XboxMedia/Media/xuiscene_death_small.h b/targets/resources/XboxMedia/Media/xuiscene_death_small.h index b686a1678..61137b138 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_death_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_death_small.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_ExitGame L"ExitGame" -#define IDC_Respawn L"Respawn" -#define IDC_Title L"Title" -#define IDC_SceneDeath L"SceneDeath" +#define IDC_ExitGame "ExitGame" +#define IDC_Respawn "Respawn" +#define IDC_Title "Title" +#define IDC_SceneDeath "SceneDeath" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug.h b/targets/resources/XboxMedia/Media/xuiscene_debug.h index 08fc1be17..e46cce611 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_XuiImage1 L"XuiImage1" -#define IDC_XuiCheckbox1 L"XuiCheckbox1" -#define IDC_XuiCheckbox2 L"XuiCheckbox2" -#define IDC_XuiCheckbox3 L"XuiCheckbox3" -#define IDC_XuiCheckbox4 L"XuiCheckbox4" -#define IDC_SceneDebug L"SceneDebug" +#define IDC_XuiImage1 "XuiImage1" +#define IDC_XuiCheckbox1 "XuiCheckbox1" +#define IDC_XuiCheckbox2 "XuiCheckbox2" +#define IDC_XuiCheckbox3 "XuiCheckbox3" +#define IDC_XuiCheckbox4 "XuiCheckbox4" +#define IDC_SceneDebug "SceneDebug" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug_480.h b/targets/resources/XboxMedia/Media/xuiscene_debug_480.h index bffba0025..22aeb9e6e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug_480.h @@ -1,6 +1,6 @@ #pragma once -#define IDC_XuiCheckbox1 L"XuiCheckbox1" -#define IDC_XuiCheckbox2 L"XuiCheckbox2" -#define IDC_XuiCheckbox3 L"XuiCheckbox3" -#define IDC_XuiCheckbox4 L"XuiCheckbox4" -#define IDC_SceneDebug L"SceneDebug" +#define IDC_XuiCheckbox1 "XuiCheckbox1" +#define IDC_XuiCheckbox2 "XuiCheckbox2" +#define IDC_XuiCheckbox3 "XuiCheckbox3" +#define IDC_XuiCheckbox4 "XuiCheckbox4" +#define IDC_SceneDebug "SceneDebug" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug_item_editor.h b/targets/resources/XboxMedia/Media/xuiscene_debug_item_editor.h index 632bdc168..b82a9d44a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug_item_editor.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug_item_editor.h @@ -1,13 +1,13 @@ #pragma once -#define IDC_icon L"icon" -#define IDC_itemName L"itemName" -#define IDC_itemId L"itemId" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_itemAuxValue L"itemAuxValue" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_itemCount L"itemCount" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_item4JData L"item4JData" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_ruleXml L"ruleXml" -#define IDC_DebugItemEditor L"DebugItemEditor" +#define IDC_icon "icon" +#define IDC_itemName "itemName" +#define IDC_itemId "itemId" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_itemAuxValue "itemAuxValue" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_itemCount "itemCount" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_item4JData "item4JData" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_ruleXml "ruleXml" +#define IDC_DebugItemEditor "DebugItemEditor" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug_schematic_create.h b/targets/resources/XboxMedia/Media/xuiscene_debug_schematic_create.h index dc1a0a4c3..b4a814f91 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug_schematic_create.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug_schematic_create.h @@ -1,20 +1,20 @@ #pragma once -#define IDC_StartX L"StartX" -#define IDC_StartY L"StartY" -#define IDC_StartZ L"StartZ" -#define IDC_EndX L"EndX" -#define IDC_EndY L"EndY" -#define IDC_EndZ L"EndZ" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiLabel5 L"XuiLabel5" -#define IDC_XuiLabel6 L"XuiLabel6" -#define IDC_CreateButton L"CreateButton" -#define IDC_Name L"Name" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_XuiLabel8 L"XuiLabel8" -#define IDC_SaveMobs L"SaveMobs" -#define IDC_UseXboxCompression L"UseXboxCompression" -#define IDC_XuiDebugSchematic L"XuiDebugSchematic" +#define IDC_StartX "StartX" +#define IDC_StartY "StartY" +#define IDC_StartZ "StartZ" +#define IDC_EndX "EndX" +#define IDC_EndY "EndY" +#define IDC_EndZ "EndZ" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiLabel5 "XuiLabel5" +#define IDC_XuiLabel6 "XuiLabel6" +#define IDC_CreateButton "CreateButton" +#define IDC_Name "Name" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_XuiLabel8 "XuiLabel8" +#define IDC_SaveMobs "SaveMobs" +#define IDC_UseXboxCompression "UseXboxCompression" +#define IDC_XuiDebugSchematic "XuiDebugSchematic" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug_set_camera.h b/targets/resources/XboxMedia/Media/xuiscene_debug_set_camera.h index cec8d5519..afbc4ce68 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug_set_camera.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug_set_camera.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_CamX L"CamX" -#define IDC_CamZ L"CamZ" -#define IDC_YRot L"YRot" -#define IDC_CamY L"CamY" -#define IDC_Elevation L"Elevation" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiLabel2 L"XuiLabel2" -#define IDC_XuiLabel3 L"XuiLabel3" -#define IDC_XuiLabel4 L"XuiLabel4" -#define IDC_XuiLabel7 L"XuiLabel7" -#define IDC_LockPlayer L"LockPlayer" -#define IDC_Teleport L"Teleport" -#define IDC_XuiDebugSetCamera L"XuiDebugSetCamera" +#define IDC_CamX "CamX" +#define IDC_CamZ "CamZ" +#define IDC_YRot "YRot" +#define IDC_CamY "CamY" +#define IDC_Elevation "Elevation" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiLabel2 "XuiLabel2" +#define IDC_XuiLabel3 "XuiLabel3" +#define IDC_XuiLabel4 "XuiLabel4" +#define IDC_XuiLabel7 "XuiLabel7" +#define IDC_LockPlayer "LockPlayer" +#define IDC_Teleport "Teleport" +#define IDC_XuiDebugSetCamera "XuiDebugSetCamera" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debug_small.h b/targets/resources/XboxMedia/Media/xuiscene_debug_small.h index 5a33e3e30..73a945b7f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debug_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debug_small.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_XuiCheckbox1 L"XuiCheckbox1" -#define IDC_SceneDebug L"SceneDebug" +#define IDC_XuiCheckbox1 "XuiCheckbox1" +#define IDC_SceneDebug "SceneDebug" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debugoverlay.h b/targets/resources/XboxMedia/Media/xuiscene_debugoverlay.h index e02dc1b90..7242e9dbc 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debugoverlay.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debugoverlay.h @@ -1,26 +1,26 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_ItemsList L"ItemsList" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_EnchantmentsList L"EnchantmentsList" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_MobList L"MobList" -#define IDC_SliderFov L"SliderFov" -#define IDC_SliderTime L"SliderTime" -#define IDC_SetNight L"SetNight" -#define IDC_SetDay L"SetDay" -#define IDC_ToggleThunder L"ToggleThunder" -#define IDC_ToggleRain L"ToggleRain" -#define IDC_CreateSchematic L"CreateSchematic" -#define IDC_ResetTutorial L"ResetTutorial" -#define IDC_SetCamera L"SetCamera" -#define IDC_SaveToFile L"SaveToFile" -#define IDC_ChunkRadius L"ChunkRadius" -#define IDC_DebugOverlay L"DebugOverlay" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_ItemsList "ItemsList" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_EnchantmentsList "EnchantmentsList" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_MobList "MobList" +#define IDC_SliderFov "SliderFov" +#define IDC_SliderTime "SliderTime" +#define IDC_SetNight "SetNight" +#define IDC_SetDay "SetDay" +#define IDC_ToggleThunder "ToggleThunder" +#define IDC_ToggleRain "ToggleRain" +#define IDC_CreateSchematic "CreateSchematic" +#define IDC_ResetTutorial "ResetTutorial" +#define IDC_SetCamera "SetCamera" +#define IDC_SaveToFile "SaveToFile" +#define IDC_ChunkRadius "ChunkRadius" +#define IDC_DebugOverlay "DebugOverlay" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debugoverlay_480.h b/targets/resources/XboxMedia/Media/xuiscene_debugoverlay_480.h index c29126071..efe66b916 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debugoverlay_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debugoverlay_480.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_ItemsList L"ItemsList" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_MobList L"MobList" -#define IDC_SliderFov L"SliderFov" -#define IDC_SliderTime L"SliderTime" -#define IDC_ToggleThunder L"ToggleThunder" -#define IDC_ToggleRain L"ToggleRain" -#define IDC_SetSpawn L"SetSpawn" -#define IDC_ResetTutorial L"ResetTutorial" -#define IDC_SaveToFile L"SaveToFile" -#define IDC_ChunkRadius L"ChunkRadius" -#define IDC_DebugOverlay L"DebugOverlay" +#define IDC_control_ListItem "control_ListItem" +#define IDC_ItemsList "ItemsList" +#define IDC_control_ListItem "control_ListItem" +#define IDC_MobList "MobList" +#define IDC_SliderFov "SliderFov" +#define IDC_SliderTime "SliderTime" +#define IDC_ToggleThunder "ToggleThunder" +#define IDC_ToggleRain "ToggleRain" +#define IDC_SetSpawn "SetSpawn" +#define IDC_ResetTutorial "ResetTutorial" +#define IDC_SaveToFile "SaveToFile" +#define IDC_ChunkRadius "ChunkRadius" +#define IDC_DebugOverlay "DebugOverlay" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debugtips.h b/targets/resources/XboxMedia/Media/xuiscene_debugtips.h index 222e40f0d..52b579836 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debugtips.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debugtips.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_DebugTips L"DebugTips" +#define IDC_Tip "Tip" +#define IDC_DebugTips "DebugTips" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debugtips_480.h b/targets/resources/XboxMedia/Media/xuiscene_debugtips_480.h index 222e40f0d..52b579836 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debugtips_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debugtips_480.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_DebugTips L"DebugTips" +#define IDC_Tip "Tip" +#define IDC_DebugTips "DebugTips" diff --git a/targets/resources/XboxMedia/Media/xuiscene_debugtips_small.h b/targets/resources/XboxMedia/Media/xuiscene_debugtips_small.h index 222e40f0d..52b579836 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_debugtips_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_debugtips_small.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_DebugTips L"DebugTips" +#define IDC_Tip "Tip" +#define IDC_DebugTips "DebugTips" diff --git a/targets/resources/XboxMedia/Media/xuiscene_enchant.h b/targets/resources/XboxMedia/Media/xuiscene_enchant.h index e97ee19a7..85fbf4ce1 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_enchant.h +++ b/targets/resources/XboxMedia/Media/xuiscene_enchant.h @@ -1,204 +1,204 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_EnchantText L"EnchantText" -#define IDC_InventoryText L"InventoryText" -#define IDC_EnchantmentBook L"EnchantmentBook" -#define IDC_EnchantPanel L"EnchantPanel" -#define IDC_EnchantButton3 L"EnchantButton3" -#define IDC_EnchantButton2 L"EnchantButton2" -#define IDC_EnchantButton1 L"EnchantButton1" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_EnchantText "EnchantText" +#define IDC_InventoryText "InventoryText" +#define IDC_EnchantmentBook "EnchantmentBook" +#define IDC_EnchantPanel "EnchantPanel" +#define IDC_EnchantButton3 "EnchantButton3" +#define IDC_EnchantButton2 "EnchantButton2" +#define IDC_EnchantButton1 "EnchantButton1" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_enchant_480.h b/targets/resources/XboxMedia/Media/xuiscene_enchant_480.h index 49aff8838..e151dcc70 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_enchant_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_enchant_480.h @@ -1,200 +1,200 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_EnchantText L"EnchantText" -#define IDC_InventoryText L"InventoryText" -#define IDC_EnchantPanel L"EnchantPanel" -#define IDC_EnchantButton3 L"EnchantButton3" -#define IDC_EnchantButton2 L"EnchantButton2" -#define IDC_EnchantButton1 L"EnchantButton1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_EnchantmentBook L"EnchantmentBook" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_EnchantText "EnchantText" +#define IDC_InventoryText "InventoryText" +#define IDC_EnchantPanel "EnchantPanel" +#define IDC_EnchantButton3 "EnchantButton3" +#define IDC_EnchantButton2 "EnchantButton2" +#define IDC_EnchantButton1 "EnchantButton1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_EnchantmentBook "EnchantmentBook" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_enchant_small.h b/targets/resources/XboxMedia/Media/xuiscene_enchant_small.h index 3c3e664d5..99f49fd6f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_enchant_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_enchant_small.h @@ -1,217 +1,217 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_EnchantText L"EnchantText" -#define IDC_InventoryText L"InventoryText" -#define IDC_EnchantmentBook L"EnchantmentBook" -#define IDC_EnchantPanel L"EnchantPanel" -#define IDC_EnchantButton3 L"EnchantButton3" -#define IDC_EnchantButton2 L"EnchantButton2" -#define IDC_EnchantButton1 L"EnchantButton1" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneEnchant L"XuiSceneEnchant" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_EnchantText "EnchantText" +#define IDC_InventoryText "InventoryText" +#define IDC_EnchantmentBook "EnchantmentBook" +#define IDC_EnchantPanel "EnchantPanel" +#define IDC_EnchantButton3 "EnchantButton3" +#define IDC_EnchantButton2 "EnchantButton2" +#define IDC_EnchantButton1 "EnchantButton1" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneEnchant "XuiSceneEnchant" diff --git a/targets/resources/XboxMedia/Media/xuiscene_fireworks.h b/targets/resources/XboxMedia/Media/xuiscene_fireworks.h index 52c36d888..927023745 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_fireworks.h +++ b/targets/resources/XboxMedia/Media/xuiscene_fireworks.h @@ -1,166 +1,166 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_Arrow L"Arrow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_FireworksText L"FireworksText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredients L"Ingredients" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_FireworksScene L"FireworksScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_Arrow "Arrow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_FireworksText "FireworksText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredients "Ingredients" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_FireworksScene "FireworksScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress.h b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress.h index 468f4bef6..8f81356bd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress.h +++ b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress.h @@ -1,24 +1,24 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_FullscreenProgressScene L"FullscreenProgressScene" +#define IDC_Tip "Tip" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_FullscreenProgressScene "FullscreenProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_480.h b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_480.h index be5efe9b2..2c59638ad 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_480.h @@ -1,24 +1,24 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_FullscreenProgressScene L"FullscreenProgressScene" +#define IDC_Tip "Tip" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_FullscreenProgressScene "FullscreenProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_small.h b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_small.h index 468f4bef6..8f81356bd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_fullscreenprogress_small.h @@ -1,24 +1,24 @@ #pragma once -#define IDC_Tip L"Tip" -#define IDC_Status L"Status" -#define IDC_Title L"Title" -#define IDC_Progress L"Progress" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_ButtonConfirm L"ButtonConfirm" -#define IDC_FullscreenProgressScene L"FullscreenProgressScene" +#define IDC_Tip "Tip" +#define IDC_Status "Status" +#define IDC_Title "Title" +#define IDC_Progress "Progress" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_ButtonConfirm "ButtonConfirm" +#define IDC_FullscreenProgressScene "FullscreenProgressScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_furnace.h b/targets/resources/XboxMedia/Media/xuiscene_furnace.h index 05855497b..3420aa7ac 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_furnace.h +++ b/targets/resources/XboxMedia/Media/xuiscene_furnace.h @@ -1,46 +1,46 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Fuel L"Fuel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Burn L"Burn" -#define IDC_Lit L"Lit" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_FurnaceText L"FurnaceText" -#define IDC_FuelText L"FuelText" -#define IDC_IngredientText L"IngredientText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneFurnace L"XuiSceneFurnace" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Fuel "Fuel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Burn "Burn" +#define IDC_Lit "Lit" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_FurnaceText "FurnaceText" +#define IDC_FuelText "FuelText" +#define IDC_IngredientText "IngredientText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneFurnace "XuiSceneFurnace" diff --git a/targets/resources/XboxMedia/Media/xuiscene_furnace_480.h b/targets/resources/XboxMedia/Media/xuiscene_furnace_480.h index bd479df0c..43b658591 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_furnace_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_furnace_480.h @@ -1,104 +1,104 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_Lit L"Lit" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Fuel L"Fuel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Burn L"Burn" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_FurnaceText L"FurnaceText" -#define IDC_FuelText L"FuelText" -#define IDC_IngredientText L"IngredientText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneFurnace L"XuiSceneFurnace" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_Lit "Lit" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Fuel "Fuel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Burn "Burn" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_FurnaceText "FurnaceText" +#define IDC_FuelText "FuelText" +#define IDC_IngredientText "IngredientText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneFurnace "XuiSceneFurnace" diff --git a/targets/resources/XboxMedia/Media/xuiscene_furnace_Small.h b/targets/resources/XboxMedia/Media/xuiscene_furnace_Small.h index 971a9ec24..277d98df7 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_furnace_Small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_furnace_Small.h @@ -1,62 +1,62 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Result L"Result" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Fuel L"Fuel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Ingredient L"Ingredient" -#define IDC_Burn L"Burn" -#define IDC_Lit L"Lit" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_FurnaceText L"FurnaceText" -#define IDC_FuelText L"FuelText" -#define IDC_IngredientText L"IngredientText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneFurnace L"XuiSceneFurnace" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Result "Result" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Fuel "Fuel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Ingredient "Ingredient" +#define IDC_Burn "Burn" +#define IDC_Lit "Lit" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_FurnaceText "FurnaceText" +#define IDC_FuelText "FuelText" +#define IDC_IngredientText "IngredientText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneFurnace "XuiSceneFurnace" diff --git a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions.h b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions.h index 7b67a88d2..33256247c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions.h +++ b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions.h @@ -1,26 +1,26 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_XuiButton7 L"XuiButton7" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneHelpAndOptions L"SceneHelpAndOptions" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_XuiButton7 "XuiButton7" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneHelpAndOptions "SceneHelpAndOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_480.h b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_480.h index 7b67a88d2..33256247c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_480.h @@ -1,26 +1,26 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_XuiButton7 L"XuiButton7" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneHelpAndOptions L"SceneHelpAndOptions" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_XuiButton7 "XuiButton7" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneHelpAndOptions "SceneHelpAndOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_small.h b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_small.h index 7b67a88d2..33256247c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_helpandoptions_small.h @@ -1,26 +1,26 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_XuiButton7 L"XuiButton7" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneHelpAndOptions L"SceneHelpAndOptions" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_XuiButton7 "XuiButton7" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneHelpAndOptions "SceneHelpAndOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hopper.h b/targets/resources/XboxMedia/Media/xuiscene_hopper.h index ca6d03899..66e2ac5d6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hopper.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hopper.h @@ -1,99 +1,99 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Hopper L"Hopper" -#define IDC_InventoryText L"InventoryText" -#define IDC_HopperText L"HopperText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HopperScene L"HopperScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Hopper "Hopper" +#define IDC_InventoryText "InventoryText" +#define IDC_HopperText "HopperText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HopperScene "HopperScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hopper_480.h b/targets/resources/XboxMedia/Media/xuiscene_hopper_480.h index 263aeddf7..6378295d5 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hopper_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hopper_480.h @@ -1,141 +1,141 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Hopper L"Hopper" -#define IDC_InventoryText L"InventoryText" -#define IDC_HopperText L"HopperText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HoperScene L"HoperScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Hopper "Hopper" +#define IDC_InventoryText "InventoryText" +#define IDC_HopperText "HopperText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HoperScene "HoperScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hopper_small.h b/targets/resources/XboxMedia/Media/xuiscene_hopper_small.h index ca6d03899..66e2ac5d6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hopper_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hopper_small.h @@ -1,99 +1,99 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Hopper L"Hopper" -#define IDC_InventoryText L"InventoryText" -#define IDC_HopperText L"HopperText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HopperScene L"HopperScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Hopper "Hopper" +#define IDC_InventoryText "InventoryText" +#define IDC_HopperText "HopperText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HopperScene "HopperScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_horse.h b/targets/resources/XboxMedia/Media/xuiscene_horse.h index c122d1f7d..7f22340dd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_horse.h +++ b/targets/resources/XboxMedia/Media/xuiscene_horse.h @@ -1,160 +1,160 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Chest L"Chest" -#define IDC_InventoryText L"InventoryText" -#define IDC_HorseText L"HorseText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Saddle L"Saddle" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Horse L"Horse" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HorseScene L"HorseScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Chest "Chest" +#define IDC_InventoryText "InventoryText" +#define IDC_HorseText "HorseText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Saddle "Saddle" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Horse "Horse" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HorseScene "HorseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_horse_480.h b/targets/resources/XboxMedia/Media/xuiscene_horse_480.h index f6375dc64..f8d53910d 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_horse_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_horse_480.h @@ -1,209 +1,209 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Chest L"Chest" -#define IDC_InventoryText L"InventoryText" -#define IDC_HopperText L"HopperText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Saddle L"Saddle" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Horse L"Horse" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HorseScene L"HorseScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Chest "Chest" +#define IDC_InventoryText "InventoryText" +#define IDC_HopperText "HopperText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Saddle "Saddle" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Horse "Horse" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HorseScene "HorseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_horse_small.h b/targets/resources/XboxMedia/Media/xuiscene_horse_small.h index a1311742e..9a1e2a36b 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_horse_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_horse_small.h @@ -1,163 +1,163 @@ -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Chest L"Chest" -#define IDC_InventoryText L"InventoryText" -#define IDC_HorseText L"HorseText" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Saddle L"Saddle" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Horse L"Horse" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_HorseScene L"HorseScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Chest "Chest" +#define IDC_InventoryText "InventoryText" +#define IDC_HorseText "HorseText" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Saddle "Saddle" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Horse "Horse" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_HorseScene "HorseScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay.h index 74ee33d6c..11ec80460 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay.h @@ -1,74 +1,74 @@ #pragma once -#define IDC_XuiImageNetherPortal L"XuiImageNetherPortal" -#define IDC_XuiHtmlControlNetherPortal L"XuiHtmlControlNetherPortal" -#define IDC_XuiImageTheEnd L"XuiImageTheEnd" -#define IDC_XuiHtmlControlTheEnd L"XuiHtmlControlTheEnd" -#define IDC_XuiImageDispenser L"XuiImageDispenser" -#define IDC_XuiHtmlControlDispenser L"XuiHtmlControlDispenser" -#define IDC_DInventory L"DInventory" -#define IDC_DText L"DText" -#define IDC_XuiHtmlControlHUD L"XuiHtmlControlHUD" -#define IDC_XuiImageHUD L"XuiImageHUD" -#define IDC_XuiHtmlControlBasics L"XuiHtmlControlBasics" -#define IDC_XuiImageInventory L"XuiImageInventory" -#define IDC_IInventory L"IInventory" -#define IDC_XuiHtmlControlInventory L"XuiHtmlControlInventory" -#define IDC_XuiImageChest L"XuiImageChest" -#define IDC_SCChest L"SCChest" -#define IDC_SCInventory L"SCInventory" -#define IDC_XuiHtmlControlChest L"XuiHtmlControlChest" -#define IDC_XuiHtmlControlLargeChest L"XuiHtmlControlLargeChest" -#define IDC_XuiImageLargeChest L"XuiImageLargeChest" -#define IDC_LCChest L"LCChest" -#define IDC_LCInventory L"LCInventory" -#define IDC_XuiImageFurnace L"XuiImageFurnace" -#define IDC_FChest L"FChest" -#define IDC_FIngredient L"FIngredient" -#define IDC_FInventory L"FInventory" -#define IDC_FFuel L"FFuel" -#define IDC_XuiHtmlControlFurnace L"XuiHtmlControlFurnace" -#define IDC_XuiImageCrafting L"XuiImageCrafting" -#define IDC_CInventory L"CInventory" -#define IDC_CGroup L"CGroup" -#define IDC_CItem L"CItem" -#define IDC_XuiHtmlControlCrafting L"XuiHtmlControlCrafting" -#define IDC_XuiImageCraftingTable L"XuiImageCraftingTable" -#define IDC_CTInventory3x3 L"CTInventory3x3" -#define IDC_CTGroup L"CTGroup" -#define IDC_CTItem L"CTItem" -#define IDC_XuiHtmlControlCraftingTable L"XuiHtmlControlCraftingTable" -#define IDC_XuiHtmlControlMultiplayer L"XuiHtmlControlMultiplayer" -#define IDC_XuiHtmlControlSocialMedia L"XuiHtmlControlSocialMedia" -#define IDC_XuiHtmlControlBanList L"XuiHtmlControlBanList" -#define IDC_XuiHtmlControlWhatsNew L"XuiHtmlControlWhatsNew" -#define IDC_XuiHtmlControlCreative L"XuiHtmlControlCreative" -#define IDC_XuiImageCreative L"XuiImageCreative" -#define IDC_CIGroup L"CIGroup" -#define IDC_XuiHtmlControlHostOptions L"XuiHtmlControlHostOptions" -#define IDC_XuiHtmlControlBreeding L"XuiHtmlControlBreeding" -#define IDC_XuiImageBreeding L"XuiImageBreeding" -#define IDC_XuiHtmlControlFarmingAnimals L"XuiHtmlControlFarmingAnimals" -#define IDC_XuiImageFarmingAnimals L"XuiImageFarmingAnimals" -#define IDC_XuiHtmlControlBrewing L"XuiHtmlControlBrewing" -#define IDC_XuiImageBrewing L"XuiImageBrewing" -#define IDC_BInventory L"BInventory" -#define IDC_BBrew L"BBrew" -#define IDC_XuiHtmlControlEnchantment L"XuiHtmlControlEnchantment" -#define IDC_XuiImageEnchantment L"XuiImageEnchantment" -#define IDC_EInventory L"EInventory" -#define IDC_EEnchant L"EEnchant" -#define IDC_XuiHtmlControlAnvil L"XuiHtmlControlAnvil" -#define IDC_XuiImageAnvil L"XuiImageAnvil" -#define IDC_ACost L"ACost" -#define IDC_AInventory L"AInventory" -#define IDC_ARepairAndName L"ARepairAndName" -#define IDC_XuiHtmlControlTrading L"XuiHtmlControlTrading" -#define IDC_XuiImageTrading L"XuiImageTrading" -#define IDC_TVillagerOffers L"TVillagerOffers" -#define IDC_TNeededForTrade L"TNeededForTrade" -#define IDC_TOffer1Label L"TOffer1Label" -#define IDC_TOffer2Label L"TOffer2Label" -#define IDC_TInventory L"TInventory" -#define IDC_XuiHtmlControlEnderchest L"XuiHtmlControlEnderchest" -#define IDC_XuiImageEnderchest L"XuiImageEnderchest" -#define IDC_SceneHowToPlay L"SceneHowToPlay" +#define IDC_XuiImageNetherPortal "XuiImageNetherPortal" +#define IDC_XuiHtmlControlNetherPortal "XuiHtmlControlNetherPortal" +#define IDC_XuiImageTheEnd "XuiImageTheEnd" +#define IDC_XuiHtmlControlTheEnd "XuiHtmlControlTheEnd" +#define IDC_XuiImageDispenser "XuiImageDispenser" +#define IDC_XuiHtmlControlDispenser "XuiHtmlControlDispenser" +#define IDC_DInventory "DInventory" +#define IDC_DText "DText" +#define IDC_XuiHtmlControlHUD "XuiHtmlControlHUD" +#define IDC_XuiImageHUD "XuiImageHUD" +#define IDC_XuiHtmlControlBasics "XuiHtmlControlBasics" +#define IDC_XuiImageInventory "XuiImageInventory" +#define IDC_IInventory "IInventory" +#define IDC_XuiHtmlControlInventory "XuiHtmlControlInventory" +#define IDC_XuiImageChest "XuiImageChest" +#define IDC_SCChest "SCChest" +#define IDC_SCInventory "SCInventory" +#define IDC_XuiHtmlControlChest "XuiHtmlControlChest" +#define IDC_XuiHtmlControlLargeChest "XuiHtmlControlLargeChest" +#define IDC_XuiImageLargeChest "XuiImageLargeChest" +#define IDC_LCChest "LCChest" +#define IDC_LCInventory "LCInventory" +#define IDC_XuiImageFurnace "XuiImageFurnace" +#define IDC_FChest "FChest" +#define IDC_FIngredient "FIngredient" +#define IDC_FInventory "FInventory" +#define IDC_FFuel "FFuel" +#define IDC_XuiHtmlControlFurnace "XuiHtmlControlFurnace" +#define IDC_XuiImageCrafting "XuiImageCrafting" +#define IDC_CInventory "CInventory" +#define IDC_CGroup "CGroup" +#define IDC_CItem "CItem" +#define IDC_XuiHtmlControlCrafting "XuiHtmlControlCrafting" +#define IDC_XuiImageCraftingTable "XuiImageCraftingTable" +#define IDC_CTInventory3x3 "CTInventory3x3" +#define IDC_CTGroup "CTGroup" +#define IDC_CTItem "CTItem" +#define IDC_XuiHtmlControlCraftingTable "XuiHtmlControlCraftingTable" +#define IDC_XuiHtmlControlMultiplayer "XuiHtmlControlMultiplayer" +#define IDC_XuiHtmlControlSocialMedia "XuiHtmlControlSocialMedia" +#define IDC_XuiHtmlControlBanList "XuiHtmlControlBanList" +#define IDC_XuiHtmlControlWhatsNew "XuiHtmlControlWhatsNew" +#define IDC_XuiHtmlControlCreative "XuiHtmlControlCreative" +#define IDC_XuiImageCreative "XuiImageCreative" +#define IDC_CIGroup "CIGroup" +#define IDC_XuiHtmlControlHostOptions "XuiHtmlControlHostOptions" +#define IDC_XuiHtmlControlBreeding "XuiHtmlControlBreeding" +#define IDC_XuiImageBreeding "XuiImageBreeding" +#define IDC_XuiHtmlControlFarmingAnimals "XuiHtmlControlFarmingAnimals" +#define IDC_XuiImageFarmingAnimals "XuiImageFarmingAnimals" +#define IDC_XuiHtmlControlBrewing "XuiHtmlControlBrewing" +#define IDC_XuiImageBrewing "XuiImageBrewing" +#define IDC_BInventory "BInventory" +#define IDC_BBrew "BBrew" +#define IDC_XuiHtmlControlEnchantment "XuiHtmlControlEnchantment" +#define IDC_XuiImageEnchantment "XuiImageEnchantment" +#define IDC_EInventory "EInventory" +#define IDC_EEnchant "EEnchant" +#define IDC_XuiHtmlControlAnvil "XuiHtmlControlAnvil" +#define IDC_XuiImageAnvil "XuiImageAnvil" +#define IDC_ACost "ACost" +#define IDC_AInventory "AInventory" +#define IDC_ARepairAndName "ARepairAndName" +#define IDC_XuiHtmlControlTrading "XuiHtmlControlTrading" +#define IDC_XuiImageTrading "XuiImageTrading" +#define IDC_TVillagerOffers "TVillagerOffers" +#define IDC_TNeededForTrade "TNeededForTrade" +#define IDC_TOffer1Label "TOffer1Label" +#define IDC_TOffer2Label "TOffer2Label" +#define IDC_TInventory "TInventory" +#define IDC_XuiHtmlControlEnderchest "XuiHtmlControlEnderchest" +#define IDC_XuiImageEnderchest "XuiImageEnderchest" +#define IDC_SceneHowToPlay "SceneHowToPlay" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_480.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_480.h index 96f00516c..2cda89aec 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_480.h @@ -1,73 +1,73 @@ #pragma once -#define IDC_XuiHtmlControlTheEnd L"XuiHtmlControlTheEnd" -#define IDC_XuiImageTheEnd L"XuiImageTheEnd" -#define IDC_XuiHtmlControlNetherPortal L"XuiHtmlControlNetherPortal" -#define IDC_XuiImageNetherPortal L"XuiImageNetherPortal" -#define IDC_XuiHtmlControlDispenser L"XuiHtmlControlDispenser" -#define IDC_XuiImageDispenser L"XuiImageDispenser" -#define IDC_DInventory L"DInventory" -#define IDC_DText L"DText" -#define IDC_XuiHtmlControlHUD L"XuiHtmlControlHUD" -#define IDC_XuiImageHUD L"XuiImageHUD" -#define IDC_XuiHtmlControlBasics L"XuiHtmlControlBasics" -#define IDC_XuiHtmlControlInventory L"XuiHtmlControlInventory" -#define IDC_XuiImageInventory L"XuiImageInventory" -#define IDC_IInventory L"IInventory" -#define IDC_XuiHtmlControlChest L"XuiHtmlControlChest" -#define IDC_XuiImageChest L"XuiImageChest" -#define IDC_SCChest L"SCChest" -#define IDC_SCInventory L"SCInventory" -#define IDC_XuiHtmlControlLargeChest L"XuiHtmlControlLargeChest" -#define IDC_XuiImageLargeChest L"XuiImageLargeChest" -#define IDC_LCChest L"LCChest" -#define IDC_LCInventory L"LCInventory" -#define IDC_XuiHtmlControlFurnace L"XuiHtmlControlFurnace" -#define IDC_XuiImageFurnace L"XuiImageFurnace" -#define IDC_FChest L"FChest" -#define IDC_FIngredient L"FIngredient" -#define IDC_FInventory L"FInventory" -#define IDC_FFuel L"FFuel" -#define IDC_XuiHtmlControlCrafting L"XuiHtmlControlCrafting" -#define IDC_XuiImageCrafting L"XuiImageCrafting" -#define IDC_CInventory L"CInventory" -#define IDC_CGroup L"CGroup" -#define IDC_CItem L"CItem" -#define IDC_XuiHtmlControlCraftingTable L"XuiHtmlControlCraftingTable" -#define IDC_XuiImageCraftingTable L"XuiImageCraftingTable" -#define IDC_CTInventory3x3 L"CTInventory3x3" -#define IDC_CTGroup L"CTGroup" -#define IDC_CTItem L"CTItem" -#define IDC_XuiHtmlControlSocialMedia L"XuiHtmlControlSocialMedia" -#define IDC_XuiHtmlControlMultiplayer L"XuiHtmlControlMultiplayer" -#define IDC_XuiHtmlControlWhatsNew L"XuiHtmlControlWhatsNew" -#define IDC_XuiHtmlControlBanList L"XuiHtmlControlBanList" -#define IDC_XuiImageCreative L"XuiImageCreative" -#define IDC_XuiHtmlControlCreative L"XuiHtmlControlCreative" -#define IDC_CIGroup L"CIGroup" -#define IDC_XuiHtmlControlHostOptions L"XuiHtmlControlHostOptions" -#define IDC_XuiHtmlControlBreeding L"XuiHtmlControlBreeding" -#define IDC_XuiImageBreeding L"XuiImageBreeding" -#define IDC_XuiHtmlControlFarmingAnimals L"XuiHtmlControlFarmingAnimals" -#define IDC_XuiImageFarmingAnimals L"XuiImageFarmingAnimals" -#define IDC_XuiHtmlControlBrewing L"XuiHtmlControlBrewing" -#define IDC_XuiImageBrewing L"XuiImageBrewing" -#define IDC_BInventory L"BInventory" -#define IDC_BBrew L"BBrew" -#define IDC_XuiImageEnchantment L"XuiImageEnchantment" -#define IDC_XuiHtmlControlEnchantment L"XuiHtmlControlEnchantment" -#define IDC_EInventory L"EInventory" -#define IDC_EEnchant L"EEnchant" -#define IDC_XuiImageAnvil L"XuiImageAnvil" -#define IDC_XuiHtmlControlAnvil L"XuiHtmlControlAnvil" -#define IDC_ACost L"ACost" -#define IDC_AInventory L"AInventory" -#define IDC_ARepairAndName L"ARepairAndName" -#define IDC_XuiHtmlControlTrading L"XuiHtmlControlTrading" -#define IDC_XuiImageTrading L"XuiImageTrading" -#define IDC_TInventory L"TInventory" -#define IDC_TOffer1Label L"TOffer1Label" -#define IDC_TNeededForTrade L"TNeededForTrade" -#define IDC_TVillagerOffers L"TVillagerOffers" -#define IDC_XuiHtmlControlEnderchest L"XuiHtmlControlEnderchest" -#define IDC_XuiImageEnderchest L"XuiImageEnderchest" -#define IDC_SceneHowToPlay L"SceneHowToPlay" +#define IDC_XuiHtmlControlTheEnd "XuiHtmlControlTheEnd" +#define IDC_XuiImageTheEnd "XuiImageTheEnd" +#define IDC_XuiHtmlControlNetherPortal "XuiHtmlControlNetherPortal" +#define IDC_XuiImageNetherPortal "XuiImageNetherPortal" +#define IDC_XuiHtmlControlDispenser "XuiHtmlControlDispenser" +#define IDC_XuiImageDispenser "XuiImageDispenser" +#define IDC_DInventory "DInventory" +#define IDC_DText "DText" +#define IDC_XuiHtmlControlHUD "XuiHtmlControlHUD" +#define IDC_XuiImageHUD "XuiImageHUD" +#define IDC_XuiHtmlControlBasics "XuiHtmlControlBasics" +#define IDC_XuiHtmlControlInventory "XuiHtmlControlInventory" +#define IDC_XuiImageInventory "XuiImageInventory" +#define IDC_IInventory "IInventory" +#define IDC_XuiHtmlControlChest "XuiHtmlControlChest" +#define IDC_XuiImageChest "XuiImageChest" +#define IDC_SCChest "SCChest" +#define IDC_SCInventory "SCInventory" +#define IDC_XuiHtmlControlLargeChest "XuiHtmlControlLargeChest" +#define IDC_XuiImageLargeChest "XuiImageLargeChest" +#define IDC_LCChest "LCChest" +#define IDC_LCInventory "LCInventory" +#define IDC_XuiHtmlControlFurnace "XuiHtmlControlFurnace" +#define IDC_XuiImageFurnace "XuiImageFurnace" +#define IDC_FChest "FChest" +#define IDC_FIngredient "FIngredient" +#define IDC_FInventory "FInventory" +#define IDC_FFuel "FFuel" +#define IDC_XuiHtmlControlCrafting "XuiHtmlControlCrafting" +#define IDC_XuiImageCrafting "XuiImageCrafting" +#define IDC_CInventory "CInventory" +#define IDC_CGroup "CGroup" +#define IDC_CItem "CItem" +#define IDC_XuiHtmlControlCraftingTable "XuiHtmlControlCraftingTable" +#define IDC_XuiImageCraftingTable "XuiImageCraftingTable" +#define IDC_CTInventory3x3 "CTInventory3x3" +#define IDC_CTGroup "CTGroup" +#define IDC_CTItem "CTItem" +#define IDC_XuiHtmlControlSocialMedia "XuiHtmlControlSocialMedia" +#define IDC_XuiHtmlControlMultiplayer "XuiHtmlControlMultiplayer" +#define IDC_XuiHtmlControlWhatsNew "XuiHtmlControlWhatsNew" +#define IDC_XuiHtmlControlBanList "XuiHtmlControlBanList" +#define IDC_XuiImageCreative "XuiImageCreative" +#define IDC_XuiHtmlControlCreative "XuiHtmlControlCreative" +#define IDC_CIGroup "CIGroup" +#define IDC_XuiHtmlControlHostOptions "XuiHtmlControlHostOptions" +#define IDC_XuiHtmlControlBreeding "XuiHtmlControlBreeding" +#define IDC_XuiImageBreeding "XuiImageBreeding" +#define IDC_XuiHtmlControlFarmingAnimals "XuiHtmlControlFarmingAnimals" +#define IDC_XuiImageFarmingAnimals "XuiImageFarmingAnimals" +#define IDC_XuiHtmlControlBrewing "XuiHtmlControlBrewing" +#define IDC_XuiImageBrewing "XuiImageBrewing" +#define IDC_BInventory "BInventory" +#define IDC_BBrew "BBrew" +#define IDC_XuiImageEnchantment "XuiImageEnchantment" +#define IDC_XuiHtmlControlEnchantment "XuiHtmlControlEnchantment" +#define IDC_EInventory "EInventory" +#define IDC_EEnchant "EEnchant" +#define IDC_XuiImageAnvil "XuiImageAnvil" +#define IDC_XuiHtmlControlAnvil "XuiHtmlControlAnvil" +#define IDC_ACost "ACost" +#define IDC_AInventory "AInventory" +#define IDC_ARepairAndName "ARepairAndName" +#define IDC_XuiHtmlControlTrading "XuiHtmlControlTrading" +#define IDC_XuiImageTrading "XuiImageTrading" +#define IDC_TInventory "TInventory" +#define IDC_TOffer1Label "TOffer1Label" +#define IDC_TNeededForTrade "TNeededForTrade" +#define IDC_TVillagerOffers "TVillagerOffers" +#define IDC_XuiHtmlControlEnderchest "XuiHtmlControlEnderchest" +#define IDC_XuiImageEnderchest "XuiImageEnderchest" +#define IDC_SceneHowToPlay "SceneHowToPlay" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu.h index 5118bf79c..e64cc4b11 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu.h @@ -1,10 +1,10 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_HowToListButtons L"HowToListButtons" -#define IDC_SceneHowToPlayMenu L"SceneHowToPlayMenu" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_HowToListButtons "HowToListButtons" +#define IDC_SceneHowToPlayMenu "SceneHowToPlayMenu" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_480.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_480.h index e4d091802..43c0cd2d6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_480.h @@ -1,6 +1,6 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_HowToListButtons L"HowToListButtons" -#define IDC_SceneHowToPlayMenu L"SceneHowToPlayMenu" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_HowToListButtons "HowToListButtons" +#define IDC_SceneHowToPlayMenu "SceneHowToPlayMenu" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_small.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_small.h index ca8b96402..f12f5d333 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_menu_small.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_HowToListButtons L"HowToListButtons" -#define IDC_SceneHowToPlayMenu L"SceneHowToPlayMenu" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_HowToListButtons "HowToListButtons" +#define IDC_SceneHowToPlayMenu "SceneHowToPlayMenu" diff --git a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_small.h b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_small.h index 43ffbdf41..e433c628c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_howtoplay_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_howtoplay_small.h @@ -1,73 +1,73 @@ #pragma once -#define IDC_XuiHtmlControlTheEnd L"XuiHtmlControlTheEnd" -#define IDC_XuiImageTheEnd L"XuiImageTheEnd" -#define IDC_XuiHtmlControlNetherPortal L"XuiHtmlControlNetherPortal" -#define IDC_XuiImageNetherPortal L"XuiImageNetherPortal" -#define IDC_XuiHtmlControlDispenser L"XuiHtmlControlDispenser" -#define IDC_XuiImageDispenser L"XuiImageDispenser" -#define IDC_DInventory L"DInventory" -#define IDC_DText L"DText" -#define IDC_XuiImageHUD L"XuiImageHUD" -#define IDC_XuiHtmlControlHUD L"XuiHtmlControlHUD" -#define IDC_XuiHtmlControlBasics L"XuiHtmlControlBasics" -#define IDC_XuiImageInventory L"XuiImageInventory" -#define IDC_XuiHtmlControlInventory L"XuiHtmlControlInventory" -#define IDC_IInventory L"IInventory" -#define IDC_XuiImageChest L"XuiImageChest" -#define IDC_XuiHtmlControlChest L"XuiHtmlControlChest" -#define IDC_SCChest L"SCChest" -#define IDC_SCInventory L"SCInventory" -#define IDC_XuiImageLargeChest L"XuiImageLargeChest" -#define IDC_XuiHtmlControlLargeChest L"XuiHtmlControlLargeChest" -#define IDC_LCChest L"LCChest" -#define IDC_LCInventory L"LCInventory" -#define IDC_XuiHtmlControlFurnace L"XuiHtmlControlFurnace" -#define IDC_XuiImageFurnace L"XuiImageFurnace" -#define IDC_FChest L"FChest" -#define IDC_FIngredient L"FIngredient" -#define IDC_FInventory L"FInventory" -#define IDC_FFuel L"FFuel" -#define IDC_XuiHtmlControlCrafting L"XuiHtmlControlCrafting" -#define IDC_XuiImageCrafting L"XuiImageCrafting" -#define IDC_CInventory L"CInventory" -#define IDC_CGroup L"CGroup" -#define IDC_CItem L"CItem" -#define IDC_XuiHtmlControlCraftingTable L"XuiHtmlControlCraftingTable" -#define IDC_XuiImageCraftingTable L"XuiImageCraftingTable" -#define IDC_CTInventory3x3 L"CTInventory3x3" -#define IDC_CTGroup L"CTGroup" -#define IDC_CTItem L"CTItem" -#define IDC_XuiHtmlControlMultiplayer L"XuiHtmlControlMultiplayer" -#define IDC_XuiHtmlControlSocialMedia L"XuiHtmlControlSocialMedia" -#define IDC_XuiHtmlControlWhatsNew L"XuiHtmlControlWhatsNew" -#define IDC_XuiHtmlControlBanList L"XuiHtmlControlBanList" -#define IDC_XuiHtmlControlCreative L"XuiHtmlControlCreative" -#define IDC_XuiImageCreative L"XuiImageCreative" -#define IDC_CIGroup L"CIGroup" -#define IDC_XuiHtmlControlHostOptions L"XuiHtmlControlHostOptions" -#define IDC_XuiHtmlControlBreeding L"XuiHtmlControlBreeding" -#define IDC_XuiImageBreeding L"XuiImageBreeding" -#define IDC_XuiHtmlControlFarmingAnimals L"XuiHtmlControlFarmingAnimals" -#define IDC_XuiImageFarmingAnimals L"XuiImageFarmingAnimals" -#define IDC_XuiHtmlControlBrewing L"XuiHtmlControlBrewing" -#define IDC_XuiImageBrewing L"XuiImageBrewing" -#define IDC_BBrew L"BBrew" -#define IDC_BInventory L"BInventory" -#define IDC_XuiImageEnchantment L"XuiImageEnchantment" -#define IDC_XuiHtmlControlEnchantment L"XuiHtmlControlEnchantment" -#define IDC_EInventory L"EInventory" -#define IDC_EEnchant L"EEnchant" -#define IDC_XuiHtmlControlAnvil L"XuiHtmlControlAnvil" -#define IDC_XuiImageAnvil L"XuiImageAnvil" -#define IDC_ACost L"ACost" -#define IDC_AInventory L"AInventory" -#define IDC_ARepairAndName L"ARepairAndName" -#define IDC_XuiHtmlControlTrading L"XuiHtmlControlTrading" -#define IDC_XuiImageTrading L"XuiImageTrading" -#define IDC_TVillagerOffers L"TVillagerOffers" -#define IDC_TNeededForTrade L"TNeededForTrade" -#define IDC_TOffer1Label L"TOffer1Label" -#define IDC_TInventory L"TInventory" -#define IDC_XuiImageEnderchest L"XuiImageEnderchest" -#define IDC_XuiHtmlControlEnderchest L"XuiHtmlControlEnderchest" -#define IDC_SceneHowToPlay L"SceneHowToPlay" +#define IDC_XuiHtmlControlTheEnd "XuiHtmlControlTheEnd" +#define IDC_XuiImageTheEnd "XuiImageTheEnd" +#define IDC_XuiHtmlControlNetherPortal "XuiHtmlControlNetherPortal" +#define IDC_XuiImageNetherPortal "XuiImageNetherPortal" +#define IDC_XuiHtmlControlDispenser "XuiHtmlControlDispenser" +#define IDC_XuiImageDispenser "XuiImageDispenser" +#define IDC_DInventory "DInventory" +#define IDC_DText "DText" +#define IDC_XuiImageHUD "XuiImageHUD" +#define IDC_XuiHtmlControlHUD "XuiHtmlControlHUD" +#define IDC_XuiHtmlControlBasics "XuiHtmlControlBasics" +#define IDC_XuiImageInventory "XuiImageInventory" +#define IDC_XuiHtmlControlInventory "XuiHtmlControlInventory" +#define IDC_IInventory "IInventory" +#define IDC_XuiImageChest "XuiImageChest" +#define IDC_XuiHtmlControlChest "XuiHtmlControlChest" +#define IDC_SCChest "SCChest" +#define IDC_SCInventory "SCInventory" +#define IDC_XuiImageLargeChest "XuiImageLargeChest" +#define IDC_XuiHtmlControlLargeChest "XuiHtmlControlLargeChest" +#define IDC_LCChest "LCChest" +#define IDC_LCInventory "LCInventory" +#define IDC_XuiHtmlControlFurnace "XuiHtmlControlFurnace" +#define IDC_XuiImageFurnace "XuiImageFurnace" +#define IDC_FChest "FChest" +#define IDC_FIngredient "FIngredient" +#define IDC_FInventory "FInventory" +#define IDC_FFuel "FFuel" +#define IDC_XuiHtmlControlCrafting "XuiHtmlControlCrafting" +#define IDC_XuiImageCrafting "XuiImageCrafting" +#define IDC_CInventory "CInventory" +#define IDC_CGroup "CGroup" +#define IDC_CItem "CItem" +#define IDC_XuiHtmlControlCraftingTable "XuiHtmlControlCraftingTable" +#define IDC_XuiImageCraftingTable "XuiImageCraftingTable" +#define IDC_CTInventory3x3 "CTInventory3x3" +#define IDC_CTGroup "CTGroup" +#define IDC_CTItem "CTItem" +#define IDC_XuiHtmlControlMultiplayer "XuiHtmlControlMultiplayer" +#define IDC_XuiHtmlControlSocialMedia "XuiHtmlControlSocialMedia" +#define IDC_XuiHtmlControlWhatsNew "XuiHtmlControlWhatsNew" +#define IDC_XuiHtmlControlBanList "XuiHtmlControlBanList" +#define IDC_XuiHtmlControlCreative "XuiHtmlControlCreative" +#define IDC_XuiImageCreative "XuiImageCreative" +#define IDC_CIGroup "CIGroup" +#define IDC_XuiHtmlControlHostOptions "XuiHtmlControlHostOptions" +#define IDC_XuiHtmlControlBreeding "XuiHtmlControlBreeding" +#define IDC_XuiImageBreeding "XuiImageBreeding" +#define IDC_XuiHtmlControlFarmingAnimals "XuiHtmlControlFarmingAnimals" +#define IDC_XuiImageFarmingAnimals "XuiImageFarmingAnimals" +#define IDC_XuiHtmlControlBrewing "XuiHtmlControlBrewing" +#define IDC_XuiImageBrewing "XuiImageBrewing" +#define IDC_BBrew "BBrew" +#define IDC_BInventory "BInventory" +#define IDC_XuiImageEnchantment "XuiImageEnchantment" +#define IDC_XuiHtmlControlEnchantment "XuiHtmlControlEnchantment" +#define IDC_EInventory "EInventory" +#define IDC_EEnchant "EEnchant" +#define IDC_XuiHtmlControlAnvil "XuiHtmlControlAnvil" +#define IDC_XuiImageAnvil "XuiImageAnvil" +#define IDC_ACost "ACost" +#define IDC_AInventory "AInventory" +#define IDC_ARepairAndName "ARepairAndName" +#define IDC_XuiHtmlControlTrading "XuiHtmlControlTrading" +#define IDC_XuiImageTrading "XuiImageTrading" +#define IDC_TVillagerOffers "TVillagerOffers" +#define IDC_TNeededForTrade "TNeededForTrade" +#define IDC_TOffer1Label "TOffer1Label" +#define IDC_TInventory "TInventory" +#define IDC_XuiImageEnderchest "XuiImageEnderchest" +#define IDC_XuiHtmlControlEnderchest "XuiHtmlControlEnderchest" +#define IDC_SceneHowToPlay "SceneHowToPlay" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hud.h b/targets/resources/XboxMedia/Media/xuiscene_hud.h index ed919f8b9..973f6c1ad 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hud.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hud.h @@ -1,63 +1,63 @@ #pragma once -#define IDC_Crosshair L"Crosshair" -#define IDC_Box L"Box" -#define IDC_Inventory1 L"Inventory1" -#define IDC_Inventory2 L"Inventory2" -#define IDC_Inventory3 L"Inventory3" -#define IDC_Inventory4 L"Inventory4" -#define IDC_Inventory5 L"Inventory5" -#define IDC_Inventory6 L"Inventory6" -#define IDC_Inventory7 L"Inventory7" -#define IDC_Inventory8 L"Inventory8" -#define IDC_Inventory9 L"Inventory9" -#define IDC_Hotbar L"Hotbar" -#define IDC_ExperienceProgress L"ExperienceProgress" -#define IDC_Health0 L"Health0" -#define IDC_Health1 L"Health1" -#define IDC_Health2 L"Health2" -#define IDC_Health3 L"Health3" -#define IDC_Health4 L"Health4" -#define IDC_Health5 L"Health5" -#define IDC_Health6 L"Health6" -#define IDC_Health7 L"Health7" -#define IDC_Health8 L"Health8" -#define IDC_Health9 L"Health9" -#define IDC_Health L"Health" -#define IDC_Armour0 L"Armour0" -#define IDC_Armour1 L"Armour1" -#define IDC_Armour2 L"Armour2" -#define IDC_Armour3 L"Armour3" -#define IDC_Armour4 L"Armour4" -#define IDC_Armour5 L"Armour5" -#define IDC_Armour6 L"Armour6" -#define IDC_Armour7 L"Armour7" -#define IDC_Armour8 L"Armour8" -#define IDC_Armour9 L"Armour9" -#define IDC_Armour L"Armour" -#define IDC_Food9 L"Food9" -#define IDC_Food8 L"Food8" -#define IDC_Food7 L"Food7" -#define IDC_Food6 L"Food6" -#define IDC_Food5 L"Food5" -#define IDC_Food4 L"Food4" -#define IDC_Food3 L"Food3" -#define IDC_Food2 L"Food2" -#define IDC_Food1 L"Food1" -#define IDC_Food0 L"Food0" -#define IDC_Food L"Food" -#define IDC_Air9 L"Air9" -#define IDC_Air8 L"Air8" -#define IDC_Air7 L"Air7" -#define IDC_Air6 L"Air6" -#define IDC_Air5 L"Air5" -#define IDC_Air4 L"Air4" -#define IDC_Air3 L"Air3" -#define IDC_Air2 L"Air2" -#define IDC_Air1 L"Air1" -#define IDC_Air0 L"Air0" -#define IDC_Air L"Air" -#define IDC_XPLevel L"XPLevel" -#define IDC_HudScaleGroup L"HudScaleGroup" -#define IDC_HudGroup L"HudGroup" -#define IDC_HudHolder L"HudHolder" -#define IDC_HUDScene L"HUDScene" +#define IDC_Crosshair "Crosshair" +#define IDC_Box "Box" +#define IDC_Inventory1 "Inventory1" +#define IDC_Inventory2 "Inventory2" +#define IDC_Inventory3 "Inventory3" +#define IDC_Inventory4 "Inventory4" +#define IDC_Inventory5 "Inventory5" +#define IDC_Inventory6 "Inventory6" +#define IDC_Inventory7 "Inventory7" +#define IDC_Inventory8 "Inventory8" +#define IDC_Inventory9 "Inventory9" +#define IDC_Hotbar "Hotbar" +#define IDC_ExperienceProgress "ExperienceProgress" +#define IDC_Health0 "Health0" +#define IDC_Health1 "Health1" +#define IDC_Health2 "Health2" +#define IDC_Health3 "Health3" +#define IDC_Health4 "Health4" +#define IDC_Health5 "Health5" +#define IDC_Health6 "Health6" +#define IDC_Health7 "Health7" +#define IDC_Health8 "Health8" +#define IDC_Health9 "Health9" +#define IDC_Health "Health" +#define IDC_Armour0 "Armour0" +#define IDC_Armour1 "Armour1" +#define IDC_Armour2 "Armour2" +#define IDC_Armour3 "Armour3" +#define IDC_Armour4 "Armour4" +#define IDC_Armour5 "Armour5" +#define IDC_Armour6 "Armour6" +#define IDC_Armour7 "Armour7" +#define IDC_Armour8 "Armour8" +#define IDC_Armour9 "Armour9" +#define IDC_Armour "Armour" +#define IDC_Food9 "Food9" +#define IDC_Food8 "Food8" +#define IDC_Food7 "Food7" +#define IDC_Food6 "Food6" +#define IDC_Food5 "Food5" +#define IDC_Food4 "Food4" +#define IDC_Food3 "Food3" +#define IDC_Food2 "Food2" +#define IDC_Food1 "Food1" +#define IDC_Food0 "Food0" +#define IDC_Food "Food" +#define IDC_Air9 "Air9" +#define IDC_Air8 "Air8" +#define IDC_Air7 "Air7" +#define IDC_Air6 "Air6" +#define IDC_Air5 "Air5" +#define IDC_Air4 "Air4" +#define IDC_Air3 "Air3" +#define IDC_Air2 "Air2" +#define IDC_Air1 "Air1" +#define IDC_Air0 "Air0" +#define IDC_Air "Air" +#define IDC_XPLevel "XPLevel" +#define IDC_HudScaleGroup "HudScaleGroup" +#define IDC_HudGroup "HudGroup" +#define IDC_HudHolder "HudHolder" +#define IDC_HUDScene "HUDScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hud_480.h b/targets/resources/XboxMedia/Media/xuiscene_hud_480.h index ed919f8b9..973f6c1ad 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hud_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hud_480.h @@ -1,63 +1,63 @@ #pragma once -#define IDC_Crosshair L"Crosshair" -#define IDC_Box L"Box" -#define IDC_Inventory1 L"Inventory1" -#define IDC_Inventory2 L"Inventory2" -#define IDC_Inventory3 L"Inventory3" -#define IDC_Inventory4 L"Inventory4" -#define IDC_Inventory5 L"Inventory5" -#define IDC_Inventory6 L"Inventory6" -#define IDC_Inventory7 L"Inventory7" -#define IDC_Inventory8 L"Inventory8" -#define IDC_Inventory9 L"Inventory9" -#define IDC_Hotbar L"Hotbar" -#define IDC_ExperienceProgress L"ExperienceProgress" -#define IDC_Health0 L"Health0" -#define IDC_Health1 L"Health1" -#define IDC_Health2 L"Health2" -#define IDC_Health3 L"Health3" -#define IDC_Health4 L"Health4" -#define IDC_Health5 L"Health5" -#define IDC_Health6 L"Health6" -#define IDC_Health7 L"Health7" -#define IDC_Health8 L"Health8" -#define IDC_Health9 L"Health9" -#define IDC_Health L"Health" -#define IDC_Armour0 L"Armour0" -#define IDC_Armour1 L"Armour1" -#define IDC_Armour2 L"Armour2" -#define IDC_Armour3 L"Armour3" -#define IDC_Armour4 L"Armour4" -#define IDC_Armour5 L"Armour5" -#define IDC_Armour6 L"Armour6" -#define IDC_Armour7 L"Armour7" -#define IDC_Armour8 L"Armour8" -#define IDC_Armour9 L"Armour9" -#define IDC_Armour L"Armour" -#define IDC_Food9 L"Food9" -#define IDC_Food8 L"Food8" -#define IDC_Food7 L"Food7" -#define IDC_Food6 L"Food6" -#define IDC_Food5 L"Food5" -#define IDC_Food4 L"Food4" -#define IDC_Food3 L"Food3" -#define IDC_Food2 L"Food2" -#define IDC_Food1 L"Food1" -#define IDC_Food0 L"Food0" -#define IDC_Food L"Food" -#define IDC_Air9 L"Air9" -#define IDC_Air8 L"Air8" -#define IDC_Air7 L"Air7" -#define IDC_Air6 L"Air6" -#define IDC_Air5 L"Air5" -#define IDC_Air4 L"Air4" -#define IDC_Air3 L"Air3" -#define IDC_Air2 L"Air2" -#define IDC_Air1 L"Air1" -#define IDC_Air0 L"Air0" -#define IDC_Air L"Air" -#define IDC_XPLevel L"XPLevel" -#define IDC_HudScaleGroup L"HudScaleGroup" -#define IDC_HudGroup L"HudGroup" -#define IDC_HudHolder L"HudHolder" -#define IDC_HUDScene L"HUDScene" +#define IDC_Crosshair "Crosshair" +#define IDC_Box "Box" +#define IDC_Inventory1 "Inventory1" +#define IDC_Inventory2 "Inventory2" +#define IDC_Inventory3 "Inventory3" +#define IDC_Inventory4 "Inventory4" +#define IDC_Inventory5 "Inventory5" +#define IDC_Inventory6 "Inventory6" +#define IDC_Inventory7 "Inventory7" +#define IDC_Inventory8 "Inventory8" +#define IDC_Inventory9 "Inventory9" +#define IDC_Hotbar "Hotbar" +#define IDC_ExperienceProgress "ExperienceProgress" +#define IDC_Health0 "Health0" +#define IDC_Health1 "Health1" +#define IDC_Health2 "Health2" +#define IDC_Health3 "Health3" +#define IDC_Health4 "Health4" +#define IDC_Health5 "Health5" +#define IDC_Health6 "Health6" +#define IDC_Health7 "Health7" +#define IDC_Health8 "Health8" +#define IDC_Health9 "Health9" +#define IDC_Health "Health" +#define IDC_Armour0 "Armour0" +#define IDC_Armour1 "Armour1" +#define IDC_Armour2 "Armour2" +#define IDC_Armour3 "Armour3" +#define IDC_Armour4 "Armour4" +#define IDC_Armour5 "Armour5" +#define IDC_Armour6 "Armour6" +#define IDC_Armour7 "Armour7" +#define IDC_Armour8 "Armour8" +#define IDC_Armour9 "Armour9" +#define IDC_Armour "Armour" +#define IDC_Food9 "Food9" +#define IDC_Food8 "Food8" +#define IDC_Food7 "Food7" +#define IDC_Food6 "Food6" +#define IDC_Food5 "Food5" +#define IDC_Food4 "Food4" +#define IDC_Food3 "Food3" +#define IDC_Food2 "Food2" +#define IDC_Food1 "Food1" +#define IDC_Food0 "Food0" +#define IDC_Food "Food" +#define IDC_Air9 "Air9" +#define IDC_Air8 "Air8" +#define IDC_Air7 "Air7" +#define IDC_Air6 "Air6" +#define IDC_Air5 "Air5" +#define IDC_Air4 "Air4" +#define IDC_Air3 "Air3" +#define IDC_Air2 "Air2" +#define IDC_Air1 "Air1" +#define IDC_Air0 "Air0" +#define IDC_Air "Air" +#define IDC_XPLevel "XPLevel" +#define IDC_HudScaleGroup "HudScaleGroup" +#define IDC_HudGroup "HudGroup" +#define IDC_HudHolder "HudHolder" +#define IDC_HUDScene "HUDScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_hud_small.h b/targets/resources/XboxMedia/Media/xuiscene_hud_small.h index ed919f8b9..973f6c1ad 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_hud_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_hud_small.h @@ -1,63 +1,63 @@ #pragma once -#define IDC_Crosshair L"Crosshair" -#define IDC_Box L"Box" -#define IDC_Inventory1 L"Inventory1" -#define IDC_Inventory2 L"Inventory2" -#define IDC_Inventory3 L"Inventory3" -#define IDC_Inventory4 L"Inventory4" -#define IDC_Inventory5 L"Inventory5" -#define IDC_Inventory6 L"Inventory6" -#define IDC_Inventory7 L"Inventory7" -#define IDC_Inventory8 L"Inventory8" -#define IDC_Inventory9 L"Inventory9" -#define IDC_Hotbar L"Hotbar" -#define IDC_ExperienceProgress L"ExperienceProgress" -#define IDC_Health0 L"Health0" -#define IDC_Health1 L"Health1" -#define IDC_Health2 L"Health2" -#define IDC_Health3 L"Health3" -#define IDC_Health4 L"Health4" -#define IDC_Health5 L"Health5" -#define IDC_Health6 L"Health6" -#define IDC_Health7 L"Health7" -#define IDC_Health8 L"Health8" -#define IDC_Health9 L"Health9" -#define IDC_Health L"Health" -#define IDC_Armour0 L"Armour0" -#define IDC_Armour1 L"Armour1" -#define IDC_Armour2 L"Armour2" -#define IDC_Armour3 L"Armour3" -#define IDC_Armour4 L"Armour4" -#define IDC_Armour5 L"Armour5" -#define IDC_Armour6 L"Armour6" -#define IDC_Armour7 L"Armour7" -#define IDC_Armour8 L"Armour8" -#define IDC_Armour9 L"Armour9" -#define IDC_Armour L"Armour" -#define IDC_Food9 L"Food9" -#define IDC_Food8 L"Food8" -#define IDC_Food7 L"Food7" -#define IDC_Food6 L"Food6" -#define IDC_Food5 L"Food5" -#define IDC_Food4 L"Food4" -#define IDC_Food3 L"Food3" -#define IDC_Food2 L"Food2" -#define IDC_Food1 L"Food1" -#define IDC_Food0 L"Food0" -#define IDC_Food L"Food" -#define IDC_Air9 L"Air9" -#define IDC_Air8 L"Air8" -#define IDC_Air7 L"Air7" -#define IDC_Air6 L"Air6" -#define IDC_Air5 L"Air5" -#define IDC_Air4 L"Air4" -#define IDC_Air3 L"Air3" -#define IDC_Air2 L"Air2" -#define IDC_Air1 L"Air1" -#define IDC_Air0 L"Air0" -#define IDC_Air L"Air" -#define IDC_XPLevel L"XPLevel" -#define IDC_HudScaleGroup L"HudScaleGroup" -#define IDC_HudGroup L"HudGroup" -#define IDC_HudHolder L"HudHolder" -#define IDC_HUDScene L"HUDScene" +#define IDC_Crosshair "Crosshair" +#define IDC_Box "Box" +#define IDC_Inventory1 "Inventory1" +#define IDC_Inventory2 "Inventory2" +#define IDC_Inventory3 "Inventory3" +#define IDC_Inventory4 "Inventory4" +#define IDC_Inventory5 "Inventory5" +#define IDC_Inventory6 "Inventory6" +#define IDC_Inventory7 "Inventory7" +#define IDC_Inventory8 "Inventory8" +#define IDC_Inventory9 "Inventory9" +#define IDC_Hotbar "Hotbar" +#define IDC_ExperienceProgress "ExperienceProgress" +#define IDC_Health0 "Health0" +#define IDC_Health1 "Health1" +#define IDC_Health2 "Health2" +#define IDC_Health3 "Health3" +#define IDC_Health4 "Health4" +#define IDC_Health5 "Health5" +#define IDC_Health6 "Health6" +#define IDC_Health7 "Health7" +#define IDC_Health8 "Health8" +#define IDC_Health9 "Health9" +#define IDC_Health "Health" +#define IDC_Armour0 "Armour0" +#define IDC_Armour1 "Armour1" +#define IDC_Armour2 "Armour2" +#define IDC_Armour3 "Armour3" +#define IDC_Armour4 "Armour4" +#define IDC_Armour5 "Armour5" +#define IDC_Armour6 "Armour6" +#define IDC_Armour7 "Armour7" +#define IDC_Armour8 "Armour8" +#define IDC_Armour9 "Armour9" +#define IDC_Armour "Armour" +#define IDC_Food9 "Food9" +#define IDC_Food8 "Food8" +#define IDC_Food7 "Food7" +#define IDC_Food6 "Food6" +#define IDC_Food5 "Food5" +#define IDC_Food4 "Food4" +#define IDC_Food3 "Food3" +#define IDC_Food2 "Food2" +#define IDC_Food1 "Food1" +#define IDC_Food0 "Food0" +#define IDC_Food "Food" +#define IDC_Air9 "Air9" +#define IDC_Air8 "Air8" +#define IDC_Air7 "Air7" +#define IDC_Air6 "Air6" +#define IDC_Air5 "Air5" +#define IDC_Air4 "Air4" +#define IDC_Air3 "Air3" +#define IDC_Air2 "Air2" +#define IDC_Air1 "Air1" +#define IDC_Air0 "Air0" +#define IDC_Air "Air" +#define IDC_XPLevel "XPLevel" +#define IDC_HudScaleGroup "HudScaleGroup" +#define IDC_HudGroup "HudGroup" +#define IDC_HudHolder "HudHolder" +#define IDC_HUDScene "HUDScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options.h index dbed04add..ca358ce57 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_CheckboxTNT L"CheckboxTNT" -#define IDC_CheckboxFireSpreads L"CheckboxFireSpreads" -#define IDC_ButtonTeleportToPlayer L"ButtonTeleportToPlayer" -#define IDC_ButtonTeleportPlayerToMe L"ButtonTeleportPlayerToMe" -#define IDC_GameOptions L"GameOptions" -#define IDC_InGameHostOptions L"InGameHostOptions" +#define IDC_CheckboxTNT "CheckboxTNT" +#define IDC_CheckboxFireSpreads "CheckboxFireSpreads" +#define IDC_ButtonTeleportToPlayer "ButtonTeleportToPlayer" +#define IDC_ButtonTeleportPlayerToMe "ButtonTeleportPlayerToMe" +#define IDC_GameOptions "GameOptions" +#define IDC_InGameHostOptions "InGameHostOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_480.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_480.h index dbed04add..ca358ce57 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_480.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_CheckboxTNT L"CheckboxTNT" -#define IDC_CheckboxFireSpreads L"CheckboxFireSpreads" -#define IDC_ButtonTeleportToPlayer L"ButtonTeleportToPlayer" -#define IDC_ButtonTeleportPlayerToMe L"ButtonTeleportPlayerToMe" -#define IDC_GameOptions L"GameOptions" -#define IDC_InGameHostOptions L"InGameHostOptions" +#define IDC_CheckboxTNT "CheckboxTNT" +#define IDC_CheckboxFireSpreads "CheckboxFireSpreads" +#define IDC_ButtonTeleportToPlayer "ButtonTeleportToPlayer" +#define IDC_ButtonTeleportPlayerToMe "ButtonTeleportPlayerToMe" +#define IDC_GameOptions "GameOptions" +#define IDC_InGameHostOptions "InGameHostOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_small.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_small.h index dbed04add..ca358ce57 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_host_options_small.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_CheckboxTNT L"CheckboxTNT" -#define IDC_CheckboxFireSpreads L"CheckboxFireSpreads" -#define IDC_ButtonTeleportToPlayer L"ButtonTeleportToPlayer" -#define IDC_ButtonTeleportPlayerToMe L"ButtonTeleportPlayerToMe" -#define IDC_GameOptions L"GameOptions" -#define IDC_InGameHostOptions L"InGameHostOptions" +#define IDC_CheckboxTNT "CheckboxTNT" +#define IDC_CheckboxFireSpreads "CheckboxFireSpreads" +#define IDC_ButtonTeleportToPlayer "ButtonTeleportToPlayer" +#define IDC_ButtonTeleportPlayerToMe "ButtonTeleportPlayerToMe" +#define IDC_GameOptions "GameOptions" +#define IDC_InGameHostOptions "InGameHostOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options.h index ede77d098..21b9c6d2b 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options.h @@ -1,15 +1,15 @@ #pragma once -#define IDC_CheckboxHostInvisible L"CheckboxHostInvisible" -#define IDC_CheckboxHostHunger L"CheckboxHostHunger" -#define IDC_CheckboxHostFly L"CheckboxHostFly" -#define IDC_ButtonKick L"ButtonKick" -#define IDC_CheckboxTeleport L"CheckboxTeleport" -#define IDC_CheckboxOp L"CheckboxOp" -#define IDC_CheckboxAttackAnimals L"CheckboxAttackAnimals" -#define IDC_CheckboxAttackPlayers L"CheckboxAttackPlayers" -#define IDC_CheckboxUseContainers L"CheckboxUseContainers" -#define IDC_CheckboxUseDoorsAndSwitches L"CheckboxUseDoorsAndSwitches" -#define IDC_CheckboxBuildAndMine L"CheckboxBuildAndMine" -#define IDC_Gamertag L"Gamertag" -#define IDC_Icon L"Icon" -#define IDC_InGamePlayerOptions L"InGamePlayerOptions" +#define IDC_CheckboxHostInvisible "CheckboxHostInvisible" +#define IDC_CheckboxHostHunger "CheckboxHostHunger" +#define IDC_CheckboxHostFly "CheckboxHostFly" +#define IDC_ButtonKick "ButtonKick" +#define IDC_CheckboxTeleport "CheckboxTeleport" +#define IDC_CheckboxOp "CheckboxOp" +#define IDC_CheckboxAttackAnimals "CheckboxAttackAnimals" +#define IDC_CheckboxAttackPlayers "CheckboxAttackPlayers" +#define IDC_CheckboxUseContainers "CheckboxUseContainers" +#define IDC_CheckboxUseDoorsAndSwitches "CheckboxUseDoorsAndSwitches" +#define IDC_CheckboxBuildAndMine "CheckboxBuildAndMine" +#define IDC_Gamertag "Gamertag" +#define IDC_Icon "Icon" +#define IDC_InGamePlayerOptions "InGamePlayerOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_480.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_480.h index ede77d098..21b9c6d2b 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_480.h @@ -1,15 +1,15 @@ #pragma once -#define IDC_CheckboxHostInvisible L"CheckboxHostInvisible" -#define IDC_CheckboxHostHunger L"CheckboxHostHunger" -#define IDC_CheckboxHostFly L"CheckboxHostFly" -#define IDC_ButtonKick L"ButtonKick" -#define IDC_CheckboxTeleport L"CheckboxTeleport" -#define IDC_CheckboxOp L"CheckboxOp" -#define IDC_CheckboxAttackAnimals L"CheckboxAttackAnimals" -#define IDC_CheckboxAttackPlayers L"CheckboxAttackPlayers" -#define IDC_CheckboxUseContainers L"CheckboxUseContainers" -#define IDC_CheckboxUseDoorsAndSwitches L"CheckboxUseDoorsAndSwitches" -#define IDC_CheckboxBuildAndMine L"CheckboxBuildAndMine" -#define IDC_Gamertag L"Gamertag" -#define IDC_Icon L"Icon" -#define IDC_InGamePlayerOptions L"InGamePlayerOptions" +#define IDC_CheckboxHostInvisible "CheckboxHostInvisible" +#define IDC_CheckboxHostHunger "CheckboxHostHunger" +#define IDC_CheckboxHostFly "CheckboxHostFly" +#define IDC_ButtonKick "ButtonKick" +#define IDC_CheckboxTeleport "CheckboxTeleport" +#define IDC_CheckboxOp "CheckboxOp" +#define IDC_CheckboxAttackAnimals "CheckboxAttackAnimals" +#define IDC_CheckboxAttackPlayers "CheckboxAttackPlayers" +#define IDC_CheckboxUseContainers "CheckboxUseContainers" +#define IDC_CheckboxUseDoorsAndSwitches "CheckboxUseDoorsAndSwitches" +#define IDC_CheckboxBuildAndMine "CheckboxBuildAndMine" +#define IDC_Gamertag "Gamertag" +#define IDC_Icon "Icon" +#define IDC_InGamePlayerOptions "InGamePlayerOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_small.h b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_small.h index ede77d098..21b9c6d2b 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingame_player_options_small.h @@ -1,15 +1,15 @@ #pragma once -#define IDC_CheckboxHostInvisible L"CheckboxHostInvisible" -#define IDC_CheckboxHostHunger L"CheckboxHostHunger" -#define IDC_CheckboxHostFly L"CheckboxHostFly" -#define IDC_ButtonKick L"ButtonKick" -#define IDC_CheckboxTeleport L"CheckboxTeleport" -#define IDC_CheckboxOp L"CheckboxOp" -#define IDC_CheckboxAttackAnimals L"CheckboxAttackAnimals" -#define IDC_CheckboxAttackPlayers L"CheckboxAttackPlayers" -#define IDC_CheckboxUseContainers L"CheckboxUseContainers" -#define IDC_CheckboxUseDoorsAndSwitches L"CheckboxUseDoorsAndSwitches" -#define IDC_CheckboxBuildAndMine L"CheckboxBuildAndMine" -#define IDC_Gamertag L"Gamertag" -#define IDC_Icon L"Icon" -#define IDC_InGamePlayerOptions L"InGamePlayerOptions" +#define IDC_CheckboxHostInvisible "CheckboxHostInvisible" +#define IDC_CheckboxHostHunger "CheckboxHostHunger" +#define IDC_CheckboxHostFly "CheckboxHostFly" +#define IDC_ButtonKick "ButtonKick" +#define IDC_CheckboxTeleport "CheckboxTeleport" +#define IDC_CheckboxOp "CheckboxOp" +#define IDC_CheckboxAttackAnimals "CheckboxAttackAnimals" +#define IDC_CheckboxAttackPlayers "CheckboxAttackPlayers" +#define IDC_CheckboxUseContainers "CheckboxUseContainers" +#define IDC_CheckboxUseDoorsAndSwitches "CheckboxUseDoorsAndSwitches" +#define IDC_CheckboxBuildAndMine "CheckboxBuildAndMine" +#define IDC_Gamertag "Gamertag" +#define IDC_Icon "Icon" +#define IDC_InGamePlayerOptions "InGamePlayerOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo.h b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo.h index 46bd9227e..9c3e59baa 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_GameOptionsButton L"GameOptionsButton" -#define IDC_InGameInfo L"InGameInfo" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_GameOptionsButton "GameOptionsButton" +#define IDC_InGameInfo "InGameInfo" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_480.h b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_480.h index 46bd9227e..9c3e59baa 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_GameOptionsButton L"GameOptionsButton" -#define IDC_InGameInfo L"InGameInfo" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_GameOptionsButton "GameOptionsButton" +#define IDC_InGameInfo "InGameInfo" diff --git a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_small.h b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_small.h index 9c5c88076..89b8e0d3d 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_ingameinfo_small.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_GameOptionsButton L"GameOptionsButton" -#define IDC_InGameInfo L"InGameInfo" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_GameOptionsButton "GameOptionsButton" +#define IDC_InGameInfo "InGameInfo" diff --git a/targets/resources/XboxMedia/Media/xuiscene_intro.h b/targets/resources/XboxMedia/Media/xuiscene_intro.h index be4d9fdd2..9bbe486a9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_intro.h +++ b/targets/resources/XboxMedia/Media/xuiscene_intro.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_Logo4J L"Logo4J" -#define IDC_LogoMojang L"LogoMojang" -#define IDC_LogoMicrosoft L"LogoMicrosoft" -#define IDC_LogoXLA L"LogoXLA" -#define IDC_LogoESRB L"LogoESRB" -#define IDC_SceneIntro L"SceneIntro" +#define IDC_Logo4J "Logo4J" +#define IDC_LogoMojang "LogoMojang" +#define IDC_LogoMicrosoft "LogoMicrosoft" +#define IDC_LogoXLA "LogoXLA" +#define IDC_LogoESRB "LogoESRB" +#define IDC_SceneIntro "SceneIntro" diff --git a/targets/resources/XboxMedia/Media/xuiscene_intro_480.h b/targets/resources/XboxMedia/Media/xuiscene_intro_480.h index be4d9fdd2..9bbe486a9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_intro_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_intro_480.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_Logo4J L"Logo4J" -#define IDC_LogoMojang L"LogoMojang" -#define IDC_LogoMicrosoft L"LogoMicrosoft" -#define IDC_LogoXLA L"LogoXLA" -#define IDC_LogoESRB L"LogoESRB" -#define IDC_SceneIntro L"SceneIntro" +#define IDC_Logo4J "Logo4J" +#define IDC_LogoMojang "LogoMojang" +#define IDC_LogoMicrosoft "LogoMicrosoft" +#define IDC_LogoXLA "LogoXLA" +#define IDC_LogoESRB "LogoESRB" +#define IDC_SceneIntro "SceneIntro" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory.h b/targets/resources/XboxMedia/Media/xuiscene_inventory.h index 610516206..d641b58ac 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory.h @@ -1,100 +1,100 @@ #pragma once -#define IDC_Effect10 L"Effect10" -#define IDC_Effect9 L"Effect9" -#define IDC_Effect8 L"Effect8" -#define IDC_Effect7 L"Effect7" -#define IDC_Effect6 L"Effect6" -#define IDC_Effect5 L"Effect5" -#define IDC_Effect4 L"Effect4" -#define IDC_Effect3 L"Effect3" -#define IDC_Effect2 L"Effect2" -#define IDC_Effect1 L"Effect1" -#define IDC_EffectsGroup L"EffectsGroup" -#define IDC_ArmourBackground L"ArmourBackground" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Character L"Character" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_Effect10 "Effect10" +#define IDC_Effect9 "Effect9" +#define IDC_Effect8 "Effect8" +#define IDC_Effect7 "Effect7" +#define IDC_Effect6 "Effect6" +#define IDC_Effect5 "Effect5" +#define IDC_Effect4 "Effect4" +#define IDC_Effect3 "Effect3" +#define IDC_Effect2 "Effect2" +#define IDC_Effect1 "Effect1" +#define IDC_EffectsGroup "EffectsGroup" +#define IDC_ArmourBackground "ArmourBackground" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Character "Character" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory_480.h b/targets/resources/XboxMedia/Media/xuiscene_inventory_480.h index 0b0d111cb..28e531af6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory_480.h @@ -1,138 +1,138 @@ #pragma once -#define IDC_Effect10 L"Effect10" -#define IDC_Effect9 L"Effect9" -#define IDC_Effect8 L"Effect8" -#define IDC_Effect7 L"Effect7" -#define IDC_Effect6 L"Effect6" -#define IDC_Effect5 L"Effect5" -#define IDC_Effect4 L"Effect4" -#define IDC_Effect3 L"Effect3" -#define IDC_Effect2 L"Effect2" -#define IDC_Effect1 L"Effect1" -#define IDC_EffectsGroup L"EffectsGroup" -#define IDC_ArmourBackground L"ArmourBackground" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Character L"Character" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_Effect10 "Effect10" +#define IDC_Effect9 "Effect9" +#define IDC_Effect8 "Effect8" +#define IDC_Effect7 "Effect7" +#define IDC_Effect6 "Effect6" +#define IDC_Effect5 "Effect5" +#define IDC_Effect4 "Effect4" +#define IDC_Effect3 "Effect3" +#define IDC_Effect2 "Effect2" +#define IDC_Effect1 "Effect1" +#define IDC_EffectsGroup "EffectsGroup" +#define IDC_ArmourBackground "ArmourBackground" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Character "Character" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative.h b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative.h index cbd57a4a0..bbb0492fb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative.h @@ -1,519 +1,519 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_TabImage8 L"TabImage8" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Icon_8 L"Icon_8" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_InventoryText L"InventoryText" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_ScrollUp L"ScrollUp" -#define IDC_ScrollDown L"ScrollDown" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_MainPanel "MainPanel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_TabImage8 "TabImage8" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Icon_8 "Icon_8" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_InventoryText "InventoryText" +#define IDC_XuiSlider "XuiSlider" +#define IDC_ScrollUp "ScrollUp" +#define IDC_ScrollDown "ScrollDown" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_480.h b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_480.h index db8112fa2..c30b86f5a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_480.h @@ -1,509 +1,509 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_TabImage8 L"TabImage8" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Icon_8 L"Icon_8" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_InventoryText L"InventoryText" -#define IDC_ScrollDown L"ScrollDown" -#define IDC_ScrollUp L"ScrollUp" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneCreativeInventory L"XuiSceneCreativeInventory" +#define IDC_MainPanel "MainPanel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_TabImage8 "TabImage8" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Icon_8 "Icon_8" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_InventoryText "InventoryText" +#define IDC_ScrollDown "ScrollDown" +#define IDC_ScrollUp "ScrollUp" +#define IDC_XuiSlider "XuiSlider" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneCreativeInventory "XuiSceneCreativeInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_small.h b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_small.h index 35746fae4..c9f6acfd4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory_creative_small.h @@ -1,448 +1,448 @@ #pragma once -#define IDC_MainPanel L"MainPanel" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Container L"Container" -#define IDC_TabImage1 L"TabImage1" -#define IDC_TabImage2 L"TabImage2" -#define IDC_TabImage3 L"TabImage3" -#define IDC_TabImage4 L"TabImage4" -#define IDC_TabImage5 L"TabImage5" -#define IDC_TabImage6 L"TabImage6" -#define IDC_TabImage7 L"TabImage7" -#define IDC_TabImage8 L"TabImage8" -#define IDC_Group_Tab_Images L"Group_Tab_Images" -#define IDC_Icon_1 L"Icon_1" -#define IDC_Icon_2 L"Icon_2" -#define IDC_Icon_3 L"Icon_3" -#define IDC_Icon_4 L"Icon_4" -#define IDC_Icon_5 L"Icon_5" -#define IDC_Icon_6 L"Icon_6" -#define IDC_Icon_7 L"Icon_7" -#define IDC_Icon_8 L"Icon_8" -#define IDC_Group_Tab_Icons L"Group_Tab_Icons" -#define IDC_InventoryText L"InventoryText" -#define IDC_ScrollDown L"ScrollDown" -#define IDC_ScrollUp L"ScrollUp" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneCreativeInventory L"XuiSceneCreativeInventory" +#define IDC_MainPanel "MainPanel" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Container "Container" +#define IDC_TabImage1 "TabImage1" +#define IDC_TabImage2 "TabImage2" +#define IDC_TabImage3 "TabImage3" +#define IDC_TabImage4 "TabImage4" +#define IDC_TabImage5 "TabImage5" +#define IDC_TabImage6 "TabImage6" +#define IDC_TabImage7 "TabImage7" +#define IDC_TabImage8 "TabImage8" +#define IDC_Group_Tab_Images "Group_Tab_Images" +#define IDC_Icon_1 "Icon_1" +#define IDC_Icon_2 "Icon_2" +#define IDC_Icon_3 "Icon_3" +#define IDC_Icon_4 "Icon_4" +#define IDC_Icon_5 "Icon_5" +#define IDC_Icon_6 "Icon_6" +#define IDC_Icon_7 "Icon_7" +#define IDC_Icon_8 "Icon_8" +#define IDC_Group_Tab_Icons "Group_Tab_Icons" +#define IDC_InventoryText "InventoryText" +#define IDC_ScrollDown "ScrollDown" +#define IDC_ScrollUp "ScrollUp" +#define IDC_XuiSlider "XuiSlider" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneCreativeInventory "XuiSceneCreativeInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_inventory_small.h b/targets/resources/XboxMedia/Media/xuiscene_inventory_small.h index 475f7bb7a..d8a656aa6 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_inventory_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_inventory_small.h @@ -1,122 +1,122 @@ #pragma once -#define IDC_Effect10 L"Effect10" -#define IDC_Effect9 L"Effect9" -#define IDC_Effect8 L"Effect8" -#define IDC_Effect7 L"Effect7" -#define IDC_Effect6 L"Effect6" -#define IDC_Effect5 L"Effect5" -#define IDC_Effect4 L"Effect4" -#define IDC_Effect3 L"Effect3" -#define IDC_Effect2 L"Effect2" -#define IDC_Effect1 L"Effect1" -#define IDC_EffectsGroup L"EffectsGroup" -#define IDC_ArmourBackground L"ArmourBackground" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Armor L"Armor" -#define IDC_Character L"Character" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryText L"InventoryText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_XuiSceneInventory L"XuiSceneInventory" +#define IDC_Effect10 "Effect10" +#define IDC_Effect9 "Effect9" +#define IDC_Effect8 "Effect8" +#define IDC_Effect7 "Effect7" +#define IDC_Effect6 "Effect6" +#define IDC_Effect5 "Effect5" +#define IDC_Effect4 "Effect4" +#define IDC_Effect3 "Effect3" +#define IDC_Effect2 "Effect2" +#define IDC_Effect1 "Effect1" +#define IDC_EffectsGroup "EffectsGroup" +#define IDC_ArmourBackground "ArmourBackground" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Armor "Armor" +#define IDC_Character "Character" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryText "InventoryText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_XuiSceneInventory "XuiSceneInventory" diff --git a/targets/resources/XboxMedia/Media/xuiscene_leaderboards.h b/targets/resources/XboxMedia/Media/xuiscene_leaderboards.h index 1b734840d..eb077ff1e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_leaderboards.h +++ b/targets/resources/XboxMedia/Media/xuiscene_leaderboards.h @@ -1,18 +1,18 @@ #pragma once -#define IDC_Background3 L"Background3" -#define IDC_Background2 L"Background2" -#define IDC_Background1 L"Background1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiListGamers L"XuiListGamers" -#define IDC_XuiTextFilter L"XuiTextFilter" -#define IDC_XuiTextLeaderboard L"XuiTextLeaderboard" -#define IDC_XuiTextEntries L"XuiTextEntries" -#define IDC_XuiTextInfo L"XuiTextInfo" -#define IDC_LSIcon L"LSIcon" -#define IDC_RBIcon L"RBIcon" -#define IDC_LBIcon L"LBIcon" -#define IDC_SceneLeaderboards L"SceneLeaderboards" +#define IDC_Background3 "Background3" +#define IDC_Background2 "Background2" +#define IDC_Background1 "Background1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiListGamers "XuiListGamers" +#define IDC_XuiTextFilter "XuiTextFilter" +#define IDC_XuiTextLeaderboard "XuiTextLeaderboard" +#define IDC_XuiTextEntries "XuiTextEntries" +#define IDC_XuiTextInfo "XuiTextInfo" +#define IDC_LSIcon "LSIcon" +#define IDC_RBIcon "RBIcon" +#define IDC_LBIcon "LBIcon" +#define IDC_SceneLeaderboards "SceneLeaderboards" diff --git a/targets/resources/XboxMedia/Media/xuiscene_leaderboards_480.h b/targets/resources/XboxMedia/Media/xuiscene_leaderboards_480.h index 1b734840d..eb077ff1e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_leaderboards_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_leaderboards_480.h @@ -1,18 +1,18 @@ #pragma once -#define IDC_Background3 L"Background3" -#define IDC_Background2 L"Background2" -#define IDC_Background1 L"Background1" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_XuiListGamers L"XuiListGamers" -#define IDC_XuiTextFilter L"XuiTextFilter" -#define IDC_XuiTextLeaderboard L"XuiTextLeaderboard" -#define IDC_XuiTextEntries L"XuiTextEntries" -#define IDC_XuiTextInfo L"XuiTextInfo" -#define IDC_LSIcon L"LSIcon" -#define IDC_RBIcon L"RBIcon" -#define IDC_LBIcon L"LBIcon" -#define IDC_SceneLeaderboards L"SceneLeaderboards" +#define IDC_Background3 "Background3" +#define IDC_Background2 "Background2" +#define IDC_Background1 "Background1" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_XuiListGamers "XuiListGamers" +#define IDC_XuiTextFilter "XuiTextFilter" +#define IDC_XuiTextLeaderboard "XuiTextLeaderboard" +#define IDC_XuiTextEntries "XuiTextEntries" +#define IDC_XuiTextInfo "XuiTextInfo" +#define IDC_LSIcon "LSIcon" +#define IDC_RBIcon "RBIcon" +#define IDC_LBIcon "LBIcon" +#define IDC_SceneLeaderboards "SceneLeaderboards" diff --git a/targets/resources/XboxMedia/Media/xuiscene_load_settings.h b/targets/resources/XboxMedia/Media/xuiscene_load_settings.h index 113fdaae8..113d82745 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_load_settings.h +++ b/targets/resources/XboxMedia/Media/xuiscene_load_settings.h @@ -1,38 +1,38 @@ #pragma once -#define IDC_ComparisonPic L"ComparisonPic" -#define IDC_Icon L"Icon" -#define IDC_TexturePackName L"TexturePackName" -#define IDC_TexturePackDescription L"TexturePackDescription" -#define IDC_TexturePackDetails L"TexturePackDetails" -#define IDC_Background L"Background" -#define IDC_XuiLoadSettings L"XuiLoadSettings" -#define IDC_XuiMoreOptions L"XuiMoreOptions" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_TexturePacksList L"TexturePacksList" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_XuiGameModeToggle L"XuiGameModeToggle" -#define IDC_XuiGameIcon L"XuiGameIcon" -#define IDC_XuiGameName L"XuiGameName" -#define IDC_XuiGameSeed L"XuiGameSeed" -#define IDC_XuiCreatedMode L"XuiCreatedMode" -#define IDC_MainScene L"MainScene" -#define IDC_LoadGameSettings L"LoadGameSettings" +#define IDC_ComparisonPic "ComparisonPic" +#define IDC_Icon "Icon" +#define IDC_TexturePackName "TexturePackName" +#define IDC_TexturePackDescription "TexturePackDescription" +#define IDC_TexturePackDetails "TexturePackDetails" +#define IDC_Background "Background" +#define IDC_XuiLoadSettings "XuiLoadSettings" +#define IDC_XuiMoreOptions "XuiMoreOptions" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_TexturePacksList "TexturePacksList" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_XuiGameModeToggle "XuiGameModeToggle" +#define IDC_XuiGameIcon "XuiGameIcon" +#define IDC_XuiGameName "XuiGameName" +#define IDC_XuiGameSeed "XuiGameSeed" +#define IDC_XuiCreatedMode "XuiCreatedMode" +#define IDC_MainScene "MainScene" +#define IDC_LoadGameSettings "LoadGameSettings" diff --git a/targets/resources/XboxMedia/Media/xuiscene_load_settings_480.h b/targets/resources/XboxMedia/Media/xuiscene_load_settings_480.h index 8ceb57c6d..c27d6522e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_load_settings_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_load_settings_480.h @@ -1,38 +1,38 @@ #pragma once -#define IDC_ComparisonPic L"ComparisonPic" -#define IDC_TexturePackDescription L"TexturePackDescription" -#define IDC_TexturePackName L"TexturePackName" -#define IDC_Icon L"Icon" -#define IDC_TexturePackDetails L"TexturePackDetails" -#define IDC_Background L"Background" -#define IDC_XuiLoadSettings L"XuiLoadSettings" -#define IDC_XuiMoreOptions L"XuiMoreOptions" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_TexturePacksList L"TexturePacksList" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_XuiGameModeToggle L"XuiGameModeToggle" -#define IDC_XuiGameSeed L"XuiGameSeed" -#define IDC_XuiGameIcon L"XuiGameIcon" -#define IDC_XuiGameName L"XuiGameName" -#define IDC_XuiCreatedMode L"XuiCreatedMode" -#define IDC_MainScene L"MainScene" -#define IDC_LoadGameSettings L"LoadGameSettings" +#define IDC_ComparisonPic "ComparisonPic" +#define IDC_TexturePackDescription "TexturePackDescription" +#define IDC_TexturePackName "TexturePackName" +#define IDC_Icon "Icon" +#define IDC_TexturePackDetails "TexturePackDetails" +#define IDC_Background "Background" +#define IDC_XuiLoadSettings "XuiLoadSettings" +#define IDC_XuiMoreOptions "XuiMoreOptions" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_TexturePacksList "TexturePacksList" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_XuiGameModeToggle "XuiGameModeToggle" +#define IDC_XuiGameSeed "XuiGameSeed" +#define IDC_XuiGameIcon "XuiGameIcon" +#define IDC_XuiGameName "XuiGameName" +#define IDC_XuiCreatedMode "XuiCreatedMode" +#define IDC_MainScene "MainScene" +#define IDC_LoadGameSettings "LoadGameSettings" diff --git a/targets/resources/XboxMedia/Media/xuiscene_main.h b/targets/resources/XboxMedia/Media/xuiscene_main.h index 9f1890264..ea728b570 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_main.h +++ b/targets/resources/XboxMedia/Media/xuiscene_main.h @@ -1,27 +1,27 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_XuiSplash L"XuiSplash" -#define IDC_XuiSplashMCFont L"XuiSplashMCFont" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneMain L"SceneMain" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_XuiSplash "XuiSplash" +#define IDC_XuiSplashMCFont "XuiSplashMCFont" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneMain "SceneMain" diff --git a/targets/resources/XboxMedia/Media/xuiscene_main_480.h b/targets/resources/XboxMedia/Media/xuiscene_main_480.h index 9f1890264..ea728b570 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_main_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_main_480.h @@ -1,27 +1,27 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_XuiSplash L"XuiSplash" -#define IDC_XuiSplashMCFont L"XuiSplashMCFont" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneMain L"SceneMain" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_XuiSplash "XuiSplash" +#define IDC_XuiSplashMCFont "XuiSplashMCFont" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneMain "SceneMain" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_create.h b/targets/resources/XboxMedia/Media/xuiscene_multi_create.h index 6da9ecab7..a88a93246 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_create.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_create.h @@ -1,36 +1,36 @@ #pragma once -#define IDC_ComparisonPic L"ComparisonPic" -#define IDC_Icon L"Icon" -#define IDC_TexturePackName L"TexturePackName" -#define IDC_TexturePackDescription L"TexturePackDescription" -#define IDC_TexturePackDetails L"TexturePackDetails" -#define IDC_Background L"Background" -#define IDC_XuiNewWorld L"XuiNewWorld" -#define IDC_XuiMoreOptions L"XuiMoreOptions" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_TexturePacksList L"TexturePacksList" -#define IDC_XuiGameModeToggle L"XuiGameModeToggle" -#define IDC_XuiLabelRandomSeed L"XuiLabelRandomSeed" -#define IDC_XuiEditSeed L"XuiEditSeed" -#define IDC_XuiEditWorldName L"XuiEditWorldName" -#define IDC_XuiLabelWorldName L"XuiLabelWorldName" -#define IDC_XuiLabelSeed L"XuiLabelSeed" -#define IDC_MainScene L"MainScene" -#define IDC_MultiGameCreate L"MultiGameCreate" +#define IDC_ComparisonPic "ComparisonPic" +#define IDC_Icon "Icon" +#define IDC_TexturePackName "TexturePackName" +#define IDC_TexturePackDescription "TexturePackDescription" +#define IDC_TexturePackDetails "TexturePackDetails" +#define IDC_Background "Background" +#define IDC_XuiNewWorld "XuiNewWorld" +#define IDC_XuiMoreOptions "XuiMoreOptions" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_TexturePacksList "TexturePacksList" +#define IDC_XuiGameModeToggle "XuiGameModeToggle" +#define IDC_XuiLabelRandomSeed "XuiLabelRandomSeed" +#define IDC_XuiEditSeed "XuiEditSeed" +#define IDC_XuiEditWorldName "XuiEditWorldName" +#define IDC_XuiLabelWorldName "XuiLabelWorldName" +#define IDC_XuiLabelSeed "XuiLabelSeed" +#define IDC_MainScene "MainScene" +#define IDC_MultiGameCreate "MultiGameCreate" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_create_480.h b/targets/resources/XboxMedia/Media/xuiscene_multi_create_480.h index d84a8a484..3710957e5 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_create_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_create_480.h @@ -1,39 +1,39 @@ #pragma once -#define IDC_ComparisonPic L"ComparisonPic" -#define IDC_TexturePackDescription L"TexturePackDescription" -#define IDC_TexturePackName L"TexturePackName" -#define IDC_Icon L"Icon" -#define IDC_TexturePackDetails L"TexturePackDetails" -#define IDC_Background L"Background" -#define IDC_XuiNewWorld L"XuiNewWorld" -#define IDC_XuiMoreOptions L"XuiMoreOptions" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_TexturePacksList L"TexturePacksList" -#define IDC_XuiGameModeToggle L"XuiGameModeToggle" -#define IDC_XuiLabelRandomSeed L"XuiLabelRandomSeed" -#define IDC_XuiEditSeed L"XuiEditSeed" -#define IDC_XuiLabelSeed L"XuiLabelSeed" -#define IDC_XuiEditWorldName L"XuiEditWorldName" -#define IDC_XuiLabelWorldName L"XuiLabelWorldName" -#define IDC_MainScene L"MainScene" -#define IDC_MultiGameCreate L"MultiGameCreate" +#define IDC_ComparisonPic "ComparisonPic" +#define IDC_TexturePackDescription "TexturePackDescription" +#define IDC_TexturePackName "TexturePackName" +#define IDC_Icon "Icon" +#define IDC_TexturePackDetails "TexturePackDetails" +#define IDC_Background "Background" +#define IDC_XuiNewWorld "XuiNewWorld" +#define IDC_XuiMoreOptions "XuiMoreOptions" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_TexturePacksList "TexturePacksList" +#define IDC_XuiGameModeToggle "XuiGameModeToggle" +#define IDC_XuiLabelRandomSeed "XuiLabelRandomSeed" +#define IDC_XuiEditSeed "XuiEditSeed" +#define IDC_XuiLabelSeed "XuiLabelSeed" +#define IDC_XuiEditWorldName "XuiEditWorldName" +#define IDC_XuiLabelWorldName "XuiLabelWorldName" +#define IDC_MainScene "MainScene" +#define IDC_MultiGameCreate "MultiGameCreate" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo.h b/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo.h index a1995c485..4b0889b3e 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo.h @@ -1,30 +1,30 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_JoinGame L"JoinGame" -#define IDC_LabelDifficulty L"LabelDifficulty" -#define IDC_Difficulty L"Difficulty" -#define IDC_LabelGameType L"LabelGameType" -#define IDC_GameType L"GameType" -#define IDC_LabelGamertagsOn L"LabelGamertagsOn" -#define IDC_GamertagsOn L"GamertagsOn" -#define IDC_LabelStructuresOn L"LabelStructuresOn" -#define IDC_StructuresOn L"StructuresOn" -#define IDC_LabelLevelType L"LabelLevelType" -#define IDC_LevelType L"LevelType" -#define IDC_LabelPvP L"LabelPvP" -#define IDC_PvP L"PvP" -#define IDC_LabelTrust L"LabelTrust" -#define IDC_Trust L"Trust" -#define IDC_LabelTNTOn L"LabelTNTOn" -#define IDC_TNTOn L"TNTOn" -#define IDC_LabelFireOn L"LabelFireOn" -#define IDC_FireOn L"FireOn" -#define IDC_GameSettings L"GameSettings" -#define IDC_MultiGameInfo L"MultiGameInfo" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_JoinGame "JoinGame" +#define IDC_LabelDifficulty "LabelDifficulty" +#define IDC_Difficulty "Difficulty" +#define IDC_LabelGameType "LabelGameType" +#define IDC_GameType "GameType" +#define IDC_LabelGamertagsOn "LabelGamertagsOn" +#define IDC_GamertagsOn "GamertagsOn" +#define IDC_LabelStructuresOn "LabelStructuresOn" +#define IDC_StructuresOn "StructuresOn" +#define IDC_LabelLevelType "LabelLevelType" +#define IDC_LevelType "LevelType" +#define IDC_LabelPvP "LabelPvP" +#define IDC_PvP "PvP" +#define IDC_LabelTrust "LabelTrust" +#define IDC_Trust "Trust" +#define IDC_LabelTNTOn "LabelTNTOn" +#define IDC_TNTOn "TNTOn" +#define IDC_LabelFireOn "LabelFireOn" +#define IDC_FireOn "FireOn" +#define IDC_GameSettings "GameSettings" +#define IDC_MultiGameInfo "MultiGameInfo" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo_480.h b/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo_480.h index 00cd10c7a..750684682 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_gameinfo_480.h @@ -1,29 +1,29 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_JoinGame L"JoinGame" -#define IDC_LabelDifficulty L"LabelDifficulty" -#define IDC_Difficulty L"Difficulty" -#define IDC_LabelGameType L"LabelGameType" -#define IDC_GameType L"GameType" -#define IDC_LabelGamertagsOn L"LabelGamertagsOn" -#define IDC_GamertagsOn L"GamertagsOn" -#define IDC_LabelStructuresOn L"LabelStructuresOn" -#define IDC_StructuresOn L"StructuresOn" -#define IDC_LabelLevelType L"LabelLevelType" -#define IDC_LevelType L"LevelType" -#define IDC_LabelPvP L"LabelPvP" -#define IDC_PvP L"PvP" -#define IDC_LabelTrust L"LabelTrust" -#define IDC_Trust L"Trust" -#define IDC_LabelTNTOn L"LabelTNTOn" -#define IDC_TNTOn L"TNTOn" -#define IDC_LabelFireOn L"LabelFireOn" -#define IDC_FireOn L"FireOn" -#define IDC_GameSettings L"GameSettings" -#define IDC_MultiGameInfo L"MultiGameInfo" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_JoinGame "JoinGame" +#define IDC_LabelDifficulty "LabelDifficulty" +#define IDC_Difficulty "Difficulty" +#define IDC_LabelGameType "LabelGameType" +#define IDC_GameType "GameType" +#define IDC_LabelGamertagsOn "LabelGamertagsOn" +#define IDC_GamertagsOn "GamertagsOn" +#define IDC_LabelStructuresOn "LabelStructuresOn" +#define IDC_StructuresOn "StructuresOn" +#define IDC_LabelLevelType "LabelLevelType" +#define IDC_LevelType "LevelType" +#define IDC_LabelPvP "LabelPvP" +#define IDC_PvP "PvP" +#define IDC_LabelTrust "LabelTrust" +#define IDC_Trust "Trust" +#define IDC_LabelTNTOn "LabelTNTOn" +#define IDC_TNTOn "TNTOn" +#define IDC_LabelFireOn "LabelFireOn" +#define IDC_FireOn "FireOn" +#define IDC_GameSettings "GameSettings" +#define IDC_MultiGameInfo "MultiGameInfo" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_joinload.h b/targets/resources/XboxMedia/Media/xuiscene_multi_joinload.h index 911a2f21c..ccbb68fee 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_joinload.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_joinload.h @@ -1,47 +1,47 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamesList L"GamesList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_LabelNoGames L"LabelNoGames" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_SavesList L"SavesList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_SavesTimer L"SavesTimer" -#define IDC_MultiGameJoinLoad L"MultiGameJoinLoad" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamesList "GamesList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_LabelNoGames "LabelNoGames" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_SavesList "SavesList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_SavesTimer "SavesTimer" +#define IDC_MultiGameJoinLoad "MultiGameJoinLoad" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_joinload_480.h b/targets/resources/XboxMedia/Media/xuiscene_multi_joinload_480.h index bdc76fcbb..2e331056c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_joinload_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_joinload_480.h @@ -1,53 +1,53 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamesList L"GamesList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_LabelNoGames L"LabelNoGames" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_SavesList L"SavesList" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_SavesTimer L"SavesTimer" -#define IDC_MultiGameJoinLoad L"MultiGameJoinLoad" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamesList "GamesList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_LabelNoGames "LabelNoGames" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_SavesList "SavesList" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_SavesTimer "SavesTimer" +#define IDC_MultiGameJoinLoad "MultiGameJoinLoad" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options.h b/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options.h index a374292fc..acd8f8036 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options.h @@ -1,19 +1,19 @@ #pragma once -#define IDC_CheckboxResetNether L"CheckboxResetNether" -#define IDC_CheckboxHostPrivileges L"CheckboxHostPrivileges" -#define IDC_CheckboxTNT L"CheckboxTNT" -#define IDC_CheckboxFireSpreads L"CheckboxFireSpreads" -#define IDC_CheckboxTrustSystem L"CheckboxTrustSystem" -#define IDC_CheckboxPVP L"CheckboxPVP" -#define IDC_CheckboxAllowFoF L"CheckboxAllowFoF" -#define IDC_CheckboxInviteOnly L"CheckboxInviteOnly" -#define IDC_CheckboxOnline L"CheckboxOnline" -#define IDC_HostOptions L"HostOptions" -#define IDC_CheckboxBonusChest L"CheckboxBonusChest" -#define IDC_CheckboxFlatWorld L"CheckboxFlatWorld" -#define IDC_CheckboxStructures L"CheckboxStructures" -#define IDC_WorldOptions L"WorldOptions" -#define IDC_WO_Box L"WO_Box" -#define IDC_GenerationOptions L"GenerationOptions" -#define IDC_Description L"Description" -#define IDC_MultiGameLaunchMoreOptions L"MultiGameLaunchMoreOptions" +#define IDC_CheckboxResetNether "CheckboxResetNether" +#define IDC_CheckboxHostPrivileges "CheckboxHostPrivileges" +#define IDC_CheckboxTNT "CheckboxTNT" +#define IDC_CheckboxFireSpreads "CheckboxFireSpreads" +#define IDC_CheckboxTrustSystem "CheckboxTrustSystem" +#define IDC_CheckboxPVP "CheckboxPVP" +#define IDC_CheckboxAllowFoF "CheckboxAllowFoF" +#define IDC_CheckboxInviteOnly "CheckboxInviteOnly" +#define IDC_CheckboxOnline "CheckboxOnline" +#define IDC_HostOptions "HostOptions" +#define IDC_CheckboxBonusChest "CheckboxBonusChest" +#define IDC_CheckboxFlatWorld "CheckboxFlatWorld" +#define IDC_CheckboxStructures "CheckboxStructures" +#define IDC_WorldOptions "WorldOptions" +#define IDC_WO_Box "WO_Box" +#define IDC_GenerationOptions "GenerationOptions" +#define IDC_Description "Description" +#define IDC_MultiGameLaunchMoreOptions "MultiGameLaunchMoreOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options_480.h b/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options_480.h index fd5841540..845dd8ed4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_multi_launch_more_options_480.h @@ -1,19 +1,19 @@ #pragma once -#define IDC_CheckboxBonusChest L"CheckboxBonusChest" -#define IDC_CheckboxFlatWorld L"CheckboxFlatWorld" -#define IDC_CheckboxStructures L"CheckboxStructures" -#define IDC_WorldOptions L"WorldOptions" -#define IDC_WO_Box L"WO_Box" -#define IDC_GenerationOptions L"GenerationOptions" -#define IDC_CheckboxResetNether L"CheckboxResetNether" -#define IDC_CheckboxHostPrivileges L"CheckboxHostPrivileges" -#define IDC_CheckboxTNT L"CheckboxTNT" -#define IDC_CheckboxFireSpreads L"CheckboxFireSpreads" -#define IDC_CheckboxTrustSystem L"CheckboxTrustSystem" -#define IDC_CheckboxPVP L"CheckboxPVP" -#define IDC_CheckboxAllowFoF L"CheckboxAllowFoF" -#define IDC_CheckboxInviteOnly L"CheckboxInviteOnly" -#define IDC_CheckboxOnline L"CheckboxOnline" -#define IDC_HostOptions L"HostOptions" -#define IDC_Description L"Description" -#define IDC_MultiGameLaunchMoreOptions L"MultiGameLaunchMoreOptions" +#define IDC_CheckboxBonusChest "CheckboxBonusChest" +#define IDC_CheckboxFlatWorld "CheckboxFlatWorld" +#define IDC_CheckboxStructures "CheckboxStructures" +#define IDC_WorldOptions "WorldOptions" +#define IDC_WO_Box "WO_Box" +#define IDC_GenerationOptions "GenerationOptions" +#define IDC_CheckboxResetNether "CheckboxResetNether" +#define IDC_CheckboxHostPrivileges "CheckboxHostPrivileges" +#define IDC_CheckboxTNT "CheckboxTNT" +#define IDC_CheckboxFireSpreads "CheckboxFireSpreads" +#define IDC_CheckboxTrustSystem "CheckboxTrustSystem" +#define IDC_CheckboxPVP "CheckboxPVP" +#define IDC_CheckboxAllowFoF "CheckboxAllowFoF" +#define IDC_CheckboxInviteOnly "CheckboxInviteOnly" +#define IDC_CheckboxOnline "CheckboxOnline" +#define IDC_HostOptions "HostOptions" +#define IDC_Description "Description" +#define IDC_MultiGameLaunchMoreOptions "MultiGameLaunchMoreOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword.h b/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword.h index 3797f839c..56fc53703 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword.h +++ b/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_XuiEditPartnernetPassword L"XuiEditPartnernetPassword" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiOK L"XuiOK" -#define IDC_PartnernetPassword L"PartnernetPassword" +#define IDC_XuiEditPartnernetPassword "XuiEditPartnernetPassword" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiOK "XuiOK" +#define IDC_PartnernetPassword "PartnernetPassword" diff --git a/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword_480.h b/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword_480.h index 3797f839c..56fc53703 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_partnernetpassword_480.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_XuiEditPartnernetPassword L"XuiEditPartnernetPassword" -#define IDC_XuiLabel1 L"XuiLabel1" -#define IDC_XuiOK L"XuiOK" -#define IDC_PartnernetPassword L"PartnernetPassword" +#define IDC_XuiEditPartnernetPassword "XuiEditPartnernetPassword" +#define IDC_XuiLabel1 "XuiLabel1" +#define IDC_XuiOK "XuiOK" +#define IDC_PartnernetPassword "PartnernetPassword" diff --git a/targets/resources/XboxMedia/Media/xuiscene_pause.h b/targets/resources/XboxMedia/Media/xuiscene_pause.h index 6f5d59a5c..c6eff4edb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_pause.h +++ b/targets/resources/XboxMedia/Media/xuiscene_pause.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_ScenePause L"ScenePause" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_ScenePause "ScenePause" diff --git a/targets/resources/XboxMedia/Media/xuiscene_pause_480.h b/targets/resources/XboxMedia/Media/xuiscene_pause_480.h index 6f5d59a5c..c6eff4edb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_pause_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_pause_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_ScenePause L"ScenePause" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_ScenePause "ScenePause" diff --git a/targets/resources/XboxMedia/Media/xuiscene_pause_small.h b/targets/resources/XboxMedia/Media/xuiscene_pause_small.h index 6f5d59a5c..c6eff4edb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_pause_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_pause_small.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_ScenePause L"ScenePause" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_ScenePause "ScenePause" diff --git a/targets/resources/XboxMedia/Media/xuiscene_reinstall.h b/targets/resources/XboxMedia/Media/xuiscene_reinstall.h index f09b113a5..dea887741 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_reinstall.h +++ b/targets/resources/XboxMedia/Media/xuiscene_reinstall.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_FocusSink L"FocusSink" -#define IDC_SceneReinstall L"SceneReinstall" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_FocusSink "FocusSink" +#define IDC_SceneReinstall "SceneReinstall" diff --git a/targets/resources/XboxMedia/Media/xuiscene_reinstall_480.h b/targets/resources/XboxMedia/Media/xuiscene_reinstall_480.h index f09b113a5..dea887741 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_reinstall_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_reinstall_480.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_FocusSink L"FocusSink" -#define IDC_SceneReinstall L"SceneReinstall" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_FocusSink "FocusSink" +#define IDC_SceneReinstall "SceneReinstall" diff --git a/targets/resources/XboxMedia/Media/xuiscene_reinstall_small.h b/targets/resources/XboxMedia/Media/xuiscene_reinstall_small.h index f09b113a5..dea887741 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_reinstall_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_reinstall_small.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_XuiButton1 L"XuiButton1" -#define IDC_XuiButton2 L"XuiButton2" -#define IDC_XuiButton3 L"XuiButton3" -#define IDC_XuiButton4 L"XuiButton4" -#define IDC_XuiButton5 L"XuiButton5" -#define IDC_XuiButton6 L"XuiButton6" -#define IDC_FocusSink L"FocusSink" -#define IDC_SceneReinstall L"SceneReinstall" +#define IDC_XuiButton1 "XuiButton1" +#define IDC_XuiButton2 "XuiButton2" +#define IDC_XuiButton3 "XuiButton3" +#define IDC_XuiButton4 "XuiButton4" +#define IDC_XuiButton5 "XuiButton5" +#define IDC_XuiButton6 "XuiButton6" +#define IDC_FocusSink "FocusSink" +#define IDC_SceneReinstall "SceneReinstall" diff --git a/targets/resources/XboxMedia/Media/xuiscene_savemessage.h b/targets/resources/XboxMedia/Media/xuiscene_savemessage.h index d09bba947..0dd801f68 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_savemessage.h +++ b/targets/resources/XboxMedia/Media/xuiscene_savemessage.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_ConfirmButton L"ConfirmButton" -#define IDC_Description L"Description" -#define IDC_XuiSavingIcon L"XuiSavingIcon" -#define IDC_SceneSaveMessage L"SceneSaveMessage" +#define IDC_ConfirmButton "ConfirmButton" +#define IDC_Description "Description" +#define IDC_XuiSavingIcon "XuiSavingIcon" +#define IDC_SceneSaveMessage "SceneSaveMessage" diff --git a/targets/resources/XboxMedia/Media/xuiscene_savemessage_480.h b/targets/resources/XboxMedia/Media/xuiscene_savemessage_480.h index d09bba947..0dd801f68 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_savemessage_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_savemessage_480.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_ConfirmButton L"ConfirmButton" -#define IDC_Description L"Description" -#define IDC_XuiSavingIcon L"XuiSavingIcon" -#define IDC_SceneSaveMessage L"SceneSaveMessage" +#define IDC_ConfirmButton "ConfirmButton" +#define IDC_Description "Description" +#define IDC_XuiSavingIcon "XuiSavingIcon" +#define IDC_SceneSaveMessage "SceneSaveMessage" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_All.h b/targets/resources/XboxMedia/Media/xuiscene_settings_All.h index e4aa171cb..5a167c497 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_All.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_All.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButtonResetToDefaults L"XuiButtonResetToDefaults" -#define IDC_XuiButtonUI L"XuiButtonUI" -#define IDC_XuiButtonGraphics L"XuiButtonGraphics" -#define IDC_XuiButtonControl L"XuiButtonControl" -#define IDC_XuiButtonAudio L"XuiButtonAudio" -#define IDC_XuiButtonOptions L"XuiButtonOptions" -#define IDC_SceneSettings L"SceneSettings" +#define IDC_XuiButtonResetToDefaults "XuiButtonResetToDefaults" +#define IDC_XuiButtonUI "XuiButtonUI" +#define IDC_XuiButtonGraphics "XuiButtonGraphics" +#define IDC_XuiButtonControl "XuiButtonControl" +#define IDC_XuiButtonAudio "XuiButtonAudio" +#define IDC_XuiButtonOptions "XuiButtonOptions" +#define IDC_SceneSettings "SceneSettings" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_All_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_All_480.h index e4aa171cb..5a167c497 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_All_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_All_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButtonResetToDefaults L"XuiButtonResetToDefaults" -#define IDC_XuiButtonUI L"XuiButtonUI" -#define IDC_XuiButtonGraphics L"XuiButtonGraphics" -#define IDC_XuiButtonControl L"XuiButtonControl" -#define IDC_XuiButtonAudio L"XuiButtonAudio" -#define IDC_XuiButtonOptions L"XuiButtonOptions" -#define IDC_SceneSettings L"SceneSettings" +#define IDC_XuiButtonResetToDefaults "XuiButtonResetToDefaults" +#define IDC_XuiButtonUI "XuiButtonUI" +#define IDC_XuiButtonGraphics "XuiButtonGraphics" +#define IDC_XuiButtonControl "XuiButtonControl" +#define IDC_XuiButtonAudio "XuiButtonAudio" +#define IDC_XuiButtonOptions "XuiButtonOptions" +#define IDC_SceneSettings "SceneSettings" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_All_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_All_small.h index e4aa171cb..5a167c497 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_All_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_All_small.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiButtonResetToDefaults L"XuiButtonResetToDefaults" -#define IDC_XuiButtonUI L"XuiButtonUI" -#define IDC_XuiButtonGraphics L"XuiButtonGraphics" -#define IDC_XuiButtonControl L"XuiButtonControl" -#define IDC_XuiButtonAudio L"XuiButtonAudio" -#define IDC_XuiButtonOptions L"XuiButtonOptions" -#define IDC_SceneSettings L"SceneSettings" +#define IDC_XuiButtonResetToDefaults "XuiButtonResetToDefaults" +#define IDC_XuiButtonUI "XuiButtonUI" +#define IDC_XuiButtonGraphics "XuiButtonGraphics" +#define IDC_XuiButtonControl "XuiButtonControl" +#define IDC_XuiButtonAudio "XuiButtonAudio" +#define IDC_XuiButtonOptions "XuiButtonOptions" +#define IDC_SceneSettings "SceneSettings" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio.h index 33127d123..9ebbc70f9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSound L"XuiSliderSound" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderMusic L"XuiSliderMusic" -#define IDC_SceneSettingsAudio L"SceneSettingsAudio" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSound "XuiSliderSound" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderMusic "XuiSliderMusic" +#define IDC_SceneSettingsAudio "SceneSettingsAudio" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_480.h index 33127d123..9ebbc70f9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSound L"XuiSliderSound" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderMusic L"XuiSliderMusic" -#define IDC_SceneSettingsAudio L"SceneSettingsAudio" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSound "XuiSliderSound" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderMusic "XuiSliderMusic" +#define IDC_SceneSettingsAudio "SceneSettingsAudio" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_small.h index 33127d123..9ebbc70f9 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Audio_small.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSound L"XuiSliderSound" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderMusic L"XuiSliderMusic" -#define IDC_SceneSettingsAudio L"SceneSettingsAudio" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSound "XuiSliderSound" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderMusic "XuiSliderMusic" +#define IDC_SceneSettingsAudio "SceneSettingsAudio" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Control.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Control.h index 459a9dc17..9f8b8ad1a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Control.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Control.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInMenu L"XuiSliderSensitivityInMenu" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInGame L"XuiSliderSensitivityInGame" -#define IDC_SceneSettingsControl L"SceneSettingsControl" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInMenu "XuiSliderSensitivityInMenu" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInGame "XuiSliderSensitivityInGame" +#define IDC_SceneSettingsControl "SceneSettingsControl" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Control_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Control_480.h index 459a9dc17..9f8b8ad1a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Control_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Control_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInMenu L"XuiSliderSensitivityInMenu" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInGame L"XuiSliderSensitivityInGame" -#define IDC_SceneSettingsControl L"SceneSettingsControl" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInMenu "XuiSliderSensitivityInMenu" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInGame "XuiSliderSensitivityInGame" +#define IDC_SceneSettingsControl "SceneSettingsControl" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Control_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Control_small.h index 459a9dc17..9f8b8ad1a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Control_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Control_small.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInMenu L"XuiSliderSensitivityInMenu" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderSensitivityInGame L"XuiSliderSensitivityInGame" -#define IDC_SceneSettingsControl L"SceneSettingsControl" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInMenu "XuiSliderSensitivityInMenu" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderSensitivityInGame "XuiSliderSensitivityInGame" +#define IDC_SceneSettingsControl "SceneSettingsControl" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics.h index f8233ba34..fa4a684c4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics.h @@ -1,11 +1,11 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderInterfaceOpacity L"XuiSliderInterfaceOpacity" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderGamma L"XuiSliderGamma" -#define IDC_XuiCustomSkinAnim L"XuiCustomSkinAnim" -#define IDC_XuiBedrockFog L"XuiBedrockFog" -#define IDC_XuiClouds L"XuiClouds" -#define IDC_SceneSettingsGraphics L"SceneSettingsGraphics" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderInterfaceOpacity "XuiSliderInterfaceOpacity" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderGamma "XuiSliderGamma" +#define IDC_XuiCustomSkinAnim "XuiCustomSkinAnim" +#define IDC_XuiBedrockFog "XuiBedrockFog" +#define IDC_XuiClouds "XuiClouds" +#define IDC_SceneSettingsGraphics "SceneSettingsGraphics" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_480.h index f8233ba34..fa4a684c4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_480.h @@ -1,11 +1,11 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderInterfaceOpacity L"XuiSliderInterfaceOpacity" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderGamma L"XuiSliderGamma" -#define IDC_XuiCustomSkinAnim L"XuiCustomSkinAnim" -#define IDC_XuiBedrockFog L"XuiBedrockFog" -#define IDC_XuiClouds L"XuiClouds" -#define IDC_SceneSettingsGraphics L"SceneSettingsGraphics" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderInterfaceOpacity "XuiSliderInterfaceOpacity" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderGamma "XuiSliderGamma" +#define IDC_XuiCustomSkinAnim "XuiCustomSkinAnim" +#define IDC_XuiBedrockFog "XuiBedrockFog" +#define IDC_XuiClouds "XuiClouds" +#define IDC_SceneSettingsGraphics "SceneSettingsGraphics" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_small.h index f8233ba34..fa4a684c4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_Graphics_small.h @@ -1,11 +1,11 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderInterfaceOpacity L"XuiSliderInterfaceOpacity" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderGamma L"XuiSliderGamma" -#define IDC_XuiCustomSkinAnim L"XuiCustomSkinAnim" -#define IDC_XuiBedrockFog L"XuiBedrockFog" -#define IDC_XuiClouds L"XuiClouds" -#define IDC_SceneSettingsGraphics L"SceneSettingsGraphics" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderInterfaceOpacity "XuiSliderInterfaceOpacity" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderGamma "XuiSliderGamma" +#define IDC_XuiCustomSkinAnim "XuiCustomSkinAnim" +#define IDC_XuiBedrockFog "XuiBedrockFog" +#define IDC_XuiClouds "XuiClouds" +#define IDC_SceneSettingsGraphics "SceneSettingsGraphics" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_UI.h b/targets/resources/XboxMedia/Media/xuiscene_settings_UI.h index 9cff138c1..02acaa5fd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_UI.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_UI.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISizeSplitscreen L"XuiSliderUISizeSplitscreen" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISize L"XuiSliderUISize" -#define IDC_XuiShowSplitscreenGamertags L"XuiShowSplitscreenGamertags" -#define IDC_XuiSplitScreen L"XuiSplitScreen" -#define IDC_XuiShowAnimatedCharacter L"XuiShowAnimatedCharacter" -#define IDC_XuiDisplayDeathMessages L"XuiDisplayDeathMessages" -#define IDC_XuiDisplayHand L"XuiDisplayHand" -#define IDC_XuiDisplayHUD L"XuiDisplayHUD" -#define IDC_SceneSettingsUI L"SceneSettingsUI" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISizeSplitscreen "XuiSliderUISizeSplitscreen" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISize "XuiSliderUISize" +#define IDC_XuiShowSplitscreenGamertags "XuiShowSplitscreenGamertags" +#define IDC_XuiSplitScreen "XuiSplitScreen" +#define IDC_XuiShowAnimatedCharacter "XuiShowAnimatedCharacter" +#define IDC_XuiDisplayDeathMessages "XuiDisplayDeathMessages" +#define IDC_XuiDisplayHand "XuiDisplayHand" +#define IDC_XuiDisplayHUD "XuiDisplayHUD" +#define IDC_SceneSettingsUI "SceneSettingsUI" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_UI_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_UI_480.h index 9cff138c1..02acaa5fd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_UI_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_UI_480.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISizeSplitscreen L"XuiSliderUISizeSplitscreen" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISize L"XuiSliderUISize" -#define IDC_XuiShowSplitscreenGamertags L"XuiShowSplitscreenGamertags" -#define IDC_XuiSplitScreen L"XuiSplitScreen" -#define IDC_XuiShowAnimatedCharacter L"XuiShowAnimatedCharacter" -#define IDC_XuiDisplayDeathMessages L"XuiDisplayDeathMessages" -#define IDC_XuiDisplayHand L"XuiDisplayHand" -#define IDC_XuiDisplayHUD L"XuiDisplayHUD" -#define IDC_SceneSettingsUI L"SceneSettingsUI" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISizeSplitscreen "XuiSliderUISizeSplitscreen" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISize "XuiSliderUISize" +#define IDC_XuiShowSplitscreenGamertags "XuiShowSplitscreenGamertags" +#define IDC_XuiSplitScreen "XuiSplitScreen" +#define IDC_XuiShowAnimatedCharacter "XuiShowAnimatedCharacter" +#define IDC_XuiDisplayDeathMessages "XuiDisplayDeathMessages" +#define IDC_XuiDisplayHand "XuiDisplayHand" +#define IDC_XuiDisplayHUD "XuiDisplayHUD" +#define IDC_SceneSettingsUI "SceneSettingsUI" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_UI_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_UI_small.h index 9cff138c1..02acaa5fd 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_UI_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_UI_small.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISizeSplitscreen L"XuiSliderUISizeSplitscreen" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderUISize L"XuiSliderUISize" -#define IDC_XuiShowSplitscreenGamertags L"XuiShowSplitscreenGamertags" -#define IDC_XuiSplitScreen L"XuiSplitScreen" -#define IDC_XuiShowAnimatedCharacter L"XuiShowAnimatedCharacter" -#define IDC_XuiDisplayDeathMessages L"XuiDisplayDeathMessages" -#define IDC_XuiDisplayHand L"XuiDisplayHand" -#define IDC_XuiDisplayHUD L"XuiDisplayHUD" -#define IDC_SceneSettingsUI L"SceneSettingsUI" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISizeSplitscreen "XuiSliderUISizeSplitscreen" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderUISize "XuiSliderUISize" +#define IDC_XuiShowSplitscreenGamertags "XuiShowSplitscreenGamertags" +#define IDC_XuiSplitScreen "XuiSplitScreen" +#define IDC_XuiShowAnimatedCharacter "XuiShowAnimatedCharacter" +#define IDC_XuiDisplayDeathMessages "XuiDisplayDeathMessages" +#define IDC_XuiDisplayHand "XuiDisplayHand" +#define IDC_XuiDisplayHUD "XuiDisplayHUD" +#define IDC_SceneSettingsUI "SceneSettingsUI" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_options.h b/targets/resources/XboxMedia/Media/xuiscene_settings_options.h index dfe1f5c09..d1c6e8a8c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_options.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_options.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiDifficultyText L"XuiDifficultyText" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderAutosave L"XuiSliderAutosave" -#define IDC_XuiMashUpWorlds L"XuiMashUpWorlds" -#define IDC_XuiInGameGamertags L"XuiInGameGamertags" -#define IDC_XuiShowTooltips L"XuiShowTooltips" -#define IDC_XuiShowHints L"XuiShowHints" -#define IDC_XuiViewBob L"XuiViewBob" -#define IDC_SceneSettingsOptions L"SceneSettingsOptions" +#define IDC_XuiDifficultyText "XuiDifficultyText" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderAutosave "XuiSliderAutosave" +#define IDC_XuiMashUpWorlds "XuiMashUpWorlds" +#define IDC_XuiInGameGamertags "XuiInGameGamertags" +#define IDC_XuiShowTooltips "XuiShowTooltips" +#define IDC_XuiShowHints "XuiShowHints" +#define IDC_XuiViewBob "XuiViewBob" +#define IDC_SceneSettingsOptions "SceneSettingsOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_options_480.h b/targets/resources/XboxMedia/Media/xuiscene_settings_options_480.h index dfe1f5c09..d1c6e8a8c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_options_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_options_480.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiDifficultyText L"XuiDifficultyText" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderAutosave L"XuiSliderAutosave" -#define IDC_XuiMashUpWorlds L"XuiMashUpWorlds" -#define IDC_XuiInGameGamertags L"XuiInGameGamertags" -#define IDC_XuiShowTooltips L"XuiShowTooltips" -#define IDC_XuiShowHints L"XuiShowHints" -#define IDC_XuiViewBob L"XuiViewBob" -#define IDC_SceneSettingsOptions L"SceneSettingsOptions" +#define IDC_XuiDifficultyText "XuiDifficultyText" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderAutosave "XuiSliderAutosave" +#define IDC_XuiMashUpWorlds "XuiMashUpWorlds" +#define IDC_XuiInGameGamertags "XuiInGameGamertags" +#define IDC_XuiShowTooltips "XuiShowTooltips" +#define IDC_XuiShowHints "XuiShowHints" +#define IDC_XuiViewBob "XuiViewBob" +#define IDC_SceneSettingsOptions "SceneSettingsOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_settings_options_small.h b/targets/resources/XboxMedia/Media/xuiscene_settings_options_small.h index dfe1f5c09..d1c6e8a8c 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_settings_options_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_settings_options_small.h @@ -1,14 +1,14 @@ #pragma once -#define IDC_XuiDifficultyText L"XuiDifficultyText" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderDifficulty L"XuiSliderDifficulty" -#define IDC_XuiSlider L"XuiSlider" -#define IDC_FocusSink L"FocusSink" -#define IDC_XuiSliderAutosave L"XuiSliderAutosave" -#define IDC_XuiMashUpWorlds L"XuiMashUpWorlds" -#define IDC_XuiInGameGamertags L"XuiInGameGamertags" -#define IDC_XuiShowTooltips L"XuiShowTooltips" -#define IDC_XuiShowHints L"XuiShowHints" -#define IDC_XuiViewBob L"XuiViewBob" -#define IDC_SceneSettingsOptions L"SceneSettingsOptions" +#define IDC_XuiDifficultyText "XuiDifficultyText" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderDifficulty "XuiSliderDifficulty" +#define IDC_XuiSlider "XuiSlider" +#define IDC_FocusSink "FocusSink" +#define IDC_XuiSliderAutosave "XuiSliderAutosave" +#define IDC_XuiMashUpWorlds "XuiMashUpWorlds" +#define IDC_XuiInGameGamertags "XuiInGameGamertags" +#define IDC_XuiShowTooltips "XuiShowTooltips" +#define IDC_XuiShowHints "XuiShowHints" +#define IDC_XuiViewBob "XuiViewBob" +#define IDC_SceneSettingsOptions "SceneSettingsOptions" diff --git a/targets/resources/XboxMedia/Media/xuiscene_signentry.h b/targets/resources/XboxMedia/Media/xuiscene_signentry.h index d36b2ed20..9a9e13f21 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_signentry.h +++ b/targets/resources/XboxMedia/Media/xuiscene_signentry.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_BackgroundImage L"BackgroundImage" -#define IDC_EditLineOne L"EditLineOne" -#define IDC_EditLineTwo L"EditLineTwo" -#define IDC_EditLineThree L"EditLineThree" -#define IDC_EditLineFour L"EditLineFour" -#define IDC_ButtonDone L"ButtonDone" -#define IDC_EditSignMessage L"EditSignMessage" -#define IDC_SceneSignEntry L"SceneSignEntry" +#define IDC_BackgroundImage "BackgroundImage" +#define IDC_EditLineOne "EditLineOne" +#define IDC_EditLineTwo "EditLineTwo" +#define IDC_EditLineThree "EditLineThree" +#define IDC_EditLineFour "EditLineFour" +#define IDC_ButtonDone "ButtonDone" +#define IDC_EditSignMessage "EditSignMessage" +#define IDC_SceneSignEntry "SceneSignEntry" diff --git a/targets/resources/XboxMedia/Media/xuiscene_signentry_480.h b/targets/resources/XboxMedia/Media/xuiscene_signentry_480.h index d36b2ed20..9a9e13f21 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_signentry_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_signentry_480.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_BackgroundImage L"BackgroundImage" -#define IDC_EditLineOne L"EditLineOne" -#define IDC_EditLineTwo L"EditLineTwo" -#define IDC_EditLineThree L"EditLineThree" -#define IDC_EditLineFour L"EditLineFour" -#define IDC_ButtonDone L"ButtonDone" -#define IDC_EditSignMessage L"EditSignMessage" -#define IDC_SceneSignEntry L"SceneSignEntry" +#define IDC_BackgroundImage "BackgroundImage" +#define IDC_EditLineOne "EditLineOne" +#define IDC_EditLineTwo "EditLineTwo" +#define IDC_EditLineThree "EditLineThree" +#define IDC_EditLineFour "EditLineFour" +#define IDC_ButtonDone "ButtonDone" +#define IDC_EditSignMessage "EditSignMessage" +#define IDC_SceneSignEntry "SceneSignEntry" diff --git a/targets/resources/XboxMedia/Media/xuiscene_signentry_small.h b/targets/resources/XboxMedia/Media/xuiscene_signentry_small.h index d36b2ed20..9a9e13f21 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_signentry_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_signentry_small.h @@ -1,9 +1,9 @@ #pragma once -#define IDC_BackgroundImage L"BackgroundImage" -#define IDC_EditLineOne L"EditLineOne" -#define IDC_EditLineTwo L"EditLineTwo" -#define IDC_EditLineThree L"EditLineThree" -#define IDC_EditLineFour L"EditLineFour" -#define IDC_ButtonDone L"ButtonDone" -#define IDC_EditSignMessage L"EditSignMessage" -#define IDC_SceneSignEntry L"SceneSignEntry" +#define IDC_BackgroundImage "BackgroundImage" +#define IDC_EditLineOne "EditLineOne" +#define IDC_EditLineTwo "EditLineTwo" +#define IDC_EditLineThree "EditLineThree" +#define IDC_EditLineFour "EditLineFour" +#define IDC_ButtonDone "ButtonDone" +#define IDC_EditSignMessage "EditSignMessage" +#define IDC_SceneSignEntry "SceneSignEntry" diff --git a/targets/resources/XboxMedia/Media/xuiscene_skinselect.h b/targets/resources/XboxMedia/Media/xuiscene_skinselect.h index 68a63ca21..f9fd91175 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_skinselect.h +++ b/targets/resources/XboxMedia/Media/xuiscene_skinselect.h @@ -1,46 +1,46 @@ #pragma once -#define IDC_BackgroundTint L"BackgroundTint" -#define IDC_CharacterPrevious4 L"CharacterPrevious4" -#define IDC_CharacterPrevious3 L"CharacterPrevious3" -#define IDC_CharacterPrevious2 L"CharacterPrevious2" -#define IDC_CharacterPrevious1 L"CharacterPrevious1" -#define IDC_CharacterNext4 L"CharacterNext4" -#define IDC_CharacterNext3 L"CharacterNext3" -#define IDC_CharacterNext2 L"CharacterNext2" -#define IDC_CharacterNext1 L"CharacterNext1" -#define IDC_Character L"Character" -#define IDC_Characters L"Characters" -#define IDC_Baseline L"Baseline" -#define IDC_Normal L"Normal" -#define IDC_BaselineSelected L"BaselineSelected" -#define IDC_NormalSelected L"NormalSelected" -#define IDC_Selected L"Selected" -#define IDC_TabBar L"TabBar" -#define IDC_Left L"Left" -#define IDC_Right L"Right" -#define IDC_Center L"Center" -#define IDC_PackGroup L"PackGroup" -#define IDC_SkinName L"SkinName" -#define IDC_OriginName L"OriginName" -#define IDC_SkinDetails L"SkinDetails" -#define IDC_Locked L"Locked" -#define IDC_SelectedText L"SelectedText" -#define IDC_SelectedGroup L"SelectedGroup" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneSkinSelect L"SceneSkinSelect" +#define IDC_BackgroundTint "BackgroundTint" +#define IDC_CharacterPrevious4 "CharacterPrevious4" +#define IDC_CharacterPrevious3 "CharacterPrevious3" +#define IDC_CharacterPrevious2 "CharacterPrevious2" +#define IDC_CharacterPrevious1 "CharacterPrevious1" +#define IDC_CharacterNext4 "CharacterNext4" +#define IDC_CharacterNext3 "CharacterNext3" +#define IDC_CharacterNext2 "CharacterNext2" +#define IDC_CharacterNext1 "CharacterNext1" +#define IDC_Character "Character" +#define IDC_Characters "Characters" +#define IDC_Baseline "Baseline" +#define IDC_Normal "Normal" +#define IDC_BaselineSelected "BaselineSelected" +#define IDC_NormalSelected "NormalSelected" +#define IDC_Selected "Selected" +#define IDC_TabBar "TabBar" +#define IDC_Left "Left" +#define IDC_Right "Right" +#define IDC_Center "Center" +#define IDC_PackGroup "PackGroup" +#define IDC_SkinName "SkinName" +#define IDC_OriginName "OriginName" +#define IDC_SkinDetails "SkinDetails" +#define IDC_Locked "Locked" +#define IDC_SelectedText "SelectedText" +#define IDC_SelectedGroup "SelectedGroup" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneSkinSelect "SceneSkinSelect" diff --git a/targets/resources/XboxMedia/Media/xuiscene_skinselect_480.h b/targets/resources/XboxMedia/Media/xuiscene_skinselect_480.h index cbde6b434..f6ca80431 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_skinselect_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_skinselect_480.h @@ -1,46 +1,46 @@ #pragma once -#define IDC_BackgroundTint L"BackgroundTint" -#define IDC_CharacterPrevious4 L"CharacterPrevious4" -#define IDC_CharacterPrevious3 L"CharacterPrevious3" -#define IDC_CharacterPrevious2 L"CharacterPrevious2" -#define IDC_CharacterPrevious1 L"CharacterPrevious1" -#define IDC_CharacterNext4 L"CharacterNext4" -#define IDC_CharacterNext3 L"CharacterNext3" -#define IDC_CharacterNext2 L"CharacterNext2" -#define IDC_CharacterNext1 L"CharacterNext1" -#define IDC_Character L"Character" -#define IDC_Characters L"Characters" -#define IDC_Baseline L"Baseline" -#define IDC_Normal L"Normal" -#define IDC_BaselineSelected L"BaselineSelected" -#define IDC_NormalSelected L"NormalSelected" -#define IDC_Selected L"Selected" -#define IDC_TabBar L"TabBar" -#define IDC_Left L"Left" -#define IDC_Right L"Right" -#define IDC_Center L"Center" -#define IDC_PackGroup L"PackGroup" -#define IDC_OriginName L"OriginName" -#define IDC_SkinName L"SkinName" -#define IDC_SkinDetails L"SkinDetails" -#define IDC_Locked L"Locked" -#define IDC_SelectedText L"SelectedText" -#define IDC_SelectedGroup L"SelectedGroup" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneSkinSelect480 L"SceneSkinSelect480" +#define IDC_BackgroundTint "BackgroundTint" +#define IDC_CharacterPrevious4 "CharacterPrevious4" +#define IDC_CharacterPrevious3 "CharacterPrevious3" +#define IDC_CharacterPrevious2 "CharacterPrevious2" +#define IDC_CharacterPrevious1 "CharacterPrevious1" +#define IDC_CharacterNext4 "CharacterNext4" +#define IDC_CharacterNext3 "CharacterNext3" +#define IDC_CharacterNext2 "CharacterNext2" +#define IDC_CharacterNext1 "CharacterNext1" +#define IDC_Character "Character" +#define IDC_Characters "Characters" +#define IDC_Baseline "Baseline" +#define IDC_Normal "Normal" +#define IDC_BaselineSelected "BaselineSelected" +#define IDC_NormalSelected "NormalSelected" +#define IDC_Selected "Selected" +#define IDC_TabBar "TabBar" +#define IDC_Left "Left" +#define IDC_Right "Right" +#define IDC_Center "Center" +#define IDC_PackGroup "PackGroup" +#define IDC_OriginName "OriginName" +#define IDC_SkinName "SkinName" +#define IDC_SkinDetails "SkinDetails" +#define IDC_Locked "Locked" +#define IDC_SelectedText "SelectedText" +#define IDC_SelectedGroup "SelectedGroup" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneSkinSelect480 "SceneSkinSelect480" diff --git a/targets/resources/XboxMedia/Media/xuiscene_skinselect_small.h b/targets/resources/XboxMedia/Media/xuiscene_skinselect_small.h index e7258ca8e..5cb1a4deb 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_skinselect_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_skinselect_small.h @@ -1,43 +1,43 @@ #pragma once -#define IDC_BackgroundTint L"BackgroundTint" -#define IDC_CharacterPrevious4 L"CharacterPrevious4" -#define IDC_CharacterPrevious3 L"CharacterPrevious3" -#define IDC_CharacterPrevious2 L"CharacterPrevious2" -#define IDC_CharacterPrevious1 L"CharacterPrevious1" -#define IDC_CharacterNext4 L"CharacterNext4" -#define IDC_CharacterNext3 L"CharacterNext3" -#define IDC_CharacterNext2 L"CharacterNext2" -#define IDC_CharacterNext1 L"CharacterNext1" -#define IDC_Character L"Character" -#define IDC_Characters L"Characters" -#define IDC_Normal L"Normal" -#define IDC_Selected L"Selected" -#define IDC_TabBar L"TabBar" -#define IDC_Left L"Left" -#define IDC_Right L"Right" -#define IDC_Center L"Center" -#define IDC_PackGroup L"PackGroup" -#define IDC_SkinName L"SkinName" -#define IDC_OriginName L"OriginName" -#define IDC_SkinDetails L"SkinDetails" -#define IDC_Locked L"Locked" -#define IDC_SelectedText L"SelectedText" -#define IDC_SelectedGroup L"SelectedGroup" -#define IDC_Timer_Square_1 L"Timer_Square_1" -#define IDC_Timer_Square_2 L"Timer_Square_2" -#define IDC_Timer_Square_3 L"Timer_Square_3" -#define IDC_Timer_Square_4 L"Timer_Square_4" -#define IDC_Timer_Square_5 L"Timer_Square_5" -#define IDC_Timer_Square_6 L"Timer_Square_6" -#define IDC_Timer_Square_7 L"Timer_Square_7" -#define IDC_Timer_Square_8 L"Timer_Square_8" -#define IDC_Timer_Square_9 L"Timer_Square_9" -#define IDC_Timer_Square_10 L"Timer_Square_10" -#define IDC_Timer_Square_11 L"Timer_Square_11" -#define IDC_Timer_Square_12 L"Timer_Square_12" -#define IDC_Timer_Square_13 L"Timer_Square_13" -#define IDC_Timer_Square_14 L"Timer_Square_14" -#define IDC_Timer_Square_15 L"Timer_Square_15" -#define IDC_Timer_Square_16 L"Timer_Square_16" -#define IDC_Timer L"Timer" -#define IDC_SceneSkinSelectSmall L"SceneSkinSelectSmall" +#define IDC_BackgroundTint "BackgroundTint" +#define IDC_CharacterPrevious4 "CharacterPrevious4" +#define IDC_CharacterPrevious3 "CharacterPrevious3" +#define IDC_CharacterPrevious2 "CharacterPrevious2" +#define IDC_CharacterPrevious1 "CharacterPrevious1" +#define IDC_CharacterNext4 "CharacterNext4" +#define IDC_CharacterNext3 "CharacterNext3" +#define IDC_CharacterNext2 "CharacterNext2" +#define IDC_CharacterNext1 "CharacterNext1" +#define IDC_Character "Character" +#define IDC_Characters "Characters" +#define IDC_Normal "Normal" +#define IDC_Selected "Selected" +#define IDC_TabBar "TabBar" +#define IDC_Left "Left" +#define IDC_Right "Right" +#define IDC_Center "Center" +#define IDC_PackGroup "PackGroup" +#define IDC_SkinName "SkinName" +#define IDC_OriginName "OriginName" +#define IDC_SkinDetails "SkinDetails" +#define IDC_Locked "Locked" +#define IDC_SelectedText "SelectedText" +#define IDC_SelectedGroup "SelectedGroup" +#define IDC_Timer_Square_1 "Timer_Square_1" +#define IDC_Timer_Square_2 "Timer_Square_2" +#define IDC_Timer_Square_3 "Timer_Square_3" +#define IDC_Timer_Square_4 "Timer_Square_4" +#define IDC_Timer_Square_5 "Timer_Square_5" +#define IDC_Timer_Square_6 "Timer_Square_6" +#define IDC_Timer_Square_7 "Timer_Square_7" +#define IDC_Timer_Square_8 "Timer_Square_8" +#define IDC_Timer_Square_9 "Timer_Square_9" +#define IDC_Timer_Square_10 "Timer_Square_10" +#define IDC_Timer_Square_11 "Timer_Square_11" +#define IDC_Timer_Square_12 "Timer_Square_12" +#define IDC_Timer_Square_13 "Timer_Square_13" +#define IDC_Timer_Square_14 "Timer_Square_14" +#define IDC_Timer_Square_15 "Timer_Square_15" +#define IDC_Timer_Square_16 "Timer_Square_16" +#define IDC_Timer "Timer" +#define IDC_SceneSkinSelectSmall "SceneSkinSelectSmall" diff --git a/targets/resources/XboxMedia/Media/xuiscene_socialpost.h b/targets/resources/XboxMedia/Media/xuiscene_socialpost.h index d891fb3c0..31141e47a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_socialpost.h +++ b/targets/resources/XboxMedia/Media/xuiscene_socialpost.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiOK L"XuiOK" -#define IDC_XuiEditDescription L"XuiEditDescription" -#define IDC_XuiLabelDescription L"XuiLabelDescription" -#define IDC_XuiEditCaption L"XuiEditCaption" -#define IDC_XuiLabelCaption L"XuiLabelCaption" -#define IDC_XuiLabelText L"XuiLabelText" -#define IDC_SceneSocialPost L"SceneSocialPost" +#define IDC_XuiOK "XuiOK" +#define IDC_XuiEditDescription "XuiEditDescription" +#define IDC_XuiLabelDescription "XuiLabelDescription" +#define IDC_XuiEditCaption "XuiEditCaption" +#define IDC_XuiLabelCaption "XuiLabelCaption" +#define IDC_XuiLabelText "XuiLabelText" +#define IDC_SceneSocialPost "SceneSocialPost" diff --git a/targets/resources/XboxMedia/Media/xuiscene_socialpost_480.h b/targets/resources/XboxMedia/Media/xuiscene_socialpost_480.h index d891fb3c0..31141e47a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_socialpost_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_socialpost_480.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiOK L"XuiOK" -#define IDC_XuiEditDescription L"XuiEditDescription" -#define IDC_XuiLabelDescription L"XuiLabelDescription" -#define IDC_XuiEditCaption L"XuiEditCaption" -#define IDC_XuiLabelCaption L"XuiLabelCaption" -#define IDC_XuiLabelText L"XuiLabelText" -#define IDC_SceneSocialPost L"SceneSocialPost" +#define IDC_XuiOK "XuiOK" +#define IDC_XuiEditDescription "XuiEditDescription" +#define IDC_XuiLabelDescription "XuiLabelDescription" +#define IDC_XuiEditCaption "XuiEditCaption" +#define IDC_XuiLabelCaption "XuiLabelCaption" +#define IDC_XuiLabelText "XuiLabelText" +#define IDC_SceneSocialPost "SceneSocialPost" diff --git a/targets/resources/XboxMedia/Media/xuiscene_socialpost_small.h b/targets/resources/XboxMedia/Media/xuiscene_socialpost_small.h index d891fb3c0..31141e47a 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_socialpost_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_socialpost_small.h @@ -1,8 +1,8 @@ #pragma once -#define IDC_XuiOK L"XuiOK" -#define IDC_XuiEditDescription L"XuiEditDescription" -#define IDC_XuiLabelDescription L"XuiLabelDescription" -#define IDC_XuiEditCaption L"XuiEditCaption" -#define IDC_XuiLabelCaption L"XuiLabelCaption" -#define IDC_XuiLabelText L"XuiLabelText" -#define IDC_SceneSocialPost L"SceneSocialPost" +#define IDC_XuiOK "XuiOK" +#define IDC_XuiEditDescription "XuiEditDescription" +#define IDC_XuiLabelDescription "XuiLabelDescription" +#define IDC_XuiEditCaption "XuiEditCaption" +#define IDC_XuiLabelCaption "XuiLabelCaption" +#define IDC_XuiLabelText "XuiLabelText" +#define IDC_SceneSocialPost "SceneSocialPost" diff --git a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu.h b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu.h index 811b981e4..35b13c919 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu.h +++ b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu.h @@ -1,10 +1,10 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_Teleport L"Teleport" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_Teleport "Teleport" diff --git a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_480.h b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_480.h index 811b981e4..35b13c919 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_480.h @@ -1,10 +1,10 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_Teleport L"Teleport" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_Teleport "Teleport" diff --git a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_small.h b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_small.h index 811b981e4..35b13c919 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_teleportmenu_small.h @@ -1,10 +1,10 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_GamePlayers L"GamePlayers" -#define IDC_Title L"Title" -#define IDC_Teleport L"Teleport" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_GamePlayers "GamePlayers" +#define IDC_Title "Title" +#define IDC_Teleport "Teleport" diff --git a/targets/resources/XboxMedia/Media/xuiscene_text_entry.h b/targets/resources/XboxMedia/Media/xuiscene_text_entry.h index 26dcb8cfd..ef83d91d1 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_text_entry.h +++ b/targets/resources/XboxMedia/Media/xuiscene_text_entry.h @@ -1,3 +1,3 @@ #pragma once -#define IDC_XuiEditText L"XuiEditText" -#define IDC_TextEntry L"TextEntry" +#define IDC_XuiEditText "XuiEditText" +#define IDC_TextEntry "TextEntry" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trading.h b/targets/resources/XboxMedia/Media/xuiscene_trading.h index f9bf09258..a53042b5f 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trading.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trading.h @@ -1,486 +1,486 @@ #pragma once -#define IDC_RequiredWindow L"RequiredWindow" -#define IDC_TradingWindow L"TradingWindow" -#define IDC_RequiredLabel L"RequiredLabel" -#define IDC_VillagerText L"VillagerText" -#define IDC_Request1 L"Request1" -#define IDC_Request2 L"Request2" -#define IDC_Offer1Label L"Offer1Label" -#define IDC_Offer2Label L"Offer2Label" -#define IDC_ScrollLeftArrow L"ScrollLeftArrow" -#define IDC_ScrollRightArrow L"ScrollRightArrow" -#define IDC_TradingBar0 L"TradingBar0" -#define IDC_TradingBar1 L"TradingBar1" -#define IDC_TradingBar2 L"TradingBar2" -#define IDC_TradingBar3 L"TradingBar3" -#define IDC_TradingBar4 L"TradingBar4" -#define IDC_TradingBar5 L"TradingBar5" -#define IDC_TradingBar6 L"TradingBar6" -#define IDC_TradingSelector L"TradingSelector" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_InventoryLabel L"InventoryLabel" -#define IDC_HtmlTextPanel L"HtmlTextPanel" -#define IDC_Group L"Group" -#define IDC_XuiSceneTrading L"XuiSceneTrading" +#define IDC_RequiredWindow "RequiredWindow" +#define IDC_TradingWindow "TradingWindow" +#define IDC_RequiredLabel "RequiredLabel" +#define IDC_VillagerText "VillagerText" +#define IDC_Request1 "Request1" +#define IDC_Request2 "Request2" +#define IDC_Offer1Label "Offer1Label" +#define IDC_Offer2Label "Offer2Label" +#define IDC_ScrollLeftArrow "ScrollLeftArrow" +#define IDC_ScrollRightArrow "ScrollRightArrow" +#define IDC_TradingBar0 "TradingBar0" +#define IDC_TradingBar1 "TradingBar1" +#define IDC_TradingBar2 "TradingBar2" +#define IDC_TradingBar3 "TradingBar3" +#define IDC_TradingBar4 "TradingBar4" +#define IDC_TradingBar5 "TradingBar5" +#define IDC_TradingBar6 "TradingBar6" +#define IDC_TradingSelector "TradingSelector" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_InventoryLabel "InventoryLabel" +#define IDC_HtmlTextPanel "HtmlTextPanel" +#define IDC_Group "Group" +#define IDC_XuiSceneTrading "XuiSceneTrading" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trading_480.h b/targets/resources/XboxMedia/Media/xuiscene_trading_480.h index 5898253bd..f10b08dd0 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trading_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trading_480.h @@ -1,463 +1,463 @@ -#define IDC_TradingWindow L"TradingWindow" -#define IDC_TradingWindow1 L"TradingWindow1" -#define IDC_RequiredLabel L"RequiredLabel" -#define IDC_VillagerText L"VillagerText" -#define IDC_Offer2Label L"Offer2Label" -#define IDC_Offer1Label L"Offer1Label" -#define IDC_ScrollLeftArrow L"ScrollLeftArrow" -#define IDC_ScrollRightArrow L"ScrollRightArrow" -#define IDC_Request1 L"Request1" -#define IDC_Request2 L"Request2" -#define IDC_TradingBar0 L"TradingBar0" -#define IDC_TradingBar1 L"TradingBar1" -#define IDC_TradingBar2 L"TradingBar2" -#define IDC_TradingBar3 L"TradingBar3" -#define IDC_TradingBar4 L"TradingBar4" -#define IDC_TradingBar5 L"TradingBar5" -#define IDC_TradingBar6 L"TradingBar6" -#define IDC_TradingSelector L"TradingSelector" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_InventoryLabel L"InventoryLabel" -#define IDC_HtmlTextPanel L"HtmlTextPanel" -#define IDC_Group L"Group" -#define IDC_XuiSceneTrading L"XuiSceneTrading" +#define IDC_TradingWindow "TradingWindow" +#define IDC_TradingWindow1 "TradingWindow1" +#define IDC_RequiredLabel "RequiredLabel" +#define IDC_VillagerText "VillagerText" +#define IDC_Offer2Label "Offer2Label" +#define IDC_Offer1Label "Offer1Label" +#define IDC_ScrollLeftArrow "ScrollLeftArrow" +#define IDC_ScrollRightArrow "ScrollRightArrow" +#define IDC_Request1 "Request1" +#define IDC_Request2 "Request2" +#define IDC_TradingBar0 "TradingBar0" +#define IDC_TradingBar1 "TradingBar1" +#define IDC_TradingBar2 "TradingBar2" +#define IDC_TradingBar3 "TradingBar3" +#define IDC_TradingBar4 "TradingBar4" +#define IDC_TradingBar5 "TradingBar5" +#define IDC_TradingBar6 "TradingBar6" +#define IDC_TradingSelector "TradingSelector" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_InventoryLabel "InventoryLabel" +#define IDC_HtmlTextPanel "HtmlTextPanel" +#define IDC_Group "Group" +#define IDC_XuiSceneTrading "XuiSceneTrading" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trading_small.h b/targets/resources/XboxMedia/Media/xuiscene_trading_small.h index f2bb799f0..a91e476f4 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trading_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trading_small.h @@ -1,445 +1,445 @@ -#define IDC_TradingWindow L"TradingWindow" -#define IDC_TradingWindow1 L"TradingWindow1" -#define IDC_RequiredLabel L"RequiredLabel" -#define IDC_VillagerText L"VillagerText" -#define IDC_Offer2Label L"Offer2Label" -#define IDC_Offer1Label L"Offer1Label" -#define IDC_ScrollLeftArrow L"ScrollLeftArrow" -#define IDC_ScrollRightArrow L"ScrollRightArrow" -#define IDC_Request1 L"Request1" -#define IDC_Request2 L"Request2" -#define IDC_TradingBar0 L"TradingBar0" -#define IDC_TradingBar1 L"TradingBar1" -#define IDC_TradingBar2 L"TradingBar2" -#define IDC_TradingBar3 L"TradingBar3" -#define IDC_TradingBar4 L"TradingBar4" -#define IDC_TradingBar5 L"TradingBar5" -#define IDC_TradingBar6 L"TradingBar6" -#define IDC_TradingSelector L"TradingSelector" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_InventoryGrid L"InventoryGrid" -#define IDC_InventoryLabel L"InventoryLabel" -#define IDC_HtmlTextPanel L"HtmlTextPanel" -#define IDC_Group L"Group" -#define IDC_XuiSceneTrading L"XuiSceneTrading" +#define IDC_TradingWindow "TradingWindow" +#define IDC_TradingWindow1 "TradingWindow1" +#define IDC_RequiredLabel "RequiredLabel" +#define IDC_VillagerText "VillagerText" +#define IDC_Offer2Label "Offer2Label" +#define IDC_Offer1Label "Offer1Label" +#define IDC_ScrollLeftArrow "ScrollLeftArrow" +#define IDC_ScrollRightArrow "ScrollRightArrow" +#define IDC_Request1 "Request1" +#define IDC_Request2 "Request2" +#define IDC_TradingBar0 "TradingBar0" +#define IDC_TradingBar1 "TradingBar1" +#define IDC_TradingBar2 "TradingBar2" +#define IDC_TradingBar3 "TradingBar3" +#define IDC_TradingBar4 "TradingBar4" +#define IDC_TradingBar5 "TradingBar5" +#define IDC_TradingBar6 "TradingBar6" +#define IDC_TradingSelector "TradingSelector" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_InventoryGrid "InventoryGrid" +#define IDC_InventoryLabel "InventoryLabel" +#define IDC_HtmlTextPanel "HtmlTextPanel" +#define IDC_Group "Group" +#define IDC_XuiSceneTrading "XuiSceneTrading" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trap.h b/targets/resources/XboxMedia/Media/xuiscene_trap.h index 1e3270f1f..9c2d10120 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trap.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trap.h @@ -1,54 +1,54 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Trap L"Trap" -#define IDC_InventoryText L"InventoryText" -#define IDC_DispenserText L"DispenserText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_DispenserScene L"DispenserScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Trap "Trap" +#define IDC_InventoryText "InventoryText" +#define IDC_DispenserText "DispenserText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_DispenserScene "DispenserScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trap_480.h b/targets/resources/XboxMedia/Media/xuiscene_trap_480.h index fbda32fbc..b5fed12d1 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trap_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trap_480.h @@ -1,96 +1,96 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Trap L"Trap" -#define IDC_InventoryText L"InventoryText" -#define IDC_DispenserText L"DispenserText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_DispenserScene L"DispenserScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Trap "Trap" +#define IDC_InventoryText "InventoryText" +#define IDC_DispenserText "DispenserText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_DispenserScene "DispenserScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trap_small.h b/targets/resources/XboxMedia/Media/xuiscene_trap_small.h index 1e3270f1f..9c2d10120 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trap_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trap_small.h @@ -1,54 +1,54 @@ #pragma once -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Inventory L"Inventory" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_UseRow L"UseRow" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_control_ListItem L"control_ListItem" -#define IDC_Trap L"Trap" -#define IDC_InventoryText L"InventoryText" -#define IDC_DispenserText L"DispenserText" -#define IDC_Pointer L"Pointer" -#define IDC_Group L"Group" -#define IDC_DispenserScene L"DispenserScene" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Inventory "Inventory" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_UseRow "UseRow" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_control_ListItem "control_ListItem" +#define IDC_Trap "Trap" +#define IDC_InventoryText "InventoryText" +#define IDC_DispenserText "DispenserText" +#define IDC_Pointer "Pointer" +#define IDC_Group "Group" +#define IDC_DispenserScene "DispenserScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell.h b/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell.h index 9d037ddbf..c5b13bdec 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell.h @@ -1,4 +1,4 @@ #pragma once -#define IDC_XuiImage2 L"XuiImage2" -#define IDC_XuiImage1 L"XuiImage1" -#define IDC_TrialExitUpsell L"TrialExitUpsell" +#define IDC_XuiImage2 "XuiImage2" +#define IDC_XuiImage1 "XuiImage1" +#define IDC_TrialExitUpsell "TrialExitUpsell" diff --git a/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell_480.h b/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell_480.h index 9d037ddbf..c5b13bdec 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_trialexitupsell_480.h @@ -1,4 +1,4 @@ #pragma once -#define IDC_XuiImage2 L"XuiImage2" -#define IDC_XuiImage1 L"XuiImage1" -#define IDC_TrialExitUpsell L"TrialExitUpsell" +#define IDC_XuiImage2 "XuiImage2" +#define IDC_XuiImage1 "XuiImage1" +#define IDC_TrialExitUpsell "TrialExitUpsell" diff --git a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup.h b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup.h index 71548e867..538925466 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup.h +++ b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_Description L"Description" -#define IDC_XuiInventoryPic L"XuiInventoryPic" -#define IDC_XuiImage L"XuiImage" -#define IDC_Title L"Title" -#define IDC_FontSize L"FontSize" -#define IDC_TutorialPopup L"TutorialPopup" +#define IDC_Description "Description" +#define IDC_XuiInventoryPic "XuiInventoryPic" +#define IDC_XuiImage "XuiImage" +#define IDC_Title "Title" +#define IDC_FontSize "FontSize" +#define IDC_TutorialPopup "TutorialPopup" diff --git a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_480.h b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_480.h index 71548e867..538925466 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_480.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_Description L"Description" -#define IDC_XuiInventoryPic L"XuiInventoryPic" -#define IDC_XuiImage L"XuiImage" -#define IDC_Title L"Title" -#define IDC_FontSize L"FontSize" -#define IDC_TutorialPopup L"TutorialPopup" +#define IDC_Description "Description" +#define IDC_XuiInventoryPic "XuiInventoryPic" +#define IDC_XuiImage "XuiImage" +#define IDC_Title "Title" +#define IDC_FontSize "FontSize" +#define IDC_TutorialPopup "TutorialPopup" diff --git a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_small.h b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_small.h index 71548e867..538925466 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_small.h +++ b/targets/resources/XboxMedia/Media/xuiscene_tutorialpopup_small.h @@ -1,7 +1,7 @@ #pragma once -#define IDC_Description L"Description" -#define IDC_XuiInventoryPic L"XuiInventoryPic" -#define IDC_XuiImage L"XuiImage" -#define IDC_Title L"Title" -#define IDC_FontSize L"FontSize" -#define IDC_TutorialPopup L"TutorialPopup" +#define IDC_Description "Description" +#define IDC_XuiInventoryPic "XuiInventoryPic" +#define IDC_XuiImage "XuiImage" +#define IDC_Title "Title" +#define IDC_FontSize "FontSize" +#define IDC_TutorialPopup "TutorialPopup" diff --git a/targets/resources/XboxMedia/Media/xuiscene_win.h b/targets/resources/XboxMedia/Media/xuiscene_win.h index 7bc23cb7b..17ec475a8 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_win.h +++ b/targets/resources/XboxMedia/Media/xuiscene_win.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_HtmlControl L"HtmlControl" -#define IDC_Darken L"Darken" -#define IDC_FocusSink L"FocusSink" -#define IDC_WinScene L"WinScene" +#define IDC_HtmlControl "HtmlControl" +#define IDC_Darken "Darken" +#define IDC_FocusSink "FocusSink" +#define IDC_WinScene "WinScene" diff --git a/targets/resources/XboxMedia/Media/xuiscene_win_480.h b/targets/resources/XboxMedia/Media/xuiscene_win_480.h index 7bc23cb7b..17ec475a8 100644 --- a/targets/resources/XboxMedia/Media/xuiscene_win_480.h +++ b/targets/resources/XboxMedia/Media/xuiscene_win_480.h @@ -1,5 +1,5 @@ #pragma once -#define IDC_HtmlControl L"HtmlControl" -#define IDC_Darken L"Darken" -#define IDC_FocusSink L"FocusSink" -#define IDC_WinScene L"WinScene" +#define IDC_HtmlControl "HtmlControl" +#define IDC_Darken "Darken" +#define IDC_FocusSink "FocusSink" +#define IDC_WinScene "WinScene" diff --git a/targets/util/StringHelpers.cpp b/targets/util/StringHelpers.cpp index a7619d748..e1cc331ca 100644 --- a/targets/util/StringHelpers.cpp +++ b/targets/util/StringHelpers.cpp @@ -1,16 +1,24 @@ #include #include -#include #include +#include #include #include #include #include "simdutf.h" -std::wstring toLower(const std::wstring& a) { - std::wstring out = std::wstring(a); - std::transform(out.begin(), out.end(), out.begin(), std::towlower); +// fuck you, MSVC. +static_assert((unsigned char)"ඞ"[0] == 0xE0 && (unsigned char)"ඞ"[1] == 0xB6 && + (unsigned char)"ඞ"[2] == 0x9E, + "Execution charset is not UTF-8. Compile with " + "-fexec-charset=UTF-8 or /utf-8, or use a compiler written by a " + "human being with a functional brain."); + +std::string toLower(const std::string& a) { + std::string out = std::string(a); + std::transform(out.begin(), out.end(), out.begin(), + [](unsigned char c) { return std::tolower(c); }); return out; } @@ -18,31 +26,31 @@ std::wstring toLower(const std::wstring& a) { // for whitespace-only input. Callers in animation file parsing // (AbstractTexturePack::getAnimationString) depend on this behavior - // returning empty here breaks clock/compass texture frame loading. -std::wstring trimString(const std::wstring& a) { - std::wstring b; - int start = (int)a.find_first_not_of(L" \t\n\r"); - int end = (int)a.find_last_not_of(L" \t\n\r"); - if (start == std::wstring::npos) start = 0; - if (end == std::wstring::npos) end = (int)a.size() - 1; +std::string trimString(const std::string& a) { + std::string b; + int start = (int)a.find_first_not_of(" \t\n\r"); + int end = (int)a.find_last_not_of(" \t\n\r"); + if (start == std::string::npos) start = 0; + if (end == std::string::npos) end = (int)a.size() - 1; b = a.substr(start, (end - start) + 1); return b; } -std::wstring replaceAll(const std::wstring& in, const std::wstring& replace, - const std::wstring& with) { - std::wstring out = in; +std::string replaceAll(const std::string& in, const std::string& replace, + const std::string& with) { + std::string out = in; size_t pos = 0; - while ((pos = out.find(replace, pos)) != std::wstring::npos) { + while ((pos = out.find(replace, pos)) != std::string::npos) { out.replace(pos, replace.length(), with); pos++; } return out; } -bool equalsIgnoreCase(const std::wstring& a, const std::wstring& b) { +bool equalsIgnoreCase(const std::string& a, const std::string& b) { bool out; - std::wstring c = toLower(a); - std::wstring d = toLower(b); + std::string c = toLower(a); + std::string d = toLower(b); out = c.compare(d) == 0; return out; } @@ -113,8 +121,8 @@ std::u8string wstring_to_u8string(const std::wstring& converting) { std::u8string result(simdutf::utf8_length_from_utf16le(data16, len16), u'\0'); - auto len = - simdutf::convert_utf16_to_utf8(data16, len16, reinterpret_cast(result.data())); + auto len = simdutf::convert_utf16_to_utf8( + data16, len16, reinterpret_cast(result.data())); result.resize(len); return result; @@ -124,8 +132,8 @@ std::u8string wstring_to_u8string(const std::wstring& converting) { std::u8string result(simdutf::utf8_length_from_utf32(data32, len32), u'\0'); - auto len = - simdutf::convert_utf32_to_utf8(data32, len32, reinterpret_cast(result.data())); + auto len = simdutf::convert_utf32_to_utf8( + data32, len32, reinterpret_cast(result.data())); result.resize(len); return result; @@ -135,6 +143,19 @@ std::u8string wstring_to_u8string(const std::wstring& converting) { } } +std::u16string string_to_u16string(const std::string& converting) { + if (converting.empty()) return {}; + + std::u16string result( + simdutf::utf16_length_from_utf8(converting.data(), converting.size()), + u'\0'); + std::size_t convertedLength = simdutf::convert_utf8_to_utf16( + converting.data(), converting.size(), result.data()); + result.resize(convertedLength); + + return result; +} + std::string wstringtofilename(const std::wstring& name) { std::string result; result.reserve(name.size()); @@ -153,26 +174,24 @@ std::wstring filenametowstring(const char* name) { return convStringToWstring(name); } -std::vector& stringSplit(const std::wstring& s, wchar_t delim, - std::vector& elems) { - std::wstringstream ss(s); - std::wstring item; +std::vector& stringSplit(const std::string& s, char delim, + std::vector& elems) { + std::stringstream ss(s); + std::string item; while (std::getline(ss, item, delim)) { elems.push_back(item); } return elems; } -std::vector stringSplit(const std::wstring& s, wchar_t delim) { - std::vector elems; +std::vector stringSplit(const std::string& s, char delim) { + std::vector elems; return stringSplit(s, delim, elems); } -bool BothAreSpaces(wchar_t lhs, wchar_t rhs) { - return (lhs == rhs) && (lhs == L' '); -} +bool BothAreSpaces(char lhs, char rhs) { return (lhs == rhs) && (lhs == ' '); } -void stripWhitespaceForHtml(std::wstring& string, bool bRemoveNewline) { +void stripWhitespaceForHtml(std::string& string, bool bRemoveNewline) { // Strip newline chars if (bRemoveNewline) { string.erase(std::remove(string.begin(), string.end(), '\n'), @@ -190,22 +209,22 @@ void stripWhitespaceForHtml(std::wstring& string, bool bRemoveNewline) { string = trimString(string); } -std::wstring escapeXML(const std::wstring& in) { - std::wstring out = in; - out = replaceAll(out, L"&", L"&"); - // out = replaceAll(out, L"\"", L"""); - // out = replaceAll(out, L"'", L"'"); - out = replaceAll(out, L"<", L"<"); - out = replaceAll(out, L">", L">"); +std::string escapeXML(const std::string& in) { + std::string out = in; + out = replaceAll(out, "&", "&"); + // out = replaceAll(out, "\"", """); + // out = replaceAll(out, "'", "'"); + out = replaceAll(out, "<", "<"); + out = replaceAll(out, ">", ">"); return out; } -std::wstring parseXMLSpecials(const std::wstring& in) { - std::wstring out = in; - out = replaceAll(out, L"&", L"&"); - // out = replaceAll(out, L"\"", L"""); - // out = replaceAll(out, L"'", L"'"); - out = replaceAll(out, L"<", L"<"); - out = replaceAll(out, L">", L">"); +std::string parseXMLSpecials(const std::string& in) { + std::string out = in; + out = replaceAll(out, "&", "&"); + // out = replaceAll(out, "\"", """); + // out = replaceAll(out, "'", "'"); + out = replaceAll(out, "<", "<"); + out = replaceAll(out, ">", ">"); return out; } diff --git a/targets/util/StringHelpers.h b/targets/util/StringHelpers.h index 590ce8d37..d7de053ab 100644 --- a/targets/util/StringHelpers.h +++ b/targets/util/StringHelpers.h @@ -4,28 +4,29 @@ #include #include -std::wstring toLower(const std::wstring& a); -std::wstring trimString(const std::wstring& a); -std::wstring replaceAll(const std::wstring& in, const std::wstring& replace, - const std::wstring& with); +std::string toLower(const std::string& a); +std::string trimString(const std::string& a); +std::string replaceAll(const std::string& in, const std::string& replace, + const std::string& with); + +bool equalsIgnoreCase(const std::string& a, const std::string& b); -bool equalsIgnoreCase(const std::wstring& a, const std::wstring& b); template -std::wstring toWString(T t) { - std::wostringstream oss; +std::string toWString(T t) { + std::ostringstream oss; oss << std::dec << t; return oss.str(); } template -T fromWString(const std::wstring& s) { - std::wistringstream stream(s); +T fromWString(const std::string& s) { + std::istringstream stream(s); T t; stream >> t; return t; } template -T fromHexWString(const std::wstring& s) { - std::wistringstream stream(s); +T fromHexWString(const std::string& s) { + std::istringstream stream(s); T t; stream >> std::hex >> t; return t; @@ -34,14 +35,15 @@ T fromHexWString(const std::wstring& s) { std::wstring convStringToWstring(const std::string& converting); std::wstring u16string_to_wstring(const std::u16string& converting); std::u16string wstring_to_u16string(const std::wstring& converting); +std::u16string string_to_u16string(const std::string& converting); std::u8string wstring_to_u8string(const std::wstring& converting); std::string wstringtofilename(const std::wstring& name); std::wstring filenametowstring(const char* name); -std::vector& stringSplit(const std::wstring& s, wchar_t delim, - std::vector& elems); -std::vector stringSplit(const std::wstring& s, wchar_t delim); +std::vector& stringSplit(const std::string& s, char delim, + std::vector& elems); +std::vector stringSplit(const std::string& s, char delim); -void stripWhitespaceForHtml(std::wstring& string, bool bRemoveNewline = true); -std::wstring escapeXML(const std::wstring& in); -std::wstring parseXMLSpecials(const std::wstring& in); +void stripWhitespaceForHtml(std::string& string, bool bRemoveNewline = true); +std::string escapeXML(const std::string& in); +std::string parseXMLSpecials(const std::string& in);