From 28d68befd4f9a2b01b5c9c62ee735e5cb3250946 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Mon, 30 Mar 2026 17:36:15 +1100 Subject: [PATCH] Replace remaining WinAPI types with standard C++ equivalents MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DWORD→uint32_t, BYTE→uint8_t, HRESULT→int32_t, HANDLE→void*, UINT→uint32_t, INT→int32_t, WORD→uint16_t, LONG→int32_t, SHORT→int16_t, LONGLONG→int64_t, ULONG_PTR→uintptr_t, PBYTE→uint8_t*, LPWSTR/PWSTR→wchar_t*, FLOAT→float, CHAR→char, boolean→bool, CONST→const, TRUE→true, FALSE→false across 176 files (excluding vendor libs and Linux stubs). --- .../XboxMedia/Media/xuiscene_anvil_480.h | 738 +++++++------- .../XboxMedia/Media/xuiscene_anvil_small.h | 780 +++++++-------- .../XboxMedia/Media/xuiscene_beacon.h | 812 +++++++-------- .../XboxMedia/Media/xuiscene_fireworks.h | 332 +++---- .../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_trading_480.h | 926 +++++++++--------- .../XboxMedia/Media/xuiscene_trading_small.h | 890 ++++++++--------- Minecraft.Client/Level/ServerLevel.cpp | 2 +- Minecraft.Client/Minecraft.cpp | 8 +- Minecraft.Client/Minecraft.h | 2 +- Minecraft.Client/MinecraftServer.cpp | 2 +- Minecraft.Client/Network/ClientConnection.cpp | 12 +- Minecraft.Client/Network/ClientConnection.h | 2 +- .../Network/MultiPlayerChunkCache.cpp | 6 +- Minecraft.Client/Network/PlayerConnection.cpp | 2 +- Minecraft.Client/Network/PlayerList.cpp | 6 +- Minecraft.Client/Network/ServerChunkCache.cpp | 6 +- .../Platform/Common/App_structs.h | 2 +- .../Platform/Common/Consoles_App.cpp | 78 +- .../Platform/Common/Consoles_App.h | 8 +- .../Platform/Common/DLC/DLCManager.cpp | 4 +- .../Platform/Common/DLC/DLCSkinFile.cpp | 2 +- .../Common/GameRules/GameRuleManager.cpp | 2 +- .../GameRules/LevelGenerationOptions.cpp | 34 +- .../Common/GameRules/LevelGenerationOptions.h | 4 +- .../GameRules/UseTileRuleDefinition.cpp | 4 +- .../XboxStructureActionGenerateBox.cpp | 2 +- .../XboxStructureActionPlaceContainer.cpp | 2 +- .../XboxStructureActionPlaceContainer.h | 2 +- .../Leaderboards/SonyLeaderboardManager.cpp | 8 +- .../Leaderboards/SonyLeaderboardManager.h | 16 +- .../Common/Network/GameNetworkManager.cpp | 32 +- .../Common/Network/NetworkPlayerQNet.cpp | 22 +- .../Network/PlatformNetworkManagerInterface.h | 2 +- .../Network/PlatformNetworkManagerStub.cpp | 6 +- .../Network/PlatformNetworkManagerStub.h | 4 +- .../Common/Telemetry/TelemetryManager.cpp | 6 +- .../Common/Telemetry/TelemetryManager.h | 6 +- .../Common/Tutorial/TutorialMessage.h | 2 +- .../UI/IUIScene_AbstractContainerMenu.cpp | 10 +- .../Platform/Common/UI/IUIScene_PauseMenu.cpp | 6 +- .../Platform/Common/UI/UIBitmapFont.cpp | 4 +- .../Platform/Common/UI/UIComponent_Chat.cpp | 2 +- .../Platform/Common/UI/UIController.cpp | 14 +- .../Platform/Common/UI/UIController.h | 12 +- .../UI/UIScene_AbstractContainerMenu.cpp | 4 +- .../Common/UI/UIScene_ConnectingProgress.cpp | 6 +- .../Common/UI/UIScene_ControlsMenu.cpp | 10 +- .../Common/UI/UIScene_CraftingMenu.cpp | 18 +- .../Common/UI/UIScene_CreateWorldMenu.cpp | 6 +- .../Common/UI/UIScene_CreateWorldMenu.h | 2 +- .../Common/UI/UIScene_CreativeMenu.cpp | 4 +- .../Platform/Common/UI/UIScene_Credits.cpp | 6 +- .../Common/UI/UIScene_DLCMainMenu.cpp | 4 +- .../Common/UI/UIScene_DLCOffersMenu.cpp | 4 +- .../Common/UI/UIScene_DebugOptions.cpp | 2 +- .../Platform/Common/UI/UIScene_EndPoem.cpp | 4 +- .../Common/UI/UIScene_FireworksMenu.cpp | 2 +- .../Common/UI/UIScene_FireworksMenu.h | 2 +- .../Common/UI/UIScene_FullscreenProgress.cpp | 6 +- .../Platform/Common/UI/UIScene_HUD.cpp | 20 +- .../Common/UI/UIScene_HelpAndOptionsMenu.cpp | 8 +- .../Common/UI/UIScene_HowToPlayMenu.cpp | 4 +- .../UI/UIScene_InGameHostOptionsMenu.cpp | 4 +- .../Common/UI/UIScene_InGameInfoMenu.cpp | 20 +- .../UI/UIScene_InGamePlayerOptionsMenu.cpp | 12 +- .../UI/UIScene_InGameSaveManagementMenu.cpp | 2 +- .../Platform/Common/UI/UIScene_JoinMenu.cpp | 2 +- .../Common/UI/UIScene_LanguageSelector.cpp | 4 +- .../UI/UIScene_LaunchMoreOptionsMenu.cpp | 4 +- .../Common/UI/UIScene_LeaderboardsMenu.cpp | 2 +- .../Platform/Common/UI/UIScene_LoadMenu.cpp | 6 +- .../Common/UI/UIScene_LoadOrJoinMenu.cpp | 34 +- .../Platform/Common/UI/UIScene_MainMenu.cpp | 30 +- .../Platform/Common/UI/UIScene_MessageBox.cpp | 4 +- .../Platform/Common/UI/UIScene_PauseMenu.cpp | 14 +- .../Common/UI/UIScene_QuadrantSignin.cpp | 4 +- .../Common/UI/UIScene_QuadrantSignin.h | 4 +- .../Common/UI/UIScene_ReinstallMenu.cpp | 4 +- .../Common/UI/UIScene_SettingsAudioMenu.cpp | 4 +- .../Common/UI/UIScene_SettingsMenu.cpp | 4 +- .../Common/UI/UIScene_SkinSelectMenu.cpp | 4 +- .../Common/UI/UIScene_TeleportMenu.cpp | 4 +- .../Common/UI/UIScene_TradingMenu.cpp | 4 +- .../Common/UI/UIScene_TrialExitUpsell.cpp | 4 +- .../Platform/Common/UI/UIStructs.h | 12 +- .../Platform/Common/UI/UITTFFont.h | 2 +- .../Platform/Common/XML/ATGXmlParser.cpp | 140 +-- .../Platform/Common/XML/ATGXmlParser.h | 90 +- .../Platform/Common/XML/xmlFilesCallback.h | 60 +- Minecraft.Client/Platform/Extrax64Stubs.cpp | 148 +-- .../Platform/Linux/Linux_Minecraft.cpp | 54 +- .../Linux/Sentient/DynamicConfigurations.h | 10 +- .../Platform/Linux/Sentient/SentientManager.h | 106 +- .../Platform/Linux/Sentient/SentientStats.h | 38 +- .../Platform/Linux/Social/SocialManager.h | 4 +- .../Platform/Windows64/4JLibs/inc/4J_Input.h | 12 +- .../Windows64/4JLibs/inc/4J_Profile.h | 24 +- .../Platform/Windows64/4JLibs/inc/4J_Render.h | 18 +- .../Windows64/4JLibs/inc/4J_Storage.h | 72 +- .../Platform/Windows64/Minecraft_Macros.h | 8 +- .../Sentient/DynamicConfigurations.h | 20 +- .../Windows64/Sentient/SentientManager.h | 106 +- .../Windows64/Sentient/SentientStats.h | 38 +- .../Platform/Windows64/Social/SocialManager.h | 20 +- .../Windows64/Windows64_Minecraft.cpp | 68 +- .../Platform/Windows64/XML/ATGXmlParser.h | 90 +- Minecraft.Client/Platform/extraX64client.h | 54 +- Minecraft.Client/Platform/stdafx.h | 2 +- Minecraft.Client/Player/LocalPlayer.h | 4 +- .../Player/MultiPlayerLocalPlayer.h | 6 +- .../Rendering/EntityRenderers/ChestRenderer.h | 2 +- .../EntityRenderers/PlayerRenderer.cpp | 6 +- Minecraft.Client/Rendering/GameRenderer.cpp | 2 +- Minecraft.Client/Rendering/Models/ModelPart.h | 2 +- Minecraft.Client/Rendering/Tesselator.h | 2 +- Minecraft.Client/Textures/BufferedImage.cpp | 6 +- .../Textures/Packs/AbstractTexturePack.cpp | 4 +- Minecraft.Client/UI/Screen.cpp | 2 +- .../UI/Screens/CreateWorldScreen.cpp | 24 +- Minecraft.Client/UI/Screens/PauseScreen.cpp | 4 +- Minecraft.Client/Utils/FrameProfiler.cpp | 2 +- Minecraft.Client/Utils/StringTable.h | 2 +- Minecraft.World/Blocks/HalfSlabTile.cpp | 2 +- Minecraft.World/Blocks/NoteBlockTile.cpp | 2 +- .../Commands/ExperienceCommand.cpp | 4 +- Minecraft.World/Commands/PlaySoundCommand.h | 2 +- Minecraft.World/Commands/PlayerSelector.h | 8 +- Minecraft.World/Commands/ShowSeedCommand.h | 2 +- .../Commands/SpreadPlayersCommand.h | 14 +- .../Containers/MouseInventoryClickHandler.h | 2 +- Minecraft.World/Entities/LivingEntity.cpp | 2 +- .../Entities/MobEffectInstance.cpp | 2 +- Minecraft.World/Entities/Monster.cpp | 2 +- .../IO/Files/ConsoleSaveFileOriginal.cpp | 2 +- .../IO/Files/ConsoleSaveFileOriginal.h | 2 +- .../IO/Files/ConsoleSaveFileSplit.cpp | 2 +- .../IO/Files/ConsoleSaveFileSplit.h | 2 +- Minecraft.World/IO/Files/FileHeader.cpp | 2 +- Minecraft.World/IO/Files/FileInputStream.cpp | 2 +- Minecraft.World/IO/Streams/Compression.cpp | 20 +- Minecraft.World/IO/Streams/Compression.h | 14 +- .../IO/Streams/DataInputStream.cpp | 2 +- .../IO/Streams/DataOutputStream.cpp | 4 +- Minecraft.World/Items/BoatItem.h | 2 +- Minecraft.World/Items/HangingEntityItem.cpp | 2 +- Minecraft.World/Items/MapItem.cpp | 2 +- .../Items/TileItems/StoneSlabTileItem.cpp | 2 +- Minecraft.World/Items/WrittenBookItem.h | 8 +- Minecraft.World/Level/CustomLevelSource.cpp | 14 +- .../Level/Storage/CompressedTileStorage.cpp | 2 +- Minecraft.World/Level/Storage/LevelType.cpp | 4 +- .../Level/Storage/McRegionLevelStorage.cpp | 2 +- Minecraft.World/Level/Storage/RegionFile.h | 2 +- .../Level/Storage/ZonedChunkStorage.cpp | 2 +- Minecraft.World/Network/Connection.h | 10 +- .../Network/Packets/AddPlayerPacket.cpp | 16 +- .../Network/Packets/UpdateMobEffectPacket.cpp | 2 +- Minecraft.World/Network/Socket.cpp | 2 +- .../Platform/x64headers/extraX64.h | 122 +-- Minecraft.World/Player/Player.cpp | 2 +- Minecraft.World/Recipes/MapCloningRecipe.h | 2 +- Minecraft.World/Recipes/MapExtendingRecipe.h | 2 +- Minecraft.World/Util/C4JThread.cpp | 12 +- Minecraft.World/Util/Pos.cpp | 2 +- Minecraft.World/Util/Pos.h | 2 +- Minecraft.World/Util/ThreadName.cpp | 2 +- .../WorldGen/Layers/BiomeOverrideLayer.cpp | 10 +- .../WorldGen/Sources/FlatLevelSource.h | 2 +- .../Structures/NetherBridgePieces.cpp | 2 +- 175 files changed, 4220 insertions(+), 4220 deletions(-) diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_480.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_480.h index 2e7520cb9..9d59bc38b 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_480.h +++ b/Minecraft.Assets/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 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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_small.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_small.h index 2cf321d11..fdedc7b58 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_anvil_small.h +++ b/Minecraft.Assets/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 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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_beacon.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_beacon.h index ee655a9db..80fcd67f9 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_beacon.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_fireworks.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_fireworks.h index 0c8470a35..52c36d888 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_fireworks.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper.h index b0039b602..ca6d03899 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_480.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_480.h index 8b04354ec..263aeddf7 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_480.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_small.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_small.h index b0039b602..ca6d03899 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_hopper_small.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_horse.h index c7805801f..c122d1f7d 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_480.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_480.h index 2e9e81e85..f6375dc64 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_480.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_small.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_small.h index 98ccb02c9..a1311742e 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_horse_small.h +++ b/Minecraft.Assets/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 L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_ListItem" +#define IDC_control_ListItem L"control_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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_480.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_480.h index 832df91c0..5898253bd 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_480.h +++ b/Minecraft.Assets/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 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" diff --git a/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_small.h b/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_small.h index c611b1a19..f2bb799f0 100644 --- a/Minecraft.Assets/XboxMedia/Media/xuiscene_trading_small.h +++ b/Minecraft.Assets/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 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" diff --git a/Minecraft.Client/Level/ServerLevel.cpp b/Minecraft.Client/Level/ServerLevel.cpp index 60d48e2f4..3fae07502 100644 --- a/Minecraft.Client/Level/ServerLevel.cpp +++ b/Minecraft.Client/Level/ServerLevel.cpp @@ -1268,7 +1268,7 @@ bool ServerLevel::addEntity(std::shared_ptr e) { // 4J-PB - refuse to add the entity, since we'll be removing one // already there, and it may be an item frame with something in it. LeaveCriticalSection(&m_limiterCS); - return FALSE; + return false; // removeEntityImmediately(m_hangingEntities.front()); } diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index c27c78349..1d97f3e47 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -123,7 +123,7 @@ Minecraft::Minecraft(Component* mouseComponent, Canvas* parent, // 4J Stu Added InitializeCriticalSection(&ProgressRenderer::s_progress); InitializeCriticalSection(&m_setLevelCS); - // m_hPlayerRespawned = CreateEvent(nullptr, FALSE, FALSE, nullptr); + // m_hPlayerRespawned = CreateEvent(nullptr, false, false, nullptr); progressRenderer = nullptr; gameRenderer = nullptr; @@ -1129,7 +1129,7 @@ void Minecraft::run_middle() { // give them the option to remove from the ban list // or exit the level app.SetAction(i, eAppAction_LevelInBanLevelList, - (void*)TRUE); + (void*)true); } } } @@ -1391,7 +1391,7 @@ void Minecraft::run_middle() { ui.HidePressStart(); { - UINT uiIDA[1]; + uint32_t uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; ui.RequestErrorMessage( IDS_NO_MULTIPLAYER_PRIVILEGE_TITLE, @@ -4414,7 +4414,7 @@ int Minecraft::InGame_SignInReturned(void* pParam, bool bContinue, int iPad) // BAS Game Stability: TU8: The game crashes when second Guest signs-in // on console which takes part in Xbox LIVE multiplayer session. app.DebugPrintf("Disabling Guest Signin\n"); - XEnableGuestSignin(FALSE); + XEnableGuestSignin(false); } // If sign in succeded, we're in game and this player isn't already playing, diff --git a/Minecraft.Client/Minecraft.h b/Minecraft.Client/Minecraft.h index a6c45b2e5..b496e1c5b 100644 --- a/Minecraft.Client/Minecraft.h +++ b/Minecraft.Client/Minecraft.h @@ -90,7 +90,7 @@ private: public: Level* oldLevel; // 4J Stu added to keep a handle on an old level so we can // delete it - // HANDLE m_hPlayerRespawned; // 4J Added so we can wait in menus until it + // void* m_hPlayerRespawned; // 4J Added so we can wait in menus until it // is done (for async in multiplayer) public: MultiPlayerLevel* level; diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index f1f9b81db..39f47ac36 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -1243,7 +1243,7 @@ void MinecraftServer::run(int64_t seed, void* lpParameter) { player->level->addEntity(mob); } break; case eXuiServerAction_PauseServer: - m_isServerPaused = ((size_t)param == TRUE); + m_isServerPaused = ((size_t)param == true); if (m_isServerPaused) { m_serverPausedEvent->Set(); } diff --git a/Minecraft.Client/Network/ClientConnection.cpp b/Minecraft.Client/Network/ClientConnection.cpp index 5199afdd6..df4e34bfb 100644 --- a/Minecraft.Client/Network/ClientConnection.cpp +++ b/Minecraft.Client/Network/ClientConnection.cpp @@ -54,7 +54,7 @@ ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip, int port) { // 4J Stu - No longer used as we use the socket version below. - assert(FALSE); + assert(false); } ClientConnection::ClientConnection(Minecraft* minecraft, Socket* socket, @@ -368,7 +368,7 @@ void ClientConnection::handleAddEntity( double y = packet->y / 32.0; double z = packet->z / 32.0; std::shared_ptr e; - boolean setRot = true; + bool setRot = true; // 4J-PB - replacing this massive if nest with switch switch (packet->type) { @@ -1229,7 +1229,7 @@ void ClientConnection::handleDisconnect( pMinecraft->connectionDisconnected(m_userIndex, packet->reason); app.SetDisconnectReason(packet->reason); - app.SetAction(m_userIndex, eAppAction_ExitWorld, (void*)TRUE); + app.SetAction(m_userIndex, eAppAction_ExitWorld, (void*)true); // minecraft->setLevel(nullptr); // minecraft->setScreen(new DisconnectedScreen(L"disconnect.disconnected", // L"disconnect.genericReason", &packet->reason)); @@ -1258,7 +1258,7 @@ void ClientConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, ProfileManager.GetPrimaryPad(), &ClientConnection::HostDisconnectReturned, nullptr); } else { - app.SetAction(m_userIndex, eAppAction_ExitWorld, (void*)TRUE); + app.SetAction(m_userIndex, eAppAction_ExitWorld, (void*)true); } // minecraft->setLevel(nullptr); @@ -1863,7 +1863,7 @@ void ClientConnection::handlePreLogin(std::shared_ptr packet) { reason); app.SetDisconnectReason(reason); app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, - (void*)TRUE); + (void*)true); } else { if (!isFriendsWithHost) reason = DisconnectPacket::eDisconnect_NotFriendsWithHost; @@ -3376,7 +3376,7 @@ int ClientConnection::ExitGameAndSaveReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { - // INT saveOrCheckpointId = 0; + // int32_t saveOrCheckpointId = 0; // bool validSave = // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), diff --git a/Minecraft.Client/Network/ClientConnection.h b/Minecraft.Client/Network/ClientConnection.h index f31ea0a58..b1deb132f 100644 --- a/Minecraft.Client/Network/ClientConnection.h +++ b/Minecraft.Client/Network/ClientConnection.h @@ -200,7 +200,7 @@ private: // 4J: Entity link packet deferred class DeferredEntityLinkPacket { public: - DWORD m_recievedTick; + uint32_t m_recievedTick; std::shared_ptr m_packet; DeferredEntityLinkPacket(std::shared_ptr packet); diff --git a/Minecraft.Client/Network/MultiPlayerChunkCache.cpp b/Minecraft.Client/Network/MultiPlayerChunkCache.cpp index a9ce60f03..c8537b5aa 100644 --- a/Minecraft.Client/Network/MultiPlayerChunkCache.cpp +++ b/Minecraft.Client/Network/MultiPlayerChunkCache.cpp @@ -207,9 +207,9 @@ LevelChunk* MultiPlayerChunkCache::create(int x, int z) { (int64_t*)&cache[idx], (int64_t)chunk, (int64_t)lastChunk) == (int64_t)lastChunk) #else - if (InterlockedCompareExchangeRelease((LONG*)&cache[idx], (LONG)chunk, - (LONG)lastChunk) == - (LONG)lastChunk) + if (InterlockedCompareExchangeRelease((int32_t*)&cache[idx], (int32_t)chunk, + (int32_t)lastChunk) == + (int32_t)lastChunk) #endif // 0 { // If we're sharing with the server, we'll need to calculate our diff --git a/Minecraft.Client/Network/PlayerConnection.cpp b/Minecraft.Client/Network/PlayerConnection.cpp index 4ff287b25..f4f1cab17 100644 --- a/Minecraft.Client/Network/PlayerConnection.cpp +++ b/Minecraft.Client/Network/PlayerConnection.cpp @@ -1847,7 +1847,7 @@ bool PlayerConnection::isGuest() { INetworkPlayer* networkPlayer = connection->getSocket()->getPlayer(); bool isGuest = false; if (networkPlayer != nullptr) { - isGuest = networkPlayer->IsGuest() == TRUE; + isGuest = networkPlayer->IsGuest() == true; } return isGuest; } diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp index 50a1ff7b6..9d9eda446 100644 --- a/Minecraft.Client/Network/PlayerList.cpp +++ b/Minecraft.Client/Network/PlayerList.cpp @@ -228,7 +228,7 @@ void PlayerList::placeNewPlayer(Connection* connection, level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(), (uint8_t)level->dimension->id, (uint8_t)level->getMaxBuildHeight(), (uint8_t)getMaxPlayers(), level->difficulty, - TelemetryManager->GetMultiplayerInstanceID(), (BYTE)playerIndex, + TelemetryManager->GetMultiplayerInstanceID(), (uint8_t)playerIndex, level->useNewSeaLevel(), player->getAllPlayerGamePrivileges(), level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale()))); @@ -1032,7 +1032,7 @@ void PlayerList::tick() { INetworkPlayer* selectedPlayer = g_NetworkManager.GetPlayerBySmallId(smallId); if (selectedPlayer != nullptr) { - if (selectedPlayer->IsLocal() != TRUE) { + if (selectedPlayer->IsLocal() != true) { // #if 0 PlayerUID xuid = selectedPlayer->GetUID(); // Kick this player from the game @@ -1256,7 +1256,7 @@ bool PlayerList::meetsScoreRequirements( // for (Map.Entry requirement : // scoreRequirements.entrySet()) { String name = requirement.getKey(); - // boolean min = false; + // bool min = false; // if (name.endsWith("_min") && name.length() > 4) { // min = true; diff --git a/Minecraft.Client/Network/ServerChunkCache.cpp b/Minecraft.Client/Network/ServerChunkCache.cpp index abe553ea6..685133744 100644 --- a/Minecraft.Client/Network/ServerChunkCache.cpp +++ b/Minecraft.Client/Network/ServerChunkCache.cpp @@ -166,9 +166,9 @@ LevelChunk* ServerChunkCache::create( (int64_t*)&cache[idx], (int64_t)chunk, (int64_t)lastChunk) == (int64_t)lastChunk) #else - if (InterlockedCompareExchangeRelease((LONG*)&cache[idx], (LONG)chunk, - (LONG)lastChunk) == - (LONG)lastChunk) + if (InterlockedCompareExchangeRelease((int32_t*)&cache[idx], (int32_t)chunk, + (int32_t)lastChunk) == + (int32_t)lastChunk) #endif { // Successfully updated the cache diff --git a/Minecraft.Client/Platform/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h index d7c48bbb0..b8999074a 100644 --- a/Minecraft.Client/Platform/Common/App_structs.h +++ b/Minecraft.Client/Platform/Common/App_structs.h @@ -108,7 +108,7 @@ typedef struct { // 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES below // was 192 // unsigned char - // ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(DWORD)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(LONG)-sizeof(LONG)-sizeof(DWORD)]; + // ucUnused[192-TUTORIAL_PROFILE_STORAGE_BYTES-sizeof(uint32_t)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(char)-sizeof(int32_t)-sizeof(int32_t)-sizeof(uint32_t)]; // 4J-PB - don't need to define the padded space, the union with // ucReservedSpace will make the sizeof GAME_SETTINGS correct }; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 3cd185db0..1c9fbfbbc 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -2108,9 +2108,9 @@ void CMinecraftApp::ActionDebugMask(int iPad, bool bSetAllClear) { break; case eDebugSetting_Safearea: if (ulBitmask & (1 << i)) { - app.ShowSafeArea(TRUE); + app.ShowSafeArea(true); } else { - app.ShowSafeArea(FALSE); + app.ShowSafeArea(false); } break; @@ -2344,8 +2344,8 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_NavigateBackToScene; completionData->iPad = ProfileManager.GetPrimaryPad(); @@ -2406,8 +2406,8 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_AutosaveNavigateBack; completionData->iPad = ProfileManager.GetPrimaryPad(); @@ -2699,10 +2699,10 @@ void CMinecraftApp::HandleXuiActions(void) { // Changed - Don't use the FullScreenProgressScreen for // action, use a dialog instead completionData->bRequiresUserAction = - FALSE; //(param != nullptr) ? TRUE : FALSE; - completionData->bShowTips = (param != nullptr) ? FALSE : TRUE; - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + false; //(param != nullptr) ? true : false; + completionData->bShowTips = (param != nullptr) ? false : true; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_NavigateToHomeMenu; completionData->iPad = DEFAULT_XUI_MENU_USER; @@ -2744,8 +2744,8 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_NavigateToHomeMenu; completionData->iPad = DEFAULT_XUI_MENU_USER; @@ -2810,8 +2810,8 @@ void CMinecraftApp::HandleXuiActions(void) { // UIFullscreenProgressCompletionData *completionData = // new UIFullscreenProgressCompletionData(); - // completionData->bShowBackground=TRUE; - // completionData->bShowLogo=TRUE; + // completionData->bShowBackground=true; + // completionData->bShowLogo=true; // completionData->type = // e_ProgressCompletion_CloseUIScenes; // completionData->iPad = i; @@ -2946,7 +2946,7 @@ void CMinecraftApp::HandleXuiActions(void) { // and then opts to play the tutorial once // they have been returned to the Main Menu. // 4J Stu - Leave the session - g_NetworkManager.LeaveGame(FALSE); + g_NetworkManager.LeaveGame(false); // need to clear the player stats - can't // assume it'll be done in setlevel - we may @@ -3048,8 +3048,8 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->iPad = DEFAULT_XUI_MENU_USER; completionData->type = e_ProgressCompletion_NavigateToHomeMenu; @@ -3223,8 +3223,8 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->iPad = DEFAULT_XUI_MENU_USER; completionData->type = e_ProgressCompletion_NoAction; loadingParams->completionData = completionData; @@ -3332,9 +3332,9 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bRequiresUserAction = TRUE; - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bRequiresUserAction = true; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->iPad = DEFAULT_XUI_MENU_USER; if (ui.IsSceneInStack( ProfileManager.GetPrimaryPad(), @@ -3395,9 +3395,9 @@ void CMinecraftApp::HandleXuiActions(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bRequiresUserAction = FALSE; - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bRequiresUserAction = false; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->iPad = DEFAULT_XUI_MENU_USER; if (ui.IsSceneInStack(ProfileManager.GetPrimaryPad(), eUIScene_EndPoem)) { @@ -3826,7 +3826,7 @@ int CMinecraftApp::SignoutExitWorldThreadProc(void* lpParameter) { saveStats = false; // 4J Stu - Leave the session once the disconnect packet has been sent - g_NetworkManager.LeaveGame(FALSE); + g_NetworkManager.LeaveGame(false); } else { if (lpParameter != nullptr) { switch (app.GetDisconnectReason()) { @@ -5434,9 +5434,9 @@ std::unordered_map CMinecraftApp::DLCInfo_Trial; std::unordered_map CMinecraftApp::DLCInfo_Full; std::unordered_map CMinecraftApp::DLCInfo_SkinName; -HRESULT CMinecraftApp::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, +int32_t CMinecraftApp::RegisterMojangData(wchar_t* pXuidName, PlayerUID xuid, wchar_t* pSkin, wchar_t* pCape) { - HRESULT hr = S_OK; + int32_t hr = S_OK; eXUID eTempXuid = eXUID_Undefined; MOJANG_DATA* pMojangData = nullptr; @@ -5469,8 +5469,8 @@ MOJANG_DATA* CMinecraftApp::GetMojangDataForXuid(PlayerUID xuid) { return MojangData[xuid]; } -HRESULT CMinecraftApp::RegisterConfigValues(wchar_t* pType, int iValue) { - HRESULT hr = S_OK; +int32_t CMinecraftApp::RegisterConfigValues(wchar_t* pType, int iValue) { + int32_t hr = S_OK; // #ifdef 0 // if(pType!=nullptr) @@ -5498,13 +5498,13 @@ HRESULT CMinecraftApp::RegisterConfigValues(wchar_t* pType, int iValue) { } #if defined(_WINDOWS64) -HRESULT CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, wchar_t* pFirstSkin, unsigned int uiSortIndex, int iConfig, wchar_t* pDataFile) { - HRESULT hr = S_OK; + int32_t hr = S_OK; DLC_INFO* pDLCData = new DLC_INFO; ZeroMemory(pDLCData, sizeof(DLC_INFO)); pDLCData->ullOfferID_Full = ullOfferID_Full; @@ -5548,7 +5548,7 @@ HRESULT CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, return hr; } #elif defined(__linux__) -HRESULT CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, +int32_t CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, int iGender, uint64_t ullOfferID_Full, uint64_t ullOfferID_Trial, wchar_t* pFirstSkin, @@ -5561,12 +5561,12 @@ HRESULT CMinecraftApp::RegisterDLCData(wchar_t* pType, wchar_t* pBannerName, } #else -HRESULT CMinecraftApp::RegisterDLCData(char* pchDLCName, +int32_t CMinecraftApp::RegisterDLCData(char* pchDLCName, unsigned int uiSortIndex, char* pchImageURL) { // on PS3 we get all the required info from the name char chDLCType[3]; - HRESULT hr = S_OK; + int32_t hr = S_OK; DLC_INFO* pDLCData = new DLC_INFO; ZeroMemory(pDLCData, sizeof(DLC_INFO)); @@ -5703,7 +5703,7 @@ void CMinecraftApp::EnterSaveNotificationSection() { g_NetworkManager.GetPlayerCount() == 1) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_PauseServer, - (void*)TRUE); + (void*)true); } } } @@ -5723,7 +5723,7 @@ void CMinecraftApp::LeaveSaveNotificationSection() { g_NetworkManager.GetPlayerCount() == 1) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_PauseServer, - (void*)FALSE); + (void*)false); } } } @@ -6562,7 +6562,7 @@ void CMinecraftApp::ClearTerrainFeaturePosition() { } void CMinecraftApp::UpdatePlayerInfo(std::uint8_t networkSmallId, - SHORT playerColourIndex, + int16_t playerColourIndex, unsigned int playerGamePrivileges) { for (unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) { if (m_playerColours[i] == networkSmallId) { @@ -7275,7 +7275,7 @@ std::uint32_t CMinecraftApp::getSkinIdFromPath(const std::wstring& skin) { } std::wstring CMinecraftApp::getSkinPathFromId(std::uint32_t skinId) { - // 4J Stu - This function maps the encoded DWORD we store in the player + // 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]; diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index 5fead9cf1..b293dc8d5 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -672,11 +672,11 @@ public: int* pZ); std::vector m_vTerrainFeatures; - static HRESULT RegisterMojangData(wchar_t*, PlayerUID, wchar_t*, wchar_t*); + static int32_t RegisterMojangData(wchar_t*, PlayerUID, wchar_t*, wchar_t*); MOJANG_DATA* GetMojangDataForXuid(PlayerUID xuid); - static HRESULT RegisterConfigValues(wchar_t* pType, int iValue); + static int32_t RegisterConfigValues(wchar_t* pType, int iValue); - static HRESULT RegisterDLCData(wchar_t*, wchar_t*, int, uint64_t, uint64_t, + 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, uint64_t* pullVal); @@ -839,7 +839,7 @@ private: unsigned int m_playerGamePrivileges[MINECRAFT_NET_MAX_PLAYERS]; public: - void UpdatePlayerInfo(std::uint8_t networkSmallId, SHORT playerColourIndex, + void UpdatePlayerInfo(std::uint8_t networkSmallId, int16_t playerColourIndex, unsigned int playerGamePrivileges); short GetPlayerColour(std::uint8_t networkSmallId); unsigned int GetPlayerPrivileges(std::uint8_t networkSmallId); diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp index 4e13f8eb5..178e75952 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp @@ -215,7 +215,7 @@ void DLCManager::LanguageChanged(void) { DLCPack* DLCManager::getPack(const std::wstring& name) { DLCPack* pack = nullptr; - // DWORD currentIndex = 0; + // uint32_t currentIndex = 0; DLCPack* currentPack = nullptr; for (auto it = m_packs.begin(); it != m_packs.end(); ++it) { currentPack = *it; @@ -474,7 +474,7 @@ bool DLCManager::processDLCDataFile(unsigned int& dwFilesProcessed, C4JStorage::DLC_FILE_PARAM parBuf; DLC_READ_PARAM(&parBuf, pbData, uiCurrentByte); - // DWORD dwwchCount=0; + // uint32_t dwwchCount=0; for (unsigned int i = 0; i < uiParameterCount; i++) { // Map DLC strings to application strings, then store the DLC index // mapping to application index diff --git a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp index df3190380..067a68399 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp @@ -132,7 +132,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, case DLCManager::e_DLCParamType_Anim: { swscanf_s(value.c_str(), L"%X", &m_uiAnimOverrideBitmask, sizeof(unsigned int)); - DWORD skinId = app.getSkinIdFromPath(m_path); + uint32_t skinId = app.getSkinIdFromPath(m_path); app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask); break; } diff --git a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp index 272bb09a6..38feb4c7b 100644 --- a/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp @@ -648,7 +648,7 @@ void GameRuleManager::loadDefaultGameRules() { if(app.getArchiveFileSize(fpTutorial) >= 0) { DLCPack *pack = new DLCPack(L"",0xffffffff); - DWORD dwFilesProcessed = 0; + uint32_t dwFilesProcessed = 0; if ( app.m_dlcManager.readDLCDataFile(dwFilesProcessed,fpTutorial,pack,true) ) { app.m_dlcManager.addPack(pack); diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp index 2b7e53b87..cbac82819 100644 --- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp @@ -195,7 +195,7 @@ void LevelGenerationOptions::addAttribute(const std::wstring& attributeName, if (attributeValue.compare(L"true") == 0) m_useFlatWorld = true; app.DebugPrintf( "LevelGenerationOptions: Adding parameter flatworld=%s\n", - m_useFlatWorld ? "TRUE" : "FALSE"); + m_useFlatWorld ? "true" : "false"); } else if (attributeName.compare(L"saveName") == 0) { std::wstring string(getString(attributeValue)); if (!string.empty()) @@ -233,7 +233,7 @@ void LevelGenerationOptions::addAttribute(const std::wstring& attributeName, if (attributeValue.compare(L"true") == 0) setSrc(eSrc_tutorial); app.DebugPrintf( "LevelGenerationOptions: Adding parameter isTutorial=%s\n", - isTutorial() ? "TRUE" : "FALSE"); + isTutorial() ? "true" : "false"); } else if (attributeName.compare(L"baseSaveName") == 0) { setBaseSavePath(attributeValue); app.DebugPrintf( @@ -487,8 +487,8 @@ void LevelGenerationOptions::loadBaseSaveData() { } } -int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, - DWORD dwLicenceMask) { +int LevelGenerationOptions::packMounted(void* pParam, int iPad, uint32_t dwErr, + uint32_t dwLicenceMask) { LevelGenerationOptions* lgo = (LevelGenerationOptions*)pParam; lgo->m_bLoadingData = false; if (dwErr != ERROR_SUCCESS) { @@ -497,7 +497,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, dwErr); } else { app.DebugPrintf("Mounted DLC for LGO, attempting to load data\n"); - DWORD dwFilesProcessed = 0; + uint32_t dwFilesProcessed = 0; int gameRulesCount = lgo->m_parentDLCPack->getDLCItemsCount( DLCManager::e_DLCType_GameRulesHeader); for (int i = 0; i < gameRulesCount; ++i) { @@ -513,7 +513,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, #if defined(_UNICODE) std::wstring path = grf.getPath(); const wchar_t* pchFilename = path.c_str(); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need to share @@ -527,7 +527,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, ); #else const char* pchFilename = wstringtofilename(grf.getPath()); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need to share @@ -542,12 +542,12 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, #endif if (fileHandle != INVALID_HANDLE_VALUE) { - DWORD dwFileSize = grf.length(); - DWORD bytesRead; - PBYTE pbData = (PBYTE) new BYTE[dwFileSize]; + uint32_t dwFileSize = grf.length(); + uint32_t bytesRead; + uint8_t* pbData = (uint8_t*) new uint8_t[dwFileSize]; bool bSuccess = ReadFile(fileHandle, pbData, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } CloseHandle(fileHandle); @@ -571,7 +571,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, #if defined(_UNICODE) std::wstring path = save.getPath(); const wchar_t* pchFilename = path.c_str(); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need to share @@ -585,7 +585,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, ); #else const char* pchFilename = wstringtofilename(save.getPath()); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need to share @@ -600,11 +600,11 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, #endif if (fileHandle != INVALID_HANDLE_VALUE) { - DWORD bytesRead, dwFileSize = GetFileSize(fileHandle, nullptr); - PBYTE pbData = (PBYTE) new BYTE[dwFileSize]; + uint32_t bytesRead, dwFileSize = GetFileSize(fileHandle, nullptr); + uint8_t* pbData = (uint8_t*) new uint8_t[dwFileSize]; bool bSuccess = ReadFile(fileHandle, pbData, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } CloseHandle(fileHandle); @@ -615,7 +615,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr, } } } - DWORD result = StorageManager.UnmountInstalledDLC("WPACK"); + uint32_t result = StorageManager.UnmountInstalledDLC("WPACK"); } lgo->setLoadedData(); diff --git a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h index 8cb31e933..f95c9accc 100644 --- a/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h +++ b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h @@ -219,8 +219,8 @@ public: getUnfinishedSchematicFiles(); void loadBaseSaveData(); - static int packMounted(void* pParam, int iPad, DWORD dwErr, - DWORD dwLicenceMask); + static int packMounted(void* pParam, int iPad, uint32_t dwErr, + uint32_t dwLicenceMask); // 4J-JEV: // ApplySchematicRules contain limited state diff --git a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp index 3ea08b987..4650f2210 100644 --- a/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp @@ -35,7 +35,7 @@ void UseTileRuleDefinition::addAttribute(const std::wstring& attributeName, } else if (attributeName.compare(L"useCoords") == 0) { m_useCoords = _fromString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter useCoords=%s\n", - m_useCoords ? "TRUE" : "FALSE"); + m_useCoords ? "true" : "false"); } else if (attributeName.compare(L"x") == 0) { m_coordinates.x = _fromString(attributeValue); app.DebugPrintf("UseTileRule: Adding parameter x=%d\n", @@ -65,7 +65,7 @@ bool UseTileRuleDefinition::onUseTile(GameRule* rule, int tileId, int x, int y, app.DebugPrintf( "Completed UseTileRule with info - t:%d, coords:%s, x:%d, " "y:%d, z:%d\n", - m_tileId, m_useCoords ? "TRUE" : "FALSE", m_coordinates.x, + m_tileId, m_useCoords ? "true" : "false", m_coordinates.x, m_coordinates.y, m_coordinates.z); // Send a packet or some other announcement here diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp index 39afbe7f4..4edd3be9d 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp @@ -82,7 +82,7 @@ void XboxStructureActionGenerateBox::addAttribute( if (attributeValue.compare(L"true") == 0) m_skipAir = true; app.DebugPrintf( "XboxStructureActionGenerateBox: Adding parameter skipAir=%s\n", - m_skipAir ? "TRUE" : "FALSE"); + m_skipAir ? "true" : "false"); } else { GameRuleDefinition::addAttribute(attributeName, attributeValue); } diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp index 621e5e9b5..1315c1ea6 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp @@ -19,7 +19,7 @@ XboxStructureActionPlaceContainer::~XboxStructureActionPlaceContainer() { // 4J-JEV: Super class handles attr-facing fine. // void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream -// *dos, UINT numAttrs) +// *dos, uint32_t numAttrs) void XboxStructureActionPlaceContainer::getChildren( std::vector* children) { diff --git a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h index 7168a3ff1..ec59f9a70 100644 --- a/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h +++ b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h @@ -24,7 +24,7 @@ public: ConsoleGameRules::EGameRuleType ruleType); // 4J-JEV: Super class handles attr-facing fine. - // virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); + // virtual void writeAttributes(DataOutputStream *dos, uint32_t numAttributes); virtual void addAttribute(const std::wstring& attributeName, const std::wstring& attributeValue); diff --git a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp index ff59f8255..b0415e64e 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp +++ b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.cpp @@ -178,9 +178,9 @@ void SonyLeaderboardManager::scoreboardThreadInternal() { } } -HRESULT SonyLeaderboardManager::fillByIdsQuery(const SceNpId& myNpId, +int32_t SonyLeaderboardManager::fillByIdsQuery(const SceNpId& myNpId, SceNpId*& npIds, uint32_t& len) { - HRESULT ret; + int32_t ret; // Get queried users. switch (m_eFilterMode) { @@ -861,7 +861,7 @@ void SonyLeaderboardManager::fromBinary(SceNpScoreComment** out, void* in) { void SonyLeaderboardManager::toBase32(SceNpScoreComment* out, void* in) { ZeroMemory(out, sizeof(SceNpScoreComment)); - PBYTE bytes = (PBYTE)in; + uint8_t* bytes = (uint8_t*)in; char* chars = getComment(out); for (int i = 0; i < SCE_NP_SCORE_COMMENT_MAXLEN; i++) { @@ -890,7 +890,7 @@ void SonyLeaderboardManager::toBase32(SceNpScoreComment* out, void* in) { } void SonyLeaderboardManager::fromBase32(void* out, SceNpScoreComment* in) { - PBYTE bytes = (PBYTE)out; + uint8_t* bytes = (uint8_t*)out; ZeroMemory(bytes, RECORD_SIZE); fromSymbols(getComment(in)); diff --git a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h index 88f5230c5..f7946c510 100644 --- a/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h +++ b/Minecraft.Client/Platform/Common/Leaderboards/SonyLeaderboardManager.h @@ -118,17 +118,17 @@ protected: // 4J-JEV: Interface differences: // Sce NP score library function redirects. - virtual HRESULT initialiseScoreUtility() { return ERROR_SUCCESS; } - virtual bool scoreUtilityAlreadyInitialised(HRESULT hr) { return false; } + virtual int32_t initialiseScoreUtility() { return ERROR_SUCCESS; } + virtual bool scoreUtilityAlreadyInitialised(int32_t hr) { return false; } - virtual HRESULT createTitleContext(const SceNpId& npId) = 0; - virtual HRESULT destroyTitleContext(int titleContext) = 0; + virtual int32_t createTitleContext(const SceNpId& npId) = 0; + virtual int32_t destroyTitleContext(int titleContext) = 0; - virtual HRESULT createTransactionContext(int titleContext) = 0; - virtual HRESULT abortTransactionContext(int transactionContext) = 0; - virtual HRESULT destroyTransactionContext(int transactionContext) = 0; + virtual int32_t createTransactionContext(int titleContext) = 0; + virtual int32_t abortTransactionContext(int transactionContext) = 0; + virtual int32_t destroyTransactionContext(int transactionContext) = 0; - virtual HRESULT fillByIdsQuery(const SceNpId& myNpId, SceNpId*& npIds, + virtual int32_t fillByIdsQuery(const SceNpId& myNpId, SceNpId*& npIds, uint32_t& len); diff --git a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp index 5b2d528f3..492488cb3 100644 --- a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp @@ -91,7 +91,7 @@ bool CGameNetworkManager::_RunNetworkGame(void* lpParameter) { success = s_pPlatformNetworkManager->_RunNetworkGame(); if (!success) { app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, - (void*)TRUE); + (void*)true); return true; } } @@ -151,7 +151,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, #if defined(_UNICODE) std::wstring path = grf.getPath(); const wchar_t* pchFilename = path.c_str(); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need @@ -167,7 +167,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, #else const char* pchFilename = wstringtofilename(grf.getPath()); - HANDLE fileHandle = CreateFile( + void* fileHandle = CreateFile( pchFilename, // file name GENERIC_READ, // access mode 0, // share mode // TODO 4J Stu - Will we need @@ -183,13 +183,13 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft* minecraft, #endif if (fileHandle != INVALID_HANDLE_VALUE) { - DWORD bytesRead, + uint32_t bytesRead, dwFileSize = GetFileSize(fileHandle, nullptr); - PBYTE pbData = (PBYTE) new BYTE[dwFileSize]; + uint8_t* pbData = (uint8_t*) new uint8_t[dwFileSize]; bool bSuccess = ReadFile(fileHandle, pbData, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } CloseHandle(fileHandle); @@ -626,7 +626,7 @@ void CGameNetworkManager::HostGame(int localUsersMask, bool bOnlineGame, } bool CGameNetworkManager::IsHost() { - return (s_pPlatformNetworkManager->IsHost() == TRUE); + return (s_pPlatformNetworkManager->IsHost() == true); } bool CGameNetworkManager::IsInStatsEnabledSession() { @@ -923,7 +923,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { std::this_thread::sleep_for(std::chrono::milliseconds(10)); } app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)TRUE); + eXuiServerAction_PauseServer, (void*)true); // wait for the server to be in a non-ticking state pServer->m_serverPausedEvent->WaitForSignal(INFINITE); @@ -1052,7 +1052,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc(void* lpParam) { // Start the game again app.SetGameStarted(true); app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)FALSE); + eXuiServerAction_PauseServer, (void*)false); app.SetChangingSessionType(false); app.SetReallyChangingSessionType(false); @@ -1082,13 +1082,13 @@ std::wstring CGameNetworkManager::GatherRTTStats() { void CGameNetworkManager::StateChange_AnyToHosting() { app.DebugPrintf("Disabling Guest Signin\n"); - XEnableGuestSignin(FALSE); + XEnableGuestSignin(false); Minecraft::GetInstance()->clearPendingClientTextureRequests(); } void CGameNetworkManager::StateChange_AnyToJoining() { app.DebugPrintf("Disabling Guest Signin\n"); - XEnableGuestSignin(FALSE); + XEnableGuestSignin(false); Minecraft::GetInstance()->clearPendingClientTextureRequests(); ConnectionProgressParams* param = new ConnectionProgressParams(); @@ -1133,8 +1133,8 @@ void CGameNetworkManager::StateChange_AnyToStarting() { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = ProfileManager.GetPrimaryPad(); loadingParams->completionData = completionData; @@ -1173,13 +1173,13 @@ void CGameNetworkManager::StateChange_AnyToEnding(bool bStateWasPlaying) { if (app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None) app.SetDisconnectReason(DisconnectPacket::eDisconnect_Quitting); app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, - (void*)TRUE); + (void*)true); } } void CGameNetworkManager::StateChange_AnyToIdle() { app.DebugPrintf("Enabling Guest Signin\n"); - XEnableGuestSignin(TRUE); + XEnableGuestSignin(true); // Reset this here so that we can search for games again // 4J Stu - If we are changing session type there is a race between that // thread setting the game to local, and this setting it to not local @@ -1301,7 +1301,7 @@ void CGameNetworkManager::PlayerLeaving(INetworkPlayer* pNetworkPlayer) { void CGameNetworkManager::HostChanged() { // Disable host migration app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, - (void*)TRUE); + (void*)true); } void CGameNetworkManager::WriteStats(INetworkPlayer* pNetworkPlayer) { diff --git a/Minecraft.Client/Platform/Common/Network/NetworkPlayerQNet.cpp b/Minecraft.Client/Platform/Common/Network/NetworkPlayerQNet.cpp index 6a9b26e32..735ef40ca 100644 --- a/Minecraft.Client/Platform/Common/Network/NetworkPlayerQNet.cpp +++ b/Minecraft.Client/Platform/Common/Network/NetworkPlayerQNet.cpp @@ -12,7 +12,7 @@ unsigned char NetworkPlayerQNet::GetSmallId() { void NetworkPlayerQNet::SendData(INetworkPlayer* player, const void* pvData, int dataSize, bool lowPriority, bool ack) { - DWORD flags; + uint32_t flags; flags = QNET_SENDDATA_RELIABLE | QNET_SENDDATA_SEQUENTIAL; if (lowPriority) flags |= QNET_SENDDATA_LOW_PRIORITY | QNET_SENDDATA_SECONDARY; @@ -25,12 +25,12 @@ int NetworkPlayerQNet::GetOutstandingAckCount() { return 0; } bool NetworkPlayerQNet::IsSameSystem(INetworkPlayer* player) { return (m_qnetPlayer->IsSameSystem( - static_cast(player)->m_qnetPlayer) == TRUE); + static_cast(player)->m_qnetPlayer) == true); } int NetworkPlayerQNet::GetSendQueueSizeBytes(INetworkPlayer* player, bool lowPriority) { - DWORD flags = QNET_GETSENDQUEUESIZE_BYTES; + uint32_t flags = QNET_GETSENDQUEUESIZE_BYTES; if (lowPriority) flags |= QNET_GETSENDQUEUESIZE_SECONDARY_TYPE; return m_qnetPlayer->GetSendQueueSize( player ? static_cast(player)->m_qnetPlayer @@ -40,7 +40,7 @@ int NetworkPlayerQNet::GetSendQueueSizeBytes(INetworkPlayer* player, int NetworkPlayerQNet::GetSendQueueSizeMessages(INetworkPlayer* player, bool lowPriority) { - DWORD flags = QNET_GETSENDQUEUESIZE_MESSAGES; + uint32_t flags = QNET_GETSENDQUEUESIZE_MESSAGES; if (lowPriority) flags |= QNET_GETSENDQUEUESIZE_SECONDARY_TYPE; return m_qnetPlayer->GetSendQueueSize( player ? static_cast(player)->m_qnetPlayer @@ -50,30 +50,30 @@ int NetworkPlayerQNet::GetSendQueueSizeMessages(INetworkPlayer* player, int NetworkPlayerQNet::GetCurrentRtt() { return m_qnetPlayer->GetCurrentRtt(); } -bool NetworkPlayerQNet::IsHost() { return (m_qnetPlayer->IsHost() == TRUE); } +bool NetworkPlayerQNet::IsHost() { return (m_qnetPlayer->IsHost() == true); } -bool NetworkPlayerQNet::IsGuest() { return (m_qnetPlayer->IsGuest() == TRUE); } +bool NetworkPlayerQNet::IsGuest() { return (m_qnetPlayer->IsGuest() == true); } -bool NetworkPlayerQNet::IsLocal() { return (m_qnetPlayer->IsLocal() == TRUE); } +bool NetworkPlayerQNet::IsLocal() { return (m_qnetPlayer->IsLocal() == true); } int NetworkPlayerQNet::GetSessionIndex() { return m_qnetPlayer->GetSessionIndex(); } bool NetworkPlayerQNet::IsTalking() { - return (m_qnetPlayer->IsTalking() == TRUE); + return (m_qnetPlayer->IsTalking() == true); } bool NetworkPlayerQNet::IsMutedByLocalUser(int userIndex) { - return (m_qnetPlayer->IsMutedByLocalUser(userIndex) == TRUE); + return (m_qnetPlayer->IsMutedByLocalUser(userIndex) == true); } bool NetworkPlayerQNet::HasVoice() { - return (m_qnetPlayer->HasVoice() == TRUE); + return (m_qnetPlayer->HasVoice() == true); } bool NetworkPlayerQNet::HasCamera() { - return (m_qnetPlayer->HasCamera() == TRUE); + return (m_qnetPlayer->HasCamera() == true); } int NetworkPlayerQNet::GetUserIndex() { return m_qnetPlayer->GetUserIndex(); } diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h index d780d859c..9c6252775 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h @@ -122,7 +122,7 @@ public: private: virtual void SetSessionTexturePackParentId(int id) = 0; virtual void SetSessionSubTexturePackId(int id) = 0; - virtual void Notify(int ID, ULONG_PTR Param) = 0; + virtual void Notify(int ID, uintptr_t Param) = 0; public: virtual std::vector* GetSessionList(int iPad, diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp index 55f4a51f5..aca433d9a 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp @@ -277,7 +277,7 @@ bool CPlatformNetworkManagerStub::_RunNetworkGame() { return true; } void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData( INetworkPlayer* pNetworkPlayerLeaving /*= nullptr*/) { - // DWORD playerCount = m_pIQNet->GetPlayerCount(); + // uint32_t playerCount = m_pIQNet->GetPlayerCount(); // // if( this->m_bLeavingGame ) // return; @@ -504,7 +504,7 @@ void CPlatformNetworkManagerStub::ForceFriendsSessionRefresh() { INetworkPlayer* CPlatformNetworkManagerStub::addNetworkPlayer( IQNetPlayer* pQNetPlayer) { NetworkPlayerQNet* pNetworkPlayer = new NetworkPlayerQNet(pQNetPlayer); - pQNetPlayer->SetCustomDataValue((ULONG_PTR)pNetworkPlayer); + pQNetPlayer->SetCustomDataValue((uintptr_t)pNetworkPlayer); currentNetworkPlayers.push_back(pNetworkPlayer); return pNetworkPlayer; } @@ -567,7 +567,7 @@ void CPlatformNetworkManagerStub::SetSessionSubTexturePackId(int id) { m_hostGameSessionData.subTexturePackId = id; } -void CPlatformNetworkManagerStub::Notify(int ID, ULONG_PTR Param) {} +void CPlatformNetworkManagerStub::Notify(int ID, uintptr_t Param) {} bool CPlatformNetworkManagerStub::IsInSession() { return m_pIQNet->GetState() != QNET_STATE_IDLE; diff --git a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h index 895f9820f..dd184f5bc 100644 --- a/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h +++ b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h @@ -79,7 +79,7 @@ private: IQNet* m_pIQNet; // pointer to QNet interface - HANDLE m_notificationListener; + void* m_notificationListener; std::vector m_machineQNetPrimaryPlayers; // collection of players that we deem to @@ -174,7 +174,7 @@ private: virtual void SetSessionTexturePackParentId(int id); virtual void SetSessionSubTexturePackId(int id); - virtual void Notify(int ID, ULONG_PTR Param); + virtual void Notify(int ID, uintptr_t Param); public: virtual std::vector* GetSessionList(int iPad, diff --git a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp index 240d2960f..5235ba38e 100644 --- a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp +++ b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp @@ -12,17 +12,17 @@ CTelemetryManager *TelemetryManager = new CTelemetryManager(); -HRESULT CTelemetryManager::Init() +int32_t CTelemetryManager::Init() { return 0; } -HRESULT CTelemetryManager::Tick() +int32_t CTelemetryManager::Tick() { return 0; } -HRESULT CTelemetryManager::Flush() +int32_t CTelemetryManager::Flush() { return 0; } diff --git a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h index 1241c1e86..bcb55f413 100644 --- a/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h +++ b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h @@ -13,9 +13,9 @@ class CTelemetryManager { public: - virtual HRESULT Init(); - virtual HRESULT Tick(); - virtual HRESULT Flush(); + virtual int32_t Init(); + virtual int32_t Tick(); + virtual int32_t Flush(); virtual bool RecordPlayerSessionStart(int iPad); virtual bool RecordPlayerSessionExit(int iPad, int exitStatus); diff --git a/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h index 89446ce03..164d83262 100644 --- a/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h +++ b/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h @@ -9,7 +9,7 @@ private: bool limitRepeats; unsigned char numRepeats; unsigned char timesShown; - DWORD lastDisplayed; + uint32_t lastDisplayed; public: TutorialMessage(int messageId, bool limitRepeats = false, diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp index 36402027d..3fd825ec2 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -1095,9 +1095,9 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, ui.AnimateKeyPress(iPad, iAction, bRepeat, true, false); int buttonNum = 0; // 0 = LeftMouse, 1 = RightMouse - bool quickKeyHeld = FALSE; // Represents shift key on PC + bool quickKeyHeld = false; // Represents shift key on PC - bool validKeyPress = FALSE; + bool validKeyPress = false; bool itemEditorKeyPress = false; // Ignore input from other players @@ -1106,7 +1106,7 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, switch (iAction) { #if defined(_DEBUG_MENUS_ENABLED) case ACTION_MENU_OTHER_STICK_PRESS: - itemEditorKeyPress = TRUE; + itemEditorKeyPress = true; break; #endif case ACTION_MENU_A: @@ -1256,14 +1256,14 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, // over empty space or something else??? handleOtherClicked(iPad, m_eCurrSection, buttonNum, quickKeyHeld ? true : false); - // assert( FALSE ); + // assert( false ); } } } bHandled = true; } #if defined(_DEBUG_MENUS_ENABLED) - else if (itemEditorKeyPress == TRUE) { + else if (itemEditorKeyPress == true) { if (IsSectionSlotList(m_eCurrSection)) { ItemEditorInput* initData = new ItemEditorInput(); initData->iPad = getPad(); diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp index 46832a3a9..cad535222 100644 --- a/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp @@ -114,7 +114,7 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned( // results switched for this dialog if (result == C4JStorage::EMessage_ResultDecline) { - // INT saveOrCheckpointId = 0; + // int32_t saveOrCheckpointId = 0; // bool validSave = // StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); // SentientManager.RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), @@ -230,7 +230,7 @@ int IUIScene_PauseMenu::SaveWorldThreadProc(void* lpParameter) { } - HRESULT hr = S_OK; + int32_t hr = S_OK; if (app.GetChangingSessionType()) { // 4J Stu - This causes the fullscreenprogress scene to ignore the // action it was given @@ -364,7 +364,7 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) { saveStats = false; // 4J Stu - Leave the session once the disconnect packet has been sent - g_NetworkManager.LeaveGame(FALSE); + g_NetworkManager.LeaveGame(false); } else { if (lpParameter != nullptr && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad())) { diff --git a/Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp index c6e5b9e0f..056408e94 100644 --- a/Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp @@ -212,7 +212,7 @@ IggyGlyphMetrics* UIBitmapFont::GetGlyphMetrics(S32 glyph, rrbool UIBitmapFont::IsGlyphEmpty(S32 glyph) { if (m_cFontData->glyphIsWhitespace(glyph)) return true; return false; // app.DebugPrintf("Is glyph %d empty? - // %s\n",glyph,isEmpty?"TRUE":"FALSE"); + // %s\n",glyph,isEmpty?"true":"false"); } // Callback function type for returning the kerning amount for a given pair of @@ -231,7 +231,7 @@ F32 UIBitmapFont::GetKerningForGlyphPair(S32 first_glyph, S32 second_glyph) { // glyph at the given scale rrbool UIBitmapFont::CanProvideBitmap(S32 glyph, F32 pixel_scale) { // app.DebugPrintf("Can provide bitmap for glyph %d at scale %f? - // %s\n",glyph,pixel_scale,canProvideBitmap?"TRUE":"FALSE"); + // %s\n",glyph,pixel_scale,canProvideBitmap?"true":"false"); return true; } diff --git a/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp index fb15bf2f5..27e41c3b8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp @@ -45,7 +45,7 @@ void UIComponent_Chat::handleTimerComplete(int id) { bool anyVisible = false; if (pMinecraft->localplayers[m_iPad] != nullptr) { Gui* pGui = pMinecraft->gui; - // DWORD messagesToDisplay = std::min( CHAT_LINES_COUNT, + // uint32_t messagesToDisplay = std::min( CHAT_LINES_COUNT, // pGui->getMessagesCount(m_iPad) ); for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { float opacity = pGui->getOpacity(m_iPad, i); diff --git a/Minecraft.Client/Platform/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp index a178773d1..5e77f549d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIController.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIController.cpp @@ -339,7 +339,7 @@ void UIController::SetupFont() { if ((m_eCurrentFont != m_eTargetFont) || !UIString::setCurrentLanguage()) return; - DWORD nextLanguage = UIString::getCurrentLanguage(); + uint32_t nextLanguage = UIString::getCurrentLanguage(); m_eTargetFont = getFontForLanguage(nextLanguage); // flag a language change to reload the string tables in the DLC @@ -983,7 +983,7 @@ void UIController::setupCustomDrawMatrices(UIScene* scene, float sceneWidth = (float)scene->getRenderWidth(); float sceneHeight = (float)scene->getRenderHeight(); - LONG left, right, top, bottom; + int32_t left, right, top, bottom; { left = m_tileOriginX + @@ -998,14 +998,14 @@ void UIController::setupCustomDrawMatrices(UIScene* scene, customDrawRegion->y1; m_customRenderingClearRect.left = - std::min(m_customRenderingClearRect.left, left); + std::min(m_customRenderingClearRect.left, left); m_customRenderingClearRect.right = - std::max(m_customRenderingClearRect.right, right); + std::max(m_customRenderingClearRect.right, right); ; m_customRenderingClearRect.top = - std::min(m_customRenderingClearRect.top, top); + std::min(m_customRenderingClearRect.top, top); m_customRenderingClearRect.bottom = - std::max(m_customRenderingClearRect.bottom, bottom); + std::max(m_customRenderingClearRect.bottom, bottom); if (!m_bScreenWidthSetup) { Minecraft* pMinecraft = Minecraft::GetInstance(); @@ -1137,7 +1137,7 @@ void RADLINK UIController::TextureSubstitutionDestroyCallback( void* user_callback_data, void* destroy_callback_data, GDrawTexture* handle) { // Orbis complains about casting a pointer to an int - LONGLONG llVal = (LONGLONG)destroy_callback_data; + int64_t llVal = (int64_t)destroy_callback_data; int id = (int)llVal; app.DebugPrintf("Destroying iggy texture %d\n", id); diff --git a/Minecraft.Client/Platform/Common/UI/UIController.h b/Minecraft.Client/Platform/Common/UI/UIController.h index 4d5308982..3eb04a6d4 100644 --- a/Minecraft.Client/Platform/Common/UI/UIController.h +++ b/Minecraft.Client/Platform/Common/UI/UIController.h @@ -388,21 +388,21 @@ public: void ClearPressStart(); virtual C4JStorage::EMessageResult RequestAlertMessage( - UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC, - DWORD dwPad = XUSER_INDEX_ANY, + uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, + uint32_t dwPad = XUSER_INDEX_ANY, int (*Func)(void*, int, const C4JStorage::EMessageResult) = nullptr, void* lpParam = nullptr, wchar_t* pwchFormatString = nullptr); virtual C4JStorage::EMessageResult RequestErrorMessage( - UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC, - DWORD dwPad = XUSER_INDEX_ANY, + uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, + uint32_t dwPad = XUSER_INDEX_ANY, int (*Func)(void*, int, const C4JStorage::EMessageResult) = nullptr, void* lpParam = nullptr, wchar_t* pwchFormatString = nullptr); private: virtual C4JStorage::EMessageResult RequestMessageBox( - UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC, DWORD dwPad, + uint32_t uiTitle, uint32_t uiText, uint32_t* uiOptionA, uint32_t uiOptionC, uint32_t dwPad, int (*Func)(void*, int, const C4JStorage::EMessageResult), - void* lpParam, wchar_t* pwchFormatString, DWORD dwFocusButton, + void* lpParam, wchar_t* pwchFormatString, uint32_t dwFocusButton, bool bIsError); public: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp index eb4a3dd08..7953c41df 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp @@ -234,8 +234,8 @@ void UIScene_AbstractContainerMenu::handleInput(int iPad, int key, bool repeat, if (m_bIgnoreInput) return; // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); if (pressed) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp index dd5417a56..03d0e437e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp @@ -154,7 +154,7 @@ void UIScene_ConnectingProgress::handleTimerComplete(int id) { // app.NavigateToHomeMenu(); app.SetAction(ProfileManager.GetPrimaryPad(), eAppAction_ExitWorld, - (void*)TRUE); + (void*)true); } } } @@ -163,8 +163,8 @@ void UIScene_ConnectingProgress::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); if (m_showTooltips) { ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp index 586d1daef..d846aae3c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp @@ -23,7 +23,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, bool bNotInGame = (Minecraft::GetInstance()->level == nullptr); if (bNotInGame) { - LPWSTR layoutString = new wchar_t[128]; + wchar_t* layoutString = new wchar_t[128]; swprintf(layoutString, 128, L"%ls", VER_PRODUCTVERSION_STR_W); m_labelVersion.init(layoutString); delete[] layoutString; @@ -55,7 +55,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, int iSelected = app.GetGameSettings(m_iPad, eGameSetting_ControlScheme); - LPWSTR layoutString = new wchar_t[128]; + wchar_t* layoutString = new wchar_t[128]; swprintf(layoutString, 128, L"%ls : %ls", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[iSelected])); { @@ -105,8 +105,8 @@ void UIScene_ControlsMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { @@ -154,7 +154,7 @@ void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId) { case eControl_Button2: app.SetGameSettings(m_iPad, eGameSetting_ControlScheme, (unsigned char)control); - LPWSTR layoutString = new wchar_t[128]; + wchar_t* layoutString = new wchar_t[128]; swprintf(layoutString, 128, L"%ls : %ls", app.GetString(IDS_CURRENT_LAYOUT), app.GetString(m_iSchemeTextA[control])); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp index 90959caa8..1a2e78304 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp @@ -54,8 +54,8 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, app.AdjustSplitscreenScene(m_hObj, &m_OriginalPosition, m_iPad); } - XuiElementSetShow(m_hGrid, TRUE); - XuiElementSetShow(m_hPanel, TRUE); + XuiElementSetShow(m_hGrid, true); + XuiElementSetShow(m_hPanel, true); #endif if (m_iContainerType == RECIPE_TYPE_3x3) { @@ -73,7 +73,7 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, #if TO_BE_IMPLEMENTED // display the first group tab - m_hTabGroupA[m_iGroupIndex].SetShow(TRUE); + m_hTabGroupA[m_iGroupIndex].SetShow(true); // store the slot 0 position m_pHSlotsBrushImageControl[0]->GetPosition(&m_vSlot0Pos); @@ -88,13 +88,13 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void* _initData, // get the position of the slot from the xui, and apply any offset needed for (int i = 0; i < m_iCraftablesMaxHSlotC; i++) { - m_pHSlotsBrushImageControl[i]->SetShow(FALSE); + m_pHSlotsBrushImageControl[i]->SetShow(false); } - XuiElementSetShow(m_hGridInventory, FALSE); + XuiElementSetShow(m_hGridInventory, false); - m_hScrollBar2.SetShow(FALSE); - m_hScrollBar3.SetShow(FALSE); + m_hScrollBar2.SetShow(false); + m_hScrollBar3.SetShow(false); #endif @@ -383,8 +383,8 @@ void UIScene_CraftingMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp index 4ec97e069..79f2f1a2b 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp @@ -593,7 +593,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame() { unsigned int uiIDA[2]; if (m_bGameModeCreative == true || - m_MoreOptionsParams.bHostPrivileges == TRUE) { + m_MoreOptionsParams.bHostPrivileges == true) { uiIDA[0] = IDS_CONFIRM_OK; uiIDA[1] = IDS_CONFIRM_CANCEL; if (m_bGameModeCreative == true) { @@ -866,8 +866,8 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h index d2c17aa08..a6c0de2c5 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h @@ -87,7 +87,7 @@ protected: void handlePress(F64 controlId, F64 childId); void handleSliderMove(F64 sliderId, F64 currentValue); - static void CreateGame(UIScene_CreateWorldMenu* pClass, INT LocalUsersMask); + static void CreateGame(UIScene_CreateWorldMenu* pClass, int32_t LocalUsersMask); static int ConfirmCreateReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); static int StartGame_SignInReturned(void* pParam, bool bContinue, int iPad); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp index 652d67a28..a26f08466 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp @@ -119,8 +119,8 @@ void UIScene_CreativeMenu::handleInput(int iPad, int key, bool repeat, if (repeat) return; // app.DebugPrintf("UIScene_CreativeMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); int dir = 1; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp index afba7d085..c251577de 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp @@ -158,7 +158,7 @@ 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. { - LPWSTR creditsString = new wchar_t[128]; + wchar_t* creditsString = new wchar_t[128]; if (gs_aCreditDefs[i].m_iStringID[1] != NO_TRANSLATED_STRING) { swprintf(creditsString, 128, gs_aCreditDefs[i].m_Text, app.GetString(gs_aCreditDefs[i].m_iStringID[0]), @@ -235,7 +235,7 @@ void UIScene_Credits::tick() { replaceAll(sanitisedString, L"\u2013", L"-"); } - LPWSTR creditsString = new wchar_t[128]; + wchar_t* creditsString = new wchar_t[128]; if (pDef->m_iStringID[0] == NO_TRANSLATED_STRING) { ZeroMemory(creditsString, 128); memcpy(creditsString, sanitisedString.c_str(), @@ -260,7 +260,7 @@ 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?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down?"true":"false", pressed?"true":"false", released?"true":"false"); ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp index fa6e79170..0266d3e9d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp @@ -45,8 +45,8 @@ void UIScene_DLCMainMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp index ed92c137b..5caf71393 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp @@ -78,8 +78,8 @@ void UIScene_DLCOffersMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp index b20c18e66..2222d09af 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp @@ -58,7 +58,7 @@ void UIScene_DebugOptionsMenu::handleInput(int iPad, int key, bool repeat, bool& handled) { // app.DebugPrintf("UIScene_DebugOptionsMenu handling input for pad %d, key // %d, repeat- %s, pressed- %s, released- %s\n", iPad, key, - // repeat?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // repeat?"true":"false", pressed?"true":"false", released?"true":"false"); switch (key) { case ACTION_MENU_CANCEL: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp index 60a113ecf..acbf98976 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp @@ -81,8 +81,8 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer) #if TO_BE_IMPLEMENTED m_scrollDir = 1; - HRESULT hr = XuiHtmlControlSetSmoothScroll( - m_htmlControl.m_hObj, XUI_SMOOTHSCROLL_VERTICAL, TRUE, + int32_t hr = XuiHtmlControlSetSmoothScroll( + m_htmlControl.m_hObj, XUI_SMOOTHSCROLL_VERTICAL, true, AUTO_SCROLL_SPEED, 1.0f, AUTO_SCROLL_SPEED); XuiHtmlControlVScrollBy(m_htmlControl.m_hObj, m_scrollDir * 1000); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.cpp index 958ed53b1..14ed8d205 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.cpp @@ -216,7 +216,7 @@ UIControl* UIScene_FireworksMenu::getSection(ESceneSection eSection) { // bShow == true removes the 2x2 crafting grid and bShow == false removes the // 3x3 crafting grid -void UIScene_FireworksMenu::ShowLargeCraftingGrid(boolean bShow) { +void UIScene_FireworksMenu::ShowLargeCraftingGrid(bool bShow) { app.DebugPrintf("ShowLargeCraftingGrid to %d\n", bShow); IggyDataValue result; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.h index 6cc7c98d1..12cadef24 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_FireworksMenu.h @@ -42,5 +42,5 @@ protected: virtual UIControl* getSection(ESceneSection eSection); - void ShowLargeCraftingGrid(boolean bShow); + void ShowLargeCraftingGrid(bool bShow); }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp index f63603d6e..a72e4555d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp @@ -142,7 +142,7 @@ void UIScene_FullscreenProgress::tick() { } int code = thread->GetExitCode(); - DWORD exitcode = *((DWORD*)&code); + uint32_t exitcode = *((uint32_t*)&code); // app.DebugPrintf("CScene_FullscreenProgress Timer %d\n",pTimer->nId); @@ -158,7 +158,7 @@ void UIScene_FullscreenProgress::tick() { // will cause another action } else { /*m_threadCompleted = true; - m_buttonConfirm.SetShow( TRUE ); + m_buttonConfirm.SetShow( true ); m_buttonConfirm.SetFocus( m_CompletionData->iPad ); m_CompletionData->type = e_ProgressCompletion_NavigateToHomeMenu; @@ -186,7 +186,7 @@ void UIScene_FullscreenProgress::tick() { ui.UpdatePlayerBasePositions(); } } else { - if ((m_CompletionData->bRequiresUserAction == TRUE) && + if ((m_CompletionData->bRequiresUserAction == true) && (!m_bWasCancelled)) { m_threadCompleted = true; m_buttonConfirm.setVisible(true); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp index aa5cd94a6..56a280e94 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp @@ -392,7 +392,7 @@ void UIScene_HUD::SetArmour(int iArmour) { void UIScene_HUD::ShowHealth(bool show) { if (show != m_showHealth) { - app.DebugPrintf("ShowHealth to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowHealth to %s\n", show ? "true" : "false"); m_showHealth = show; IggyDataValue result; @@ -407,7 +407,7 @@ void UIScene_HUD::ShowHealth(bool show) { void UIScene_HUD::ShowHorseHealth(bool show) { if (show != m_showHorseHealth) { - app.DebugPrintf("ShowHorseHealth to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowHorseHealth to %s\n", show ? "true" : "false"); m_showHorseHealth = show; IggyDataValue result; @@ -422,7 +422,7 @@ void UIScene_HUD::ShowHorseHealth(bool show) { void UIScene_HUD::ShowFood(bool show) { if (show != m_showFood) { - app.DebugPrintf("ShowFood to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowFood to %s\n", show ? "true" : "false"); m_showFood = show; IggyDataValue result; @@ -437,7 +437,7 @@ void UIScene_HUD::ShowFood(bool show) { void UIScene_HUD::ShowAir(bool show) { if (show != m_showAir) { - app.DebugPrintf("ShowAir to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowAir to %s\n", show ? "true" : "false"); m_showAir = show; IggyDataValue result; @@ -452,7 +452,7 @@ void UIScene_HUD::ShowAir(bool show) { void UIScene_HUD::ShowArmour(bool show) { if (show != m_showArmour) { - app.DebugPrintf("ShowArmour to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowArmour to %s\n", show ? "true" : "false"); m_showArmour = show; IggyDataValue result; @@ -467,7 +467,7 @@ void UIScene_HUD::ShowArmour(bool show) { void UIScene_HUD::ShowExpBar(bool show) { if (show != m_showExpBar) { - app.DebugPrintf("ShowExpBar to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowExpBar to %s\n", show ? "true" : "false"); m_showExpBar = show; IggyDataValue result; @@ -483,7 +483,7 @@ void UIScene_HUD::ShowExpBar(bool show) { void UIScene_HUD::SetRegenerationEffect(bool bEnabled) { if (bEnabled != m_bRegenEffectEnabled) { app.DebugPrintf("SetRegenerationEffect to %s\n", - bEnabled ? "TRUE" : "FALSE"); + bEnabled ? "true" : "false"); m_bRegenEffectEnabled = bEnabled; IggyDataValue result; @@ -542,7 +542,7 @@ void UIScene_HUD::SetDragonLabel(const std::wstring& label) { void UIScene_HUD::ShowDragonHealth(bool show) { if (show != m_showDragonHealth) { - app.DebugPrintf("ShowDragonHealth to %s\n", show ? "TRUE" : "FALSE"); + app.DebugPrintf("ShowDragonHealth to %s\n", show ? "true" : "false"); m_showDragonHealth = show; IggyDataValue result; @@ -587,7 +587,7 @@ void UIScene_HUD::SetRidingHorse(bool ridingHorse, bool bIsJumpable, int maxHorseHealth) { if (m_bRidingHorse != ridingHorse || maxHorseHealth != m_iHorseMaxHealth) { app.DebugPrintf("SetRidingHorse to %s\n", - ridingHorse ? "TRUE" : "FALSE"); + ridingHorse ? "true" : "false"); m_bRidingHorse = ridingHorse; m_bIsJumpable = bIsJumpable; m_iHorseMaxHealth = maxHorseHealth; @@ -726,7 +726,7 @@ void UIScene_HUD::handleTimerComplete(int id) { bool anyVisible = false; if (pMinecraft->localplayers[m_iPad] != nullptr) { Gui* pGui = pMinecraft->gui; - // DWORD messagesToDisplay = std::min( CHAT_LINES_COUNT, + // uint32_t messagesToDisplay = std::min( CHAT_LINES_COUNT, // pGui->getMessagesCount(m_iPad) ); for (unsigned int i = 0; i < CHAT_LINES_COUNT; ++i) { float opacity = pGui->getOpacity(m_iPad, i); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp index 35559b817..4b5b5d4b7 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp @@ -136,8 +136,8 @@ void UIScene_HelpAndOptionsMenu::handleReload() { if (!ProfileManager.IsFullVersion()) //|| ProfileManager.IsGuest(m_iPad)) { #if TO_BE_IMPLEMENTED - m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(FALSE); - m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(FALSE); + m_Buttons[BUTTON_HAO_CHANGESKIN].SetEnable(false); + m_Buttons[BUTTON_HAO_CHANGESKIN].EnableInput(false); // set the focus to the second button XuiElementSetUserFocus(m_Buttons[BUTTON_HAO_HOWTOPLAY].m_hObj, m_iPad); @@ -156,8 +156,8 @@ void UIScene_HelpAndOptionsMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp index 5cd34da5f..8fe2d3d79 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp @@ -110,8 +110,8 @@ void UIScene_HowToPlayMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp index c16ac4976..9eaab478e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp @@ -106,8 +106,8 @@ void UIScene_InGameHostOptionsMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); ui.AnimateKeyPress(iPad, key, repeat, pressed, released); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp index a94f00155..de9c64185 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp @@ -39,7 +39,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData, INetworkPlayer* thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(m_iPad); m_isHostPlayer = false; - if (thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE; + if (thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == true; Minecraft* pMinecraft = Minecraft::GetInstance(); std::shared_ptr localPlayer = @@ -113,9 +113,9 @@ void UIScene_InGameInfoMenu::updateTooltips() { #endif ) { keyA = IDS_TOOLTIPS_PRIVILEGES; - } else if (selectedPlayer->IsLocal() != TRUE && + } else if (selectedPlayer->IsLocal() != true && selectedPlayer->IsSameSystem( - g_NetworkManager.GetHostPlayer()) != TRUE) { + g_NetworkManager.GetHostPlayer()) != true) { // Only ops will hit this, can kick anyone not local and not // local to the host keyA = IDS_TOOLTIPS_KICK; @@ -158,7 +158,7 @@ void UIScene_InGameInfoMenu::handleReload() { } m_players.clear(); - for (DWORD i = 0; i < playerCount; ++i) { + for (uint32_t i = 0; i < playerCount; ++i) { INetworkPlayer* player = g_NetworkManager.GetPlayerByIndex(i); if (player != nullptr) { @@ -173,7 +173,7 @@ void UIScene_InGameInfoMenu::handleReload() { INetworkPlayer* thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(m_iPad); m_isHostPlayer = false; - if (thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE; + if (thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == true; Minecraft* pMinecraft = Minecraft::GetInstance(); std::shared_ptr localPlayer = @@ -193,7 +193,7 @@ void UIScene_InGameInfoMenu::tick() { UIScene::tick(); // Update players by index - for (DWORD i = 0; i < m_players.size(); ++i) { + for (uint32_t i = 0; i < m_players.size(); ++i) { INetworkPlayer* player = g_NetworkManager.GetPlayerByIndex(i); if (player != nullptr) { @@ -225,8 +225,8 @@ void UIScene_InGameInfoMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { @@ -309,9 +309,9 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId) { m_players[currentSelection]->m_smallId); ui.NavigateToScene(m_iPad, eUIScene_InGamePlayerOptionsMenu, pInitData); - } else if (selectedPlayer->IsLocal() != TRUE && + } else if (selectedPlayer->IsLocal() != true && selectedPlayer->IsSameSystem( - g_NetworkManager.GetHostPlayer()) != TRUE) { + g_NetworkManager.GetHostPlayer()) != true) { // Only ops will hit this, can kick anyone not local and not // local to the host std::uint8_t* smallId = new std::uint8_t(); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp index 4d87f55d1..da0e67e95 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp @@ -246,9 +246,9 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu( } // Can only kick people if they are not local, and not local to the host - if (editingPlayer->IsLocal() != TRUE && + if (editingPlayer->IsLocal() != true && editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) != - TRUE) { + true) { m_buttonKick.init(app.GetString(IDS_KICK_PLAYER), eControl_Kick); } else { removeControl(&m_buttonKick, true); @@ -358,9 +358,9 @@ void UIScene_InGamePlayerOptionsMenu::handleReload() { } // Can only kick people if they are not local, and not local to the host - if (editingPlayer->IsLocal() == TRUE || + if (editingPlayer->IsLocal() == true || editingPlayer->IsSameSystem(g_NetworkManager.GetHostPlayer()) == - TRUE) { + true) { removeControl(&m_buttonKick, true); } } @@ -394,8 +394,8 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool released, bool& handled) { // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); ui.AnimateKeyPress(iPad, key, repeat, pressed, released); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp index 0fc0b44cb..877ae0933 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp @@ -242,7 +242,7 @@ void UIScene_InGameSaveManagementMenu::tick() { .UTF8SaveFilename, // source UTF-8 string MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 // string, - // in CHAR's (= bytes), including end-of-string \0 + // in char's (= bytes), including end-of-string \0 (wchar_t*)u16Message, // destination buffer MAX_SAVEFILENAME_LENGTH // size of destination buffer, in // wchar_t's diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp index 72f7971c6..c09513c5c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp @@ -317,7 +317,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass) { bool noPrivileges = false; int signedInUsers = 0; int localUsersMask = 0; - DWORD dwLocalUsersMask = 0; + uint32_t dwLocalUsersMask = 0; bool isSignedInLive = true; int iPadNotSignedInLive = -1; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp index 821d638a2..0b2663c57 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LanguageSelector.cpp @@ -77,8 +77,8 @@ void UIScene_LanguageSelector::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp index 7d53484a7..e620f6d24 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp @@ -283,8 +283,8 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, if (m_bIgnoreInput) return; // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp index 964d996b9..4743fefdf 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -794,7 +794,7 @@ int UIScene_LeaderboardsMenu::SetLeaderboardTitleIcons() { for (int i = 0; i < 7; i++) { if (TitleIcons[m_currentLeaderboard][i] == 0) { - // m_pHTitleIconSlots[i]->SetShow(FALSE); + // m_pHTitleIconSlots[i]->SetShow(false); } else { iValidIcons++; m_listEntries.setColumnIcon(i, TitleIcons[m_currentLeaderboard][i]); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp index d1fc9d4c9..f957867be 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp @@ -279,10 +279,10 @@ void UIScene_LoadMenu::tick() { // #ifdef _DEBUG // // dump out the thumbnail - // HANDLE hThumbnail = + // void* hThumbnail = // CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, nullptr, // OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr); - // DWORD dwBytes; + // uint32_t dwBytes; // WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,nullptr); // XCloseHandle(hThumbnail); // #endif @@ -1059,7 +1059,7 @@ int UIScene_LoadMenu::DeleteSaveDataReturned(void* pParam, bool bSuccess) { void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, int localUsersMask) { if (pClass->m_levelGen == nullptr) { - INT saveOrCheckpointId = 0; + int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); TelemetryManager->RecordLevelResume( diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp index e0c2b9063..3dc367bcc 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -465,7 +465,7 @@ void UIScene_LoadOrJoinMenu::tick() { .UTF8SaveFilename, // source UTF-8 string MAX_SAVEFILENAME_LENGTH, // total length of source UTF-8 // string, - // in CHAR's (= bytes), including end-of-string \0 + // in char's (= bytes), including end-of-string \0 (wchar_t*)u16Message, // destination buffer MAX_SAVEFILENAME_LENGTH // size of destination buffer, in // wchar_t's @@ -623,7 +623,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo() { if (eSGIStatus == C4JStorage::ESGIStatus_NoSaves) { uiSaveC = 0; m_controlSavesTimer.setVisible(false); - m_SavesList.SetEnable(TRUE); + m_SavesList.SetEnable(true); } #endif } @@ -1082,8 +1082,8 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions* levelGen) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; @@ -1150,7 +1150,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { if (filteredListSize > 0) { #if TO_BE_IMPLEMENTED if (!m_pGamesList->IsEnabled()) { - m_pGamesList->SetEnable(TRUE); + m_pGamesList->SetEnable(true); m_pGamesList->SetCurSel(0); } #endif @@ -1158,7 +1158,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { m_controlJoinTimer.setVisible(false); } else { #if TO_BE_IMPLEMENTED - m_pGamesList->SetEnable(FALSE); + m_pGamesList->SetEnable(false); #endif m_controlJoinTimer.setVisible(false); m_labelNoGames.setVisible(true); @@ -1188,7 +1188,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList() { Minecraft* pMinecraft = Minecraft::GetInstance(); TexturePack* tp = pMinecraft->skins->getTexturePackById( sessionInfo->data.texturePackParentId); - HRESULT hr; + int32_t hr; std::uint32_t imageBytes = 0; std::uint8_t* imageData = nullptr; @@ -1289,8 +1289,8 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id) { ProfileManager.AllowedToPlayMultiplayer(m_iPad); if (bMultiplayerAllowed != m_bMultiplayerAllowed) { if (bMultiplayerAllowed) { - // m_CheckboxOnline.SetEnable(TRUE); - // m_CheckboxPrivate.SetEnable(TRUE); + // m_CheckboxOnline.SetEnable(true); + // m_CheckboxPrivate.SetEnable(true); } else { m_bInParty = false; m_buttonListGames.clearList(); @@ -1351,8 +1351,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk( UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; @@ -1416,8 +1416,8 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; @@ -1510,7 +1510,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned( pClass->m_iDefaultButtonsC] .UTF8SaveName, strlen(pClass->m_saveDetails->UTF8SaveName) + 1); // plus null - LPWSTR ptr = wSaveName; + wchar_t* ptr = wSaveName; InputManager.RequestKeyboard( app.GetString(IDS_RENAME_WORLD_TITLE), wSaveName, 0, 25, &UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback, @@ -1580,8 +1580,8 @@ void UIScene_LoadOrJoinMenu::LaunchSaveTransfer() { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_NavigateBackToScene; completionData->iPad = DEFAULT_XUI_MENU_USER; loadingParams->completionData = completionData; @@ -2089,7 +2089,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc(void* lpParameter) { } else { unsigned int uiIDA[1]; uiIDA[0] = IDS_CONFIRM_OK; - UINT errorMessage = IDS_SAVE_TRANSFER_DOWNLOADFAILED; + uint32_t errorMessage = IDS_SAVE_TRANSFER_DOWNLOADFAILED; if (!ProfileManager.IsSignedInLive( ProfileManager.GetPrimaryPad())) { errorMessage = diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp index 1c709a17b..712c1f3c1 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp @@ -143,7 +143,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack) { // Fix for #45154 - Frontend: DLC: Content can only be downloaded from the // frontend if you have not joined/exited multiplayer XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); - m_Timer.SetShow(FALSE); + m_Timer.SetShow(false); #endif m_controlTimer.setVisible(false); @@ -183,8 +183,8 @@ void UIScene_MainMenu::handleReload() { void UIScene_MainMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); if (m_bIgnorePress || (eNavigateWhenReady >= 0)) return; @@ -458,12 +458,12 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void* pParam, // We want to hide everything in this scene and display a timer // until we get a completion for the TMS files for (int i = 0; i < BUTTONS_MAX; i++) { - pClass->m_Buttons[i].SetShow(FALSE); + pClass->m_Buttons[i].SetShow(false); } pClass->updateTooltips(); - pClass->m_Timer.SetShow(TRUE); + pClass->m_Timer.SetShow(true); } #endif } else { @@ -538,7 +538,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, ProfileManager.GetPrimaryPad()); // check for DLC // start timer to track DLC check finished - pClass->m_Timer.SetShow(TRUE); + pClass->m_Timer.SetShow(true); XuiSetTimer(pClass->m_hObj, DLC_INSTALLED_TIMER_ID, DLC_INSTALLED_TIMER_TIME); @@ -556,12 +556,12 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void* pParam, bool bContinue, // display a timer until we get a completion for the // TMS files for (int i = 0; i < BUTTONS_MAX; i++) { - pClass->m_Buttons[i].SetShow(FALSE); + pClass->m_Buttons[i].SetShow(false); } updateTooltips(); - pClass->m_Timer.SetShow(TRUE); + pClass->m_Timer.SetShow(true); } #else Minecraft* pMinecraft = Minecraft::GetInstance(); @@ -803,7 +803,7 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { app.ApplyGameSettingsChanged(iPad); // check for DLC // start timer to track DLC check finished - m_Timer.SetShow(TRUE); + m_Timer.SetShow(true); XuiSetTimer(m_hObj, DLC_INSTALLED_TIMER_ID, DLC_INSTALLED_TIMER_TIME); // app.NavigateToScene(iPad,eUIScene_MultiGameJoinLoad); @@ -818,12 +818,12 @@ void UIScene_MainMenu::RunPlayGame(int iPad) { // We want to hide everything in this scene and display a // timer until we get a completion for the TMS files for (int i = 0; i < BUTTONS_MAX; i++) { - m_Buttons[i].SetShow(FALSE); + m_Buttons[i].SetShow(false); } updateTooltips(); - m_Timer.SetShow(TRUE); + m_Timer.SetShow(true); } #else pMinecraft->user->name = convStringToWstring( @@ -1067,12 +1067,12 @@ void UIScene_MainMenu::RunHelpAndOptions(int iPad) { // We want to hide everything in this scene and display a timer // until we get a completion for the TMS files for (int i = 0; i < BUTTONS_MAX; i++) { - m_Buttons[i].SetShow(FALSE); + m_Buttons[i].SetShow(false); } updateTooltips(); - m_Timer.SetShow(TRUE); + m_Timer.SetShow(true); } #endif } @@ -1122,8 +1122,8 @@ void UIScene_MainMenu::LoadTrial(void) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = ProfileManager.GetPrimaryPad(); loadingParams->completionData = completionData; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp index 4a4544317..beb6d3b68 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp @@ -96,8 +96,8 @@ void UIScene_MessageBox::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { case ACTION_MENU_CANCEL: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp index 519113e4e..4cf38478a 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp @@ -52,7 +52,7 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, if (/*g_NetworkManager.IsLocalGame() &&*/ g_NetworkManager .GetPlayerCount() == 1) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)TRUE); + eXuiServerAction_PauseServer, (void*)true); } TelemetryManager->RecordMenuShown(m_iPad, eUIScene_PauseMenu, 0); @@ -195,8 +195,8 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, } // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); ui.AnimateKeyPress(iPad, key, repeat, pressed, released); @@ -211,7 +211,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, .GetPlayerCount() == 1) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_PauseServer, - (void*)FALSE); + (void*)false); } ui.PlayUISFX(eSFX_Back); @@ -244,7 +244,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, StorageManager.SetSaveDevice( &UIScene_PauseMenu::DeviceSelectReturned, this, true); } - rfHandled = TRUE; + rfHandled = true; break; #endif @@ -264,7 +264,7 @@ void UIScene_PauseMenu::handleInput(int iPad, int key, bool repeat, if (bCanScreenshot) app.SetAction(pInputData->UserIndex, eAppAction_SocialPost); } - rfHandled = TRUE; + rfHandled = true; #endif } break; } @@ -283,7 +283,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) { .GetPlayerCount() == 1) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_PauseServer, - (void*)FALSE); + (void*)false); } navigateBack(); break; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp index 815477352..c7e132b03 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp @@ -58,8 +58,8 @@ void UIScene_QuadrantSignin::handleInput(int iPad, int key, bool repeat, app.DebugPrintf( "UIScene_QuadrantSignin handling input for pad %d, key %d, repeat- %s, " "pressed- %s, released- %s\n", - iPad, key, repeat ? "TRUE" : "FALSE", pressed ? "TRUE" : "FALSE", - released ? "TRUE" : "FALSE"); + iPad, key, repeat ? "true" : "false", pressed ? "true" : "false", + released ? "true" : "false"); if (!m_bIgnoreInput) { ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h index 2a1f33619..635077ba7 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h @@ -103,8 +103,8 @@ public: virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled); // 4jcraft: made public for thumbnail thunk - static int AvatarReturned(void* lpParam, PBYTE pbThumbnail, - DWORD dwThumbnailBytes); + static int AvatarReturned(void* lpParam, uint8_t* pbThumbnail, + uint32_t dwThumbnailBytes); private: static int SignInReturned(void* pParam, bool bContinue, int iPad); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp index b44c7ab0b..3ce99d9f2 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp @@ -57,8 +57,8 @@ void UIScene_ReinstallMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp index fa2c36d02..aff54a89c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp @@ -61,8 +61,8 @@ void UIScene_SettingsAudioMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp index 2f425a3af..9f0312aa8 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp @@ -77,8 +77,8 @@ void UIScene_SettingsMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp index c583b3732..cd521339b 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp @@ -178,8 +178,8 @@ void UIScene_SkinSelectMenu::handleInput(int iPad, int key, bool repeat, bool& handled) { if (m_bIgnoreInput) return; // app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // down- %s, pressed- %s, released- %s\n", iPad, key, down?"true":"false", + // pressed?"true":"false", released?"true":"false"); switch (key) { case ACTION_MENU_CANCEL: diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp index 0d17a2828..7145df5e2 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp @@ -206,8 +206,8 @@ void UIScene_TeleportMenu::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp index 10aca8307..163a31686 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp @@ -138,8 +138,8 @@ void UIScene_TradingMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool& handled) { // app.DebugPrintf("UIScene_InventoryMenu handling input for pad %d, key %d, - // down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); switch (key) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp index ebe4cdb55..90a4b3297 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp @@ -22,8 +22,8 @@ void UIScene_TrialExitUpsell::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- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", - // pressed?"TRUE":"FALSE", released?"TRUE":"FALSE"); + // 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); diff --git a/Minecraft.Client/Platform/Common/UI/UIStructs.h b/Minecraft.Client/Platform/Common/UI/UIStructs.h index e5c845f22..4cba8ce6c 100644 --- a/Minecraft.Client/Platform/Common/UI/UIStructs.h +++ b/Minecraft.Client/Platform/Common/UI/UIStructs.h @@ -268,7 +268,7 @@ typedef struct _LaunchMoreOptionsMenuInitData { int iPad; - DWORD dwTexturePack; + uint32_t dwTexturePack; std::wstring seed; int worldSize; @@ -387,11 +387,11 @@ typedef struct { // Message box typedef struct _MessageBoxInfo { - UINT uiTitle; - UINT uiText; - UINT* uiOptionA; - UINT uiOptionC; - DWORD dwPad; + uint32_t uiTitle; + uint32_t uiText; + uint32_t* uiOptionA; + uint32_t uiOptionC; + uint32_t dwPad; int (*Func)(void*, int, const C4JStorage::EMessageResult); void* lpParam; // C4JStringTable *pStringTable; // 4J Stu - We don't need this for our diff --git a/Minecraft.Client/Platform/Common/UI/UITTFFont.h b/Minecraft.Client/Platform/Common/UI/UITTFFont.h index 9b37f9a38..72c3665b5 100644 --- a/Minecraft.Client/Platform/Common/UI/UITTFFont.h +++ b/Minecraft.Client/Platform/Common/UI/UITTFFont.h @@ -5,7 +5,7 @@ private: std::uint8_t* pbData; const std::string m_strFontName; - // DWORD dwDataSize; + // uint32_t dwDataSize; public: UITTFFont(const std::string& name, const std::string& path, diff --git a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp index ac983fd11..d0216db44 100644 --- a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp +++ b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp @@ -47,7 +47,7 @@ XMLParser::~XMLParser() //------------------------------------------------------------------------------------- void XMLParser::FillBuffer() { - DWORD NChars; + uint32_t NChars; m_pReadPtr = m_pReadBuf; @@ -72,7 +72,7 @@ void XMLParser::FillBuffer() m_dwCharsConsumed += NChars; int64_t iProgress = m_dwCharsTotal ? (( (int64_t)m_dwCharsConsumed * 1000 ) / (int64_t)m_dwCharsTotal) : 0; - m_pISAXCallback->SetParseProgress( (DWORD)iProgress ); + m_pISAXCallback->SetParseProgress( (uint32_t)iProgress ); m_pReadBuf[ NChars ] = '\0'; m_pReadBuf[ NChars + 1] = '\0'; @@ -85,7 +85,7 @@ void XMLParser::FillBuffer() //------------------------------------------------------------------------------------- void XMLParser::SkipNextAdvance() { - m_bSkipNextAdvance = TRUE; + m_bSkipNextAdvance = true; } @@ -93,9 +93,9 @@ void XMLParser::SkipNextAdvance() // Name: XMLParser::ConsumeSpace // Desc: Skips spaces in the current stream //------------------------------------------------------------------------------------- -HRESULT XMLParser::ConsumeSpace() +int32_t XMLParser::ConsumeSpace() { - HRESULT hr; + int32_t hr; // Skip spaces if( FAILED( hr = AdvanceCharacter() ) ) @@ -116,9 +116,9 @@ HRESULT XMLParser::ConsumeSpace() // Name: XMLParser::ConvertEscape // Desc: Copies and converts an escape sequence into m_pWriteBuf //------------------------------------------------------------------------------------- -HRESULT XMLParser::ConvertEscape() +int32_t XMLParser::ConvertEscape() { - HRESULT hr; + int32_t hr; wchar_t wVal = 0; if( FAILED( hr = AdvanceCharacter() ) ) @@ -194,13 +194,13 @@ HRESULT XMLParser::ConvertEscape() // must be an entity reference wchar_t *pEntityRefVal = m_pWritePtr; - UINT EntityRefLen; + uint32_t EntityRefLen; SkipNextAdvance(); if( FAILED( hr = AdvanceName() ) ) return hr; - EntityRefLen = (UINT)( m_pWritePtr - pEntityRefVal ); + EntityRefLen = (uint32_t)( m_pWritePtr - pEntityRefVal ); m_pWritePtr = pEntityRefVal; if ( EntityRefLen == 0 ) @@ -243,9 +243,9 @@ HRESULT XMLParser::ConvertEscape() // Name: XMLParser::AdvanceAttrVal // Desc: Copies an attribute value into m_pWrite buf, skipping surrounding quotes //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceAttrVal() +int32_t XMLParser::AdvanceAttrVal() { - HRESULT hr; + int32_t hr; wchar_t wQuoteChar; if( FAILED( hr = AdvanceCharacter() ) ) @@ -294,12 +294,12 @@ HRESULT XMLParser::AdvanceAttrVal() //------------------------------------------------------------------------------------- // Name: XMLParser::AdvanceName -// Desc: Copies a name into the m_pWriteBuf - returns TRUE on success, FALSE on failure +// Desc: Copies a name into the m_pWriteBuf - returns true on success, false on failure // Ignores leading whitespace. Currently does not support unicode names //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceName() +int32_t XMLParser::AdvanceName() { - HRESULT hr; + int32_t hr; if( FAILED( hr = AdvanceCharacter() ) ) return hr; @@ -344,11 +344,11 @@ HRESULT XMLParser::AdvanceName() // and getting another chunk of the file if needed // Returns S_OK if there are more characters, E_ABORT for no characters to read //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceCharacter( bool bOkToFail ) +int32_t XMLParser::AdvanceCharacter( bool bOkToFail ) { if( m_bSkipNextAdvance ) { - m_bSkipNextAdvance = FALSE; + m_bSkipNextAdvance = false; return S_OK; } @@ -376,12 +376,12 @@ HRESULT XMLParser::AdvanceCharacter( bool bOkToFail ) } } - if( m_bUnicode == FALSE ) + if( m_bUnicode == false ) { - m_Ch = *((CHAR *)m_pReadPtr); + m_Ch = *((char *)m_pReadPtr); m_pReadPtr++; } - else // if( m_bUnicode == TRUE ) + else // if( m_bUnicode == true ) { m_Ch = *((wchar_t *)m_pReadPtr); @@ -409,9 +409,9 @@ HRESULT XMLParser::AdvanceCharacter( bool bOkToFail ) // Name: XMLParser::AdvanceElement // Desc: Builds data, calls callback //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceElement() +int32_t XMLParser::AdvanceElement() { - HRESULT hr; + int32_t hr; // write ptr at the beginning of the buffer m_pWritePtr = m_pWriteBuf; @@ -500,7 +500,7 @@ HRESULT XMLParser::AdvanceElement() return hr; if( FAILED( m_pISAXCallback->ElementEnd( pEntityRefVal, - (UINT) ( m_pWritePtr - pEntityRefVal ) ) ) ) + (uint32_t) ( m_pWritePtr - pEntityRefVal ) ) ) ) return E_ABORT; if( FAILED( hr = ConsumeSpace() ) ) @@ -530,10 +530,10 @@ HRESULT XMLParser::AdvanceElement() else { XMLAttribute Attributes[ XML_MAX_ATTRIBUTES_PER_ELEMENT ]; - UINT NumAttrs; + uint32_t NumAttrs; wchar_t *pEntityRefVal = m_pWritePtr; - UINT EntityRefLen; + uint32_t EntityRefLen; NumAttrs = 0; @@ -543,7 +543,7 @@ HRESULT XMLParser::AdvanceElement() if( FAILED( hr = AdvanceName() ) ) return hr; - EntityRefLen = (UINT)( m_pWritePtr - pEntityRefVal ); + EntityRefLen = (uint32_t)( m_pWritePtr - pEntityRefVal ); if( FAILED( hr = ConsumeSpace() ) ) return hr; @@ -568,7 +568,7 @@ HRESULT XMLParser::AdvanceElement() if( FAILED( hr = AdvanceName() ) ) return hr; - Attributes[ NumAttrs ].NameLen = (UINT)( m_pWritePtr - Attributes[ NumAttrs ].strName ); + Attributes[ NumAttrs ].NameLen = (uint32_t)( m_pWritePtr - Attributes[ NumAttrs ].strName ); if( FAILED( hr = ConsumeSpace() ) ) return hr; @@ -590,7 +590,7 @@ HRESULT XMLParser::AdvanceElement() if( FAILED( hr = AdvanceAttrVal() ) ) return hr; - Attributes[ NumAttrs ].ValueLen = (UINT)( m_pWritePtr - + Attributes[ NumAttrs ].ValueLen = (uint32_t)( m_pWritePtr - Attributes[ NumAttrs ].strValue ); ++NumAttrs; @@ -635,10 +635,10 @@ HRESULT XMLParser::AdvanceElement() // Name: XMLParser::AdvanceCDATA // Desc: Read a CDATA section //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceCDATA() +int32_t XMLParser::AdvanceCDATA() { - HRESULT hr; - WORD wStage = 0; + int32_t hr; + uint16_t wStage = 0; if( FAILED( m_pISAXCallback->CDATABegin() ) ) return E_ABORT; @@ -665,13 +665,13 @@ HRESULT XMLParser::AdvanceCDATA() if( m_pWritePtr - m_pWriteBuf >= XML_WRITE_BUFFER_SIZE ) { - if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), TRUE ) ) ) + if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (uint32_t)( m_pWritePtr - m_pWriteBuf ), true ) ) ) return E_ABORT; m_pWritePtr = m_pWriteBuf; } } - if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) ) + if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (uint32_t)( m_pWritePtr - m_pWriteBuf ), false ) ) ) return E_ABORT; m_pWritePtr = m_pWriteBuf; @@ -686,10 +686,10 @@ HRESULT XMLParser::AdvanceCDATA() // Name: XMLParser::AdvanceComment // Desk: Skips over a comment //------------------------------------------------------------------------------------- -HRESULT XMLParser::AdvanceComment() +int32_t XMLParser::AdvanceComment() { - HRESULT hr; - WORD wStage; + int32_t hr; + uint16_t wStage; wStage = 0; for( ;; ) @@ -735,10 +735,10 @@ ISAXCallback* XMLParser::GetSAXCallbackInterface() // Name: XMLParser::MainParseLoop // Desc: Main Loop to Parse Data - source agnostic //------------------------------------------------------------------------------------- -HRESULT XMLParser::MainParseLoop() +int32_t XMLParser::MainParseLoop() { - bool bWhiteSpaceOnly = TRUE; - HRESULT hr = S_OK; + bool bWhiteSpaceOnly = true; + int32_t hr = S_OK; if( FAILED( m_pISAXCallback->StartDocument() ) ) return E_ABORT; @@ -749,30 +749,30 @@ HRESULT XMLParser::MainParseLoop() if ( *((wchar_t *) m_pReadBuf ) == 0xFEFF ) { - m_bUnicode = TRUE; - m_bReverseBytes = FALSE; + m_bUnicode = true; + m_bReverseBytes = false; m_pReadPtr += 2; } else if ( *((wchar_t *) m_pReadBuf ) == 0xFFFE ) { - m_bUnicode = TRUE; - m_bReverseBytes = TRUE; + m_bUnicode = true; + m_bReverseBytes = true; m_pReadPtr += 2; } else if ( *((wchar_t *) m_pReadBuf ) == 0x003C ) { - m_bUnicode = TRUE; - m_bReverseBytes = FALSE; + m_bUnicode = true; + m_bReverseBytes = false; } else if ( *((wchar_t *) m_pReadBuf ) == 0x3C00 ) { - m_bUnicode = TRUE; - m_bReverseBytes = TRUE; + m_bUnicode = true; + m_bReverseBytes = true; } else if ( m_pReadBuf[ 0 ] == 0x3C ) { - m_bUnicode = FALSE; - m_bReverseBytes = FALSE; + m_bUnicode = false; + m_bReverseBytes = false; } else { @@ -782,14 +782,14 @@ HRESULT XMLParser::MainParseLoop() for( ;; ) { - if( FAILED( AdvanceCharacter( TRUE ) ) ) + if( FAILED( AdvanceCharacter( true ) ) ) { - if ( ( (UINT) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) ) + if ( ( (uint32_t) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) ) { - if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) ) + if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (uint32_t)( m_pWritePtr - m_pWriteBuf ), false ) ) ) return E_ABORT; - bWhiteSpaceOnly = TRUE; + bWhiteSpaceOnly = true; } if( FAILED( m_pISAXCallback->EndDocument() ) ) @@ -800,12 +800,12 @@ HRESULT XMLParser::MainParseLoop() if( m_Ch == '<' ) { - if( ( (UINT) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) ) + if( ( (uint32_t) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) ) { - if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) ) + if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (uint32_t)( m_pWritePtr - m_pWriteBuf ), false ) ) ) return E_ABORT; - bWhiteSpaceOnly = TRUE; + bWhiteSpaceOnly = true; } SkipNextAdvance(); @@ -829,7 +829,7 @@ HRESULT XMLParser::MainParseLoop() if( bWhiteSpaceOnly && ( m_Ch != ' ' ) && ( m_Ch != '\n' ) && ( m_Ch != '\r' ) && ( m_Ch != '\t' ) ) { - bWhiteSpaceOnly = FALSE; + bWhiteSpaceOnly = false; } *m_pWritePtr = m_Ch; @@ -840,15 +840,15 @@ HRESULT XMLParser::MainParseLoop() if( !bWhiteSpaceOnly ) { if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, - ( UINT ) ( m_pWritePtr - m_pWriteBuf ), - TRUE ) ) ) + ( uint32_t ) ( m_pWritePtr - m_pWriteBuf ), + true ) ) ) { return E_ABORT; } } m_pWritePtr = m_pWriteBuf; - bWhiteSpaceOnly = TRUE; + bWhiteSpaceOnly = true; } } } @@ -859,9 +859,9 @@ HRESULT XMLParser::MainParseLoop() // Name: XMLParser::ParseXMLFile // Desc: Builds element data //------------------------------------------------------------------------------------- -HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename ) +int32_t XMLParser::ParseXMLFile( const char *strFilename ) { - HRESULT hr; + int32_t hr; if( m_pISAXCallback == nullptr ) return E_NOINTERFACE; @@ -870,7 +870,7 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename ) m_pISAXCallback->m_LinePos = 0; m_pISAXCallback->m_strFilename = strFilename; // save this off only while we parse the file - m_bSkipNextAdvance = FALSE; + m_bSkipNextAdvance = false; m_pReadPtr = m_pReadBuf; m_pReadBuf[ 0 ] = '\0'; @@ -890,7 +890,7 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename ) { LARGE_INTEGER iFileSize; GetFileSizeEx( m_hFile, &iFileSize ); - m_dwCharsTotal = (DWORD)iFileSize.QuadPart; + m_dwCharsTotal = (uint32_t)iFileSize.QuadPart; m_dwCharsConsumed = 0; hr = MainParseLoop(); } @@ -910,9 +910,9 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename ) // Name: XMLParser::ParseXMLFile // Desc: Builds element data //------------------------------------------------------------------------------------- -HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize ) +int32_t XMLParser::ParseXMLBuffer( const char *strBuffer, uint32_t uBufferSize ) { - HRESULT hr; + int32_t hr; if( m_pISAXCallback == nullptr ) return E_NOINTERFACE; @@ -921,7 +921,7 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize ) m_pISAXCallback->m_LinePos = 0; m_pISAXCallback->m_strFilename = ""; // save this off only while we parse the file - m_bSkipNextAdvance = FALSE; + m_bSkipNextAdvance = false; m_pReadPtr = m_pReadBuf; m_pReadBuf[ 0 ] = '\0'; @@ -946,13 +946,13 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize ) // Logs an error through the callback interface //------------------------------------------------------------------------------------- #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation -void XMLParser::Error( HRESULT hErr, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ) +void XMLParser::Error( int32_t hErr, _In_z_ _Printf_format_string_ const char* strFormat, ... ) #else -void XMLParser::Error( HRESULT hErr, CONST CHAR* strFormat, ... ) +void XMLParser::Error( int32_t hErr, const char* strFormat, ... ) #endif { - CONST INT MAX_OUTPUT_STR = 160; - CHAR strBuffer[ MAX_OUTPUT_STR ]; + const int32_t MAX_OUTPUT_STR = 160; + char strBuffer[ MAX_OUTPUT_STR ]; va_list pArglist; va_start( pArglist, strFormat ); diff --git a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h index 0e2d92587..5f7178ecd 100644 --- a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h +++ b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h @@ -28,10 +28,10 @@ namespace ATG #define E_INVALID_XML_SYNTAX MAKE_HRESULT(1, _ATGFAC, 0x0002 ) -CONST UINT XML_MAX_ATTRIBUTES_PER_ELEMENT = 32; -CONST UINT XML_MAX_NAME_LENGTH = 128; -CONST UINT XML_READ_BUFFER_SIZE = 2048; -CONST UINT XML_WRITE_BUFFER_SIZE = 2048; +const uint32_t XML_MAX_ATTRIBUTES_PER_ELEMENT = 32; +const uint32_t XML_MAX_NAME_LENGTH = 128; +const uint32_t XML_READ_BUFFER_SIZE = 2048; +const uint32_t XML_WRITE_BUFFER_SIZE = 2048; // No tag can be longer than XML_WRITE_BUFFER_SIZE - an error will be returned if // it is @@ -40,9 +40,9 @@ CONST UINT XML_WRITE_BUFFER_SIZE = 2048; struct XMLAttribute { wchar_t* strName; - UINT NameLen; + uint32_t NameLen; wchar_t* strValue; - UINT ValueLen; + uint32_t ValueLen; }; //------------------------------------------------------------------------------------- @@ -53,30 +53,30 @@ public: ISAXCallback() {}; virtual ~ISAXCallback() {}; - virtual HRESULT StartDocument() = 0; - virtual HRESULT EndDocument() = 0; + virtual int32_t StartDocument() = 0; + virtual int32_t EndDocument() = 0; - virtual HRESULT ElementBegin( CONST wchar_t* strName, UINT NameLen, - CONST XMLAttribute *pAttributes, UINT NumAttributes ) = 0; - virtual HRESULT ElementContent( CONST wchar_t *strData, UINT DataLen, bool More ) = 0; - virtual HRESULT ElementEnd( CONST wchar_t *strName, UINT NameLen ) = 0; + virtual int32_t ElementBegin( const wchar_t* strName, uint32_t NameLen, + const XMLAttribute *pAttributes, uint32_t NumAttributes ) = 0; + virtual int32_t ElementContent( const wchar_t *strData, uint32_t DataLen, bool More ) = 0; + virtual int32_t ElementEnd( const wchar_t *strName, uint32_t NameLen ) = 0; - virtual HRESULT CDATABegin( ) = 0; - virtual HRESULT CDATAData( CONST wchar_t *strCDATA, UINT CDATALen, bool bMore ) = 0; - virtual HRESULT CDATAEnd( ) = 0; + virtual int32_t CDATABegin( ) = 0; + virtual int32_t CDATAData( const wchar_t *strCDATA, uint32_t CDATALen, bool bMore ) = 0; + virtual int32_t CDATAEnd( ) = 0; - virtual void Error( HRESULT hError, CONST CHAR *strMessage ) = 0; + virtual void Error( int32_t hError, const char *strMessage ) = 0; - virtual void SetParseProgress( DWORD dwProgress ) { } + virtual void SetParseProgress( uint32_t dwProgress ) { } - const CHAR* GetFilename() { return m_strFilename; } - UINT GetLineNumber() { return m_LineNum; } - UINT GetLinePosition() { return m_LinePos; } + const char* GetFilename() { return m_strFilename; } + uint32_t GetLineNumber() { return m_LineNum; } + uint32_t GetLinePosition() { return m_LinePos; } private: - CONST CHAR *m_strFilename; - UINT m_LineNum; - UINT m_LinePos; + const char *m_strFilename; + uint32_t m_LineNum; + uint32_t m_LinePos; }; @@ -100,52 +100,52 @@ public: // E_ABORT - callback returned a fail code // S_OK - file parsed and completed - HRESULT ParseXMLFile( CONST CHAR *strFilename ); + int32_t ParseXMLFile( const char *strFilename ); // Parses from a buffer- if you pass a wchar_t buffer (and cast it), it will // correctly detect it and use unicode instead. Return codes are the // same as for ParseXMLFile - HRESULT ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ); + int32_t ParseXMLBuffer( const char* strBuffer, uint32_t uBufferSize ); private: - HRESULT MainParseLoop(); + int32_t MainParseLoop(); - HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); + int32_t AdvanceCharacter( bool bOkToFail = false ); void SkipNextAdvance(); - HRESULT ConsumeSpace(); - HRESULT ConvertEscape(); - HRESULT AdvanceElement(); - HRESULT AdvanceName(); - HRESULT AdvanceAttrVal(); - HRESULT AdvanceCDATA(); - HRESULT AdvanceComment(); + int32_t ConsumeSpace(); + int32_t ConvertEscape(); + int32_t AdvanceElement(); + int32_t AdvanceName(); + int32_t AdvanceAttrVal(); + int32_t AdvanceCDATA(); + int32_t AdvanceComment(); void FillBuffer(); #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation - void Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); + void Error( int32_t hRet, _In_z_ _Printf_format_string_ const char* strFormat, ... ); #else - void Error( HRESULT hRet, CONST CHAR* strFormat, ... ); + void Error( int32_t hRet, const char* strFormat, ... ); #endif ISAXCallback* m_pISAXCallback; - HANDLE m_hFile; - CONST CHAR* m_pInXMLBuffer; - UINT m_uInXMLBufferCharsLeft; - DWORD m_dwCharsTotal; - DWORD m_dwCharsConsumed; + void* m_hFile; + const char* m_pInXMLBuffer; + uint32_t m_uInXMLBufferCharsLeft; + uint32_t m_dwCharsTotal; + uint32_t m_dwCharsConsumed; - BYTE m_pReadBuf[ XML_READ_BUFFER_SIZE + 2 ]; // room for a trailing NULL + uint8_t m_pReadBuf[ XML_READ_BUFFER_SIZE + 2 ]; // room for a trailing NULL wchar_t m_pWriteBuf[ XML_WRITE_BUFFER_SIZE ]; - BYTE* m_pReadPtr; + uint8_t* m_pReadPtr; wchar_t* 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_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 diff --git a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h index aff4815bb..7784d676f 100644 --- a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h +++ b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h @@ -9,10 +9,10 @@ using namespace ATG; class xmlMojangCallback : public ATG::ISAXCallback { public: - virtual HRESULT StartDocument() { return S_OK; }; - virtual HRESULT EndDocument() { return S_OK; }; + virtual int32_t StartDocument() { return S_OK; }; + virtual int32_t EndDocument() { return S_OK; }; - virtual HRESULT ElementBegin( CONST wchar_t* strName, UINT NameLen, CONST XMLAttribute *pAttributes, UINT NumAttributes ) + virtual int32_t ElementBegin( const wchar_t* strName, uint32_t NameLen, const XMLAttribute *pAttributes, uint32_t NumAttributes ) { wchar_t wTemp[35] = L""; wchar_t wAttName[32] = L""; @@ -33,7 +33,7 @@ public: } else if ( _wcsicmp(wAttName,L"data") == 0) { - for(UINT i = 0; i < NumAttributes; i++) + for(uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s( wAttName, pAttributes[i].strName, pAttributes[i].NameLen); if (_wcsicmp(wAttName,L"name")==0) @@ -80,27 +80,27 @@ public: } }; - virtual HRESULT ElementContent( CONST wchar_t *strData, UINT DataLen, bool More ) { return S_OK; }; + virtual int32_t ElementContent( const wchar_t *strData, uint32_t DataLen, bool More ) { return S_OK; }; - virtual HRESULT ElementEnd( CONST wchar_t *strName, UINT NameLen ){ return S_OK; }; + virtual int32_t ElementEnd( const wchar_t *strName, uint32_t NameLen ){ return S_OK; }; - virtual HRESULT CDATABegin( ) { return S_OK; }; + virtual int32_t CDATABegin( ) { return S_OK; }; - virtual HRESULT CDATAData( CONST wchar_t *strCDATA, UINT CDATALen, bool bMore ){ return S_OK; }; + virtual int32_t CDATAData( const wchar_t *strCDATA, uint32_t CDATALen, bool bMore ){ return S_OK; }; - virtual HRESULT CDATAEnd( ){ return S_OK; }; + virtual int32_t CDATAEnd( ){ return S_OK; }; - virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; + virtual void Error( int32_t hError, const char *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; }; class xmlConfigCallback : public ATG::ISAXCallback { public: - virtual HRESULT StartDocument() { return S_OK; }; - virtual HRESULT EndDocument() { return S_OK; }; + virtual int32_t StartDocument() { return S_OK; }; + virtual int32_t EndDocument() { return S_OK; }; - virtual HRESULT ElementBegin( CONST wchar_t* strName, UINT NameLen, CONST XMLAttribute *pAttributes, UINT NumAttributes ) + virtual int32_t ElementBegin( const wchar_t* strName, uint32_t NameLen, const XMLAttribute *pAttributes, uint32_t NumAttributes ) { wchar_t wTemp[35] = L""; wchar_t wType[32] = L""; @@ -119,7 +119,7 @@ public: } else if ( _wcsicmp(wAttName,L"data") == 0) { - for(UINT i = 0; i < NumAttributes; i++) + for(uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s( wAttName, pAttributes[i].strName, pAttributes[i].NameLen); if (_wcsicmp(wAttName,L"Type")==0) @@ -161,27 +161,27 @@ public: } - virtual HRESULT ElementContent( CONST wchar_t *strData, UINT DataLen, bool More ) { return S_OK; }; + virtual int32_t ElementContent( const wchar_t *strData, uint32_t DataLen, bool More ) { return S_OK; }; - virtual HRESULT ElementEnd( CONST wchar_t *strName, UINT NameLen ){ return S_OK; }; + virtual int32_t ElementEnd( const wchar_t *strName, uint32_t NameLen ){ return S_OK; }; - virtual HRESULT CDATABegin( ) { return S_OK; }; + virtual int32_t CDATABegin( ) { return S_OK; }; - virtual HRESULT CDATAData( CONST wchar_t *strCDATA, UINT CDATALen, bool bMore ){ return S_OK; }; + virtual int32_t CDATAData( const wchar_t *strCDATA, uint32_t CDATALen, bool bMore ){ return S_OK; }; - virtual HRESULT CDATAEnd( ){ return S_OK; }; + virtual int32_t CDATAEnd( ){ return S_OK; }; - virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; + virtual void Error( int32_t hError, const char *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; }; class xmlDLCInfoCallback : public ATG::ISAXCallback { public: - virtual HRESULT StartDocument() { return S_OK; }; - virtual HRESULT EndDocument() { return S_OK; }; + virtual int32_t StartDocument() { return S_OK; }; + virtual int32_t EndDocument() { return S_OK; }; - virtual HRESULT ElementBegin( CONST wchar_t* strName, UINT NameLen, CONST XMLAttribute *pAttributes, UINT NumAttributes ) + virtual int32_t ElementBegin( const wchar_t* strName, uint32_t NameLen, const XMLAttribute *pAttributes, uint32_t NumAttributes ) { wchar_t wTemp[35] = L""; wchar_t wAttName[32] = L""; @@ -207,7 +207,7 @@ public: } else if ( _wcsicmp(wAttName,L"data") == 0) { - for(UINT i = 0; i < NumAttributes; i++) + for(uint32_t i = 0; i < NumAttributes; i++) { wcsncpy_s( wAttName, pAttributes[i].strName, pAttributes[i].NameLen); if (_wcsicmp(wAttName,L"SortIndex")==0) @@ -313,17 +313,17 @@ public: } }; - virtual HRESULT ElementContent( CONST wchar_t *strData, UINT DataLen, bool More ) { return S_OK; }; + virtual int32_t ElementContent( const wchar_t *strData, uint32_t DataLen, bool More ) { return S_OK; }; - virtual HRESULT ElementEnd( CONST wchar_t *strName, UINT NameLen ){ return S_OK; }; + virtual int32_t ElementEnd( const wchar_t *strName, uint32_t NameLen ){ return S_OK; }; - virtual HRESULT CDATABegin( ) { return S_OK; }; + virtual int32_t CDATABegin( ) { return S_OK; }; - virtual HRESULT CDATAData( CONST wchar_t *strCDATA, UINT CDATALen, bool bMore ){ return S_OK; }; + virtual int32_t CDATAData( const wchar_t *strCDATA, uint32_t CDATALen, bool bMore ){ return S_OK; }; - virtual HRESULT CDATAEnd( ){ return S_OK; }; + virtual int32_t CDATAEnd( ){ return S_OK; }; - virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing DLC.XML\n"); }; + virtual void Error( int32_t hError, const char *strMessage ) { app.DebugPrintf("Error when Parsing DLC.XML\n"); }; }; diff --git a/Minecraft.Client/Platform/Extrax64Stubs.cpp b/Minecraft.Client/Platform/Extrax64Stubs.cpp index 0a1f89c9f..9401c9969 100644 --- a/Minecraft.Client/Platform/Extrax64Stubs.cpp +++ b/Minecraft.Client/Platform/Extrax64Stubs.cpp @@ -29,7 +29,7 @@ CXuiStringTable StringTable; #if !defined(__linux__) ATG::XMLParser::XMLParser() {} ATG::XMLParser::~XMLParser() {} -HRESULT ATG::XMLParser::ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ) { return S_OK; } +int32_t ATG::XMLParser::ParseXMLBuffer( const char* strBuffer, uint32_t uBufferSize ) { return S_OK; } void ATG::XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) {} #endif @@ -38,19 +38,19 @@ bool CSocialManager::IsTitleAllowedToPostAnything() { return false; } bool CSocialManager::AreAllUsersAllowedToPostImages() { return false; } bool CSocialManager::IsTitleAllowedToPostImages() { return false; } -bool CSocialManager::PostLinkToSocialNetwork( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ) { return false; } -bool CSocialManager::PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ) { return false; } +bool CSocialManager::PostLinkToSocialNetwork( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect ) { return false; } +bool CSocialManager::PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect ) { return false; } CSocialManager *CSocialManager::Instance() { return nullptr; } void CSocialManager::SetSocialPostText(const wchar_t* Title, const wchar_t* Caption, const wchar_t* Desc) {}; #endif -DWORD XShowPartyUI(DWORD dwUserIndex) { return 0; } -DWORD XShowFriendsUI(DWORD dwUserIndex) { return 0; } -HRESULT XPartyGetUserList(XPARTY_USER_LIST *pUserList) { return S_OK; } -DWORD XContentGetThumbnail(DWORD dwUserIndex, const XCONTENT_DATA *pContentData, PBYTE pbThumbnail, PDWORD pcbThumbnail, PXOVERLAPPED *pOverlapped) { return 0; } +uint32_t XShowPartyUI(uint32_t dwUserIndex) { return 0; } +uint32_t XShowFriendsUI(uint32_t dwUserIndex) { return 0; } +int32_t XPartyGetUserList(XPARTY_USER_LIST *pUserList) { return S_OK; } +uint32_t XContentGetThumbnail(uint32_t dwUserIndex, const XCONTENT_DATA *pContentData, uint8_t* pbThumbnail, uint32_t* pcbThumbnail, PXOVERLAPPED *pOverlapped) { return 0; } void XShowAchievementsUI(int i) {} -DWORD XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) { return 0; } +uint32_t XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) { return 0; } void PIXAddNamedCounter(int a, const char *b, ...) {} //#define PS3_USE_PIX_EVENTS @@ -109,23 +109,23 @@ bool IsEqualXUID(PlayerUID a, PlayerUID b) void XMemCpy(void *a, const void *b, size_t s) { memcpy(a, b, s); } void XMemSet(void *a, int t, size_t s) { memset(a, t, s); } void XMemSet128(void *a, int t, size_t s) { memset(a, t, s); } -void *XPhysicalAlloc(size_t a, ULONG_PTR b, ULONG_PTR c, DWORD d) { return malloc(a); } +void *XPhysicalAlloc(size_t a, uintptr_t b, uintptr_t c, uint32_t d) { return malloc(a); } void XPhysicalFree(void *a) { free(a); } D3DXVECTOR3::D3DXVECTOR3() {} D3DXVECTOR3::D3DXVECTOR3(float x,float y,float z) : x(x), y(y), z(z) {} -D3DXVECTOR3& D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& add ) { x += add.x; y += add.y; z += add.z; return *this; } +D3DXVECTOR3& D3DXVECTOR3::operator += ( const D3DXVECTOR3& add ) { x += add.x; y += add.y; z += add.z; return *this; } -BYTE IQNetPlayer::GetSmallId() { return 0; } -void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags) +uint8_t IQNetPlayer::GetSmallId() { return 0; } +void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, uint32_t dwDataSize, uint32_t dwFlags) { #if !defined(__linux__) app.DebugPrintf("Sending from 0x%x to 0x%x %d bytes\n",this,player,dwDataSize); #endif } bool IQNetPlayer::IsSameSystem(IQNetPlayer *player) { return true; } -DWORD IQNetPlayer::GetSendQueueSize( IQNetPlayer *player, DWORD dwFlags ) { return 0; } -DWORD IQNetPlayer::GetCurrentRtt() { return 0; } +uint32_t IQNetPlayer::GetSendQueueSize( IQNetPlayer *player, uint32_t dwFlags ) { return 0; } +uint32_t IQNetPlayer::GetCurrentRtt() { return 0; } bool IQNetPlayer::IsHost() { return this == &IQNet::m_player[0]; } bool IQNetPlayer::IsGuest() { return false; } bool IQNetPlayer::IsLocal() { return true; } @@ -133,14 +133,14 @@ PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; } const wchar_t* IQNetPlayer::GetGamertag() { static const wchar_t *test = L"stub"; return test; } int IQNetPlayer::GetSessionIndex() { return 0; } bool IQNetPlayer::IsTalking() { return false; } -bool IQNetPlayer::IsMutedByLocalUser(DWORD dwUserIndex) { return false; } +bool IQNetPlayer::IsMutedByLocalUser(uint32_t dwUserIndex) { return false; } bool IQNetPlayer::HasVoice() { return false; } bool IQNetPlayer::HasCamera() { return false; } int IQNetPlayer::GetUserIndex() { return this - &IQNet::m_player[0]; } -void IQNetPlayer::SetCustomDataValue(ULONG_PTR ulpCustomDataValue) { +void IQNetPlayer::SetCustomDataValue(uintptr_t ulpCustomDataValue) { m_customData = ulpCustomDataValue; } -ULONG_PTR IQNetPlayer::GetCustomDataValue() { +uintptr_t IQNetPlayer::GetCustomDataValue() { return m_customData; } @@ -148,29 +148,29 @@ IQNetPlayer IQNet::m_player[4]; bool _bQNetStubGameRunning = false; -HRESULT IQNet::AddLocalPlayerByUserIndex(DWORD dwUserIndex){ return S_OK; } +int32_t IQNet::AddLocalPlayerByUserIndex(uint32_t dwUserIndex){ return S_OK; } IQNetPlayer *IQNet::GetHostPlayer() { return &m_player[0]; } -IQNetPlayer *IQNet::GetLocalPlayerByUserIndex(DWORD dwUserIndex) { return &m_player[dwUserIndex]; } -IQNetPlayer *IQNet::GetPlayerByIndex(DWORD dwPlayerIndex) { return &m_player[0]; } -IQNetPlayer *IQNet::GetPlayerBySmallId(BYTE SmallId){ return &m_player[0]; } +IQNetPlayer *IQNet::GetLocalPlayerByUserIndex(uint32_t dwUserIndex) { return &m_player[dwUserIndex]; } +IQNetPlayer *IQNet::GetPlayerByIndex(uint32_t dwPlayerIndex) { return &m_player[0]; } +IQNetPlayer *IQNet::GetPlayerBySmallId(uint8_t SmallId){ return &m_player[0]; } IQNetPlayer *IQNet::GetPlayerByXuid(PlayerUID xuid){ return &m_player[0]; } -DWORD IQNet::GetPlayerCount() { return 1; } +uint32_t IQNet::GetPlayerCount() { return 1; } QNET_STATE IQNet::GetState() { return _bQNetStubGameRunning ? QNET_STATE_GAME_PLAY : QNET_STATE_IDLE; } bool IQNet::IsHost() { return true; } -HRESULT IQNet::JoinGameFromInviteInfo(DWORD dwUserIndex, DWORD dwUserMask, const INVITE_INFO *pInviteInfo) { return S_OK; } +int32_t IQNet::JoinGameFromInviteInfo(uint32_t dwUserIndex, uint32_t dwUserMask, const INVITE_INFO *pInviteInfo) { return S_OK; } void IQNet::HostGame() { _bQNetStubGameRunning = true; } void IQNet::EndGame() { _bQNetStubGameRunning = false; } -DWORD MinecraftDynamicConfigurations::GetTrialTime() { return DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; } +uint32_t MinecraftDynamicConfigurations::GetTrialTime() { return DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; } -void XSetThreadProcessor(HANDLE a, int b) {} +void XSetThreadProcessor(void* a, int b) {} // #if !(0) && !(0) -// bool XCloseHandle(HANDLE a) { return CloseHandle(a); } +// bool XCloseHandle(void* a) { return CloseHandle(a); } // #endif // 0 -DWORD XUserGetSigninInfo( - DWORD dwUserIndex, - DWORD dwFlags, +uint32_t XUserGetSigninInfo( + uint32_t dwUserIndex, + uint32_t dwFlags, PXUSER_SIGNIN_INFO pSigninInfo ) { @@ -178,13 +178,13 @@ DWORD XUserGetSigninInfo( } const wchar_t* CXuiStringTable::Lookup(const wchar_t* szId) { return szId; } -const wchar_t* CXuiStringTable::Lookup(UINT nIndex) { return L"String"; } +const wchar_t* CXuiStringTable::Lookup(uint32_t nIndex) { return L"String"; } void CXuiStringTable::Clear() {} -HRESULT CXuiStringTable::Load(const wchar_t* szId) { return S_OK; } +int32_t CXuiStringTable::Load(const wchar_t* szId) { return S_OK; } -DWORD XUserAreUsersFriends( DWORD dwUserIndex, PPlayerUID pXuids, DWORD dwXuidCount, bool* pfResult, void *pOverlapped) { return 0; } +uint32_t XUserAreUsersFriends( uint32_t dwUserIndex, PPlayerUID pXuids, uint32_t dwXuidCount, bool* pfResult, void *pOverlapped) { return 0; } -HRESULT XMemDecompress( +int32_t XMemDecompress( XMEMDECOMPRESSION_CONTEXT Context, void *pDestination, size_t *pDestSize, @@ -215,7 +215,7 @@ HRESULT XMemDecompress( } } -HRESULT XMemCompress( +int32_t XMemCompress( XMEMCOMPRESSION_CONTEXT Context, void *pDestination, size_t *pDestSize, @@ -246,17 +246,17 @@ HRESULT XMemCompress( } } -HRESULT XMemCreateCompressionContext( +int32_t XMemCreateCompressionContext( XMEMCODEC_TYPE CodecType, - CONST void *pCodecParams, - DWORD Flags, + const void *pCodecParams, + uint32_t Flags, XMEMCOMPRESSION_CONTEXT *pContext ) { /* COMPRESSOR_HANDLE Compressor = nullptr; - HRESULT hr = CreateCompressor( + int32_t hr = CreateCompressor( COMPRESS_ALGORITHM_XPRESS_HUFF, // Compression Algorithm nullptr, // Optional allocation routine &Compressor); // Handle @@ -267,17 +267,17 @@ HRESULT XMemCreateCompressionContext( return 0; } -HRESULT XMemCreateDecompressionContext( +int32_t XMemCreateDecompressionContext( XMEMCODEC_TYPE CodecType, - CONST void *pCodecParams, - DWORD Flags, + const void *pCodecParams, + uint32_t Flags, XMEMDECOMPRESSION_CONTEXT *pContext ) { /* DECOMPRESSOR_HANDLE Decompressor = nullptr; - HRESULT hr = CreateDecompressor( + int32_t hr = CreateDecompressor( COMPRESS_ALGORITHM_XPRESS_HUFF, // Compression Algorithm nullptr, // Optional allocation routine &Decompressor); // Handle @@ -301,9 +301,9 @@ void XMemDestroyDecompressionContext(XMEMDECOMPRESSION_CONTEXT Context) } //#if 1 -DWORD XGetLanguage() { return 1; } -DWORD XGetLocale() { return 0; } -DWORD XEnableGuestSignin(bool fEnable) { return 0; } +uint32_t XGetLanguage() { return 1; } +uint32_t XGetLocale() { return 0; } +uint32_t XEnableGuestSignin(bool fEnable) { return 0; } @@ -408,7 +408,7 @@ void C_4JProfile::SetSignInChangeCallback(void ( *Func)(void *, bool, unsigne void C_4JProfile::SetNotificationsCallback(void ( *Func)(void *, std::uint32_t, unsigned int),void *lpParam) {} bool C_4JProfile::RegionIsNorthAmerica(void) { return false; } bool C_4JProfile::LocaleIsUSorCanada(void) { return false; } -HRESULT C_4JProfile::GetLiveConnectionStatus() { return S_OK; } +int32_t C_4JProfile::GetLiveConnectionStatus() { return S_OK; } bool C_4JProfile::IsSystemUIDisplayed() { return false; } void C_4JProfile::SetProfileReadErrorCallback(void ( *Func)(void *), void *lpParam) {} int( *defaultOptionsCallback)(void *,C_4JProfile::PROFILESETTINGS *, const int iPad) = nullptr; @@ -467,7 +467,7 @@ void C4JStorage::ResetSaveData() {} void C4JStorage::SetDefaultSaveNameForKeyboardDisplay(const wchar_t* pwchDefaultSaveName) {} void C4JStorage::SetSaveTitle(const wchar_t* pwchDefaultSaveName) {} const wchar_t* C4JStorage::GetSaveTitle() { return L""; } -bool C4JStorage::GetSaveUniqueNumber(INT *piVal) { return true; } +bool C4JStorage::GetSaveUniqueNumber(int32_t *piVal) { return true; } bool C4JStorage::GetSaveUniqueFilename(char *pszName) { return true; } void C4JStorage::SetSaveUniqueFilename(char *szFilename) { } void C4JStorage::SetState(ESaveGameControlState eControlState,int( *Func)(void*,const bool),void* lpParam) {} @@ -476,14 +476,14 @@ bool C4JStorage::GetSaveDisabled(void) { return false; } unsigned int C4JStorage::GetSaveSize() { return 0; } void C4JStorage::GetSaveData(void *pvData,unsigned int *pulBytes) {} void* C4JStorage::AllocateSaveData(unsigned int ulBytes) { return new char[ulBytes]; } -void C4JStorage::SaveSaveData(unsigned int ulBytes,PBYTE pbThumbnail,DWORD cbThumbnail,PBYTE pbTextData, DWORD dwTextLen) {} +void C4JStorage::SaveSaveData(unsigned int ulBytes,uint8_t* pbThumbnail,uint32_t cbThumbnail,uint8_t* pbTextData, uint32_t dwTextLen) {} void C4JStorage::CopySaveDataToNewSave(std::uint8_t *pbThumbnail,unsigned int cbThumbnail,wchar_t *wchNewName,int ( *Func)(void* lpParam, bool), void* lpParam) {} void C4JStorage::SetSaveDeviceSelected(unsigned int uiPad,bool bSelected) {} bool C4JStorage::GetSaveDeviceSelected(unsigned int iPad) { return true; } C4JStorage::ELoadGameStatus C4JStorage::DoesSaveExist(bool *pbExists) { return C4JStorage::ELoadGame_Idle; } bool C4JStorage::EnoughSpaceForAMinSaveGame() { return true; } void C4JStorage::SetSaveMessageVPosition(float fY) {} -//C4JStorage::ESGIStatus C4JStorage::GetSavesInfo(int iPad,bool ( *Func)(void*, int, CACHEINFOSTRUCT *, int, HRESULT),void* lpParam,char *pszSavePackName) { return C4JStorage::ESGIStatus_Idle; } +//C4JStorage::ESGIStatus C4JStorage::GetSavesInfo(int iPad,bool ( *Func)(void*, int, CACHEINFOSTRUCT *, int, int32_t),void* lpParam,char *pszSavePackName) { return C4JStorage::ESGIStatus_Idle; } C4JStorage::ESaveGameState C4JStorage::GetSavesInfo(int iPad,int ( *Func)(void* lpParam,SAVE_DETAILS *pSaveDetails,const bool),void* lpParam,char *pszSavePackName) { return C4JStorage::ESaveGame_Idle; } void C4JStorage::GetSaveCacheFileInfo(unsigned int fileIndex,XCONTENT_DATA &xContentData) {} @@ -519,31 +519,31 @@ C4JStorage::ETMSStatus C4JStorage::TMSPP_ReadFile(int iPad,C4JStorage::eGloba /////////////////////////////////////////////////////// Sentient manager -HRESULT CSentientManager::Init() { return S_OK; } -HRESULT CSentientManager::Tick() { return S_OK; } -HRESULT CSentientManager::Flush() { return S_OK; } -bool CSentientManager::RecordPlayerSessionStart(DWORD dwUserId) { return true; } -bool CSentientManager::RecordPlayerSessionExit(DWORD dwUserId, int exitStatus) { return true; } -bool CSentientManager::RecordHeartBeat(DWORD dwUserId) { return true; } -bool CSentientManager::RecordLevelStart(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, DWORD numberOfLocalPlayers, DWORD numberOfOnlinePlayers) { return true; } -bool CSentientManager::RecordLevelExit(DWORD dwUserId, ESen_LevelExitStatus levelExitStatus) { return true; } -bool CSentientManager::RecordLevelSaveOrCheckpoint(DWORD dwUserId, INT saveOrCheckPointID, INT saveSizeInBytes) { return true; } -bool CSentientManager::RecordLevelResume(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, DWORD numberOfLocalPlayers, DWORD numberOfOnlinePlayers, INT saveOrCheckPointID) { return true; } -bool CSentientManager::RecordPauseOrInactive(DWORD dwUserId) { return true; } -bool CSentientManager::RecordUnpauseOrActive(DWORD dwUserId) { return true; } -bool CSentientManager::RecordMenuShown(DWORD dwUserId, INT menuID, INT optionalMenuSubID) { return true; } -bool CSentientManager::RecordAchievementUnlocked(DWORD dwUserId, INT achievementID, INT achievementGamerscore) { return true; } -bool CSentientManager::RecordMediaShareUpload(DWORD dwUserId, ESen_MediaDestination mediaDestination, ESen_MediaType mediaType) { return true; } -bool CSentientManager::RecordUpsellPresented(DWORD dwUserId, ESen_UpsellID upsellId, INT marketplaceOfferID) { return true; } -bool CSentientManager::RecordUpsellResponded(DWORD dwUserId, ESen_UpsellID upsellId, INT marketplaceOfferID, ESen_UpsellOutcome upsellOutcome) { return true; } -bool CSentientManager::RecordPlayerDiedOrFailed(DWORD dwUserId, INT lowResMapX, INT lowResMapY, INT lowResMapZ, INT mapID, INT playerWeaponID, INT enemyWeaponID, ETelemetryChallenges enemyTypeID) { return true; } -bool CSentientManager::RecordEnemyKilledOrOvercome(DWORD dwUserId, INT lowResMapX, INT lowResMapY, INT lowResMapZ, INT mapID, INT playerWeaponID, INT enemyWeaponID, ETelemetryChallenges enemyTypeID) { return true; } -bool CSentientManager::RecordSkinChanged(DWORD dwUserId, DWORD dwSkinId) { return true; } -bool CSentientManager::RecordBanLevel(DWORD dwUserId) { return true; } -bool CSentientManager::RecordUnBanLevel(DWORD dwUserId) { return true; } -INT CSentientManager::GetMultiplayerInstanceID() { return 0; } -INT CSentientManager::GenerateMultiplayerInstanceId() { return 0; } -void CSentientManager::SetMultiplayerInstanceId(INT value) {} +int32_t CSentientManager::Init() { return S_OK; } +int32_t CSentientManager::Tick() { return S_OK; } +int32_t CSentientManager::Flush() { return S_OK; } +bool CSentientManager::RecordPlayerSessionStart(uint32_t dwUserId) { return true; } +bool CSentientManager::RecordPlayerSessionExit(uint32_t dwUserId, int exitStatus) { return true; } +bool CSentientManager::RecordHeartBeat(uint32_t dwUserId) { return true; } +bool CSentientManager::RecordLevelStart(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, uint32_t numberOfLocalPlayers, uint32_t numberOfOnlinePlayers) { return true; } +bool CSentientManager::RecordLevelExit(uint32_t dwUserId, ESen_LevelExitStatus levelExitStatus) { return true; } +bool CSentientManager::RecordLevelSaveOrCheckpoint(uint32_t dwUserId, int32_t saveOrCheckPointID, int32_t saveSizeInBytes) { return true; } +bool CSentientManager::RecordLevelResume(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, uint32_t numberOfLocalPlayers, uint32_t numberOfOnlinePlayers, int32_t saveOrCheckPointID) { return true; } +bool CSentientManager::RecordPauseOrInactive(uint32_t dwUserId) { return true; } +bool CSentientManager::RecordUnpauseOrActive(uint32_t dwUserId) { return true; } +bool CSentientManager::RecordMenuShown(uint32_t dwUserId, int32_t menuID, int32_t optionalMenuSubID) { return true; } +bool CSentientManager::RecordAchievementUnlocked(uint32_t dwUserId, int32_t achievementID, int32_t achievementGamerscore) { return true; } +bool CSentientManager::RecordMediaShareUpload(uint32_t dwUserId, ESen_MediaDestination mediaDestination, ESen_MediaType mediaType) { return true; } +bool CSentientManager::RecordUpsellPresented(uint32_t dwUserId, ESen_UpsellID upsellId, int32_t marketplaceOfferID) { return true; } +bool CSentientManager::RecordUpsellResponded(uint32_t dwUserId, ESen_UpsellID upsellId, int32_t marketplaceOfferID, ESen_UpsellOutcome upsellOutcome) { return true; } +bool CSentientManager::RecordPlayerDiedOrFailed(uint32_t dwUserId, int32_t lowResMapX, int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID) { return true; } +bool CSentientManager::RecordEnemyKilledOrOvercome(uint32_t dwUserId, int32_t lowResMapX, int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID) { return true; } +bool CSentientManager::RecordSkinChanged(uint32_t dwUserId, uint32_t dwSkinId) { return true; } +bool CSentientManager::RecordBanLevel(uint32_t dwUserId) { return true; } +bool CSentientManager::RecordUnBanLevel(uint32_t dwUserId) { return true; } +int32_t CSentientManager::GetMultiplayerInstanceID() { return 0; } +int32_t CSentientManager::GenerateMultiplayerInstanceId() { return 0; } +void CSentientManager::SetMultiplayerInstanceId(int32_t value) {} //////////////////////////////////////////////////////// Stats counter diff --git a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp index 743bf4b32..608c6b1b7 100644 --- a/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp +++ b/Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp @@ -86,7 +86,7 @@ static void sigsegv_handler(int sig) { // #define PROFILE_VERSION 3 // new version for the interim bug fix 166 TU #define NUM_PROFILE_VALUES 5 #define NUM_PROFILE_SETTINGS 4 -DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = { +uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = { 0, 0, 0, 0, 0 }; @@ -101,7 +101,7 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = { uint8_t* AddRichPresenceString(int iID); void FreeRichPresenceStrings(); -bool g_bWidescreen = TRUE; +bool g_bWidescreen = true; void DefineActions(void) { // The app needs to define the actions required, and the possible mappings @@ -431,7 +431,7 @@ ID3D11DepthStencilView* g_pDepthStencilView = nullptr; ID3D11Texture2D* g_pDepthStencilBuffer = nullptr; // -// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) +// FUNCTION: WndProc(HWND, uint32_t, WPARAM, LPARAM) // // PURPOSE: Processes messages for the main window. // @@ -440,7 +440,7 @@ ID3D11Texture2D* g_pDepthStencilBuffer = nullptr; // WM_DESTROY - post a quit message and return // // -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, +LRESULT CALLBACK WndProc(HWND hWnd, uint32_t message, WPARAM wParam, LPARAM lParam) { int wmId, wmEvent; PAINTSTRUCT ps; @@ -516,27 +516,27 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { hInstance, nullptr); if (!g_hWnd) { - return FALSE; + return false; } ShowWindow(g_hWnd, nCmdShow); UpdateWindow(g_hWnd); - return TRUE; + return true; } //-------------------------------------------------------------------------------------- // Create Direct3D device and swap chain //-------------------------------------------------------------------------------------- -HRESULT InitDevice() { - HRESULT hr = S_OK; +int32_t InitDevice() { + int32_t hr = S_OK; RECT rc; GetClientRect(g_hWnd, &rc); - UINT width = rc.right - rc.left; - UINT height = rc.bottom - rc.top; + uint32_t width = rc.right - rc.left; + uint32_t height = rc.bottom - rc.top; - UINT createDeviceFlags = 0; + uint32_t createDeviceFlags = 0; #if defined(_DEBUG) createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; #endif @@ -546,14 +546,14 @@ HRESULT InitDevice() { D3D_DRIVER_TYPE_WARP, D3D_DRIVER_TYPE_REFERENCE, }; - UINT numDriverTypes = ARRAYSIZE(driverTypes); + uint32_t numDriverTypes = ARRAYSIZE(driverTypes); D3D_FEATURE_LEVEL featureLevels[] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0, }; - UINT numFeatureLevels = ARRAYSIZE(featureLevels); + uint32_t numFeatureLevels = ARRAYSIZE(featureLevels); DXGI_SWAP_CHAIN_DESC sd; ZeroMemory(&sd, sizeof(sd)); @@ -567,9 +567,9 @@ HRESULT InitDevice() { sd.OutputWindow = g_hWnd; sd.SampleDesc.Count = 1; sd.SampleDesc.Quality = 0; - sd.Windowed = TRUE; + sd.Windowed = true; - for (UINT driverTypeIndex = 0; driverTypeIndex < numDriverTypes; + for (uint32_t driverTypeIndex = 0; driverTypeIndex < numDriverTypes; driverTypeIndex++) { g_driverType = driverTypes[driverTypeIndex]; hr = D3D11CreateDeviceAndSwapChain( @@ -621,8 +621,8 @@ HRESULT InitDevice() { // Setup the viewport D3D11_VIEWPORT vp; - vp.Width = (FLOAT)width; - vp.Height = (FLOAT)height; + vp.Width = (float)width; + vp.Height = (float)height; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; vp.TopLeftX = 0; @@ -1047,9 +1047,9 @@ volatile size_t sizeCheckMin = 1160; volatile size_t sizeCheckMax = 1160; volatile int sectCheck = 48; CRITICAL_SECTION memCS; -DWORD tlsIdx; +uint32_t tlsIdx; -void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) { +void* XMemAlloc(size_t dwSize, uint32_t dwAllocAttributes) { if (!trackStarted) { void* p = XMemAllocDefault(dwSize, dwAllocAttributes); size_t realSize = XMemSizeDefault(p, dwAllocAttributes); @@ -1090,22 +1090,22 @@ void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) { void* operator new(size_t size) { return (unsigned char*)XMemAlloc( size, MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP)); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP)); } void operator delete(void* p) { XMemFree(p, MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP)); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP)); } -void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) { +void WINAPI XMemFree(void* pAddress, uint32_t dwAllocAttributes) { bool special = false; if (dwAllocAttributes == 0) { dwAllocAttributes = MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP); special = true; } if (!trackStarted) { @@ -1132,7 +1132,7 @@ void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) { LeaveCriticalSection(&memCS); } -size_t WINAPI XMemSize(void* pAddress, DWORD dwAllocAttributes) { +size_t WINAPI XMemSize(void* pAddress, uint32_t dwAllocAttributes) { if (trackStarted) { return XMemSizeDefault(pAddress, dwAllocAttributes) - 16; } else { diff --git a/Minecraft.Client/Platform/Linux/Sentient/DynamicConfigurations.h b/Minecraft.Client/Platform/Linux/Sentient/DynamicConfigurations.h index 1adc90622..601b2527a 100644 --- a/Minecraft.Client/Platform/Linux/Sentient/DynamicConfigurations.h +++ b/Minecraft.Client/Platform/Linux/Sentient/DynamicConfigurations.h @@ -29,12 +29,12 @@ private: ************************/ // 4J Stu - The first 4 bytes define a version number, that defines the - // structure of the data After reading those bytes into a DWORD, the + // structure of the data After reading those bytes into a uint32_t, the // remainder of the data should be the size of the relevant struct and can // be cast to the struct struct _dynamic_config_trial_data_version1 { // The time in seconds that the player can play the trial for - DWORD trialTimeSeconds; + uint32_t trialTimeSeconds; _dynamic_config_trial_data_version1() { trialTimeSeconds = DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; @@ -57,15 +57,15 @@ private: public: static void Tick(); - static DWORD GetTrialTime(); + static uint32_t GetTrialTime(); private: static void UpdateAllConfigurations(); static void UpdateNextConfiguration(); static void UpdateConfiguration(EDynamic_Configs id); - static void GetSizeCompletedCallback(HRESULT taskResult, + static void GetSizeCompletedCallback(int32_t taskResult, void* userCallbackData); - static void GetDataCompletedCallback(HRESULT taskResult, + static void GetDataCompletedCallback(int32_t taskResult, void* userCallbackData); }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Linux/Sentient/SentientManager.h b/Minecraft.Client/Platform/Linux/Sentient/SentientManager.h index 2c0c2ddfd..065b2a995 100644 --- a/Minecraft.Client/Platform/Linux/Sentient/SentientManager.h +++ b/Minecraft.Client/Platform/Linux/Sentient/SentientManager.h @@ -21,54 +21,54 @@ public: eTelemetry_EnemyKilledOrOvercome, }; - HRESULT Init(); - HRESULT Tick(); + int32_t Init(); + int32_t Tick(); - HRESULT Flush(); + int32_t Flush(); - bool RecordPlayerSessionStart(DWORD dwUserId); - bool RecordPlayerSessionExit(DWORD dwUserId, int exitStatus); - bool RecordHeartBeat(DWORD dwUserId); - bool RecordLevelStart(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, + bool RecordPlayerSessionStart(uint32_t dwUserId); + bool RecordPlayerSessionExit(uint32_t dwUserId, int exitStatus); + bool RecordHeartBeat(uint32_t dwUserId); + bool RecordLevelStart(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, - DWORD numberOfLocalPlayers, - DWORD numberOfOnlinePlayers); - bool RecordLevelExit(DWORD dwUserId, ESen_LevelExitStatus levelExitStatus); - bool RecordLevelSaveOrCheckpoint(DWORD dwUserId, INT saveOrCheckPointID, - INT saveSizeInBytes); - bool RecordLevelResume(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, + uint32_t numberOfLocalPlayers, + uint32_t numberOfOnlinePlayers); + bool RecordLevelExit(uint32_t dwUserId, ESen_LevelExitStatus levelExitStatus); + bool RecordLevelSaveOrCheckpoint(uint32_t dwUserId, int32_t saveOrCheckPointID, + int32_t saveSizeInBytes); + bool RecordLevelResume(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, - DWORD numberOfLocalPlayers, - DWORD numberOfOnlinePlayers, INT saveOrCheckPointID); - bool RecordPauseOrInactive(DWORD dwUserId); - bool RecordUnpauseOrActive(DWORD dwUserId); - bool RecordMenuShown(DWORD dwUserId, INT menuID, INT optionalMenuSubID); - bool RecordAchievementUnlocked(DWORD dwUserId, INT achievementID, - INT achievementGamerscore); - bool RecordMediaShareUpload(DWORD dwUserId, + uint32_t numberOfLocalPlayers, + uint32_t numberOfOnlinePlayers, int32_t saveOrCheckPointID); + bool RecordPauseOrInactive(uint32_t dwUserId); + bool RecordUnpauseOrActive(uint32_t dwUserId); + bool RecordMenuShown(uint32_t dwUserId, int32_t menuID, int32_t optionalMenuSubID); + bool RecordAchievementUnlocked(uint32_t dwUserId, int32_t achievementID, + int32_t achievementGamerscore); + bool RecordMediaShareUpload(uint32_t dwUserId, ESen_MediaDestination mediaDestination, ESen_MediaType mediaType); - bool RecordUpsellPresented(DWORD dwUserId, ESen_UpsellID upsellId, - INT marketplaceOfferID); - bool RecordUpsellResponded(DWORD dwUserId, ESen_UpsellID upsellId, - INT marketplaceOfferID, + bool RecordUpsellPresented(uint32_t dwUserId, ESen_UpsellID upsellId, + int32_t marketplaceOfferID); + bool RecordUpsellResponded(uint32_t dwUserId, ESen_UpsellID upsellId, + int32_t marketplaceOfferID, ESen_UpsellOutcome upsellOutcome); - bool RecordPlayerDiedOrFailed(DWORD dwUserId, INT lowResMapX, - INT lowResMapY, INT lowResMapZ, INT mapID, - INT playerWeaponID, INT enemyWeaponID, + bool RecordPlayerDiedOrFailed(uint32_t dwUserId, int32_t lowResMapX, + int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, + int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID); - bool RecordEnemyKilledOrOvercome(DWORD dwUserId, INT lowResMapX, - INT lowResMapY, INT lowResMapZ, INT mapID, - INT playerWeaponID, INT enemyWeaponID, + bool RecordEnemyKilledOrOvercome(uint32_t dwUserId, int32_t lowResMapX, + int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, + int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID); - bool RecordSkinChanged(DWORD dwUserId, DWORD dwSkinId); - bool RecordBanLevel(DWORD dwUserId); - bool RecordUnBanLevel(DWORD dwUserId); + bool RecordSkinChanged(uint32_t dwUserId, uint32_t dwSkinId); + bool RecordBanLevel(uint32_t dwUserId); + bool RecordUnBanLevel(uint32_t dwUserId); - INT GetMultiplayerInstanceID(); - INT GenerateMultiplayerInstanceId(); - void SetMultiplayerInstanceId(INT value); + int32_t GetMultiplayerInstanceID(); + int32_t GenerateMultiplayerInstanceId(); + void SetMultiplayerInstanceId(int32_t value); private: float m_initialiseTime; @@ -77,24 +77,24 @@ private: float m_fLevelStartTime[XUSER_MAX_COUNT]; - INT m_multiplayerInstanceID; - DWORD m_levelInstanceID; + int32_t m_multiplayerInstanceID; + uint32_t m_levelInstanceID; // Helper functions to get the various common settings - INT GetSecondsSinceInitialize(); - INT GetMode(DWORD dwUserId); - INT GetSubMode(DWORD dwUserId); - INT GetLevelId(DWORD dwUserId); - INT GetSubLevelId(DWORD dwUserId); - INT GetTitleBuildId(); - INT GetLevelInstanceID(); - INT GetSingleOrMultiplayer(); - INT GetDifficultyLevel(INT diff); - INT GetLicense(); - INT GetDefaultGameControls(); - INT GetAudioSettings(DWORD dwUserId); - INT GetLevelExitProgressStat1(); - INT GetLevelExitProgressStat2(); + int32_t GetSecondsSinceInitialize(); + int32_t GetMode(uint32_t dwUserId); + int32_t GetSubMode(uint32_t dwUserId); + int32_t GetLevelId(uint32_t dwUserId); + int32_t GetSubLevelId(uint32_t dwUserId); + int32_t GetTitleBuildId(); + int32_t GetLevelInstanceID(); + int32_t GetSingleOrMultiplayer(); + int32_t GetDifficultyLevel(int32_t diff); + int32_t GetLicense(); + int32_t GetDefaultGameControls(); + int32_t GetAudioSettings(uint32_t dwUserId); + int32_t GetLevelExitProgressStat1(); + int32_t GetLevelExitProgressStat2(); }; extern CSentientManager SentientManager; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Linux/Sentient/SentientStats.h b/Minecraft.Client/Platform/Linux/Sentient/SentientStats.h index 8b05924c3..d82d13978 100644 --- a/Minecraft.Client/Platform/Linux/Sentient/SentientStats.h +++ b/Minecraft.Client/Platform/Linux/Sentient/SentientStats.h @@ -12,77 +12,77 @@ // PlayerSessionStart // Player signed in or joined -bool SenStatPlayerSessionStart ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT TitleBuildID, INT SkeletonDistanceInInches, INT EnrollmentType, INT NumberOfSkeletonsInView ); +bool SenStatPlayerSessionStart ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t TitleBuildID, int32_t SkeletonDistanceInInches, int32_t EnrollmentType, int32_t NumberOfSkeletonsInView ); // PlayerSessionExit // Player signed out or left -bool SenStatPlayerSessionExit ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID ); +bool SenStatPlayerSessionExit ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID ); // HeartBeat // Sent every 60 seconds by title -bool SenStatHeartBeat ( DWORD dwUserID, INT SecondsSinceInitialize ); +bool SenStatHeartBeat ( uint32_t dwUserID, int32_t SecondsSinceInitialize ); // LevelStart // Level started -bool SenStatLevelStart ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SingleOrMultiplayer, INT FriendsOrMatch, INT CompeteOrCoop, INT DifficultyLevel, INT NumberOfLocalPlayers, INT NumberOfOnlinePlayers, INT License, INT DefaultGameControls, INT AudioSettings, INT SkeletonDistanceInInches, INT NumberOfSkeletonsInView ); +bool SenStatLevelStart ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SingleOrMultiplayer, int32_t FriendsOrMatch, int32_t CompeteOrCoop, int32_t DifficultyLevel, int32_t NumberOfLocalPlayers, int32_t NumberOfOnlinePlayers, int32_t License, int32_t DefaultGameControls, int32_t AudioSettings, int32_t SkeletonDistanceInInches, int32_t NumberOfSkeletonsInView ); // LevelExit // Level exited -bool SenStatLevelExit ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LevelExitStatus, INT LevelExitProgressStat1, INT LevelExitProgressStat2, INT LevelDurationInSeconds ); +bool SenStatLevelExit ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LevelExitStatus, int32_t LevelExitProgressStat1, int32_t LevelExitProgressStat2, int32_t LevelDurationInSeconds ); // LevelSaveOrCheckpoint // Level saved explicitly or implicitly -bool SenStatLevelSaveOrCheckpoint ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LevelExitProgressStat1, INT LevelExitProgressStat2, INT LevelDurationInSeconds, INT SaveOrCheckPointID ); +bool SenStatLevelSaveOrCheckpoint ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LevelExitProgressStat1, int32_t LevelExitProgressStat2, int32_t LevelDurationInSeconds, int32_t SaveOrCheckPointID ); // LevelResume // Level resumed from a save or restarted at a checkpoint -bool SenStatLevelResume ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SingleOrMultiplayer, INT FriendsOrMatch, INT CompeteOrCoop, INT DifficultyLevel, INT NumberOfLocalPlayers, INT NumberOfOnlinePlayers, INT License, INT DefaultGameControls, INT SaveOrCheckPointID, INT AudioSettings, INT SkeletonDistanceInInches, INT NumberOfSkeletonsInView ); +bool SenStatLevelResume ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SingleOrMultiplayer, int32_t FriendsOrMatch, int32_t CompeteOrCoop, int32_t DifficultyLevel, int32_t NumberOfLocalPlayers, int32_t NumberOfOnlinePlayers, int32_t License, int32_t DefaultGameControls, int32_t SaveOrCheckPointID, int32_t AudioSettings, int32_t SkeletonDistanceInInches, int32_t NumberOfSkeletonsInView ); // PauseOrInactive // Player paused game or has become inactive, level and mode are for what the player is leaving -bool SenStatPauseOrInactive ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatPauseOrInactive ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // UnpauseOrActive // Player unpaused game or has become active, level and mode are for what the player is entering into -bool SenStatUnpauseOrActive ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatUnpauseOrActive ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // MenuShown // A menu screen or major menu area has been shown -bool SenStatMenuShown ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT MenuID, INT OptionalMenuSubID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatMenuShown ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t MenuID, int32_t OptionalMenuSubID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // AchievementUnlocked // An achievement was unlocked -bool SenStatAchievementUnlocked ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT AchievementID, INT AchievementGamerscore ); +bool SenStatAchievementUnlocked ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t AchievementID, int32_t AchievementGamerscore ); // MediaShareUpload // The user uploaded something to Kinect Share -bool SenStatMediaShareUpload ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT MediaDestination, INT MediaType ); +bool SenStatMediaShareUpload ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t MediaDestination, int32_t MediaType ); // UpsellPresented // The user is shown an upsell to purchase something -bool SenStatUpsellPresented ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT UpsellID, INT MarketplaceOfferID ); +bool SenStatUpsellPresented ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t UpsellID, int32_t MarketplaceOfferID ); // UpsellResponded // The user responded to the upsell -bool SenStatUpsellResponded ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT UpsellID, INT MarketplaceOfferID, INT UpsellOutcome ); +bool SenStatUpsellResponded ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t UpsellID, int32_t MarketplaceOfferID, int32_t UpsellOutcome ); // PlayerDiedOrFailed // The player died or failed a challenge - can be used for many types of failure -bool SenStatPlayerDiedOrFailed ( DWORD dwUserID, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LowResMapX, INT LowResMapY, INT LowResMapZ, INT MapID, INT PlayerWeaponID, INT EnemyWeaponID, INT EnemyTypeID, INT SecondsSinceInitialize, INT CopyOfSecondsSinceInitialize ); +bool SenStatPlayerDiedOrFailed ( uint32_t dwUserID, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LowResMapX, int32_t LowResMapY, int32_t LowResMapZ, int32_t MapID, int32_t PlayerWeaponID, int32_t EnemyWeaponID, int32_t EnemyTypeID, int32_t SecondsSinceInitialize, int32_t CopyOfSecondsSinceInitialize ); // EnemyKilledOrOvercome // The player killed an enemy or overcame or solved a major challenge -bool SenStatEnemyKilledOrOvercome ( DWORD dwUserID, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LowResMapX, INT LowResMapY, INT LowResMapZ, INT MapID, INT PlayerWeaponID, INT EnemyWeaponID, INT EnemyTypeID, INT SecondsSinceInitialize, INT CopyOfSecondsSinceInitialize ); +bool SenStatEnemyKilledOrOvercome ( uint32_t dwUserID, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LowResMapX, int32_t LowResMapY, int32_t LowResMapZ, int32_t MapID, int32_t PlayerWeaponID, int32_t EnemyWeaponID, int32_t EnemyTypeID, int32_t SecondsSinceInitialize, int32_t CopyOfSecondsSinceInitialize ); // SkinChanged // The player has changed their skin, level and mode are for what the player is currently in -bool SenStatSkinChanged ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SkinID ); +bool SenStatSkinChanged ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SkinID ); // BanLevel // The player has banned a level, level and mode are for what the player is currently in and banning -bool SenStatBanLevel ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatBanLevel ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // UnBanLevel // The player has ubbanned a level, level and mode are for what the player is currently in and unbanning -bool SenStatUnBanLevel ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatUnBanLevel ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); diff --git a/Minecraft.Client/Platform/Linux/Social/SocialManager.h b/Minecraft.Client/Platform/Linux/Social/SocialManager.h index 24915af04..4ca04253c 100644 --- a/Minecraft.Client/Platform/Linux/Social/SocialManager.h +++ b/Minecraft.Client/Platform/Linux/Social/SocialManager.h @@ -23,8 +23,8 @@ public: bool IsTitleAllowedToPostLinks() { return false; } bool AreAllUsersAllowedToPostImages() { return false; } - bool PostLinkToSocialNetwork(ESocialNetwork, DWORD, bool) { return false; } - bool PostImageToSocialNetwork(ESocialNetwork, DWORD, bool) { return false; } + bool PostLinkToSocialNetwork(ESocialNetwork, uint32_t, bool) { return false; } + bool PostImageToSocialNetwork(ESocialNetwork, uint32_t, bool) { return false; } void SetSocialPostText(const wchar_t*, const wchar_t*, const wchar_t*) {} diff --git a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h index ae75cd26c..303391d35 100644 --- a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h +++ b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h @@ -55,8 +55,8 @@ enum EKeyboardResult typedef struct _STRING_VERIFY_RESPONSE { - WORD wNumStrings; - HRESULT *pStringResult; + uint16_t wNumStrings; + int32_t *pStringResult; } STRING_VERIFY_RESPONSE; @@ -94,7 +94,7 @@ public: void SetJoypadStickTriggerMap(int iPad,unsigned int uiFrom, unsigned int uiTo); void SetKeyRepeatRate(float fRepeatDelaySecs,float fRepeatRateSecs); void SetDebugSequence( const char *chSequenceA,int( *Func)(void *),void *lpParam ); - FLOAT GetIdleSeconds(int iPad); + float GetIdleSeconds(int iPad); bool IsPadConnected(int iPad); // In-Game values which may have been remapped due to Southpaw, swap triggers, etc @@ -107,8 +107,8 @@ public: void SetMenuDisplayed(int iPad, bool bVal); -// EKeyboardResult RequestKeyboard(UINT uiTitle, UINT uiText, UINT uiDesc, DWORD dwPad, wchar_t *pwchResult, UINT uiResultSize,int( *Func)(void*,const bool),void* lpParam,EKeyboardMode eMode,C4JStringTable *pStringTable=nullptr); -// EKeyboardResult RequestKeyboard(UINT uiTitle, const wchar_t* pwchDefault, UINT uiDesc, DWORD dwPad, wchar_t *pwchResult, UINT uiResultSize,int( *Func)(void*,const bool),void* lpParam, EKeyboardMode eMode,C4JStringTable *pStringTable=nullptr); +// EKeyboardResult RequestKeyboard(uint32_t uiTitle, uint32_t uiText, uint32_t uiDesc, uint32_t dwPad, wchar_t *pwchResult, uint32_t uiResultSize,int( *Func)(void*,const bool),void* lpParam,EKeyboardMode eMode,C4JStringTable *pStringTable=nullptr); +// EKeyboardResult RequestKeyboard(uint32_t uiTitle, const wchar_t* pwchDefault, uint32_t uiDesc, uint32_t dwPad, wchar_t *pwchResult, uint32_t uiResultSize,int( *Func)(void*,const bool),void* lpParam, EKeyboardMode eMode,C4JStringTable *pStringTable=nullptr); EKeyboardResult RequestKeyboard(const wchar_t *Title, const wchar_t *Text, int iPad, unsigned int uiMaxChars, int( *Func)(void *,const bool), void *lpParam, C_4JInput::EKeyboardMode eMode); void GetText(uint16_t *UTF16String); @@ -130,7 +130,7 @@ public: void CancelQueuedVerifyStrings(int( *Func)(void *,STRING_VERIFY_RESPONSE *),void *lpParam); void CancelAllVerifyInProgress(void); - //bool InputDetected(DWORD dwUserIndex,wchar_t *pwchInput); + //bool InputDetected(uint32_t dwUserIndex,wchar_t *pwchInput); }; // Singleton diff --git a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Profile.h b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Profile.h index 12d16187a..7b1fa06b7 100644 --- a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Profile.h +++ b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Profile.h @@ -39,12 +39,12 @@ public: // 4 players have game defined data, puiGameDefinedDataChangedBitmask needs to be checked by the game side to see if there's an update needed - it'll have the bits set for players to be updated - void Initialise( DWORD dwTitleID, - DWORD dwOfferID, + void Initialise( uint32_t dwTitleID, + uint32_t dwOfferID, unsigned short usProfileVersion, - UINT uiProfileValuesC, - UINT uiProfileSettingsC, - DWORD *pdwProfileSettingsA, + uint32_t uiProfileValuesC, + uint32_t uiProfileSettingsC, + uint32_t *pdwProfileSettingsA, int iGameDefinedDataSizeX4, unsigned int *puiGameDefinedDataChangedBitmask); void SetTrialTextStringTable(CXuiStringTable *pStringTable,int iAccept,int iReject); @@ -54,9 +54,9 @@ public: bool IsSignedIn(int iQuadrant); bool IsSignedInLive(int iProf); bool IsGuest(int iQuadrant); - UINT RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); - UINT DisplayOfflineProfile(int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); - UINT RequestConvertOfflineToGuestUI(int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); + uint32_t RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); + uint32_t DisplayOfflineProfile(int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); + uint32_t RequestConvertOfflineToGuestUI(int( *Func)(void*,const bool, const int iPad),void* lpParam,int iQuadrant=XUSER_INDEX_ANY); void SetPrimaryPlayerChanged(bool bVal); bool QuerySigninStatus(void); void GetXUID(int iPad, PlayerUID *pXuid,bool bOnlineXuid); @@ -66,9 +66,9 @@ public: bool GetChatAndContentRestrictions(int iPad,bool *pbChatRestricted,bool *pbContentRestricted,int *piAge); void StartTrialGame(); // disables saves and leaderboard, and change state to readyforgame from pregame void AllowedPlayerCreatedContent(int iPad, bool thisQuadrantOnly, bool *allAllowed, bool *friendsAllowed); - bool CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, DWORD dwXuidCount ); + bool CanViewPlayerCreatedContent(int iPad, bool thisQuadrantOnly, PPlayerUID pXuids, uint32_t dwXuidCount ); void ShowProfileCard(int iPad, PlayerUID targetUid); - bool GetProfileAvatar(int iPad,int( *Func)(void* lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), void* lpParam); + bool GetProfileAvatar(int iPad,int( *Func)(void* lpParam,uint8_t* pbThumbnail,uint32_t dwThumbnailBytes), void* lpParam); void CancelProfileAvatarRequest(); @@ -79,10 +79,10 @@ public: std::wstring GetDisplayName(int iPad); bool IsFullVersion(); void SetSignInChangeCallback(void ( *Func)(void*, bool, unsigned int),void* lpParam); - void SetNotificationsCallback(void ( *Func)(void*, DWORD, unsigned int),void* lpParam); + void SetNotificationsCallback(void ( *Func)(void*, uint32_t, unsigned int),void* lpParam); bool RegionIsNorthAmerica(void); bool LocaleIsUSorCanada(void); - HRESULT GetLiveConnectionStatus(); + int32_t GetLiveConnectionStatus(); bool IsSystemUIDisplayed(); void SetProfileReadErrorCallback(void ( *Func)(void*), void* lpParam); diff --git a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Render.h b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Render.h index 60c0bfc45..603273e12 100644 --- a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Render.h +++ b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Render.h @@ -29,10 +29,10 @@ typedef struct }D3DXIMAGE_INFO; typedef struct _XSOCIAL_PREVIEWIMAGE { - BYTE *pBytes; - DWORD Pitch; - DWORD Width; - DWORD Height; + uint8_t *pBytes; + uint32_t Pitch; + uint32_t Width; + uint32_t Height; // D3DFORMAT Format; } XSOCIAL_PREVIEWIMAGE, *PXSOCIAL_PREVIEWIMAGE; @@ -76,7 +76,7 @@ public: // Vertex data handling typedef enum { - VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, // Position 3 x float, texture 2 x float, colour 4 x byte, normal 4 x byte, padding 1 DWORD + VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, // Position 3 x float, texture 2 x float, colour 4 x byte, normal 4 x byte, padding 1 uint32_t VERTEX_TYPE_COMPRESSED, // Compressed format - see comment at top of VS_PS3_TS2_CS1.hlsl for description of layout VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with lighting applied, VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN, // as VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1 with tex gen @@ -154,10 +154,10 @@ public: void TextureSetParam(int param, int value); void TextureDynamicUpdateStart(); void TextureDynamicUpdateEnd(); - HRESULT LoadTextureData(const char *szFilename,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); - HRESULT LoadTextureData(BYTE *pbData, DWORD dwBytes,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); - HRESULT SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut); - HRESULT SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn); + int32_t LoadTextureData(const char *szFilename,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); + int32_t LoadTextureData(uint8_t *pbData, uint32_t dwBytes,D3DXIMAGE_INFO *pSrcInfo, int **ppDataOut); + int32_t SaveTextureData(const char *szFilename, D3DXIMAGE_INFO *pSrcInfo, int *ppDataOut); + int32_t SaveTextureDataToMemory(void *pOutput, int outputCapacity, int *outputLength, int width, int height, int *ppDataIn); void TextureGetStats(); void *TextureGetTexture(int idx); diff --git a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h index ec2039866..b0debaa0b 100644 --- a/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h +++ b/Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h @@ -20,7 +20,7 @@ typedef struct char UTF8SaveFilename[MAX_SAVEFILENAME_LENGTH]; char UTF8SaveTitle[MAX_DISPLAYNAME_LENGTH]; CONTAINER_METADATA metaData; - PBYTE thumbnailData; + uint8_t* thumbnailData; } SAVE_INFO,*PSAVE_INFO; @@ -46,16 +46,16 @@ public: typedef struct { unsigned int uiFileSize; - DWORD dwType; - DWORD dwWchCount; // count of wchar_t in next array + uint32_t dwType; + uint32_t dwWchCount; // count of wchar_t in next array wchar_t wchFile[1]; } DLC_FILE_DETAILS, *PDLC_FILE_DETAILS; typedef struct { - DWORD dwType; - DWORD dwWchCount; // count of wchar_t in next array; + uint32_t dwType; + uint32_t dwWchCount; // count of wchar_t in next array; wchar_t wchData[1]; // will be an array of size dwBytes } DLC_FILE_PARAM, *PDLC_FILE_PARAM; @@ -64,20 +64,20 @@ public: typedef struct { wchar_t wchDisplayName[XCONTENT_MAX_DISPLAYNAME_LENGTH]; - CHAR szFileName[XCONTENT_MAX_FILENAME_LENGTH]; - DWORD dwImageOffset; - DWORD dwImageBytes; + char szFileName[XCONTENT_MAX_FILENAME_LENGTH]; + uint32_t dwImageOffset; + uint32_t dwImageBytes; } CACHEINFOSTRUCT; // structure to hold DLC info in TMS typedef struct { - DWORD dwVersion; - DWORD dwNewOffers; - DWORD dwTotalOffers; - DWORD dwInstalledTotalOffers; - BYTE bPadding[1024-sizeof(DWORD)*4]; // future expansion + uint32_t dwVersion; + uint32_t dwNewOffers; + uint32_t dwTotalOffers; + uint32_t dwInstalledTotalOffers; + uint8_t bPadding[1024-sizeof(uint32_t)*4]; // future expansion } DLC_TMS_DETAILS; @@ -212,7 +212,7 @@ public: typedef struct { - CHAR szFilename[256]; + char szFilename[256]; int iFileSize; eTMS_FILETYPEVAL eFileTypeVal; } @@ -227,8 +227,8 @@ public: typedef struct { - DWORD dwSize; - PBYTE pbData; + uint32_t dwSize; + uint8_t* pbData; } TMSPP_FILEDATA, *PTMSPP_FILEDATA; @@ -238,8 +238,8 @@ public: void Tick(void); // Messages - C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, - int( *Func)(void*,int,const C4JStorage::EMessageResult)=nullptr,void* lpParam=nullptr, C4JStringTable *pStringTable=nullptr, wchar_t *pwchFormatString=nullptr,DWORD dwFocusButton=0); + C4JStorage::EMessageResult RequestMessageBox(uint32_t uiTitle, uint32_t uiText, uint32_t *uiOptionA,uint32_t uiOptionC, uint32_t dwPad=XUSER_INDEX_ANY, + int( *Func)(void*,int,const C4JStorage::EMessageResult)=nullptr,void* lpParam=nullptr, C4JStringTable *pStringTable=nullptr, wchar_t *pwchFormatString=nullptr,uint32_t dwFocusButton=0); C4JStorage::EMessageResult GetMessageBoxResult(); @@ -252,7 +252,7 @@ public: 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); - bool GetSaveUniqueNumber(INT *piVal); + bool GetSaveUniqueNumber(int32_t *piVal); bool GetSaveUniqueFilename(char *pszName); void SetSaveUniqueFilename(char *szFilename); void SetState(ESaveGameControlState eControlState,int( *Func)(void*,const bool),void* lpParam); @@ -261,9 +261,9 @@ public: unsigned int GetSaveSize(); void GetSaveData(void *pvData,unsigned int *puiBytes); void* AllocateSaveData(unsigned int uiBytes); - void SetSaveImages( PBYTE pbThumbnail,DWORD dwThumbnailBytes,PBYTE pbImage,DWORD dwImageBytes, PBYTE pbTextData ,DWORD dwTextDataBytes); // Sets the thumbnail & image for the save, optionally setting the metadata in the png + void SetSaveImages( uint8_t* pbThumbnail,uint32_t dwThumbnailBytes,uint8_t* pbImage,uint32_t dwImageBytes, uint8_t* pbTextData ,uint32_t dwTextDataBytes); // Sets the thumbnail & image for the save, optionally setting the metadata in the png C4JStorage::ESaveGameState SaveSaveData(int( *Func)(void* ,const bool),void* lpParam); - void CopySaveDataToNewSave(PBYTE pbThumbnail,DWORD cbThumbnail,wchar_t *wchNewName,int ( *Func)(void* lpParam, bool), void* lpParam); + void CopySaveDataToNewSave(uint8_t* pbThumbnail,uint32_t cbThumbnail,wchar_t *wchNewName,int ( *Func)(void* lpParam, bool), void* lpParam); void SetSaveDeviceSelected(unsigned int uiPad,bool bSelected); bool GetSaveDeviceSelected(unsigned int iPad); C4JStorage::ESaveGameState DoesSaveExist(bool *pbExists); @@ -274,10 +274,10 @@ public: C4JStorage::ESaveGameState GetSavesInfo(int iPad,int ( *Func)(void* lpParam,SAVE_DETAILS *pSaveDetails,const bool),void* lpParam,char *pszSavePackName); PSAVE_DETAILS ReturnSavesInfo(); void ClearSavesInfo(); // Clears results - C4JStorage::ESaveGameState LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,int( *Func)(void* lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes), void* lpParam); // Get the thumbnail for an individual save referenced by pSaveInfo + C4JStorage::ESaveGameState LoadSaveDataThumbnail(PSAVE_INFO pSaveInfo,int( *Func)(void* lpParam,uint8_t* pbThumbnail,uint32_t dwThumbnailBytes), void* lpParam); // Get the thumbnail for an individual save referenced by pSaveInfo - void GetSaveCacheFileInfo(DWORD dwFile,XCONTENT_DATA &xContentData); - void GetSaveCacheFileInfo(DWORD dwFile, PBYTE *ppbImageData, DWORD *pdwImageBytes); + void GetSaveCacheFileInfo(uint32_t dwFile,XCONTENT_DATA &xContentData); + void GetSaveCacheFileInfo(uint32_t dwFile, uint8_t* *ppbImageData, uint32_t *pdwImageBytes); // Load the save. Need to call GetSaveData once the callback is called C4JStorage::ESaveGameState LoadSaveData(PSAVE_INFO pSaveInfo,int( *Func)(void* lpParam,const bool, const bool), void* lpParam); @@ -286,35 +286,35 @@ public: // DLC void RegisterMarketplaceCountsCallback(int ( *Func)(void* lpParam, C4JStorage::DLC_TMS_DETAILS *, int), void* lpParam ); void SetDLCPackageRoot(char *pszDLCRoot); - C4JStorage::EDLCStatus GetDLCOffers(int iPad,int( *Func)(void*, int, DWORD, int),void* lpParam, DWORD dwOfferTypesBitmask=XMARKETPLACE_OFFERING_TYPE_CONTENT); - DWORD CancelGetDLCOffers(); + C4JStorage::EDLCStatus GetDLCOffers(int iPad,int( *Func)(void*, int, uint32_t, int),void* lpParam, uint32_t dwOfferTypesBitmask=XMARKETPLACE_OFFERING_TYPE_CONTENT); + uint32_t CancelGetDLCOffers(); void ClearDLCOffers(); - XMARKETPLACE_CONTENTOFFER_INFO& GetOffer(DWORD dw); + XMARKETPLACE_CONTENTOFFER_INFO& GetOffer(uint32_t dw); int GetOfferCount(); - DWORD InstallOffer(int iOfferIDC, uint64_t *ullOfferIDA,int( *Func)(void*, int, int),void* lpParam, bool bTrial=false); - DWORD GetAvailableDLCCount( int iPad); + uint32_t InstallOffer(int iOfferIDC, uint64_t *ullOfferIDA,int( *Func)(void*, int, int),void* lpParam, bool bTrial=false); + uint32_t GetAvailableDLCCount( int iPad); C4JStorage::EDLCStatus GetInstalledDLC(int iPad,int( *Func)(void*, int, int),void* lpParam); - XCONTENT_DATA& GetDLC(DWORD dw); - DWORD MountInstalledDLC(int iPad,DWORD dwDLC,int( *Func)(void*, int, DWORD,DWORD),void* lpParam,const char* szMountDrive=nullptr); - DWORD UnmountInstalledDLC(const char* szMountDrive = nullptr); + XCONTENT_DATA& GetDLC(uint32_t dw); + uint32_t MountInstalledDLC(int iPad,uint32_t dwDLC,int( *Func)(void*, int, uint32_t,uint32_t),void* lpParam,const char* szMountDrive=nullptr); + uint32_t UnmountInstalledDLC(const char* szMountDrive = nullptr); void GetMountedDLCFileList(const char* szMountDrive, std::vector& fileList); std::string GetMountedPath(std::string szMount); // Global title storage C4JStorage::ETMSStatus ReadTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,C4JStorage::eTMS_FileType eFileType, - wchar_t *pwchFilename,BYTE **ppBuffer,DWORD *pdwBufferSize,int( *Func)(void*, wchar_t *,int, bool, int)=nullptr,void* lpParam=nullptr, int iAction=0); - bool WriteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,wchar_t *pwchFilename,BYTE *pBuffer,DWORD dwBufferSize); + wchar_t *pwchFilename,uint8_t **ppBuffer,uint32_t *pdwBufferSize,int( *Func)(void*, wchar_t *,int, bool, int)=nullptr,void* lpParam=nullptr, int iAction=0); + bool WriteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,wchar_t *pwchFilename,uint8_t *pBuffer,uint32_t dwBufferSize); bool DeleteTMSFile(int iQuadrant,eGlobalStorage eStorageFacility,wchar_t *pwchFilename); void StoreTMSPathName(wchar_t *pwchName=NULL); // TMS++ - // C4JStorage::ETMSStatus TMSPP_WriteFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,C4JStorage::eTMS_UGCTYPE eUGCType,CHAR *pchFilePath,CHAR *pchBuffer,DWORD dwBufferSize,int( *Func)(void*,int,int)=nullptr,void* lpParam=nullptr, int iUserData=0); + // C4JStorage::ETMSStatus TMSPP_WriteFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,C4JStorage::eTMS_UGCTYPE eUGCType,char *pchFilePath,char *pchBuffer,uint32_t dwBufferSize,int( *Func)(void*,int,int)=nullptr,void* lpParam=nullptr, int iUserData=0); // C4JStorage::ETMSStatus TMSPP_GetUserQuotaInfo(int iPad,TMSCLIENT_CALLBACK Func,void* lpParam, int iUserData=0); C4JStorage::ETMSStatus TMSPP_ReadFile(int iPad,C4JStorage::eGlobalStorage eStorageFacility,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,const char* szFilename,int( *Func)(void*,int,int,PTMSPP_FILEDATA, const char*)=nullptr,void* lpParam=nullptr, int iUserData=0); - // C4JStorage::ETMSStatus TMSPP_ReadFileList(int iPad,C4JStorage::eGlobalStorage eStorageFacility,CHAR *pchFilePath,int( *Func)(void*,int,int,PTMSPP_FILE_LIST)=nullptr,void* lpParam=nullptr, int iUserData=0); + // C4JStorage::ETMSStatus TMSPP_ReadFileList(int iPad,C4JStorage::eGlobalStorage eStorageFacility,char *pchFilePath,int( *Func)(void*,int,int,PTMSPP_FILE_LIST)=nullptr,void* lpParam=nullptr, int iUserData=0); // C4JStorage::ETMSStatus TMSPP_DeleteFile(int iPad,const char* szFilePath,C4JStorage::eTMS_FILETYPEVAL eFileTypeVal,int( *Func)(void*,int,int),void* lpParam=nullptr, int iUserData=0); // bool TMSPP_InFileList(eGlobalStorage eStorageFacility, int iPad,const std::wstring &Filename); // unsigned int CRC(unsigned char *buf, int len); diff --git a/Minecraft.Client/Platform/Windows64/Minecraft_Macros.h b/Minecraft.Client/Platform/Windows64/Minecraft_Macros.h index 3dc8b7924..5700e4762 100644 --- a/Minecraft.Client/Platform/Windows64/Minecraft_Macros.h +++ b/Minecraft.Client/Platform/Windows64/Minecraft_Macros.h @@ -35,7 +35,7 @@ #define MAKE_SKIN_BITMASK(bDlcSkin, dwSkinId) ( (bDlcSkin?0x80000000:0) | (dwSkinId & 0x7FFFFFFF) ) #define IS_SKIN_ID_IN_RANGE(dwSkinId) (dwSkinId <= 0x7FFFFFFF) -#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x7FFFFFFF) -#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x7FFFFFE0) -#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask) (((DWORD)uiBitmask)&0x0000001F) -#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((((DWORD)uiBitmask)&0x80000000)?true:false) +#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask) (((uint32_t)uiBitmask)&0x7FFFFFFF) +#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask) (((uint32_t)uiBitmask)&0x7FFFFFE0) +#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask) (((uint32_t)uiBitmask)&0x0000001F) +#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((((uint32_t)uiBitmask)&0x80000000)?true:false) diff --git a/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h b/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h index e05a57ff9..0f5732165 100644 --- a/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h +++ b/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h @@ -29,12 +29,12 @@ private: ************************/ // 4J Stu - The first 4 bytes define a version number, that defines the - // structure of the data After reading those bytes into a DWORD, the + // structure of the data After reading those bytes into a uint32_t, the // remainder of the data should be the size of the relevant struct and can // be cast to the struct struct _dynamic_config_trial_data_version1 { // The time in seconds that the player can play the trial for - DWORD trialTimeSeconds; + uint32_t trialTimeSeconds; _dynamic_config_trial_data_version1() { trialTimeSeconds = DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; @@ -57,16 +57,16 @@ private: public: static void Tick(); - static DWORD GetTrialTime(); + static uint32_t GetTrialTime(); private: static void UpdateAllConfigurations(); static void UpdateNextConfiguration(); static void UpdateConfiguration(EDynamic_Configs id); - static void GetSizeCompletedCallback(HRESULT taskResult, + static void GetSizeCompletedCallback(int32_t taskResult, void* userCallbackData); - static void GetDataCompletedCallback(HRESULT taskResult, + static void GetDataCompletedCallback(int32_t taskResult, void* userCallbackData); };#pragma once @@ -99,12 +99,12 @@ private: ************************/ // 4J Stu - The first 4 bytes define a version number, that defines the - // structure of the data After reading those bytes into a DWORD, the + // structure of the data After reading those bytes into a uint32_t, the // remainder of the data should be the size of the relevant struct and can // be cast to the struct struct _dynamic_config_trial_data_version1 { // The time in seconds that the player can play the trial for - DWORD trialTimeSeconds; + uint32_t trialTimeSeconds; _dynamic_config_trial_data_version1() { trialTimeSeconds = DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME; @@ -127,15 +127,15 @@ private: public: static void Tick(); - static DWORD GetTrialTime(); + static uint32_t GetTrialTime(); private: static void UpdateAllConfigurations(); static void UpdateNextConfiguration(); static void UpdateConfiguration(EDynamic_Configs id); - static void GetSizeCompletedCallback(HRESULT taskResult, + static void GetSizeCompletedCallback(int32_t taskResult, void* userCallbackData); - static void GetDataCompletedCallback(HRESULT taskResult, + static void GetDataCompletedCallback(int32_t taskResult, void* userCallbackData); }; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Windows64/Sentient/SentientManager.h b/Minecraft.Client/Platform/Windows64/Sentient/SentientManager.h index 2c0c2ddfd..065b2a995 100644 --- a/Minecraft.Client/Platform/Windows64/Sentient/SentientManager.h +++ b/Minecraft.Client/Platform/Windows64/Sentient/SentientManager.h @@ -21,54 +21,54 @@ public: eTelemetry_EnemyKilledOrOvercome, }; - HRESULT Init(); - HRESULT Tick(); + int32_t Init(); + int32_t Tick(); - HRESULT Flush(); + int32_t Flush(); - bool RecordPlayerSessionStart(DWORD dwUserId); - bool RecordPlayerSessionExit(DWORD dwUserId, int exitStatus); - bool RecordHeartBeat(DWORD dwUserId); - bool RecordLevelStart(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, + bool RecordPlayerSessionStart(uint32_t dwUserId); + bool RecordPlayerSessionExit(uint32_t dwUserId, int exitStatus); + bool RecordHeartBeat(uint32_t dwUserId); + bool RecordLevelStart(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, - DWORD numberOfLocalPlayers, - DWORD numberOfOnlinePlayers); - bool RecordLevelExit(DWORD dwUserId, ESen_LevelExitStatus levelExitStatus); - bool RecordLevelSaveOrCheckpoint(DWORD dwUserId, INT saveOrCheckPointID, - INT saveSizeInBytes); - bool RecordLevelResume(DWORD dwUserId, ESen_FriendOrMatch friendsOrMatch, + uint32_t numberOfLocalPlayers, + uint32_t numberOfOnlinePlayers); + bool RecordLevelExit(uint32_t dwUserId, ESen_LevelExitStatus levelExitStatus); + bool RecordLevelSaveOrCheckpoint(uint32_t dwUserId, int32_t saveOrCheckPointID, + int32_t saveSizeInBytes); + bool RecordLevelResume(uint32_t dwUserId, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, - DWORD numberOfLocalPlayers, - DWORD numberOfOnlinePlayers, INT saveOrCheckPointID); - bool RecordPauseOrInactive(DWORD dwUserId); - bool RecordUnpauseOrActive(DWORD dwUserId); - bool RecordMenuShown(DWORD dwUserId, INT menuID, INT optionalMenuSubID); - bool RecordAchievementUnlocked(DWORD dwUserId, INT achievementID, - INT achievementGamerscore); - bool RecordMediaShareUpload(DWORD dwUserId, + uint32_t numberOfLocalPlayers, + uint32_t numberOfOnlinePlayers, int32_t saveOrCheckPointID); + bool RecordPauseOrInactive(uint32_t dwUserId); + bool RecordUnpauseOrActive(uint32_t dwUserId); + bool RecordMenuShown(uint32_t dwUserId, int32_t menuID, int32_t optionalMenuSubID); + bool RecordAchievementUnlocked(uint32_t dwUserId, int32_t achievementID, + int32_t achievementGamerscore); + bool RecordMediaShareUpload(uint32_t dwUserId, ESen_MediaDestination mediaDestination, ESen_MediaType mediaType); - bool RecordUpsellPresented(DWORD dwUserId, ESen_UpsellID upsellId, - INT marketplaceOfferID); - bool RecordUpsellResponded(DWORD dwUserId, ESen_UpsellID upsellId, - INT marketplaceOfferID, + bool RecordUpsellPresented(uint32_t dwUserId, ESen_UpsellID upsellId, + int32_t marketplaceOfferID); + bool RecordUpsellResponded(uint32_t dwUserId, ESen_UpsellID upsellId, + int32_t marketplaceOfferID, ESen_UpsellOutcome upsellOutcome); - bool RecordPlayerDiedOrFailed(DWORD dwUserId, INT lowResMapX, - INT lowResMapY, INT lowResMapZ, INT mapID, - INT playerWeaponID, INT enemyWeaponID, + bool RecordPlayerDiedOrFailed(uint32_t dwUserId, int32_t lowResMapX, + int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, + int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID); - bool RecordEnemyKilledOrOvercome(DWORD dwUserId, INT lowResMapX, - INT lowResMapY, INT lowResMapZ, INT mapID, - INT playerWeaponID, INT enemyWeaponID, + bool RecordEnemyKilledOrOvercome(uint32_t dwUserId, int32_t lowResMapX, + int32_t lowResMapY, int32_t lowResMapZ, int32_t mapID, + int32_t playerWeaponID, int32_t enemyWeaponID, ETelemetryChallenges enemyTypeID); - bool RecordSkinChanged(DWORD dwUserId, DWORD dwSkinId); - bool RecordBanLevel(DWORD dwUserId); - bool RecordUnBanLevel(DWORD dwUserId); + bool RecordSkinChanged(uint32_t dwUserId, uint32_t dwSkinId); + bool RecordBanLevel(uint32_t dwUserId); + bool RecordUnBanLevel(uint32_t dwUserId); - INT GetMultiplayerInstanceID(); - INT GenerateMultiplayerInstanceId(); - void SetMultiplayerInstanceId(INT value); + int32_t GetMultiplayerInstanceID(); + int32_t GenerateMultiplayerInstanceId(); + void SetMultiplayerInstanceId(int32_t value); private: float m_initialiseTime; @@ -77,24 +77,24 @@ private: float m_fLevelStartTime[XUSER_MAX_COUNT]; - INT m_multiplayerInstanceID; - DWORD m_levelInstanceID; + int32_t m_multiplayerInstanceID; + uint32_t m_levelInstanceID; // Helper functions to get the various common settings - INT GetSecondsSinceInitialize(); - INT GetMode(DWORD dwUserId); - INT GetSubMode(DWORD dwUserId); - INT GetLevelId(DWORD dwUserId); - INT GetSubLevelId(DWORD dwUserId); - INT GetTitleBuildId(); - INT GetLevelInstanceID(); - INT GetSingleOrMultiplayer(); - INT GetDifficultyLevel(INT diff); - INT GetLicense(); - INT GetDefaultGameControls(); - INT GetAudioSettings(DWORD dwUserId); - INT GetLevelExitProgressStat1(); - INT GetLevelExitProgressStat2(); + int32_t GetSecondsSinceInitialize(); + int32_t GetMode(uint32_t dwUserId); + int32_t GetSubMode(uint32_t dwUserId); + int32_t GetLevelId(uint32_t dwUserId); + int32_t GetSubLevelId(uint32_t dwUserId); + int32_t GetTitleBuildId(); + int32_t GetLevelInstanceID(); + int32_t GetSingleOrMultiplayer(); + int32_t GetDifficultyLevel(int32_t diff); + int32_t GetLicense(); + int32_t GetDefaultGameControls(); + int32_t GetAudioSettings(uint32_t dwUserId); + int32_t GetLevelExitProgressStat1(); + int32_t GetLevelExitProgressStat2(); }; extern CSentientManager SentientManager; \ No newline at end of file diff --git a/Minecraft.Client/Platform/Windows64/Sentient/SentientStats.h b/Minecraft.Client/Platform/Windows64/Sentient/SentientStats.h index 8b05924c3..d82d13978 100644 --- a/Minecraft.Client/Platform/Windows64/Sentient/SentientStats.h +++ b/Minecraft.Client/Platform/Windows64/Sentient/SentientStats.h @@ -12,77 +12,77 @@ // PlayerSessionStart // Player signed in or joined -bool SenStatPlayerSessionStart ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT TitleBuildID, INT SkeletonDistanceInInches, INT EnrollmentType, INT NumberOfSkeletonsInView ); +bool SenStatPlayerSessionStart ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t TitleBuildID, int32_t SkeletonDistanceInInches, int32_t EnrollmentType, int32_t NumberOfSkeletonsInView ); // PlayerSessionExit // Player signed out or left -bool SenStatPlayerSessionExit ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID ); +bool SenStatPlayerSessionExit ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID ); // HeartBeat // Sent every 60 seconds by title -bool SenStatHeartBeat ( DWORD dwUserID, INT SecondsSinceInitialize ); +bool SenStatHeartBeat ( uint32_t dwUserID, int32_t SecondsSinceInitialize ); // LevelStart // Level started -bool SenStatLevelStart ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SingleOrMultiplayer, INT FriendsOrMatch, INT CompeteOrCoop, INT DifficultyLevel, INT NumberOfLocalPlayers, INT NumberOfOnlinePlayers, INT License, INT DefaultGameControls, INT AudioSettings, INT SkeletonDistanceInInches, INT NumberOfSkeletonsInView ); +bool SenStatLevelStart ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SingleOrMultiplayer, int32_t FriendsOrMatch, int32_t CompeteOrCoop, int32_t DifficultyLevel, int32_t NumberOfLocalPlayers, int32_t NumberOfOnlinePlayers, int32_t License, int32_t DefaultGameControls, int32_t AudioSettings, int32_t SkeletonDistanceInInches, int32_t NumberOfSkeletonsInView ); // LevelExit // Level exited -bool SenStatLevelExit ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LevelExitStatus, INT LevelExitProgressStat1, INT LevelExitProgressStat2, INT LevelDurationInSeconds ); +bool SenStatLevelExit ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LevelExitStatus, int32_t LevelExitProgressStat1, int32_t LevelExitProgressStat2, int32_t LevelDurationInSeconds ); // LevelSaveOrCheckpoint // Level saved explicitly or implicitly -bool SenStatLevelSaveOrCheckpoint ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LevelExitProgressStat1, INT LevelExitProgressStat2, INT LevelDurationInSeconds, INT SaveOrCheckPointID ); +bool SenStatLevelSaveOrCheckpoint ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LevelExitProgressStat1, int32_t LevelExitProgressStat2, int32_t LevelDurationInSeconds, int32_t SaveOrCheckPointID ); // LevelResume // Level resumed from a save or restarted at a checkpoint -bool SenStatLevelResume ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SingleOrMultiplayer, INT FriendsOrMatch, INT CompeteOrCoop, INT DifficultyLevel, INT NumberOfLocalPlayers, INT NumberOfOnlinePlayers, INT License, INT DefaultGameControls, INT SaveOrCheckPointID, INT AudioSettings, INT SkeletonDistanceInInches, INT NumberOfSkeletonsInView ); +bool SenStatLevelResume ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SingleOrMultiplayer, int32_t FriendsOrMatch, int32_t CompeteOrCoop, int32_t DifficultyLevel, int32_t NumberOfLocalPlayers, int32_t NumberOfOnlinePlayers, int32_t License, int32_t DefaultGameControls, int32_t SaveOrCheckPointID, int32_t AudioSettings, int32_t SkeletonDistanceInInches, int32_t NumberOfSkeletonsInView ); // PauseOrInactive // Player paused game or has become inactive, level and mode are for what the player is leaving -bool SenStatPauseOrInactive ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatPauseOrInactive ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // UnpauseOrActive // Player unpaused game or has become active, level and mode are for what the player is entering into -bool SenStatUnpauseOrActive ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatUnpauseOrActive ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // MenuShown // A menu screen or major menu area has been shown -bool SenStatMenuShown ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT MenuID, INT OptionalMenuSubID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatMenuShown ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t MenuID, int32_t OptionalMenuSubID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // AchievementUnlocked // An achievement was unlocked -bool SenStatAchievementUnlocked ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT AchievementID, INT AchievementGamerscore ); +bool SenStatAchievementUnlocked ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t AchievementID, int32_t AchievementGamerscore ); // MediaShareUpload // The user uploaded something to Kinect Share -bool SenStatMediaShareUpload ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT MediaDestination, INT MediaType ); +bool SenStatMediaShareUpload ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t MediaDestination, int32_t MediaType ); // UpsellPresented // The user is shown an upsell to purchase something -bool SenStatUpsellPresented ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT UpsellID, INT MarketplaceOfferID ); +bool SenStatUpsellPresented ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t UpsellID, int32_t MarketplaceOfferID ); // UpsellResponded // The user responded to the upsell -bool SenStatUpsellResponded ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT UpsellID, INT MarketplaceOfferID, INT UpsellOutcome ); +bool SenStatUpsellResponded ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t UpsellID, int32_t MarketplaceOfferID, int32_t UpsellOutcome ); // PlayerDiedOrFailed // The player died or failed a challenge - can be used for many types of failure -bool SenStatPlayerDiedOrFailed ( DWORD dwUserID, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LowResMapX, INT LowResMapY, INT LowResMapZ, INT MapID, INT PlayerWeaponID, INT EnemyWeaponID, INT EnemyTypeID, INT SecondsSinceInitialize, INT CopyOfSecondsSinceInitialize ); +bool SenStatPlayerDiedOrFailed ( uint32_t dwUserID, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LowResMapX, int32_t LowResMapY, int32_t LowResMapZ, int32_t MapID, int32_t PlayerWeaponID, int32_t EnemyWeaponID, int32_t EnemyTypeID, int32_t SecondsSinceInitialize, int32_t CopyOfSecondsSinceInitialize ); // EnemyKilledOrOvercome // The player killed an enemy or overcame or solved a major challenge -bool SenStatEnemyKilledOrOvercome ( DWORD dwUserID, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT LowResMapX, INT LowResMapY, INT LowResMapZ, INT MapID, INT PlayerWeaponID, INT EnemyWeaponID, INT EnemyTypeID, INT SecondsSinceInitialize, INT CopyOfSecondsSinceInitialize ); +bool SenStatEnemyKilledOrOvercome ( uint32_t dwUserID, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t LowResMapX, int32_t LowResMapY, int32_t LowResMapZ, int32_t MapID, int32_t PlayerWeaponID, int32_t EnemyWeaponID, int32_t EnemyTypeID, int32_t SecondsSinceInitialize, int32_t CopyOfSecondsSinceInitialize ); // SkinChanged // The player has changed their skin, level and mode are for what the player is currently in -bool SenStatSkinChanged ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID, INT SkinID ); +bool SenStatSkinChanged ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID, int32_t SkinID ); // BanLevel // The player has banned a level, level and mode are for what the player is currently in and banning -bool SenStatBanLevel ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatBanLevel ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); // UnBanLevel // The player has ubbanned a level, level and mode are for what the player is currently in and unbanning -bool SenStatUnBanLevel ( DWORD dwUserID, INT SecondsSinceInitialize, INT ModeID, INT OptionalSubModeID, INT LevelID, INT OptionalSubLevelID, INT LevelInstanceID, INT MultiplayerInstanceID ); +bool SenStatUnBanLevel ( uint32_t dwUserID, int32_t SecondsSinceInitialize, int32_t ModeID, int32_t OptionalSubModeID, int32_t LevelID, int32_t OptionalSubLevelID, int32_t LevelInstanceID, int32_t MultiplayerInstanceID ); diff --git a/Minecraft.Client/Platform/Windows64/Social/SocialManager.h b/Minecraft.Client/Platform/Windows64/Social/SocialManager.h index 8d0874710..72051c74d 100644 --- a/Minecraft.Client/Platform/Windows64/Social/SocialManager.h +++ b/Minecraft.Client/Platform/Windows64/Social/SocialManager.h @@ -35,18 +35,18 @@ private: static CSocialManager* m_pInstance; // Bitset of title posting capability flags ( XSOCIAL_CAPABILITY_POSTIMAGE, XSOCIAL_CAPABILITY_POSTLINK ). - DWORD m_dwSocialPostingCapability; + uint32_t m_dwSocialPostingCapability; // Index of user who made current active request. - DWORD m_dwCurrRequestUser; + uint32_t m_dwCurrRequestUser; // WESTY : Not sure if we even need to get social access key! /* // Size of the social network access key text buffer. - DWORD m_dwAccessKeyTextSize; + uint32_t m_dwAccessKeyTextSize; // Pointer to the social network access key text buffer. - LPWSTR m_pAccessKeyText; + wchar_t* m_pAccessKeyText; */ // The various states of the manager. @@ -65,7 +65,7 @@ private: // For xsocial asyncronous operations. XOVERLAPPED m_Overlapped; - DWORD m_dwOverlappedResultCode; + uint32_t m_dwOverlappedResultCode; // Social post preview image struct. XSOCIAL_PREVIEWIMAGE m_PostPreviewImage; @@ -73,14 +73,14 @@ private: // Image details for posting an image to social network. unsigned char* m_pMainImageBuffer; - DWORD m_dwMainImageBufferSize; + uint32_t m_dwMainImageBufferSize; void DestroyMainPostImage(); void DestroyPreviewPostImage(); // WESTY : Not sure if we even need to get social access key! /* - bool GetSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect, DWORD dwUserTrackingIndex, bool bShowNetworkSignin ); + bool GetSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect, uint32_t dwUserTrackingIndex, bool bShowNetworkSignin ); */ public: @@ -109,17 +109,17 @@ public: bool AreAllUsersAllowedToPostImages(); // Post a test link to social network. - bool PostLinkToSocialNetwork( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ); + bool PostLinkToSocialNetwork( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect ); // Post a test image to social network. - bool PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ); + bool PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect ); void SetSocialPostText(const wchar_t* Title, const wchar_t* Caption, const wchar_t* Desc); // WESTY : Not sure if we even need to get social access key! /* // We do not currently know what this is used for. We may not even need it? - bool ObtainSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ); + bool ObtainSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, uint32_t dwUserIndex, bool bUsingKinect ); */ private: diff --git a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp index ec705d714..1c90eca18 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp @@ -37,7 +37,7 @@ #include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h" HINSTANCE hMyInst; -LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK DlgProc(HWND hWndDlg, uint32_t Msg, WPARAM wParam, LPARAM lParam); char chGlobalText[256]; uint16_t ui16GlobalText[256]; @@ -55,7 +55,7 @@ uint16_t ui16GlobalText[256]; // #define PROFILE_VERSION 3 // new version for the interim bug fix 166 TU #define NUM_PROFILE_VALUES 5 #define NUM_PROFILE_SETTINGS 4 -DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = { +uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = { 0, 0, 0, 0, 0 }; @@ -66,7 +66,7 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = { // running for a long time. //------------------------------------------------------------------------------------- -bool g_bWidescreen = TRUE; +bool g_bWidescreen = true; int g_iScreenWidth = 1920; int g_iScreenHeight = 1080; @@ -398,7 +398,7 @@ ID3D11DepthStencilView* g_pDepthStencilView = nullptr; ID3D11Texture2D* g_pDepthStencilBuffer = nullptr; // -// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) +// FUNCTION: WndProc(HWND, uint32_t, WPARAM, LPARAM) // // PURPOSE: Processes messages for the main window. // @@ -407,7 +407,7 @@ ID3D11Texture2D* g_pDepthStencilBuffer = nullptr; // WM_DESTROY - post a quit message and return // // -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, +LRESULT CALLBACK WndProc(HWND hWnd, uint32_t message, WPARAM wParam, LPARAM lParam) { int wmId, wmEvent; PAINTSTRUCT ps; @@ -481,7 +481,7 @@ bool InitInstance(HINSTANCE hInstance, int nCmdShow) { RECT wr = {0, 0, g_iScreenWidth, g_iScreenHeight}; // set the size, but not the position - AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, FALSE); // adjust the size + AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, false); // adjust the size g_hWnd = CreateWindow("MinecraftClass", "Minecraft", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, @@ -490,13 +490,13 @@ bool InitInstance(HINSTANCE hInstance, int nCmdShow) { nullptr, nullptr, hInstance, nullptr); if (!g_hWnd) { - return FALSE; + return false; } ShowWindow(g_hWnd, nCmdShow); UpdateWindow(g_hWnd); - return TRUE; + return true; } // 4J Stu - These functions are referenced from the Windows Input library @@ -520,10 +520,10 @@ void SeedEditBox() { } //--------------------------------------------------------------------------- -LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { +LRESULT CALLBACK DlgProc(HWND hWndDlg, uint32_t Msg, WPARAM wParam, LPARAM lParam) { switch (Msg) { case WM_INITDIALOG: - return TRUE; + return true; case WM_COMMAND: switch (wParam) { @@ -531,30 +531,30 @@ LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { // Set the text GetDlgItemText(hWndDlg, IDC_EDIT, chGlobalText, 256); EndDialog(hWndDlg, 0); - return TRUE; + return true; } break; } - return FALSE; + return false; } //-------------------------------------------------------------------------------------- // Create Direct3D device and swap chain //-------------------------------------------------------------------------------------- -HRESULT InitDevice() { - HRESULT hr = S_OK; +int32_t InitDevice() { + int32_t hr = S_OK; RECT rc; GetClientRect(g_hWnd, &rc); - UINT width = rc.right - rc.left; - UINT height = rc.bottom - rc.top; + uint32_t width = rc.right - rc.left; + uint32_t height = rc.bottom - rc.top; // app.DebugPrintf("width: %d, height: %d\n", width, height); width = g_iScreenWidth; height = g_iScreenHeight; app.DebugPrintf("width: %d, height: %d\n", width, height); - UINT createDeviceFlags = 0; + uint32_t createDeviceFlags = 0; #if defined(_DEBUG) createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; #endif @@ -564,14 +564,14 @@ HRESULT InitDevice() { D3D_DRIVER_TYPE_WARP, D3D_DRIVER_TYPE_REFERENCE, }; - UINT numDriverTypes = ARRAYSIZE(driverTypes); + uint32_t numDriverTypes = ARRAYSIZE(driverTypes); D3D_FEATURE_LEVEL featureLevels[] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0, }; - UINT numFeatureLevels = ARRAYSIZE(featureLevels); + uint32_t numFeatureLevels = ARRAYSIZE(featureLevels); DXGI_SWAP_CHAIN_DESC sd; ZeroMemory(&sd, sizeof(sd)); @@ -585,9 +585,9 @@ HRESULT InitDevice() { sd.OutputWindow = g_hWnd; sd.SampleDesc.Count = 1; sd.SampleDesc.Quality = 0; - sd.Windowed = TRUE; + sd.Windowed = true; - for (UINT driverTypeIndex = 0; driverTypeIndex < numDriverTypes; + for (uint32_t driverTypeIndex = 0; driverTypeIndex < numDriverTypes; driverTypeIndex++) { g_driverType = driverTypes[driverTypeIndex]; hr = D3D11CreateDeviceAndSwapChain( @@ -639,8 +639,8 @@ HRESULT InitDevice() { // Setup the viewport D3D11_VIEWPORT vp; - vp.Width = (FLOAT)width; - vp.Height = (FLOAT)height; + vp.Width = (float)width; + vp.Height = (float)height; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; vp.TopLeftX = 0; @@ -704,7 +704,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, // Perform application initialization: if (!InitInstance(hInstance, nCmdShow)) { - return FALSE; + return false; } hMyInst = hInstance; @@ -933,9 +933,9 @@ volatile size_t sizeCheckMin = 1160; volatile size_t sizeCheckMax = 1160; volatile int sectCheck = 48; CRITICAL_SECTION memCS; -DWORD tlsIdx; +uint32_t tlsIdx; -void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) { +void* XMemAlloc(size_t dwSize, uint32_t dwAllocAttributes) { if (!trackStarted) { void* p = XMemAllocDefault(dwSize, dwAllocAttributes); size_t realSize = XMemSizeDefault(p, dwAllocAttributes); @@ -976,22 +976,22 @@ void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) { void* operator new(size_t size) { return (unsigned char*)XMemAlloc( size, MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP)); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP)); } void operator delete(void* p) { XMemFree(p, MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP)); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP)); } -void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) { +void WINAPI XMemFree(void* pAddress, uint32_t dwAllocAttributes) { bool special = false; if (dwAllocAttributes == 0) { dwAllocAttributes = MAKE_XALLOC_ATTRIBUTES( - 0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, - XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP); + 0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT, + XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP); special = true; } if (!trackStarted) { @@ -1018,7 +1018,7 @@ void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) { LeaveCriticalSection(&memCS); } -size_t WINAPI XMemSize(void* pAddress, DWORD dwAllocAttributes) { +size_t WINAPI XMemSize(void* pAddress, uint32_t dwAllocAttributes) { if (trackStarted) { return XMemSizeDefault(pAddress, dwAllocAttributes) - 16; } else { diff --git a/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h b/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h index dede9794d..21a9f91d0 100644 --- a/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h +++ b/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h @@ -28,10 +28,10 @@ namespace ATG #define E_INVALID_XML_SYNTAX MAKE_HRESULT(1, _ATGFAC, 0x0002 ) -CONST UINT XML_MAX_ATTRIBUTES_PER_ELEMENT = 32; -CONST UINT XML_MAX_NAME_LENGTH = 128; -CONST UINT XML_READ_BUFFER_SIZE = 2048; -CONST UINT XML_WRITE_BUFFER_SIZE = 2048; +const uint32_t XML_MAX_ATTRIBUTES_PER_ELEMENT = 32; +const uint32_t XML_MAX_NAME_LENGTH = 128; +const uint32_t XML_READ_BUFFER_SIZE = 2048; +const uint32_t XML_WRITE_BUFFER_SIZE = 2048; // No tag can be longer than XML_WRITE_BUFFER_SIZE - an error will be returned if // it is @@ -40,9 +40,9 @@ CONST UINT XML_WRITE_BUFFER_SIZE = 2048; struct XMLAttribute { wchar_t* strName; - UINT NameLen; + uint32_t NameLen; wchar_t* strValue; - UINT ValueLen; + uint32_t ValueLen; }; //------------------------------------------------------------------------------------- @@ -53,30 +53,30 @@ public: ISAXCallback() {}; virtual ~ISAXCallback() {}; - virtual HRESULT StartDocument() = 0; - virtual HRESULT EndDocument() = 0; + virtual int32_t StartDocument() = 0; + virtual int32_t EndDocument() = 0; - virtual HRESULT ElementBegin( CONST wchar_t* strName, UINT NameLen, - CONST XMLAttribute *pAttributes, UINT NumAttributes ) = 0; - virtual HRESULT ElementContent( CONST wchar_t *strData, UINT DataLen, bool More ) = 0; - virtual HRESULT ElementEnd( CONST wchar_t *strName, UINT NameLen ) = 0; + virtual int32_t ElementBegin( const wchar_t* strName, uint32_t NameLen, + const XMLAttribute *pAttributes, uint32_t NumAttributes ) = 0; + virtual int32_t ElementContent( const wchar_t *strData, uint32_t DataLen, bool More ) = 0; + virtual int32_t ElementEnd( const wchar_t *strName, uint32_t NameLen ) = 0; - virtual HRESULT CDATABegin( ) = 0; - virtual HRESULT CDATAData( CONST wchar_t *strCDATA, UINT CDATALen, bool bMore ) = 0; - virtual HRESULT CDATAEnd( ) = 0; + virtual int32_t CDATABegin( ) = 0; + virtual int32_t CDATAData( const wchar_t *strCDATA, uint32_t CDATALen, bool bMore ) = 0; + virtual int32_t CDATAEnd( ) = 0; - virtual void Error( HRESULT hError, CONST CHAR *strMessage ) = 0; + virtual void Error( int32_t hError, const char *strMessage ) = 0; - virtual void SetParseProgress( DWORD dwProgress ) { } + virtual void SetParseProgress( uint32_t dwProgress ) { } - const CHAR* GetFilename() { return m_strFilename; } - UINT GetLineNumber() { return m_LineNum; } - UINT GetLinePosition() { return m_LinePos; } + const char* GetFilename() { return m_strFilename; } + uint32_t GetLineNumber() { return m_LineNum; } + uint32_t GetLinePosition() { return m_LinePos; } private: - CONST CHAR *m_strFilename; - UINT m_LineNum; - UINT m_LinePos; + const char *m_strFilename; + uint32_t m_LineNum; + uint32_t m_LinePos; }; @@ -100,53 +100,53 @@ public: // E_ABORT - callback returned a fail code // S_OK - file parsed and completed - HRESULT ParseXMLFile( CONST CHAR *strFilename ); + int32_t ParseXMLFile( const char *strFilename ); // Parses from a buffer- if you pass a wchar_t buffer (and cast it), it will // correctly detect it and use unicode instead. Return codes are the // same as for ParseXMLFile - HRESULT ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ); + int32_t ParseXMLBuffer( const char* strBuffer, uint32_t uBufferSize ); private: - HRESULT MainParseLoop(); + int32_t MainParseLoop(); - HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); + int32_t AdvanceCharacter( bool bOkToFail = false ); void SkipNextAdvance(); - HRESULT ConsumeSpace(); - HRESULT ConvertEscape(); - HRESULT AdvanceElement(); - HRESULT AdvanceName(); - HRESULT AdvanceAttrVal(); - HRESULT AdvanceCDATA(); - HRESULT AdvanceComment(); + int32_t ConsumeSpace(); + int32_t ConvertEscape(); + int32_t AdvanceElement(); + int32_t AdvanceName(); + int32_t AdvanceAttrVal(); + int32_t AdvanceCDATA(); + int32_t AdvanceComment(); void FillBuffer(); #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation - void Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); + void Error( int32_t hRet, _In_z_ _Printf_format_string_ const char* strFormat, ... ); #else - void Error( HRESULT hRet, CONST CHAR* strFormat, ... ); + void Error( int32_t hRet, const char* strFormat, ... ); #endif ISAXCallback* m_pISAXCallback; - HANDLE m_hFile; - CONST CHAR* m_pInXMLBuffer; - UINT m_uInXMLBufferCharsLeft; - DWORD m_dwCharsTotal; - DWORD m_dwCharsConsumed; + void* m_hFile; + const char* m_pInXMLBuffer; + uint32_t m_uInXMLBufferCharsLeft; + uint32_t m_dwCharsTotal; + uint32_t m_dwCharsConsumed; - BYTE m_pReadBuf[ XML_READ_BUFFER_SIZE + 2 ]; // room for a trailing NULL + uint8_t m_pReadBuf[ XML_READ_BUFFER_SIZE + 2 ]; // room for a trailing NULL wchar_t m_pWriteBuf[ XML_WRITE_BUFFER_SIZE ]; - BYTE* m_pReadPtr; + uint8_t* m_pReadPtr; wchar_t* 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_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 diff --git a/Minecraft.Client/Platform/extraX64client.h b/Minecraft.Client/Platform/extraX64client.h index b9c9d3d86..d4b341620 100644 --- a/Minecraft.Client/Platform/extraX64client.h +++ b/Minecraft.Client/Platform/extraX64client.h @@ -7,7 +7,7 @@ typedef enum _XBACKGROUND_DOWNLOAD_MODE XBACKGROUND_DOWNLOAD_MODE_AUTO = 2 } XBACKGROUND_DOWNLOAD_MODE, *PXBACKGROUND_DOWNLOAD_MODE; -DWORD XBackgroundDownloadSetMode( +uint32_t XBackgroundDownloadSetMode( XBACKGROUND_DOWNLOAD_MODE Mode ); @@ -16,33 +16,33 @@ DWORD XBackgroundDownloadSetMode( #define XPARTY_MAX_USERS 4 typedef struct _XPARTY_USER_INFO { PlayerUID Xuid; - CHAR GamerTag[XUSER_NAME_SIZE]; - DWORD dwUserIndex; + char GamerTag[XUSER_NAME_SIZE]; + uint32_t dwUserIndex; // XONLINE_NAT_TYPE NatType; - DWORD dwTitleId; - DWORD dwFlags; + uint32_t dwTitleId; + uint32_t dwFlags; // XSESSION_INFO SessionInfo; // XPARTY_CUSTOM_DATA CustomData; } XPARTY_USER_INFO; typedef struct _XPARTY_USER_LIST { - DWORD dwUserCount; + uint32_t dwUserCount; XPARTY_USER_INFO Users[XPARTY_MAX_USERS]; } XPARTY_USER_LIST; -DWORD XShowPartyUI(DWORD dwUserIndex); -DWORD XShowFriendsUI(DWORD dwUserIndex); -HRESULT XPartyGetUserList(XPARTY_USER_LIST *pUserList); +uint32_t XShowPartyUI(uint32_t dwUserIndex); +uint32_t XShowFriendsUI(uint32_t dwUserIndex); +int32_t XPartyGetUserList(XPARTY_USER_LIST *pUserList); -DWORD XContentGetThumbnail(DWORD dwUserIndex, const XCONTENT_DATA *pContentData, PBYTE pbThumbnail, PDWORD pcbThumbnail, PXOVERLAPPED *pOverlapped); +uint32_t XContentGetThumbnail(uint32_t dwUserIndex, const XCONTENT_DATA *pContentData, uint8_t* pbThumbnail, uint32_t* pcbThumbnail, PXOVERLAPPED *pOverlapped); void XShowAchievementsUI(int i); -DWORD XUserAreUsersFriends( - DWORD dwUserIndex, +uint32_t XUserAreUsersFriends( + uint32_t dwUserIndex, PPlayerUID pXuids, - DWORD dwXuidCount, + uint32_t dwXuidCount, bool* pfResult, void *pOverlapped); @@ -56,8 +56,8 @@ class XSOCIAL_LINKPOSTPARAMS typedef struct _XSESSION_VIEW_PROPERTIES { - DWORD dwViewId; - DWORD dwNumProperties; + uint32_t dwViewId; + uint32_t dwNumProperties; XUSER_PROPERTY *pProperties; } XSESSION_VIEW_PROPERTIES; @@ -65,37 +65,37 @@ typedef struct _XSESSION_VIEW_PROPERTIES typedef struct _XUSER_STATS_SPEC { - DWORD dwViewId; - DWORD dwNumColumnIds; - WORD rgwColumnIds[XUSER_STATS_ATTRS_IN_SPEC]; + uint32_t dwViewId; + uint32_t dwNumColumnIds; + uint16_t rgwColumnIds[XUSER_STATS_ATTRS_IN_SPEC]; } XUSER_STATS_SPEC, *PXUSER_STATS_SPEC; typedef struct _XUSER_STATS_COLUMN { - WORD wColumnId; + uint16_t wColumnId; XUSER_DATA Value; } XUSER_STATS_COLUMN, *PXUSER_STATS_COLUMN; typedef struct _XUSER_STATS_ROW { PlayerUID xuid; - DWORD dwRank; - LONGLONG i64Rating; - CHAR szGamertag[XUSER_NAME_SIZE]; - DWORD dwNumColumns; + uint32_t dwRank; + int64_t i64Rating; + char szGamertag[XUSER_NAME_SIZE]; + uint32_t dwNumColumns; PXUSER_STATS_COLUMN pColumns; } XUSER_STATS_ROW, *PXUSER_STATS_ROW; typedef struct _XUSER_STATS_VIEW { - DWORD dwViewId; - DWORD dwTotalViewRows; - DWORD dwNumRows; + uint32_t dwViewId; + uint32_t dwTotalViewRows; + uint32_t dwNumRows; PXUSER_STATS_ROW pRows; } XUSER_STATS_VIEW, *PXUSER_STATS_VIEW; typedef struct _XUSER_STATS_READ_RESULTS { - DWORD dwNumViews; + uint32_t dwNumViews; PXUSER_STATS_VIEW pViews; } XUSER_STATS_READ_RESULTS, *PXUSER_STATS_READ_RESULTS; diff --git a/Minecraft.Client/Platform/stdafx.h b/Minecraft.Client/Platform/stdafx.h index 9d840b274..85fbc0205 100644 --- a/Minecraft.Client/Platform/stdafx.h +++ b/Minecraft.Client/Platform/stdafx.h @@ -33,7 +33,7 @@ #include using namespace DirectX; -#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) +#define HRESULT_SUCCEEDED(hr) (((int32_t)(hr)) >= 0) #endif diff --git a/Minecraft.Client/Player/LocalPlayer.h b/Minecraft.Client/Player/LocalPlayer.h index 9b7ed26b7..5348876a2 100644 --- a/Minecraft.Client/Player/LocalPlayer.h +++ b/Minecraft.Client/Player/LocalPlayer.h @@ -190,8 +190,8 @@ public: // Minecraft.Client virtual void onCrafted(std::shared_ptr item); - virtual void setAndBroadcastCustomSkin(DWORD skinId); - virtual void setAndBroadcastCustomCape(DWORD capeId); + virtual void setAndBroadcastCustomSkin(uint32_t skinId); + virtual void setAndBroadcastCustomCape(uint32_t capeId); private: bool isSolidBlock(int x, int y, int z); diff --git a/Minecraft.Client/Player/MultiPlayerLocalPlayer.h b/Minecraft.Client/Player/MultiPlayerLocalPlayer.h index b40e28752..a68e7ee02 100644 --- a/Minecraft.Client/Player/MultiPlayerLocalPlayer.h +++ b/Minecraft.Client/Player/MultiPlayerLocalPlayer.h @@ -82,7 +82,7 @@ public: virtual void sendOpenInventory(); // 4J - send the custom skin texture data if there is one - // void CustomSkin(PBYTE pbData, DWORD dwBytes); + // void CustomSkin(uint8_t* pbData, uint32_t dwBytes); // 4J Overriding this so we can flag an event for the tutorial virtual void ride(std::shared_ptr e); @@ -91,8 +91,8 @@ public: virtual void StopSleeping(); // 4J Added - virtual void setAndBroadcastCustomSkin(DWORD skinId); - virtual void setAndBroadcastCustomCape(DWORD capeId); + virtual void setAndBroadcastCustomSkin(uint32_t skinId); + virtual void setAndBroadcastCustomCape(uint32_t capeId); // 4J added for testing #ifdef STRESS_TEST_MOVE diff --git a/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.h b/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.h index 505346a5f..4a28aec0d 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.h +++ b/Minecraft.Client/Rendering/EntityRenderers/ChestRenderer.h @@ -14,7 +14,7 @@ private: ChestModel* chestModel; ChestModel* largeChestModel; - boolean xmasTextures; + bool xmasTextures; public: ChestRenderer(); diff --git a/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp index 9f1e6c31d..4d54f0b7f 100644 --- a/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp +++ b/Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp @@ -302,9 +302,9 @@ void PlayerRenderer::additionalRendering(std::shared_ptr _mob, } // 4J: removed - /*boolean loaded = mob->getCloakTexture()->isLoaded(); -boolean b1 = !mob->isInvisible(); -boolean b2 = !mob->isCapeHidden();*/ + /*bool loaded = mob->getCloakTexture()->isLoaded(); +bool b1 = !mob->isInvisible(); +bool b2 = !mob->isCapeHidden();*/ if (bindTexture(mob->customTextureUrl2, L"") && !mob->isInvisible()) { glPushMatrix(); glTranslatef(0, 0, 2 / 16.0f); diff --git a/Minecraft.Client/Rendering/GameRenderer.cpp b/Minecraft.Client/Rendering/GameRenderer.cpp index 635264322..fc429f5c2 100644 --- a/Minecraft.Client/Rendering/GameRenderer.cpp +++ b/Minecraft.Client/Rendering/GameRenderer.cpp @@ -328,7 +328,7 @@ void GameRenderer::pick(float a) { std::shared_ptr ridingEntity = mc->cameraTargetPlayer->riding; // 4jcraft: compare the mounted entity explicitly so riding the hit - // target does not get collapsed into a boolean/null comparison. + // target does not get collapsed into a bool/null comparison. if (ridingEntity != nullptr && e == ridingEntity) { if (nearest == 0) { hovered = e; diff --git a/Minecraft.Client/Rendering/Models/ModelPart.h b/Minecraft.Client/Rendering/Models/ModelPart.h index 9d71b297a..778420184 100644 --- a/Minecraft.Client/Rendering/Models/ModelPart.h +++ b/Minecraft.Client/Rendering/Models/ModelPart.h @@ -24,7 +24,7 @@ public: private: std::wstring id; int xTexOffs, yTexOffs; - boolean compiled; + bool compiled; int list; Model* model; diff --git a/Minecraft.Client/Rendering/Tesselator.h b/Minecraft.Client/Rendering/Tesselator.h index 7fc2c5556..3b3b5db58 100644 --- a/Minecraft.Client/Rendering/Tesselator.h +++ b/Minecraft.Client/Rendering/Tesselator.h @@ -3,7 +3,7 @@ class ChunkRebuildData; class Tesselator { - // private static boolean TRIANGLE_MODE = false; + // private static bool TRIANGLE_MODE = false; friend ChunkRebuildData; private: diff --git a/Minecraft.Client/Textures/BufferedImage.cpp b/Minecraft.Client/Textures/BufferedImage.cpp index e9ab94fde..2dd13ef83 100644 --- a/Minecraft.Client/Textures/BufferedImage.cpp +++ b/Minecraft.Client/Textures/BufferedImage.cpp @@ -36,7 +36,7 @@ BufferedImage::BufferedImage(const std::wstring& File, bool filenameHasExtension, bool bTitleUpdateTexture, const std::wstring& drive) { - HRESULT hr = -1; + int32_t hr = -1; std::wstring filePath = File; for (size_t i = 0; i < filePath.length(); ++i) { @@ -118,7 +118,7 @@ BufferedImage::BufferedImage(const std::wstring& File, } BufferedImage::BufferedImage(DLCPack* dlcPack, const std::wstring& File, bool filenameHasExtension) { - HRESULT hr; + int32_t hr; std::wstring filePath = File; std::uint8_t* pbData = nullptr; std::uint32_t dataBytes = 0; @@ -162,7 +162,7 @@ BufferedImage::BufferedImage(std::uint8_t* pbData, std::uint32_t dataBytes) { D3DXIMAGE_INFO ImageInfo; ZeroMemory(&ImageInfo, sizeof(D3DXIMAGE_INFO)); - HRESULT hr = + int32_t hr = RenderManager.LoadTextureData(pbData, dataBytes, &ImageInfo, &data[0]); if (hr == ERROR_SUCCESS) { diff --git a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp index 1431f54a0..1e34b2b20 100644 --- a/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/AbstractTexturePack.cpp @@ -172,7 +172,7 @@ void AbstractTexturePack::loadDefaultColourTable() { AbstractTexturePack::getPath(true).append(L"res/colours.col")); if (coloursFile.exists()) { - DWORD dataLength = coloursFile.length(); + uint32_t dataLength = coloursFile.length(); byteArray data(dataLength); FileInputStream fis(coloursFile); @@ -209,7 +209,7 @@ void AbstractTexturePack::unloadUI() { } std::wstring AbstractTexturePack::getXuiRootPath() { - const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(nullptr); + const uintptr_t c_ModuleHandle = (uintptr_t)GetModuleHandle(nullptr); // Load new skin constexpr int LOCATOR_SIZE = diff --git a/Minecraft.Client/UI/Screen.cpp b/Minecraft.Client/UI/Screen.cpp index c6060629f..210bd242f 100644 --- a/Minecraft.Client/UI/Screen.cpp +++ b/Minecraft.Client/UI/Screen.cpp @@ -34,7 +34,7 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey) { if (g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1) app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)FALSE); + eXuiServerAction_PauseServer, (void*)false); } } diff --git a/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp b/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp index a149f3723..4270190c2 100644 --- a/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp +++ b/Minecraft.Client/UI/Screens/CreateWorldScreen.cpp @@ -164,19 +164,19 @@ void CreateWorldScreen::buttonClicked(Button* button) { // these r just the defaults from the createworldmenu UIscene // i had higher ambitions for what id do with these but its not worth it // for a temp ui - moreOptionsParams->bGenerateOptions = TRUE; + moreOptionsParams->bGenerateOptions = true; moreOptionsParams->bStructures = generateStructures; moreOptionsParams->bFlatWorld = flatWorld; moreOptionsParams->bBonusChest = bonusChest; - moreOptionsParams->bPVP = TRUE; - moreOptionsParams->bTrust = TRUE; - moreOptionsParams->bFireSpreads = TRUE; - moreOptionsParams->bTNT = TRUE; - moreOptionsParams->bHostPrivileges = FALSE; - moreOptionsParams->bOnlineGame = FALSE; - moreOptionsParams->bInviteOnly = FALSE; - moreOptionsParams->bAllowFriendsOfFriends = FALSE; - moreOptionsParams->bOnlineSettingChangedBySystem = FALSE; + moreOptionsParams->bPVP = true; + moreOptionsParams->bTrust = true; + moreOptionsParams->bFireSpreads = true; + moreOptionsParams->bTNT = true; + moreOptionsParams->bHostPrivileges = false; + moreOptionsParams->bOnlineGame = false; + moreOptionsParams->bInviteOnly = false; + moreOptionsParams->bAllowFriendsOfFriends = false; + moreOptionsParams->bOnlineSettingChangedBySystem = false; moreOptionsParams->bCheatsEnabled = cheatsEnabled; moreOptionsParams->iPad = 0; @@ -284,8 +284,8 @@ void CreateWorldScreen::buttonClicked(Button* button) { UIFullscreenProgressCompletionData* completionData = new UIFullscreenProgressCompletionData(); - completionData->bShowBackground = TRUE; - completionData->bShowLogo = TRUE; + completionData->bShowBackground = true; + completionData->bShowLogo = true; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->iPad = 0; loadingParams->completionData = completionData; diff --git a/Minecraft.Client/UI/Screens/PauseScreen.cpp b/Minecraft.Client/UI/Screens/PauseScreen.cpp index e55fc2790..11dd9e84a 100644 --- a/Minecraft.Client/UI/Screens/PauseScreen.cpp +++ b/Minecraft.Client/UI/Screens/PauseScreen.cpp @@ -26,7 +26,7 @@ void PauseScreen::init() { if (g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1) app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)TRUE); + eXuiServerAction_PauseServer, (void*)true); buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 5 + yo, I18n::get(L"menu.returnToMenu"))); if (!g_NetworkManager.IsHost()) { @@ -84,7 +84,7 @@ void PauseScreen::buttonClicked(Button* button) { } if (button->id == 4) { app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), - eXuiServerAction_PauseServer, (void*)FALSE); + eXuiServerAction_PauseServer, (void*)false); minecraft->setScreen(nullptr); // minecraft->grabMouse(); // 4J - removed } diff --git a/Minecraft.Client/Utils/FrameProfiler.cpp b/Minecraft.Client/Utils/FrameProfiler.cpp index 53ddaa42f..7c0d937c4 100644 --- a/Minecraft.Client/Utils/FrameProfiler.cpp +++ b/Minecraft.Client/Utils/FrameProfiler.cpp @@ -26,7 +26,7 @@ constexpr std::uint64_t kNsPerMs = 1000ULL * 1000ULL; constexpr std::uint64_t kReportIntervalNs = 1000ULL * 1000ULL * 1000ULL; constexpr std::size_t kBucketCount = FrameProfiler::BucketCount(); constexpr auto kFalseTokens = std::to_array({ - "0", "false", "False", "FALSE", "no", "No", "NO", "off", "Off", "OFF", + "0", "false", "False", "false", "no", "No", "NO", "off", "Off", "OFF", }); constexpr std::array kBucketDescriptors = {{ diff --git a/Minecraft.Client/Utils/StringTable.h b/Minecraft.Client/Utils/StringTable.h index 682c49932..67fdb622d 100644 --- a/Minecraft.Client/Utils/StringTable.h +++ b/Minecraft.Client/Utils/StringTable.h @@ -63,6 +63,6 @@ public: // static const wchar_t* m_wchLocaleCode[LOCALE_COUNT]; private: - // std::wstring getLangId(DWORD dwLanguage=0); + // std::wstring getLangId(uint32_t dwLanguage=0); void ProcessStringTableData(void); }; diff --git a/Minecraft.World/Blocks/HalfSlabTile.cpp b/Minecraft.World/Blocks/HalfSlabTile.cpp index 7cb6e3eab..6e677ebe8 100644 --- a/Minecraft.World/Blocks/HalfSlabTile.cpp +++ b/Minecraft.World/Blocks/HalfSlabTile.cpp @@ -89,7 +89,7 @@ bool HalfSlabTile::shouldRenderFace(LevelSource* level, int x, int y, int z, oy += Facing::STEP_Y[Facing::OPPOSITE_FACING[face]]; oz += Facing::STEP_Z[Facing::OPPOSITE_FACING[face]]; - boolean isUpper = (level->getData(ox, oy, oz) & TOP_SLOT_BIT) != 0; + bool isUpper = (level->getData(ox, oy, oz) & TOP_SLOT_BIT) != 0; if (isUpper) { if (face == Facing::DOWN) return true; if (face == Facing::UP && Tile::shouldRenderFace(level, x, y, z, face)) diff --git a/Minecraft.World/Blocks/NoteBlockTile.cpp b/Minecraft.World/Blocks/NoteBlockTile.cpp index 0a87ae3f9..578a4ddd4 100644 --- a/Minecraft.World/Blocks/NoteBlockTile.cpp +++ b/Minecraft.World/Blocks/NoteBlockTile.cpp @@ -14,7 +14,7 @@ void NoteBlockTile::neighborChanged(Level* level, int x, int y, int z, std::dynamic_pointer_cast( level->getTileEntity(x, y, z)); app.DebugPrintf("-------- Signal is %s, tile is currently %s\n", - signal ? "TRUE" : "FALSE", mte->on ? "ON" : "OFF"); + signal ? "true" : "false", mte->on ? "ON" : "OFF"); if (mte != nullptr && mte->on != signal) { if (signal) { mte->playNote(level, x, y, z); diff --git a/Minecraft.World/Commands/ExperienceCommand.cpp b/Minecraft.World/Commands/ExperienceCommand.cpp index 3ccf5012e..025bcf356 100644 --- a/Minecraft.World/Commands/ExperienceCommand.cpp +++ b/Minecraft.World/Commands/ExperienceCommand.cpp @@ -15,13 +15,13 @@ void ExperienceCommand::execute(std::shared_ptr source, // Player player; // String inputAmount = args[0]; // - // boolean levels = inputAmount.endsWith("l") || + // bool levels = inputAmount.endsWith("l") || // inputAmount.endsWith("L"); if (levels && // inputAmount.length() > 1) inputAmount = inputAmount.substring(0, // inputAmount.length() - 1); // // int amount = convertArgToInt(source, inputAmount); - // boolean take = amount < 0; + // bool take = amount < 0; // // if (take) amount *= -1; // diff --git a/Minecraft.World/Commands/PlaySoundCommand.h b/Minecraft.World/Commands/PlaySoundCommand.h index a59d65ccf..d3f82641a 100644 --- a/Minecraft.World/Commands/PlaySoundCommand.h +++ b/Minecraft.World/Commands/PlaySoundCommand.h @@ -84,7 +84,7 @@ player.getAName()); } @Override - public boolean isValidWildcardPlayerArgument(String[] args, int + public bool isValidWildcardPlayerArgument(String[] args, int argumentIndex) { return argumentIndex == 1; } } diff --git a/Minecraft.World/Commands/PlayerSelector.h b/Minecraft.World/Commands/PlayerSelector.h index de581f085..1cd04d966 100644 --- a/Minecraft.World/Commands/PlayerSelector.h +++ b/Minecraft.World/Commands/PlayerSelector.h @@ -78,7 +78,7 @@ rangeMax = getDefaultRangeMax(type); int levelMin = getDefaultLevelMin(type); Map scores = getScores(args); String name = null; String team = null; - boolean requireLevel = false; + bool requireLevel = false; if (args.containsKey(ARGUMENT_RANGE_MIN)) { rangeMin = Mth.getInt(args.get(ARGUMENT_RANGE_MIN), rangeMin); @@ -153,7 +153,7 @@ Mth.getInt(input.get(key), 1)); return result; } - public static boolean isList(String input) { + public static bool isList(String input) { Matcher matcher = PATTERN_TARGETS.matcher(input); if (matcher.matches()) { @@ -167,7 +167,7 @@ count); return count != 1; return false; } - public static boolean isPattern(String input, String onlyType) { + public static bool isPattern(String input, String onlyType) { Matcher matcher = PATTERN_TARGETS.matcher(input); if (matcher.matches()) { @@ -180,7 +180,7 @@ count); return count != 1; return false; } - public static boolean isPattern(String input) { + public static bool isPattern(String input) { return isPattern(input, null); } diff --git a/Minecraft.World/Commands/ShowSeedCommand.h b/Minecraft.World/Commands/ShowSeedCommand.h index 7ed06651d..b55008953 100644 --- a/Minecraft.World/Commands/ShowSeedCommand.h +++ b/Minecraft.World/Commands/ShowSeedCommand.h @@ -10,7 +10,7 @@ import net.minecraft.world.level.Level; public class ShowSeedCommand extends BaseCommand { @Override - public boolean canExecute(CommandSender source) { + public bool canExecute(CommandSender source) { return MinecraftServer.getInstance().isSingleplayer() || super.canExecute(source); } diff --git a/Minecraft.World/Commands/SpreadPlayersCommand.h b/Minecraft.World/Commands/SpreadPlayersCommand.h index e103a8ae9..b3d6e2888 100644 --- a/Minecraft.World/Commands/SpreadPlayersCommand.h +++ b/Minecraft.World/Commands/SpreadPlayersCommand.h @@ -44,7 +44,7 @@ UsageException("commands.spreadplayers.usage"); int index = 0; double x = convertArgToCoordinate(source, Double.NaN, args[index++]); double z = convertArgToCoordinate(source, Double.NaN, args[index++]); double minDist = convertArgToDouble(source, args[index++], 0); double maxDist = -convertArgToDouble(source, args[index++], minDist + 1); boolean respectTeams = +convertArgToDouble(source, args[index++], minDist + 1); bool respectTeams = convertArgToBoolean(source, args[index++]); List players = Lists.newArrayList(); @@ -86,7 +86,7 @@ players.get(0).level, respectTeams); private void spreadPlayers(CommandSender source, List players, Position center, double spreadDist, double maxDistFromCenter, Level level, -boolean respectTeams) { Random random = new Random(); double minX = center.x - +bool respectTeams) { Random random = new Random(); double minX = center.x - maxDistFromCenter; double minZ = center.z - maxDistFromCenter; double maxX = center.x + maxDistFromCenter; double maxZ = center.z + maxDistFromCenter; @@ -120,7 +120,7 @@ source.sendMessage(ChatMessageComponent.forTranslation("commands.spreadplayers.i private int spreadPositions(Position center, double spreadDist, Level level, Random random, double minX, double minZ, double maxX, double maxZ, Position[] -positions, boolean respectTeams) { boolean hasCollisions = true; int iteration; +positions, bool respectTeams) { bool hasCollisions = true; int iteration; double minDistance = Float.MAX_VALUE; for (iteration = 0; iteration < MAX_ITERATION_COUNT && hasCollisions; @@ -185,7 +185,7 @@ String.format("%.2f", minDistance)); } private double setPlayerPositions(List players, Level level, -Position[] positions, boolean respectTeams) { double avgDistance = 0; int +Position[] positions, bool respectTeams) { double avgDistance = 0; int positionIndex = 0; Map teamPositions = Maps.newHashMap(); for (int i = 0; i < players.size(); i++) { @@ -276,8 +276,8 @@ Position[count]; z -= pos.z; } - public boolean clamp(double minX, double minZ, double maxX, double maxZ) -{ boolean changed = false; + public bool clamp(double minX, double minZ, double maxX, double maxZ) +{ bool changed = false; if (x < minX) { x = minX; @@ -313,7 +313,7 @@ Position[count]; return Level.maxBuildHeight + 1; } - public boolean isSafe(Level level) { + public bool isSafe(Level level) { int xt = Mth.floor(x); int zt = Mth.floor(z); diff --git a/Minecraft.World/Containers/MouseInventoryClickHandler.h b/Minecraft.World/Containers/MouseInventoryClickHandler.h index a9144ba3f..e7eee459d 100644 --- a/Minecraft.World/Containers/MouseInventoryClickHandler.h +++ b/Minecraft.World/Containers/MouseInventoryClickHandler.h @@ -4,7 +4,7 @@ // completeness class MouseInventoryClickHandler { - /* public static void handle(int buttonNum, boolean clickedOutside, int + /* public static void handle(int buttonNum, bool clickedOutside, int slotId, Player player) { Inventory inventory = player.inventory; Slot slot = player.getInventorySlot(slotId); if (slot != null) { ItemInstance clicked = slot.getItem(); if (clicked == null && inventory.carried == diff --git a/Minecraft.World/Entities/LivingEntity.cpp b/Minecraft.World/Entities/LivingEntity.cpp index 4b03700cf..8c9288d2f 100644 --- a/Minecraft.World/Entities/LivingEntity.cpp +++ b/Minecraft.World/Entities/LivingEntity.cpp @@ -481,7 +481,7 @@ void LivingEntity::tickEffects() { bool ambient = entityData->getByte(DATA_EFFECT_AMBIENCE_ID) > 0; if (colorValue > 0) { - boolean doParticle = false; + bool doParticle = false; if (!isInvisible()) { doParticle = random->nextBoolean(); diff --git a/Minecraft.World/Entities/MobEffectInstance.cpp b/Minecraft.World/Entities/MobEffectInstance.cpp index c9689c415..f81d97f84 100644 --- a/Minecraft.World/Entities/MobEffectInstance.cpp +++ b/Minecraft.World/Entities/MobEffectInstance.cpp @@ -145,7 +145,7 @@ MobEffectInstance* MobEffectInstance::load(CompoundTag* tag) { int id = tag->getByte(L"Id"); int amplifier = tag->getByte(L"Amplifier"); int duration = tag->getInt(L"Duration"); - boolean ambient = tag->getBoolean(L"Ambient"); + bool ambient = tag->getBoolean(L"Ambient"); return new MobEffectInstance(id, duration, amplifier, ambient); } diff --git a/Minecraft.World/Entities/Monster.cpp b/Minecraft.World/Entities/Monster.cpp index 8cccb5c9e..976ed393d 100644 --- a/Minecraft.World/Entities/Monster.cpp +++ b/Minecraft.World/Entities/Monster.cpp @@ -82,7 +82,7 @@ bool Monster::doHurtTarget(std::shared_ptr target) { livingTarget); } - boolean wasHurt = target->hurt( + bool wasHurt = target->hurt( DamageSource::mobAttack( std::dynamic_pointer_cast(shared_from_this())), dmg); diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp index 67c8f928e..7abb318cf 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp @@ -656,7 +656,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail) { app.GetGameHostOption(eGameHostOption_All), Minecraft::GetInstance()->getCurrentTexturePackId()); - INT saveOrCheckpointId = 0; + int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); TelemetryManager->RecordLevelSaveOrCheckpoint( diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h index f5f4777fd..7ca7e7cf6 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h +++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h @@ -10,7 +10,7 @@ private: std::wstring m_fileName; - // HANDLE hHeap; + // void* hHeap; static void* pvHeap; static unsigned int pagesCommitted; #if defined(_LARGE_WORLDS) diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp index 62e039669..31bc923f1 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp @@ -1375,7 +1375,7 @@ void ConsoleSaveFileSplit::Flush(bool autosave, bool updateThumbnail) { app.DebugPrintf("Save thumbnail size %d\n", dwThumbnailDataSize); } - INT saveOrCheckpointId = 0; + int32_t saveOrCheckpointId = 0; bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); TelemetryManager->RecordLevelSaveOrCheckpoint( diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h index a5f1025e9..971d859b5 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h +++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h @@ -66,7 +66,7 @@ private: std::wstring m_fileName; bool m_autosave; - // HANDLE hHeap; + // void* hHeap; static void* pvHeap; static unsigned int pagesCommitted; #if defined(_LARGE_WORLDS) diff --git a/Minecraft.World/IO/Files/FileHeader.cpp b/Minecraft.World/IO/Files/FileHeader.cpp index feb3a20de..6af09503f 100644 --- a/Minecraft.World/IO/Files/FileHeader.cpp +++ b/Minecraft.World/IO/Files/FileHeader.cpp @@ -71,7 +71,7 @@ void FileHeader::WriteHeader(void* saveMem) { // size in bytes unsigned int headerSize = (int)(fileTable.size()); - // DWORD numberOfBytesWritten = 0; + // uint32_t numberOfBytesWritten = 0; // Write the offset of the header // assert(numberOfBytesWritten == 4); diff --git a/Minecraft.World/IO/Files/FileInputStream.cpp b/Minecraft.World/IO/Files/FileInputStream.cpp index 3b45921b8..84c5220b1 100644 --- a/Minecraft.World/IO/Files/FileInputStream.cpp +++ b/Minecraft.World/IO/Files/FileInputStream.cpp @@ -147,7 +147,7 @@ int FileInputStream::read(byteArray b, unsigned int offset, void FileInputStream::close() { if (m_fileHandle == nullptr) { // printf("\n\nFileInputStream::close - TRYING TO CLOSE AN INVALID FILE - // HANDLE\n\n"); + // void*\n\n"); return; } diff --git a/Minecraft.World/IO/Streams/Compression.cpp b/Minecraft.World/IO/Streams/Compression.cpp index 68f65c10c..da7662638 100644 --- a/Minecraft.World/IO/Streams/Compression.cpp +++ b/Minecraft.World/IO/Streams/Compression.cpp @@ -39,7 +39,7 @@ Compression* Compression::getCompression() { return m_tlsCompression->compression; } -HRESULT Compression::CompressLZXRLE(void* pDestination, unsigned int* pDestSize, +int32_t Compression::CompressLZXRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { EnterCriticalSection(&rleCompressLock); // static unsigned char rleBuf[1024*100]; @@ -89,7 +89,7 @@ HRESULT Compression::CompressLZXRLE(void* pDestination, unsigned int* pDestSize, return S_OK; } -HRESULT Compression::CompressRLE(void* pDestination, unsigned int* pDestSize, +int32_t Compression::CompressRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { EnterCriticalSection(&rleCompressLock); // static unsigned char rleBuf[1024*100]; @@ -144,7 +144,7 @@ HRESULT Compression::CompressRLE(void* pDestination, unsigned int* pDestSize, return S_OK; } -HRESULT Compression::DecompressLZXRLE(void* pDestination, +int32_t Compression::DecompressLZXRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { EnterCriticalSection(&rleDecompressLock); @@ -207,7 +207,7 @@ HRESULT Compression::DecompressLZXRLE(void* pDestination, return S_OK; } -HRESULT Compression::DecompressRLE(void* pDestination, unsigned int* pDestSize, +int32_t Compression::DecompressRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { EnterCriticalSection(&rleDecompressLock); @@ -242,7 +242,7 @@ HRESULT Compression::DecompressRLE(void* pDestination, unsigned int* pDestSize, return S_OK; } -HRESULT Compression::Compress(void* pDestination, unsigned int* pDestSize, +int32_t Compression::Compress(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { // Using zlib for x64 compression - 360 is using native 360 compression and // PS3 a stubbed non-compressing version of this @@ -254,14 +254,14 @@ HRESULT Compression::Compress(void* pDestination, unsigned int* pDestSize, return ((res == Z_OK) ? S_OK : -1); #else size_t destSize = (size_t)(*pDestSize); - HRESULT res = XMemCompress(compressionContext, pDestination, &destSize, + int32_t res = XMemCompress(compressionContext, pDestination, &destSize, pSource, SrcSize); *pDestSize = (unsigned int)destSize; return res; #endif } -HRESULT Compression::Decompress(void* pDestination, unsigned int* pDestSize, +int32_t Compression::Decompress(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { if (m_decompressType != m_localDecompressType) // check if we're decompressing data from a @@ -282,7 +282,7 @@ HRESULT Compression::Decompress(void* pDestination, unsigned int* pDestSize, return ((res == Z_OK) ? S_OK : -1); #else size_t destSize = (size_t)(*pDestSize); - HRESULT res = XMemDecompress(decompressionContext, pDestination, + int32_t res = XMemDecompress(decompressionContext, pDestination, (size_t*)&destSize, pSource, SrcSize); *pDestSize = (unsigned int)destSize; return res; @@ -321,7 +321,7 @@ void Compression::VitaVirtualDecompress( *pDestSize = Offset; } -HRESULT Compression::DecompressWithType(void* pDestination, +int32_t Compression::DecompressWithType(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize) { switch (m_decompressType) { @@ -334,7 +334,7 @@ HRESULT Compression::DecompressWithType(void* pDestination, case eCompressionType_LZXRLE: { #if defined(_WIN64) size_t destSize = (size_t)(*pDestSize); - HRESULT res = XMemDecompress(decompressionContext, pDestination, + int32_t res = XMemDecompress(decompressionContext, pDestination, (size_t*)&destSize, pSource, SrcSize); *pDestSize = (unsigned int)destSize; return res; diff --git a/Minecraft.World/IO/Streams/Compression.h b/Minecraft.World/IO/Streams/Compression.h index 8b1310810..980c9e6b1 100644 --- a/Minecraft.World/IO/Streams/Compression.h +++ b/Minecraft.World/IO/Streams/Compression.h @@ -35,17 +35,17 @@ public: static Compression* getCompression(); public: - HRESULT Compress(void* pDestination, unsigned int* pDestSize, void* pSource, + int32_t Compress(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); - HRESULT Decompress(void* pDestination, unsigned int* pDestSize, + int32_t Decompress(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); - HRESULT CompressLZXRLE(void* pDestination, unsigned int* pDestSize, + int32_t CompressLZXRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); - HRESULT DecompressLZXRLE(void* pDestination, unsigned int* pDestSize, + int32_t DecompressLZXRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); - HRESULT CompressRLE(void* pDestination, unsigned int* pDestSize, + int32_t CompressRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); - HRESULT DecompressRLE(void* pDestination, unsigned int* pDestSize, + int32_t DecompressRLE(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); static void VitaVirtualDecompress(void* pDestination, unsigned int* pDestSize, void* pSource, @@ -62,7 +62,7 @@ public: ~Compression(); private: - HRESULT DecompressWithType(void* pDestination, unsigned int* pDestSize, + int32_t DecompressWithType(void* pDestination, unsigned int* pDestSize, void* pSource, unsigned int SrcSize); XMEMCOMPRESSION_CONTEXT compressionContext; diff --git a/Minecraft.World/IO/Streams/DataInputStream.cpp b/Minecraft.World/IO/Streams/DataInputStream.cpp index 55666f209..38f22f148 100644 --- a/Minecraft.World/IO/Streams/DataInputStream.cpp +++ b/Minecraft.World/IO/Streams/DataInputStream.cpp @@ -112,7 +112,7 @@ void DataInputStream::close() { // Reads one input byte and returns true if that byte is nonzero, false if that // byte is zero. This method is suitable for reading the byte written by the -// writeBoolean method of interface DataOutput. Returns: the boolean value read. +// writeBoolean method of interface DataOutput. Returns: the bool value read. bool DataInputStream::readBoolean() { if (stream == nullptr) { app.DebugPrintf( diff --git a/Minecraft.World/IO/Streams/DataOutputStream.cpp b/Minecraft.World/IO/Streams/DataOutputStream.cpp index a3a2e3376..b1e19d614 100644 --- a/Minecraft.World/IO/Streams/DataOutputStream.cpp +++ b/Minecraft.World/IO/Streams/DataOutputStream.cpp @@ -182,10 +182,10 @@ void DataOutputStream::writeChars(const std::wstring& str) { // Incrementing handled by the writeChar function } -// Writes a boolean to the underlying output stream as a 1-byte value. +// Writes a bool to the underlying output stream as a 1-byte value. // The value true is written out as the value (uint8_t)1; the value false is // written out as the value (uint8_t)0. If no exception is thrown, the counter -// written is incremented by 1. Parameters: v - a boolean value to be written. +// written is incremented by 1. Parameters: v - a bool value to be written. void DataOutputStream::writeBoolean(bool b) { stream->write(b ? 1 : 0); // TODO 4J Stu - Error handling? diff --git a/Minecraft.World/Items/BoatItem.h b/Minecraft.World/Items/BoatItem.h index 0e41c33b3..7a9e7166e 100644 --- a/Minecraft.World/Items/BoatItem.h +++ b/Minecraft.World/Items/BoatItem.h @@ -16,7 +16,7 @@ public: std::shared_ptr player); /* - * public boolean useOn(ItemInstance instance, Player player, Level level, + * public bool useOn(ItemInstance instance, Player player, Level level, * int x, int y, int z, int face) { // if (face != 1) return false; int * targetType = level.getTile(x, y, z); if (targetType == Tile.rail.id) { * level.addEntity(new Minecart(level, x + 0.5f, y + 0.5f, z + 0.5f)); diff --git a/Minecraft.World/Items/HangingEntityItem.cpp b/Minecraft.World/Items/HangingEntityItem.cpp index 2fb62c6d0..7dfcfe323 100644 --- a/Minecraft.World/Items/HangingEntityItem.cpp +++ b/Minecraft.World/Items/HangingEntityItem.cpp @@ -38,7 +38,7 @@ bool HangingEntityItem::useOn(std::shared_ptr instance, if (entity != nullptr && entity->survives()) { if (!level->isClientSide) { - if (level->addEntity(entity) == TRUE) { + if (level->addEntity(entity) == true) { // 4J-JEV: Hook for durango 'BlockPlaced' event. if (eType == eTYPE_PAINTING) player->awardStat( diff --git a/Minecraft.World/Items/MapItem.cpp b/Minecraft.World/Items/MapItem.cpp index 1dc1a0bbd..63d828af0 100644 --- a/Minecraft.World/Items/MapItem.cpp +++ b/Minecraft.World/Items/MapItem.cpp @@ -347,7 +347,7 @@ void MapItem::onCraftedBy(std::shared_ptr itemInstance, // 4J - Don't want /* void appendHoverText(ItemInstance itemInstance, Player player, List -lines, boolean advanced) { MapItemSavedData data = getSavedData(itemInstance, +lines, bool advanced) { MapItemSavedData data = getSavedData(itemInstance, player.level); if (advanced) { diff --git a/Minecraft.World/Items/TileItems/StoneSlabTileItem.cpp b/Minecraft.World/Items/TileItems/StoneSlabTileItem.cpp index e7e83fa93..3ec12fd21 100644 --- a/Minecraft.World/Items/TileItems/StoneSlabTileItem.cpp +++ b/Minecraft.World/Items/TileItems/StoneSlabTileItem.cpp @@ -84,7 +84,7 @@ bool StoneSlabTileItem::mayPlace(Level* level, int x, int y, int z, int face, int currentTile = level->getTile(x, y, z); int currentData = level->getData(x, y, z); int slabType = currentData & HalfSlabTile::TYPE_MASK; - boolean isUpper = (currentData & HalfSlabTile::TOP_SLOT_BIT) != 0; + bool isUpper = (currentData & HalfSlabTile::TOP_SLOT_BIT) != 0; if (((face == Facing::UP && !isUpper) || (face == Facing::DOWN && isUpper)) && diff --git a/Minecraft.World/Items/WrittenBookItem.h b/Minecraft.World/Items/WrittenBookItem.h index 513947863..c46853ecf 100644 --- a/Minecraft.World/Items/WrittenBookItem.h +++ b/Minecraft.World/Items/WrittenBookItem.h @@ -15,7 +15,7 @@ class WrittenBookItem extends Item { setMaxStackSize(1); } - public static boolean makeSureTagIsValid(CompoundTag bookTag) { + public static bool makeSureTagIsValid(CompoundTag bookTag) { if (!WritingBookItem.makeSureTagIsValid(bookTag)) { return false; @@ -50,7 +50,7 @@ itemTag.get(TAG_TITLE); if (titleTag != null) { return titleTag.toString(); @Override public void appendHoverText(ItemInstance itemInstance, Player -player, List lines, boolean advanced) { +player, List lines, bool advanced) { if (itemInstance.hasTag()) { CompoundTag itemTag = itemInstance.getTag(); @@ -68,12 +68,12 @@ Player player) { player.openItemInstanceGui(itemInstance); return itemInstance; } @Override - public boolean shouldOverrideMultiplayerNBT() { + public bool shouldOverrideMultiplayerNBT() { return true; } @Override - public boolean isFoil(ItemInstance itemInstance) { + public bool isFoil(ItemInstance itemInstance) { return true; } diff --git a/Minecraft.World/Level/CustomLevelSource.cpp b/Minecraft.World/Level/CustomLevelSource.cpp index fed0ef83e..c06ddffdd 100644 --- a/Minecraft.World/Level/CustomLevelSource.cpp +++ b/Minecraft.World/Level/CustomLevelSource.cpp @@ -31,14 +31,14 @@ CustomLevelSource::CustomLevelSource(Level* level, int64_t seed, std::string path = "GAME:\\GameRules\\heightmap.bin"; #endif #endif - HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, + void* file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (file == INVALID_HANDLE_VALUE) { app.FatalLoadError(); - DWORD error = GetLastError(); + uint32_t error = GetLastError(); assert(false); } else { - DWORD bytesRead, dwFileSize = GetFileSize(file, nullptr); + uint32_t bytesRead, dwFileSize = GetFileSize(file, nullptr); if (dwFileSize > m_heightmapOverride.length) { app.DebugPrintf("Heightmap binary is too large!!\n"); __debugbreak(); @@ -46,7 +46,7 @@ CustomLevelSource::CustomLevelSource(Level* level, int64_t seed, bool bSuccess = ReadFile(file, m_heightmapOverride.data, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } CloseHandle(file); @@ -67,12 +67,12 @@ CustomLevelSource::CustomLevelSource(Level* level, int64_t seed, file = CreateFile(waterHeightPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); if (file == INVALID_HANDLE_VALUE) { - DWORD error = GetLastError(); + uint32_t error = GetLastError(); // assert(false); memset(m_waterheightOverride.data, level->seaLevel, m_waterheightOverride.length); } else { - DWORD bytesRead, dwFileSize = GetFileSize(file, nullptr); + uint32_t bytesRead, dwFileSize = GetFileSize(file, nullptr); if (dwFileSize > m_waterheightOverride.length) { app.DebugPrintf("waterheight binary is too large!!\n"); __debugbreak(); @@ -80,7 +80,7 @@ CustomLevelSource::CustomLevelSource(Level* level, int64_t seed, bool bSuccess = ReadFile(file, m_waterheightOverride.data, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } CloseHandle(file); diff --git a/Minecraft.World/Level/Storage/CompressedTileStorage.cpp b/Minecraft.World/Level/Storage/CompressedTileStorage.cpp index 015b3c6cf..04f805208 100644 --- a/Minecraft.World/Level/Storage/CompressedTileStorage.cpp +++ b/Minecraft.World/Level/Storage/CompressedTileStorage.cpp @@ -957,7 +957,7 @@ void CompressedTileStorage::compress(int upgradeBlock /*=-1*/) { memToAlloc, MAXULONG_PTR, 4096, PAGE_READWRITE); //(unsigned char *)malloc( memToAlloc ); if (newIndicesAndData == nullptr) { - DWORD lastError = GetLastError(); + uint32_t lastError = GetLastError(); MEMORYSTATUS memStatus; GlobalMemoryStatus(&memStatus); __debugbreak(); diff --git a/Minecraft.World/Level/Storage/LevelType.cpp b/Minecraft.World/Level/Storage/LevelType.cpp index a734cb236..a0ad493fc 100644 --- a/Minecraft.World/Level/Storage/LevelType.cpp +++ b/Minecraft.World/Level/Storage/LevelType.cpp @@ -9,8 +9,8 @@ // // private final String generatorName; // private final int version; -// private boolean selectable; -// private boolean replacement; +// private bool selectable; +// private bool replacement; LevelType* LevelType::levelTypes[16]; // = new LevelType[16]; LevelType* LevelType::lvl_normal = diff --git a/Minecraft.World/Level/Storage/McRegionLevelStorage.cpp b/Minecraft.World/Level/Storage/McRegionLevelStorage.cpp index faa4f9f15..40c8eab52 100644 --- a/Minecraft.World/Level/Storage/McRegionLevelStorage.cpp +++ b/Minecraft.World/Level/Storage/McRegionLevelStorage.cpp @@ -30,7 +30,7 @@ ChunkStorage* McRegionLevelStorage::createChunkStorage(Dimension* dimension) { std::vector* netherFiles = m_saveFile->getRegionFilesByDimension(1); if (netherFiles != nullptr) { - DWORD bytesWritten = 0; + uint32_t bytesWritten = 0; for (auto it = netherFiles->begin(); it != netherFiles->end(); ++it) { m_saveFile->zeroFile(*it, (*it)->getFileSize(), diff --git a/Minecraft.World/Level/Storage/RegionFile.h b/Minecraft.World/Level/Storage/RegionFile.h index 35f6202d1..f22b2337a 100644 --- a/Minecraft.World/Level/Storage/RegionFile.h +++ b/Minecraft.World/Level/Storage/RegionFile.h @@ -22,7 +22,7 @@ private: static byteArray emptySector; File* fileName; - // HANDLE file; + // void* file; ConsoleSaveFile* m_saveFile; int* offsets; diff --git a/Minecraft.World/Level/Storage/ZonedChunkStorage.cpp b/Minecraft.World/Level/Storage/ZonedChunkStorage.cpp index c0783300a..e4b47ff2d 100644 --- a/Minecraft.World/Level/Storage/ZonedChunkStorage.cpp +++ b/Minecraft.World/Level/Storage/ZonedChunkStorage.cpp @@ -64,7 +64,7 @@ ZoneFile* ZonedChunkStorage::getZoneFile(int x, int z, bool create) { if (!file.exists()) { if (!create) return nullptr; - HANDLE ch = CreateFile(wstringtofilename(file.getPath()), + void* ch = CreateFile(wstringtofilename(file.getPath()), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); CloseHandle(ch); diff --git a/Minecraft.World/Network/Connection.h b/Minecraft.World/Network/Connection.h index d949ac2b2..2c7cec21e 100644 --- a/Minecraft.World/Network/Connection.h +++ b/Minecraft.World/Network/Connection.h @@ -17,10 +17,10 @@ class ByteArrayOutputStream; class Connection { - friend DWORD WINAPI runRead(void* lpParam); - friend DWORD WINAPI runWrite(void* lpParam); - friend DWORD WINAPI runSendAndQuit(void* lpParam); - friend DWORD WINAPI runClose(void* lpParam); + friend uint32_t WINAPI runRead(void* lpParam); + friend uint32_t WINAPI runWrite(void* lpParam); + friend uint32_t WINAPI runSendAndQuit(void* lpParam); + friend uint32_t WINAPI runClose(void* lpParam); private: static const int SEND_BUFFER_SIZE = 1024 * 5; @@ -72,7 +72,7 @@ private: C4JThread::Event* m_hWakeReadThread; C4JThread::Event* m_hWakeWriteThread; - DWORD saqThreadID, closeThreadID; + uint32_t saqThreadID, closeThreadID; bool disconnected; DisconnectPacket::eDisconnectReason disconnectReason; diff --git a/Minecraft.World/Network/Packets/AddPlayerPacket.cpp b/Minecraft.World/Network/Packets/AddPlayerPacket.cpp index 6f9c943d5..2f82aa3d7 100644 --- a/Minecraft.World/Network/Packets/AddPlayerPacket.cpp +++ b/Minecraft.World/Network/Packets/AddPlayerPacket.cpp @@ -56,7 +56,7 @@ AddPlayerPacket::AddPlayerPacket(std::shared_ptr player, PlayerUID xuid, this->xuid = xuid; this->OnlineXuid = OnlineXuid; - m_playerIndex = (BYTE)player->getPlayerIndex(); + m_playerIndex = (uint8_t)player->getPlayerIndex(); m_skinId = player->getCustomSkin(); m_capeId = player->getCustomCape(); m_uiGamePrivileges = player->getAllPlayerGamePrivileges(); @@ -79,11 +79,11 @@ void AddPlayerPacket::read(DataInputStream* dis) // throws IOException xuid = dis->readPlayerUID(); OnlineXuid = dis->readPlayerUID(); m_playerIndex = dis->readByte(); - INT skinId = dis->readInt(); - m_skinId = *(DWORD*)&skinId; - INT capeId = dis->readInt(); - m_capeId = *(DWORD*)&capeId; - INT privileges = dis->readInt(); + int32_t skinId = dis->readInt(); + m_skinId = *(uint32_t*)&skinId; + int32_t capeId = dis->readInt(); + m_capeId = *(uint32_t*)&capeId; + int32_t privileges = dis->readInt(); m_uiGamePrivileges = *(unsigned int*)&privileges; MemSect(1); unpack = SynchedEntityData::unpack(dis); @@ -116,9 +116,9 @@ void AddPlayerPacket::handle(PacketListener* listener) { int AddPlayerPacket::getEstimatedSize() { int iSize = sizeof(int) + Player::MAX_NAME_LENGTH + sizeof(int) + - sizeof(int) + sizeof(int) + sizeof(BYTE) + sizeof(BYTE) + + sizeof(int) + sizeof(int) + sizeof(uint8_t) + sizeof(uint8_t) + sizeof(short) + sizeof(PlayerUID) + sizeof(PlayerUID) + - sizeof(int) + sizeof(BYTE) + sizeof(unsigned int) + + sizeof(int) + sizeof(uint8_t) + sizeof(unsigned int) + sizeof(uint8_t); if (entityData != nullptr) { diff --git a/Minecraft.World/Network/Packets/UpdateMobEffectPacket.cpp b/Minecraft.World/Network/Packets/UpdateMobEffectPacket.cpp index 5e2ffd3ca..c099b9bfb 100644 --- a/Minecraft.World/Network/Packets/UpdateMobEffectPacket.cpp +++ b/Minecraft.World/Network/Packets/UpdateMobEffectPacket.cpp @@ -16,7 +16,7 @@ UpdateMobEffectPacket::UpdateMobEffectPacket() { UpdateMobEffectPacket::UpdateMobEffectPacket(int entityId, MobEffectInstance* effect) { this->entityId = entityId; - effectId = (BYTE)(effect->getId() & 0xff); + effectId = (uint8_t)(effect->getId() & 0xff); effectAmplifier = (char)(effect->getAmplifier() & 0xff); if (effect->getDuration() > std::numeric_limits::max()) { diff --git a/Minecraft.World/Network/Socket.cpp b/Minecraft.World/Network/Socket.cpp index 0153af75a..3f8afba37 100644 --- a/Minecraft.World/Network/Socket.cpp +++ b/Minecraft.World/Network/Socket.cpp @@ -477,7 +477,7 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags(byteArray b, hostPlayer->SendData(socketPlayer, buffer.pbyData, buffer.dwDataSize, lowPriority, requireAck); - // DWORD queueSize = hostPlayer->GetSendQueueSize( nullptr, + // uint32_t queueSize = hostPlayer->GetSendQueueSize( nullptr, // QNET_GETSENDQUEUESIZE_BYTES ); if( queueSize > 24000 ) // { // //printf("Queue size is: %d, forcing diff --git a/Minecraft.World/Platform/x64headers/extraX64.h b/Minecraft.World/Platform/x64headers/extraX64.h index 4d814dc32..c394b9bdc 100644 --- a/Minecraft.World/Platform/x64headers/extraX64.h +++ b/Minecraft.World/Platform/x64headers/extraX64.h @@ -59,7 +59,7 @@ public: void XMemCpy(void* a, const void* b, size_t s); void XMemSet(void* a, int t, size_t s); void XMemSet128(void* a, int t, size_t s); -void* XPhysicalAlloc(size_t a, ULONG_PTR b, ULONG_PTR c, DWORD d); +void* XPhysicalAlloc(size_t a, uintptr_t b, uintptr_t c, uint32_t d); void XPhysicalFree(void* a); class DLCManager; @@ -117,12 +117,12 @@ const int XN_SYS_STORAGEDEVICESCHANGED = 3; class IQNetPlayer { public: - BYTE GetSmallId(); - void SendData(IQNetPlayer* player, const void* pvData, DWORD dwDataSize, - DWORD dwFlags); + uint8_t GetSmallId(); + void SendData(IQNetPlayer* player, const void* pvData, uint32_t dwDataSize, + uint32_t dwFlags); bool IsSameSystem(IQNetPlayer* player); - DWORD GetSendQueueSize(IQNetPlayer* player, DWORD dwFlags); - DWORD GetCurrentRtt(); + uint32_t GetSendQueueSize(IQNetPlayer* player, uint32_t dwFlags); + uint32_t GetCurrentRtt(); bool IsHost(); bool IsGuest(); bool IsLocal(); @@ -130,15 +130,15 @@ public: const wchar_t* GetGamertag(); int GetSessionIndex(); bool IsTalking(); - bool IsMutedByLocalUser(DWORD dwUserIndex); + bool IsMutedByLocalUser(uint32_t dwUserIndex); bool HasVoice(); bool HasCamera(); int GetUserIndex(); - void SetCustomDataValue(ULONG_PTR ulpCustomDataValue); - ULONG_PTR GetCustomDataValue(); + void SetCustomDataValue(uintptr_t ulpCustomDataValue); + uintptr_t GetCustomDataValue(); private: - ULONG_PTR m_customData; + uintptr_t m_customData; }; const int QNET_GETSENDQUEUESIZE_SECONDARY_TYPE = 0; @@ -146,21 +146,21 @@ const int QNET_GETSENDQUEUESIZE_MESSAGES = 0; const int QNET_GETSENDQUEUESIZE_BYTES = 0; typedef struct { - BYTE bFlags; - BYTE bReserved; - WORD cProbesXmit; - WORD cProbesRecv; - WORD cbData; - BYTE* pbData; - WORD wRttMinInMsecs; - WORD wRttMedInMsecs; - DWORD dwUpBitsPerSec; - DWORD dwDnBitsPerSec; + uint8_t bFlags; + uint8_t bReserved; + uint16_t cProbesXmit; + uint16_t cProbesRecv; + uint16_t cbData; + uint8_t* pbData; + uint16_t wRttMinInMsecs; + uint16_t wRttMedInMsecs; + uint32_t dwUpBitsPerSec; + uint32_t dwDnBitsPerSec; } XNQOSINFO; typedef struct { - UINT cxnqos; - UINT cxnqosPending; + uint32_t cxnqos; + uint32_t cxnqosPending; XNQOSINFO axnqosinfo[1]; } XNQOS; @@ -171,25 +171,25 @@ typedef struct _XSESSION_SEARCHRESULT { } XSESSION_SEARCHRESULT, *PXSESSION_SEARCHRESULT; typedef struct { - DWORD dwContextId; - DWORD dwValue; + uint32_t dwContextId; + uint32_t dwValue; } XUSER_CONTEXT, *PXUSER_CONTEXT; typedef struct _XSESSION_SEARCHRESULT_HEADER { - DWORD dwSearchResults; + uint32_t dwSearchResults; XSESSION_SEARCHRESULT* pResults; } XSESSION_SEARCHRESULT_HEADER, *PXSESSION_SEARCHRESULT_HEADER; typedef struct _XONLINE_FRIEND { PlayerUID xuid; - CHAR szGamertag[XUSER_NAME_SIZE]; - DWORD dwFriendState; + char szGamertag[XUSER_NAME_SIZE]; + uint32_t dwFriendState; SessionID sessionID; - DWORD dwTitleID; + uint32_t dwTitleID; FILETIME ftUserTime; SessionID xnkidInvite; FILETIME gameinviteTime; - DWORD cchRichPresence; + uint32_t cchRichPresence; } XONLINE_FRIEND, *PXONLINE_FRIEND; class IQNetCallbacks {}; @@ -211,16 +211,16 @@ typedef enum _QNET_STATE { class IQNet { public: - HRESULT AddLocalPlayerByUserIndex(DWORD dwUserIndex); + int32_t AddLocalPlayerByUserIndex(uint32_t dwUserIndex); IQNetPlayer* GetHostPlayer(); - IQNetPlayer* GetLocalPlayerByUserIndex(DWORD dwUserIndex); - IQNetPlayer* GetPlayerByIndex(DWORD dwPlayerIndex); - IQNetPlayer* GetPlayerBySmallId(BYTE SmallId); + IQNetPlayer* GetLocalPlayerByUserIndex(uint32_t dwUserIndex); + IQNetPlayer* GetPlayerByIndex(uint32_t dwPlayerIndex); + IQNetPlayer* GetPlayerBySmallId(uint8_t SmallId); IQNetPlayer* GetPlayerByXuid(PlayerUID xuid); - DWORD GetPlayerCount(); + uint32_t GetPlayerCount(); QNET_STATE GetState(); bool IsHost(); - HRESULT JoinGameFromInviteInfo(DWORD dwUserIndex, DWORD dwUserMask, + int32_t JoinGameFromInviteInfo(uint32_t dwUserIndex, uint32_t dwUserMask, const INVITE_INFO* pInviteInfo); void HostGame(); void EndGame(); @@ -233,7 +233,7 @@ void PIXBeginNamedEvent(int a, const char* b, ...); void PIXEndNamedEvent(); void PIXSetMarkerDeprecated(int a, const char* b, ...); -void XSetThreadProcessor(HANDLE a, int b); +void XSetThreadProcessor(void* a, int b); const int QNET_SENDDATA_LOW_PRIORITY = 0; const int QNET_SENDDATA_SECONDARY = 0; @@ -243,7 +243,7 @@ const int QNET_SENDDATA_RELIABLE = 0; const int QNET_SENDDATA_SEQUENTIAL = 0; struct XRNM_SEND_BUFFER { - DWORD dwDataSize; + uint32_t dwDataSize; uint8_t* pbyData; }; @@ -253,21 +253,21 @@ const int D3DPT_QUADLIST = 0; typedef struct _XUSER_SIGNIN_INFO { PlayerUID xuid; - DWORD dwGuestNumber; + uint32_t dwGuestNumber; } XUSER_SIGNIN_INFO, *PXUSER_SIGNIN_INFO; #define XUSER_GET_SIGNIN_INFO_ONLINE_XUID_ONLY 0x00000001 #define XUSER_GET_SIGNIN_INFO_OFFLINE_XUID_ONLY 0x00000002 -DWORD XUserGetSigninInfo(DWORD dwUserIndex, DWORD dwFlags, +uint32_t XUserGetSigninInfo(uint32_t dwUserIndex, uint32_t dwFlags, PXUSER_SIGNIN_INFO pSigninInfo); class CXuiStringTable { public: const wchar_t* Lookup(const wchar_t* szId); - const wchar_t* Lookup(UINT nIndex); + const wchar_t* Lookup(uint32_t nIndex); void Clear(); - HRESULT Load(const wchar_t* szId); + int32_t Load(const wchar_t* szId); }; typedef void* XMEMDECOMPRESSION_CONTEXT; @@ -278,50 +278,50 @@ typedef enum _XMEMCODEC_TYPE { XMEMCODEC_LZX = 1 } XMEMCODEC_TYPE; -HRESULT XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, void* pDestination, +int32_t XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, void* pDestination, size_t* pDestSize, void* pSource, size_t SrcSize); -HRESULT XMemCompress(XMEMCOMPRESSION_CONTEXT Context, void* pDestination, +int32_t XMemCompress(XMEMCOMPRESSION_CONTEXT Context, void* pDestination, size_t* pDestSize, void* pSource, size_t SrcSize); -HRESULT XMemCreateCompressionContext(XMEMCODEC_TYPE CodecType, - const void* pCodecParams, DWORD Flags, +int32_t XMemCreateCompressionContext(XMEMCODEC_TYPE CodecType, + const void* pCodecParams, uint32_t Flags, XMEMCOMPRESSION_CONTEXT* pContext); -HRESULT XMemCreateDecompressionContext(XMEMCODEC_TYPE CodecType, - const void* pCodecParams, DWORD Flags, +int32_t XMemCreateDecompressionContext(XMEMCODEC_TYPE CodecType, + const void* pCodecParams, uint32_t Flags, XMEMDECOMPRESSION_CONTEXT* pContext); typedef struct _XMEMCODEC_PARAMETERS_LZX { - DWORD Flags; - DWORD WindowSize; - DWORD CompressionPartitionSize; + uint32_t Flags; + uint32_t WindowSize; + uint32_t CompressionPartitionSize; } XMEMCODEC_PARAMETERS_LZX; void XMemDestroyCompressionContext(XMEMCOMPRESSION_CONTEXT Context); void XMemDestroyDecompressionContext(XMEMDECOMPRESSION_CONTEXT Context); typedef struct { - BYTE type; + uint8_t type; union { - LONG nData; - LONGLONG i64Data; + int32_t nData; + int64_t i64Data; double dblData; struct { - DWORD cbData; - LPWSTR pwszData; + uint32_t cbData; + wchar_t* pwszData; } string; float fData; struct { - DWORD cbData; - PBYTE pbData; + uint32_t cbData; + uint8_t* pbData; } binary; FILETIME ftData; }; } XUSER_DATA, *PXUSER_DATA; typedef struct { - DWORD dwPropertyId; + uint32_t dwPropertyId; XUSER_DATA value; } XUSER_PROPERTY, *PXUSER_PROPERTY; @@ -394,9 +394,9 @@ const int XC_LOCALE_ISRAEL = 42; const int XC_LOCALE_UNITED_ARAB_EMIRATES = 43; const int XC_LOCALE_LATIN_AMERICA = 240; -DWORD XGetLanguage(); -DWORD XGetLocale(); -DWORD XEnableGuestSignin(bool fEnable); +uint32_t XGetLanguage(); +uint32_t XGetLocale(); +uint32_t XEnableGuestSignin(bool fEnable); class D3DXVECTOR3 { public: diff --git a/Minecraft.World/Player/Player.cpp b/Minecraft.World/Player/Player.cpp index 719a96a08..c120ce2e8 100644 --- a/Minecraft.World/Player/Player.cpp +++ b/Minecraft.World/Player/Player.cpp @@ -679,7 +679,7 @@ std::uint32_t Player::getCapeIdFromPath(const std::wstring& cape) { } std::wstring Player::getCapePathFromId(std::uint32_t capeId) { - // 4J Stu - This function maps the encoded DWORD we store in the player + // 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]; diff --git a/Minecraft.World/Recipes/MapCloningRecipe.h b/Minecraft.World/Recipes/MapCloningRecipe.h index 3d2e05446..c4d9d0655 100644 --- a/Minecraft.World/Recipes/MapCloningRecipe.h +++ b/Minecraft.World/Recipes/MapCloningRecipe.h @@ -3,7 +3,7 @@ /* class MapCloningRecipe implements Recipy { @Override - public boolean matches(CraftingContainer craftSlots, Level + public bool matches(CraftingContainer craftSlots, Level level) { int count = 0; ItemInstance source = null; for (int slot = 0; slot < craftSlots.getContainerSize(); diff --git a/Minecraft.World/Recipes/MapExtendingRecipe.h b/Minecraft.World/Recipes/MapExtendingRecipe.h index 62f9a09cf..5701bd68d 100644 --- a/Minecraft.World/Recipes/MapExtendingRecipe.h +++ b/Minecraft.World/Recipes/MapExtendingRecipe.h @@ -12,7 +12,7 @@ ItemInstance(Item.paper), new ItemInstance(Item.paper), } @Override - public boolean matches(CraftingContainer craftSlots, Level + public bool matches(CraftingContainer craftSlots, Level level) { if (!super.matches(craftSlots, level)) return false; ItemInstance map = null; diff --git a/Minecraft.World/Util/C4JThread.cpp b/Minecraft.World/Util/C4JThread.cpp index ad3ab8cfb..ccd8cf62d 100644 --- a/Minecraft.World/Util/C4JThread.cpp +++ b/Minecraft.World/Util/C4JThread.cpp @@ -317,7 +317,7 @@ void C4JThread::SetProcessor(int proc) { } #if defined(_WIN32) - HANDLE threadHandle = nullptr; + void* threadHandle = nullptr; if (m_threadHandle.joinable()) { threadHandle = m_threadHandle.native_handle(); @@ -386,7 +386,7 @@ void C4JThread::SetPriority(int priority) { m_requestedPriority.store(priority, std::memory_order_release); #if defined(_WIN32) - HANDLE threadHandle = nullptr; + void* threadHandle = nullptr; if (m_threadHandle.joinable()) { threadHandle = m_threadHandle.native_handle(); @@ -475,7 +475,7 @@ void C4JThread::SetThreadName(std::uint32_t threadId, const char* threadName) { #if defined(_WIN32) if (threadId == static_cast(-1) || threadId == ::GetCurrentThreadId()) { - using SetThreadDescriptionFn = HRESULT(WINAPI*)(HANDLE, PCWSTR); + using SetThreadDescriptionFn = int32_t(WINAPI*)(void*, PCWSTR); const HMODULE kernelModule = ::GetModuleHandleW(L"Kernel32.dll"); if (kernelModule != nullptr) { @@ -514,8 +514,8 @@ void C4JThread::SetThreadName(std::uint32_t threadId, const char* threadName) { info.dwFlags = 0; __try { - ::RaiseException(0x406D1388, 0, sizeof(info) / sizeof(ULONG_PTR), - reinterpret_cast(&info)); + ::RaiseException(0x406D1388, 0, sizeof(info) / sizeof(uintptr_t), + reinterpret_cast(&info)); } __except (EXCEPTION_EXECUTE_HANDLER) { } @@ -843,7 +843,7 @@ void C4JThread::EventQueue::threadPoll() { void C4JThread::PushAffinityAllCores() { #if defined(_WIN32) - const HANDLE currentThread = ::GetCurrentThread(); + const void* currentThread = ::GetCurrentThread(); DWORD_PTR processAffinityMask = 0; DWORD_PTR systemAffinityMask = 0; diff --git a/Minecraft.World/Util/Pos.cpp b/Minecraft.World/Util/Pos.cpp index 7e6c2b0ca..d4f5cfd0c 100644 --- a/Minecraft.World/Util/Pos.cpp +++ b/Minecraft.World/Util/Pos.cpp @@ -17,7 +17,7 @@ Pos::Pos(Pos* position) { } //@Override -// public boolean equals(Object other) +// public bool equals(Object other) bool Pos::equals(void* other) { // TODO 4J Stu I cannot do a dynamic_cast from a void pointer // If I cast it to a Pos then do a dynamic_cast will it still return nullptr if diff --git a/Minecraft.World/Util/Pos.h b/Minecraft.World/Util/Pos.h index 0d9de3e25..f564e9740 100644 --- a/Minecraft.World/Util/Pos.h +++ b/Minecraft.World/Util/Pos.h @@ -18,7 +18,7 @@ public: Pos(Pos* position); //@Override - // public boolean equals(Object other) + // public bool equals(Object other) bool equals(void* other); int hashCode(); diff --git a/Minecraft.World/Util/ThreadName.cpp b/Minecraft.World/Util/ThreadName.cpp index a8aa8bd41..a65c7fb2e 100644 --- a/Minecraft.World/Util/ThreadName.cpp +++ b/Minecraft.World/Util/ThreadName.cpp @@ -21,7 +21,7 @@ void SetThreadName(std::uint32_t threadId, const char* threadName) { #if (defined _WINDOWS64 | 0) __try { RaiseException(0x406D1388, 0, sizeof(info) / sizeof(std::uint32_t), - reinterpret_cast(&info)); + reinterpret_cast(&info)); } __except (GetExceptionCode() == 0x406D1388 ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_EXECUTE_HANDLER) { } diff --git a/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp b/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp index b8b0c714b..9a8fa91dd 100644 --- a/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp +++ b/Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp @@ -9,7 +9,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { #if defined(_UNICODE) std::wstring path = L"GAME:\\GameRules\\biomemap.bin"; - HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, + void* file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); #else #if defined(_WINDOWS64) @@ -17,17 +17,17 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { #else std::string path = "GAME:\\GameRules\\biomemap.bin"; #endif - HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, + void* file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); #endif if (file == INVALID_HANDLE_VALUE) { - DWORD error = GetLastError(); + uint32_t error = GetLastError(); // assert(false); app.DebugPrintf("Biome override not found, using plains as default\n"); memset(m_biomeOverride.data, Biome::plains->id, m_biomeOverride.length); } else { - DWORD bytesRead, dwFileSize = GetFileSize(file, nullptr); + uint32_t bytesRead, dwFileSize = GetFileSize(file, nullptr); if (dwFileSize > m_biomeOverride.length) { app.DebugPrintf("Biomemap binary is too large!!\n"); __debugbreak(); @@ -35,7 +35,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup) { bool bSuccess = ReadFile(file, m_biomeOverride.data, dwFileSize, &bytesRead, nullptr); - if (bSuccess == FALSE) { + if (bSuccess == false) { app.FatalLoadError(); } diff --git a/Minecraft.World/WorldGen/Sources/FlatLevelSource.h b/Minecraft.World/WorldGen/Sources/FlatLevelSource.h index 8918767ff..7c2bdb908 100644 --- a/Minecraft.World/WorldGen/Sources/FlatLevelSource.h +++ b/Minecraft.World/WorldGen/Sources/FlatLevelSource.h @@ -19,7 +19,7 @@ private: Random* random; Random* pprandom; - boolean generateStructures; + bool generateStructures; VillageFeature* villageFeature; // = new VillageFeature(1); public: diff --git a/Minecraft.World/WorldGen/Structures/NetherBridgePieces.cpp b/Minecraft.World/WorldGen/Structures/NetherBridgePieces.cpp index ab3e77695..e86172c39 100644 --- a/Minecraft.World/WorldGen/Structures/NetherBridgePieces.cpp +++ b/Minecraft.World/WorldGen/Structures/NetherBridgePieces.cpp @@ -205,7 +205,7 @@ NetherBridgePieces::NetherBridgePiece::generatePiece( std::list* pieces, Random* random, int footX, int footY, int footZ, int direction, int depth) { int totalWeight = updatePieceWeight(currentPieces); - boolean doStuff = totalWeight > 0 && depth <= MAX_DEPTH; + bool doStuff = totalWeight > 0 && depth <= MAX_DEPTH; int numAttempts = 0; while (numAttempts < 5 && doStuff) {