TestUser/MinecraftConsoles
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'smartcmd:main' into main

Browse Source
This commit is contained in:
qwasdrizzel
2026-03-05 17:17:45 -06:00
committed by GitHub
parent 9370cbc7d8 eed770b121
commit 0666959d31
343 changed files with 6746 additions and 6110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.clang-tidy Normal file
View File

@@ -0,0 +1,18 @@
---
# Enable all modernize checks, but explicitly exclude trailing return types
Checks: >
-*,
modernize-*,
google-readability-casting,
cppcoreguidelines-pro-type-cstyle-cast,
-modernize-use-trailing-return-type
# Pass the C++14 flag to the internal Clang compiler
ExtraArgs: ['-std=c++14']
CheckOptions:
- key: modernize-loop-convert.MinConfidence
value: reasonable
- key: modernize-use-auto.MinTypeNameLength
value: 5
...

78
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View File

@@ -0,0 +1,78 @@
name: Bug Report
description: File a bug report.
title: "[Bug] "
labels: ["bug"]
body:
- type: textarea
id: bug-description
attributes:
label: Bug description
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: steps
attributes:
label: To Reproduce
description: Steps to reproduce the behavior
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: If applicable, add screenshots to help explain your problem.
validations:
required: false
- type: textarea
id: video
attributes:
label: Videos
description: If applicable, add videos to help explain your problem.
validations:
required: false
- type: input
id: version
attributes:
label: Version
placeholder: e.g. 55a86b8
validations:
required: true
- type: checkboxes
id: build
attributes:
label: Build Type
options:
- label: Release
- label: Debug
validations:
required: true
- type: textarea
id: additional
attributes:
label: Additional context
description: A clear and concise description of what the bug is.
validations:
required: false

34
.github/ISSUE_TEMPLATE/suggestion_request.yml vendored Normal file
View File

@@ -0,0 +1,34 @@
name: Suggestion
description: Suggest an idea for this project
title: "[Suggestion] "
labels: ["enhancement"]
body:
- type: textarea
id: solution
attributes:
label: Describe the solution you'd like
description: What would you like to see happen?
placeholder: |
A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: problem
attributes:
label: Is your suggestion related to a problem?
description: Describe the problem you are experiencing.
placeholder: |
A clear and concise description of what the problem is.
Example: I'm always frustrated when [...]
validations:
required: false
- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context, mockups, or screenshots here.
validations:
required: false

20
.github/pull_request_template.md vendored
View File

@@ -1,5 +1,20 @@
<!-- <!--
Note: IF YOUR PR CHANGES THE GAME BEHAVIOR VISIBLY, REMEMBER TO ATTACH A GAMEPLAY FOOTAGE (or at least a screenshot) OF YOU *ACTUALLY* PLAYING THE GAME WITH YOUR CHANGES. Untested PRs are *NOT* welcome. Please don't forget to describe what did you do in each commit in your PR. ⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
IF YOUR PR CHANGES THE GAME BEHAVIOR VISIBLY, REMEMBER TO ATTACH A GAMEPLAY FOOTAGE (or at least a screenshot) OF YOU *ACTUALLY* PLAYING THE GAME WITH YOUR CHANGES. Untested PRs are *NOT* welcome. Please don't forget to describe what did you do in each commit in your PR.
⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
We will NOT accept PRs with code authored by AI. If your code
was written by an AI, your PR will be closed. Do not submit
vibe coded PRs.
⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
PRs that do not fulfill the informational intent of this PR template will be closed. Please do your best to use this template as written.
⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️
--> -->
## Description ## Description
@@ -19,6 +34,9 @@ Note: IF YOUR PR CHANGES THE GAME BEHAVIOR VISIBLY, REMEMBER TO ATTACH A GAMEPLA
### Fix Implementation ### Fix Implementation
<!-- Detail exactly how the issue was resolved (specific code changes, algorithms, logic flows). --> <!-- Detail exactly how the issue was resolved (specific code changes, algorithms, logic flows). -->
### AI Use Disclosure
<!-- Explain, if any, AI was used to solve this problem. Note that we do not accept code written by any LLM in this repo. -->
## Related Issues ## Related Issues
- Fixes #[issue-number] - Fixes #[issue-number]
- Related to #[issue-number] - Related to #[issue-number]

32
.github/workflows/debug-test.yml vendored Normal file
View File

@@ -0,0 +1,32 @@
name: MSBuild Debug Test
on:
workflow_dispatch:
pull_request:
types: [opened, reopened, synchronize]
paths-ignore:
- '.gitignore'
- '*.md'
- '.github/*.md'
push:
branches:
- 'main'
paths-ignore:
- '.gitignore'
- '*.md'
- '.github/*.md'
jobs:
build:
name: Build Windows64 (DEBUG)
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
- name: Build
run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Debug /p:Platform="Windows64"

6
.github/workflows/nightly.yml vendored
View File

@@ -36,7 +36,11 @@ jobs:
with: with:
tag_name: nightly tag_name: nightly
name: Nightly Release name: Nightly Release
body: Requires at least Windows 7 and DirectX 11 compatible GPU to run. Compiled with MSVC v14.44.35207 in Release mode with Whole Program Optimization, as well as `/O2 /Ot /Oi /Ob3 /GF /fp:precise`. body: |
Requires at least Windows 7 and DirectX 11 compatible GPU to run. Compiled with MSVC v14.44.35207 in Release mode with Whole Program Optimization, as well as `/O2 /Ot /Oi /Ob3 /GF /fp:precise`.
# 🚨 First time here? 🚨
If you've never downloaded the game before, you need to download `LCEWindows64.zip` and extract it to the folder where you'd like to keep the game. The other files are included in this `.zip` file!
files: | files: |
LCEWindows64.zip LCEWindows64.zip
./x64/Release/Minecraft.Client.exe ./x64/Release/Minecraft.Client.exe

62
CMakeLists.txt
View File

@@ -89,13 +89,59 @@ target_link_libraries(MinecraftClient PRIVATE
> >
) )
add_custom_command(TARGET MinecraftClient POST_BUILD if(WIN32)
COMMAND "${CMAKE_COMMAND}" message(STATUS "Starting redist copy...")
-DPROJECT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" execute_process(
-DOUTPUT_DIR="$<TARGET_FILE_DIR:MinecraftClient>" COMMAND robocopy.exe
-DCONFIGURATION=$<CONFIG> "${CMAKE_CURRENT_SOURCE_DIR}/x64/Release"
-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyAssets.cmake" "${CMAKE_CURRENT_BINARY_DIR}"
VERBATIM /S /MT /R:0 /W:0 /NP
) )
message(STATUS "Starting asset copy...")
execute_process(
COMMAND robocopy.exe
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
"${CMAKE_CURRENT_BINARY_DIR}"
/S /MT /R:0 /W:0 /NP
/XF "*.cpp" "*.c" "*.h" "*.hpp" "*.asm"
"*.xml" "*.lang" "*.vcxproj" "*.vcxproj.*" "*.sln"
"*.docx" "*.xls"
"*.bat" "*.cmd" "*.ps1" "*.py"
"*Test*"
/XD "Durango*" "Orbis*" "PS*" "Xbox"
)
message(STATUS "Patching Windows64Media...")
execute_process(
COMMAND robocopy.exe
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/DurangoMedia"
"${CMAKE_CURRENT_BINARY_DIR}/Windows64Media"
/S /MT /R:0 /W:0 /NP
/XF "*.h" "*.xml" "*.lang" "*.bat"
)
elseif(UNIX)
message(STATUS "Starting redist copy...")
execute_process(
COMMAND rsync -av "${CMAKE_CURRENT_SOURCE_DIR}/x64/Release/" "${CMAKE_CURRENT_BINARY_DIR}/"
)
message(STATUS "Starting asset copy...")
execute_process(
COMMAND rsync -av
"--exclude=*.cpp" "--exclude=*.c" "--exclude=*.h" "--exclude=*.hpp" "--exclude=*.asm"
"--exclude=*.xml" "--exclude=*.lang" "--exclude=*.vcxproj" "--exclude=*.vcxproj.*" "--exclude=*.sln"
"--exclude=*.docx" "--exclude=*.xls"
"--exclude=*.bat" "--exclude=*.cmd" "--exclude=*.ps1" "--exclude=*.py"
"--exclude=*Test*"
"--exclude=Durango*" "--exclude=Orbis*" "--exclude=PS*" "--exclude=Xbox"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/" "${CMAKE_CURRENT_BINARY_DIR}/"
)
message(STATUS "Patching Windows64Media...")
execute_process(
COMMAND rsync -av
"--exclude=*.h" "--exclude=*.xml" "--exclude=*.lang" "--exclude=*.bat"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/DurangoMedia/" "${CMAKE_CURRENT_BINARY_DIR}/Windows64Media/"
)
else()
message(FATAL_ERROR "Redist and asset copying is only supported on Windows (Robocopy) and Unix systems (rsync).")
endif()
set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftClient) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftClient)

25
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,25 @@
# Scope of Project
At the moment, this project's scope is generally limited outside of adding new content to the game (blocks, mobs, items). We are currently prioritizing stability, quality of life, and platform support over these things.
## Current Goals
- Being a robust Desktop version of LCE
- Having proper controller support across all types, brands on Desktop or Desktop-like platforms (Steam Deck)
- Improving stability as much as possible
- Fixing as many bugs as possible
- Enabling Desktop multiplayer options
- LAN P2P Multiplayer
- Splitscreen Multiplayer
- WAN Servers (IP:Port connectivity)
- Platform-based P2P Connectivity
- Steam Networking
- GameDate?
- Maybe more?
- Refining rendering settings, renderer options, as well as reaching rendering parity with true LCE
- Having workable multi-platform compilation for ARM, Consoles, Linux
- Being a good base for further expansion and modding of LCE, such as backports and "modpacks".
# Use of AI and LLMs
We currently do not accept any new code into the project that was written largely, entirely, or even noticably by an LLM. All contributions should be made by humans that understand the codebase.
# Pull Request Template
We request that all PRs made for this repo use our PR template to the fullest extent possible. Completely wiping it out to write minimal information will likely get your PR closed.

30
Minecraft.Client/.clangd Normal file
View File

@@ -0,0 +1,30 @@
CompileFlags:
Add: [-std=c++14,
-m64,
-Wno-unused-includes
]
Remove: [-W*]
Index:
StandardLibrary: true
Diagnostics:
Suppress: unused-includes
UnusedIncludes: None
ClangTidy:
Add: [modernize-loop-convert]
Completion:
AllScopes: Yes
ArgumentLists: Delimiters
HeaderInsertion: Never
InlayHints:
BlockEnd: true
ParameterNames: false
DeducedTypes: false
Designators: false
DefaultArguments: false
Hover:
ShowAKA: true

11
Minecraft.Client/AbstractContainerScreen.cpp
View File

@@ -52,12 +52,9 @@ void AbstractContainerScreen::render(int xm, int ym, float a)
glEnable(GL_RESCALE_NORMAL); glEnable(GL_RESCALE_NORMAL);
Slot *hoveredSlot = NULL; Slot *hoveredSlot = NULL;
AUTO_VAR(itEnd, menu->slots->end());
for (AUTO_VAR(it, menu->slots->begin()); it != itEnd; it++)
{
Slot *slot = *it; //menu->slots->at(i);
for ( Slot *slot : *menu->slots )
{
renderSlot(slot); renderSlot(slot);
if (isHovering(slot, xm, ym)) if (isHovering(slot, xm, ym))
@@ -150,10 +147,8 @@ void AbstractContainerScreen::renderSlot(Slot *slot)
Slot *AbstractContainerScreen::findSlot(int x, int y) Slot *AbstractContainerScreen::findSlot(int x, int y)
{ {
AUTO_VAR(itEnd, menu->slots->end()); for (Slot* slot : menu->slots )
for (AUTO_VAR(it, menu->slots->begin()); it != itEnd; it++)
{ {
Slot *slot = *it; //menu->slots->at(i);
if (isHovering(slot, x, y)) return slot; if (isHovering(slot, x, y)) return slot;
} }
return NULL; return NULL;

15
Minecraft.Client/AchievementScreen.cpp
View File

@@ -261,12 +261,10 @@ void AchievementScreen::renderBg(int xm, int ym, float a)
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
AUTO_VAR(itEnd, Achievements::achievements->end()); for ( Achievement *ach : *Achievements::achievements )
for (AUTO_VAR(it, Achievements::achievements->begin()); it != itEnd; it++)
{ {
Achievement *ach = *it; //Achievements::achievements->at(i); if ( ach == nullptr || ach->requires == nullptr) continue;
if (ach->requires == NULL) continue;
int x1 = ach->x * ACHIEVEMENT_COORD_SCALE - (int) xScroll + 11 + xBigMap; int x1 = ach->x * ACHIEVEMENT_COORD_SCALE - (int) xScroll + 11 + xBigMap;
int y1 = ach->y * ACHIEVEMENT_COORD_SCALE - (int) yScroll + 11 + yBigMap; int y1 = ach->y * ACHIEVEMENT_COORD_SCALE - (int) yScroll + 11 + yBigMap;
@@ -298,12 +296,9 @@ void AchievementScreen::renderBg(int xm, int ym, float a)
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glEnable(GL_RESCALE_NORMAL); glEnable(GL_RESCALE_NORMAL);
glEnable(GL_COLOR_MATERIAL); glEnable(GL_COLOR_MATERIAL);
itEnd = Achievements::achievements->end();
for (AUTO_VAR(it, Achievements::achievements->begin()); it != itEnd; it++)
{
Achievement *ach = *it; //Achievements::achievements->at(i);
for ( Achievement *ach : *Achievements::achievements )
{
int x = ach->x * ACHIEVEMENT_COORD_SCALE - (int) xScroll; int x = ach->x * ACHIEVEMENT_COORD_SCALE - (int) xScroll;
int y = ach->y * ACHIEVEMENT_COORD_SCALE - (int) yScroll; int y = ach->y * ACHIEVEMENT_COORD_SCALE - (int) yScroll;

9
Minecraft.Client/ArchiveFile.cpp
View File

@@ -78,11 +78,8 @@ vector<wstring> *ArchiveFile::getFileList()
{ {
vector<wstring> *out = new vector<wstring>(); vector<wstring> *out = new vector<wstring>();
for ( AUTO_VAR(it, m_index.begin()); for ( const auto& it : m_index )
it != m_index.end(); out->push_back( it.first );
it++ )
out->push_back( it->first );
return out; return out;
} }
@@ -100,7 +97,7 @@ int ArchiveFile::getFileSize(const wstring &filename)
byteArray ArchiveFile::getFile(const wstring &filename) byteArray ArchiveFile::getFile(const wstring &filename)
{ {
byteArray out; byteArray out;
AUTO_VAR(it,m_index.find(filename)); auto it = m_index.find(filename);
if(it == m_index.end()) if(it == m_index.end())
{ {

20
Minecraft.Client/BufferedImage.cpp
View File

@@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h" #include "..\Minecraft.World\StringHelpers.h"
#include "Textures.h" #include "Textures.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "..\Minecraft.World\ArrayWithLength.h"
@@ -46,7 +46,7 @@ void BufferedImage::ByteFlip4(unsigned int &data)
} }
// Loads a bitmap into a buffered image - only currently supports the 2 types of 32-bit image that we've made so far // Loads a bitmap into a buffered image - only currently supports the 2 types of 32-bit image that we've made so far
// and determines which of these is which by the compression method. Compression method 3 is a 32-bit image with only // and determines which of these is which by the compression method. Compression method 3 is a 32-bit image with only
// 24-bits used (ie no alpha channel) whereas method 0 is a full 32-bit image with a valid alpha channel. // 24-bits used (ie no alpha channel) whereas method 0 is a full 32-bit image with a valid alpha channel.
BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=false*/, bool bTitleUpdateTexture /*=false*/, const wstring &drive /*=L""*/) BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=false*/, bool bTitleUpdateTexture /*=false*/, const wstring &drive /*=L""*/)
{ {
HRESULT hr; HRESULT hr;
@@ -149,7 +149,7 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
wstring mipMapPath = L""; wstring mipMapPath = L"";
if( l != 0 ) if( l != 0 )
{ {
mipMapPath = L"MipMapLevel" + _toString<int>(l+1); mipMapPath = L"MipMapLevel" + std::to_wstring(l+1);
} }
if( filenameHasExtension ) if( filenameHasExtension )
{ {
@@ -171,7 +171,7 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
hr=RenderManager.LoadTextureData(pchTextureName,&ImageInfo,&data[l]); hr=RenderManager.LoadTextureData(pchTextureName,&ImageInfo,&data[l]);
if(hr!=ERROR_SUCCESS) if(hr!=ERROR_SUCCESS)
{ {
// 4J - If we haven't loaded the non-mipmap version then exit the game // 4J - If we haven't loaded the non-mipmap version then exit the game
if( l == 0 ) if( l == 0 )
@@ -179,7 +179,7 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
app.FatalLoadError(); app.FatalLoadError();
} }
return; return;
} }
if( l == 0 ) if( l == 0 )
{ {
@@ -207,7 +207,7 @@ BufferedImage::BufferedImage(DLCPack *dlcPack, const wstring& File, bool filenam
wstring mipMapPath = L""; wstring mipMapPath = L"";
if( l != 0 ) if( l != 0 )
{ {
mipMapPath = L"MipMapLevel" + _toString<int>(l+1); mipMapPath = L"MipMapLevel" + std::to_wstring(l+1);
} }
if( filenameHasExtension ) if( filenameHasExtension )
{ {
@@ -231,7 +231,7 @@ BufferedImage::BufferedImage(DLCPack *dlcPack, const wstring& File, bool filenam
DLCFile *dlcFile = dlcPack->getFile(DLCManager::e_DLCType_All, name); DLCFile *dlcFile = dlcPack->getFile(DLCManager::e_DLCType_All, name);
pbData = dlcFile->getData(dwBytes); pbData = dlcFile->getData(dwBytes);
if(pbData == NULL || dwBytes == 0) if(pbData == NULL || dwBytes == 0)
{ {
// 4J - If we haven't loaded the non-mipmap version then exit the game // 4J - If we haven't loaded the non-mipmap version then exit the game
if( l == 0 ) if( l == 0 )
{ {
@@ -245,7 +245,7 @@ BufferedImage::BufferedImage(DLCPack *dlcPack, const wstring& File, bool filenam
hr=RenderManager.LoadTextureData(pbData,dwBytes,&ImageInfo,&data[l]); hr=RenderManager.LoadTextureData(pbData,dwBytes,&ImageInfo,&data[l]);
if(hr!=ERROR_SUCCESS) if(hr!=ERROR_SUCCESS)
{ {
// 4J - If we haven't loaded the non-mipmap version then exit the game // 4J - If we haven't loaded the non-mipmap version then exit the game
if( l == 0 ) if( l == 0 )
@@ -253,7 +253,7 @@ BufferedImage::BufferedImage(DLCPack *dlcPack, const wstring& File, bool filenam
app.FatalLoadError(); app.FatalLoadError();
} }
return; return;
} }
if( l == 0 ) if( l == 0 )
{ {
@@ -276,7 +276,7 @@ BufferedImage::BufferedImage(BYTE *pbData, DWORD dwBytes)
ZeroMemory(&ImageInfo,sizeof(D3DXIMAGE_INFO)); ZeroMemory(&ImageInfo,sizeof(D3DXIMAGE_INFO));
HRESULT hr=RenderManager.LoadTextureData(pbData,dwBytes,&ImageInfo,&data[0]); HRESULT hr=RenderManager.LoadTextureData(pbData,dwBytes,&ImageInfo,&data[0]);
if(hr==ERROR_SUCCESS) if(hr==ERROR_SUCCESS)
{ {
width=ImageInfo.Width; width=ImageInfo.Width;
height=ImageInfo.Height; height=ImageInfo.Height;

79
Minecraft.Client/Chunk.cpp
View File

@@ -105,7 +105,7 @@ void Chunk::setPos(int x, int y, int z)
{ {
bb = shared_ptr<AABB>(AABB::newPermanent(-g, -g, -g, XZSIZE+g, SIZE+g, XZSIZE+g)); bb = shared_ptr<AABB>(AABB::newPermanent(-g, -g, -g, XZSIZE+g, SIZE+g, XZSIZE+g));
} }
else else
{ {
// 4J MGH - bounds are relative to the position now, so the AABB will be setup already, either above, or from the tesselator bounds. // 4J MGH - bounds are relative to the position now, so the AABB will be setup already, either above, or from the tesselator bounds.
// bb->set(-g, -g, -g, SIZE+g, SIZE+g, SIZE+g); // bb->set(-g, -g, -g, SIZE+g, SIZE+g, SIZE+g);
@@ -143,7 +143,7 @@ void Chunk::setPos(int x, int y, int z)
LeaveCriticalSection(&levelRenderer->m_csDirtyChunks); LeaveCriticalSection(&levelRenderer->m_csDirtyChunks);
} }
void Chunk::translateToPos() void Chunk::translateToPos()
@@ -176,7 +176,7 @@ void Chunk::makeCopyForRebuild(Chunk *source)
this->clipChunk = NULL; this->clipChunk = NULL;
this->id = source->id; this->id = source->id;
this->globalRenderableTileEntities = source->globalRenderableTileEntities; this->globalRenderableTileEntities = source->globalRenderableTileEntities;
this->globalRenderableTileEntities_cs = source->globalRenderableTileEntities_cs; this->globalRenderableTileEntities_cs = source->globalRenderableTileEntities_cs;
} }
void Chunk::rebuild() void Chunk::rebuild()
@@ -189,7 +189,7 @@ void Chunk::rebuild()
// if (!dirty) return; // if (!dirty) return;
PIXBeginNamedEvent(0,"Rebuild section A"); PIXBeginNamedEvent(0,"Rebuild section A");
#ifdef _LARGE_WORLDS #ifdef _LARGE_WORLDS
Tesselator *t = Tesselator::getInstance(); Tesselator *t = Tesselator::getInstance();
#else #else
@@ -226,7 +226,7 @@ void Chunk::rebuild()
// Get the data for the level chunk that this render chunk is it (level chunk is 16 x 16 x 128, // Get the data for the level chunk that this render chunk is it (level chunk is 16 x 16 x 128,
// render chunk is 16 x 16 x 16. We wouldn't have to actually get all of it if the data was ordered differently, but currently // render chunk is 16 x 16 x 16. We wouldn't have to actually get all of it if the data was ordered differently, but currently
// it is ordered by x then z then y so just getting a small range of y out of it would involve getting the whole thing into // it is ordered by x then z then y so just getting a small range of y out of it would involve getting the whole thing into
// the cache anyway. // the cache anyway.
#ifdef _LARGE_WORLDS #ifdef _LARGE_WORLDS
unsigned char *tileIds = GetTileIdsStorage(); unsigned char *tileIds = GetTileIdsStorage();
@@ -240,9 +240,9 @@ void Chunk::rebuild()
TileRenderer *tileRenderer = new TileRenderer(region, this->x, this->y, this->z, tileIds); TileRenderer *tileRenderer = new TileRenderer(region, this->x, this->y, this->z, tileIds);
// AP - added a caching system for Chunk::rebuild to take advantage of // AP - added a caching system for Chunk::rebuild to take advantage of
// Basically we're storing of copy of the tileIDs array inside the region so that calls to Region::getTile can grab data // Basically we're storing of copy of the tileIDs array inside the region so that calls to Region::getTile can grab data
// more quickly from this array rather than calling CompressedTileStorage. On the Vita the total thread time spent in // more quickly from this array rather than calling CompressedTileStorage. On the Vita the total thread time spent in
// Region::getTile went from 20% to 4%. // Region::getTile went from 20% to 4%.
#ifdef __PSVITA__ #ifdef __PSVITA__
int xc = x >> 4; int xc = x >> 4;
int zc = z >> 4; int zc = z >> 4;
@@ -278,7 +278,7 @@ void Chunk::rebuild()
if( yy == (Level::maxBuildHeight - 1) ) continue; if( yy == (Level::maxBuildHeight - 1) ) continue;
if(( xx == 0 ) || ( xx == 15 )) continue; if(( xx == 0 ) || ( xx == 15 )) continue;
if(( zz == 0 ) || ( zz == 15 )) continue; if(( zz == 0 ) || ( zz == 15 )) continue;
// Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already // Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already
// been determined to meet this criteria themselves and have a tile of 255 set. // been determined to meet this criteria themselves and have a tile of 255 set.
if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue;
@@ -340,7 +340,7 @@ void Chunk::rebuild()
PIXBeginNamedEvent(0,"Rebuild section C"); PIXBeginNamedEvent(0,"Rebuild section C");
Tesselator::Bounds bounds; // 4J MGH - added Tesselator::Bounds bounds; // 4J MGH - added
{ {
// this was the old default clip bounds for the chunk, set in Chunk::setPos. // this was the old default clip bounds for the chunk, set in Chunk::setPos.
float g = 6.0f; float g = 6.0f;
bounds.boundingBox[0] = -g; bounds.boundingBox[0] = -g;
bounds.boundingBox[1] = -g; bounds.boundingBox[1] = -g;
@@ -401,7 +401,7 @@ void Chunk::rebuild()
t->begin(); t->begin();
t->offset((float)(-this->x), (float)(-this->y), (float)(-this->z)); t->offset((float)(-this->x), (float)(-this->y), (float)(-this->z));
} }
Tile *tile = Tile::tiles[tileId]; Tile *tile = Tile::tiles[tileId];
if (currentLayer == 0 && tile->isEntityTile()) if (currentLayer == 0 && tile->isEntityTile())
{ {
@@ -468,7 +468,7 @@ void Chunk::rebuild()
{ {
levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level, LevelRenderer::CHUNK_FLAG_EMPTY1); levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level, LevelRenderer::CHUNK_FLAG_EMPTY1);
RenderManager.CBuffClear(lists + 1); RenderManager.CBuffClear(lists + 1);
break; break;
} }
} }
@@ -484,7 +484,6 @@ void Chunk::rebuild()
PIXEndNamedEvent(); PIXEndNamedEvent();
PIXBeginNamedEvent(0,"Rebuild section D"); PIXBeginNamedEvent(0,"Rebuild section D");
// 4J - have rewritten the way that tile entities are stored globally to make it work more easily with split screen. Chunks are now // 4J - have rewritten the way that tile entities are stored globally to make it work more easily with split screen. Chunks are now
// stored globally in the levelrenderer, in a hashmap with a special key made up from the dimension and chunk position (using same index // stored globally in the levelrenderer, in a hashmap with a special key made up from the dimension and chunk position (using same index
// as is used for global flags) // as is used for global flags)
@@ -493,25 +492,25 @@ void Chunk::rebuild()
EnterCriticalSection(globalRenderableTileEntities_cs); EnterCriticalSection(globalRenderableTileEntities_cs);
if( renderableTileEntities.size() ) if( renderableTileEntities.size() )
{ {
AUTO_VAR(it, globalRenderableTileEntities->find(key)); auto it = globalRenderableTileEntities->find(key);
if( it != globalRenderableTileEntities->end() ) if( it != globalRenderableTileEntities->end() )
{ {
// We've got some renderable tile entities that we want associated with this chunk, and an existing list of things that used to be. // We've got some renderable tile entities that we want associated with this chunk, and an existing list of things that used to be.
// We need to flag any that we don't need any more to be removed, keep those that we do, and add any new ones // We need to flag any that we don't need any more to be removed, keep those that we do, and add any new ones
// First pass - flag everything already existing to be removed // First pass - flag everything already existing to be removed
for( AUTO_VAR(it2, it->second.begin()); it2 != it->second.end(); it2++ ) for(auto& it2 : it->second)
{ {
(*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk); it2->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk);
} }
// Now go through the current list. If these are already in the list, then unflag the remove flag. If they aren't, then add // Now go through the current list. If these are already in the list, then unflag the remove flag. If they aren't, then add
for( int i = 0; i < renderableTileEntities.size(); i++ ) for(const auto& it3 : renderableTileEntities)
{ {
AUTO_VAR(it2, find( it->second.begin(), it->second.end(), renderableTileEntities[i] )); auto it2 = find(it->second.begin(), it->second.end(), it3);
if( it2 == it->second.end() ) if( it2 == it->second.end() )
{ {
(*globalRenderableTileEntities)[key].push_back(renderableTileEntities[i]); (*globalRenderableTileEntities)[key].push_back(it3);
} }
else else
{ {
@@ -531,12 +530,12 @@ void Chunk::rebuild()
else else
{ {
// Another easy case - we don't want any renderable tile entities associated with this chunk. Flag all to be removed. // Another easy case - we don't want any renderable tile entities associated with this chunk. Flag all to be removed.
AUTO_VAR(it, globalRenderableTileEntities->find(key)); auto it = globalRenderableTileEntities->find(key);
if( it != globalRenderableTileEntities->end() ) if( it != globalRenderableTileEntities->end() )
{ {
for( AUTO_VAR(it2, it->second.begin()); it2 != it->second.end(); it2++ ) for(auto& it2 : it->second)
{ {
(*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk); it2->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk);
} }
} }
} }
@@ -555,11 +554,11 @@ void Chunk::rebuild()
oldTileEntities.removeAll(renderableTileEntities); oldTileEntities.removeAll(renderableTileEntities);
globalRenderableTileEntities.removeAll(oldTileEntities); globalRenderableTileEntities.removeAll(oldTileEntities);
*/ */
unordered_set<shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); unordered_set<shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end());
AUTO_VAR(endIt, oldTileEntities.end()); auto endIt = oldTileEntities.end();
for( unordered_set<shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) for( unordered_set<shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ )
{ {
newTileEntities.erase(*it); newTileEntities.erase(*it);
@@ -576,7 +575,7 @@ void Chunk::rebuild()
// 4J - All these new things added to globalRenderableTileEntities // 4J - All these new things added to globalRenderableTileEntities
AUTO_VAR(endItRTE, renderableTileEntities.end()); auto endItRTE = renderableTileEntities.end();
for( vector<shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ ) for( vector<shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
{ {
oldTileEntities.erase(*it); oldTileEntities.erase(*it);
@@ -680,13 +679,13 @@ void Chunk::rebuild_SPU()
// Get the data for the level chunk that this render chunk is it (level chunk is 16 x 16 x 128, // Get the data for the level chunk that this render chunk is it (level chunk is 16 x 16 x 128,
// render chunk is 16 x 16 x 16. We wouldn't have to actually get all of it if the data was ordered differently, but currently // render chunk is 16 x 16 x 16. We wouldn't have to actually get all of it if the data was ordered differently, but currently
// it is ordered by x then z then y so just getting a small range of y out of it would involve getting the whole thing into // it is ordered by x then z then y so just getting a small range of y out of it would involve getting the whole thing into
// the cache anyway. // the cache anyway.
ChunkRebuildData* pOutData = NULL; ChunkRebuildData* pOutData = NULL;
g_rebuildDataIn.buildForChunk(&region, level, x0, y0, z0); g_rebuildDataIn.buildForChunk(&region, level, x0, y0, z0);
Tesselator::Bounds bounds; Tesselator::Bounds bounds;
{ {
// this was the old default clip bounds for the chunk, set in Chunk::setPos. // this was the old default clip bounds for the chunk, set in Chunk::setPos.
float g = 6.0f; float g = 6.0f;
bounds.boundingBox[0] = -g; bounds.boundingBox[0] = -g;
bounds.boundingBox[1] = -g; bounds.boundingBox[1] = -g;
@@ -814,14 +813,14 @@ void Chunk::rebuild_SPU()
EnterCriticalSection(globalRenderableTileEntities_cs); EnterCriticalSection(globalRenderableTileEntities_cs);
if( renderableTileEntities.size() ) if( renderableTileEntities.size() )
{ {
AUTO_VAR(it, globalRenderableTileEntities->find(key)); auto it = globalRenderableTileEntities->find(key);
if( it != globalRenderableTileEntities->end() ) if( it != globalRenderableTileEntities->end() )
{ {
// We've got some renderable tile entities that we want associated with this chunk, and an existing list of things that used to be. // We've got some renderable tile entities that we want associated with this chunk, and an existing list of things that used to be.
// We need to flag any that we don't need any more to be removed, keep those that we do, and add any new ones // We need to flag any that we don't need any more to be removed, keep those that we do, and add any new ones
// First pass - flag everything already existing to be removed // First pass - flag everything already existing to be removed
for( AUTO_VAR(it2, it->second.begin()); it2 != it->second.end(); it2++ ) for( auto it2 = it->second.begin(); it2 != it->second.end(); it2++ )
{ {
(*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk); (*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk);
} }
@@ -829,7 +828,7 @@ void Chunk::rebuild_SPU()
// Now go through the current list. If these are already in the list, then unflag the remove flag. If they aren't, then add // Now go through the current list. If these are already in the list, then unflag the remove flag. If they aren't, then add
for( int i = 0; i < renderableTileEntities.size(); i++ ) for( int i = 0; i < renderableTileEntities.size(); i++ )
{ {
AUTO_VAR(it2, find( it->second.begin(), it->second.end(), renderableTileEntities[i] )); auto it2 = find( it->second.begin(), it->second.end(), renderableTileEntities[i] );
if( it2 == it->second.end() ) if( it2 == it->second.end() )
{ {
(*globalRenderableTileEntities)[key].push_back(renderableTileEntities[i]); (*globalRenderableTileEntities)[key].push_back(renderableTileEntities[i]);
@@ -852,10 +851,10 @@ void Chunk::rebuild_SPU()
else else
{ {
// Another easy case - we don't want any renderable tile entities associated with this chunk. Flag all to be removed. // Another easy case - we don't want any renderable tile entities associated with this chunk. Flag all to be removed.
AUTO_VAR(it, globalRenderableTileEntities->find(key)); auto it = globalRenderableTileEntities->find(key);
if( it != globalRenderableTileEntities->end() ) if( it != globalRenderableTileEntities->end() )
{ {
for( AUTO_VAR(it2, it->second.begin()); it2 != it->second.end(); it2++ ) for( auto it2 = it->second.begin(); it2 != it->second.end(); it2++ )
{ {
(*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk); (*it2)->setRenderRemoveStage(TileEntity::e_RenderRemoveStageFlaggedAtChunk);
} }
@@ -875,11 +874,11 @@ void Chunk::rebuild_SPU()
oldTileEntities.removeAll(renderableTileEntities); oldTileEntities.removeAll(renderableTileEntities);
globalRenderableTileEntities.removeAll(oldTileEntities); globalRenderableTileEntities.removeAll(oldTileEntities);
*/ */
unordered_set<shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); unordered_set<shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end());
AUTO_VAR(endIt, oldTileEntities.end()); auto endIt = oldTileEntities.end();
for( unordered_set<shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) for( unordered_set<shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ )
{ {
newTileEntities.erase(*it); newTileEntities.erase(*it);
@@ -896,7 +895,7 @@ void Chunk::rebuild_SPU()
// 4J - All these new things added to globalRenderableTileEntities // 4J - All these new things added to globalRenderableTileEntities
AUTO_VAR(endItRTE, renderableTileEntities.end()); auto endItRTE = renderableTileEntities.end();
for( vector<shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ ) for( vector<shared_ptr<TileEntity> >::iterator it = renderableTileEntities.begin(); it != endItRTE; it++ )
{ {
oldTileEntities.erase(*it); oldTileEntities.erase(*it);

207
Minecraft.Client/ClientConnection.cpp
View File

@@ -168,9 +168,9 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
PlayerUID OnlineXuid; PlayerUID OnlineXuid;
ProfileManager.GetXUID(m_userIndex,&OnlineXuid,true); // online xuid ProfileManager.GetXUID(m_userIndex,&OnlineXuid,true); // online xuid
MOJANG_DATA *pMojangData = NULL; MOJANG_DATA *pMojangData = NULL;
if(!g_NetworkManager.IsLocalGame()) if(!g_NetworkManager.IsLocalGame())
{ {
pMojangData=app.GetMojangDataForXuid(OnlineXuid); pMojangData=app.GetMojangDataForXuid(OnlineXuid);
} }
@@ -222,7 +222,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
// check the file is not already in // check the file is not already in
bRes=app.IsFileInMemoryTextures(wstr); bRes=app.IsFileInMemoryTextures(wstr);
if(!bRes) if(!bRes)
{ {
#ifdef _XBOX #ifdef _XBOX
C4JStorage::ETMSStatus eTMSStatus; C4JStorage::ETMSStatus eTMSStatus;
eTMSStatus=StorageManager.ReadTMSFile(iUserID,C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic,pMojangData->wchSkin,&pBuffer, &dwSize); eTMSStatus=StorageManager.ReadTMSFile(iUserID,C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic,pMojangData->wchSkin,&pBuffer, &dwSize);
@@ -234,17 +234,17 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
if(bRes) if(bRes)
{ {
app.AddMemoryTextureFile(wstr,pBuffer,dwSize); app.AddMemoryTextureFile(wstr,pBuffer,dwSize);
} }
} }
// a cloak? // a cloak?
if(pMojangData->wchCape[0]!=0L) if(pMojangData->wchCape[0]!=0L)
{ {
wstring wstr=pMojangData->wchCape; wstring wstr=pMojangData->wchCape;
// check the file is not already in // check the file is not already in
bRes=app.IsFileInMemoryTextures(wstr); bRes=app.IsFileInMemoryTextures(wstr);
if(!bRes) if(!bRes)
{ {
#ifdef _XBOX #ifdef _XBOX
C4JStorage::ETMSStatus eTMSStatus; C4JStorage::ETMSStatus eTMSStatus;
eTMSStatus=StorageManager.ReadTMSFile(iUserID,C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic,pMojangData->wchCape,&pBuffer, &dwSize); eTMSStatus=StorageManager.ReadTMSFile(iUserID,C4JStorage::eGlobalStorage_Title,C4JStorage::eTMS_FileType_Graphic,pMojangData->wchCape,&pBuffer, &dwSize);
@@ -302,7 +302,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
app.DebugPrintf("ClientConnection - DIFFICULTY --- %d\n",packet->difficulty); app.DebugPrintf("ClientConnection - DIFFICULTY --- %d\n",packet->difficulty);
level->difficulty = packet->difficulty; // 4J Added level->difficulty = packet->difficulty; // 4J Added
level->isClientSide = true; level->isClientSide = true;
minecraft->setLevel(level); minecraft->setLevel(level);
} }
minecraft->player->setPlayerIndex( packet->m_playerIndex ); minecraft->player->setPlayerIndex( packet->m_playerIndex );
@@ -362,7 +362,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
// 4J Stu - At time of writing ProfileManager.GetGamertag() does not always return the correct name, // 4J Stu - At time of writing ProfileManager.GetGamertag() does not always return the correct name,
// if sign-ins are turned off while the player signed in. Using the qnetPlayer instead. // if sign-ins are turned off while the player signed in. Using the qnetPlayer instead.
// need to have a level before create extra local player // need to have a level before create extra local player
MultiPlayerLevel *levelpassedin=(MultiPlayerLevel *)level; MultiPlayerLevel *levelpassedin=(MultiPlayerLevel *)level;
player = minecraft->createExtraLocalPlayer(m_userIndex, networkPlayer->GetOnlineName(), m_userIndex, packet->dimension, this,levelpassedin); player = minecraft->createExtraLocalPlayer(m_userIndex, networkPlayer->GetOnlineName(), m_userIndex, packet->dimension, this,levelpassedin);
// need to have a player before the setlevel // need to have a player before the setlevel
@@ -384,7 +384,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
player->setPlayerIndex( packet->m_playerIndex ); player->setPlayerIndex( packet->m_playerIndex );
player->setCustomSkin( app.GetPlayerSkinId(m_userIndex) ); player->setCustomSkin( app.GetPlayerSkinId(m_userIndex) );
player->setCustomCape( app.GetPlayerCapeId(m_userIndex) ); player->setCustomCape( app.GetPlayerCapeId(m_userIndex) );
BYTE networkSmallId = getSocket()->getSmallId(); BYTE networkSmallId = getSocket()->getSmallId();
app.UpdatePlayerInfo(networkSmallId, packet->m_playerIndex, packet->m_uiGamePrivileges); app.UpdatePlayerInfo(networkSmallId, packet->m_playerIndex, packet->m_uiGamePrivileges);
@@ -396,21 +396,21 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
displayPrivilegeChanges(minecraft->localplayers[m_userIndex],startingPrivileges); displayPrivilegeChanges(minecraft->localplayers[m_userIndex],startingPrivileges);
} }
maxPlayers = packet->maxPlayers; maxPlayers = packet->maxPlayers;
// need to have a player before the setLocalCreativeMode // need to have a player before the setLocalCreativeMode
shared_ptr<MultiplayerLocalPlayer> lastPlayer = minecraft->player; shared_ptr<MultiplayerLocalPlayer> lastPlayer = minecraft->player;
minecraft->player = minecraft->localplayers[m_userIndex]; minecraft->player = minecraft->localplayers[m_userIndex];
((MultiPlayerGameMode *)minecraft->localgameModes[m_userIndex])->setLocalMode(GameType::byId(packet->gameType)); ((MultiPlayerGameMode *)minecraft->localgameModes[m_userIndex])->setLocalMode(GameType::byId(packet->gameType));
minecraft->player = lastPlayer; minecraft->player = lastPlayer;
// make sure the UI offsets for this player are set correctly // make sure the UI offsets for this player are set correctly
if(iUserID!=-1) if(iUserID!=-1)
{ {
ui.UpdateSelectedItemPos(iUserID); ui.UpdateSelectedItemPos(iUserID);
} }
TelemetryManager->RecordLevelStart(m_userIndex, eSen_FriendOrMatch_Playing_With_Invited_Friends, eSen_CompeteOrCoop_Coop_and_Competitive, Minecraft::GetInstance()->getLevel(packet->dimension)->difficulty, app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount()); TelemetryManager->RecordLevelStart(m_userIndex, eSen_FriendOrMatch_Playing_With_Invited_Friends, eSen_CompeteOrCoop_Coop_and_Competitive, Minecraft::GetInstance()->getLevel(packet->dimension)->difficulty, app.GetLocalPlayerCount(), g_NetworkManager.GetOnlinePlayerCount());
} }
@@ -448,7 +448,7 @@ void ClientConnection::handleAddEntity(shared_ptr<AddEntityPacket> packet)
} }
} }
} }
if (owner != NULL && owner->instanceof(eTYPE_PLAYER)) if (owner != NULL && owner->instanceof(eTYPE_PLAYER))
{ {
shared_ptr<Player> player = dynamic_pointer_cast<Player>(owner); shared_ptr<Player> player = dynamic_pointer_cast<Player>(owner);
@@ -574,7 +574,7 @@ void ClientConnection::handleAddEntity(shared_ptr<AddEntityPacket> packet)
} }
packet->data = 0; packet->data = 0;
} }
if (packet->type == AddEntityPacket::ARROW) e = shared_ptr<Entity>( new Arrow(level, x, y, z) ); if (packet->type == AddEntityPacket::ARROW) e = shared_ptr<Entity>( new Arrow(level, x, y, z) );
if (packet->type == AddEntityPacket::SNOWBALL) e = shared_ptr<Entity>( new Snowball(level, x, y, z) ); if (packet->type == AddEntityPacket::SNOWBALL) e = shared_ptr<Entity>( new Snowball(level, x, y, z) );
if (packet->type == AddEntityPacket::THROWN_ENDERPEARL) e = shared_ptr<Entity>( new ThrownEnderpearl(level, x, y, z) ); if (packet->type == AddEntityPacket::THROWN_ENDERPEARL) e = shared_ptr<Entity>( new ThrownEnderpearl(level, x, y, z) );
@@ -620,22 +620,19 @@ void ClientConnection::handleAddEntity(shared_ptr<AddEntityPacket> packet)
e->yRotp = packet->yRot; e->yRotp = packet->yRot;
e->xRotp = packet->xRot; e->xRotp = packet->xRot;
if (setRot) if (setRot)
{ {
e->yRot = 0.0f; e->yRot = 0.0f;
e->xRot = 0.0f; e->xRot = 0.0f;
} }
vector<shared_ptr<Entity> > *subEntities = e->getSubEntities(); vector<shared_ptr<Entity> > *subEntities = e->getSubEntities();
if (subEntities != NULL) if (subEntities)
{ {
int offs = packet->id - e->entityId; int offs = packet->id - e->entityId;
//for (int i = 0; i < subEntities.length; i++) for ( auto it : *subEntities )
for(AUTO_VAR(it, subEntities->begin()); it != subEntities->end(); ++it) {
{ it->entityId += offs;
(*it)->entityId += offs;
//subEntities[i].entityId += offs;
//System.out.println(subEntities[i].entityId);
} }
} }
@@ -685,10 +682,10 @@ void ClientConnection::handleAddEntity(shared_ptr<AddEntityPacket> packet)
} }
} }
e->lerpMotion(packet->xa / 8000.0, packet->ya / 8000.0, packet->za / 8000.0); e->lerpMotion(packet->xa / 8000.0, packet->ya / 8000.0, packet->za / 8000.0);
} }
// 4J: Check our deferred entity link packets // 4J: Check our deferred entity link packets
checkDeferredEntityLinkPackets(e->entityId); checkDeferredEntityLinkPackets(e->entityId);
} }
} }
@@ -839,7 +836,7 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
player->setCustomSkin( packet->m_skinId ); player->setCustomSkin( packet->m_skinId );
player->setCustomCape( packet->m_capeId ); player->setCustomCape( packet->m_capeId );
player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_All, packet->m_uiGamePrivileges); player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_All, packet->m_uiGamePrivileges);
if(!player->customTextureUrl.empty() && player->customTextureUrl.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl)) if(!player->customTextureUrl.empty() && player->customTextureUrl.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl))
{ {
if( minecraft->addPendingClientTextureRequest(player->customTextureUrl) ) if( minecraft->addPendingClientTextureRequest(player->customTextureUrl) )
@@ -856,7 +853,7 @@ void ClientConnection::handleAddPlayer(shared_ptr<AddPlayerPacket> packet)
} }
app.DebugPrintf("Custom skin for player %ls is %ls\n",player->name.c_str(),player->customTextureUrl.c_str()); app.DebugPrintf("Custom skin for player %ls is %ls\n",player->name.c_str(),player->customTextureUrl.c_str());
if(!player->customTextureUrl2.empty() && player->customTextureUrl2.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl2)) if(!player->customTextureUrl2.empty() && player->customTextureUrl2.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl2))
{ {
if( minecraft->addPendingClientTextureRequest(player->customTextureUrl2) ) if( minecraft->addPendingClientTextureRequest(player->customTextureUrl2) )
@@ -1034,7 +1031,7 @@ void ClientConnection::handleMovePlayer(shared_ptr<MovePlayerPacket> packet)
packet->yView = player->y; packet->yView = player->y;
connection->send(packet); connection->send(packet);
if (!started) if (!started)
{ {
if(!g_NetworkManager.IsHost() ) if(!g_NetworkManager.IsHost() )
{ {
@@ -1050,7 +1047,7 @@ void ClientConnection::handleMovePlayer(shared_ptr<MovePlayerPacket> packet)
started = true; started = true;
minecraft->setScreen(NULL); minecraft->setScreen(NULL);
// Fix for #105852 - TU12: Content: Gameplay: Local splitscreen Players are spawned at incorrect places after re-joining previously saved and loaded "Mass Effect World". // Fix for #105852 - TU12: Content: Gameplay: Local splitscreen Players are spawned at incorrect places after re-joining previously saved and loaded "Mass Effect World".
// Move this check from Minecraft::createExtraLocalPlayer // Move this check from Minecraft::createExtraLocalPlayer
// 4J-PB - can't call this when this function is called from the qnet thread (GetGameStarted will be false) // 4J-PB - can't call this when this function is called from the qnet thread (GetGameStarted will be false)
@@ -1124,7 +1121,7 @@ void ClientConnection::handleChunkTilesUpdate(shared_ptr<ChunkTilesUpdatePacket>
// Don't bother setting this to dirty if it isn't going to visually change - we get a lot of // Don't bother setting this to dirty if it isn't going to visually change - we get a lot of
// water changing from static to dynamic for instance // water changing from static to dynamic for instance
if(!( ( ( prevTile == Tile::water_Id ) && ( tile == Tile::calmWater_Id ) ) || if(!( ( ( prevTile == Tile::water_Id ) && ( tile == Tile::calmWater_Id ) ) ||
( ( prevTile == Tile::calmWater_Id ) && ( tile == Tile::water_Id ) ) || ( ( prevTile == Tile::calmWater_Id ) && ( tile == Tile::water_Id ) ) ||
( ( prevTile == Tile::lava_Id ) && ( tile == Tile::calmLava_Id ) ) || ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::calmLava_Id ) ) ||
( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::calmLava_Id ) ) || ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::calmLava_Id ) ) ||
( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::lava_Id ) ) ) ) ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::lava_Id ) ) ) )
@@ -1253,7 +1250,7 @@ void ClientConnection::handleDisconnect(shared_ptr<DisconnectPacket> packet)
{ {
connection->close(DisconnectPacket::eDisconnect_Kicked); connection->close(DisconnectPacket::eDisconnect_Kicked);
done = true; done = true;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
pMinecraft->connectionDisconnected( m_userIndex , packet->reason ); pMinecraft->connectionDisconnected( m_userIndex , packet->reason );
app.SetDisconnectReason( packet->reason ); app.SetDisconnectReason( packet->reason );
@@ -1337,7 +1334,7 @@ void ClientConnection::handleTakeItemEntity(shared_ptr<TakeItemEntityPacket> pac
if (from != NULL) if (from != NULL)
{ {
// If this is a local player, then we only want to do processing for it if this connection is associated with the player it is for. In // If this is a local player, then we only want to do processing for it if this connection is associated with the player it is for. In
// particular, we don't want to remove the item entity until we are processing it for the right connection, or else we won't have a valid // particular, we don't want to remove the item entity until we are processing it for the right connection, or else we won't have a valid
// "from" reference if we've already removed the item for an earlier processed connection // "from" reference if we've already removed the item for an earlier processed connection
if( isLocalPlayer ) if( isLocalPlayer )
@@ -1422,7 +1419,7 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
case ChatPacket::e_ChatBedMeSleep: case ChatPacket::e_ChatBedMeSleep:
message=app.GetString(IDS_TILE_BED_MESLEEP); message=app.GetString(IDS_TILE_BED_MESLEEP);
break; break;
case ChatPacket::e_ChatPlayerJoinedGame: case ChatPacket::e_ChatPlayerJoinedGame:
message=app.GetString(IDS_PLAYER_JOINED); message=app.GetString(IDS_PLAYER_JOINED);
iPos=message.find(L"%s"); iPos=message.find(L"%s");
message.replace(iPos,2,playerDisplayName); message.replace(iPos,2,playerDisplayName);
@@ -1537,7 +1534,7 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
replaceEntitySource = true; replaceEntitySource = true;
break; break;
case ChatPacket::e_ChatDeathFellAccidentLadder: case ChatPacket::e_ChatDeathFellAccidentLadder:
message=app.GetString(IDS_DEATH_FELL_ACCIDENT_LADDER); message=app.GetString(IDS_DEATH_FELL_ACCIDENT_LADDER);
replacePlayer = true; replacePlayer = true;
@@ -1702,7 +1699,7 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
message=app.GetString(IDS_MAX_WOLVES_BRED); message=app.GetString(IDS_MAX_WOLVES_BRED);
break; break;
// can't shear the mooshroom // can't shear the mooshroom
case ChatPacket::e_ChatPlayerCantShearMooshroom: case ChatPacket::e_ChatPlayerCantShearMooshroom:
message=app.GetString(IDS_CANT_SHEAR_MOOSHROOM); message=app.GetString(IDS_CANT_SHEAR_MOOSHROOM);
break; break;
@@ -1710,16 +1707,16 @@ void ClientConnection::handleChat(shared_ptr<ChatPacket> packet)
// Paintings/Item Frames // Paintings/Item Frames
case ChatPacket::e_ChatPlayerMaxHangingEntities: case ChatPacket::e_ChatPlayerMaxHangingEntities:
message=app.GetString(IDS_MAX_HANGINGENTITIES); message=app.GetString(IDS_MAX_HANGINGENTITIES);
break; break;
// Enemy spawn eggs in peaceful // Enemy spawn eggs in peaceful
case ChatPacket::e_ChatPlayerCantSpawnInPeaceful: case ChatPacket::e_ChatPlayerCantSpawnInPeaceful:
message=app.GetString(IDS_CANT_SPAWN_IN_PEACEFUL); message=app.GetString(IDS_CANT_SPAWN_IN_PEACEFUL);
break; break;
// Enemy spawn eggs in peaceful // Enemy spawn eggs in peaceful
case ChatPacket::e_ChatPlayerMaxBoats: case ChatPacket::e_ChatPlayerMaxBoats:
message=app.GetString(IDS_MAX_BOATS); message=app.GetString(IDS_MAX_BOATS);
break; break;
case ChatPacket::e_ChatCommandTeleportSuccess: case ChatPacket::e_ChatCommandTeleportSuccess:
message=app.GetString(IDS_COMMAND_TELEPORT_SUCCESS); message=app.GetString(IDS_COMMAND_TELEPORT_SUCCESS);
@@ -1851,7 +1848,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
BOOL isAtLeastOneFriend = g_NetworkManager.IsHost(); BOOL isAtLeastOneFriend = g_NetworkManager.IsHost();
BOOL isFriendsWithHost = TRUE; BOOL isFriendsWithHost = TRUE;
BOOL cantPlayContentRestricted = FALSE; BOOL cantPlayContentRestricted = FALSE;
if(!g_NetworkManager.IsHost()) if(!g_NetworkManager.IsHost())
{ {
// set the game host settings // set the game host settings
@@ -1885,7 +1882,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
} }
if( playerXuid != INVALID_XUID ) if( playerXuid != INVALID_XUID )
{ {
// Is this user friends with the host player? // Is this user friends with the host player?
BOOL result; BOOL result;
DWORD error; DWORD error;
error = XUserAreUsersFriends(idx,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL); error = XUserAreUsersFriends(idx,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL);
@@ -1915,7 +1912,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
} }
if( playerXuid != INVALID_XUID ) if( playerXuid != INVALID_XUID )
{ {
// Is this user friends with the host player? // Is this user friends with the host player?
BOOL result; BOOL result;
DWORD error; DWORD error;
error = XUserAreUsersFriends(m_userIndex,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL); error = XUserAreUsersFriends(m_userIndex,&packet->m_playerXuids[packet->m_hostIndex],1,&result,NULL);
@@ -2030,7 +2027,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
if(m_userIndex == ProfileManager.GetPrimaryPad() ) if(m_userIndex == ProfileManager.GetPrimaryPad() )
{ {
// Is this user friends with the host player? // Is this user friends with the host player?
bool isFriend = true; bool isFriend = true;
unsigned int friendCount = 0; unsigned int friendCount = 0;
#ifdef __PS3__ #ifdef __PS3__
@@ -2060,7 +2057,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
requestParam.offset = 0; requestParam.offset = 0;
requestParam.userInfo.userId = ProfileManager.getUserID(ProfileManager.GetPrimaryPad()); requestParam.userInfo.userId = ProfileManager.getUserID(ProfileManager.GetPrimaryPad());
int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, &requestParam, false); int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, &requestParam, false);
if( ret == 0 ) if( ret == 0 )
{ {
if( friendList.hasResult() ) if( friendList.hasResult() )
@@ -2070,7 +2067,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
} }
#endif #endif
if( ret == 0 ) if( ret == 0 )
{ {
isFriend = false; isFriend = false;
SceNpId npid; SceNpId npid;
for( unsigned int i = 0; i < friendCount; i++ ) for( unsigned int i = 0; i < friendCount; i++ )
@@ -2153,7 +2150,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
isAtLeastOneFriend = true; isAtLeastOneFriend = true;
break; break;
} }
} }
} }
app.DebugPrintf("ClientConnection::handlePreLogin: User has at least one friend? %s\n", isAtLeastOneFriend ? "Yes" : "No"); app.DebugPrintf("ClientConnection::handlePreLogin: User has at least one friend? %s\n", isAtLeastOneFriend ? "Yes" : "No");
@@ -2195,8 +2192,8 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
DisconnectPacket::eDisconnectReason reason = DisconnectPacket::eDisconnect_NoUGC_Remote; DisconnectPacket::eDisconnectReason reason = DisconnectPacket::eDisconnect_NoUGC_Remote;
#else #else
DisconnectPacket::eDisconnectReason reason = DisconnectPacket::eDisconnect_None; DisconnectPacket::eDisconnectReason reason = DisconnectPacket::eDisconnect_None;
#endif #endif
if(m_userIndex == ProfileManager.GetPrimaryPad()) if(m_userIndex == ProfileManager.GetPrimaryPad())
{ {
if(!isFriendsWithHost) reason = DisconnectPacket::eDisconnect_NotFriendsWithHost; if(!isFriendsWithHost) reason = DisconnectPacket::eDisconnect_NotFriendsWithHost;
else if(!isAtLeastOneFriend) reason = DisconnectPacket::eDisconnect_NoFriendsInGame; else if(!isAtLeastOneFriend) reason = DisconnectPacket::eDisconnect_NoFriendsInGame;
@@ -2208,7 +2205,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE); app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
} }
else else
{ {
if(!isFriendsWithHost) reason = DisconnectPacket::eDisconnect_NotFriendsWithHost; if(!isFriendsWithHost) reason = DisconnectPacket::eDisconnect_NotFriendsWithHost;
else if(!canPlayLocal) reason = DisconnectPacket::eDisconnect_NoUGC_Single_Local; else if(!canPlayLocal) reason = DisconnectPacket::eDisconnect_NoUGC_Single_Local;
else if(cantPlayContentRestricted) reason = DisconnectPacket::eDisconnect_ContentRestricted_Single_Local; else if(cantPlayContentRestricted) reason = DisconnectPacket::eDisconnect_ContentRestricted_Single_Local;
@@ -2221,7 +2218,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
app.SetDisconnectReason( reason ); app.SetDisconnectReason( reason );
// 4J-PB - this locks up on the read and write threads not closing down, because they are trying to lock the incoming critsec when it's already locked by this thread // 4J-PB - this locks up on the read and write threads not closing down, because they are trying to lock the incoming critsec when it's already locked by this thread
// Minecraft::GetInstance()->connectionDisconnected( m_userIndex , reason ); // Minecraft::GetInstance()->connectionDisconnected( m_userIndex , reason );
// done = true; // done = true;
// connection->flush(); // connection->flush();
@@ -2278,7 +2275,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
#endif #endif
// On PS3, all non-signed in players (even guests) can get a useful offlineXUID // On PS3, all non-signed in players (even guests) can get a useful offlineXUID
#if !(defined __PS3__ || defined _DURANGO ) #if !(defined __PS3__ || defined _DURANGO )
if( !ProfileManager.IsGuest( m_userIndex ) ) if( !ProfileManager.IsGuest( m_userIndex ) )
#endif #endif
{ {
@@ -2287,7 +2284,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
} }
BOOL allAllowed, friendsAllowed; BOOL allAllowed, friendsAllowed;
ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed); ProfileManager.AllowedPlayerCreatedContent(m_userIndex,true,&allAllowed,&friendsAllowed);
send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE), send( shared_ptr<LoginPacket>( new LoginPacket(minecraft->user->name, SharedConstants::NETWORK_PROTOCOL_VERSION, offlineXUID, onlineXUID, (allAllowed!=TRUE && friendsAllowed==TRUE),
packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), ProfileManager.IsGuest( m_userIndex )))); packet->m_ugcPlayersVersion, app.GetPlayerSkinId(m_userIndex), app.GetPlayerCapeId(m_userIndex), ProfileManager.IsGuest( m_userIndex ))));
if(!g_NetworkManager.IsHost() ) if(!g_NetworkManager.IsHost() )
@@ -2345,14 +2342,12 @@ void ClientConnection::handleAddMob(shared_ptr<AddMobPacket> packet)
mob->xRotp = packet->xRot; mob->xRotp = packet->xRot;
vector<shared_ptr<Entity> > *subEntities = mob->getSubEntities(); vector<shared_ptr<Entity> > *subEntities = mob->getSubEntities();
if (subEntities != NULL) if (subEntities)
{ {
int offs = packet->id - mob->entityId; int offs = packet->id - mob->entityId;
//for (int i = 0; i < subEntities.length; i++) for (auto& it : *subEntities )
for(AUTO_VAR(it, subEntities->begin()); it != subEntities->end(); ++it) {
{ it->entityId += offs;
//subEntities[i].entityId += offs;
(*it)->entityId += offs;
} }
} }
@@ -2438,7 +2433,7 @@ void ClientConnection::handleEntityLinkPacket(shared_ptr<SetEntityLinkPacket> pa
minecraft.gui.setOverlayMessage(I18n.get("mount.onboard", Options.getTranslatedKeyMessage(options.keySneak.key)), false); minecraft.gui.setOverlayMessage(I18n.get("mount.onboard", Options.getTranslatedKeyMessage(options.keySneak.key)), false);
} }
*/ */
} }
else if (packet->type == SetEntityLinkPacket::LEASH) else if (packet->type == SetEntityLinkPacket::LEASH)
{ {
if ( (sourceEntity != NULL) && sourceEntity->instanceof(eTYPE_MOB) ) if ( (sourceEntity != NULL) && sourceEntity->instanceof(eTYPE_MOB) )
@@ -2508,7 +2503,7 @@ void ClientConnection::handleTexture(shared_ptr<TexturePacket> packet)
wprintf(L"Client received request for custom texture %ls\n",packet->textureName.c_str()); wprintf(L"Client received request for custom texture %ls\n",packet->textureName.c_str());
#endif #endif
PBYTE pbData=NULL; PBYTE pbData=NULL;
DWORD dwBytes=0; DWORD dwBytes=0;
app.GetMemFileDetails(packet->textureName,&pbData,&dwBytes); app.GetMemFileDetails(packet->textureName,&pbData,&dwBytes);
if(dwBytes!=0) if(dwBytes!=0)
@@ -2540,7 +2535,7 @@ void ClientConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
wprintf(L"Client received request for custom texture and geometry %ls\n",packet->textureName.c_str()); wprintf(L"Client received request for custom texture and geometry %ls\n",packet->textureName.c_str());
#endif #endif
PBYTE pbData=NULL; PBYTE pbData=NULL;
DWORD dwBytes=0; DWORD dwBytes=0;
app.GetMemFileDetails(packet->textureName,&pbData,&dwBytes); app.GetMemFileDetails(packet->textureName,&pbData,&dwBytes);
DLCSkinFile *pDLCSkinFile = app.m_dlcManager.getSkinFile(packet->textureName); DLCSkinFile *pDLCSkinFile = app.m_dlcManager.getSkinFile(packet->textureName);
@@ -2574,9 +2569,9 @@ void ClientConnection::handleTextureAndGeometry(shared_ptr<TextureAndGeometryPac
// Add the texture data // Add the texture data
app.AddMemoryTextureFile(packet->textureName,packet->pbData,packet->dwTextureBytes); app.AddMemoryTextureFile(packet->textureName,packet->pbData,packet->dwTextureBytes);
// Add the geometry data // Add the geometry data
if(packet->dwBoxC!=0) if(packet->dwBoxC!=0)
{ {
app.SetAdditionalSkinBoxes(packet->dwSkinID,packet->BoxDataA,packet->dwBoxC); app.SetAdditionalSkinBoxes(packet->dwSkinID,packet->BoxDataA,packet->dwBoxC);
} }
// Add the anim override // Add the anim override
app.SetAnimOverrideBitmask(packet->dwSkinID,packet->uiAnimOverrideBitmask); app.SetAnimOverrideBitmask(packet->dwSkinID,packet->uiAnimOverrideBitmask);
@@ -2622,7 +2617,7 @@ void ClientConnection::handleTextureChange(shared_ptr<TextureChangePacket> packe
#endif #endif
break; break;
} }
if(!packet->path.empty() && packet->path.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(packet->path)) if(!packet->path.empty() && packet->path.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(packet->path))
{ {
if( minecraft->addPendingClientTextureRequest(packet->path) ) if( minecraft->addPendingClientTextureRequest(packet->path) )
@@ -2694,6 +2689,10 @@ void ClientConnection::handleRespawn(shared_ptr<RespawnPacket> packet)
int oldDimension = minecraft->localplayers[m_userIndex]->dimension; int oldDimension = minecraft->localplayers[m_userIndex]->dimension;
started = false; started = false;
// Stop any streaming music (e.g. jukebox) when changing dimensions
// so it doesn't leak into the new dimension
level->playStreamingMusic(L"", 0, 0, 0);
// Remove client connection from this level // Remove client connection from this level
level->removeClientConnection(this, false); level->removeClientConnection(this, false);
@@ -2724,7 +2723,7 @@ void ClientConnection::handleRespawn(shared_ptr<RespawnPacket> packet)
level->removeEntity( shared_ptr<Entity>(minecraft->localplayers[m_userIndex]) ); level->removeEntity( shared_ptr<Entity>(minecraft->localplayers[m_userIndex]) );
level = dimensionLevel; level = dimensionLevel;
// Whilst calling setLevel, make sure that minecraft::player is set up to be correct for this // Whilst calling setLevel, make sure that minecraft::player is set up to be correct for this
// connection // connection
shared_ptr<MultiplayerLocalPlayer> lastPlayer = minecraft->player; shared_ptr<MultiplayerLocalPlayer> lastPlayer = minecraft->player;
@@ -2733,7 +2732,7 @@ void ClientConnection::handleRespawn(shared_ptr<RespawnPacket> packet)
minecraft->player = lastPlayer; minecraft->player = lastPlayer;
TelemetryManager->RecordLevelExit(m_userIndex, eSen_LevelExitStatus_Succeeded); TelemetryManager->RecordLevelExit(m_userIndex, eSen_LevelExitStatus_Succeeded);
//minecraft->player->dimension = packet->dimension; //minecraft->player->dimension = packet->dimension;
minecraft->localplayers[m_userIndex]->dimension = packet->dimension; minecraft->localplayers[m_userIndex]->dimension = packet->dimension;
//minecraft->setScreen(new ReceivingLevelScreen(this)); //minecraft->setScreen(new ReceivingLevelScreen(this));
@@ -2784,12 +2783,12 @@ void ClientConnection::handleRespawn(shared_ptr<RespawnPacket> packet)
{ {
ui.NavigateToScene(m_userIndex, eUIScene_ConnectingProgress, param); ui.NavigateToScene(m_userIndex, eUIScene_ConnectingProgress, param);
} }
app.SetAction( m_userIndex, eAppAction_WaitForDimensionChangeComplete); app.SetAction( m_userIndex, eAppAction_WaitForDimensionChangeComplete);
} }
//minecraft->respawnPlayer(minecraft->player->GetXboxPad(),true, packet->dimension); //minecraft->respawnPlayer(minecraft->player->GetXboxPad(),true, packet->dimension);
// Wrap respawnPlayer call up in code to set & restore the player/gamemode etc. as some things // Wrap respawnPlayer call up in code to set & restore the player/gamemode etc. as some things
// in there assume that we are set up for the player that the respawn is coming in for // in there assume that we are set up for the player that the respawn is coming in for
int oldIndex = minecraft->getLocalPlayerIdx(); int oldIndex = minecraft->getLocalPlayerIdx();
@@ -2814,7 +2813,7 @@ void ClientConnection::handleExplosion(shared_ptr<ExplodePacket> packet)
MultiPlayerLevel *mpLevel = (MultiPlayerLevel *)minecraft->level; MultiPlayerLevel *mpLevel = (MultiPlayerLevel *)minecraft->level;
mpLevel->enableResetChanges(false); mpLevel->enableResetChanges(false);
// 4J - now directly pass a pointer to the toBlow array in the packet rather than copying around // 4J - now directly pass a pointer to the toBlow array in the packet rather than copying around
e->finalizeExplosion(true, &packet->toBlow); e->finalizeExplosion(true, &packet->toBlow);
mpLevel->enableResetChanges(true); mpLevel->enableResetChanges(true);
PIXEndNamedEvent(); PIXEndNamedEvent();
PIXEndNamedEvent(); PIXEndNamedEvent();
@@ -2860,7 +2859,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2874,7 +2873,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2888,7 +2887,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2903,7 +2902,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2918,7 +2917,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2933,7 +2932,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2945,7 +2944,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2957,7 +2956,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2971,7 +2970,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2986,7 +2985,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -2998,7 +2997,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -3021,7 +3020,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -3033,7 +3032,7 @@ void ClientConnection::handleContainerOpen(shared_ptr<ContainerOpenPacket> packe
} }
else else
{ {
failed = true; failed = true;
} }
} }
break; break;
@@ -3111,7 +3110,7 @@ void ClientConnection::handleContainerAck(shared_ptr<ContainerAckPacket> packet)
void ClientConnection::handleContainerContent(shared_ptr<ContainerSetContentPacket> packet) void ClientConnection::handleContainerContent(shared_ptr<ContainerSetContentPacket> packet)
{ {
shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[m_userIndex]; shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[m_userIndex];
if (packet->containerId == AbstractContainerMenu::CONTAINER_ID_INVENTORY) if (packet->containerId == AbstractContainerMenu::CONTAINER_ID_INVENTORY)
{ {
player->inventoryMenu->setAll(&packet->items); player->inventoryMenu->setAll(&packet->items);
} }
@@ -3191,7 +3190,7 @@ void ClientConnection::handleTileEntityData(shared_ptr<TileEntityDataPacket> pac
else if (packet->type == TileEntityDataPacket::TYPE_BEACON && dynamic_pointer_cast<BeaconTileEntity>(te) != NULL) else if (packet->type == TileEntityDataPacket::TYPE_BEACON && dynamic_pointer_cast<BeaconTileEntity>(te) != NULL)
{ {
dynamic_pointer_cast<BeaconTileEntity>(te)->load(packet->tag); dynamic_pointer_cast<BeaconTileEntity>(te)->load(packet->tag);
} }
else if (packet->type == TileEntityDataPacket::TYPE_SKULL && dynamic_pointer_cast<SkullTileEntity>(te) != NULL) else if (packet->type == TileEntityDataPacket::TYPE_SKULL && dynamic_pointer_cast<SkullTileEntity>(te) != NULL)
{ {
dynamic_pointer_cast<SkullTileEntity>(te)->load(packet->tag); dynamic_pointer_cast<SkullTileEntity>(te)->load(packet->tag);
@@ -3269,7 +3268,7 @@ void ClientConnection::handleGameEvent(shared_ptr<GameEventPacket> gameEventPack
else if (event == GameEventPacket::WIN_GAME) else if (event == GameEventPacket::WIN_GAME)
{ {
ui.SetWinUserIndex( (BYTE)gameEventPacket->param ); ui.SetWinUserIndex( (BYTE)gameEventPacket->param );
#ifdef _XBOX #ifdef _XBOX
// turn off the gamertags in splitscreen for the primary player, since they are about to be made fullscreen // turn off the gamertags in splitscreen for the primary player, since they are about to be made fullscreen
@@ -3509,7 +3508,7 @@ void ClientConnection::displayPrivilegeChanges(shared_ptr<MultiplayerLocalPlayer
case Player::ePlayerGamePrivilege_Invulnerable: case Player::ePlayerGamePrivilege_Invulnerable:
if(privOn) message = app.GetString(IDS_PRIV_INVULNERABLE_TOGGLE_ON); if(privOn) message = app.GetString(IDS_PRIV_INVULNERABLE_TOGGLE_ON);
else message = app.GetString(IDS_PRIV_INVULNERABLE_TOGGLE_OFF); else message = app.GetString(IDS_PRIV_INVULNERABLE_TOGGLE_OFF);
break; break;
case Player::ePlayerGamePrivilege_CanToggleInvisible: case Player::ePlayerGamePrivilege_CanToggleInvisible:
if(privOn) message = app.GetString(IDS_PRIV_CAN_INVISIBLE_TOGGLE_ON); if(privOn) message = app.GetString(IDS_PRIV_CAN_INVISIBLE_TOGGLE_ON);
else message = app.GetString(IDS_PRIV_CAN_INVISIBLE_TOGGLE_OFF); else message = app.GetString(IDS_PRIV_CAN_INVISIBLE_TOGGLE_OFF);
@@ -3583,7 +3582,7 @@ void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> custo
UIScene_TradingMenu *screen = (UIScene_TradingMenu *)scene; UIScene_TradingMenu *screen = (UIScene_TradingMenu *)scene;
trader = screen->getMerchant(); trader = screen->getMerchant();
#endif #endif
MerchantRecipeList *recipeList = MerchantRecipeList::createFromStream(&input); MerchantRecipeList *recipeList = MerchantRecipeList::createFromStream(&input);
trader->overrideOffers(recipeList); trader->overrideOffers(recipeList);
} }
@@ -3670,7 +3669,7 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E
DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack(); DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" )) if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
{ {
// no upsell, we're about to quit // no upsell, we're about to quit
MinecraftServer::getInstance()->setSaveOnExit( false ); MinecraftServer::getInstance()->setSaveOnExit( false );
// flag a app action of exit game // flag a app action of exit game
@@ -3724,7 +3723,7 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E
int ClientConnection::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) int ClientConnection::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
{ {
// results switched for this dialog // results switched for this dialog
if(result==C4JStorage::EMessage_ResultDecline) if(result==C4JStorage::EMessage_ResultDecline)
{ {
//INT saveOrCheckpointId = 0; //INT saveOrCheckpointId = 0;
//bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId); //bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
@@ -3743,7 +3742,7 @@ int ClientConnection::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage::
return 0; return 0;
} }
// //
wstring ClientConnection::GetDisplayNameByGamertag(wstring gamertag) wstring ClientConnection::GetDisplayNameByGamertag(wstring gamertag)
{ {
#ifdef _DURANGO #ifdef _DURANGO
@@ -3888,31 +3887,31 @@ void ClientConnection::handleUpdateAttributes(shared_ptr<UpdateAttributesPacket>
if ( !entity->instanceof(eTYPE_LIVINGENTITY) ) if ( !entity->instanceof(eTYPE_LIVINGENTITY) )
{ {
// Entity is not a living entity! // Entity is not a living entity!
assert(0); assert(0);
} }
BaseAttributeMap *attributes = (dynamic_pointer_cast<LivingEntity>(entity))->getAttributes(); BaseAttributeMap *attributes = (dynamic_pointer_cast<LivingEntity>(entity))->getAttributes();
unordered_set<UpdateAttributesPacket::AttributeSnapshot *> attributeSnapshots = packet->getValues(); unordered_set<UpdateAttributesPacket::AttributeSnapshot *> attributeSnapshots = packet->getValues();
for (AUTO_VAR(it,attributeSnapshots.begin()); it != attributeSnapshots.end(); ++it) for ( UpdateAttributesPacket::AttributeSnapshot *attribute : attributeSnapshots )
{ {
UpdateAttributesPacket::AttributeSnapshot *attribute = *it;
AttributeInstance *instance = attributes->getInstance(attribute->getId()); AttributeInstance *instance = attributes->getInstance(attribute->getId());
if (instance == NULL) if (instance)
{ {
// 4J - TODO: revisit, not familiar with the attribute system, why are we passing in MIN_NORMAL (Java's smallest non-zero value conforming to IEEE Standard 754 (?)) and MAX_VALUE // 4J - TODO: revisit, not familiar with the attribute system, why are we passing in MIN_NORMAL (Java's smallest non-zero value conforming to IEEE Standard 754 (?)) and MAX_VALUE
instance = attributes->registerAttribute(new RangedAttribute(attribute->getId(), 0, Double::MIN_NORMAL, Double::MAX_VALUE)); instance = attributes->registerAttribute(new RangedAttribute(attribute->getId(), 0, Double::MIN_NORMAL, Double::MAX_VALUE));
} instance->setBaseValue(attribute->getBase());
instance->removeModifiers();
unordered_set<AttributeModifier *> *modifiers = attribute->getModifiers();
instance->setBaseValue(attribute->getBase()); if ( modifiers )
instance->removeModifiers(); {
for ( AttributeModifier* modifier : *modifiers )
unordered_set<AttributeModifier *> *modifiers = attribute->getModifiers(); {
instance->addModifier(new AttributeModifier(modifier->getId(), modifier->getAmount(), modifier->getOperation()));
for (AUTO_VAR(it2,modifiers->begin()); it2 != modifiers->end(); ++it2) }
{ }
AttributeModifier* modifier = *it2;
instance->addModifier(new AttributeModifier(modifier->getId(), modifier->getAmount(), modifier->getOperation() ) );
} }
} }
} }

2
Minecraft.Client/Common/Audio/Consoles_SoundEngine.cpp
View File

@@ -42,7 +42,7 @@ void ConsoleSoundEngine::tick()
return; return;
} }
for(AUTO_VAR(it,scheduledSounds.begin()); it != scheduledSounds.end();) for (auto it = scheduledSounds.begin(); it != scheduledSounds.end();)
{ {
SoundEngine::ScheduledSound *next = *it; SoundEngine::ScheduledSound *next = *it;
next->delay--; next->delay--;

4
Minecraft.Client/Common/Colours/ColourTable.cpp
View File

@@ -355,7 +355,7 @@ void ColourTable::loadColoursFromData(PBYTE pbData, DWORD dwLength)
wstring colourId = dis.readUTF(); wstring colourId = dis.readUTF();
int colourValue = dis.readInt(); int colourValue = dis.readInt();
setColour(colourId, colourValue); setColour(colourId, colourValue);
AUTO_VAR(it,s_colourNamesMap.find(colourId)); auto it = s_colourNamesMap.find(colourId); // ?
} }
bais.reset(); bais.reset();
@@ -363,7 +363,7 @@ void ColourTable::loadColoursFromData(PBYTE pbData, DWORD dwLength)
void ColourTable::setColour(const wstring &colourName, int value) void ColourTable::setColour(const wstring &colourName, int value)
{ {
AUTO_VAR(it,s_colourNamesMap.find(colourName)); auto it = s_colourNamesMap.find(colourName);
if(it != s_colourNamesMap.end()) if(it != s_colourNamesMap.end())
{ {
m_colourValues[(int)it->second] = value; m_colourValues[(int)it->second] = value;

148
Minecraft.Client/Common/Consoles_App.cpp
View File

@@ -1,5 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h" #include "..\..\Minecraft.World\net.minecraft.world.entity.item.h"
#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" #include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
@@ -1475,9 +1474,8 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Gamertags); app.SetXuiServerAction(iPad,eXuiServerAction_ServerSettingChanged_Gamertags);
PlayerList *players = MinecraftServer::getInstance()->getPlayerList(); PlayerList *players = MinecraftServer::getInstance()->getPlayerList();
for(AUTO_VAR(it3, players->players.begin()); it3 != players->players.end(); ++it3) for( auto& decorationPlayer : players->players )
{ {
shared_ptr<ServerPlayer> decorationPlayer = *it3;
decorationPlayer->setShowOnMaps((app.GetGameHostOption(eGameHostOption_Gamertags)!=0)?true:false); decorationPlayer->setShowOnMaps((app.GetGameHostOption(eGameHostOption_Gamertags)!=0)?true:false);
} }
} }
@@ -5641,7 +5639,7 @@ bool CMinecraftApp::isXuidNotch(PlayerUID xuid)
bool CMinecraftApp::isXuidDeadmau5(PlayerUID xuid) bool CMinecraftApp::isXuidDeadmau5(PlayerUID xuid)
{ {
AUTO_VAR(it, MojangData.find( xuid )); // 4J Stu - The .at and [] accessors insert elements if they don't exist auto it = MojangData.find(xuid); // 4J Stu - The .at and [] accessors insert elements if they don't exist
if (it != MojangData.end() ) if (it != MojangData.end() )
{ {
MOJANG_DATA *pMojangData=MojangData[xuid]; MOJANG_DATA *pMojangData=MojangData[xuid];
@@ -5659,7 +5657,7 @@ void CMinecraftApp::AddMemoryTextureFile(const wstring &wName,PBYTE pbData,DWORD
EnterCriticalSection(&csMemFilesLock); EnterCriticalSection(&csMemFilesLock);
// check it's not already in // check it's not already in
PMEMDATA pData=NULL; PMEMDATA pData=NULL;
AUTO_VAR(it, m_MEM_Files.find(wName)); auto it = m_MEM_Files.find(wName);
if(it != m_MEM_Files.end()) if(it != m_MEM_Files.end())
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
@@ -5704,7 +5702,7 @@ void CMinecraftApp::RemoveMemoryTextureFile(const wstring &wName)
{ {
EnterCriticalSection(&csMemFilesLock); EnterCriticalSection(&csMemFilesLock);
AUTO_VAR(it, m_MEM_Files.find(wName)); auto it = m_MEM_Files.find(wName);
if(it != m_MEM_Files.end()) if(it != m_MEM_Files.end())
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
@@ -5730,7 +5728,7 @@ bool CMinecraftApp::DefaultCapeExists()
bool val = false; bool val = false;
EnterCriticalSection(&csMemFilesLock); EnterCriticalSection(&csMemFilesLock);
AUTO_VAR(it, m_MEM_Files.find(wTex)); auto it = m_MEM_Files.find(wTex);
if(it != m_MEM_Files.end()) val = true; if(it != m_MEM_Files.end()) val = true;
LeaveCriticalSection(&csMemFilesLock); LeaveCriticalSection(&csMemFilesLock);
@@ -5742,7 +5740,7 @@ bool CMinecraftApp::IsFileInMemoryTextures(const wstring &wName)
bool val = false; bool val = false;
EnterCriticalSection(&csMemFilesLock); EnterCriticalSection(&csMemFilesLock);
AUTO_VAR(it, m_MEM_Files.find(wName)); auto it = m_MEM_Files.find(wName);
if(it != m_MEM_Files.end()) val = true; if(it != m_MEM_Files.end()) val = true;
LeaveCriticalSection(&csMemFilesLock); LeaveCriticalSection(&csMemFilesLock);
@@ -5752,7 +5750,7 @@ bool CMinecraftApp::IsFileInMemoryTextures(const wstring &wName)
void CMinecraftApp::GetMemFileDetails(const wstring &wName,PBYTE *ppbData,DWORD *pdwBytes) void CMinecraftApp::GetMemFileDetails(const wstring &wName,PBYTE *ppbData,DWORD *pdwBytes)
{ {
EnterCriticalSection(&csMemFilesLock); EnterCriticalSection(&csMemFilesLock);
AUTO_VAR(it, m_MEM_Files.find(wName)); auto it = m_MEM_Files.find(wName);
if(it != m_MEM_Files.end()) if(it != m_MEM_Files.end())
{ {
PMEMDATA pData = (*it).second; PMEMDATA pData = (*it).second;
@@ -5767,7 +5765,7 @@ void CMinecraftApp::AddMemoryTPDFile(int iConfig,PBYTE pbData,DWORD dwBytes)
EnterCriticalSection(&csMemTPDLock); EnterCriticalSection(&csMemTPDLock);
// check it's not already in // check it's not already in
PMEMDATA pData=NULL; PMEMDATA pData=NULL;
AUTO_VAR(it, m_MEM_TPD.find(iConfig)); auto it = m_MEM_TPD.find(iConfig);
if(it == m_MEM_TPD.end()) if(it == m_MEM_TPD.end())
{ {
pData = (PMEMDATA)new BYTE[sizeof(MEMDATA)]; pData = (PMEMDATA)new BYTE[sizeof(MEMDATA)];
@@ -5787,7 +5785,7 @@ void CMinecraftApp::RemoveMemoryTPDFile(int iConfig)
EnterCriticalSection(&csMemTPDLock); EnterCriticalSection(&csMemTPDLock);
// check it's not already in // check it's not already in
PMEMDATA pData=NULL; PMEMDATA pData=NULL;
AUTO_VAR(it, m_MEM_TPD.find(iConfig)); auto it = m_MEM_TPD.find(iConfig);
if(it != m_MEM_TPD.end()) if(it != m_MEM_TPD.end())
{ {
pData=m_MEM_TPD[iConfig]; pData=m_MEM_TPD[iConfig];
@@ -5844,7 +5842,7 @@ bool CMinecraftApp::IsFileInTPD(int iConfig)
bool val = false; bool val = false;
EnterCriticalSection(&csMemTPDLock); EnterCriticalSection(&csMemTPDLock);
AUTO_VAR(it, m_MEM_TPD.find(iConfig)); auto it = m_MEM_TPD.find(iConfig);
if(it != m_MEM_TPD.end()) val = true; if(it != m_MEM_TPD.end()) val = true;
LeaveCriticalSection(&csMemTPDLock); LeaveCriticalSection(&csMemTPDLock);
@@ -5854,7 +5852,7 @@ bool CMinecraftApp::IsFileInTPD(int iConfig)
void CMinecraftApp::GetTPD(int iConfig,PBYTE *ppbData,DWORD *pdwBytes) void CMinecraftApp::GetTPD(int iConfig,PBYTE *ppbData,DWORD *pdwBytes)
{ {
EnterCriticalSection(&csMemTPDLock); EnterCriticalSection(&csMemTPDLock);
AUTO_VAR(it, m_MEM_TPD.find(iConfig)); auto it = m_MEM_TPD.find(iConfig);
if(it != m_MEM_TPD.end()) if(it != m_MEM_TPD.end())
{ {
PMEMDATA pData = (*it).second; PMEMDATA pData = (*it).second;
@@ -6989,7 +6987,7 @@ HRESULT CMinecraftApp::RegisterDLCData(eDLCContentType eType, WCHAR *pwchBannerN
// check if we already have this info from the local DLC file // check if we already have this info from the local DLC file
wstring wsTemp=wchUppercaseProductID; wstring wsTemp=wchUppercaseProductID;
AUTO_VAR(it, DLCInfo_Full.find(wsTemp)); auto it = DLCInfo_Full.find(wsTemp);
if( it == DLCInfo_Full.end() ) if( it == DLCInfo_Full.end() )
{ {
// Not found // Not found
@@ -7097,7 +7095,7 @@ HRESULT CMinecraftApp::RegisterDLCData(char *pchDLCName, unsigned int uiSortInde
#if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__) #if defined( __PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal) bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
{ {
AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin)); auto it = DLCInfo_SkinName.find(FirstSkin);
if( it == DLCInfo_SkinName.end() ) if( it == DLCInfo_SkinName.end() )
{ {
return false; return false;
@@ -7110,7 +7108,7 @@ bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLON
} }
bool CMinecraftApp::GetDLCNameForPackID(const int iPackID,char **ppchKeyID) bool CMinecraftApp::GetDLCNameForPackID(const int iPackID,char **ppchKeyID)
{ {
AUTO_VAR(it, DLCTextures_PackID.find(iPackID)); auto it = DLCTextures_PackID.find(iPackID);
if( it == DLCTextures_PackID.end() ) if( it == DLCTextures_PackID.end() )
{ {
*ppchKeyID=NULL; *ppchKeyID=NULL;
@@ -7128,7 +7126,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfo(char *pchDLCName)
if(DLCInfo.size()>0) if(DLCInfo.size()>0)
{ {
AUTO_VAR(it, DLCInfo.find(tempString)); auto it = DLCInfo.find(tempString);
if( it == DLCInfo.end() ) if( it == DLCInfo.end() )
{ {
@@ -7185,7 +7183,7 @@ char *CMinecraftApp::GetDLCInfoTextures(int iIndex)
#elif defined _XBOX_ONE #elif defined _XBOX_ONE
bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,wstring &ProductId) bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,wstring &ProductId)
{ {
AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin)); auto it = DLCInfo_SkinName.find(FirstSkin);
if( it == DLCInfo_SkinName.end() ) if( it == DLCInfo_SkinName.end() )
{ {
return false; return false;
@@ -7198,7 +7196,7 @@ bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,wstring
} }
bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,wstring &ProductId) bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,wstring &ProductId)
{ {
AUTO_VAR(it, DLCTextures_PackID.find(iPackID)); auto it = DLCTextures_PackID.find(iPackID);
if( it == DLCTextures_PackID.end() ) if( it == DLCTextures_PackID.end() )
{ {
return false; return false;
@@ -7243,7 +7241,7 @@ wstring CMinecraftApp::GetDLCInfoTexturesFullOffer(int iIndex)
#else #else
bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal) bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLONG *pullVal)
{ {
AUTO_VAR(it, DLCInfo_SkinName.find(FirstSkin)); auto it = DLCInfo_SkinName.find(FirstSkin);
if( it == DLCInfo_SkinName.end() ) if( it == DLCInfo_SkinName.end() )
{ {
return false; return false;
@@ -7256,15 +7254,15 @@ bool CMinecraftApp::GetDLCFullOfferIDForSkinID(const wstring &FirstSkin,ULONGLON
} }
bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,ULONGLONG *pullVal) bool CMinecraftApp::GetDLCFullOfferIDForPackID(const int iPackID,ULONGLONG *pullVal)
{ {
AUTO_VAR(it, DLCTextures_PackID.find(iPackID)); auto it = DLCTextures_PackID.find(iPackID);
if( it == DLCTextures_PackID.end() ) if( it == DLCTextures_PackID.end() )
{ {
*pullVal=(ULONGLONG)0; *pullVal=0ULL;
return false; return false;
} }
else else
{ {
*pullVal=(ULONGLONG)it->second; *pullVal=it->second;
return true; return true;
} }
} }
@@ -7273,7 +7271,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForTrialOfferID(ULONGLONG ullOfferID_Trial)
//DLC_INFO *pDLCInfo=NULL; //DLC_INFO *pDLCInfo=NULL;
if(DLCInfo_Trial.size()>0) if(DLCInfo_Trial.size()>0)
{ {
AUTO_VAR(it, DLCInfo_Trial.find(ullOfferID_Trial)); auto it = DLCInfo_Trial.find(ullOfferID_Trial);
if( it == DLCInfo_Trial.end() ) if( it == DLCInfo_Trial.end() )
{ {
@@ -7330,7 +7328,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(WCHAR *pwchProductID)
wstring wsTemp = pwchProductID; wstring wsTemp = pwchProductID;
if(DLCInfo_Full.size()>0) if(DLCInfo_Full.size()>0)
{ {
AUTO_VAR(it, DLCInfo_Full.find(wsTemp)); auto it = DLCInfo_Full.find(wsTemp);
if( it == DLCInfo_Full.end() ) if( it == DLCInfo_Full.end() )
{ {
@@ -7370,7 +7368,7 @@ DLC_INFO *CMinecraftApp::GetDLCInfoForFullOfferID(ULONGLONG ullOfferID_Full)
if(DLCInfo_Full.size()>0) if(DLCInfo_Full.size()>0)
{ {
AUTO_VAR(it, DLCInfo_Full.find(ullOfferID_Full)); auto it = DLCInfo_Full.find(ullOfferID_Full);
if( it == DLCInfo_Full.end() ) if( it == DLCInfo_Full.end() )
{ {
@@ -7570,9 +7568,8 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char *ps
DWORD dwDataBytes=(DWORD)(sizeof(BANNEDLISTDATA)*m_vBannedListA[iPad]->size()); DWORD dwDataBytes=(DWORD)(sizeof(BANNEDLISTDATA)*m_vBannedListA[iPad]->size());
PBANNEDLISTDATA pBannedList = (BANNEDLISTDATA *)(new CHAR [dwDataBytes]); PBANNEDLISTDATA pBannedList = (BANNEDLISTDATA *)(new CHAR [dwDataBytes]);
int iCount=0; int iCount=0;
for(AUTO_VAR(it, m_vBannedListA[iPad]->begin()); it != m_vBannedListA[iPad]->end(); ++it) for (PBANNEDLISTDATA pData : *m_vBannedListA[iPad] )
{ {
PBANNEDLISTDATA pData=*it;
memcpy(&pBannedList[iCount++],pData,sizeof(BANNEDLISTDATA)); memcpy(&pBannedList[iCount++],pData,sizeof(BANNEDLISTDATA));
} }
@@ -7590,9 +7587,8 @@ void CMinecraftApp::AddLevelToBannedLevelList(int iPad, PlayerUID xuid, char *ps
bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, char *pszLevelName) bool CMinecraftApp::IsInBannedLevelList(int iPad, PlayerUID xuid, char *pszLevelName)
{ {
for(AUTO_VAR(it, m_vBannedListA[iPad]->begin()); it != m_vBannedListA[iPad]->end(); ++it) for( PBANNEDLISTDATA pData : *m_vBannedListA[iPad] )
{ {
PBANNEDLISTDATA pData=*it;
#ifdef _XBOX_ONE #ifdef _XBOX_ONE
PlayerUID bannedPlayerUID = pData->wchPlayerUID; PlayerUID bannedPlayerUID = pData->wchPlayerUID;
if(IsEqualXUID (bannedPlayerUID,xuid) && (strcmp(pData->pszLevelName,pszLevelName)==0)) if(IsEqualXUID (bannedPlayerUID,xuid) && (strcmp(pData->pszLevelName,pszLevelName)==0))
@@ -7613,7 +7609,7 @@ void CMinecraftApp::RemoveLevelFromBannedLevelList(int iPad, PlayerUID xuid, cha
//bool bRes; //bool bRes;
// we will have retrieved the banned level list from TMS, so remove this one from it and write it back to TMS // we will have retrieved the banned level list from TMS, so remove this one from it and write it back to TMS
for(AUTO_VAR(it, m_vBannedListA[iPad]->begin()); it != m_vBannedListA[iPad]->end(); ) for (auto it = m_vBannedListA[iPad]->begin(); it != m_vBannedListA[iPad]->end(); )
{ {
PBANNEDLISTDATA pBannedListData = *it; PBANNEDLISTDATA pBannedListData = *it;
@@ -8321,10 +8317,8 @@ unsigned int CMinecraftApp::CreateImageTextData(PBYTE bTextMetadata, __int64 see
void CMinecraftApp::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType,int x,int z) void CMinecraftApp::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType,int x,int z)
{ {
// check we don't already have this in // check we don't already have this in
for(AUTO_VAR(it, m_vTerrainFeatures.begin()); it < m_vTerrainFeatures.end(); ++it) for( FEATURE_DATA *pFeatureData : m_vTerrainFeatures )
{ {
FEATURE_DATA *pFeatureData=*it;
if((pFeatureData->eTerrainFeature==eFeatureType) &&(pFeatureData->x==x) && (pFeatureData->z==z)) return; if((pFeatureData->eTerrainFeature==eFeatureType) &&(pFeatureData->x==x) && (pFeatureData->z==z)) return;
} }
@@ -8338,10 +8332,8 @@ void CMinecraftApp::AddTerrainFeaturePosition(_eTerrainFeatureType eFeatureType,
_eTerrainFeatureType CMinecraftApp::IsTerrainFeature(int x,int z) _eTerrainFeatureType CMinecraftApp::IsTerrainFeature(int x,int z)
{ {
for(AUTO_VAR(it, m_vTerrainFeatures.begin()); it < m_vTerrainFeatures.end(); ++it) for(FEATURE_DATA *pFeatureData : m_vTerrainFeatures )
{ {
FEATURE_DATA *pFeatureData=*it;
if((pFeatureData->x==x) && (pFeatureData->z==z)) return pFeatureData->eTerrainFeature; if((pFeatureData->x==x) && (pFeatureData->z==z)) return pFeatureData->eTerrainFeature;
} }
@@ -8350,10 +8342,8 @@ _eTerrainFeatureType CMinecraftApp::IsTerrainFeature(int x,int z)
bool CMinecraftApp::GetTerrainFeaturePosition(_eTerrainFeatureType eType,int *pX, int *pZ) bool CMinecraftApp::GetTerrainFeaturePosition(_eTerrainFeatureType eType,int *pX, int *pZ)
{ {
for(AUTO_VAR(it, m_vTerrainFeatures.begin()); it < m_vTerrainFeatures.end(); ++it) for ( const FEATURE_DATA *pFeatureData : m_vTerrainFeatures )
{ {
FEATURE_DATA *pFeatureData=*it;
if(pFeatureData->eTerrainFeature==eType) if(pFeatureData->eTerrainFeature==eType)
{ {
*pX=pFeatureData->x; *pX=pFeatureData->x;
@@ -8489,10 +8479,8 @@ unsigned int CMinecraftApp::AddDLCRequest(eDLCMarketplaceType eType, bool bPromo
// If it's already in there, promote it to the top of the list // If it's already in there, promote it to the top of the list
int iPosition=0; int iPosition=0;
for(AUTO_VAR(it, m_DLCDownloadQueue.begin()); it != m_DLCDownloadQueue.end(); ++it) for( DLCRequest *pCurrent : m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it;
if(pCurrent->dwType==m_dwContentTypeA[eType]) if(pCurrent->dwType==m_dwContentTypeA[eType])
{ {
// already got this in the list // already got this in the list
@@ -8543,7 +8531,7 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
bool bPromoted=false; bool bPromoted=false;
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for ( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it; TMSPPRequest *pCurrent = *it;
@@ -8601,10 +8589,8 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
// this may already be present in the vector because of a previous trial/full offer // this may already be present in the vector because of a previous trial/full offer
bool bAlreadyInQueue=false; bool bAlreadyInQueue=false;
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it;
if(wcscmp(pDLC->wchDataFile,pCurrent->wchFilename)==0) if(wcscmp(pDLC->wchDataFile,pCurrent->wchFilename)==0)
{ {
bAlreadyInQueue=true; bAlreadyInQueue=true;
@@ -8664,10 +8650,8 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
if(!bPresent) // retrieve it from TMSPP if(!bPresent) // retrieve it from TMSPP
{ {
bool bAlreadyInQueue=false; bool bAlreadyInQueue=false;
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it;
if(wcscmp(pDLC->wchBanner,pCurrent->wchFilename)==0) if(wcscmp(pDLC->wchBanner,pCurrent->wchFilename)==0)
{ {
bAlreadyInQueue=true; bAlreadyInQueue=true;
@@ -8721,10 +8705,8 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
// this may already be present in the vector because of a previous trial/full offer // this may already be present in the vector because of a previous trial/full offer
bool bAlreadyInQueue=false; bool bAlreadyInQueue=false;
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it;
if(wcscmp(pDLC->wchBanner,pCurrent->wchFilename)==0) if(wcscmp(pDLC->wchBanner,pCurrent->wchFilename)==0)
{ {
bAlreadyInQueue=true; bAlreadyInQueue=true;
@@ -8767,10 +8749,8 @@ unsigned int CMinecraftApp::AddTMSPPFileTypeRequest(eDLCContentType eType, bool
bool CMinecraftApp::CheckTMSDLCCanStop() bool CMinecraftApp::CheckTMSDLCCanStop()
{ {
EnterCriticalSection(&csTMSPPDownloadQueue); EnterCriticalSection(&csTMSPPDownloadQueue);
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it;
if(pCurrent->eState==e_TMS_ContentState_Retrieving) if(pCurrent->eState==e_TMS_ContentState_Retrieving)
{ {
LeaveCriticalSection(&csTMSPPDownloadQueue); LeaveCriticalSection(&csTMSPPDownloadQueue);
@@ -8796,10 +8776,8 @@ bool CMinecraftApp::RetrieveNextDLCContent()
} }
EnterCriticalSection(&csDLCDownloadQueue); EnterCriticalSection(&csDLCDownloadQueue);
for(AUTO_VAR(it, m_DLCDownloadQueue.begin()); it != m_DLCDownloadQueue.end(); ++it) for( const DLCRequest* pCurrent : m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it;
if(pCurrent->eState==e_DLC_ContentState_Retrieving) if(pCurrent->eState==e_DLC_ContentState_Retrieving)
{ {
LeaveCriticalSection(&csDLCDownloadQueue); LeaveCriticalSection(&csDLCDownloadQueue);
@@ -8808,10 +8786,8 @@ bool CMinecraftApp::RetrieveNextDLCContent()
} }
// Now look for the next retrieval // Now look for the next retrieval
for(AUTO_VAR(it, m_DLCDownloadQueue.begin()); it != m_DLCDownloadQueue.end(); ++it) for( DLCRequest *pCurrent : m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it;
if(pCurrent->eState==e_DLC_ContentState_Idle) if(pCurrent->eState==e_DLC_ContentState_Idle)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@@ -8853,9 +8829,8 @@ int CMinecraftApp::TMSPPFileReturned(LPVOID pParam,int iPad,int iUserData,C4JSto
// find the right one in the vector // find the right one in the vector
EnterCriticalSection(&pClass->csTMSPPDownloadQueue); EnterCriticalSection(&pClass->csTMSPPDownloadQueue);
for(AUTO_VAR(it, pClass->m_TMSPPDownloadQueue.begin()); it != pClass->m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : pClass->m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it;
#if defined(_XBOX) || defined(_WINDOWS64) #if defined(_XBOX) || defined(_WINDOWS64)
char szFile[MAX_TMSFILENAME_SIZE]; char szFile[MAX_TMSFILENAME_SIZE];
wcstombs(szFile,pCurrent->wchFilename,MAX_TMSFILENAME_SIZE); wcstombs(szFile,pCurrent->wchFilename,MAX_TMSFILENAME_SIZE);
@@ -8956,8 +8931,7 @@ bool CMinecraftApp::RetrieveNextTMSPPContent()
if(ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad())==false) return false; if(ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad())==false) return false;
EnterCriticalSection(&csTMSPPDownloadQueue); for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it)
{ {
TMSPPRequest *pCurrent = *it; TMSPPRequest *pCurrent = *it;
@@ -8970,7 +8944,7 @@ bool CMinecraftApp::RetrieveNextTMSPPContent()
} }
// Now look for the next retrieval // Now look for the next retrieval
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it; TMSPPRequest *pCurrent = *it;
@@ -9074,11 +9048,10 @@ void CMinecraftApp::ClearAndResetDLCDownloadQueue()
int iPosition=0; int iPosition=0;
EnterCriticalSection(&csTMSPPDownloadQueue); EnterCriticalSection(&csTMSPPDownloadQueue);
for(AUTO_VAR(it, m_DLCDownloadQueue.begin()); it != m_DLCDownloadQueue.end(); ++it) for( DLCRequest *pCurrent : m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it; if ( pCurrent )
delete pCurrent;
delete pCurrent;
iPosition++; iPosition++;
} }
m_DLCDownloadQueue.clear(); m_DLCDownloadQueue.clear();
@@ -9100,11 +9073,10 @@ void CMinecraftApp::ClearTMSPPFilesRetrieved()
{ {
int iPosition=0; int iPosition=0;
EnterCriticalSection(&csTMSPPDownloadQueue); EnterCriticalSection(&csTMSPPDownloadQueue);
for(AUTO_VAR(it, m_TMSPPDownloadQueue.begin()); it != m_TMSPPDownloadQueue.end(); ++it) for ( TMSPPRequest *pCurrent : m_TMSPPDownloadQueue )
{ {
TMSPPRequest *pCurrent = *it; if ( pCurrent )
delete pCurrent;
delete pCurrent;
iPosition++; iPosition++;
} }
m_TMSPPDownloadQueue.clear(); m_TMSPPDownloadQueue.clear();
@@ -9118,10 +9090,8 @@ int CMinecraftApp::DLCOffersReturned(void *pParam, int iOfferC, DWORD dwType, in
// find the right one in the vector // find the right one in the vector
EnterCriticalSection(&pClass->csTMSPPDownloadQueue); EnterCriticalSection(&pClass->csTMSPPDownloadQueue);
for(AUTO_VAR(it, pClass->m_DLCDownloadQueue.begin()); it != pClass->m_DLCDownloadQueue.end(); ++it) for( DLCRequest *pCurrent : pClass->m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it;
// avatar items are coming back as type Content, so we can't trust the type setting // avatar items are coming back as type Content, so we can't trust the type setting
if(pCurrent->dwType==dwType) if(pCurrent->dwType==dwType)
{ {
@@ -9151,10 +9121,8 @@ bool CMinecraftApp::DLCContentRetrieved(eDLCMarketplaceType eType)
// If there's already a retrieve in progress, quit // If there's already a retrieve in progress, quit
// we may have re-ordered the list, so need to check every item // we may have re-ordered the list, so need to check every item
EnterCriticalSection(&csDLCDownloadQueue); EnterCriticalSection(&csDLCDownloadQueue);
for(AUTO_VAR(it, m_DLCDownloadQueue.begin()); it != m_DLCDownloadQueue.end(); ++it) for( DLCRequest *pCurrent : m_DLCDownloadQueue )
{ {
DLCRequest *pCurrent = *it;
if((pCurrent->dwType==m_dwContentTypeA[eType]) && (pCurrent->eState==e_DLC_ContentState_Retrieved)) if((pCurrent->dwType==m_dwContentTypeA[eType]) && (pCurrent->eState==e_DLC_ContentState_Retrieved))
{ {
LeaveCriticalSection(&csDLCDownloadQueue); LeaveCriticalSection(&csDLCDownloadQueue);
@@ -9208,17 +9176,17 @@ vector<ModelPart *> * CMinecraftApp::SetAdditionalSkinBoxes(DWORD dwSkinID, vect
app.DebugPrintf("*** SetAdditionalSkinBoxes - Inserting model parts for skin %d from array of Skin Boxes\n",dwSkinID&0x0FFFFFFF); app.DebugPrintf("*** SetAdditionalSkinBoxes - Inserting model parts for skin %d from array of Skin Boxes\n",dwSkinID&0x0FFFFFFF);
// convert the skin boxes into model parts, and add to the humanoid model // convert the skin boxes into model parts, and add to the humanoid model
for(AUTO_VAR(it, pvSkinBoxA->begin());it != pvSkinBoxA->end(); ++it) for( auto& it : *pvSkinBoxA )
{ {
if(pModel) if(pModel)
{ {
ModelPart *pModelPart=pModel->AddOrRetrievePart(*it); ModelPart *pModelPart=pModel->AddOrRetrievePart(it);
pvModelPart->push_back(pModelPart); pvModelPart->push_back(pModelPart);
} }
} }
m_AdditionalModelParts.insert( std::pair<DWORD, vector<ModelPart *> *>(dwSkinID, pvModelPart) ); m_AdditionalModelParts.emplace(dwSkinID, pvModelPart);
m_AdditionalSkinBoxes.insert( std::pair<DWORD, vector<SKIN_BOX *> *>(dwSkinID, pvSkinBoxA) ); m_AdditionalSkinBoxes.emplace(dwSkinID, pvSkinBoxA);
LeaveCriticalSection( &csAdditionalSkinBoxes ); LeaveCriticalSection( &csAdditionalSkinBoxes );
LeaveCriticalSection( &csAdditionalModelParts ); LeaveCriticalSection( &csAdditionalModelParts );
@@ -9232,7 +9200,7 @@ vector<ModelPart *> *CMinecraftApp::GetAdditionalModelParts(DWORD dwSkinID)
vector<ModelPart *> *pvModelParts=NULL; vector<ModelPart *> *pvModelParts=NULL;
if(m_AdditionalModelParts.size()>0) if(m_AdditionalModelParts.size()>0)
{ {
AUTO_VAR(it, m_AdditionalModelParts.find(dwSkinID)); auto it = m_AdditionalModelParts.find(dwSkinID);
if(it!=m_AdditionalModelParts.end()) if(it!=m_AdditionalModelParts.end())
{ {
pvModelParts = (*it).second; pvModelParts = (*it).second;
@@ -9249,7 +9217,7 @@ vector<SKIN_BOX *> *CMinecraftApp::GetAdditionalSkinBoxes(DWORD dwSkinID)
vector<SKIN_BOX *> *pvSkinBoxes=NULL; vector<SKIN_BOX *> *pvSkinBoxes=NULL;
if(m_AdditionalSkinBoxes.size()>0) if(m_AdditionalSkinBoxes.size()>0)
{ {
AUTO_VAR(it,m_AdditionalSkinBoxes.find(dwSkinID)); auto it = m_AdditionalSkinBoxes.find(dwSkinID);
if(it!=m_AdditionalSkinBoxes.end()) if(it!=m_AdditionalSkinBoxes.end())
{ {
pvSkinBoxes = (*it).second; pvSkinBoxes = (*it).second;
@@ -9267,7 +9235,7 @@ unsigned int CMinecraftApp::GetAnimOverrideBitmask(DWORD dwSkinID)
if(m_AnimOverrides.size()>0) if(m_AnimOverrides.size()>0)
{ {
AUTO_VAR(it, m_AnimOverrides.find(dwSkinID)); auto it = m_AnimOverrides.find(dwSkinID);
if(it!=m_AnimOverrides.end()) if(it!=m_AnimOverrides.end())
{ {
uiAnimOverrideBitmask = (*it).second; uiAnimOverrideBitmask = (*it).second;
@@ -9285,7 +9253,7 @@ void CMinecraftApp::SetAnimOverrideBitmask(DWORD dwSkinID,unsigned int uiAnimOve
if(m_AnimOverrides.size()>0) if(m_AnimOverrides.size()>0)
{ {
AUTO_VAR(it, m_AnimOverrides.find(dwSkinID)); auto it = m_AnimOverrides.find(dwSkinID);
if(it!=m_AnimOverrides.end()) if(it!=m_AnimOverrides.end())
{ {
LeaveCriticalSection( &csAnimOverrideBitmask ); LeaveCriticalSection( &csAnimOverrideBitmask );

2
Minecraft.Client/Common/DLC/DLCAudioFile.cpp
View File

@@ -178,7 +178,7 @@ bool DLCAudioFile::processDLCDataFile(PBYTE pbData, DWORD dwLength)
{ {
//EAudioParameterType paramType = e_AudioParamType_Invalid; //EAudioParameterType paramType = e_AudioParamType_Invalid;
AUTO_VAR(it, parameterMapping.find( pParams->dwType )); auto it = parameterMapping.find(pParams->dwType);
if(it != parameterMapping.end() ) if(it != parameterMapping.end() )
{ {

59
Minecraft.Client/Common/DLC/DLCManager.cpp
View File

@@ -32,10 +32,10 @@ DLCManager::DLCManager()
DLCManager::~DLCManager() DLCManager::~DLCManager()
{ {
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for ( DLCPack *pack : m_packs )
{ {
DLCPack *pack = *it; if ( pack )
delete pack; delete pack;
} }
} }
@@ -60,10 +60,9 @@ DWORD DLCManager::getPackCount(EDLCType type /*= e_DLCType_All*/)
DWORD packCount = 0; DWORD packCount = 0;
if( type != e_DLCType_All ) if( type != e_DLCType_All )
{ {
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = *it; if( pack && pack->getDLCItemsCount(type) > 0 )
if( pack->getDLCItemsCount(type) > 0 )
{ {
++packCount; ++packCount;
} }
@@ -85,7 +84,7 @@ void DLCManager::removePack(DLCPack *pack)
{ {
if(pack != NULL) if(pack != NULL)
{ {
AUTO_VAR(it, find(m_packs.begin(),m_packs.end(),pack)); auto it = find(m_packs.begin(), m_packs.end(), pack);
if(it != m_packs.end() ) m_packs.erase(it); if(it != m_packs.end() ) m_packs.erase(it);
delete pack; delete pack;
} }
@@ -93,10 +92,10 @@ void DLCManager::removePack(DLCPack *pack)
void DLCManager::removeAllPacks(void) void DLCManager::removeAllPacks(void)
{ {
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = (DLCPack *)*it; if ( pack )
delete pack; delete pack;
} }
m_packs.clear(); m_packs.clear();
@@ -104,23 +103,19 @@ void DLCManager::removeAllPacks(void)
void DLCManager::LanguageChanged(void) void DLCManager::LanguageChanged(void)
{ {
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = (DLCPack *)*it;
// update the language // update the language
pack->UpdateLanguage(); pack->UpdateLanguage();
} }
} }
DLCPack *DLCManager::getPack(const wstring &name) DLCPack *DLCManager::getPack(const wstring &name)
{ {
DLCPack *pack = NULL; DLCPack *pack = NULL;
//DWORD currentIndex = 0; //DWORD currentIndex = 0;
DLCPack *currentPack = NULL; for( DLCPack * currentPack : m_packs )
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it)
{ {
currentPack = *it;
wstring wsName=currentPack->getName(); wstring wsName=currentPack->getName();
if(wsName.compare(name) == 0) if(wsName.compare(name) == 0)
@@ -136,11 +131,8 @@ DLCPack *DLCManager::getPack(const wstring &name)
DLCPack *DLCManager::getPackFromProductID(const wstring &productID) DLCPack *DLCManager::getPackFromProductID(const wstring &productID)
{ {
DLCPack *pack = NULL; DLCPack *pack = NULL;
//DWORD currentIndex = 0; for( DLCPack *currentPack : m_packs )
DLCPack *currentPack = NULL;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it)
{ {
currentPack = *it;
wstring wsName=currentPack->getPurchaseOfferId(); wstring wsName=currentPack->getPurchaseOfferId();
if(wsName.compare(productID) == 0) if(wsName.compare(productID) == 0)
@@ -159,10 +151,8 @@ DLCPack *DLCManager::getPack(DWORD index, EDLCType type /*= e_DLCType_All*/)
if( type != e_DLCType_All ) if( type != e_DLCType_All )
{ {
DWORD currentIndex = 0; DWORD currentIndex = 0;
DLCPack *currentPack = NULL; for( DLCPack *currentPack : m_packs )
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it)
{ {
currentPack = *it;
if(currentPack->getDLCItemsCount(type)>0) if(currentPack->getDLCItemsCount(type)>0)
{ {
if(currentIndex == index) if(currentIndex == index)
@@ -200,9 +190,8 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D
if( type != e_DLCType_All ) if( type != e_DLCType_All )
{ {
DWORD index = 0; DWORD index = 0;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *thisPack : m_packs )
{ {
DLCPack *thisPack = *it;
if(thisPack->getDLCItemsCount(type)>0) if(thisPack->getDLCItemsCount(type)>0)
{ {
if(thisPack == pack) if(thisPack == pack)
@@ -218,9 +207,8 @@ DWORD DLCManager::getPackIndex(DLCPack *pack, bool &found, EDLCType type /*= e_D
else else
{ {
DWORD index = 0; DWORD index = 0;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *thisPack : m_packs )
{ {
DLCPack *thisPack = *it;
if(thisPack == pack) if(thisPack == pack)
{ {
found = true; found = true;
@@ -238,9 +226,8 @@ DWORD DLCManager::getPackIndexContainingSkin(const wstring &path, bool &found)
DWORD foundIndex = 0; DWORD foundIndex = 0;
found = false; found = false;
DWORD index = 0; DWORD index = 0;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = *it;
if(pack->getDLCItemsCount(e_DLCType_Skin)>0) if(pack->getDLCItemsCount(e_DLCType_Skin)>0)
{ {
if(pack->doesPackContainSkin(path)) if(pack->doesPackContainSkin(path))
@@ -258,9 +245,8 @@ DWORD DLCManager::getPackIndexContainingSkin(const wstring &path, bool &found)
DLCPack *DLCManager::getPackContainingSkin(const wstring &path) DLCPack *DLCManager::getPackContainingSkin(const wstring &path)
{ {
DLCPack *foundPack = NULL; DLCPack *foundPack = NULL;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = *it;
if(pack->getDLCItemsCount(e_DLCType_Skin)>0) if(pack->getDLCItemsCount(e_DLCType_Skin)>0)
{ {
if(pack->doesPackContainSkin(path)) if(pack->doesPackContainSkin(path))
@@ -276,9 +262,8 @@ DLCPack *DLCManager::getPackContainingSkin(const wstring &path)
DLCSkinFile *DLCManager::getSkinFile(const wstring &path) DLCSkinFile *DLCManager::getSkinFile(const wstring &path)
{ {
DLCSkinFile *foundSkinfile = NULL; DLCSkinFile *foundSkinfile = NULL;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
DLCPack *pack = *it;
foundSkinfile=pack->getSkinFile(path); foundSkinfile=pack->getSkinFile(path);
if(foundSkinfile!=NULL) if(foundSkinfile!=NULL)
{ {
@@ -291,12 +276,10 @@ DLCSkinFile *DLCManager::getSkinFile(const wstring &path)
DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/) DWORD DLCManager::checkForCorruptDLCAndAlert(bool showMessage /*= true*/)
{ {
DWORD corruptDLCCount = m_dwUnnamedCorruptDLCCount; DWORD corruptDLCCount = m_dwUnnamedCorruptDLCCount;
DLCPack *pack = NULL;
DLCPack *firstCorruptPack = NULL; DLCPack *firstCorruptPack = NULL;
for(AUTO_VAR(it, m_packs.begin()); it != m_packs.end(); ++it) for( DLCPack *pack : m_packs )
{ {
pack = *it;
if( pack->IsCorrupt() ) if( pack->IsCorrupt() )
{ {
++corruptDLCCount; ++corruptDLCCount;
@@ -468,7 +451,7 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
{ {
//DLCManager::EDLCParameterType paramType = DLCManager::e_DLCParamType_Invalid; //DLCManager::EDLCParameterType paramType = DLCManager::e_DLCParamType_Invalid;
AUTO_VAR(it, parameterMapping.find( pParams->dwType )); auto it = parameterMapping.find(pParams->dwType);
if(it != parameterMapping.end() ) if(it != parameterMapping.end() )
{ {
@@ -658,7 +641,7 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp; pParams = (C4JStorage::DLC_FILE_PARAM *)pbTemp;
for(unsigned int j=0;j<uiParameterCount;j++) for(unsigned int j=0;j<uiParameterCount;j++)
{ {
AUTO_VAR(it, parameterMapping.find( pParams->dwType )); auto it = parameterMapping.find(pParams->dwType);
if(it != parameterMapping.end() ) if(it != parameterMapping.end() )
{ {

20
Minecraft.Client/Common/DLC/DLCPack.cpp
View File

@@ -54,16 +54,18 @@ DLCPack::DLCPack(const wstring &name,const wstring &productID,DWORD dwLicenseMas
DLCPack::~DLCPack() DLCPack::~DLCPack()
{ {
for(AUTO_VAR(it, m_childPacks.begin()); it != m_childPacks.end(); ++it) for( auto& it : m_childPacks )
{ {
delete *it; if ( it )
delete it;
} }
for(unsigned int i = 0; i < DLCManager::e_DLCType_Max; ++i) for(unsigned int i = 0; i < DLCManager::e_DLCType_Max; ++i)
{ {
for(AUTO_VAR(it,m_files[i].begin()); it != m_files[i].end(); ++it) for (auto& it : m_files[i] )
{ {
delete *it; if ( it )
delete it;
} }
} }
@@ -161,7 +163,7 @@ void DLCPack::addParameter(DLCManager::EDLCParameterType type, const wstring &va
bool DLCPack::getParameterAsUInt(DLCManager::EDLCParameterType type, unsigned int &param) bool DLCPack::getParameterAsUInt(DLCManager::EDLCParameterType type, unsigned int &param)
{ {
AUTO_VAR(it,m_parameters.find((int)type)); auto it = m_parameters.find((int)type);
if(it != m_parameters.end()) if(it != m_parameters.end())
{ {
switch(type) switch(type)
@@ -270,7 +272,7 @@ bool DLCPack::doesPackContainFile(DLCManager::EDLCType type, const wstring &path
else else
{ {
g_pathCmpString = &path; g_pathCmpString = &path;
AUTO_VAR(it, find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); auto it = find_if(m_files[type].begin(), m_files[type].end(), pathCmp);
hasFile = it != m_files[type].end(); hasFile = it != m_files[type].end();
if(!hasFile && m_parentPack ) if(!hasFile && m_parentPack )
{ {
@@ -316,7 +318,7 @@ DLCFile *DLCPack::getFile(DLCManager::EDLCType type, const wstring &path)
else else
{ {
g_pathCmpString = &path; g_pathCmpString = &path;
AUTO_VAR(it, find_if( m_files[type].begin(), m_files[type].end(), pathCmp )); auto it = find_if(m_files[type].begin(), m_files[type].end(), pathCmp);
if(it == m_files[type].end()) if(it == m_files[type].end())
{ {
@@ -368,9 +370,9 @@ DWORD DLCPack::getFileIndexAt(DLCManager::EDLCType type, const wstring &path, bo
DWORD foundIndex = 0; DWORD foundIndex = 0;
found = false; found = false;
DWORD index = 0; DWORD index = 0;
for(AUTO_VAR(it, m_files[type].begin()); it != m_files[type].end(); ++it) for( auto& it : m_files[type] )
{ {
if(path.compare((*it)->getPath()) == 0) if(path.compare(it->getPath()) == 0)
{ {
foundIndex = index; foundIndex = index;
found = true; found = true;

6
Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
View File

@@ -14,10 +14,10 @@ void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream *dos, UINT n
GameRuleDefinition::writeAttributes(dos, numAttributes + 2); GameRuleDefinition::writeAttributes(dos, numAttributes + 2);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_enchantmentId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_enchantmentId);
dos->writeUTF( _toString( m_enchantmentId ) ); dos->writeUTF( std::to_wstring( m_enchantmentId ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_enchantmentLevel); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_enchantmentLevel);
dos->writeUTF( _toString( m_enchantmentLevel ) ); dos->writeUTF( std::to_wstring( m_enchantmentLevel ) );
} }
void AddEnchantmentRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue) void AddEnchantmentRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue)
@@ -50,7 +50,7 @@ bool AddEnchantmentRuleDefinition::enchantItem(shared_ptr<ItemInstance> item)
{ {
// 4J-JEV: Ripped code from enchantmenthelpers // 4J-JEV: Ripped code from enchantmenthelpers
// Maybe we want to add an addEnchantment method to EnchantmentHelpers // Maybe we want to add an addEnchantment method to EnchantmentHelpers
if (item->id == Item::enchantedBook_Id) if (item->id == Item::enchantedBook_Id)
{ {
Item::enchantedBook->addEnchantment( item, new EnchantmentInstance(m_enchantmentId, m_enchantmentLevel) ); Item::enchantedBook->addEnchantment( item, new EnchantmentInstance(m_enchantmentId, m_enchantmentLevel) );
} }

20
Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
View File

@@ -17,26 +17,26 @@ void AddItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttrs
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_itemId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_itemId);
dos->writeUTF( _toString( m_itemId ) ); dos->writeUTF( std::to_wstring( m_itemId ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_quantity); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_quantity);
dos->writeUTF( _toString( m_quantity ) ); dos->writeUTF( std::to_wstring( m_quantity ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_auxValue); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_auxValue);
dos->writeUTF( _toString( m_auxValue ) ); dos->writeUTF( std::to_wstring( m_auxValue ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dataTag); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dataTag);
dos->writeUTF( _toString( m_dataTag ) ); dos->writeUTF( std::to_wstring( m_dataTag ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_slot); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_slot);
dos->writeUTF( _toString( m_slot ) ); dos->writeUTF( std::to_wstring( m_slot ) );
} }
void AddItemRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) void AddItemRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
{ {
GameRuleDefinition::getChildren( children ); GameRuleDefinition::getChildren( children );
for (AUTO_VAR(it, m_enchantments.begin()); it != m_enchantments.end(); it++) for ( const auto& it : m_enchantments )
children->push_back( *it ); children->push_back( it );
} }
GameRuleDefinition *AddItemRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *AddItemRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -99,13 +99,13 @@ bool AddItemRuleDefinition::addItemToContainer(shared_ptr<Container> container,
bool added = false; bool added = false;
if(Item::items[m_itemId] != NULL) if(Item::items[m_itemId] != NULL)
{ {
int quantity = min(m_quantity, Item::items[m_itemId]->getMaxStackSize()); int quantity = std::min<int>(m_quantity, Item::items[m_itemId]->getMaxStackSize());
shared_ptr<ItemInstance> newItem = shared_ptr<ItemInstance>(new ItemInstance(m_itemId,quantity,m_auxValue) ); shared_ptr<ItemInstance> newItem = shared_ptr<ItemInstance>(new ItemInstance(m_itemId,quantity,m_auxValue) );
newItem->set4JData(m_dataTag); newItem->set4JData(m_dataTag);
for(AUTO_VAR(it, m_enchantments.begin()); it != m_enchantments.end(); ++it) for( auto& it : m_enchantments )
{ {
(*it)->enchantItem(newItem); it->enchantItem(newItem);
} }
if(m_slot >= 0 && m_slot < container->getContainerSize() ) if(m_slot >= 0 && m_slot < container->getContainerSize() )

20
Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
View File

@@ -37,19 +37,19 @@ void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream *dos, UINT n
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_filename); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_filename);
dos->writeUTF(m_schematicName); dos->writeUTF(m_schematicName);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x);
dos->writeUTF(_toString(m_location->x)); dos->writeUTF(std::to_wstring(m_location->x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y);
dos->writeUTF(_toString(m_location->y)); dos->writeUTF(std::to_wstring(m_location->y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z);
dos->writeUTF(_toString(m_location->z)); dos->writeUTF(std::to_wstring(m_location->z));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_rot); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_rot);
switch (m_rotation) switch (m_rotation)
{ {
case ConsoleSchematicFile::eSchematicRot_0: dos->writeUTF(_toString( 0 )); break; case ConsoleSchematicFile::eSchematicRot_0: dos->writeUTF(L"0"); break;
case ConsoleSchematicFile::eSchematicRot_90: dos->writeUTF(_toString( 90 )); break; case ConsoleSchematicFile::eSchematicRot_90: dos->writeUTF(L"90"); break;
case ConsoleSchematicFile::eSchematicRot_180: dos->writeUTF(_toString( 180 )); break; case ConsoleSchematicFile::eSchematicRot_180: dos->writeUTF(L"180"); break;
case ConsoleSchematicFile::eSchematicRot_270: dos->writeUTF(_toString( 270 )); break; case ConsoleSchematicFile::eSchematicRot_270: dos->writeUTF(L"270"); break;
} }
} }
@@ -113,7 +113,7 @@ void ApplySchematicRuleDefinition::addAttribute(const wstring &attributeName, co
m_rotation = ConsoleSchematicFile::eSchematicRot_0; m_rotation = ConsoleSchematicFile::eSchematicRot_0;
break; break;
}; };
//app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter rot=%d\n",m_rotation); //app.DebugPrintf("ApplySchematicRuleDefinition: Adding parameter rot=%d\n",m_rotation);
} }
else if(attributeName.compare(L"dim") == 0) else if(attributeName.compare(L"dim") == 0)
@@ -160,7 +160,7 @@ void ApplySchematicRuleDefinition::processSchematic(AABB *chunkBox, LevelChunk *
{ {
if( m_completed ) return; if( m_completed ) return;
if(chunk->level->dimension->id != m_dimension) return; if(chunk->level->dimension->id != m_dimension) return;
PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition"); PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition");
if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName); if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);
@@ -199,7 +199,7 @@ void ApplySchematicRuleDefinition::processSchematicLighting(AABB *chunkBox, Leve
{ {
if( m_completed ) return; if( m_completed ) return;
if(chunk->level->dimension->id != m_dimension) return; if(chunk->level->dimension->id != m_dimension) return;
PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition (lighting)"); PIXBeginNamedEvent(0, "Processing ApplySchematicRuleDefinition (lighting)");
if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName); if(m_schematic == NULL) m_schematic = m_levelGenOptions->getSchematicFile(m_schematicName);

6
Minecraft.Client/Common/GameRules/BiomeOverride.cpp
View File

@@ -14,11 +14,11 @@ void BiomeOverride::writeAttributes(DataOutputStream *dos, UINT numAttrs)
GameRuleDefinition::writeAttributes(dos, numAttrs + 3); GameRuleDefinition::writeAttributes(dos, numAttrs + 3);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_biomeId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_biomeId);
dos->writeUTF(_toString(m_biomeId)); dos->writeUTF(std::to_wstring(m_biomeId));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_tileId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_tileId);
dos->writeUTF(_toString(m_tile)); dos->writeUTF(std::to_wstring(m_tile));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_topTileId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_topTileId);
dos->writeUTF(_toString(m_topTile)); dos->writeUTF(std::to_wstring(m_topTile));
} }
void BiomeOverride::addAttribute(const wstring &attributeName, const wstring &attributeValue) void BiomeOverride::addAttribute(const wstring &attributeName, const wstring &attributeValue)

12
Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
View File

@@ -22,13 +22,13 @@ void CollectItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numA
GameRuleDefinition::writeAttributes(dos, numAttributes + 3); GameRuleDefinition::writeAttributes(dos, numAttributes + 3);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_itemId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_itemId);
dos->writeUTF( _toString( m_itemId ) ); dos->writeUTF( std::to_wstring( m_itemId ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_auxValue); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_auxValue);
dos->writeUTF( _toString( m_auxValue ) ); dos->writeUTF( std::to_wstring( m_auxValue ) );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_quantity); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_quantity);
dos->writeUTF( _toString( m_quantity ) ); dos->writeUTF( std::to_wstring( m_quantity ) );
} }
void CollectItemRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue) void CollectItemRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue)
@@ -108,9 +108,9 @@ wstring CollectItemRuleDefinition::generateXml(shared_ptr<ItemInstance> item)
wstring xml = L""; wstring xml = L"";
if(item != NULL) if(item != NULL)
{ {
xml = L"<CollectItemRule itemId=\"" + _toString<int>(item->id) + L"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" promptName=\"OPTIONAL\""; xml = L"<CollectItemRule itemId=\"" + std::to_wstring(item->id) + L"\" quantity=\"SET\" descriptionName=\"OPTIONAL\" promptName=\"OPTIONAL\"";
if(item->getAuxValue() != 0) xml += L" auxValue=\"" + _toString<int>(item->getAuxValue()) + L"\""; if(item->getAuxValue() != 0) xml += L" auxValue=\"" + std::to_wstring(item->getAuxValue()) + L"\"";
if(item->get4JData() != 0) xml += L" dataTag=\"" + _toString<int>(item->get4JData()) + L"\""; if(item->get4JData() != 0) xml += L" dataTag=\"" + std::to_wstring(item->get4JData()) + L"\"";
xml += L"/>\n"; xml += L"/>\n";
} }
return xml; return xml;

16
Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
View File

@@ -28,12 +28,12 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
{ {
int goal = 0; int goal = 0;
int progress = 0; int progress = 0;
for(AUTO_VAR(it, rule->m_parameters.begin()); it != rule->m_parameters.end(); ++it) for (auto& it : rule->m_parameters )
{ {
if(it->second.isPointer) if(it.second.isPointer)
{ {
goal += it->second.gr->getGameRuleDefinition()->getGoal(); goal += it.second.gr->getGameRuleDefinition()->getGoal();
progress += it->second.gr->getGameRuleDefinition()->getProgress(it->second.gr); progress += it.second.gr->getGameRuleDefinition()->getProgress(it.second.gr);
} }
} }
if(rule->getConnection() != NULL) if(rule->getConnection() != NULL)
@@ -44,9 +44,9 @@ void CompleteAllRuleDefinition::updateStatus(GameRule *rule)
int icon = -1; int icon = -1;
int auxValue = 0; int auxValue = 0;
if(m_lastRuleStatusChanged != NULL) if(m_lastRuleStatusChanged != NULL)
{ {
icon = m_lastRuleStatusChanged->getIcon(); icon = m_lastRuleStatusChanged->getIcon();
auxValue = m_lastRuleStatusChanged->getAuxValue(); auxValue = m_lastRuleStatusChanged->getAuxValue();
m_lastRuleStatusChanged = NULL; m_lastRuleStatusChanged = NULL;
@@ -60,7 +60,7 @@ wstring CompleteAllRuleDefinition::generateDescriptionString(const wstring &desc
{ {
PacketData *values = (PacketData *)data; PacketData *values = (PacketData *)data;
wstring newDesc = description; wstring newDesc = description;
newDesc = replaceAll(newDesc,L"{*progress*}",_toString<int>(values->progress)); newDesc = replaceAll(newDesc,L"{*progress*}",std::to_wstring(values->progress));
newDesc = replaceAll(newDesc,L"{*goal*}",_toString<int>(values->goal)); newDesc = replaceAll(newDesc,L"{*goal*}",std::to_wstring(values->goal));
return newDesc; return newDesc;
} }

40
Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
View File

@@ -11,17 +11,17 @@ CompoundGameRuleDefinition::CompoundGameRuleDefinition()
CompoundGameRuleDefinition::~CompoundGameRuleDefinition() CompoundGameRuleDefinition::~CompoundGameRuleDefinition()
{ {
for(AUTO_VAR(it, m_children.begin()); it != m_children.end(); ++it) for (auto it : m_children )
{ {
delete (*it); delete it;
} }
} }
void CompoundGameRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) void CompoundGameRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
{ {
GameRuleDefinition::getChildren(children); GameRuleDefinition::getChildren(children);
for (AUTO_VAR(it, m_children.begin()); it != m_children.end(); it++) for (auto& it : m_children )
children->push_back(*it); children->push_back(it);
} }
GameRuleDefinition *CompoundGameRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *CompoundGameRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -40,7 +40,7 @@ GameRuleDefinition *CompoundGameRuleDefinition::addChild(ConsoleGameRules::EGame
rule = new UseTileRuleDefinition(); rule = new UseTileRuleDefinition();
} }
else if(ruleType == ConsoleGameRules::eGameRuleType_UpdatePlayerRule) else if(ruleType == ConsoleGameRules::eGameRuleType_UpdatePlayerRule)
{ {
rule = new UpdatePlayerRuleDefinition(); rule = new UpdatePlayerRuleDefinition();
} }
else else
@@ -57,17 +57,17 @@ void CompoundGameRuleDefinition::populateGameRule(GameRulesInstance::EGameRulesI
{ {
GameRule *newRule = NULL; GameRule *newRule = NULL;
int i = 0; int i = 0;
for(AUTO_VAR(it, m_children.begin()); it != m_children.end(); ++it) for (auto& it : m_children )
{ {
newRule = new GameRule(*it, rule->getConnection() ); newRule = new GameRule(it, rule->getConnection() );
(*it)->populateGameRule(type,newRule); it->populateGameRule(type,newRule);
GameRule::ValueType value; GameRule::ValueType value;
value.gr = newRule; value.gr = newRule;
value.isPointer = true; value.isPointer = true;
// Somehow add the newRule to the current rule // Somehow add the newRule to the current rule
rule->setParameter(L"rule" + _toString<int>(i),value); rule->setParameter(L"rule" + std::to_wstring(i),value);
++i; ++i;
} }
GameRuleDefinition::populateGameRule(type, rule); GameRuleDefinition::populateGameRule(type, rule);
@@ -76,14 +76,14 @@ void CompoundGameRuleDefinition::populateGameRule(GameRulesInstance::EGameRulesI
bool CompoundGameRuleDefinition::onUseTile(GameRule *rule, int tileId, int x, int y, int z) bool CompoundGameRuleDefinition::onUseTile(GameRule *rule, int tileId, int x, int y, int z)
{ {
bool statusChanged = false; bool statusChanged = false;
for(AUTO_VAR(it, rule->m_parameters.begin()); it != rule->m_parameters.end(); ++it) for (auto& it : rule->m_parameters )
{ {
if(it->second.isPointer) if(it.second.isPointer)
{ {
bool changed = it->second.gr->getGameRuleDefinition()->onUseTile(it->second.gr,tileId,x,y,z); bool changed = it.second.gr->getGameRuleDefinition()->onUseTile(it.second.gr,tileId,x,y,z);
if(!statusChanged && changed) if(!statusChanged && changed)
{ {
m_lastRuleStatusChanged = it->second.gr->getGameRuleDefinition(); m_lastRuleStatusChanged = it.second.gr->getGameRuleDefinition();
statusChanged = true; statusChanged = true;
} }
} }
@@ -94,14 +94,14 @@ bool CompoundGameRuleDefinition::onUseTile(GameRule *rule, int tileId, int x, in
bool CompoundGameRuleDefinition::onCollectItem(GameRule *rule, shared_ptr<ItemInstance> item) bool CompoundGameRuleDefinition::onCollectItem(GameRule *rule, shared_ptr<ItemInstance> item)
{ {
bool statusChanged = false; bool statusChanged = false;
for(AUTO_VAR(it, rule->m_parameters.begin()); it != rule->m_parameters.end(); ++it) for (auto& it : rule->m_parameters )
{ {
if(it->second.isPointer) if(it.second.isPointer)
{ {
bool changed = it->second.gr->getGameRuleDefinition()->onCollectItem(it->second.gr,item); bool changed = it.second.gr->getGameRuleDefinition()->onCollectItem(it.second.gr,item);
if(!statusChanged && changed) if(!statusChanged && changed)
{ {
m_lastRuleStatusChanged = it->second.gr->getGameRuleDefinition(); m_lastRuleStatusChanged = it.second.gr->getGameRuleDefinition();
statusChanged = true; statusChanged = true;
} }
} }
@@ -111,8 +111,8 @@ bool CompoundGameRuleDefinition::onCollectItem(GameRule *rule, shared_ptr<ItemIn
void CompoundGameRuleDefinition::postProcessPlayer(shared_ptr<Player> player) void CompoundGameRuleDefinition::postProcessPlayer(shared_ptr<Player> player)
{ {
for(AUTO_VAR(it, m_children.begin()); it != m_children.end(); ++it) for (auto it : m_children )
{ {
(*it)->postProcessPlayer(player); it->postProcessPlayer(player);
} }
} }

35
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
View File

@@ -17,10 +17,10 @@ ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
void ConsoleGenerateStructure::getChildren(vector<GameRuleDefinition *> *children) void ConsoleGenerateStructure::getChildren(vector<GameRuleDefinition *> *children)
{ {
GameRuleDefinition::getChildren(children); GameRuleDefinition::getChildren(children);
for(AUTO_VAR(it, m_actions.begin()); it != m_actions.end(); it++) for ( auto& action : m_actions )
children->push_back( *it ); children->push_back( action );
} }
GameRuleDefinition *ConsoleGenerateStructure::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *ConsoleGenerateStructure::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -60,16 +60,16 @@ void ConsoleGenerateStructure::writeAttributes(DataOutputStream *dos, UINT numAt
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x);
dos->writeUTF(_toString(m_x)); dos->writeUTF(std::to_wstring(m_x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y);
dos->writeUTF(_toString(m_y)); dos->writeUTF(std::to_wstring(m_y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z);
dos->writeUTF(_toString(m_z)); dos->writeUTF(std::to_wstring(m_z));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_orientation); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_orientation);
dos->writeUTF(_toString(orientation)); dos->writeUTF(std::to_wstring(orientation));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dimension); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dimension);
dos->writeUTF(_toString(m_dimension)); dos->writeUTF(std::to_wstring(m_dimension));
} }
void ConsoleGenerateStructure::addAttribute(const wstring &attributeName, const wstring &attributeValue) void ConsoleGenerateStructure::addAttribute(const wstring &attributeName, const wstring &attributeValue)
@@ -117,27 +117,24 @@ BoundingBox* ConsoleGenerateStructure::getBoundingBox()
// Find the max bounds // Find the max bounds
int maxX, maxY, maxZ; int maxX, maxY, maxZ;
maxX = maxY = maxZ = 1; maxX = maxY = maxZ = 1;
for(AUTO_VAR(it, m_actions.begin()); it != m_actions.end(); ++it) for( ConsoleGenerateStructureAction *action : m_actions )
{ {
ConsoleGenerateStructureAction *action = *it; maxX = std::max<int>(maxX,action->getEndX());
maxX = max(maxX,action->getEndX()); maxY = std::max<int>(maxY,action->getEndY());
maxY = max(maxY,action->getEndY()); maxZ = std::max<int>(maxZ,action->getEndZ());
maxZ = max(maxZ,action->getEndZ());
} }
boundingBox = new BoundingBox(m_x, m_y, m_z, m_x + maxX, m_y + maxY, m_z + maxZ); boundingBox = new BoundingBox(m_x, m_y, m_z, m_x + maxX, m_y + maxY, m_z + maxZ);
} }
return boundingBox; return boundingBox;
} }
bool ConsoleGenerateStructure::postProcess(Level *level, Random *random, BoundingBox *chunkBB) bool ConsoleGenerateStructure::postProcess(Level *level, Random *random, BoundingBox *chunkBB)
{ {
if(level->dimension->id != m_dimension) return false; if(level->dimension->id != m_dimension) return false;
for(AUTO_VAR(it, m_actions.begin()); it != m_actions.end(); ++it) for( ConsoleGenerateStructureAction *action : m_actions )
{ {
ConsoleGenerateStructureAction *action = *it;
switch(action->getActionType()) switch(action->getActionType())
{ {
case ConsoleGameRules::eGameRuleType_GenerateBox: case ConsoleGameRules::eGameRuleType_GenerateBox:

40
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
View File

@@ -167,18 +167,18 @@ void ConsoleSchematicFile::save_tags(DataOutputStream *dos)
ListTag<CompoundTag> *tileEntityTags = new ListTag<CompoundTag>(); ListTag<CompoundTag> *tileEntityTags = new ListTag<CompoundTag>();
tag->put(L"TileEntities", tileEntityTags); tag->put(L"TileEntities", tileEntityTags);
for (AUTO_VAR(it, m_tileEntities.begin()); it != m_tileEntities.end(); it++) for ( auto& it : m_tileEntities )
{ {
CompoundTag *cTag = new CompoundTag(); CompoundTag *cTag = new CompoundTag();
(*it)->save(cTag); it->save(cTag);
tileEntityTags->add(cTag); tileEntityTags->add(cTag);
} }
ListTag<CompoundTag> *entityTags = new ListTag<CompoundTag>(); ListTag<CompoundTag> *entityTags = new ListTag<CompoundTag>();
tag->put(L"Entities", entityTags); tag->put(L"Entities", entityTags);
for (AUTO_VAR(it, m_entities.begin()); it != m_entities.end(); it++) for (auto& it : m_entities )
entityTags->add( (CompoundTag *)(*it).second->copy() ); entityTags->add( (CompoundTag *)(it).second->copy() );
NbtIo::write(tag,dos); NbtIo::write(tag,dos);
delete tag; delete tag;
@@ -186,15 +186,15 @@ void ConsoleSchematicFile::save_tags(DataOutputStream *dos)
__int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot) __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
{ {
int xStart = max(destinationBox->x0, (double)chunk->x*16); int xStart = static_cast<int>(std::fmax<double>(destinationBox->x0, (double)chunk->x*16));
int xEnd = min(destinationBox->x1, (double)((xStart>>4)<<4) + 16); int xEnd = static_cast<int>(std::fmin<double>(destinationBox->x1, (double)((xStart >> 4) << 4) + 16));
int yStart = destinationBox->y0; int yStart = destinationBox->y0;
int yEnd = destinationBox->y1; int yEnd = destinationBox->y1;
if(yEnd > Level::maxBuildHeight) yEnd = Level::maxBuildHeight; if(yEnd > Level::maxBuildHeight) yEnd = Level::maxBuildHeight;
int zStart = max(destinationBox->z0, (double)chunk->z*16); int zStart = static_cast<int>(std::fmax<double>(destinationBox->z0, (double)chunk->z * 16));
int zEnd = min(destinationBox->z1, (double)((zStart>>4)<<4) + 16); int zEnd = static_cast<int>(std::fmin<double>(destinationBox->z1, (double)((zStart >> 4) << 4) + 16));
#ifdef _DEBUG #ifdef _DEBUG
app.DebugPrintf("Range is (%d,%d,%d) to (%d,%d,%d)\n",xStart,yStart,zStart,xEnd-1,yEnd-1,zEnd-1); app.DebugPrintf("Range is (%d,%d,%d) to (%d,%d,%d)\n",xStart,yStart,zStart,xEnd-1,yEnd-1,zEnd-1);
@@ -431,10 +431,8 @@ void ConsoleSchematicFile::schematicCoordToChunkCoord(AABB *destinationBox, doub
void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot) void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox, AABB *destinationBox, ESchematicRotation rot)
{ {
for(AUTO_VAR(it, m_tileEntities.begin()); it != m_tileEntities.end();++it) for (auto& te : m_tileEntities )
{ {
shared_ptr<TileEntity> te = *it;
double targetX = te->x; double targetX = te->x;
double targetY = te->y + destinationBox->y0; double targetY = te->y + destinationBox->y0;
double targetZ = te->z; double targetZ = te->z;
@@ -477,7 +475,7 @@ void ConsoleSchematicFile::applyTileEntities(LevelChunk *chunk, AABB *chunkBox,
teCopy->setChanged(); teCopy->setChanged();
} }
} }
for(AUTO_VAR(it, m_entities.begin()); it != m_entities.end();) for (auto it = m_entities.begin(); it != m_entities.end();)
{ {
Vec3 *source = it->first; Vec3 *source = it->first;
@@ -679,9 +677,8 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
for (int zc = zc0; zc <= zc1; zc++) for (int zc = zc0; zc <= zc1; zc++)
{ {
vector<shared_ptr<TileEntity> > *tileEntities = getTileEntitiesInRegion(level->getChunk(xc, zc), xStart, yStart, zStart, xStart + xSize, yStart + ySize, zStart + zSize); vector<shared_ptr<TileEntity> > *tileEntities = getTileEntitiesInRegion(level->getChunk(xc, zc), xStart, yStart, zStart, xStart + xSize, yStart + ySize, zStart + zSize);
for(AUTO_VAR(it, tileEntities->begin()); it != tileEntities->end(); ++it) for( auto& te : *tileEntities )
{ {
shared_ptr<TileEntity> te = *it;
CompoundTag *teTag = new CompoundTag(); CompoundTag *teTag = new CompoundTag();
shared_ptr<TileEntity> teCopy = te->clone(); shared_ptr<TileEntity> teCopy = te->clone();
@@ -701,10 +698,8 @@ void ConsoleSchematicFile::generateSchematicFile(DataOutputStream *dos, Level *l
vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, bb); vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, bb);
ListTag<CompoundTag> *entitiesTag = new ListTag<CompoundTag>(L"entities"); ListTag<CompoundTag> *entitiesTag = new ListTag<CompoundTag>(L"entities");
for(AUTO_VAR(it, entities->begin()); it != entities->end(); ++it) for (auto& e : *entities )
{ {
shared_ptr<Entity> e = *it;
bool mobCanBeSaved = false; bool mobCanBeSaved = false;
if (bSaveMobs) if (bSaveMobs)
{ {
@@ -1012,12 +1007,15 @@ void ConsoleSchematicFile::setBlocksAndData(LevelChunk *chunk, byteArray blockDa
vector<shared_ptr<TileEntity> > *ConsoleSchematicFile::getTileEntitiesInRegion(LevelChunk *chunk, int x0, int y0, int z0, int x1, int y1, int z1) vector<shared_ptr<TileEntity> > *ConsoleSchematicFile::getTileEntitiesInRegion(LevelChunk *chunk, int x0, int y0, int z0, int x1, int y1, int z1)
{ {
vector<shared_ptr<TileEntity> > *result = new vector<shared_ptr<TileEntity> >; vector<shared_ptr<TileEntity> > *result = new vector<shared_ptr<TileEntity> >;
for (AUTO_VAR(it, chunk->tileEntities.begin()); it != chunk->tileEntities.end(); ++it) if ( result )
{ {
shared_ptr<TileEntity> te = it->second; for ( auto& it : chunk->tileEntities )
if (te->x >= x0 && te->y >= y0 && te->z >= z0 && te->x < x1 && te->y < y1 && te->z < z1)
{ {
result->push_back(te); shared_ptr<TileEntity> te = it.second;
if (te->x >= x0 && te->y >= y0 && te->z >= z0 && te->x < x1 && te->y < y1 && te->z < z1)
{
result->push_back(te);
}
} }
} }
return result; return result;

18
Minecraft.Client/Common/GameRules/GameRule.cpp
View File

@@ -9,11 +9,11 @@ GameRule::GameRule(GameRuleDefinition *definition, Connection *connection)
GameRule::~GameRule() GameRule::~GameRule()
{ {
for(AUTO_VAR(it, m_parameters.begin()); it != m_parameters.end(); ++it) for(auto& it : m_parameters )
{ {
if(it->second.isPointer) if(it.second.isPointer)
{ {
delete it->second.gr; delete it.second.gr;
} }
} }
} }
@@ -59,12 +59,12 @@ void GameRule::write(DataOutputStream *dos)
{ {
// Find required parameters. // Find required parameters.
dos->writeInt(m_parameters.size()); dos->writeInt(m_parameters.size());
for (AUTO_VAR(it, m_parameters.begin()); it != m_parameters.end(); it++) for ( const auto& parameter : m_parameters )
{ {
wstring pName = (*it).first; wstring pName = parameter.first;
ValueType vType = (*it).second; ValueType vType = parameter.second;
dos->writeUTF( (*it).first ); dos->writeUTF( parameter.first );
dos->writeBoolean( vType.isPointer ); dos->writeBoolean( vType.isPointer );
if (vType.isPointer) if (vType.isPointer)
@@ -80,7 +80,7 @@ void GameRule::read(DataInputStream *dis)
for (int i = 0; i < savedParams; i++) for (int i = 0; i < savedParams; i++)
{ {
wstring pNames = dis->readUTF(); wstring pNames = dis->readUTF();
ValueType vType = getParameter(pNames); ValueType vType = getParameter(pNames);
if (dis->readBoolean()) if (dis->readBoolean())

14
Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
View File

@@ -18,15 +18,15 @@ void GameRuleDefinition::write(DataOutputStream *dos)
ConsoleGameRules::write(dos, eType); // stringID ConsoleGameRules::write(dos, eType); // stringID
writeAttributes(dos, 0); writeAttributes(dos, 0);
// 4J-JEV: Get children. // 4J-JEV: Get children.
vector<GameRuleDefinition *> *children = new vector<GameRuleDefinition *>(); vector<GameRuleDefinition *> *children = new vector<GameRuleDefinition *>();
getChildren( children ); getChildren( children );
// Write children. // Write children.
dos->writeInt( children->size() ); dos->writeInt( children->size() );
for (AUTO_VAR(it, children->begin()); it != children->end(); it++) for ( auto& it : *children )
(*it)->write(dos); it->write(dos);
} }
void GameRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void GameRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes)
@@ -40,7 +40,7 @@ void GameRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttribut
dos->writeUTF(m_promptId); dos->writeUTF(m_promptId);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dataTag); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_dataTag);
dos->writeUTF(_toString(m_4JDataValue)); dos->writeUTF(std::to_wstring(m_4JDataValue));
} }
void GameRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) {} void GameRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) {}
@@ -116,13 +116,13 @@ vector<GameRuleDefinition *> *GameRuleDefinition::enumerate()
unordered_map<GameRuleDefinition *, int> *GameRuleDefinition::enumerateMap() unordered_map<GameRuleDefinition *, int> *GameRuleDefinition::enumerateMap()
{ {
unordered_map<GameRuleDefinition *, int> *out unordered_map<GameRuleDefinition *, int> *out
= new unordered_map<GameRuleDefinition *, int>(); = new unordered_map<GameRuleDefinition *, int>();
int i = 0; int i = 0;
vector<GameRuleDefinition *> *gRules = enumerate(); vector<GameRuleDefinition *> *gRules = enumerate();
for (AUTO_VAR(it, gRules->begin()); it != gRules->end(); it++) for ( auto& it : *gRules )
out->insert( pair<GameRuleDefinition *, int>( *it, i++ ) ); out->emplace(it, i++);
return out; return out;
} }

55
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View File

@@ -77,7 +77,7 @@ WCHAR *GameRuleManager::wchAttrNameA[] =
L"spawnY", // eGameRuleAttr_spawnY L"spawnY", // eGameRuleAttr_spawnY
L"spawnZ", // eGameRuleAttr_spawnZ L"spawnZ", // eGameRuleAttr_spawnZ
L"orientation", L"orientation",
L"dimension", L"dimension",
L"topTileId", // eGameRuleAttr_topTileId L"topTileId", // eGameRuleAttr_topTileId
L"biomeId", // eGameRuleAttr_biomeId L"biomeId", // eGameRuleAttr_biomeId
L"feature", // eGameRuleAttr_feature L"feature", // eGameRuleAttr_feature
@@ -127,7 +127,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(pack); LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(pack);
// = loadGameRules(dData, dSize); //, strings); // = loadGameRules(dData, dSize); //, strings);
createdLevelGenerationOptions->setGrSource( new JustGrSource() ); createdLevelGenerationOptions->setGrSource( new JustGrSource() );
createdLevelGenerationOptions->setSrc( LevelGenerationOptions::eSrc_tutorial ); createdLevelGenerationOptions->setSrc( LevelGenerationOptions::eSrc_tutorial );
@@ -164,7 +164,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT
app.DebugPrintf("\tversion=%d.\n", version); app.DebugPrintf("\tversion=%d.\n", version);
for (int i = 0; i < 8; i++) dis.readByte(); for (int i = 0; i < 8; i++) dis.readByte();
BYTE compression_type = dis.readByte(); BYTE compression_type = dis.readByte();
app.DebugPrintf("\tcompressionType=%d.\n", compression_type); app.DebugPrintf("\tcompressionType=%d.\n", compression_type);
@@ -174,11 +174,11 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, byte *dIn, UINT
decomp_len = dis.readInt(); decomp_len = dis.readInt();
app.DebugPrintf("\tcompr_len=%d.\n\tdecomp_len=%d.\n", compr_len, decomp_len); app.DebugPrintf("\tcompr_len=%d.\n\tdecomp_len=%d.\n", compr_len, decomp_len);
// Decompress File Body // Decompress File Body
byteArray content(new BYTE[decomp_len], decomp_len), byteArray content(new BYTE[decomp_len], decomp_len),
compr_content(new BYTE[compr_len], compr_len); compr_content(new BYTE[compr_len], compr_len);
dis.read(compr_content); dis.read(compr_content);
@@ -251,7 +251,7 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
// Initialise output stream. // Initialise output stream.
ByteArrayOutputStream baos; ByteArrayOutputStream baos;
DataOutputStream dos(&baos); DataOutputStream dos(&baos);
// Write header. // Write header.
// VERSION NUMBER // VERSION NUMBER
@@ -279,7 +279,7 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
compr_dos.writeInt( 0 ); // XmlObjects.length compr_dos.writeInt( 0 ); // XmlObjects.length
} }
else else
{ {
StringTable *st = m_currentGameRuleDefinitions->getStringTable(); StringTable *st = m_currentGameRuleDefinitions->getStringTable();
if (st == NULL) if (st == NULL)
@@ -311,9 +311,9 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
dos.writeInt( compr_ba.length ); // Write length dos.writeInt( compr_ba.length ); // Write length
dos.writeInt( compr_baos.buf.length ); dos.writeInt( compr_baos.buf.length );
dos.write(compr_ba); dos.write(compr_ba);
delete [] compr_ba.data; delete [] compr_ba.data;
compr_dos.close(); compr_dos.close();
compr_baos.close(); compr_baos.close();
// -- END COMPRESSED -- // // -- END COMPRESSED -- //
@@ -323,7 +323,7 @@ void GameRuleManager::saveGameRules(byte **dOut, UINT *dSize)
*dOut = baos.buf.data; *dOut = baos.buf.data;
baos.buf.data = NULL; baos.buf.data = NULL;
dos.close(); baos.close(); dos.close(); baos.close();
} }
@@ -344,11 +344,10 @@ void GameRuleManager::writeRuleFile(DataOutputStream *dos)
// Write schematic files. // Write schematic files.
unordered_map<wstring, ConsoleSchematicFile *> *files; unordered_map<wstring, ConsoleSchematicFile *> *files;
files = getLevelGenerationOptions()->getUnfinishedSchematicFiles(); files = getLevelGenerationOptions()->getUnfinishedSchematicFiles();
dos->writeInt( files->size() ); for ( auto& it : *files )
for (AUTO_VAR(it, files->begin()); it != files->end(); it++)
{ {
wstring filename = it->first; const wstring& filename = it.first;
ConsoleSchematicFile *file = it->second; ConsoleSchematicFile *file = it.second;
ByteArrayOutputStream fileBaos; ByteArrayOutputStream fileBaos;
DataOutputStream fileDos(&fileBaos); DataOutputStream fileDos(&fileBaos);
@@ -378,7 +377,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
//DWORD dwLen = 0; //DWORD dwLen = 0;
//PBYTE pbData = dlcFile->getData(dwLen); //PBYTE pbData = dlcFile->getData(dwLen);
//byteArray data(pbData,dwLen); //byteArray data(pbData,dwLen);
byteArray data(dIn, dSize); byteArray data(dIn, dSize);
ByteArrayInputStream bais(data); ByteArrayInputStream bais(data);
DataInputStream dis(&bais); DataInputStream dis(&bais);
@@ -497,7 +496,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
} }
}*/ }*/
// subfile // subfile
UINT numFiles = contentDis->readInt(); UINT numFiles = contentDis->readInt();
for (UINT i = 0; i < numFiles; i++) for (UINT i = 0; i < numFiles; i++)
{ {
@@ -519,7 +518,7 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
{ {
int tagId = contentDis->readInt(); int tagId = contentDis->readInt();
ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid; ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid;
AUTO_VAR(it,tagIdMap.find(tagId)); auto it = tagIdMap.find(tagId);
if(it != tagIdMap.end()) tagVal = it->second; if(it != tagIdMap.end()) tagVal = it->second;
GameRuleDefinition *rule = NULL; GameRuleDefinition *rule = NULL;
@@ -565,10 +564,10 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, byte *dIn, UINT
LevelGenerationOptions *GameRuleManager::readHeader(DLCGameRulesHeader *grh) LevelGenerationOptions *GameRuleManager::readHeader(DLCGameRulesHeader *grh)
{ {
LevelGenerationOptions *out = LevelGenerationOptions *out =
new LevelGenerationOptions(); new LevelGenerationOptions();
out->setSrc(LevelGenerationOptions::eSrc_fromDLC); out->setSrc(LevelGenerationOptions::eSrc_fromDLC);
out->setGrSource(grh); out->setGrSource(grh);
addLevelGenerationOptions(out); addLevelGenerationOptions(out);
@@ -595,7 +594,7 @@ void GameRuleManager::readChildren(DataInputStream *dis, vector<wstring> *tagsAn
{ {
int tagId = dis->readInt(); int tagId = dis->readInt();
ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid; ConsoleGameRules::EGameRuleType tagVal = ConsoleGameRules::eGameRuleType_Invalid;
AUTO_VAR(it,tagIdMap->find(tagId)); auto it = tagIdMap->find(tagId);
if(it != tagIdMap->end()) tagVal = it->second; if(it != tagIdMap->end()) tagVal = it->second;
GameRuleDefinition *childRule = NULL; GameRuleDefinition *childRule = NULL;
@@ -640,18 +639,6 @@ void GameRuleManager::loadDefaultGameRules()
m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(app.GetString(IDS_TUTORIALSAVENAME)); m_levelGenerators.getLevelGenerators()->at(0)->setDefaultSaveName(app.GetString(IDS_TUTORIALSAVENAME));
} }
#ifndef _CONTENT_PACKAGE
// 4J Stu - Remove these just now
//File testRulesPath(L"GAME:\\GameRules");
//vector<File *> *packFiles = testRulesPath.listFiles();
//for(AUTO_VAR(it,packFiles->begin()); it != packFiles->end(); ++it)
//{
// loadGameRulesPack(*it);
//}
//delete packFiles;
#endif
#else // _XBOX #else // _XBOX
#ifdef _WINDOWS64 #ifdef _WINDOWS64
@@ -741,7 +728,7 @@ LPCWSTR GameRuleManager::GetGameRulesString(const wstring &key)
LEVEL_GEN_ID GameRuleManager::addLevelGenerationOptions(LevelGenerationOptions *lgo) LEVEL_GEN_ID GameRuleManager::addLevelGenerationOptions(LevelGenerationOptions *lgo)
{ {
vector<LevelGenerationOptions *> *lgs = m_levelGenerators.getLevelGenerators(); vector<LevelGenerationOptions *> *lgs = m_levelGenerators.getLevelGenerators();
for (int i = 0; i<lgs->size(); i++) for (int i = 0; i<lgs->size(); i++)
if (lgs->at(i) == lgo) if (lgs->at(i) == lgo)
return i; return i;
@@ -761,7 +748,7 @@ void GameRuleManager::unloadCurrentGameRules()
if (m_currentLevelGenerationOptions->isFromSave()) if (m_currentLevelGenerationOptions->isFromSave())
{ {
m_levelGenerators.removeLevelGenerator( m_currentLevelGenerationOptions ); m_levelGenerators.removeLevelGenerator( m_currentLevelGenerationOptions );
delete m_currentLevelGenerationOptions; delete m_currentLevelGenerationOptions;
} }
else if (m_currentLevelGenerationOptions->isFromDLC()) else if (m_currentLevelGenerationOptions->isFromDLC())

137
Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
View File

@@ -59,7 +59,7 @@ LevelGenerationOptions::LevelGenerationOptions(DLCPack *parentPack)
m_pbBaseSaveData = NULL; m_pbBaseSaveData = NULL;
m_dwBaseSaveSize = 0; m_dwBaseSaveSize = 0;
m_parentDLCPack = parentPack; m_parentDLCPack = parentPack;
m_bLoadingData = false; m_bLoadingData = false;
} }
@@ -67,23 +67,24 @@ LevelGenerationOptions::~LevelGenerationOptions()
{ {
clearSchematics(); clearSchematics();
if(m_spawnPos != NULL) delete m_spawnPos; if(m_spawnPos != NULL) delete m_spawnPos;
for(AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end(); ++it) for (auto& it : m_schematicRules )
{ {
delete *it; delete it;
}
for(AUTO_VAR(it, m_structureRules.begin()); it != m_structureRules.end(); ++it)
{
delete *it;
} }
for(AUTO_VAR(it, m_biomeOverrides.begin()); it != m_biomeOverrides.end(); ++it) for (auto& it : m_structureRules )
{ {
delete *it; delete it;
} }
for(AUTO_VAR(it, m_features.begin()); it != m_features.end(); ++it) for (auto& it : m_biomeOverrides )
{ {
delete *it; delete it;
}
for (auto& it : m_features )
{
delete it;
} }
if (m_stringTable) if (m_stringTable)
@@ -100,16 +101,16 @@ void LevelGenerationOptions::writeAttributes(DataOutputStream *dos, UINT numAttr
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnX); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnX);
dos->writeUTF(_toString(m_spawnPos->x)); dos->writeUTF(std::to_wstring(m_spawnPos->x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnY); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnY);
dos->writeUTF(_toString(m_spawnPos->y)); dos->writeUTF(std::to_wstring(m_spawnPos->y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnZ); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnZ);
dos->writeUTF(_toString(m_spawnPos->z)); dos->writeUTF(std::to_wstring(m_spawnPos->z));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_seed); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_seed);
dos->writeUTF(_toString(m_seed)); dos->writeUTF(std::to_wstring(m_seed));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_flatworld); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_flatworld);
dos->writeUTF(_toString(m_useFlatWorld)); dos->writeUTF(std::to_wstring(m_useFlatWorld));
} }
void LevelGenerationOptions::getChildren(vector<GameRuleDefinition *> *children) void LevelGenerationOptions::getChildren(vector<GameRuleDefinition *> *children)
@@ -117,18 +118,25 @@ void LevelGenerationOptions::getChildren(vector<GameRuleDefinition *> *children)
GameRuleDefinition::getChildren(children); GameRuleDefinition::getChildren(children);
vector<ApplySchematicRuleDefinition *> used_schematics; vector<ApplySchematicRuleDefinition *> used_schematics;
for (AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end(); it++) for (auto& it : m_schematicRules )
if ( !(*it)->isComplete() ) if ( it && !it->isComplete() )
used_schematics.push_back( *it ); used_schematics.push_back( it );
for(AUTO_VAR(it, m_structureRules.begin()); it!=m_structureRules.end(); it++) for (auto& it : m_structureRules)
children->push_back( *it ); if ( it )
for(AUTO_VAR(it, used_schematics.begin()); it!=used_schematics.end(); it++) children->push_back( it );
children->push_back( *it );
for(AUTO_VAR(it, m_biomeOverrides.begin()); it != m_biomeOverrides.end(); ++it) for (auto& it : used_schematics)
children->push_back( *it ); if ( it )
for(AUTO_VAR(it, m_features.begin()); it != m_features.end(); ++it) children->push_back( it );
children->push_back( *it );
for (auto& it : m_biomeOverrides)
if ( it )
children->push_back( it );
for (auto& it : m_features)
if ( it )
children->push_back( it );
} }
GameRuleDefinition *LevelGenerationOptions::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *LevelGenerationOptions::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -195,7 +203,7 @@ void LevelGenerationOptions::addAttribute(const wstring &attributeName, const ws
{ {
if(attributeValue.compare(L"true") == 0) m_useFlatWorld = true; if(attributeValue.compare(L"true") == 0) m_useFlatWorld = true;
app.DebugPrintf("LevelGenerationOptions: Adding parameter flatworld=%s\n",m_useFlatWorld?"TRUE":"FALSE"); app.DebugPrintf("LevelGenerationOptions: Adding parameter flatworld=%s\n",m_useFlatWorld?"TRUE":"FALSE");
} }
else if(attributeName.compare(L"saveName") == 0) else if(attributeName.compare(L"saveName") == 0)
{ {
wstring string(attributeValue); wstring string(attributeValue);
@@ -218,7 +226,7 @@ void LevelGenerationOptions::addAttribute(const wstring &attributeName, const ws
app.DebugPrintf("LevelGenerationOptions: Adding parameter displayName=%ls\n", getDisplayName()); app.DebugPrintf("LevelGenerationOptions: Adding parameter displayName=%ls\n", getDisplayName());
} }
else if(attributeName.compare(L"texturePackId") == 0) else if(attributeName.compare(L"texturePackId") == 0)
{ {
setRequiredTexturePackId( _fromString<unsigned int>(attributeValue) ); setRequiredTexturePackId( _fromString<unsigned int>(attributeValue) );
setRequiresTexturePack( true ); setRequiresTexturePack( true );
app.DebugPrintf("LevelGenerationOptions: Adding parameter texturePackId=%0x\n", getRequiredTexturePackId()); app.DebugPrintf("LevelGenerationOptions: Adding parameter texturePackId=%0x\n", getRequiredTexturePackId());
@@ -249,19 +257,14 @@ void LevelGenerationOptions::processSchematics(LevelChunk *chunk)
{ {
PIXBeginNamedEvent(0,"Processing schematics for chunk (%d,%d)", chunk->x, chunk->z); PIXBeginNamedEvent(0,"Processing schematics for chunk (%d,%d)", chunk->x, chunk->z);
AABB *chunkBox = AABB::newTemp(chunk->x*16,0,chunk->z*16,chunk->x*16 + 16,Level::maxBuildHeight,chunk->z*16 + 16); AABB *chunkBox = AABB::newTemp(chunk->x*16,0,chunk->z*16,chunk->x*16 + 16,Level::maxBuildHeight,chunk->z*16 + 16);
for( AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end();++it) for( ApplySchematicRuleDefinition *rule : m_schematicRules )
{
ApplySchematicRuleDefinition *rule = *it;
rule->processSchematic(chunkBox, chunk); rule->processSchematic(chunkBox, chunk);
}
int cx = (chunk->x << 4); int cx = (chunk->x << 4);
int cz = (chunk->z << 4); int cz = (chunk->z << 4);
for( AUTO_VAR(it, m_structureRules.begin()); it != m_structureRules.end(); it++ ) for ( ConsoleGenerateStructure *structureStart : m_structureRules )
{ {
ConsoleGenerateStructure *structureStart = *it;
if (structureStart->getBoundingBox()->intersects(cx, cz, cx + 15, cz + 15)) if (structureStart->getBoundingBox()->intersects(cx, cz, cx + 15, cz + 15))
{ {
BoundingBox *bb = new BoundingBox(cx, cz, cx + 15, cz + 15); BoundingBox *bb = new BoundingBox(cx, cz, cx + 15, cz + 15);
@@ -276,9 +279,8 @@ void LevelGenerationOptions::processSchematicsLighting(LevelChunk *chunk)
{ {
PIXBeginNamedEvent(0,"Processing schematics (lighting) for chunk (%d,%d)", chunk->x, chunk->z); PIXBeginNamedEvent(0,"Processing schematics (lighting) for chunk (%d,%d)", chunk->x, chunk->z);
AABB *chunkBox = AABB::newTemp(chunk->x*16,0,chunk->z*16,chunk->x*16 + 16,Level::maxBuildHeight,chunk->z*16 + 16); AABB *chunkBox = AABB::newTemp(chunk->x*16,0,chunk->z*16,chunk->x*16 + 16,Level::maxBuildHeight,chunk->z*16 + 16);
for( AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end();++it) for ( ApplySchematicRuleDefinition *rule : m_schematicRules )
{ {
ApplySchematicRuleDefinition *rule = *it;
rule->processSchematicLighting(chunkBox, chunk); rule->processSchematicLighting(chunkBox, chunk);
} }
PIXEndNamedEvent(); PIXEndNamedEvent();
@@ -292,16 +294,14 @@ bool LevelGenerationOptions::checkIntersects(int x0, int y0, int z0, int x1, int
// a) ores generally being below ground/sea level and b) tutorial world additions generally being above ground/sea level // a) ores generally being below ground/sea level and b) tutorial world additions generally being above ground/sea level
if(!m_bHaveMinY) if(!m_bHaveMinY)
{ {
for(AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end();++it) for ( ApplySchematicRuleDefinition *rule : m_schematicRules )
{ {
ApplySchematicRuleDefinition *rule = *it;
int minY = rule->getMinY(); int minY = rule->getMinY();
if(minY < m_minY) m_minY = minY; if(minY < m_minY) m_minY = minY;
} }
for( AUTO_VAR(it, m_structureRules.begin()); it != m_structureRules.end(); it++ ) for ( ConsoleGenerateStructure *structureStart : m_structureRules )
{ {
ConsoleGenerateStructure *structureStart = *it;
int minY = structureStart->getMinY(); int minY = structureStart->getMinY();
if(minY < m_minY) m_minY = minY; if(minY < m_minY) m_minY = minY;
} }
@@ -313,18 +313,16 @@ bool LevelGenerationOptions::checkIntersects(int x0, int y0, int z0, int x1, int
if( y1 < m_minY ) return false; if( y1 < m_minY ) return false;
bool intersects = false; bool intersects = false;
for(AUTO_VAR(it, m_schematicRules.begin()); it != m_schematicRules.end();++it) for( ApplySchematicRuleDefinition *rule : m_schematicRules )
{ {
ApplySchematicRuleDefinition *rule = *it;
intersects = rule->checkIntersects(x0,y0,z0,x1,y1,z1); intersects = rule->checkIntersects(x0,y0,z0,x1,y1,z1);
if(intersects) break; if(intersects) break;
} }
if(!intersects) if(!intersects)
{ {
for( AUTO_VAR(it, m_structureRules.begin()); it != m_structureRules.end(); it++ ) for( ConsoleGenerateStructure *structureStart : m_structureRules )
{ {
ConsoleGenerateStructure *structureStart = *it;
intersects = structureStart->checkIntersects(x0,y0,z0,x1,y1,z1); intersects = structureStart->checkIntersects(x0,y0,z0,x1,y1,z1);
if(intersects) break; if(intersects) break;
} }
@@ -335,9 +333,9 @@ bool LevelGenerationOptions::checkIntersects(int x0, int y0, int z0, int x1, int
void LevelGenerationOptions::clearSchematics() void LevelGenerationOptions::clearSchematics()
{ {
for(AUTO_VAR(it, m_schematics.begin()); it != m_schematics.end(); ++it) for ( auto& it : m_schematics )
{ {
delete it->second; delete it.second;
} }
m_schematics.clear(); m_schematics.clear();
} }
@@ -345,7 +343,7 @@ void LevelGenerationOptions::clearSchematics()
ConsoleSchematicFile *LevelGenerationOptions::loadSchematicFile(const wstring &filename, PBYTE pbData, DWORD dwLen) ConsoleSchematicFile *LevelGenerationOptions::loadSchematicFile(const wstring &filename, PBYTE pbData, DWORD dwLen)
{ {
// If we have already loaded this, just return // If we have already loaded this, just return
AUTO_VAR(it, m_schematics.find(filename)); auto it = m_schematics.find(filename);
if(it != m_schematics.end()) if(it != m_schematics.end())
{ {
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
@@ -370,7 +368,7 @@ ConsoleSchematicFile *LevelGenerationOptions::getSchematicFile(const wstring &fi
{ {
ConsoleSchematicFile *schematic = NULL; ConsoleSchematicFile *schematic = NULL;
// If we have already loaded this, just return // If we have already loaded this, just return
AUTO_VAR(it, m_schematics.find(filename)); auto it = m_schematics.find(filename);
if(it != m_schematics.end()) if(it != m_schematics.end())
{ {
schematic = it->second; schematic = it->second;
@@ -381,7 +379,7 @@ ConsoleSchematicFile *LevelGenerationOptions::getSchematicFile(const wstring &fi
void LevelGenerationOptions::releaseSchematicFile(const wstring &filename) void LevelGenerationOptions::releaseSchematicFile(const wstring &filename)
{ {
// 4J Stu - We don't want to delete them when done, but probably want to keep a set of active schematics for the current world // 4J Stu - We don't want to delete them when done, but probably want to keep a set of active schematics for the current world
//AUTO_VAR(it, m_schematics.find(filename)); // auto it = m_schematics.find(filename);
//if(it != m_schematics.end()) //if(it != m_schematics.end())
//{ //{
// ConsoleSchematicFile *schematic = it->second; // ConsoleSchematicFile *schematic = it->second;
@@ -413,10 +411,9 @@ LPCWSTR LevelGenerationOptions::getString(const wstring &key)
void LevelGenerationOptions::getBiomeOverride(int biomeId, BYTE &tile, BYTE &topTile) void LevelGenerationOptions::getBiomeOverride(int biomeId, BYTE &tile, BYTE &topTile)
{ {
for(AUTO_VAR(it, m_biomeOverrides.begin()); it != m_biomeOverrides.end(); ++it) for ( BiomeOverride *bo : m_biomeOverrides )
{ {
BiomeOverride *bo = *it; if ( bo && bo->isBiome(biomeId) )
if(bo->isBiome(biomeId))
{ {
bo->getTileValues(tile,topTile); bo->getTileValues(tile,topTile);
break; break;
@@ -428,9 +425,8 @@ bool LevelGenerationOptions::isFeatureChunk(int chunkX, int chunkZ, StructureFea
{ {
bool isFeature = false; bool isFeature = false;
for(AUTO_VAR(it, m_features.begin()); it != m_features.end(); ++it) for( StartFeature *sf : m_features )
{ {
StartFeature *sf = *it;
if(sf->isFeatureChunk(chunkX, chunkZ, feature, orientation)) if(sf->isFeatureChunk(chunkX, chunkZ, feature, orientation))
{ {
isFeature = true; isFeature = true;
@@ -444,17 +440,17 @@ unordered_map<wstring, ConsoleSchematicFile *> *LevelGenerationOptions::getUnfin
{ {
// Clean schematic rules. // Clean schematic rules.
unordered_set<wstring> usedFiles = unordered_set<wstring>(); unordered_set<wstring> usedFiles = unordered_set<wstring>();
for (AUTO_VAR(it, m_schematicRules.begin()); it!=m_schematicRules.end(); it++) for ( auto& it : m_schematicRules )
if ( !(*it)->isComplete() ) if ( !it->isComplete() )
usedFiles.insert( (*it)->getSchematicName() ); usedFiles.insert( it->getSchematicName() );
// Clean schematic files. // Clean schematic files.
unordered_map<wstring, ConsoleSchematicFile *> *out unordered_map<wstring, ConsoleSchematicFile *> *out
= new unordered_map<wstring, ConsoleSchematicFile *>(); = new unordered_map<wstring, ConsoleSchematicFile *>();
for (AUTO_VAR(it, usedFiles.begin()); it!=usedFiles.end(); it++) for ( auto& it : usedFiles )
out->insert( pair<wstring, ConsoleSchematicFile *>(*it, getSchematicFile(*it)) ); out->insert( pair<wstring, ConsoleSchematicFile *>(it, getSchematicFile(it)) );
return out; return out;
} }
void LevelGenerationOptions::loadBaseSaveData() void LevelGenerationOptions::loadBaseSaveData()
@@ -472,7 +468,7 @@ void LevelGenerationOptions::loadBaseSaveData()
{ {
// corrupt DLC // corrupt DLC
setLoadedData(); setLoadedData();
app.DebugPrintf("Failed to mount LGO DLC %d for pad %d\n",mountIndex,ProfileManager.GetPrimaryPad()); app.DebugPrintf("Failed to mount LGO DLC %d for pad %d\n",mountIndex,ProfileManager.GetPrimaryPad());
} }
else else
{ {
@@ -604,7 +600,7 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
} }
} }
#ifdef _DURANGO #ifdef _DURANGO
DWORD result = StorageManager.UnmountInstalledDLC(L"WPACK"); DWORD result = StorageManager.UnmountInstalledDLC(L"WPACK");
#else #else
DWORD result = StorageManager.UnmountInstalledDLC("WPACK"); DWORD result = StorageManager.UnmountInstalledDLC("WPACK");
@@ -619,11 +615,10 @@ int LevelGenerationOptions::packMounted(LPVOID pParam,int iPad,DWORD dwErr,DWORD
void LevelGenerationOptions::reset_start() void LevelGenerationOptions::reset_start()
{ {
for ( AUTO_VAR( it, m_schematicRules.begin()); for ( auto& it : m_schematicRules )
it != m_schematicRules.end();
it++ )
{ {
(*it)->reset(); if ( it )
it->reset();
} }
} }
@@ -651,7 +646,7 @@ bool LevelGenerationOptions::requiresTexturePack() { return info()->requiresText
UINT LevelGenerationOptions::getRequiredTexturePackId() { return info()->getRequiredTexturePackId(); } UINT LevelGenerationOptions::getRequiredTexturePackId() { return info()->getRequiredTexturePackId(); }
wstring LevelGenerationOptions::getDefaultSaveName() wstring LevelGenerationOptions::getDefaultSaveName()
{ {
switch (getSrc()) switch (getSrc())
{ {
case eSrc_fromSave: return getString( info()->getDefaultSaveName() ); case eSrc_fromSave: return getString( info()->getDefaultSaveName() );
@@ -661,7 +656,7 @@ wstring LevelGenerationOptions::getDefaultSaveName()
return L""; return L"";
} }
LPCWSTR LevelGenerationOptions::getWorldName() LPCWSTR LevelGenerationOptions::getWorldName()
{ {
switch (getSrc()) switch (getSrc())
{ {
case eSrc_fromSave: return getString( info()->getWorldName() ); case eSrc_fromSave: return getString( info()->getWorldName() );

14
Minecraft.Client/Common/GameRules/LevelRuleset.cpp
View File

@@ -11,7 +11,7 @@ LevelRuleset::LevelRuleset()
LevelRuleset::~LevelRuleset() LevelRuleset::~LevelRuleset()
{ {
for(AUTO_VAR(it, m_areas.begin()); it != m_areas.end(); ++it) for (auto it = m_areas.begin(); it != m_areas.end(); ++it)
{ {
delete *it; delete *it;
} }
@@ -20,8 +20,8 @@ LevelRuleset::~LevelRuleset()
void LevelRuleset::getChildren(vector<GameRuleDefinition *> *children) void LevelRuleset::getChildren(vector<GameRuleDefinition *> *children)
{ {
CompoundGameRuleDefinition::getChildren(children); CompoundGameRuleDefinition::getChildren(children);
for (AUTO_VAR(it, m_areas.begin()); it != m_areas.end(); it++) for (const auto& area : m_areas)
children->push_back(*it); children->push_back(area);
} }
GameRuleDefinition *LevelRuleset::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *LevelRuleset::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -58,12 +58,12 @@ LPCWSTR LevelRuleset::getString(const wstring &key)
AABB *LevelRuleset::getNamedArea(const wstring &areaName) AABB *LevelRuleset::getNamedArea(const wstring &areaName)
{ {
AABB *area = NULL; AABB *area = nullptr;
for(AUTO_VAR(it, m_areas.begin()); it != m_areas.end(); ++it) for(auto& it : m_areas)
{ {
if( (*it)->getName().compare(areaName) == 0 ) if( it->getName().compare(areaName) == 0 )
{ {
area = (*it)->getArea(); area = it->getArea();
break; break;
} }
} }

12
Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
View File

@@ -22,18 +22,18 @@ void NamedAreaRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAtt
dos->writeUTF(m_name); dos->writeUTF(m_name);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x0);
dos->writeUTF(_toString(m_area->x0)); dos->writeUTF(std::to_wstring(m_area->x0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y0);
dos->writeUTF(_toString(m_area->y0)); dos->writeUTF(std::to_wstring(m_area->y0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z0);
dos->writeUTF(_toString(m_area->z0)); dos->writeUTF(std::to_wstring(m_area->z0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x1);
dos->writeUTF(_toString(m_area->x1)); dos->writeUTF(std::to_wstring(m_area->x1));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y1);
dos->writeUTF(_toString(m_area->y1)); dos->writeUTF(std::to_wstring(m_area->y1));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z1);
dos->writeUTF(_toString(m_area->z1)); dos->writeUTF(std::to_wstring(m_area->z1));
} }
void NamedAreaRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue) void NamedAreaRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue)

8
Minecraft.Client/Common/GameRules/StartFeature.cpp
View File

@@ -15,13 +15,13 @@ void StartFeature::writeAttributes(DataOutputStream *dos, UINT numAttrs)
GameRuleDefinition::writeAttributes(dos, numAttrs + 4); GameRuleDefinition::writeAttributes(dos, numAttrs + 4);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_chunkX); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_chunkX);
dos->writeUTF(_toString(m_chunkX)); dos->writeUTF(std::to_wstring(m_chunkX));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_chunkZ); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_chunkZ);
dos->writeUTF(_toString(m_chunkZ)); dos->writeUTF(std::to_wstring(m_chunkZ));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_feature); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_feature);
dos->writeUTF(_toString((int)m_feature)); dos->writeUTF(std::to_wstring((int)m_feature));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_orientation); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_orientation);
dos->writeUTF(_toString(m_orientation)); dos->writeUTF(std::to_wstring(m_orientation));
} }
void StartFeature::addAttribute(const wstring &attributeName, const wstring &attributeValue) void StartFeature::addAttribute(const wstring &attributeName, const wstring &attributeValue)

26
Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
View File

@@ -11,16 +11,16 @@ UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
{ {
m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;; m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;;
m_health = 0; m_health = 0;
m_food = 0; m_food = 0;
m_spawnPos = NULL; m_spawnPos = NULL;
m_yRot = 0.0f; m_yRot = 0.0f;
} }
UpdatePlayerRuleDefinition::~UpdatePlayerRuleDefinition() UpdatePlayerRuleDefinition::~UpdatePlayerRuleDefinition()
{ {
for(AUTO_VAR(it, m_items.begin()); it != m_items.end(); ++it) for(auto& item : m_items)
{ {
delete *it; delete item;
} }
} }
@@ -33,34 +33,34 @@ void UpdatePlayerRuleDefinition::writeAttributes(DataOutputStream *dos, UINT num
GameRuleDefinition::writeAttributes(dos, numAttributes + attrCount ); GameRuleDefinition::writeAttributes(dos, numAttributes + attrCount );
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnX); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnX);
dos->writeUTF(_toString(m_spawnPos->x)); dos->writeUTF(std::to_wstring(m_spawnPos->x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnY); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnY);
dos->writeUTF(_toString(m_spawnPos->y)); dos->writeUTF(std::to_wstring(m_spawnPos->y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnZ); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_spawnZ);
dos->writeUTF(_toString(m_spawnPos->z)); dos->writeUTF(std::to_wstring(m_spawnPos->z));
if(m_bUpdateYRot) if(m_bUpdateYRot)
{ {
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_yRot); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_yRot);
dos->writeUTF(_toString(m_yRot)); dos->writeUTF(std::to_wstring(m_yRot));
} }
if(m_bUpdateHealth) if(m_bUpdateHealth)
{ {
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_food); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_food);
dos->writeUTF(_toString(m_health)); dos->writeUTF(std::to_wstring(m_health));
} }
if(m_bUpdateFood) if(m_bUpdateFood)
{ {
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_health); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_health);
dos->writeUTF(_toString(m_food)); dos->writeUTF(std::to_wstring(m_food));
} }
} }
void UpdatePlayerRuleDefinition::getChildren(vector<GameRuleDefinition *> *children) void UpdatePlayerRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
{ {
GameRuleDefinition::getChildren(children); GameRuleDefinition::getChildren(children);
for(AUTO_VAR(it, m_items.begin()); it!=m_items.end(); it++) for(auto& item : m_items)
children->push_back(*it); children->push_back(item);
} }
GameRuleDefinition *UpdatePlayerRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *UpdatePlayerRuleDefinition::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -162,10 +162,8 @@ void UpdatePlayerRuleDefinition::postProcessPlayer(shared_ptr<Player> player)
if(m_spawnPos != NULL || m_bUpdateYRot) player->absMoveTo(x,y,z,yRot,xRot); if(m_spawnPos != NULL || m_bUpdateYRot) player->absMoveTo(x,y,z,yRot,xRot);
for(AUTO_VAR(it, m_items.begin()); it != m_items.end(); ++it) for(auto& addItem : m_items)
{ {
AddItemRuleDefinition *addItem = *it;
addItem->addItemToContainer(player->inventory, -1); addItem->addItemToContainer(player->inventory, -1);
} }
} }

10
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
View File

@@ -13,19 +13,19 @@ void UseTileRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttri
GameRuleDefinition::writeAttributes(dos, numAttributes + 5); GameRuleDefinition::writeAttributes(dos, numAttributes + 5);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_tileId); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_tileId);
dos->writeUTF(_toString(m_tileId)); dos->writeUTF(std::to_wstring(m_tileId));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_useCoords); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_useCoords);
dos->writeUTF(_toString(m_useCoords)); dos->writeUTF(std::to_wstring(m_useCoords));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x);
dos->writeUTF(_toString(m_coordinates.x)); dos->writeUTF(std::to_wstring(m_coordinates.x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y);
dos->writeUTF(_toString(m_coordinates.y)); dos->writeUTF(std::to_wstring(m_coordinates.y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z);
dos->writeUTF(_toString(m_coordinates.z)); dos->writeUTF(std::to_wstring(m_coordinates.z));
} }
void UseTileRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue) void UseTileRuleDefinition::addAttribute(const wstring &attributeName, const wstring &attributeValue)

18
Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
View File

@@ -14,25 +14,25 @@ void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream *dos, UINT
ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 9); ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 9);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x0);
dos->writeUTF(_toString(m_x0)); dos->writeUTF(std::to_wstring(m_x0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y0);
dos->writeUTF(_toString(m_y0)); dos->writeUTF(std::to_wstring(m_y0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z0); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z0);
dos->writeUTF(_toString(m_z0)); dos->writeUTF(std::to_wstring(m_z0));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x1);
dos->writeUTF(_toString(m_x1)); dos->writeUTF(std::to_wstring(m_x1));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y1);
dos->writeUTF(_toString(m_y1)); dos->writeUTF(std::to_wstring(m_y1));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z1); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z1);
dos->writeUTF(_toString(m_z1)); dos->writeUTF(std::to_wstring(m_z1));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_edgeTile); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_edgeTile);
dos->writeUTF(_toString(m_edgeTile)); dos->writeUTF(std::to_wstring(m_edgeTile));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_fillTile); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_fillTile);
dos->writeUTF(_toString(m_fillTile)); dos->writeUTF(std::to_wstring(m_fillTile));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_skipAir); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_skipAir);
dos->writeUTF(_toString(m_skipAir)); dos->writeUTF(std::to_wstring(m_skipAir));
} }
void XboxStructureActionGenerateBox::addAttribute(const wstring &attributeName, const wstring &attributeValue) void XboxStructureActionGenerateBox::addAttribute(const wstring &attributeName, const wstring &attributeValue)

10
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
View File

@@ -13,16 +13,16 @@ void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream *dos, UINT
ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 5); ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 5);
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_x);
dos->writeUTF(_toString(m_x)); dos->writeUTF(std::to_wstring(m_x));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_y);
dos->writeUTF(_toString(m_y)); dos->writeUTF(std::to_wstring(m_y));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_z);
dos->writeUTF(_toString(m_z)); dos->writeUTF(std::to_wstring(m_z));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_data); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_data);
dos->writeUTF(_toString(m_data)); dos->writeUTF(std::to_wstring(m_data));
ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_block); ConsoleGameRules::write(dos, ConsoleGameRules::eGameRuleAttr_block);
dos->writeUTF(_toString(m_tile)); dos->writeUTF(std::to_wstring(m_tile));
} }

16
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
View File

@@ -14,21 +14,21 @@ XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
XboxStructureActionPlaceContainer::~XboxStructureActionPlaceContainer() XboxStructureActionPlaceContainer::~XboxStructureActionPlaceContainer()
{ {
for(AUTO_VAR(it, m_items.begin()); it != m_items.end(); ++it) for(auto& item : m_items)
{ {
delete *it; delete item;
} }
} }
// 4J-JEV: Super class handles attr-facing fine. // 4J-JEV: Super class handles attr-facing fine.
//void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, UINT numAttrs) //void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, UINT numAttrs)
void XboxStructureActionPlaceContainer::getChildren(vector<GameRuleDefinition *> *children) void XboxStructureActionPlaceContainer::getChildren(vector<GameRuleDefinition *> *children)
{ {
XboxStructureActionPlaceBlock::getChildren(children); XboxStructureActionPlaceBlock::getChildren(children);
for(AUTO_VAR(it, m_items.begin()); it!=m_items.end(); it++) for(auto & item : m_items)
children->push_back( *it ); children->push_back( item );
} }
GameRuleDefinition *XboxStructureActionPlaceContainer::addChild(ConsoleGameRules::EGameRuleType ruleType) GameRuleDefinition *XboxStructureActionPlaceContainer::addChild(ConsoleGameRules::EGameRuleType ruleType)
@@ -79,15 +79,15 @@ bool XboxStructureActionPlaceContainer::placeContainerInLevel(StructurePiece *st
level->setTileAndData( worldX, worldY, worldZ, m_tile, 0, Tile::UPDATE_ALL ); level->setTileAndData( worldX, worldY, worldZ, m_tile, 0, Tile::UPDATE_ALL );
shared_ptr<Container> container = dynamic_pointer_cast<Container>(level->getTileEntity( worldX, worldY, worldZ )); shared_ptr<Container> container = dynamic_pointer_cast<Container>(level->getTileEntity( worldX, worldY, worldZ ));
app.DebugPrintf("XboxStructureActionPlaceContainer - placing a container at (%d,%d,%d)\n", worldX, worldY, worldZ); app.DebugPrintf("XboxStructureActionPlaceContainer - placing a container at (%d,%d,%d)\n", worldX, worldY, worldZ);
if ( container != NULL ) if ( container != NULL )
{ {
level->setData( worldX, worldY, worldZ, m_data, Tile::UPDATE_CLIENTS); level->setData( worldX, worldY, worldZ, m_data, Tile::UPDATE_CLIENTS);
// Add items // Add items
int slotId = 0; int slotId = 0;
for(AUTO_VAR(it, m_items.begin()); it != m_items.end() && (slotId < container->getContainerSize()); ++it, ++slotId ) for (auto it = m_items.begin(); it != m_items.end() && (slotId < container->getContainerSize()); ++it, ++slotId)
{ {
AddItemRuleDefinition *addItem = *it; AddItemRuleDefinition *addItem = *it;
addItem->addItemToContainer(container,slotId); addItem->addItemToContainer(container,slotId);

BIN
Minecraft.Client/Common/Media/MediaWindows64.arc
View File

Binary file not shown.

107
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View File

@@ -75,7 +75,7 @@ void CGameNetworkManager::Initialise()
#else #else
s_pPlatformNetworkManager = new CPlatformNetworkManagerStub(); s_pPlatformNetworkManager = new CPlatformNetworkManagerStub();
#endif #endif
s_pPlatformNetworkManager->Initialise( this, flagIndexSize ); s_pPlatformNetworkManager->Initialise( this, flagIndexSize );
m_bNetworkThreadRunning = false; m_bNetworkThreadRunning = false;
m_bInitialised = true; m_bInitialised = true;
} }
@@ -105,7 +105,7 @@ void CGameNetworkManager::DoWork()
if((g_NetworkManager.GetLockedProfile()!=-1) && iPrimaryPlayer!=-1 && bConnected == false && g_NetworkManager.IsInSession() ) if((g_NetworkManager.GetLockedProfile()!=-1) && iPrimaryPlayer!=-1 && bConnected == false && g_NetworkManager.IsInSession() )
{ {
app.SetAction(iPrimaryPlayer,eAppAction_EthernetDisconnected); app.SetAction(iPrimaryPlayer,eAppAction_EthernetDisconnected);
} }
} }
break; break;
case XN_LIVE_INVITE_ACCEPTED: case XN_LIVE_INVITE_ACCEPTED:
@@ -162,7 +162,7 @@ bool CGameNetworkManager::_RunNetworkGame(LPVOID lpParameter)
success = s_pPlatformNetworkManager->_RunNetworkGame(); success = s_pPlatformNetworkManager->_RunNetworkGame();
if(!success) if(!success)
{ {
app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE); app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
return true; return true;
} }
@@ -172,7 +172,7 @@ bool CGameNetworkManager::_RunNetworkGame(LPVOID lpParameter)
// Client needs QNET_STATE_GAME_PLAY so that IsInGameplay() returns true // Client needs QNET_STATE_GAME_PLAY so that IsInGameplay() returns true
s_pPlatformNetworkManager->SetGamePlayState(); s_pPlatformNetworkManager->SetGamePlayState();
} }
if( g_NetworkManager.IsLeavingGame() ) return false; if( g_NetworkManager.IsLeavingGame() ) return false;
app.SetGameStarted(true); app.SetGameStarted(true);
@@ -199,7 +199,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
{ {
NetworkGameInitData *param = (NetworkGameInitData *)lpParameter; NetworkGameInitData *param = (NetworkGameInitData *)lpParameter;
seed = param->seed; seed = param->seed;
app.setLevelGenerationOptions(param->levelGen); app.setLevelGenerationOptions(param->levelGen);
if(param->levelGen != NULL) if(param->levelGen != NULL)
{ {
@@ -305,7 +305,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
ServerReadyWait(); ServerReadyWait();
ServerReadyDestroy(); ServerReadyDestroy();
if( MinecraftServer::serverHalted() ) if( MinecraftServer::serverHalted() )
return false; return false;
// printf("Server ready to go!\n"); // printf("Server ready to go!\n");
@@ -316,7 +316,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
} }
#ifndef _XBOX #ifndef _XBOX
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
// Make sure that we have transitioned through any joining/creating stages and are actually playing the game, so that we know the players should be valid // Make sure that we have transitioned through any joining/creating stages and are actually playing the game, so that we know the players should be valid
bool changedMessage = false; bool changedMessage = false;
while(!IsReadyToPlayOrIdle()) while(!IsReadyToPlayOrIdle())
@@ -492,9 +492,10 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
do do
{ {
// We need to keep ticking the connections for players that already logged in // We need to keep ticking the connections for players that already logged in
for(AUTO_VAR(it, createdConnections.begin()); it < createdConnections.end(); ++it) for (auto& it : createdConnections )
{ {
(*it)->tick(); if ( it )
it->tick();
} }
// 4J Stu - We were ticking this way too fast which could cause the connection to time out // 4J Stu - We were ticking this way too fast which could cause the connection to time out
@@ -522,8 +523,8 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
else else
{ {
connection->close(); connection->close();
AUTO_VAR(it, find( createdConnections.begin(), createdConnections.end(), connection )); auto it = find(createdConnections.begin(), createdConnections.end(), connection);
if(it != createdConnections.end() ) createdConnections.erase( it ); if(it != createdConnections.end() ) createdConnections.erase( it );
} }
} }
@@ -536,12 +537,12 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
return false; return false;
} }
if(g_NetworkManager.IsLeavingGame() || !IsInSession() ) if(g_NetworkManager.IsLeavingGame() || !IsInSession() )
{ {
for(AUTO_VAR(it, createdConnections.begin()); it < createdConnections.end(); ++it) for (auto& it : createdConnections)
{ {
(*it)->close(); it->close();
} }
// assert(false); // assert(false);
MinecraftServer::HaltServer(); MinecraftServer::HaltServer();
@@ -832,7 +833,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
ProfileManager.SetPrimaryPad(iPad); ProfileManager.SetPrimaryPad(iPad);
g_NetworkManager.SetLocalGame(false); g_NetworkManager.SetLocalGame(false);
// If the player was signed in before selecting play, we'll not have read the profile yet, so query the sign-in status to get this to happen // If the player was signed in before selecting play, we'll not have read the profile yet, so query the sign-in status to get this to happen
ProfileManager.QuerySigninStatus(); ProfileManager.QuerySigninStatus();
@@ -848,7 +849,7 @@ int CGameNetworkManager::JoinFromInvite_SignInReturned(void *pParam,bool bContin
pInviteInfo ); // pInviteInfo pInviteInfo ); // pInviteInfo
if( !success ) if( !success )
{ {
app.DebugPrintf( "Failed joining game from invite\n" ); app.DebugPrintf( "Failed joining game from invite\n" );
} }
} }
} }
@@ -894,7 +895,7 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
Compression::UseDefaultThreadStorage(); Compression::UseDefaultThreadStorage();
Tile::CreateNewThreadStorage(); Tile::CreateNewThreadStorage();
IntCache::CreateNewThreadStorage(); IntCache::CreateNewThreadStorage();
g_NetworkManager.m_bNetworkThreadRunning = true; g_NetworkManager.m_bNetworkThreadRunning = true;
bool success = g_NetworkManager._RunNetworkGame(lpParameter); bool success = g_NetworkManager._RunNetworkGame(lpParameter);
g_NetworkManager.m_bNetworkThreadRunning = false; g_NetworkManager.m_bNetworkThreadRunning = false;
@@ -906,7 +907,7 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
Sleep(1); Sleep(1);
} }
ui.CleanUpSkinReload(); ui.CleanUpSkinReload();
if(app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None) if(app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None)
{ {
app.SetDisconnectReason( DisconnectPacket::eDisconnect_ConnectionCreationFailed ); app.SetDisconnectReason( DisconnectPacket::eDisconnect_ConnectionCreationFailed );
} }
@@ -949,7 +950,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
SetThreadName(-1, "Minecraft Server thread"); SetThreadName(-1, "Minecraft Server thread");
AABB::CreateNewThreadStorage(); AABB::CreateNewThreadStorage();
Vec3::CreateNewThreadStorage(); Vec3::CreateNewThreadStorage();
IntCache::CreateNewThreadStorage(); IntCache::CreateNewThreadStorage();
Compression::UseDefaultThreadStorage(); Compression::UseDefaultThreadStorage();
OldChunkStorage::UseDefaultThreadStorage(); OldChunkStorage::UseDefaultThreadStorage();
Entity::useSmallIds(); Entity::useSmallIds();
@@ -958,7 +959,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
FireworksRecipe::CreateNewThreadStorage(); FireworksRecipe::CreateNewThreadStorage();
MinecraftServer::main(seed, lpParameter); //saveData, app.GetGameHostOption(eGameHostOption_All)); MinecraftServer::main(seed, lpParameter); //saveData, app.GetGameHostOption(eGameHostOption_All));
Tile::ReleaseThreadStorage(); Tile::ReleaseThreadStorage();
AABB::ReleaseThreadStorage(); AABB::ReleaseThreadStorage();
Vec3::ReleaseThreadStorage(); Vec3::ReleaseThreadStorage();
@@ -1012,7 +1013,7 @@ int CGameNetworkManager::ExitAndJoinFromInviteThreadProc( void* lpParam )
// The pair of methods MustSignInReturned_0 & PSNSignInReturned_0 handle this // The pair of methods MustSignInReturned_0 & PSNSignInReturned_0 handle this
int CGameNetworkManager::MustSignInReturned_0(void *pParam,int iPad,C4JStorage::EMessageResult result) int CGameNetworkManager::MustSignInReturned_0(void *pParam,int iPad,C4JStorage::EMessageResult result)
{ {
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
#ifdef __PS3__ #ifdef __PS3__
SQRNetworkManager_PS3::AttemptPSNSignIn(&CGameNetworkManager::PSNSignInReturned_0, pParam,true); SQRNetworkManager_PS3::AttemptPSNSignIn(&CGameNetworkManager::PSNSignInReturned_0, pParam,true);
@@ -1072,7 +1073,7 @@ int CGameNetworkManager::PSNSignInReturned_0(void* pParam, bool bContinue, int i
// The pair of methods MustSignInReturned_1 & PSNSignInReturned_1 handle this // The pair of methods MustSignInReturned_1 & PSNSignInReturned_1 handle this
int CGameNetworkManager::MustSignInReturned_1(void *pParam,int iPad,C4JStorage::EMessageResult result) int CGameNetworkManager::MustSignInReturned_1(void *pParam,int iPad,C4JStorage::EMessageResult result)
{ {
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
#ifdef __PS3__ #ifdef __PS3__
SQRNetworkManager_PS3::AttemptPSNSignIn(&CGameNetworkManager::PSNSignInReturned_1, pParam,true); SQRNetworkManager_PS3::AttemptPSNSignIn(&CGameNetworkManager::PSNSignInReturned_1, pParam,true);
@@ -1104,7 +1105,7 @@ int CGameNetworkManager::PSNSignInReturned_1(void* pParam, bool bContinue, int i
#elif defined __ORBIS__ #elif defined __ORBIS__
// TODO: No Orbis equivalent (should there be?) // TODO: No Orbis equivalent (should there be?)
#endif #endif
} }
} }
@@ -1129,7 +1130,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
Vec3::UseDefaultThreadStorage(); Vec3::UseDefaultThreadStorage();
Compression::UseDefaultThreadStorage(); Compression::UseDefaultThreadStorage();
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
MinecraftServer *pServer = MinecraftServer::getInstance(); MinecraftServer *pServer = MinecraftServer::getInstance();
#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
@@ -1168,7 +1169,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
pMinecraft->progressRenderer->progressStartNoAbort( g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) ); pMinecraft->progressRenderer->progressStartNoAbort( g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) );
pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME ); pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME );
} }
#else #else
pMinecraft->progressRenderer->progressStartNoAbort( g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) ); pMinecraft->progressRenderer->progressStartNoAbort( g_NetworkManager.CorrectErrorIDS(IDS_CONNECTION_LOST_LIVE_NO_EXIT) );
pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME ); pMinecraft->progressRenderer->progressStage( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME );
@@ -1182,7 +1183,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
// wait for the server to be in a non-ticking state // wait for the server to be in a non-ticking state
pServer->m_serverPausedEvent->WaitForSignal(INFINITE); pServer->m_serverPausedEvent->WaitForSignal(INFINITE);
#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__ #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
// Swap these two messages around as one is too long to display at 480 // Swap these two messages around as one is too long to display at 480
pMinecraft->progressRenderer->progressStartNoAbort( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME ); pMinecraft->progressRenderer->progressStartNoAbort( IDS_PROGRESS_CONVERTING_TO_OFFLINE_GAME );
@@ -1218,9 +1219,8 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
if( pServer != NULL ) if( pServer != NULL )
{ {
PlayerList *players = pServer->getPlayers(); PlayerList *players = pServer->getPlayers();
for(AUTO_VAR(it, players->players.begin()); it < players->players.end(); ++it) for(auto& servPlayer : players->players)
{ {
shared_ptr<ServerPlayer> servPlayer = *it;
if( servPlayer->connection->isLocal() && !servPlayer->connection->isGuest() ) if( servPlayer->connection->isLocal() && !servPlayer->connection->isGuest() )
{ {
servPlayer->connection->connection->getSocket()->setPlayer(NULL); servPlayer->connection->connection->getSocket()->setPlayer(NULL);
@@ -1244,7 +1244,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
{ {
Sleep(1); Sleep(1);
} }
// Reset this flag as the we don't need to know that we only lost the room only from this point onwards, the behaviour is exactly the same // Reset this flag as the we don't need to know that we only lost the room only from this point onwards, the behaviour is exactly the same
g_NetworkManager.m_bLastDisconnectWasLostRoomOnly = false; g_NetworkManager.m_bLastDisconnectWasLostRoomOnly = false;
g_NetworkManager.m_bFullSessionMessageOnNextSessionChange = false; g_NetworkManager.m_bFullSessionMessageOnNextSessionChange = false;
@@ -1275,7 +1275,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
{ {
Sleep(1); Sleep(1);
} }
// Restore the network player of all the server players that are local // Restore the network player of all the server players that are local
if( pServer != NULL ) if( pServer != NULL )
{ {
@@ -1286,9 +1286,8 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
PlayerUID localPlayerXuid = pMinecraft->localplayers[index]->getXuid(); PlayerUID localPlayerXuid = pMinecraft->localplayers[index]->getXuid();
PlayerList *players = pServer->getPlayers(); PlayerList *players = pServer->getPlayers();
for(AUTO_VAR(it, players->players.begin()); it < players->players.end(); ++it) for(auto& servPlayer : players->players)
{ {
shared_ptr<ServerPlayer> servPlayer = *it;
if( servPlayer->getXuid() == localPlayerXuid ) if( servPlayer->getXuid() == localPlayerXuid )
{ {
servPlayer->connection->connection->getSocket()->setPlayer( g_NetworkManager.GetLocalPlayerByUserIndex(index) ); servPlayer->connection->connection->getSocket()->setPlayer( g_NetworkManager.GetLocalPlayerByUserIndex(index) );
@@ -1302,7 +1301,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
pMinecraft->m_pendingLocalConnections[index]->getConnection()->getSocket()->setPlayer(g_NetworkManager.GetLocalPlayerByUserIndex(index)); pMinecraft->m_pendingLocalConnections[index]->getConnection()->getSocket()->setPlayer(g_NetworkManager.GetLocalPlayerByUserIndex(index));
} }
else if ( pMinecraft->m_connectionFailed[index] && (pMinecraft->m_connectionFailedReason[index] == DisconnectPacket::eDisconnect_ConnectionCreationFailed) ) else if ( pMinecraft->m_connectionFailed[index] && (pMinecraft->m_connectionFailedReason[index] == DisconnectPacket::eDisconnect_ConnectionCreationFailed) )
{ {
pMinecraft->removeLocalPlayerIdx(index); pMinecraft->removeLocalPlayerIdx(index);
#ifdef _XBOX_ONE #ifdef _XBOX_ONE
ProfileManager.RemoveGamepadFromGame(index); ProfileManager.RemoveGamepadFromGame(index);
@@ -1311,7 +1310,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
} }
} }
} }
pMinecraft->progressRenderer->progressStagePercentage(100); pMinecraft->progressRenderer->progressStagePercentage(100);
#ifndef _XBOX #ifndef _XBOX
@@ -1333,7 +1332,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
#endif #endif
// Start the game again // Start the game again
app.SetGameStarted(true); app.SetGameStarted(true);
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE); app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)FALSE);
app.SetChangingSessionType(false); app.SetChangingSessionType(false);
app.SetReallyChangingSessionType(false); app.SetReallyChangingSessionType(false);
@@ -1387,7 +1386,7 @@ void CGameNetworkManager::StateChange_AnyToJoining()
app.DebugPrintf("Disabling Guest Signin\n"); app.DebugPrintf("Disabling Guest Signin\n");
XEnableGuestSignin(FALSE); XEnableGuestSignin(FALSE);
Minecraft::GetInstance()->clearPendingClientTextureRequests(); Minecraft::GetInstance()->clearPendingClientTextureRequests();
ConnectionProgressParams *param = new ConnectionProgressParams(); ConnectionProgressParams *param = new ConnectionProgressParams();
param->iPad = ProfileManager.GetPrimaryPad(); param->iPad = ProfileManager.GetPrimaryPad();
param->stringId = -1; param->stringId = -1;
@@ -1435,7 +1434,7 @@ void CGameNetworkManager::StateChange_AnyToStarting()
completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes; completionData->type = e_ProgressCompletion_CloseAllPlayersUIScenes;
completionData->iPad = ProfileManager.GetPrimaryPad(); completionData->iPad = ProfileManager.GetPrimaryPad();
loadingParams->completionData = completionData; loadingParams->completionData = completionData;
ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams); ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
} }
} }
@@ -1559,7 +1558,7 @@ void CGameNetworkManager::PlayerJoining( INetworkPlayer *pNetworkPlayer )
bool multiplayer = g_NetworkManager.GetPlayerCount() > 1, localgame = g_NetworkManager.IsLocalGame(); bool multiplayer = g_NetworkManager.GetPlayerCount() > 1, localgame = g_NetworkManager.IsLocalGame();
for (int iPad=0; iPad<XUSER_MAX_COUNT; ++iPad) for (int iPad=0; iPad<XUSER_MAX_COUNT; ++iPad)
{ {
INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(iPad); INetworkPlayer *pNetworkPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(iPad);
if (pNetworkPlayer == NULL) continue; if (pNetworkPlayer == NULL) continue;
app.SetRichPresenceContext(iPad,CONTEXT_GAME_STATE_BLANK); app.SetRichPresenceContext(iPad,CONTEXT_GAME_STATE_BLANK);
@@ -1584,7 +1583,7 @@ void CGameNetworkManager::PlayerJoining( INetworkPlayer *pNetworkPlayer )
else else
{ {
if( !pNetworkPlayer->IsHost() ) if( !pNetworkPlayer->IsHost() )
{ {
for(int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for(int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(Minecraft::GetInstance()->localplayers[idx] != NULL) if(Minecraft::GetInstance()->localplayers[idx] != NULL)
@@ -1640,7 +1639,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
} }
// Need to check we're signed in to PSN // Need to check we're signed in to PSN
bool isSignedInLive = true; bool isSignedInLive = true;
bool isLocalMultiplayerAvailable = app.IsLocalMultiplayerAvailable(); bool isLocalMultiplayerAvailable = app.IsLocalMultiplayerAvailable();
int iPadNotSignedInLive = -1; int iPadNotSignedInLive = -1;
for(unsigned int i = 0; i < XUSER_MAX_COUNT; i++) for(unsigned int i = 0; i < XUSER_MAX_COUNT; i++)
@@ -1680,7 +1679,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
ui.RequestErrorMessage( IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, iPadNotSignedInLive); ui.RequestErrorMessage( IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, iPadNotSignedInLive);
} }
else else
{ {
// Not signed in to PSN // Not signed in to PSN
UINT uiIDA[1]; UINT uiIDA[1];
uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT; uiIDA[0] = IDS_PRO_NOTONLINE_ACCEPT;
@@ -1700,10 +1699,10 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
{ {
m_pInviteInfo = (INVITE_INFO *) pInviteInfo; m_pInviteInfo = (INVITE_INFO *) pInviteInfo;
m_iPlayerInvited = userIndex; m_iPlayerInvited = userIndex;
m_pUpsell = new PsPlusUpsellWrapper(index); m_pUpsell = new PsPlusUpsellWrapper(index);
m_pUpsell->displayUpsell(); m_pUpsell->displayUpsell();
return; return;
} }
} }
@@ -1723,9 +1722,9 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
// 4J-PB we shouldn't bring any inactive players into the game, except for the invited player (who may be an inactive player) // 4J-PB we shouldn't bring any inactive players into the game, except for the invited player (who may be an inactive player)
// 4J Stu - If we are not in a game, then bring in all players signed in // 4J Stu - If we are not in a game, then bring in all players signed in
if(index==userIndex || pMinecraft->localplayers[index]!=NULL ) if(index==userIndex || pMinecraft->localplayers[index]!=NULL )
{ {
++joiningUsers; ++joiningUsers;
if( !ProfileManager.AllowedToPlayMultiplayer(index) ) noPrivileges = true; if( !ProfileManager.AllowedToPlayMultiplayer(index) ) noPrivileges = true;
localUsersMask |= GetLocalPlayerMask( index ); localUsersMask |= GetLocalPlayerMask( index );
} }
} }
@@ -1742,7 +1741,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed); ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
if(!pccAllowed && !pccFriendsAllowed) noUGC = true; if(!pccAllowed && !pccFriendsAllowed) noUGC = true;
#endif #endif
#if defined(_XBOX) || defined(__PS3__) #if defined(_XBOX) || defined(__PS3__)
if(joiningUsers > 1 && !RenderManager.IsHiDef() && userIndex != ProfileManager.GetPrimaryPad()) if(joiningUsers > 1 && !RenderManager.IsHiDef() && userIndex != ProfileManager.GetPrimaryPad())
{ {
@@ -1796,10 +1795,10 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
} }
#endif #endif
if( !g_NetworkManager.IsInSession() ) if( !g_NetworkManager.IsInSession() )
{ {
#if defined (__PS3__) || defined (__PSVITA__) #if defined (__PS3__) || defined (__PSVITA__)
// PS3 is more complicated here - we need to make sure that the player is online. If they are then we can do the same as the xbox, if not we need to try and get them online and then, if they do sign in, go down the same path // PS3 is more complicated here - we need to make sure that the player is online. If they are then we can do the same as the xbox, if not we need to try and get them online and then, if they do sign in, go down the same path
// Determine why they're not "signed in live" // Determine why they're not "signed in live"
// MGH - On Vita we need to add a new message at some point for connecting when already signed in // MGH - On Vita we need to add a new message at some point for connecting when already signed in
if(ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad())) if(ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()))
@@ -1816,7 +1815,7 @@ void CGameNetworkManager::GameInviteReceived( int userIndex, const INVITE_INFO *
#else #else
HandleInviteWhenInMenus(userIndex, pInviteInfo); HandleInviteWhenInMenus(userIndex, pInviteInfo);
#endif #endif
} }
else else
@@ -1856,7 +1855,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( int userIndex, const INVITE_I
if(!ProfileManager.IsFullVersion()) if(!ProfileManager.IsFullVersion())
{ {
// The marketplace will fail with the primary player set to -1 // The marketplace will fail with the primary player set to -1
ProfileManager.SetPrimaryPad(userIndex); ProfileManager.SetPrimaryPad(userIndex);
app.SetAction(userIndex,eAppAction_DashboardTrialJoinFromInvite); app.SetAction(userIndex,eAppAction_DashboardTrialJoinFromInvite);
} }
@@ -1900,7 +1899,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( int userIndex, const INVITE_I
ProfileManager.QuerySigninStatus(); ProfileManager.QuerySigninStatus();
// 4J-PB - clear any previous connection errors // 4J-PB - clear any previous connection errors
Minecraft::GetInstance()->clearConnectionFailed(); Minecraft::GetInstance()->clearConnectionFailed();
g_NetworkManager.SetLocalGame(false); g_NetworkManager.SetLocalGame(false);
@@ -1910,7 +1909,7 @@ void CGameNetworkManager::HandleInviteWhenInMenus( int userIndex, const INVITE_I
bool success = g_NetworkManager.JoinGameFromInviteInfo( userIndex, localUsersMask, pInviteInfo ); bool success = g_NetworkManager.JoinGameFromInviteInfo( userIndex, localUsersMask, pInviteInfo );
if( !success ) if( !success )
{ {
app.DebugPrintf( "Failed joining game from invite\n" ); app.DebugPrintf( "Failed joining game from invite\n" );
} }
} }
} }

90
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
View File

@@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "..\..\..\Minecraft.World\Socket.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "..\..\..\Minecraft.World\StringHelpers.h"
#include "PlatformNetworkManagerStub.h" #include "PlatformNetworkManagerStub.h"
@@ -7,6 +7,7 @@
#include "..\..\Windows64\Network\WinsockNetLayer.h" #include "..\..\Windows64\Network\WinsockNetLayer.h"
#include "..\..\Minecraft.h" #include "..\..\Minecraft.h"
#include "..\..\User.h" #include "..\..\User.h"
#include <iostream>
#endif #endif
CPlatformNetworkManagerStub *g_pPlatformNetworkManager; CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
@@ -63,9 +64,8 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer )
{ {
// Do we already have a primary player for this system? // Do we already have a primary player for this system?
bool systemHasPrimaryPlayer = false; bool systemHasPrimaryPlayer = false;
for(AUTO_VAR(it, m_machineQNetPrimaryPlayers.begin()); it < m_machineQNetPrimaryPlayers.end(); ++it) for (auto& pQNetPrimaryPlayer : m_machineQNetPrimaryPlayers)
{ {
IQNetPlayer *pQNetPrimaryPlayer = *it;
if( pQNetPlayer->IsSameSystem(pQNetPrimaryPlayer) ) if( pQNetPlayer->IsSameSystem(pQNetPrimaryPlayer) )
{ {
systemHasPrimaryPlayer = true; systemHasPrimaryPlayer = true;
@@ -77,7 +77,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer )
} }
} }
g_NetworkManager.PlayerJoining( networkPlayer ); g_NetworkManager.PlayerJoining( networkPlayer );
if( createFakeSocket == true && !m_bHostChanged ) if( createFakeSocket == true && !m_bHostChanged )
{ {
g_NetworkManager.CreateSocket( networkPlayer, localPlayer ); g_NetworkManager.CreateSocket( networkPlayer, localPlayer );
@@ -97,7 +97,7 @@ void CPlatformNetworkManagerStub::NotifyPlayerJoined(IQNetPlayer *pQNetPlayer )
// g_NetworkManager.UpdateAndSetGameSessionData(); // g_NetworkManager.UpdateAndSetGameSessionData();
SystemFlagAddPlayer( networkPlayer ); SystemFlagAddPlayer( networkPlayer );
} }
for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(playerChangedCallback[idx] != NULL) if(playerChangedCallback[idx] != NULL)
@@ -161,7 +161,7 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
{ {
playerChangedCallback[ i ] = NULL; playerChangedCallback[ i ] = NULL;
} }
m_bLeavingGame = false; m_bLeavingGame = false;
m_bLeaveGameOnTick = false; m_bLeaveGameOnTick = false;
m_bHostChanged = false; m_bHostChanged = false;
@@ -317,8 +317,8 @@ bool CPlatformNetworkManagerStub::LeaveGame(bool bMigrateHost)
m_pIQNet->EndGame(); m_pIQNet->EndGame();
} }
for (AUTO_VAR(it, currentNetworkPlayers.begin()); it != currentNetworkPlayers.end(); it++) for (auto & it : currentNetworkPlayers)
delete* it; delete it;
currentNetworkPlayers.clear(); currentNetworkPlayers.clear();
m_machineQNetPrimaryPlayers.clear(); m_machineQNetPrimaryPlayers.clear();
SystemFlagReset(); SystemFlagReset();
@@ -472,7 +472,7 @@ void CPlatformNetworkManagerStub::UnRegisterPlayerChangedCallback(int iPad, void
void CPlatformNetworkManagerStub::HandleSignInChange() void CPlatformNetworkManagerStub::HandleSignInChange()
{ {
return; return;
} }
bool CPlatformNetworkManagerStub::_RunNetworkGame() bool CPlatformNetworkManagerStub::_RunNetworkGame()
@@ -499,24 +499,24 @@ bool CPlatformNetworkManagerStub::_RunNetworkGame()
void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= NULL*/) void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pNetworkPlayerLeaving /*= NULL*/)
{ {
// DWORD playerCount = m_pIQNet->GetPlayerCount(); // DWORD playerCount = m_pIQNet->GetPlayerCount();
// //
// if( this->m_bLeavingGame ) // if( this->m_bLeavingGame )
// return; // return;
// //
// if( GetHostPlayer() == NULL ) // if( GetHostPlayer() == NULL )
// return; // return;
// //
// for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i) // for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
// { // {
// if( i < playerCount ) // if( i < playerCount )
// { // {
// INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i); // INetworkPlayer *pNetworkPlayer = GetPlayerByIndex(i);
// //
// // We can call this from NotifyPlayerLeaving but at that point the player is still considered in the session // // We can call this from NotifyPlayerLeaving but at that point the player is still considered in the session
// if( pNetworkPlayer != pNetworkPlayerLeaving ) // if( pNetworkPlayer != pNetworkPlayerLeaving )
// { // {
// m_hostGameSessionData.players[i] = ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID(); // m_hostGameSessionData.players[i] = ((NetworkPlayerXbox *)pNetworkPlayer)->GetUID();
// //
// char *temp; // char *temp;
// temp = (char *)wstringtofilename( pNetworkPlayer->GetOnlineName() ); // temp = (char *)wstringtofilename( pNetworkPlayer->GetOnlineName() );
// memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE); // memcpy(m_hostGameSessionData.szPlayers[i],temp,XUSER_NAME_SIZE);
@@ -533,7 +533,7 @@ void CPlatformNetworkManagerStub::UpdateAndSetGameSessionData(INetworkPlayer *pN
// memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE); // memset(m_hostGameSessionData.szPlayers[i],0,XUSER_NAME_SIZE);
// } // }
// } // }
// //
// m_hostGameSessionData.hostPlayerUID = ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetXuid(); // m_hostGameSessionData.hostPlayerUID = ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetXuid();
// m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All); // m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All);
} }
@@ -700,6 +700,7 @@ void CPlatformNetworkManagerStub::SearchForGames()
#ifdef _WINDOWS64 #ifdef _WINDOWS64
std::vector<Win64LANSession> lanSessions = WinsockNetLayer::GetDiscoveredSessions(); std::vector<Win64LANSession> lanSessions = WinsockNetLayer::GetDiscoveredSessions();
//THEY GET DELETED HERE DAMMIT
for (size_t i = 0; i < friendsSessions[0].size(); i++) for (size_t i = 0; i < friendsSessions[0].size(); i++)
delete friendsSessions[0][i]; delete friendsSessions[0][i];
friendsSessions[0].clear(); friendsSessions[0].clear();
@@ -730,6 +731,55 @@ void CPlatformNetworkManagerStub::SearchForGames()
friendsSessions[0].push_back(info); friendsSessions[0].push_back(info);
} }
std::FILE* file = std::fopen("servers.txt", "r");
if (file) {
wstring wline;
int phase = 0;
string ip;
wstring port;
wstring name;
char buffer[512];
while (std::fgets(buffer, sizeof(buffer), file)) {
if (phase == 0) {
ip = buffer;
if (!ip.empty() && (ip.back() == '\n' || ip.back() == '\r'))
ip.pop_back();
phase = 1;
}
else if (phase == 1) {
wline = convStringToWstring(buffer);
port = wline;
phase = 2;
}
else if (phase == 2) {
wline = convStringToWstring(buffer);
name = wline;
phase = 0;
//THEY GET DELETED AFTER USE LIKE 30 LINES UP!!
FriendSessionInfo* info = new FriendSessionInfo();
wchar_t label[128];
wcsncpy_s(label, sizeof(label)/sizeof(wchar_t), name.c_str(), _TRUNCATE);
size_t nameLen = wcslen(label);
info->displayLabel = new wchar_t[nameLen+1];
wcscpy_s(info->displayLabel, nameLen + 1, label);
info->displayLabelLength = (unsigned char)nameLen;
info->displayLabelViewableStartIndex = 0;
info->data.isReadyToJoin = true;
info->data.isJoinable = true;
strncpy_s(info->data.hostIP, sizeof(info->data.hostIP), ip.c_str(), _TRUNCATE);
info->data.hostPort = stoi(port);
info->sessionId = (SessionID)(static_cast<uint64_t>(inet_addr(ip.c_str())) | (static_cast<uint64_t>(stoi(port)) << 32));
friendsSessions[0].push_back(info);
}
}
std::fclose(file);
}
m_searchResultsCount[0] = (int)friendsSessions[0].size(); m_searchResultsCount[0] = (int)friendsSessions[0].size();
if (m_SessionsUpdatedCallback != NULL) if (m_SessionsUpdatedCallback != NULL)
@@ -774,7 +824,7 @@ void CPlatformNetworkManagerStub::GetFullFriendSessionInfo( FriendSessionInfo *f
void CPlatformNetworkManagerStub::ForceFriendsSessionRefresh() void CPlatformNetworkManagerStub::ForceFriendsSessionRefresh()
{ {
app.DebugPrintf("Resetting friends session search data\n"); app.DebugPrintf("Resetting friends session search data\n");
for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
{ {
m_searchResultsCount[i] = 0; m_searchResultsCount[i] = 0;
@@ -795,8 +845,8 @@ INetworkPlayer *CPlatformNetworkManagerStub::addNetworkPlayer(IQNetPlayer *pQNet
void CPlatformNetworkManagerStub::removeNetworkPlayer(IQNetPlayer *pQNetPlayer) void CPlatformNetworkManagerStub::removeNetworkPlayer(IQNetPlayer *pQNetPlayer)
{ {
INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pQNetPlayer); INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pQNetPlayer);
for( AUTO_VAR(it, currentNetworkPlayers.begin()); it != currentNetworkPlayers.end(); it++ ) for (auto it = currentNetworkPlayers.begin(); it != currentNetworkPlayers.end(); it++)
{ {
if( *it == pNetworkPlayer ) if( *it == pNetworkPlayer )
{ {
currentNetworkPlayers.erase(it); currentNetworkPlayers.erase(it);
@@ -813,7 +863,7 @@ INetworkPlayer *CPlatformNetworkManagerStub::getNetworkPlayer(IQNetPlayer *pQNet
INetworkPlayer *CPlatformNetworkManagerStub::GetLocalPlayerByUserIndex(int userIndex ) INetworkPlayer *CPlatformNetworkManagerStub::GetLocalPlayerByUserIndex(int userIndex )
{ {
return getNetworkPlayer(m_pIQNet->GetLocalPlayerByUserIndex(userIndex)); return getNetworkPlayer(m_pIQNet->GetLocalPlayerByUserIndex(userIndex));
} }
INetworkPlayer *CPlatformNetworkManagerStub::GetPlayerByIndex(int playerIndex) INetworkPlayer *CPlatformNetworkManagerStub::GetPlayerByIndex(int playerIndex)

76
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
View File

@@ -7,21 +7,21 @@
CPlatformNetworkManagerSony *g_pPlatformNetworkManager; CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
bool CPlatformNetworkManagerSony::IsLocalGame() bool CPlatformNetworkManagerSony::IsLocalGame()
{ {
return m_bIsOfflineGame; return m_bIsOfflineGame;
} }
bool CPlatformNetworkManagerSony::IsPrivateGame() bool CPlatformNetworkManagerSony::IsPrivateGame()
{ {
return m_bIsPrivateGame; return m_bIsPrivateGame;
} }
bool CPlatformNetworkManagerSony::IsLeavingGame() bool CPlatformNetworkManagerSony::IsLeavingGame()
{ {
return m_bLeavingGame; return m_bLeavingGame;
} }
void CPlatformNetworkManagerSony::ResetLeavingGame() void CPlatformNetworkManagerSony::ResetLeavingGame()
{ {
m_bLeavingGame = false; m_bLeavingGame = false;
} }
@@ -188,9 +188,8 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
{ {
// Do we already have a primary player for this system? // Do we already have a primary player for this system?
bool systemHasPrimaryPlayer = false; bool systemHasPrimaryPlayer = false;
for(AUTO_VAR(it, m_machineSQRPrimaryPlayers.begin()); it < m_machineSQRPrimaryPlayers.end(); ++it) for( SQRNetworkPlayer *pQNetPrimaryPlayer : m_machineSQRPrimaryPlayers )
{ {
SQRNetworkPlayer *pQNetPrimaryPlayer = *it;
if( pSQRPlayer->IsSameSystem(pQNetPrimaryPlayer) ) if( pSQRPlayer->IsSameSystem(pQNetPrimaryPlayer) )
{ {
systemHasPrimaryPlayer = true; systemHasPrimaryPlayer = true;
@@ -202,7 +201,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
} }
} }
g_NetworkManager.PlayerJoining( networkPlayer ); g_NetworkManager.PlayerJoining( networkPlayer );
if( createFakeSocket == true && !m_bHostChanged ) if( createFakeSocket == true && !m_bHostChanged )
{ {
g_NetworkManager.CreateSocket( networkPlayer, localPlayer ); g_NetworkManager.CreateSocket( networkPlayer, localPlayer );
@@ -224,7 +223,7 @@ void CPlatformNetworkManagerSony::HandlePlayerJoined(SQRNetworkPlayer *
g_NetworkManager.UpdateAndSetGameSessionData(); g_NetworkManager.UpdateAndSetGameSessionData();
SystemFlagAddPlayer( networkPlayer ); SystemFlagAddPlayer( networkPlayer );
} }
for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(playerChangedCallback[idx] != NULL) if(playerChangedCallback[idx] != NULL)
@@ -293,7 +292,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
break; break;
} }
} }
AUTO_VAR(it, find( m_machineSQRPrimaryPlayers.begin(), m_machineSQRPrimaryPlayers.end(), pSQRPlayer)); auto it = find( m_machineSQRPrimaryPlayers.begin(), m_machineSQRPrimaryPlayers.end(), pSQRPlayer);
if( it != m_machineSQRPrimaryPlayers.end() ) if( it != m_machineSQRPrimaryPlayers.end() )
{ {
m_machineSQRPrimaryPlayers.erase( it ); m_machineSQRPrimaryPlayers.erase( it );
@@ -309,7 +308,7 @@ void CPlatformNetworkManagerSony::HandlePlayerLeaving(SQRNetworkPlayer *pSQRPlay
} }
g_NetworkManager.PlayerLeaving( networkPlayer ); g_NetworkManager.PlayerLeaving( networkPlayer );
for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(playerChangedCallback[idx] != NULL) if(playerChangedCallback[idx] != NULL)
@@ -374,7 +373,7 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
#ifdef __ORBIS__ #ifdef __ORBIS__
m_pSQRNet = new SQRNetworkManager_Orbis(this); m_pSQRNet = new SQRNetworkManager_Orbis(this);
m_pSQRNet->Initialise(); m_pSQRNet->Initialise();
#elif defined __PS3__ #elif defined __PS3__
m_pSQRNet = new SQRNetworkManager_PS3(this); m_pSQRNet = new SQRNetworkManager_PS3(this);
m_pSQRNet->Initialise(); m_pSQRNet->Initialise();
#else // __PSVITA__ #else // __PSVITA__
@@ -405,7 +404,7 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
{ {
playerChangedCallback[ i ] = NULL; playerChangedCallback[ i ] = NULL;
} }
m_bLeavingGame = false; m_bLeavingGame = false;
m_bLeaveGameOnTick = false; m_bLeaveGameOnTick = false;
m_bHostChanged = false; m_bHostChanged = false;
@@ -419,7 +418,7 @@ bool CPlatformNetworkManagerSony::Initialise(CGameNetworkManager *pGameNetworkMa
m_searchResultsCount = 0; m_searchResultsCount = 0;
m_pSearchResults = NULL; m_pSearchResults = NULL;
m_lastSearchStartTime = 0; m_lastSearchStartTime = 0;
// Success! // Success!
@@ -458,7 +457,7 @@ int CPlatformNetworkManagerSony::CorrectErrorIDS(int IDS)
bool preferSignoutError = false; bool preferSignoutError = false;
int state; int state;
#if defined __PSVITA__ // MGH - to fix devtrack #6258 #if defined __PSVITA__ // MGH - to fix devtrack #6258
if(!ProfileManager.IsSignedInPSN(ProfileManager.GetPrimaryPad())) if(!ProfileManager.IsSignedInPSN(ProfileManager.GetPrimaryPad()))
preferSignoutError = true; preferSignoutError = true;
#elif defined __ORBIS__ #elif defined __ORBIS__
@@ -529,9 +528,8 @@ int CPlatformNetworkManagerSony::CorrectErrorIDS(int IDS)
bool CPlatformNetworkManagerSony::isSystemPrimaryPlayer(SQRNetworkPlayer *pSQRPlayer) bool CPlatformNetworkManagerSony::isSystemPrimaryPlayer(SQRNetworkPlayer *pSQRPlayer)
{ {
bool playerIsSystemPrimary = false; bool playerIsSystemPrimary = false;
for(AUTO_VAR(it, m_machineSQRPrimaryPlayers.begin()); it < m_machineSQRPrimaryPlayers.end(); ++it) for( SQRNetworkPlayer *pSQRPrimaryPlayer : m_machineSQRPrimaryPlayers )
{ {
SQRNetworkPlayer *pSQRPrimaryPlayer = *it;
if( pSQRPrimaryPlayer == pSQRPlayer ) if( pSQRPrimaryPlayer == pSQRPlayer )
{ {
playerIsSystemPrimary = true; playerIsSystemPrimary = true;
@@ -552,7 +550,7 @@ void CPlatformNetworkManagerSony::DoWork()
m_notificationListener, m_notificationListener,
0, // Any notification 0, // Any notification
&dwNotifyId, &dwNotifyId,
&ulpNotifyParam) &ulpNotifyParam)
) )
{ {
@@ -650,7 +648,7 @@ bool CPlatformNetworkManagerSony::IsInStatsEnabledSession()
DWORD dataSize = sizeof(QNET_LIVE_STATS_MODE); DWORD dataSize = sizeof(QNET_LIVE_STATS_MODE);
QNET_LIVE_STATS_MODE statsMode; QNET_LIVE_STATS_MODE statsMode;
m_pIQNet->GetOpt(QNET_OPTION_LIVE_STATS_MODE, &statsMode , &dataSize ); m_pIQNet->GetOpt(QNET_OPTION_LIVE_STATS_MODE, &statsMode , &dataSize );
// Use QNET_LIVE_STATS_MODE_AUTO if there is another way to check if stats are enabled or not // Use QNET_LIVE_STATS_MODE_AUTO if there is another way to check if stats are enabled or not
bool statsEnabled = statsMode == QNET_LIVE_STATS_MODE_ENABLED; bool statsEnabled = statsMode == QNET_LIVE_STATS_MODE_ENABLED;
return m_pIQNet->GetState() != QNET_STATE_IDLE && statsEnabled; return m_pIQNet->GetState() != QNET_STATE_IDLE && statsEnabled;
@@ -732,7 +730,7 @@ bool CPlatformNetworkManagerSony::LeaveGame(bool bMigrateHost)
// If we are the host wait for the game server to end // If we are the host wait for the game server to end
if(m_pSQRNet->IsHost() && g_NetworkManager.ServerStoppedValid()) if(m_pSQRNet->IsHost() && g_NetworkManager.ServerStoppedValid())
{ {
m_pSQRNet->EndGame(); m_pSQRNet->EndGame();
g_NetworkManager.ServerStoppedWait(); g_NetworkManager.ServerStoppedWait();
g_NetworkManager.ServerStoppedDestroy(); g_NetworkManager.ServerStoppedDestroy();
@@ -887,7 +885,7 @@ void CPlatformNetworkManagerSony::UnRegisterPlayerChangedCallback(int iPad, void
void CPlatformNetworkManagerSony::HandleSignInChange() void CPlatformNetworkManagerSony::HandleSignInChange()
{ {
return; return;
} }
bool CPlatformNetworkManagerSony::_RunNetworkGame() bool CPlatformNetworkManagerSony::_RunNetworkGame()
@@ -930,7 +928,7 @@ void CPlatformNetworkManagerSony::UpdateAndSetGameSessionData(INetworkPlayer *pN
{ {
m_hostGameSessionData.hostPlayerUID.setForAdhoc(); m_hostGameSessionData.hostPlayerUID.setForAdhoc();
} }
#endif #endif
m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All); m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All);
@@ -1066,8 +1064,8 @@ bool CPlatformNetworkManagerSony::SystemFlagGet(INetworkPlayer *pNetworkPlayer,
wstring CPlatformNetworkManagerSony::GatherStats() wstring CPlatformNetworkManagerSony::GatherStats()
{ {
#if 0 #if 0
return L"Queue messages: " + _toString(((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_MESSAGES ) ) return L"Queue messages: " + std::to_wstring(((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_MESSAGES ) )
+ L" Queue bytes: " + _toString( ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_BYTES ) ); + L" Queue bytes: " + std::to_wstring( ((NetworkPlayerXbox *)GetHostPlayer())->GetQNetPlayer()->GetSendQueueSize( NULL, QNET_GETSENDQUEUESIZE_BYTES ) );
#else #else
return L""; return L"";
#endif #endif
@@ -1192,7 +1190,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
bool foundSession = false; bool foundSession = false;
FriendSessionInfo *sessionInfo = NULL; FriendSessionInfo *sessionInfo = NULL;
AUTO_VAR(itFriendSession, friendsSessions[iPad].begin()); auto itFriendSession = friendsSessions[iPad].begin();
for(itFriendSession = friendsSessions[iPad].begin(); itFriendSession < friendsSessions[iPad].end(); ++itFriendSession) for(itFriendSession = friendsSessions[iPad].begin(); itFriendSession < friendsSessions[iPad].end(); ++itFriendSession)
{ {
sessionInfo = *itFriendSession; sessionInfo = *itFriendSession;
@@ -1224,7 +1222,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
else else
{ {
swprintf(sessionInfo->displayLabel,app.GetString(IDS_GAME_HOST_NAME_UNKNOWN)); swprintf(sessionInfo->displayLabel,app.GetString(IDS_GAME_HOST_NAME_UNKNOWN));
} }
sessionInfo->displayLabelLength = wcslen( sessionInfo->displayLabel ); sessionInfo->displayLabelLength = wcslen( sessionInfo->displayLabel );
// If this host wasn't disabled use this one. // If this host wasn't disabled use this one.
@@ -1283,7 +1281,7 @@ INetworkPlayer *CPlatformNetworkManagerSony::addNetworkPlayer(SQRNetworkPlayer *
void CPlatformNetworkManagerSony::removeNetworkPlayer(SQRNetworkPlayer *pSQRPlayer) void CPlatformNetworkManagerSony::removeNetworkPlayer(SQRNetworkPlayer *pSQRPlayer)
{ {
INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pSQRPlayer); INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pSQRPlayer);
for( AUTO_VAR(it, currentNetworkPlayers.begin()); it != currentNetworkPlayers.end(); it++ ) for( auto it = currentNetworkPlayers.begin(); it != currentNetworkPlayers.end(); it++ )
{ {
if( *it == pNetworkPlayer ) if( *it == pNetworkPlayer )
{ {
@@ -1301,7 +1299,7 @@ INetworkPlayer *CPlatformNetworkManagerSony::getNetworkPlayer(SQRNetworkPlayer *
INetworkPlayer *CPlatformNetworkManagerSony::GetLocalPlayerByUserIndex(int userIndex ) INetworkPlayer *CPlatformNetworkManagerSony::GetLocalPlayerByUserIndex(int userIndex )
{ {
return getNetworkPlayer(m_pSQRNet->GetLocalPlayerByUserIndex(userIndex)); return getNetworkPlayer(m_pSQRNet->GetLocalPlayerByUserIndex(userIndex));
} }
INetworkPlayer *CPlatformNetworkManagerSony::GetPlayerByIndex(int playerIndex) INetworkPlayer *CPlatformNetworkManagerSony::GetPlayerByIndex(int playerIndex)
@@ -1400,7 +1398,7 @@ bool CPlatformNetworkManagerSony::setAdhocMode( bool bAdhoc )
{ {
if(m_bUsingAdhocMode != bAdhoc) if(m_bUsingAdhocMode != bAdhoc)
{ {
m_bUsingAdhocMode = bAdhoc; m_bUsingAdhocMode = bAdhoc;
if(m_bUsingAdhocMode) if(m_bUsingAdhocMode)
{ {
// uninit the PSN, and init adhoc // uninit the PSN, and init adhoc
@@ -1419,14 +1417,14 @@ bool CPlatformNetworkManagerSony::setAdhocMode( bool bAdhoc )
else else
{ {
if(m_pSQRNet_Vita_Adhoc->IsInitialised()) if(m_pSQRNet_Vita_Adhoc->IsInitialised())
{ {
int ret = sceNetCtlAdhocDisconnect(); int ret = sceNetCtlAdhocDisconnect();
// uninit the adhoc, and init psn // uninit the adhoc, and init psn
m_pSQRNet_Vita_Adhoc->UnInitialise(); m_pSQRNet_Vita_Adhoc->UnInitialise();
} }
if(m_pSQRNet_Vita->IsInitialised()==false) if(m_pSQRNet_Vita->IsInitialised()==false)
{ {
m_pSQRNet_Vita->Initialise(); m_pSQRNet_Vita->Initialise();
} }

57
Minecraft.Client/Common/PostProcesser.h Normal file
View File

@@ -0,0 +1,57 @@
#pragma once
#include <d3d11.h>
class PostProcesser
{
public:
static PostProcesser& GetInstance()
{
static PostProcesser instance;
return instance;
}
void Init();
void Apply() const;
void SetViewport(const D3D11_VIEWPORT& viewport);
void ResetViewport();
void CopyBackbuffer(); // Copy backbuffer once before multi-pass gamma
void ApplyFromCopied() const; // Apply gamma using already-copied offscreen texture
void Cleanup();
void SetGamma(float gamma);
float GetGamma() const { return m_gamma; }
PostProcesser(const PostProcesser&) = delete;
PostProcesser& operator=(const PostProcesser&) = delete;
private:
PostProcesser();
~PostProcesser();
static bool IsRunningUnderWine();
ID3D11Texture2D* m_pGammaOffscreenTex = nullptr;
ID3D11ShaderResourceView* m_pGammaOffscreenSRV = nullptr;
ID3D11RenderTargetView* m_pGammaOffscreenRTV = nullptr;
ID3D11VertexShader* m_pGammaVS = nullptr;
ID3D11PixelShader* m_pGammaPS = nullptr;
ID3D11Buffer* m_pGammaCB = nullptr;
ID3D11SamplerState* m_pGammaSampler = nullptr;
ID3D11RasterizerState* m_pGammaRastState = nullptr;
ID3D11DepthStencilState* m_pGammaDepthState = nullptr;
ID3D11BlendState* m_pGammaBlendState = nullptr;
bool m_initialized = false;
float m_gamma = 1.0f;
bool m_wineMode = false;
D3D11_VIEWPORT m_customViewport;
bool m_useCustomViewport = false;
struct GammaCBData
{
float gamma;
float pad[3];
};
static const char* g_gammaVSCode;
static const char* g_gammaPSCode;
};

3
Minecraft.Client/Common/Tutorial/AreaTask.cpp
View File

@@ -23,9 +23,8 @@ bool AreaTask::isCompleted()
case eAreaTaskCompletion_CompleteOnConstraintsSatisfied: case eAreaTaskCompletion_CompleteOnConstraintsSatisfied:
{ {
bool allSatisfied = true; bool allSatisfied = true;
for(AUTO_VAR(it, constraints.begin()); it != constraints.end(); ++it) for( auto& constraint : constraints )
{ {
TutorialConstraint *constraint = *it;
if(!constraint->isConstraintSatisfied(tutorial->getPad())) if(!constraint->isConstraintSatisfied(tutorial->getPad()))
{ {
allSatisfied = false; allSatisfied = false;

16
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View File

@@ -53,15 +53,15 @@ bool ControllerTask::isCompleted()
if(m_bHasSouthpaw && app.GetGameSettings(pMinecraft->player->GetXboxPad(),eGameSetting_ControlSouthPaw)) if(m_bHasSouthpaw && app.GetGameSettings(pMinecraft->player->GetXboxPad(),eGameSetting_ControlSouthPaw))
{ {
for(AUTO_VAR(it, southpawCompletedMappings.begin()); it != southpawCompletedMappings.end(); ++it) for (auto& it : southpawCompletedMappings )
{ {
bool current = (*it).second; bool current = it.second;
if(!current) if(!current)
{ {
// TODO Use a different pad // TODO Use a different pad
if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0 ) if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), it.first) > 0 )
{ {
(*it).second = true; it.second = true;
m_uiCompletionMask|=1<<iCurrent; m_uiCompletionMask|=1<<iCurrent;
} }
else else
@@ -78,15 +78,15 @@ bool ControllerTask::isCompleted()
} }
else else
{ {
for(AUTO_VAR(it, completedMappings.begin()); it != completedMappings.end(); ++it) for (auto& it : completedMappings )
{ {
bool current = (*it).second; bool current = it.second;
if(!current) if(!current)
{ {
// TODO Use a different pad // TODO Use a different pad
if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0 ) if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), it.first) > 0 )
{ {
(*it).second = true; it.second = true;
m_uiCompletionMask|=1<<iCurrent; m_uiCompletionMask|=1<<iCurrent;
} }
else else

22
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View File

@@ -37,7 +37,7 @@ bool InfoTask::isCompleted()
return false; return false;
bool bAllComplete = true; bool bAllComplete = true;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
// If the player is under water then allow all keypresses so they can jump out // If the player is under water then allow all keypresses so they can jump out
@@ -47,9 +47,9 @@ bool InfoTask::isCompleted()
{ {
// If a menu is displayed, then we use the handleUIInput to complete the task // If a menu is displayed, then we use the handleUIInput to complete the task
bAllComplete = true; bAllComplete = true;
for(AUTO_VAR(it, completedMappings.begin()); it != completedMappings.end(); ++it) for( auto& it : completedMappings )
{ {
bool current = (*it).second; bool current = it.second;
if(!current) if(!current)
{ {
bAllComplete = false; bAllComplete = false;
@@ -61,18 +61,18 @@ bool InfoTask::isCompleted()
{ {
int iCurrent=0; int iCurrent=0;
for(AUTO_VAR(it, completedMappings.begin()); it != completedMappings.end(); ++it) for( auto& it : completedMappings )
{ {
bool current = (*it).second; bool current = it.second;
if(!current) if(!current)
{ {
#ifdef _WINDOWS64 #ifdef _WINDOWS64
if (InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0 || g_KBMInput.IsKeyDown(VK_SPACE)) if (InputManager.GetValue(pMinecraft->player->GetXboxPad(), it.first) > 0 || g_KBMInput.IsKeyDown(VK_SPACE))
#else #else
if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), (*it).first) > 0) if( InputManager.GetValue(pMinecraft->player->GetXboxPad(), it.first) > 0)
#endif #endif
{ {
(*it).second = true; it.second = true;
bAllComplete=true; bAllComplete=true;
} }
else else
@@ -111,11 +111,11 @@ void InfoTask::handleUIInput(int iAction)
{ {
if(bHasBeenActivated) if(bHasBeenActivated)
{ {
for(AUTO_VAR(it, completedMappings.begin()); it != completedMappings.end(); ++it) for( auto& it : completedMappings )
{ {
if( iAction == (*it).first ) if( iAction == it.first )
{ {
(*it).second = true; it.second = true;
} }
} }
} }

69
Minecraft.Client/Common/Tutorial/ProcedureCompoundTask.cpp
View File

@@ -3,8 +3,8 @@
ProcedureCompoundTask::~ProcedureCompoundTask() ProcedureCompoundTask::~ProcedureCompoundTask()
{ {
for(AUTO_VAR(it, m_taskSequence.begin()); it < m_taskSequence.end(); ++it) for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it)
{ {
delete (*it); delete (*it);
} }
} }
@@ -24,10 +24,8 @@ int ProcedureCompoundTask::getDescriptionId()
// Return the id of the first task not completed // Return the id of the first task not completed
int descriptionId = -1; int descriptionId = -1;
AUTO_VAR(itEnd, m_taskSequence.end()); for (auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it) {
{
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
task->setAsCurrentTask(true); task->setAsCurrentTask(true);
@@ -50,10 +48,8 @@ int ProcedureCompoundTask::getPromptId()
// Return the id of the first task not completed // Return the id of the first task not completed
int promptId = -1; int promptId = -1;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
promptId = task->getPromptId(); promptId = task->getPromptId();
@@ -69,11 +65,8 @@ bool ProcedureCompoundTask::isCompleted()
bool allCompleted = true; bool allCompleted = true;
bool isCurrentTask = true; bool isCurrentTask = true;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(allCompleted && isCurrentTask) if(allCompleted && isCurrentTask)
{ {
if(task->isCompleted()) if(task->isCompleted())
@@ -99,11 +92,9 @@ bool ProcedureCompoundTask::isCompleted()
if(allCompleted) if(allCompleted)
{ {
//Disable all constraints // Disable all constraints
itEnd = m_taskSequence.end(); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->enableConstraints(false); task->enableConstraints(false);
} }
} }
@@ -113,20 +104,16 @@ bool ProcedureCompoundTask::isCompleted()
void ProcedureCompoundTask::onCrafted(shared_ptr<ItemInstance> item) void ProcedureCompoundTask::onCrafted(shared_ptr<ItemInstance> item)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->onCrafted(item); task->onCrafted(item);
} }
} }
void ProcedureCompoundTask::handleUIInput(int iAction) void ProcedureCompoundTask::handleUIInput(int iAction)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->handleUIInput(iAction); task->handleUIInput(iAction);
} }
} }
@@ -135,10 +122,8 @@ void ProcedureCompoundTask::handleUIInput(int iAction)
void ProcedureCompoundTask::setAsCurrentTask(bool active /*= true*/) void ProcedureCompoundTask::setAsCurrentTask(bool active /*= true*/)
{ {
bool allCompleted = true; bool allCompleted = true;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(allCompleted && !task->isCompleted()) if(allCompleted && !task->isCompleted())
{ {
task->setAsCurrentTask(true); task->setAsCurrentTask(true);
@@ -157,10 +142,8 @@ bool ProcedureCompoundTask::ShowMinimumTime()
return false; return false;
bool showMinimumTime = false; bool showMinimumTime = false;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
showMinimumTime = task->ShowMinimumTime(); showMinimumTime = task->ShowMinimumTime();
@@ -176,10 +159,8 @@ bool ProcedureCompoundTask::hasBeenActivated()
return true; return true;
bool hasBeenActivated = false; bool hasBeenActivated = false;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
hasBeenActivated = task->hasBeenActivated(); hasBeenActivated = task->hasBeenActivated();
@@ -191,10 +172,8 @@ bool ProcedureCompoundTask::hasBeenActivated()
void ProcedureCompoundTask::setShownForMinimumTime() void ProcedureCompoundTask::setShownForMinimumTime()
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
task->setShownForMinimumTime(); task->setShownForMinimumTime();
@@ -209,10 +188,8 @@ bool ProcedureCompoundTask::AllowFade()
return true; return true;
bool allowFade = true; bool allowFade = true;
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
if(!task->isCompleted()) if(!task->isCompleted())
{ {
allowFade = task->AllowFade(); allowFade = task->AllowFade();
@@ -224,40 +201,32 @@ bool ProcedureCompoundTask::AllowFade()
void ProcedureCompoundTask::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly) void ProcedureCompoundTask::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->useItemOn(level, item, x, y, z, bTestUseOnly); task->useItemOn(level, item, x, y, z, bTestUseOnly);
} }
} }
void ProcedureCompoundTask::useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly) void ProcedureCompoundTask::useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->useItem(item, bTestUseOnly); task->useItem(item, bTestUseOnly);
} }
} }
void ProcedureCompoundTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux) void ProcedureCompoundTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->onTake(item, invItemCountAnyAux, invItemCountThisAux); task->onTake(item, invItemCountAnyAux, invItemCountThisAux);
} }
} }
void ProcedureCompoundTask::onStateChange(eTutorial_State newState) void ProcedureCompoundTask::onStateChange(eTutorial_State newState)
{ {
AUTO_VAR(itEnd, m_taskSequence.end()); for(auto& task : m_taskSequence)
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
{ {
TutorialTask *task = *it;
task->onStateChange(newState); task->onStateChange(newState);
} }
} }

227
Minecraft.Client/Common/Tutorial/Tutorial.cpp
View File

@@ -41,7 +41,7 @@ bool Tutorial::PopupMessageDetails::isSameContent(PopupMessageDetails *other)
void Tutorial::staticCtor() void Tutorial::staticCtor()
{ {
// //
/* /*
***** *****
***** *****
@@ -72,7 +72,7 @@ void Tutorial::staticCtor()
s_completableTasks.push_back( e_Tutorial_State_Enchanting ); s_completableTasks.push_back( e_Tutorial_State_Enchanting );
s_completableTasks.push_back( e_Tutorial_Hint_Hold_To_Mine ); s_completableTasks.push_back( e_Tutorial_Hint_Hold_To_Mine );
s_completableTasks.push_back( e_Tutorial_Hint_Tool_Damaged ); s_completableTasks.push_back( e_Tutorial_Hint_Tool_Damaged );
s_completableTasks.push_back( e_Tutorial_Hint_Swim_Up ); s_completableTasks.push_back( e_Tutorial_Hint_Swim_Up );
s_completableTasks.push_back( e_Tutorial_Hint_Unused_2 ); s_completableTasks.push_back( e_Tutorial_Hint_Unused_2 );
@@ -164,7 +164,7 @@ void Tutorial::staticCtor()
s_completableTasks.push_back( e_Tutorial_Hint_Thin_Glass ); s_completableTasks.push_back( e_Tutorial_Hint_Thin_Glass );
s_completableTasks.push_back( e_Tutorial_Hint_Melon ); s_completableTasks.push_back( e_Tutorial_Hint_Melon );
s_completableTasks.push_back( e_Tutorial_Hint_Vine ); s_completableTasks.push_back( e_Tutorial_Hint_Vine );
s_completableTasks.push_back( e_Tutorial_Hint_Fence_Gate ); s_completableTasks.push_back( e_Tutorial_Hint_Fence_Gate );
s_completableTasks.push_back( e_Tutorial_Hint_Mycel ); s_completableTasks.push_back( e_Tutorial_Hint_Mycel );
s_completableTasks.push_back( e_Tutorial_Hint_Water_Lily ); s_completableTasks.push_back( e_Tutorial_Hint_Water_Lily );
s_completableTasks.push_back( e_Tutorial_Hint_Nether_Brick ); s_completableTasks.push_back( e_Tutorial_Hint_Nether_Brick );
@@ -319,7 +319,7 @@ void Tutorial::staticCtor()
s_completableTasks.push_back( e_Tutorial_State_Enderchests ); s_completableTasks.push_back( e_Tutorial_State_Enderchests );
s_completableTasks.push_back( e_Tutorial_State_Horse_Menu ); s_completableTasks.push_back( e_Tutorial_State_Horse_Menu );
s_completableTasks.push_back( e_Tutorial_State_Hopper_Menu ); s_completableTasks.push_back( e_Tutorial_State_Hopper_Menu );
s_completableTasks.push_back( e_Tutorial_Hint_Wither ); s_completableTasks.push_back( e_Tutorial_Hint_Wither );
s_completableTasks.push_back( e_Tutorial_Hint_Witch ); s_completableTasks.push_back( e_Tutorial_Hint_Witch );
s_completableTasks.push_back( e_Tutorial_Hint_Bat ); s_completableTasks.push_back( e_Tutorial_Hint_Bat );
@@ -470,7 +470,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
if(!isHintCompleted(e_Tutorial_Hint_Detector_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Detector_Rail, this, detectorRailItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_Detector_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Detector_Rail, this, detectorRailItems, 1 ) );
int tallGrassItems[] = {Tile::tallgrass_Id}; int tallGrassItems[] = {Tile::tallgrass_Id};
if(!isHintCompleted(e_Tutorial_Hint_Tall_Grass)) if(!isHintCompleted(e_Tutorial_Hint_Tall_Grass))
{ {
addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tall_Grass, this, tallGrassItems, 1, -1, TallGrass::DEAD_SHRUB ) ); addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tall_Grass, this, tallGrassItems, 1, -1, TallGrass::DEAD_SHRUB ) );
addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tall_Grass, this, tallGrassItems, 1, -1, TallGrass::TALL_GRASS ) ); addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tall_Grass, this, tallGrassItems, 1, -1, TallGrass::TALL_GRASS ) );
@@ -753,46 +753,46 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
int potatoItems[] = {Tile::potatoes_Id}; int potatoItems[] = {Tile::potatoes_Id};
if(!isHintCompleted(e_Tutorial_Hint_Potato)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Potato, this, potatoItems, 1, -1, -1, 7 ) ); if(!isHintCompleted(e_Tutorial_Hint_Potato)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Potato, this, potatoItems, 1, -1, -1, 7 ) );
int carrotItems[] = {Tile::carrots_Id}; int carrotItems[] = {Tile::carrots_Id};
if(!isHintCompleted(e_Tutorial_Hint_Carrot)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Carrot, this, carrotItems, 1, -1, -1, 7 ) ); if(!isHintCompleted(e_Tutorial_Hint_Carrot)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Carrot, this, carrotItems, 1, -1, -1, 7 ) );
int commandBlockItems[] = {Tile::commandBlock_Id}; int commandBlockItems[] = {Tile::commandBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_CommandBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CommandBlock, this, commandBlockItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_CommandBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CommandBlock, this, commandBlockItems, 1 ) );
int beaconItems[] = {Tile::beacon_Id}; int beaconItems[] = {Tile::beacon_Id};
if(!isHintCompleted(e_Tutorial_Hint_Beacon)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Beacon, this, beaconItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_Beacon)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Beacon, this, beaconItems, 1 ) );
int activatorRailItems[] = {Tile::activatorRail_Id}; int activatorRailItems[] = {Tile::activatorRail_Id};
if(!isHintCompleted(e_Tutorial_Hint_Activator_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Activator_Rail, this, activatorRailItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_Activator_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Activator_Rail, this, activatorRailItems, 1 ) );
int redstoneBlockItems[] = {Tile::redstoneBlock_Id}; int redstoneBlockItems[] = {Tile::redstoneBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_RedstoneBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_RedstoneBlock, this, redstoneBlockItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_RedstoneBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_RedstoneBlock, this, redstoneBlockItems, 1 ) );
int daylightDetectorItems[] = {Tile::daylightDetector_Id}; int daylightDetectorItems[] = {Tile::daylightDetector_Id};
if(!isHintCompleted(e_Tutorial_Hint_DaylightDetector)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_DaylightDetector, this, daylightDetectorItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_DaylightDetector)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_DaylightDetector, this, daylightDetectorItems, 1 ) );
int dropperItems[] = {Tile::dropper_Id}; int dropperItems[] = {Tile::dropper_Id};
if(!isHintCompleted(e_Tutorial_Hint_Dropper)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Dropper, this, dropperItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_Dropper)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Dropper, this, dropperItems, 1 ) );
int hopperItems[] = {Tile::hopper_Id}; int hopperItems[] = {Tile::hopper_Id};
if(!isHintCompleted(e_Tutorial_Hint_Hopper)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Hopper, this, hopperItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_Hopper)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Hopper, this, hopperItems, 1 ) );
int comparatorItems[] = {Tile::comparator_off_Id, Tile::comparator_on_Id}; int comparatorItems[] = {Tile::comparator_off_Id, Tile::comparator_on_Id};
if(!isHintCompleted(e_Tutorial_Hint_Comparator)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Comparator, this, comparatorItems, 2, Item::comparator_Id ) ); if(!isHintCompleted(e_Tutorial_Hint_Comparator)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Comparator, this, comparatorItems, 2, Item::comparator_Id ) );
int trappedChestItems[] = {Tile::chest_trap_Id}; int trappedChestItems[] = {Tile::chest_trap_Id};
if(!isHintCompleted(e_Tutorial_Hint_ChestTrap)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ChestTrap, this, trappedChestItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_ChestTrap)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ChestTrap, this, trappedChestItems, 1 ) );
int hayBlockItems[] = {Tile::hayBlock_Id}; int hayBlockItems[] = {Tile::hayBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_HayBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_HayBlock, this, hayBlockItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_HayBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_HayBlock, this, hayBlockItems, 1 ) );
int clayHardenedItems[] = {Tile::clayHardened_Id}; int clayHardenedItems[] = {Tile::clayHardened_Id};
if(!isHintCompleted(e_Tutorial_Hint_ClayHardened)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardened, this, clayHardenedItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_ClayHardened)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardened, this, clayHardenedItems, 1 ) );
int clayHardenedColoredItems[] = {Tile::clayHardened_colored_Id}; int clayHardenedColoredItems[] = {Tile::clayHardened_colored_Id};
if(!isHintCompleted(e_Tutorial_Hint_ClayHardenedColored)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardenedColored, this, clayHardenedColoredItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_ClayHardenedColored)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardenedColored, this, clayHardenedColoredItems, 1 ) );
int coalBlockItems[] = {Tile::coalBlock_Id}; int coalBlockItems[] = {Tile::coalBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) ); if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) );
@@ -1000,9 +1000,9 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
* HORSE ENCOUNTER * HORSE ENCOUNTER
* *
*/ */
if(isFullTutorial || !isStateCompleted(e_Tutorial_State_Horse) ) if(isFullTutorial || !isStateCompleted(e_Tutorial_State_Horse) )
{ {
addTask(e_Tutorial_State_Horse, addTask(e_Tutorial_State_Horse,
new HorseChoiceTask(this, IDS_TUTORIAL_TASK_HORSE_OVERVIEW, IDS_TUTORIAL_TASK_DONKEY_OVERVIEW, IDS_TUTORIAL_TASK_MULE_OVERVIEW, IDS_TUTORIAL_PROMPT_HORSE_OVERVIEW, new HorseChoiceTask(this, IDS_TUTORIAL_TASK_HORSE_OVERVIEW, IDS_TUTORIAL_TASK_DONKEY_OVERVIEW, IDS_TUTORIAL_TASK_MULE_OVERVIEW, IDS_TUTORIAL_PROMPT_HORSE_OVERVIEW,
true, ACTION_MENU_A, ACTION_MENU_B, e_Tutorial_Completion_Complete_State_Gameplay_Constraints, eTelemetryTutorial_Horse) ); true, ACTION_MENU_A, ACTION_MENU_B, e_Tutorial_Completion_Complete_State_Gameplay_Constraints, eTelemetryTutorial_Horse) );
@@ -1144,23 +1144,23 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
Tutorial::~Tutorial() Tutorial::~Tutorial()
{ {
for(AUTO_VAR(it, m_globalConstraints.begin()); it != m_globalConstraints.end(); ++it) for(auto& it : m_globalConstraints)
{ {
delete (*it); delete it;
} }
for(unordered_map<int, TutorialMessage *>::iterator it = messages.begin(); it != messages.end(); ++it) for(auto& message : messages)
{ {
delete (*it).second; delete message.second;
} }
for(unsigned int i = 0; i < e_Tutorial_State_Max; ++i) for(unsigned int i = 0; i < e_Tutorial_State_Max; ++i)
{ {
for(AUTO_VAR(it, activeTasks[i].begin()); it < activeTasks[i].end(); ++it) for(auto& it : activeTasks[i])
{ {
delete (*it); delete it;
} }
for(AUTO_VAR(it, hints[i].begin()); it < hints[i].end(); ++it) for(auto& it : hints[i])
{ {
delete (*it); delete it;
} }
currentTask[i] = NULL; currentTask[i] = NULL;
@@ -1188,10 +1188,10 @@ void Tutorial::setCompleted( int completableId )
int completableIndex = -1; int completableIndex = -1;
for( AUTO_VAR(it, s_completableTasks.begin()); it < s_completableTasks.end(); ++it) for (int task : s_completableTasks)
{ {
++completableIndex; ++completableIndex;
if( *it == completableId ) if( task == completableId )
{ {
break; break;
} }
@@ -1220,10 +1220,10 @@ bool Tutorial::getCompleted( int completableId )
//} //}
int completableIndex = -1; int completableIndex = -1;
for( AUTO_VAR(it, s_completableTasks.begin()); it < s_completableTasks.end(); ++it) for (int it : s_completableTasks)
{ {
++completableIndex; ++completableIndex;
if( *it == completableId ) if( it == completableId )
{ {
break; break;
} }
@@ -1318,8 +1318,8 @@ void Tutorial::tick()
for(unsigned int state = 0; state < e_Tutorial_State_Max; ++state) for(unsigned int state = 0; state < e_Tutorial_State_Max; ++state)
{ {
AUTO_VAR(it, constraintsToRemove[state].begin()); auto it = constraintsToRemove[state].begin();
while(it < constraintsToRemove[state].end() ) while(it != constraintsToRemove[state].end() )
{ {
++(*it).second; ++(*it).second;
if( (*it).second > m_iTutorialConstraintDelayRemoveTicks ) if( (*it).second > m_iTutorialConstraintDelayRemoveTicks )
@@ -1361,7 +1361,7 @@ void Tutorial::tick()
} }
if(!m_allowShow) if(!m_allowShow)
{ {
if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) ) if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
{ {
uiTempDisabled = true; uiTempDisabled = true;
@@ -1397,7 +1397,7 @@ void Tutorial::tick()
app.TutorialSceneNavigateBack(m_iPad); app.TutorialSceneNavigateBack(m_iPad);
m_bSceneIsSplitscreen=app.GetLocalPlayerCount()>1; m_bSceneIsSplitscreen=app.GetLocalPlayerCount()>1;
if(m_bSceneIsSplitscreen) if(m_bSceneIsSplitscreen)
{ {
app.NavigateToScene(m_iPad, eUIComponent_TutorialPopup,(void *)this, false, false, &m_hTutorialScene); app.NavigateToScene(m_iPad, eUIComponent_TutorialPopup,(void *)this, false, false, &m_hTutorialScene);
} }
else else
@@ -1427,9 +1427,8 @@ void Tutorial::tick()
} }
// Check constraints // Check constraints
for(AUTO_VAR(it, m_globalConstraints.begin()); it < m_globalConstraints.end(); ++it) for (auto& constraint : m_globalConstraints)
{ {
TutorialConstraint *constraint = *it;
constraint->tick(m_iPad); constraint->tick(m_iPad);
} }
@@ -1443,9 +1442,8 @@ void Tutorial::tick()
if(hintsOn) if(hintsOn)
{ {
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for (auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->tick(); hintNeeded = hint->tick();
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1469,9 +1467,8 @@ void Tutorial::tick()
constraintChanged = true; constraintChanged = true;
currentFailedConstraint[m_CurrentState] = NULL; currentFailedConstraint[m_CurrentState] = NULL;
} }
for(AUTO_VAR(it, constraints[m_CurrentState].begin()); it < constraints[m_CurrentState].end(); ++it) for (auto& constraint : constraints[m_CurrentState])
{ {
TutorialConstraint *constraint = *it;
if( !constraint->isConstraintSatisfied(m_iPad) && constraint->isConstraintRestrictive(m_iPad) ) if( !constraint->isConstraintSatisfied(m_iPad) && constraint->isConstraintRestrictive(m_iPad) )
{ {
constraintChanged = true; constraintChanged = true;
@@ -1484,15 +1481,15 @@ void Tutorial::tick()
{ {
// Update tasks // Update tasks
bool isCurrentTask = true; bool isCurrentTask = true;
AUTO_VAR(it, activeTasks[m_CurrentState].begin()); auto it = activeTasks[m_CurrentState].begin();
while(activeTasks[m_CurrentState].size() > 0 && it < activeTasks[m_CurrentState].end()) while(activeTasks[m_CurrentState].size() > 0 && it != activeTasks[m_CurrentState].end())
{ {
TutorialTask *task = *it; TutorialTask *task = *it;
if( isCurrentTask || task->isPreCompletionEnabled() ) if( isCurrentTask || task->isPreCompletionEnabled() )
{ {
isCurrentTask = false; isCurrentTask = false;
if( if(
( !task->ShowMinimumTime() || ( task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() ) ) ( !task->ShowMinimumTime() || ( task->hasBeenActivated() && (lastMessageTime + m_iTutorialMinimumDisplayMessageTime ) < GetTickCount() ) )
&& task->isCompleted() && task->isCompleted()
) )
{ {
@@ -1509,8 +1506,8 @@ void Tutorial::tick()
{ {
// 4J Stu - Move the delayed constraints to the gameplay state so that they are in // 4J Stu - Move the delayed constraints to the gameplay state so that they are in
// effect for a bit longer // effect for a bit longer
AUTO_VAR(itCon, constraintsToRemove[m_CurrentState].begin()); auto itCon = constraintsToRemove[m_CurrentState].begin();
while(itCon != constraintsToRemove[m_CurrentState].end() ) while(itCon != constraintsToRemove[m_CurrentState].end() )
{ {
constraints[e_Tutorial_State_Gameplay].push_back(itCon->first); constraints[e_Tutorial_State_Gameplay].push_back(itCon->first);
constraintsToRemove[e_Tutorial_State_Gameplay].push_back( pair<TutorialConstraint *, unsigned char>(itCon->first, itCon->second) ); constraintsToRemove[e_Tutorial_State_Gameplay].push_back( pair<TutorialConstraint *, unsigned char>(itCon->first, itCon->second) );
@@ -1521,9 +1518,9 @@ void Tutorial::tick()
} }
// Fall through the the normal complete state // Fall through the the normal complete state
case e_Tutorial_Completion_Complete_State: case e_Tutorial_Completion_Complete_State:
for(AUTO_VAR(itRem, activeTasks[m_CurrentState].begin()); itRem < activeTasks[m_CurrentState].end(); ++itRem) for (auto& itRem : activeTasks[m_CurrentState])
{ {
delete (*itRem); delete itRem;
} }
activeTasks[m_CurrentState].clear(); activeTasks[m_CurrentState].clear();
break; break;
@@ -1531,9 +1528,9 @@ void Tutorial::tick()
{ {
TutorialTask *lastTask = activeTasks[m_CurrentState].at( activeTasks[m_CurrentState].size() - 1 ); TutorialTask *lastTask = activeTasks[m_CurrentState].at( activeTasks[m_CurrentState].size() - 1 );
activeTasks[m_CurrentState].pop_back(); activeTasks[m_CurrentState].pop_back();
for(AUTO_VAR(itRem, activeTasks[m_CurrentState].begin()); itRem < activeTasks[m_CurrentState].end(); ++itRem) for(auto& itRem : activeTasks[m_CurrentState])
{ {
delete (*itRem); delete itRem;
} }
activeTasks[m_CurrentState].clear(); activeTasks[m_CurrentState].clear();
activeTasks[m_CurrentState].push_back( lastTask ); activeTasks[m_CurrentState].push_back( lastTask );
@@ -1636,7 +1633,7 @@ void Tutorial::tick()
message->m_promptId = currentTask[m_CurrentState]->getPromptId(); message->m_promptId = currentTask[m_CurrentState]->getPromptId();
message->m_allowFade = currentTask[m_CurrentState]->AllowFade(); message->m_allowFade = currentTask[m_CurrentState]->AllowFade();
setMessage( message ); setMessage( message );
currentTask[m_CurrentState]->TaskReminders()? m_iTaskReminders = 1 : m_iTaskReminders = 0; currentTask[m_CurrentState]->TaskReminders()? m_iTaskReminders = 1 : m_iTaskReminders = 0;
} }
else else
{ {
@@ -1697,8 +1694,8 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
} }
else else
{ {
AUTO_VAR(it, messages.find(message->m_messageId)); auto it = messages.find(message->m_messageId);
if( it != messages.end() && it->second != NULL ) if( it != messages.end() && it->second != NULL )
{ {
TutorialMessage *messageString = it->second; TutorialMessage *messageString = it->second;
text = wstring( messageString->getMessageForDisplay() ); text = wstring( messageString->getMessageForDisplay() );
@@ -1727,8 +1724,8 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
} }
else if(message->m_promptId >= 0) else if(message->m_promptId >= 0)
{ {
AUTO_VAR(it, messages.find(message->m_promptId)); auto it = messages.find(message->m_promptId);
if(it != messages.end() && it->second != NULL) if(it != messages.end() && it->second != NULL)
{ {
TutorialMessage *prompt = it->second; TutorialMessage *prompt = it->second;
text.append( prompt->getMessageForDisplay() ); text.append( prompt->getMessageForDisplay() );
@@ -1781,7 +1778,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
bool messageShown = false; bool messageShown = false;
DWORD time = GetTickCount(); DWORD time = GetTickCount();
if(message != NULL && (message->m_forceDisplay || hintsOn) && if(message != NULL && (message->m_forceDisplay || hintsOn) &&
(!message->m_delay || (!message->m_delay ||
( (
(m_hintDisplayed && (time - m_lastHintDisplayedTime) > m_iTutorialHintDelayTime ) || (m_hintDisplayed && (time - m_lastHintDisplayedTime) > m_iTutorialHintDelayTime ) ||
(!m_hintDisplayed && (time - lastMessageTime) > m_iTutorialMinimumDisplayMessageTime ) (!m_hintDisplayed && (time - lastMessageTime) > m_iTutorialMinimumDisplayMessageTime )
@@ -1793,7 +1790,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
if(messageShown) if(messageShown)
{ {
m_lastHintDisplayedTime = time; m_lastHintDisplayedTime = time;
m_hintDisplayed = true; m_hintDisplayed = true;
if(hint!=NULL) setHintCompleted( hint ); if(hint!=NULL) setHintCompleted( hint );
} }
@@ -1817,7 +1814,7 @@ void Tutorial::showTutorialPopup(bool show)
m_allowShow = show; m_allowShow = show;
if(!show) if(!show)
{ {
if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) ) if( currentTask[m_CurrentState] != NULL && (!currentTask[m_CurrentState]->AllowFade() || (lastMessageTime + m_iTutorialDisplayMessageTime ) > GetTickCount() ) )
{ {
uiTempDisabled = true; uiTempDisabled = true;
@@ -1828,36 +1825,32 @@ void Tutorial::showTutorialPopup(bool show)
void Tutorial::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly) void Tutorial::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly)
{ {
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it) for(auto& task : activeTasks[m_CurrentState])
{ {
TutorialTask *task = *it;
task->useItemOn(level, item, x, y, z, bTestUseOnly); task->useItemOn(level, item, x, y, z, bTestUseOnly);
} }
} }
void Tutorial::useItemOn(shared_ptr<ItemInstance> item, bool bTestUseOnly) void Tutorial::useItemOn(shared_ptr<ItemInstance> item, bool bTestUseOnly)
{ {
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it) for(auto& task : activeTasks[m_CurrentState])
{ {
TutorialTask *task = *it;
task->useItem(item, bTestUseOnly); task->useItem(item, bTestUseOnly);
} }
} }
void Tutorial::completeUsingItem(shared_ptr<ItemInstance> item) void Tutorial::completeUsingItem(shared_ptr<ItemInstance> item)
{ {
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it) for(auto task : activeTasks[m_CurrentState])
{ {
TutorialTask *task = *it;
task->completeUsingItem(item); task->completeUsingItem(item);
} }
// Fix for #46922 - TU5: UI: Player receives a reminder that he is hungry while "hunger bar" is full (triggered in split-screen mode) // Fix for #46922 - TU5: UI: Player receives a reminder that he is hungry while "hunger bar" is full (triggered in split-screen mode)
if(m_CurrentState != e_Tutorial_State_Gameplay) if(m_CurrentState != e_Tutorial_State_Gameplay)
{ {
for(AUTO_VAR(it, activeTasks[e_Tutorial_State_Gameplay].begin()); it < activeTasks[e_Tutorial_State_Gameplay].end(); ++it) for(auto task : activeTasks[e_Tutorial_State_Gameplay])
{ {
TutorialTask *task = *it;
task->completeUsingItem(item); task->completeUsingItem(item);
} }
} }
@@ -1866,9 +1859,8 @@ void Tutorial::completeUsingItem(shared_ptr<ItemInstance> item)
void Tutorial::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile) void Tutorial::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
{ {
int hintNeeded = -1; int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->startDestroyBlock(item, tile); hintNeeded = hint->startDestroyBlock(item, tile);
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1877,16 +1869,14 @@ void Tutorial::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
setMessage( hint, message ); setMessage( hint, message );
break; break;
} }
} }
} }
void Tutorial::destroyBlock(Tile *tile) void Tutorial::destroyBlock(Tile *tile)
{ {
int hintNeeded = -1; int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->destroyBlock(tile); hintNeeded = hint->destroyBlock(tile);
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1895,16 +1885,14 @@ void Tutorial::destroyBlock(Tile *tile)
setMessage( hint, message ); setMessage( hint, message );
break; break;
} }
} }
} }
void Tutorial::attack(shared_ptr<Player> player, shared_ptr<Entity> entity) void Tutorial::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
{ {
int hintNeeded = -1; int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->attack(player->inventory->getSelected(), entity); hintNeeded = hint->attack(player->inventory->getSelected(), entity);
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1920,9 +1908,8 @@ void Tutorial::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
void Tutorial::itemDamaged(shared_ptr<ItemInstance> item) void Tutorial::itemDamaged(shared_ptr<ItemInstance> item)
{ {
int hintNeeded = -1; int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->itemDamaged(item); hintNeeded = hint->itemDamaged(item);
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1939,11 +1926,6 @@ void Tutorial::handleUIInput(int iAction)
{ {
if( m_hintDisplayed ) return; if( m_hintDisplayed ) return;
//for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it)
//{
// TutorialTask *task = *it;
// task->handleUIInput(iAction);
//}
if(currentTask[m_CurrentState] != NULL) if(currentTask[m_CurrentState] != NULL)
currentTask[m_CurrentState]->handleUIInput(iAction); currentTask[m_CurrentState]->handleUIInput(iAction);
} }
@@ -1951,9 +1933,8 @@ void Tutorial::handleUIInput(int iAction)
void Tutorial::createItemSelected(shared_ptr<ItemInstance> item, bool canMake) void Tutorial::createItemSelected(shared_ptr<ItemInstance> item, bool canMake)
{ {
int hintNeeded = -1; int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->createItemSelected(item, canMake); hintNeeded = hint->createItemSelected(item, canMake);
if(hintNeeded >= 0) if(hintNeeded >= 0)
{ {
@@ -1968,11 +1949,10 @@ void Tutorial::createItemSelected(shared_ptr<ItemInstance> item, bool canMake)
void Tutorial::onCrafted(shared_ptr<ItemInstance> item) void Tutorial::onCrafted(shared_ptr<ItemInstance> item)
{ {
for(unsigned int state = 0; state < e_Tutorial_State_Max; ++state) for(auto& subtasks : activeTasks)
{ {
for(AUTO_VAR(it, activeTasks[state].begin()); it < activeTasks[state].end(); ++it) for(auto& task : subtasks)
{ {
TutorialTask *task = *it;
task->onCrafted(item); task->onCrafted(item);
} }
} }
@@ -1983,23 +1963,20 @@ void Tutorial::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAn
if( !m_hintDisplayed ) if( !m_hintDisplayed )
{ {
bool hintNeeded = false; bool hintNeeded = false;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->onTake(item); hintNeeded = hint->onTake(item);
if(hintNeeded) if(hintNeeded)
{ {
break; break;
} }
} }
} }
for(unsigned int state = 0; state < e_Tutorial_State_Max; ++state) for(auto& subtasks : activeTasks)
{ {
for(AUTO_VAR(it, activeTasks[state].begin()); it < activeTasks[state].end(); ++it) for(auto& task : subtasks)
{ {
TutorialTask *task = *it;
task->onTake(item, invItemCountAnyAux, invItemCountThisAux); task->onTake(item, invItemCountAnyAux, invItemCountThisAux);
} }
} }
@@ -2035,9 +2012,8 @@ void Tutorial::onLookAt(int id, int iData)
if( m_hintDisplayed ) return; if( m_hintDisplayed ) return;
bool hintNeeded = false; bool hintNeeded = false;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->onLookAt(id, iData); hintNeeded = hint->onLookAt(id, iData);
if(hintNeeded) if(hintNeeded)
{ {
@@ -2066,9 +2042,8 @@ void Tutorial::onLookAtEntity(shared_ptr<Entity> entity)
if( m_hintDisplayed ) return; if( m_hintDisplayed ) return;
bool hintNeeded = false; bool hintNeeded = false;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it) for(auto& hint : hints[m_CurrentState])
{ {
TutorialHint *hint = *it;
hintNeeded = hint->onLookAtEntity(entity->GetType()); hintNeeded = hint->onLookAtEntity(entity->GetType());
if(hintNeeded) if(hintNeeded)
{ {
@@ -2081,9 +2056,9 @@ void Tutorial::onLookAtEntity(shared_ptr<Entity> entity)
changeTutorialState(e_Tutorial_State_Horse); changeTutorialState(e_Tutorial_State_Horse);
} }
for (AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it != activeTasks[m_CurrentState].end(); ++it) for (auto& it : activeTasks[m_CurrentState])
{ {
(*it)->onLookAtEntity(entity); it->onLookAtEntity(entity);
} }
} }
@@ -2098,17 +2073,16 @@ void Tutorial::onRideEntity(shared_ptr<Entity> entity)
} }
} }
for (AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it != activeTasks[m_CurrentState].end(); ++it) for (auto& it : activeTasks[m_CurrentState])
{ {
(*it)->onRideEntity(entity); it->onRideEntity(entity);
} }
} }
void Tutorial::onEffectChanged(MobEffect *effect, bool bRemoved) void Tutorial::onEffectChanged(MobEffect *effect, bool bRemoved)
{ {
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it) for(auto& task : activeTasks[m_CurrentState])
{ {
TutorialTask *task = *it;
task->onEffectChanged(effect,bRemoved); task->onEffectChanged(effect,bRemoved);
} }
} }
@@ -2116,9 +2090,8 @@ void Tutorial::onEffectChanged(MobEffect *effect, bool bRemoved)
bool Tutorial::canMoveToPosition(double xo, double yo, double zo, double xt, double yt, double zt) bool Tutorial::canMoveToPosition(double xo, double yo, double zo, double xt, double yt, double zt)
{ {
bool allowed = true; bool allowed = true;
for(AUTO_VAR(it, constraints[m_CurrentState].begin()); it < constraints[m_CurrentState].end(); ++it) for(auto& constraint : constraints[m_CurrentState])
{ {
TutorialConstraint *constraint = *it;
if( !constraint->isConstraintSatisfied(m_iPad) && !constraint->canMoveToPosition(xo,yo,zo,xt,yt,zt) ) if( !constraint->isConstraintSatisfied(m_iPad) && !constraint->canMoveToPosition(xo,yo,zo,xt,yt,zt) )
{ {
allowed = false; allowed = false;
@@ -2136,9 +2109,8 @@ bool Tutorial::isInputAllowed(int mapping)
if( Minecraft::GetInstance()->localplayers[m_iPad]->isUnderLiquid(Material::water) ) return true; if( Minecraft::GetInstance()->localplayers[m_iPad]->isUnderLiquid(Material::water) ) return true;
bool allowed = true; bool allowed = true;
for(AUTO_VAR(it, constraints[m_CurrentState].begin()); it < constraints[m_CurrentState].end(); ++it) for(auto& constraint : constraints[m_CurrentState])
{ {
TutorialConstraint *constraint = *it;
if( constraint->isMappingConstrained( m_iPad, mapping ) ) if( constraint->isMappingConstrained( m_iPad, mapping ) )
{ {
allowed = false; allowed = false;
@@ -2156,9 +2128,9 @@ vector<TutorialTask *> *Tutorial::getTasks()
unsigned int Tutorial::getCurrentTaskIndex() unsigned int Tutorial::getCurrentTaskIndex()
{ {
unsigned int index = 0; unsigned int index = 0;
for(AUTO_VAR(it, tasks.begin()); it < tasks.end(); ++it) for(const auto& task : tasks)
{ {
if(*it == currentTask[e_Tutorial_State_Gameplay]) if(task == currentTask[e_Tutorial_State_Gameplay])
break; break;
++index; ++index;
@@ -2184,11 +2156,11 @@ void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= fa
if( c->getQueuedForRemoval() ) if( c->getQueuedForRemoval() )
{ {
// If it is already queued for removal, remove it on the next tick // If it is already queued for removal, remove it on the next tick
/*for(AUTO_VAR(it, constraintsToRemove[m_CurrentState].begin()); it < constraintsToRemove[m_CurrentState].end(); ++it) /*for(auto& it : constraintsToRemove[m_CurrentState])
{ {
if( it->first == c ) if( it.first == c )
{ {
it->second = m_iTutorialConstraintDelayRemoveTicks; it.second = m_iTutorialConstraintDelayRemoveTicks;
break; break;
} }
}*/ }*/
@@ -2196,12 +2168,12 @@ void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= fa
else if(delayedRemove) else if(delayedRemove)
{ {
c->setQueuedForRemoval(true); c->setQueuedForRemoval(true);
constraintsToRemove[m_CurrentState].push_back( pair<TutorialConstraint *, unsigned char>(c, 0) ); constraintsToRemove[m_CurrentState].emplace_back(c, 0);
} }
else else
{ {
for( AUTO_VAR(it, constraintsToRemove[m_CurrentState].begin()); it < constraintsToRemove[m_CurrentState].end(); ++it) for (auto it = constraintsToRemove[m_CurrentState].begin(); it != constraintsToRemove[m_CurrentState].end(); ++it)
{ {
if( it->first == c ) if( it->first == c )
{ {
constraintsToRemove[m_CurrentState].erase( it ); constraintsToRemove[m_CurrentState].erase( it );
@@ -2209,8 +2181,8 @@ void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= fa
} }
} }
AUTO_VAR(it, find( constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), c)); auto it = find(constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), c);
if( it != constraints[m_CurrentState].end() ) constraints[m_CurrentState].erase( find( constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), c) ); if( it != constraints[m_CurrentState].end() ) constraints[m_CurrentState].erase( find( constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), c) );
// It may be in the gameplay list, so remove it from there if it is // It may be in the gameplay list, so remove it from there if it is
it = find( constraints[e_Tutorial_State_Gameplay].begin(), constraints[e_Tutorial_State_Gameplay].end(), c); it = find( constraints[e_Tutorial_State_Gameplay].begin(), constraints[e_Tutorial_State_Gameplay].end(), c);
@@ -2271,7 +2243,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*=
// The action that caused the change of state may also have completed the current task // The action that caused the change of state may also have completed the current task
if( currentTask[m_CurrentState] != NULL && currentTask[m_CurrentState]->isCompleted() ) if( currentTask[m_CurrentState] != NULL && currentTask[m_CurrentState]->isCompleted() )
{ {
activeTasks[m_CurrentState].erase( find( activeTasks[m_CurrentState].begin(), activeTasks[m_CurrentState].end(), currentTask[m_CurrentState]) ); activeTasks[m_CurrentState].erase( find( activeTasks[m_CurrentState].begin(), activeTasks[m_CurrentState].end(), currentTask[m_CurrentState]) );
if( activeTasks[m_CurrentState].size() > 0 ) if( activeTasks[m_CurrentState].size() > 0 )
{ {
@@ -2304,9 +2276,8 @@ void Tutorial::changeTutorialState(eTutorial_State newState, UIScene *scene /*=
if( m_CurrentState != newState ) if( m_CurrentState != newState )
{ {
for(AUTO_VAR(it, activeTasks[newState].begin()); it < activeTasks[newState].end(); ++it) for (auto& task : activeTasks[newState] )
{ {
TutorialTask *task = *it;
task->onStateChange(newState); task->onStateChange(newState);
} }
m_CurrentState = newState; m_CurrentState = newState;

15
Minecraft.Client/Common/Tutorial/TutorialTask.cpp
View File

@@ -3,7 +3,7 @@
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "TutorialTask.h" #include "TutorialTask.h"
TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints,
bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders) bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
: tutorial( tutorial ), descriptionId( descriptionId ), m_promptId( -1 ), enablePreCompletion( enablePreCompletion ), : tutorial( tutorial ), descriptionId( descriptionId ), m_promptId( -1 ), enablePreCompletion( enablePreCompletion ),
areConstraintsEnabled( false ), bIsCompleted( false ), bHasBeenActivated( false ), areConstraintsEnabled( false ), bIsCompleted( false ), bHasBeenActivated( false ),
@@ -11,9 +11,8 @@ TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePre
{ {
if(inConstraints != NULL) if(inConstraints != NULL)
{ {
for(AUTO_VAR(it, inConstraints->begin()); it < inConstraints->end(); ++it) for(auto& constraint : *inConstraints)
{ {
TutorialConstraint *constraint = *it;
constraints.push_back( constraint ); constraints.push_back( constraint );
} }
delete inConstraints; delete inConstraints;
@@ -26,10 +25,8 @@ TutorialTask::~TutorialTask()
{ {
enableConstraints(false); enableConstraints(false);
for(AUTO_VAR(it, constraints.begin()); it < constraints.end(); ++it) for(auto& constraint : constraints)
{ {
TutorialConstraint *constraint = *it;
if( constraint->getQueuedForRemoval() ) if( constraint->getQueuedForRemoval() )
{ {
constraint->setDeleteOnDeactivate(true); constraint->setDeleteOnDeactivate(true);
@@ -52,9 +49,8 @@ void TutorialTask::enableConstraints(bool enable, bool delayRemove /*= false*/)
if( !enable && (areConstraintsEnabled || !delayRemove) ) if( !enable && (areConstraintsEnabled || !delayRemove) )
{ {
// Remove // Remove
for(AUTO_VAR(it, constraints.begin()); it != constraints.end(); ++it) for(auto& constraint : constraints)
{ {
TutorialConstraint *constraint = *it;
//app.DebugPrintf(">>>>>>>> %i\n", constraints.size()); //app.DebugPrintf(">>>>>>>> %i\n", constraints.size());
tutorial->RemoveConstraint( constraint, delayRemove ); tutorial->RemoveConstraint( constraint, delayRemove );
} }
@@ -63,9 +59,8 @@ void TutorialTask::enableConstraints(bool enable, bool delayRemove /*= false*/)
else if( !areConstraintsEnabled && enable ) else if( !areConstraintsEnabled && enable )
{ {
// Add // Add
for(AUTO_VAR(it, constraints.begin()); it != constraints.end(); ++it) for(auto& constraint : constraints)
{ {
TutorialConstraint *constraint = *it;
tutorial->AddConstraint( constraint ); tutorial->AddConstraint( constraint );
} }
areConstraintsEnabled = true; areConstraintsEnabled = true;

6
Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
View File

@@ -387,8 +387,10 @@ vector<HtmlString> *IUIScene_BeaconMenu::GetSectionHoverText(ESceneSection eSect
desc = new vector<HtmlString>(); desc = new vector<HtmlString>();
HtmlString string( app.GetString(MobEffect::effects[effectId]->getDescriptionId()), eHTMLColor_White ); if (effectId < MobEffect::e_MobEffectIcon_COUNT && MobEffect::effects[effectId]) {
desc->push_back( string ); HtmlString string( app.GetString(MobEffect::effects[effectId]->getDescriptionId()), eHTMLColor_White );
desc->push_back( string );
}
} }
break; break;
} }

90
Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
View File

@@ -91,7 +91,7 @@ IUIScene_CraftingMenu::_eGroupTab IUIScene_CraftingMenu::m_GroupTabBkgMapping3x3
// eBaseItemType_bow, // eBaseItemType_bow,
// eBaseItemType_pockettool, // eBaseItemType_pockettool,
// eBaseItemType_utensil, // eBaseItemType_utensil,
// //
// } // }
// eBaseItemType; // eBaseItemType;
@@ -180,11 +180,11 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
UpdateTooltips(); UpdateTooltips();
break; break;
case ACTION_MENU_PAUSEMENU: case ACTION_MENU_PAUSEMENU:
case ACTION_MENU_B: case ACTION_MENU_B:
ui.ShowTooltip( iPad, eToolTipButtonX, false ); ui.ShowTooltip( iPad, eToolTipButtonX, false );
ui.ShowTooltip( iPad, eToolTipButtonB, false ); ui.ShowTooltip( iPad, eToolTipButtonB, false );
ui.ShowTooltip( iPad, eToolTipButtonA, false ); ui.ShowTooltip( iPad, eToolTipButtonA, false );
ui.ShowTooltip( iPad, eToolTipButtonRB, false ); ui.ShowTooltip( iPad, eToolTipButtonRB, false );
// kill the crafting xui // kill the crafting xui
//ui.PlayUISFX(eSFX_Back); //ui.PlayUISFX(eSFX_Back);
ui.CloseUIScenes(iPad); ui.CloseUIScenes(iPad);
@@ -197,14 +197,14 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
#endif #endif
// Do some crafting! // Do some crafting!
if(m_pPlayer && m_pPlayer->inventory) if(m_pPlayer && m_pPlayer->inventory)
{ {
//RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies(); //RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies();
Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray(); Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();
// Force a make if the debug is on // Force a make if the debug is on
if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_CraftAnything)) if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_CraftAnything))
{ {
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0)
{ {
int iSlot=iVSlotIndexA[m_iCurrentSlotVIndex]; int iSlot=iVSlotIndexA[m_iCurrentSlotVIndex];
int iRecipe= CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot]; int iRecipe= CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iSlot];
@@ -256,7 +256,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
} }
} }
if(pRecipeIngredientsRequired[iRecipe].bCanMake[iPad]) if(pRecipeIngredientsRequired[iRecipe].bCanMake[iPad])
{ {
pTempItemInst->onCraftedBy(m_pPlayer->level, dynamic_pointer_cast<Player>( m_pPlayer->shared_from_this() ), pTempItemInst->count ); pTempItemInst->onCraftedBy(m_pPlayer->level, dynamic_pointer_cast<Player>( m_pPlayer->shared_from_this() ), pTempItemInst->count );
// TODO 4J Stu - handleCraftItem should do a lot more than what it does, loads of the "can we craft" code should also probably be // TODO 4J Stu - handleCraftItem should do a lot more than what it does, loads of the "can we craft" code should also probably be
@@ -340,7 +340,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
break; break;
case ACTION_MENU_LEFT_SCROLL: case ACTION_MENU_LEFT_SCROLL:
// turn off the old group tab // turn off the old group tab
showTabHighlight(m_iGroupIndex,false); showTabHighlight(m_iGroupIndex,false);
if(m_iGroupIndex==0) if(m_iGroupIndex==0)
@@ -434,7 +434,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
// clear the indices // clear the indices
iVSlotIndexA[0]=CanBeMadeA[m_iCurrentSlotHIndex].iCount-1; iVSlotIndexA[0]=CanBeMadeA[m_iCurrentSlotHIndex].iCount-1;
iVSlotIndexA[1]=0; iVSlotIndexA[1]=0;
iVSlotIndexA[2]=1; iVSlotIndexA[2]=1;
UpdateVerticalSlots(); UpdateVerticalSlots();
UpdateHighlight(); UpdateHighlight();
@@ -485,13 +485,13 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
else else
{ {
iVSlotIndexA[1]--; iVSlotIndexA[1]--;
} }
ui.PlayUISFX(eSFX_Focus); ui.PlayUISFX(eSFX_Focus);
} }
else else
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>2) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>2)
{ {
{ {
if(m_iCurrentSlotVIndex!=0) if(m_iCurrentSlotVIndex!=0)
{ {
// just move the highlight // just move the highlight
@@ -499,11 +499,11 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
ui.PlayUISFX(eSFX_Focus); ui.PlayUISFX(eSFX_Focus);
} }
else else
{ {
//move the slots //move the slots
iVSlotIndexA[2]=iVSlotIndexA[1]; iVSlotIndexA[2]=iVSlotIndexA[1];
iVSlotIndexA[1]=iVSlotIndexA[0]; iVSlotIndexA[1]=iVSlotIndexA[0];
// on 0 and went up, so cycle the values // on 0 and went up, so cycle the values
if(iVSlotIndexA[0]==0) if(iVSlotIndexA[0]==0)
{ {
iVSlotIndexA[0]=CanBeMadeA[m_iCurrentSlotHIndex].iCount-1; iVSlotIndexA[0]=CanBeMadeA[m_iCurrentSlotHIndex].iCount-1;
@@ -536,7 +536,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1)
{ {
if(bNoScrollSlots) if(bNoScrollSlots)
{ {
if(iVSlotIndexA[1]==(CanBeMadeA[m_iCurrentSlotHIndex].iCount-1)) if(iVSlotIndexA[1]==(CanBeMadeA[m_iCurrentSlotHIndex].iCount-1))
{ {
iVSlotIndexA[1]=0; iVSlotIndexA[1]=0;
@@ -577,7 +577,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
{ {
m_iCurrentSlotVIndex++; m_iCurrentSlotVIndex++;
ui.PlayUISFX(eSFX_Focus); ui.PlayUISFX(eSFX_Focus);
} }
} }
UpdateVerticalSlots(); UpdateVerticalSlots();
UpdateHighlight(); UpdateHighlight();
@@ -621,9 +621,9 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies(); RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies();
Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray(); Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();
int iRecipeC=(int)recipes->size(); int iRecipeC=(int)recipes->size();
AUTO_VAR(itRecipe, recipes->begin()); auto itRecipe = recipes->begin();
// dump out the recipe products // dump out the recipe products
// for (int i = 0; i < iRecipeC; i++) // for (int i = 0; i < iRecipeC; i++)
// { // {
@@ -631,7 +631,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
// if (pTempItemInst != NULL) // if (pTempItemInst != NULL)
// { // {
// wstring itemstring=pTempItemInst->toString(); // wstring itemstring=pTempItemInst->toString();
// //
// printf("Recipe [%d] = ",i); // printf("Recipe [%d] = ",i);
// OutputDebugStringW(itemstring.c_str()); // OutputDebugStringW(itemstring.c_str());
// if(pTempItemInst->id!=0) // if(pTempItemInst->id!=0)
@@ -645,7 +645,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
// { // {
// printf("ID\t%d\tAux val\t%d\tBase type\t%d\tMaterial\t%d Count=%d\n",pTempItemInst->id, pTempItemInst->getAuxValue(),pTempItemInst->getItem()->getBaseItemType(),pTempItemInst->getItem()->getMaterial(),pTempItemInst->GetCount()); // printf("ID\t%d\tAux val\t%d\tBase type\t%d\tMaterial\t%d Count=%d\n",pTempItemInst->id, pTempItemInst->getAuxValue(),pTempItemInst->getItem()->getBaseItemType(),pTempItemInst->getItem()->getMaterial(),pTempItemInst->GetCount());
// } // }
// //
// } // }
// } // }
// } // }
@@ -686,9 +686,9 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
if (m_pPlayer->inventory->items[k] != NULL) if (m_pPlayer->inventory->items[k] != NULL)
{ {
// do they have the ingredient, and the aux value matches, and enough off it? // do they have the ingredient, and the aux value matches, and enough off it?
if((m_pPlayer->inventory->items[k]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) && if((m_pPlayer->inventory->items[k]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) &&
// check if the ingredient required doesn't care about the aux value, or if it does, does the inventory item aux match it // check if the ingredient required doesn't care about the aux value, or if it does, does the inventory item aux match it
((pRecipeIngredientsRequired[i].iIngAuxValA[j]==Recipes::ANY_AUX_VALUE) || (pRecipeIngredientsRequired[i].iIngAuxValA[j]==m_pPlayer->inventory->items[k]->getAuxValue())) ((pRecipeIngredientsRequired[i].iIngAuxValA[j]==Recipes::ANY_AUX_VALUE) || (pRecipeIngredientsRequired[i].iIngAuxValA[j]==m_pPlayer->inventory->items[k]->getAuxValue()))
) )
{ {
// do they have enough? We need to check the whole inventory, since they may have enough in different slots (milk isn't milkx3, but milk,milk,milk) // do they have enough? We need to check the whole inventory, since they may have enough in different slots (milk isn't milkx3, but milk,milk,milk)
@@ -724,18 +724,18 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
// 4J Stu - TU-1 hotfix // 4J Stu - TU-1 hotfix
// Fix for #13143 - Players are able to craft items they do not have enough ingredients for if they store the ingredients in multiple, smaller stacks // Fix for #13143 - Players are able to craft items they do not have enough ingredients for if they store the ingredients in multiple, smaller stacks
break; break;
} }
} }
} }
// if bFoundA[j] is false, then we didn't have enough of the ingredient required by the recipe, so mark the grid items we're short of // if bFoundA[j] is false, then we didn't have enough of the ingredient required by the recipe, so mark the grid items we're short of
if(bFoundA[j]==false) if(bFoundA[j]==false)
{ {
int iMissing = pRecipeIngredientsRequired[i].iIngValA[j]-iTotalCount; int iMissing = pRecipeIngredientsRequired[i].iIngValA[j]-iTotalCount;
int iGridIndex=0; int iGridIndex=0;
while(iMissing!=0) while(iMissing!=0)
{ {
// need to check if there is an aux val and match that // need to check if there is an aux val and match that
if(((pRecipeIngredientsRequired[i].uiGridA[iGridIndex]&0x00FFFFFF)==pRecipeIngredientsRequired[i].iIngIDA[j]) && if(((pRecipeIngredientsRequired[i].uiGridA[iGridIndex]&0x00FFFFFF)==pRecipeIngredientsRequired[i].iIngIDA[j]) &&
((pRecipeIngredientsRequired[i].iIngAuxValA[j]==Recipes::ANY_AUX_VALUE) ||(pRecipeIngredientsRequired[i].iIngAuxValA[j]== ((pRecipeIngredientsRequired[i].uiGridA[iGridIndex]&0xFF000000)>>24))) ) ((pRecipeIngredientsRequired[i].iIngAuxValA[j]==Recipes::ANY_AUX_VALUE) ||(pRecipeIngredientsRequired[i].iIngAuxValA[j]== ((pRecipeIngredientsRequired[i].uiGridA[iGridIndex]&0xFF000000)>>24))) )
{ {
// this grid entry is the ingredient we don't have enough of // this grid entry is the ingredient we don't have enough of
@@ -780,7 +780,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
// ignore for the misc base type - these have not been placed in a base type group // ignore for the misc base type - these have not been placed in a base type group
if(iBaseType!=Item::eBaseItemType_undefined) if(iBaseType!=Item::eBaseItemType_undefined)
{ {
for(int k=0;k<iHSlotBrushControl;k++) for(int k=0;k<iHSlotBrushControl;k++)
{ {
// if the item base type is the same as one already in, then add it to that list // if the item base type is the same as one already in, then add it to that list
@@ -804,7 +804,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
if(!bFound) if(!bFound)
{ {
if(iHSlotBrushControl<m_iCraftablesMaxHSlotC) if(iHSlotBrushControl<m_iCraftablesMaxHSlotC)
{ {
// add to the list // add to the list
CanBeMadeA[iHSlotBrushControl].iItemBaseType=iBaseType; CanBeMadeA[iHSlotBrushControl].iItemBaseType=iBaseType;
CanBeMadeA[iHSlotBrushControl].iRecipeA[CanBeMadeA[iHSlotBrushControl].iCount++]=i; CanBeMadeA[iHSlotBrushControl].iRecipeA[CanBeMadeA[iHSlotBrushControl].iCount++]=i;
@@ -827,7 +827,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
} }
delete [] bFoundA; delete [] bFoundA;
itRecipe++; itRecipe++;
} }
} }
@@ -847,7 +847,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
uiAlpha = 31; uiAlpha = 31;
} }
else else
{ {
if(pRecipeIngredientsRequired[CanBeMadeA[iIndex].iRecipeA[0]].bCanMake[getPad()]) if(pRecipeIngredientsRequired[CanBeMadeA[iIndex].iRecipeA[0]].bCanMake[getPad()])
{ {
uiAlpha = 31; uiAlpha = 31;
@@ -936,10 +936,10 @@ void IUIScene_CraftingMenu::UpdateHighlight()
{ {
itemstring=app.GetString( IDS_ITEM_FIREBALLCOAL ); itemstring=app.GetString( IDS_ITEM_FIREBALLCOAL );
} }
} }
break; break;
default: default:
itemstring=app.GetString(id ); itemstring=app.GetString(id );
break; break;
} }
@@ -1004,7 +1004,7 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots()
uiAlpha = 31; uiAlpha = 31;
} }
else else
{ {
if(pRecipeIngredientsRequired[CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iVSlotIndexA[i]]].bCanMake[getPad()]) if(pRecipeIngredientsRequired[CanBeMadeA[m_iCurrentSlotHIndex].iRecipeA[iVSlotIndexA[i]]].bCanMake[getPad()])
{ {
uiAlpha = 31; uiAlpha = 31;
@@ -1043,7 +1043,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
hideAllIngredientsSlots(); hideAllIngredientsSlots();
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount!=0)
{ {
int iSlot,iRecipy; int iSlot,iRecipy;
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1)
{ {
@@ -1135,13 +1135,13 @@ void IUIScene_CraftingMenu::DisplayIngredients()
} }
} }
for (int x = 0; x < iBoxWidth; x++) for (int x = 0; x < iBoxWidth; x++)
{ {
for (int y = 0; y < iBoxWidth; y++) for (int y = 0; y < iBoxWidth; y++)
{ {
int index = x+y*iBoxWidth; int index = x+y*iBoxWidth;
if(pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]!=0) if(pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]!=0)
{ {
int id=pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]&0x00FFFFFF; int id=pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]&0x00FFFFFF;
assert(id!=0); assert(id!=0);
int iAuxVal=(pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]&0xFF000000)>>24; int iAuxVal=(pRecipeIngredientsRequired[iRecipy].uiGridA[x+y*3]&0xFF000000)>>24;
@@ -1164,7 +1164,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
setIngredientSlotRedBox(index, false); setIngredientSlotRedBox(index, false);
} }
else else
{ {
if((pRecipeIngredientsRequired[iRecipy].usBitmaskMissingGridIngredients[getPad()]&(1<<(x+y*3)))!=0) if((pRecipeIngredientsRequired[iRecipy].usBitmaskMissingGridIngredients[getPad()]&(1<<(x+y*3)))!=0)
{ {
setIngredientSlotRedBox(index, true); setIngredientSlotRedBox(index, true);
@@ -1179,7 +1179,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
{ {
setIngredientSlotRedBox(index, false); setIngredientSlotRedBox(index, false);
setIngredientSlotItem(getPad(),index,nullptr); setIngredientSlotItem(getPad(),index,nullptr);
} }
} }
} }
} }
@@ -1203,7 +1203,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
{ {
setIngredientSlotRedBox(i, false); setIngredientSlotRedBox(i, false);
setIngredientSlotItem(getPad(),i,nullptr); setIngredientSlotItem(getPad(),i,nullptr);
} }
} }
} }
@@ -1220,7 +1220,7 @@ void IUIScene_CraftingMenu::UpdateDescriptionText(bool bCanBeMade)
Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray(); Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();
if(bCanBeMade) if(bCanBeMade)
{ {
int iSlot;//,iRecipy; int iSlot;//,iRecipy;
if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1) if(CanBeMadeA[m_iCurrentSlotHIndex].iCount>1)
{ {
@@ -1293,13 +1293,13 @@ void IUIScene_CraftingMenu::UpdateDescriptionText(bool bCanBeMade)
#ifdef _DEBUG #ifdef _DEBUG
setDescriptionText(L"This is some placeholder description text about the craftable item."); setDescriptionText(L"This is some placeholder description text about the craftable item.");
#else #else
setDescriptionText(L""); setDescriptionText(L"");
#endif #endif
} }
} }
else else
{ {
setDescriptionText(L""); setDescriptionText(L"");
} }
} }
@@ -1323,7 +1323,7 @@ void IUIScene_CraftingMenu::UpdateTooltips()
{ {
iSlot=iVSlotIndexA[m_iCurrentSlotVIndex]; iSlot=iVSlotIndexA[m_iCurrentSlotVIndex];
} }
else else
{ {
iSlot=0; iSlot=0;
} }
@@ -1363,7 +1363,7 @@ void IUIScene_CraftingMenu::UpdateTooltips()
{ {
iSlot=iVSlotIndexA[m_iCurrentSlotVIndex]; iSlot=iVSlotIndexA[m_iCurrentSlotVIndex];
} }
else else
{ {
iSlot=0; iSlot=0;
} }
@@ -1396,7 +1396,7 @@ bool IUIScene_CraftingMenu::isItemSelected(int itemId)
{ {
bool isSelected = false; bool isSelected = false;
if(m_pPlayer && m_pPlayer->inventory) if(m_pPlayer && m_pPlayer->inventory)
{ {
//RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies(); //RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies();
Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray(); Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();

44
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View File

@@ -60,7 +60,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::treeTrunk_Id, 0) ITEM_AUX(Tile::treeTrunk_Id, 0)
ITEM_AUX(Tile::treeTrunk_Id, TreeTile::DARK_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::DARK_TRUNK)
ITEM_AUX(Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK)
ITEM_AUX(Tile::treeTrunk_Id, TreeTile::JUNGLE_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::JUNGLE_TRUNK)
ITEM(Tile::gravel_Id) ITEM(Tile::gravel_Id)
ITEM(Tile::redBrick_Id) ITEM(Tile::redBrick_Id)
ITEM(Tile::mossyCobblestone_Id) ITEM(Tile::mossyCobblestone_Id)
@@ -144,7 +144,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Tile::sponge_Id) ITEM(Tile::sponge_Id)
ITEM(Tile::melon_Id) ITEM(Tile::melon_Id)
ITEM(Tile::pumpkin_Id) ITEM(Tile::pumpkin_Id)
ITEM(Tile::litPumpkin_Id) ITEM(Tile::litPumpkin_Id)
ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_DEFAULT) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_DEFAULT)
ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_EVERGREEN) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_EVERGREEN)
ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_BIRCH) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_BIRCH)
@@ -321,7 +321,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Tile::anvil_Id); ITEM(Tile::anvil_Id);
ITEM(Item::bed_Id) ITEM(Item::bed_Id)
ITEM(Item::bucket_empty_Id) ITEM(Item::bucket_empty_Id)
ITEM(Item::bucket_lava_Id) ITEM(Item::bucket_lava_Id)
ITEM(Item::bucket_water_Id) ITEM(Item::bucket_water_Id)
ITEM(Item::bucket_milk_Id) ITEM(Item::bucket_milk_Id)
ITEM(Item::cauldron_Id) ITEM(Item::cauldron_Id)
@@ -408,7 +408,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::beef_cooked_Id) ITEM(Item::beef_cooked_Id)
ITEM(Item::beef_raw_Id) ITEM(Item::beef_raw_Id)
ITEM(Item::chicken_raw_Id) ITEM(Item::chicken_raw_Id)
ITEM(Item::chicken_cooked_Id) ITEM(Item::chicken_cooked_Id)
ITEM(Item::rotten_flesh_Id) ITEM(Item::rotten_flesh_Id)
ITEM(Item::spiderEye_Id) ITEM(Item::spiderEye_Id)
ITEM(Item::potato_Id) ITEM(Item::potato_Id)
@@ -430,7 +430,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::pickAxe_wood_Id) ITEM(Item::pickAxe_wood_Id)
ITEM(Item::hatchet_wood_Id) ITEM(Item::hatchet_wood_Id)
ITEM(Item::hoe_wood_Id) ITEM(Item::hoe_wood_Id)
ITEM(Item::emptyMap_Id) ITEM(Item::emptyMap_Id)
ITEM(Item::helmet_chain_Id) ITEM(Item::helmet_chain_Id)
ITEM(Item::chestplate_chain_Id) ITEM(Item::chestplate_chain_Id)
@@ -441,7 +441,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::pickAxe_stone_Id) ITEM(Item::pickAxe_stone_Id)
ITEM(Item::hatchet_stone_Id) ITEM(Item::hatchet_stone_Id)
ITEM(Item::hoe_stone_Id) ITEM(Item::hoe_stone_Id)
ITEM(Item::bow_Id) ITEM(Item::bow_Id)
ITEM(Item::helmet_iron_Id) ITEM(Item::helmet_iron_Id)
ITEM(Item::chestplate_iron_Id) ITEM(Item::chestplate_iron_Id)
@@ -452,7 +452,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::pickAxe_iron_Id) ITEM(Item::pickAxe_iron_Id)
ITEM(Item::hatchet_iron_Id) ITEM(Item::hatchet_iron_Id)
ITEM(Item::hoe_iron_Id) ITEM(Item::hoe_iron_Id)
ITEM(Item::arrow_Id) ITEM(Item::arrow_Id)
ITEM(Item::helmet_gold_Id) ITEM(Item::helmet_gold_Id)
ITEM(Item::chestplate_gold_Id) ITEM(Item::chestplate_gold_Id)
@@ -514,7 +514,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::brick_Id) ITEM(Item::brick_Id)
ITEM(Item::netherbrick_Id) ITEM(Item::netherbrick_Id)
ITEM(Item::stick_Id) ITEM(Item::stick_Id)
ITEM(Item::bowl_Id) ITEM(Item::bowl_Id)
ITEM(Item::bone_Id) ITEM(Item::bone_Id)
ITEM(Item::string_Id) ITEM(Item::string_Id)
ITEM(Item::feather_Id) ITEM(Item::feather_Id)
@@ -523,13 +523,13 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::gunpowder_Id) ITEM(Item::gunpowder_Id)
ITEM(Item::clay_Id) ITEM(Item::clay_Id)
ITEM(Item::yellowDust_Id) ITEM(Item::yellowDust_Id)
ITEM(Item::seeds_wheat_Id) ITEM(Item::seeds_wheat_Id)
ITEM(Item::seeds_melon_Id) ITEM(Item::seeds_melon_Id)
ITEM(Item::seeds_pumpkin_Id) ITEM(Item::seeds_pumpkin_Id)
ITEM(Item::wheat_Id) ITEM(Item::wheat_Id)
ITEM(Item::reeds_Id) ITEM(Item::reeds_Id)
ITEM(Item::egg_Id) ITEM(Item::egg_Id)
ITEM(Item::sugar_Id) ITEM(Item::sugar_Id)
ITEM(Item::slimeBall_Id) ITEM(Item::slimeBall_Id)
ITEM(Item::blazeRod_Id) ITEM(Item::blazeRod_Id)
ITEM(Item::goldNugget_Id) ITEM(Item::goldNugget_Id)
@@ -562,7 +562,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::magmaCream_Id) ITEM(Item::magmaCream_Id)
ITEM(Item::speckledMelon_Id) ITEM(Item::speckledMelon_Id)
ITEM(Item::glassBottle_Id) ITEM(Item::glassBottle_Id)
ITEM_AUX(Item::potion_Id,0) // Water bottle ITEM_AUX(Item::potion_Id,0) // Water bottle
//ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_TYPE_AWKWARD)) // Awkward Potion //ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_TYPE_AWKWARD)) // Awkward Potion
@@ -594,7 +594,7 @@ void IUIScene_CreativeMenu::staticCtor()
//ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INSTANTHEALTH)) //ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INSTANTHEALTH))
//ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_NIGHTVISION)) //ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_NIGHTVISION))
//ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INVISIBILITY)) //ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_INVISIBILITY))
ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_WEAKNESS)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_WEAKNESS))
ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_STRENGTH)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, MASK_LEVEL2, MASK_STRENGTH))
ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_SLOWNESS)) ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_SLOWNESS))
@@ -669,7 +669,7 @@ void IUIScene_CreativeMenu::staticCtor()
// Top Row // Top Row
ECreative_Inventory_Groups blocksGroup[] = {eCreativeInventory_BuildingBlocks}; ECreative_Inventory_Groups blocksGroup[] = {eCreativeInventory_BuildingBlocks};
specs[eCreativeInventoryTab_BuildingBlocks] = new TabSpec(L"Structures", IDS_GROUPNAME_BUILDING_BLOCKS, 1, blocksGroup); specs[eCreativeInventoryTab_BuildingBlocks] = new TabSpec(L"Structures", IDS_GROUPNAME_BUILDING_BLOCKS, 1, blocksGroup);
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration}; ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration};
ECreative_Inventory_Groups debugDecorationsGroup[] = {eCreativeInventory_ArtToolsDecorations}; ECreative_Inventory_Groups debugDecorationsGroup[] = {eCreativeInventory_ArtToolsDecorations};
@@ -720,7 +720,7 @@ IUIScene_CreativeMenu::IUIScene_CreativeMenu()
m_creativeSlotX = m_creativeSlotY = m_inventorySlotX = m_inventorySlotY = 0; m_creativeSlotX = m_creativeSlotY = m_inventorySlotX = m_inventorySlotY = 0;
// 4J JEV - Settup Tabs // 4J JEV - Settup Tabs
for (int i = 0; i < eCreativeInventoryTab_COUNT; i++) for (int i = 0; i < eCreativeInventoryTab_COUNT; i++)
{ {
m_tabDynamicPos[i] = 0; m_tabDynamicPos[i] = 0;
m_tabPage[i] = 0; m_tabPage[i] = 0;
@@ -735,7 +735,7 @@ void IUIScene_CreativeMenu::switchTab(ECreativeInventoryTabs tab)
if(tab != m_curTab) updateTabHighlightAndText(tab); if(tab != m_curTab) updateTabHighlightAndText(tab);
m_curTab = tab; m_curTab = tab;
updateScrollCurrentPage(m_tabPage[m_curTab] + 1, specs[m_curTab]->getPageCount()); updateScrollCurrentPage(m_tabPage[m_curTab] + 1, specs[m_curTab]->getPageCount());
specs[tab]->populateMenu(itemPickerMenu,m_tabDynamicPos[m_curTab], m_tabPage[m_curTab]); specs[tab]->populateMenu(itemPickerMenu,m_tabDynamicPos[m_curTab], m_tabPage[m_curTab]);
@@ -769,7 +769,7 @@ void IUIScene_CreativeMenu::ScrollBar(UIVec2D pointerPos)
IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= NULL*/) IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= NULL*/)
: m_icon(icon), m_descriptionId(descriptionId), m_staticGroupsCount(staticGroupsCount), m_dynamicGroupsCount(dynamicGroupsCount), m_debugGroupsCount(debugGroupsCount) : m_icon(icon), m_descriptionId(descriptionId), m_staticGroupsCount(staticGroupsCount), m_dynamicGroupsCount(dynamicGroupsCount), m_debugGroupsCount(debugGroupsCount)
{ {
m_pages = 0; m_pages = 0;
m_staticGroupsA = NULL; m_staticGroupsA = NULL;
@@ -828,8 +828,8 @@ void IUIScene_CreativeMenu::TabSpec::populateMenu(AbstractContainerMenu *menu, i
// Fill the dynamic group // Fill the dynamic group
if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != NULL) if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != NULL)
{ {
for(AUTO_VAR(it, categoryGroups[m_dynamicGroupsA[dynamicIndex]].rbegin()); it != categoryGroups[m_dynamicGroupsA[dynamicIndex]].rend() && lastSlotIndex < MAX_SIZE; ++it) for (auto it = categoryGroups[m_dynamicGroupsA[dynamicIndex]].rbegin(); it != categoryGroups[m_dynamicGroupsA[dynamicIndex]].rend() && lastSlotIndex < MAX_SIZE; ++it)
{ {
Slot *slot = menu->getSlot(++lastSlotIndex); Slot *slot = menu->getSlot(++lastSlotIndex);
slot->set( *it ); slot->set( *it );
} }
@@ -953,7 +953,7 @@ unsigned int IUIScene_CreativeMenu::TabSpec::getPageCount()
IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu( shared_ptr<SimpleContainer> smp, shared_ptr<Inventory> inv ) : AbstractContainerMenu() IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu( shared_ptr<SimpleContainer> smp, shared_ptr<Inventory> inv ) : AbstractContainerMenu()
{ {
inventory = inv; inventory = inv;
creativeContainer = smp; creativeContainer = smp;
//int startLength = slots->size(); //int startLength = slots->size();
@@ -994,7 +994,7 @@ IUIScene_AbstractContainerMenu::ESceneSection IUIScene_CreativeMenu::GetSectionA
switch( eSection ) switch( eSection )
{ {
case eSectionInventoryCreativeSelector: case eSectionInventoryCreativeSelector:
if (eTapDirection == eTapStateDown || eTapDirection == eTapStateUp) if (eTapDirection == eTapStateDown || eTapDirection == eTapStateUp)
{ {
newSection = eSectionInventoryCreativeUsing; newSection = eSectionInventoryCreativeUsing;
} }
@@ -1081,7 +1081,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
dir = -1; dir = -1;
// Fall through intentional // Fall through intentional
case ACTION_MENU_RIGHT_SCROLL: case ACTION_MENU_RIGHT_SCROLL:
{ {
ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir); ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir);
if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1); if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1);
if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks; if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks;
@@ -1375,7 +1375,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
itemTag->put(FireworksItem::TAG_FIREWORKS, fireTag); itemTag->put(FireworksItem::TAG_FIREWORKS, fireTag);
firework->setTag(itemTag); firework->setTag(itemTag);
} }
list->push_back(firework); list->push_back(firework);
} }

19
Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
View File

@@ -47,11 +47,11 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
switch(iAction) switch(iAction)
{ {
case ACTION_MENU_B: case ACTION_MENU_B:
ui.ShowTooltip( iPad, eToolTipButtonX, false ); ui.ShowTooltip( iPad, eToolTipButtonX, false );
ui.ShowTooltip( iPad, eToolTipButtonB, false ); ui.ShowTooltip( iPad, eToolTipButtonB, false );
ui.ShowTooltip( iPad, eToolTipButtonA, false ); ui.ShowTooltip( iPad, eToolTipButtonA, false );
ui.ShowTooltip( iPad, eToolTipButtonRB, false ); ui.ShowTooltip( iPad, eToolTipButtonRB, false );
// kill the crafting xui // kill the crafting xui
//ui.PlayUISFX(eSFX_Back); //ui.PlayUISFX(eSFX_Back);
ui.CloseUIScenes(iPad); ui.CloseUIScenes(iPad);
@@ -78,7 +78,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
int buyBMatches = player->inventory->countMatches(buyBItem); int buyBMatches = player->inventory->countMatches(buyBItem);
if( (buyAItem != NULL && buyAMatches >= buyAItem->count) && (buyBItem == NULL || buyBMatches >= buyBItem->count) ) if( (buyAItem != NULL && buyAMatches >= buyAItem->count) && (buyBItem == NULL || buyBMatches >= buyBItem->count) )
{ {
// 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple ‘Enchanted Books’ will cause the title to crash. // 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple <EFBFBD>Enchanted Books<EFBFBD> will cause the title to crash.
int actualShopItem = m_activeOffers.at(selectedShopItem).second; int actualShopItem = m_activeOffers.at(selectedShopItem).second;
m_merchant->notifyTrade(activeRecipe); m_merchant->notifyTrade(activeRecipe);
@@ -186,13 +186,12 @@ void IUIScene_TradingMenu::updateDisplay()
m_activeOffers.clear(); m_activeOffers.clear();
int unfilteredIndex = 0; int unfilteredIndex = 0;
int firstValidTrade = INT_MAX; int firstValidTrade = INT_MAX;
for(AUTO_VAR(it, unfilteredOffers->begin()); it != unfilteredOffers->end(); ++it) for(auto& recipe : *unfilteredOffers)
{ {
MerchantRecipe *recipe = *it;
if(!recipe->isDeprecated()) if(!recipe->isDeprecated())
{ {
m_activeOffers.push_back( pair<MerchantRecipe *,int>(recipe,unfilteredIndex)); m_activeOffers.emplace_back(recipe,unfilteredIndex);
firstValidTrade = min(firstValidTrade,unfilteredIndex); firstValidTrade = std::min<int>(firstValidTrade, unfilteredIndex);
} }
++unfilteredIndex; ++unfilteredIndex;
} }
@@ -249,7 +248,7 @@ void IUIScene_TradingMenu::updateDisplay()
vector<HtmlString> *offerDescription = GetItemDescription(activeRecipe->getSellItem()); vector<HtmlString> *offerDescription = GetItemDescription(activeRecipe->getSellItem());
setOfferDescription(offerDescription); setOfferDescription(offerDescription);
shared_ptr<ItemInstance> buyAItem = activeRecipe->getBuyAItem(); shared_ptr<ItemInstance> buyAItem = activeRecipe->getBuyAItem();
shared_ptr<ItemInstance> buyBItem = activeRecipe->getBuyBItem(); shared_ptr<ItemInstance> buyBItem = activeRecipe->getBuyBItem();
@@ -307,7 +306,7 @@ void IUIScene_TradingMenu::updateDisplay()
setRequest1RedBox(false); setRequest1RedBox(false);
setRequest2RedBox(false); setRequest2RedBox(false);
setRequest1Item(nullptr); setRequest1Item(nullptr);
setRequest2Item(nullptr); setRequest2Item(nullptr);
vector<HtmlString> offerDescription; vector<HtmlString> offerDescription;
setOfferDescription(&offerDescription); setOfferDescription(&offerDescription);
} }

14
Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
View File

@@ -24,7 +24,7 @@ bool UIControl_EnchantmentButton::setupControl(UIScene *scene, IggyValuePath *pa
UIControl::setControlType(UIControl::eEnchantmentButton); UIControl::setControlType(UIControl::eEnchantmentButton);
bool success = UIControl_Button::setupControl(scene,parent,controlName); bool success = UIControl_Button::setupControl(scene,parent,controlName);
//Button specific initialisers //Button specific initialisers
m_funcChangeState = registerFastName(L"ChangeState"); m_funcChangeState = registerFastName(L"ChangeState");
return success; return success;
@@ -40,7 +40,7 @@ void UIControl_EnchantmentButton::ReInit()
{ {
UIControl_Button::ReInit(); UIControl_Button::ReInit();
m_lastState = eState_Inactive; m_lastState = eState_Inactive;
m_lastCost = 0; m_lastCost = 0;
m_bHasFocus = false; m_bHasFocus = false;
@@ -54,10 +54,10 @@ void UIControl_EnchantmentButton::tick()
} }
void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region) void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
{ {
UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene; UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene;
EnchantmentMenu *menu = enchantingScene->getMenu(); EnchantmentMenu *menu = enchantingScene->getMenu();
float width = region->x1 - region->x0; float width = region->x1 - region->x0;
float height = region->y1 - region->y0; float height = region->y1 - region->y0;
float xo = width/2; float xo = width/2;
@@ -101,7 +101,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.1f); glAlphaFunc(GL_GREATER, 0.1f);
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
wstring line = _toString<int>(cost); wstring line = std::to_wstring(cost);
Font *font = pMinecraft->altFont; Font *font = pMinecraft->altFont;
//int col = 0x685E4A; //int col = 0x685E4A;
unsigned int col = m_textColour; unsigned int col = m_textColour;
@@ -143,7 +143,7 @@ void UIControl_EnchantmentButton::updateState()
EState state = eState_Inactive; EState state = eState_Inactive;
int cost = menu->costs[m_index]; int cost = menu->costs[m_index];
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
if(cost > pMinecraft->localplayers[enchantingScene->getPad()]->experienceLevel && !pMinecraft->localplayers[enchantingScene->getPad()]->abilities.instabuild) if(cost > pMinecraft->localplayers[enchantingScene->getPad()]->experienceLevel && !pMinecraft->localplayers[enchantingScene->getPad()]->abilities.instabuild)
{ {
@@ -165,7 +165,7 @@ void UIControl_EnchantmentButton::updateState()
if(cost != m_lastCost) if(cost != m_lastCost)
{ {
setLabel( _toString<int>(cost) ); setLabel( std::to_wstring(cost) );
m_lastCost = cost; m_lastCost = cost;
m_enchantmentString = EnchantmentNames::instance.getRandomName(); m_enchantmentString = EnchantmentNames::instance.getRandomName();
} }

18
Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
View File

@@ -175,14 +175,14 @@ void UIControl_PlayerSkinPreview::CycleNextAnimation()
void UIControl_PlayerSkinPreview::CyclePreviousAnimation() void UIControl_PlayerSkinPreview::CyclePreviousAnimation()
{ {
m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1); m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1);
if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1); if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1);
m_swingTime = 0.0f; m_swingTime = 0.0f;
} }
void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region) void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
{ {
Minecraft *pMinecraft=Minecraft::GetInstance(); Minecraft *pMinecraft=Minecraft::GetInstance();
glEnable(GL_RESCALE_NORMAL); glEnable(GL_RESCALE_NORMAL);
@@ -193,7 +193,7 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
float height = region->y1 - region->y0; float height = region->y1 - region->y0;
float xo = width/2; float xo = width/2;
float yo = height; float yo = height;
glTranslatef(xo, yo - 3.5f, 50.0f); glTranslatef(xo, yo - 3.5f, 50.0f);
//glTranslatef(120.0f, 294, 0.0f); //glTranslatef(120.0f, 294, 0.0f);
@@ -224,11 +224,9 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
//vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts(); //vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0) if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0)
{ {
for(AUTO_VAR(it, m_pvAdditionalModelParts->begin()); it != m_pvAdditionalModelParts->end(); ++it) for(auto& pModelPart : *m_pvAdditionalModelParts)
{ {
ModelPart *pModelPart=*it;
pModelPart->visible=true; pModelPart->visible=true;
} }
} }
@@ -238,11 +236,9 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
// hide the additional parts // hide the additional parts
if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0) if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0)
{ {
for(AUTO_VAR(it, m_pvAdditionalModelParts->begin()); it != m_pvAdditionalModelParts->end(); ++it) for(auto& pModelPart : *m_pvAdditionalModelParts)
{ {
ModelPart *pModelPart=*it;
pModelPart->visible=false; pModelPart->visible=false;
} }
} }

100
Minecraft.Client/Common/UI/UIController.cpp
View File

@@ -182,7 +182,7 @@ UIController::UIController()
{ {
m_uiDebugConsole = NULL; m_uiDebugConsole = NULL;
m_reloadSkinThread = NULL; m_reloadSkinThread = NULL;
m_navigateToHomeOnReload = false; m_navigateToHomeOnReload = false;
m_bCleanupOnReload = false; m_bCleanupOnReload = false;
@@ -302,7 +302,7 @@ void UIController::postInit()
IggySetTextureSubstitutionCallbacks ( &UIController::TextureSubstitutionCreateCallback , &UIController::TextureSubstitutionDestroyCallback, this ); IggySetTextureSubstitutionCallbacks ( &UIController::TextureSubstitutionCreateCallback , &UIController::TextureSubstitutionDestroyCallback, this );
SetupFont(); SetupFont();
// //
loadSkins(); loadSkins();
for(unsigned int i = 0; i < eUIGroup_COUNT; ++i) for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
@@ -383,7 +383,7 @@ void UIController::SetupFont()
app.m_dlcManager.LanguageChanged(); app.m_dlcManager.LanguageChanged();
app.loadStringTable(); // Switch to use new string table, app.loadStringTable(); // Switch to use new string table,
if (m_eTargetFont == m_eCurrentFont) if (m_eTargetFont == m_eCurrentFont)
{ {
// 4J-JEV: If we're ingame, reload the font to update all the text. // 4J-JEV: If we're ingame, reload the font to update all the text.
@@ -458,12 +458,12 @@ bool UIController::UsingBitmapFont()
void UIController::tick() void UIController::tick()
{ {
SetupFont(); // If necessary, change font. SetupFont(); // If necessary, change font.
if ( (m_navigateToHomeOnReload || m_bCleanupOnReload) && !ui.IsReloadingSkin() ) if ( (m_navigateToHomeOnReload || m_bCleanupOnReload) && !ui.IsReloadingSkin() )
{ {
ui.CleanUpSkinReload(); ui.CleanUpSkinReload();
if (m_navigateToHomeOnReload || !g_NetworkManager.IsInSession()) if (m_navigateToHomeOnReload || !g_NetworkManager.IsInSession())
{ {
ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MainMenu); ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MainMenu);
} }
@@ -500,8 +500,8 @@ void UIController::tick()
// Clear out the cached movie file data // Clear out the cached movie file data
__int64 currentTime = System::currentTimeMillis(); __int64 currentTime = System::currentTimeMillis();
for(AUTO_VAR(it, m_cachedMovieData.begin()); it != m_cachedMovieData.end();) for (auto it = m_cachedMovieData.begin(); it != m_cachedMovieData.end();)
{ {
if(it->second.m_expiry < currentTime) if(it->second.m_expiry < currentTime)
{ {
delete [] it->second.m_ba.data; delete [] it->second.m_ba.data;
@@ -730,7 +730,7 @@ void UIController::CleanUpSkinReload()
{ {
if(!Minecraft::GetInstance()->skins->getSelected()->hasAudio()) if(!Minecraft::GetInstance()->skins->getSelected()->hasAudio())
{ {
#ifdef _DURANGO #ifdef _DURANGO
DWORD result = StorageManager.UnmountInstalledDLC(L"TPACK"); DWORD result = StorageManager.UnmountInstalledDLC(L"TPACK");
#else #else
DWORD result = StorageManager.UnmountInstalledDLC("TPACK"); DWORD result = StorageManager.UnmountInstalledDLC("TPACK");
@@ -738,9 +738,8 @@ void UIController::CleanUpSkinReload()
} }
} }
for(AUTO_VAR(it,m_queuedMessageBoxData.begin()); it != m_queuedMessageBoxData.end(); ++it) for(auto queuedData : m_queuedMessageBoxData)
{ {
QueuedMessageBoxData *queuedData = *it;
ui.NavigateToScene(queuedData->iPad, eUIScene_MessageBox, &queuedData->info, queuedData->layer, eUIGroup_Fullscreen); ui.NavigateToScene(queuedData->iPad, eUIScene_MessageBox, &queuedData->info, queuedData->layer, eUIGroup_Fullscreen);
delete queuedData->info.uiOptionA; delete queuedData->info.uiOptionA;
delete queuedData; delete queuedData;
@@ -752,8 +751,8 @@ byteArray UIController::getMovieData(const wstring &filename)
{ {
// Cache everything we load in the current tick // Cache everything we load in the current tick
__int64 targetTime = System::currentTimeMillis() + (1000LL * 60); __int64 targetTime = System::currentTimeMillis() + (1000LL * 60);
AUTO_VAR(it,m_cachedMovieData.find(filename)); auto it = m_cachedMovieData.find(filename);
if(it == m_cachedMovieData.end() ) if(it == m_cachedMovieData.end() )
{ {
byteArray baFile = app.getArchiveFile(filename); byteArray baFile = app.getArchiveFile(filename);
CachedMovieData cmd; CachedMovieData cmd;
@@ -959,7 +958,7 @@ void UIController::handleInput()
{ {
#ifdef _DURANGO #ifdef _DURANGO
// 4J-JEV: Added exception for primary play who migh've uttered speech commands. // 4J-JEV: Added exception for primary play who migh've uttered speech commands.
if(iPad != ProfileManager.GetPrimaryPad() if(iPad != ProfileManager.GetPrimaryPad()
&& (!InputManager.IsPadConnected(iPad) || !InputManager.IsPadLocked(iPad)) ) continue; && (!InputManager.IsPadConnected(iPad) || !InputManager.IsPadLocked(iPad)) ) continue;
#endif #endif
for(unsigned int key = 0; key <= ACTION_MAX_MENU; ++key) for(unsigned int key = 0; key <= ACTION_MAX_MENU; ++key)
@@ -1035,7 +1034,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
{ {
// no active touch? clear active and highlighted touch UI elements // no active touch? clear active and highlighted touch UI elements
m_ActiveUIElement = NULL; m_ActiveUIElement = NULL;
m_HighlightedUIElement = NULL; m_HighlightedUIElement = NULL;
// fullscreen first // fullscreen first
UIScene *pScene=m_groups[(int)eUIGroup_Fullscreen]->getCurrentScene(); UIScene *pScene=m_groups[(int)eUIGroup_Fullscreen]->getCurrentScene();
@@ -1085,7 +1084,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
} }
} }
} }
} }
else if(m_bTouchscreenPressed && pTouchData->reportNum==1) else if(m_bTouchscreenPressed && pTouchData->reportNum==1)
{ {
// fullscreen first // fullscreen first
@@ -1337,8 +1336,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
app.DebugPrintf(app.USER_SR, "Total static: %d , Total dynamic: %d\n", totalStatic, totalDynamic); app.DebugPrintf(app.USER_SR, "Total static: %d , Total dynamic: %d\n", totalStatic, totalDynamic);
app.DebugPrintf(app.USER_SR, "\n\nEND TOTAL SWF MEMORY USAGE\n"); app.DebugPrintf(app.USER_SR, "\n\nEND TOTAL SWF MEMORY USAGE\n");
app.DebugPrintf(app.USER_SR, "********************************\n\n"); app.DebugPrintf(app.USER_SR, "********************************\n\n");
} }
else else
#endif #endif
#endif #endif
#endif #endif
@@ -1535,7 +1534,7 @@ void UIController::setupCustomDrawGameState()
glLoadIdentity(); glLoadIdentity();
glOrtho(0, m_fScreenWidth, m_fScreenHeight, 0, 1000, 3000); glOrtho(0, m_fScreenWidth, m_fScreenHeight, 0, 1000, 3000);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.1f); glAlphaFunc(GL_GREATER, 0.1f);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
@@ -1635,22 +1634,22 @@ void RADLINK UIController::CustomDrawCallback(void *user_callback_data, Iggy *pl
//Description //Description
//Callback to create a user-defined texture to replace SWF-defined textures. //Callback to create a user-defined texture to replace SWF-defined textures.
//Parameters //Parameters
//width - Input value: optional number of pixels wide specified from AS3, or -1 if not defined. Output value: the number of pixels wide to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is. //width - Input value: optional number of pixels wide specified from AS3, or -1 if not defined. Output value: the number of pixels wide to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
//height - Input value: optional number of pixels high specified from AS3, or -1 if not defined. Output value: the number of pixels high to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is. //height - Input value: optional number of pixels high specified from AS3, or -1 if not defined. Output value: the number of pixels high to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
//destroy_callback_data - Optional additional output value you can set; the value will be passed along to the corresponding Iggy_TextureSubstitutionDestroyCallback (e.g. you can store the pointer to your own internal structure here). //destroy_callback_data - Optional additional output value you can set; the value will be passed along to the corresponding Iggy_TextureSubstitutionDestroyCallback (e.g. you can store the pointer to your own internal structure here).
//return - A platform-independent wrapped texture handle provided by GDraw, or NULL (NULL with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks. //return - A platform-independent wrapped texture handle provided by GDraw, or NULL (NULL with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks.
// //
//Discussion //Discussion
// //
//If your texture includes an alpha channel, you must use a premultiplied alpha (where the R,G, and B channels have been multiplied by the alpha value); all Iggy shaders assume premultiplied alpha (and it looks better anyway). //If your texture includes an alpha channel, you must use a premultiplied alpha (where the R,G, and B channels have been multiplied by the alpha value); all Iggy shaders assume premultiplied alpha (and it looks better anyway).
GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void * * destroy_callback_data ) GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void * * destroy_callback_data )
{ {
UIController *uiController = (UIController *)user_callback_data; UIController *uiController = static_cast<UIController *>(user_callback_data);
AUTO_VAR(it,uiController->m_substitutionTextures.find((wchar_t *)texture_name)); auto it = uiController->m_substitutionTextures.find(texture_name);
if(it != uiController->m_substitutionTextures.end()) if(it != uiController->m_substitutionTextures.end())
{ {
app.DebugPrintf("Found substitution texture %ls, with %d bytes\n", (wchar_t *)texture_name,it->second.length); app.DebugPrintf("Found substitution texture %ls, with %d bytes\n", texture_name,it->second.length);
BufferedImage image(it->second.data, it->second.length); BufferedImage image(it->second.data, it->second.length);
if( image.getData() != NULL ) if( image.getData() != NULL )
@@ -1711,9 +1710,9 @@ void UIController::registerSubstitutionTexture(const wstring &textureName, PBYTE
void UIController::unregisterSubstitutionTexture(const wstring &textureName, bool deleteData) void UIController::unregisterSubstitutionTexture(const wstring &textureName, bool deleteData)
{ {
AUTO_VAR(it,m_substitutionTextures.find(textureName)); auto it = m_substitutionTextures.find(textureName);
if(it != m_substitutionTextures.end()) if(it != m_substitutionTextures.end())
{ {
if(deleteData) delete [] it->second.data; if(deleteData) delete [] it->second.data;
m_substitutionTextures.erase(it); m_substitutionTextures.erase(it);
@@ -1854,7 +1853,7 @@ bool UIController::NavigateBack(int iPad, bool forceUsePad, EUIScene eScene, EUI
void UIController::NavigateToHomeMenu() void UIController::NavigateToHomeMenu()
{ {
ui.CloseAllPlayersScenes(); ui.CloseAllPlayersScenes();
// Alert the app the we no longer want to be informed of ethernet connections // Alert the app the we no longer want to be informed of ethernet connections
app.SetLiveLinkRequired( false ); app.SetLiveLinkRequired( false );
@@ -1953,8 +1952,8 @@ size_t UIController::RegisterForCallbackId(UIScene *scene)
void UIController::UnregisterCallbackId(size_t id) void UIController::UnregisterCallbackId(size_t id)
{ {
EnterCriticalSection(&m_registeredCallbackScenesCS); EnterCriticalSection(&m_registeredCallbackScenesCS);
AUTO_VAR(it, m_registeredCallbackScenes.find(id) ); auto it = m_registeredCallbackScenes.find(id);
if(it != m_registeredCallbackScenes.end() ) if(it != m_registeredCallbackScenes.end() )
{ {
m_registeredCallbackScenes.erase(it); m_registeredCallbackScenes.erase(it);
} }
@@ -1964,8 +1963,8 @@ void UIController::UnregisterCallbackId(size_t id)
UIScene *UIController::GetSceneFromCallbackId(size_t id) UIScene *UIController::GetSceneFromCallbackId(size_t id)
{ {
UIScene *scene = NULL; UIScene *scene = NULL;
AUTO_VAR(it, m_registeredCallbackScenes.find(id) ); auto it = m_registeredCallbackScenes.find(id);
if(it != m_registeredCallbackScenes.end() ) if(it != m_registeredCallbackScenes.end() )
{ {
scene = it->second; scene = it->second;
} }
@@ -2017,7 +2016,7 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad)
m_groups[(int)group]->closeAllScenes(); m_groups[(int)group]->closeAllScenes();
m_groups[(int)group]->getTooltips()->SetTooltips(-1); m_groups[(int)group]->getTooltips()->SetTooltips(-1);
// This should cause the popup to dissappear // This should cause the popup to dissappear
TutorialPopupInfo popupInfo; TutorialPopupInfo popupInfo;
if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(&popupInfo); if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(&popupInfo);
@@ -2168,7 +2167,7 @@ void UIController::SetMenuDisplayed(int iPad,bool bVal)
#ifdef _DURANGO #ifdef _DURANGO
// 4J-JEV: When in-game, allow player to toggle the 'Pause' and 'IngameInfo' menus via Kinnect. // 4J-JEV: When in-game, allow player to toggle the 'Pause' and 'IngameInfo' menus via Kinnect.
if (Minecraft::GetInstance()->running) if (Minecraft::GetInstance()->running)
InputManager.SetEnabledGtcButtons(_360_GTC_MENU | _360_GTC_PAUSE | _360_GTC_VIEW); InputManager.SetEnabledGtcButtons(_360_GTC_MENU | _360_GTC_PAUSE | _360_GTC_VIEW);
#endif #endif
} }
@@ -2341,7 +2340,7 @@ void UIController::PlayUISFX(ESoundEffect eSound)
// Don't play multiple SFX on the same tick // Don't play multiple SFX on the same tick
// (prevents horrible sounds when programmatically setting multiple checkboxes) // (prevents horrible sounds when programmatically setting multiple checkboxes)
if (time - m_lastUiSfx < 10) { return; } if (time - m_lastUiSfx < 10) { return; }
m_lastUiSfx = time; m_lastUiSfx = time;
Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f); Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f);
} }
@@ -2588,7 +2587,7 @@ void UIController::SetTrialTimerLimitSecs(unsigned int uiSeconds)
void UIController::UpdateTrialTimer(unsigned int iPad) void UIController::UpdateTrialTimer(unsigned int iPad)
{ {
WCHAR wcTime[20]; WCHAR wcTime[20];
DWORD dwTimeTicks=(DWORD)app.getTrialTimer(); DWORD dwTimeTicks=(DWORD)app.getTrialTimer();
@@ -2650,7 +2649,7 @@ void UIController::ShowAutosaveCountdownTimer(bool show)
void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds) void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
{ {
#if !(defined(_XBOX_ONE) || defined(__ORBIS__)) #if !(defined(_XBOX_ONE) || defined(__ORBIS__))
WCHAR wcAutosaveCountdown[100]; WCHAR wcAutosaveCountdown[100];
swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds); swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds);
if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown); if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);
#endif #endif
@@ -2820,7 +2819,7 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1
#ifdef __ORBIS__ #ifdef __ORBIS__
// Show the vague UGC system message in addition to our message // Show the vague UGC system message in addition to our message
ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad ); ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad );
return C4JStorage::EMessage_ResultAccept; return C4JStorage::EMessage_ResultAccept;
#elif defined(__PSVITA__) #elif defined(__PSVITA__)
ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, iPad ); ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, iPad );
UINT uiIDA[1]; UINT uiIDA[1];
@@ -2857,7 +2856,7 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT
#ifdef __ORBIS__ #ifdef __ORBIS__
// Show the vague UGC system message in addition to our message // Show the vague UGC system message in addition to our message
ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad ); ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_UGC_RESTRICTION, iPad );
return C4JStorage::EMessage_ResultAccept; return C4JStorage::EMessage_ResultAccept;
#elif defined(__PSVITA__) #elif defined(__PSVITA__)
ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_AGE_RESTRICTION, iPad ); ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_AGE_RESTRICTION, iPad );
return C4JStorage::EMessage_ResultAccept; return C4JStorage::EMessage_ResultAccept;
@@ -2897,7 +2896,7 @@ void UIController::setFontCachingCalculationBuffer(int length)
} }
} }
// Returns the first scene of given type if it exists, NULL otherwise // Returns the first scene of given type if it exists, NULL otherwise
UIScene *UIController::FindScene(EUIScene sceneType) UIScene *UIController::FindScene(EUIScene sceneType)
{ {
UIScene *pScene = NULL; UIScene *pScene = NULL;
@@ -3002,11 +3001,8 @@ void UIController::TouchBoxRebuild(UIScene *pUIScene)
ui.TouchBoxesClear(pUIScene); ui.TouchBoxesClear(pUIScene);
// rebuild boxes // rebuild boxes
AUTO_VAR(itEnd, pUIScene->GetControls()->end()); for ( UIControl *control : *pUIScene->GetControls() )
for (AUTO_VAR(it, pUIScene->GetControls()->begin()); it != itEnd; it++)
{ {
UIControl *control=(UIControl *)*it;
if(control->getControlType() == UIControl::eButton || if(control->getControlType() == UIControl::eButton ||
control->getControlType() == UIControl::eSlider || control->getControlType() == UIControl::eSlider ||
control->getControlType() == UIControl::eCheckBox || control->getControlType() == UIControl::eCheckBox ||
@@ -3035,11 +3031,9 @@ void UIController::TouchBoxesClear(UIScene *pUIScene)
EUILayer eUILayer=pUIScene->GetParentLayer()->m_iLayer; EUILayer eUILayer=pUIScene->GetParentLayer()->m_iLayer;
EUIScene eUIscene=pUIScene->getSceneType(); EUIScene eUIscene=pUIScene->getSceneType();
AUTO_VAR(itEnd, m_TouchBoxes[eUIGroup][eUILayer][eUIscene].end()); for ( UIELEMENT *element : m_TouchBoxes[eUIGroup][eUILayer][eUIscene] )
for (AUTO_VAR(it, m_TouchBoxes[eUIGroup][eUILayer][eUIscene].begin()); it != itEnd; it++)
{ {
UIELEMENT *element=(UIELEMENT *)*it; delete element;
delete element;
} }
m_TouchBoxes[eUIGroup][eUILayer][eUIscene].clear(); m_TouchBoxes[eUIGroup][eUILayer][eUIscene].clear();
} }
@@ -3056,10 +3050,8 @@ bool UIController::TouchBoxHit(UIScene *pUIScene,S32 x, S32 y)
if(m_TouchBoxes[eUIGroup][eUILayer][eUIscene].size()>0) if(m_TouchBoxes[eUIGroup][eUILayer][eUIscene].size()>0)
{ {
AUTO_VAR(itEnd, m_TouchBoxes[eUIGroup][eUILayer][eUIscene].end()); for ( UIELEMENT *element : m_TouchBoxes[eUIGroup][eUILayer][eUIscene] )
for (AUTO_VAR(it, m_TouchBoxes[eUIGroup][eUILayer][eUIscene].begin()); it != itEnd; it++)
{ {
UIELEMENT *element=(UIELEMENT *)*it;
if(element->pControl->getHidden() == false && element->pControl->getVisible()) // ignore removed controls if(element->pControl->getHidden() == false && element->pControl->getVisible()) // ignore removed controls
{ {
if((x>=element->x1) &&(x<=element->x2) && (y>=element->y1) && (y<=element->y2)) if((x>=element->x1) &&(x<=element->x2) && (y>=element->y1) && (y<=element->y2))
@@ -3075,7 +3067,7 @@ bool UIController::TouchBoxHit(UIScene *pUIScene,S32 x, S32 y)
return true; return true;
} }
} }
} }
} }
//app.DebugPrintf("MISS at x = %i y = %i\n", (int)x, (int)y); //app.DebugPrintf("MISS at x = %i y = %i\n", (int)x, (int)y);

154
Minecraft.Client/Common/UI/UILayer.cpp
View File

@@ -18,18 +18,16 @@ void UILayer::tick()
{ {
// Delete old scenes - deleting a scene can cause a new scene to be deleted, so we need to make a copy of the scenes that we are going to try and destroy this tick // Delete old scenes - deleting a scene can cause a new scene to be deleted, so we need to make a copy of the scenes that we are going to try and destroy this tick
vector<UIScene *>scenesToDeleteCopy; vector<UIScene *>scenesToDeleteCopy;
for( AUTO_VAR(it,m_scenesToDelete.begin()); it != m_scenesToDelete.end(); it++) for(auto& scene : m_scenesToDelete)
{ {
UIScene *scene = (*it);
scenesToDeleteCopy.push_back(scene); scenesToDeleteCopy.push_back(scene);
} }
m_scenesToDelete.clear(); m_scenesToDelete.clear();
// Delete the scenes in our copy if they are ready to delete, otherwise add back to the ones that are still to be deleted. Actually deleting a scene might also add something back into m_scenesToDelete. // Delete the scenes in our copy if they are ready to delete, otherwise add back to the ones that are still to be deleted. Actually deleting a scene might also add something back into m_scenesToDelete.
for( AUTO_VAR(it,scenesToDeleteCopy.begin()); it != scenesToDeleteCopy.end(); it++) for(auto& scene : scenesToDeleteCopy)
{ {
UIScene *scene = (*it); if( scene && scene->isReadyToDelete())
if( scene->isReadyToDelete())
{ {
delete scene; delete scene;
} }
@@ -38,7 +36,7 @@ void UILayer::tick()
m_scenesToDelete.push_back(scene); m_scenesToDelete.push_back(scene);
} }
} }
while (!m_scenesToDestroy.empty()) while (!m_scenesToDestroy.empty())
{ {
UIScene *scene = m_scenesToDestroy.back(); UIScene *scene = m_scenesToDestroy.back();
@@ -46,14 +44,13 @@ void UILayer::tick()
scene->destroyMovie(); scene->destroyMovie();
} }
m_scenesToDestroy.clear(); m_scenesToDestroy.clear();
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto & component : m_components)
{ {
(*it)->tick(); component->tick();
} }
// Note: reverse iterator, the last element is the top of the stack // Note: reverse iterator, the last element is the top of the stack
int sceneIndex = m_sceneStack.size() - 1; int sceneIndex = m_sceneStack.size() - 1;
//for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it)
while( sceneIndex >= 0 && sceneIndex < m_sceneStack.size() ) while( sceneIndex >= 0 && sceneIndex < m_sceneStack.size() )
{ {
//(*it)->tick(); //(*it)->tick();
@@ -68,20 +65,20 @@ void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport)
{ {
if(!ui.IsExpectingOrReloadingSkin()) if(!ui.IsExpectingOrReloadingSkin())
{ {
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto& it : m_components)
{
AUTO_VAR(itRef,m_componentRefCount.find((*it)->getSceneType()));
if(itRef != m_componentRefCount.end() && itRef->second.second)
{ {
if((*it)->isVisible() ) auto itRef = m_componentRefCount.find(it->getSceneType());
if(itRef != m_componentRefCount.end() && itRef->second.second)
{ {
PIXBeginNamedEvent(0, "Rendering component %d", (*it)->getSceneType() ); if(it->isVisible() )
(*it)->render(width, height,viewport); {
PIXEndNamedEvent(); PIXBeginNamedEvent(0, "Rendering component %d", it->getSceneType() );
it->render(width, height,viewport);
PIXEndNamedEvent();
}
} }
} }
} }
}
if(!m_sceneStack.empty()) if(!m_sceneStack.empty())
{ {
int lowestRenderable = m_sceneStack.size() - 1; int lowestRenderable = m_sceneStack.size() - 1;
@@ -139,9 +136,9 @@ bool UILayer::HasFocus(int iPad)
bool UILayer::hidesLowerScenes() bool UILayer::hidesLowerScenes()
{ {
bool hidesScenes = false; bool hidesScenes = false;
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto& it : m_components)
{ {
if((*it)->hidesLowerScenes()) if(it->hidesLowerScenes())
{ {
hidesScenes = true; hidesScenes = true;
break; break;
@@ -168,28 +165,27 @@ void UILayer::getRenderDimensions(S32 &width, S32 &height)
void UILayer::DestroyAll() void UILayer::DestroyAll()
{ {
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto& it : m_components)
{ {
(*it)->destroyMovie(); it->destroyMovie();
} }
for(AUTO_VAR(it, m_sceneStack.begin()); it != m_sceneStack.end(); ++it) for(auto& it : m_sceneStack)
{ {
(*it)->destroyMovie(); it->destroyMovie();
} }
} }
void UILayer::ReloadAll(bool force) void UILayer::ReloadAll(bool force)
{ {
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto& it : m_components)
{ {
(*it)->reloadMovie(force); it->reloadMovie(force);
} }
if(!m_sceneStack.empty()) if(!m_sceneStack.empty())
{ {
int lowestRenderable = 0; for(auto& lowestRenderable : m_sceneStack)
for(;lowestRenderable < m_sceneStack.size(); ++lowestRenderable)
{ {
m_sceneStack[lowestRenderable]->reloadMovie(force); lowestRenderable->reloadMovie(force);
} }
} }
} }
@@ -440,9 +436,9 @@ bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData)
} }
m_sceneStack.push_back(newScene); m_sceneStack.push_back(newScene);
updateFocusState(); updateFocusState();
newScene->tick(); newScene->tick();
return true; return true;
@@ -493,8 +489,8 @@ bool UILayer::NavigateBack(int iPad, EUIScene eScene)
void UILayer::showComponent(int iPad, EUIScene scene, bool show) void UILayer::showComponent(int iPad, EUIScene scene, bool show)
{ {
AUTO_VAR(it,m_componentRefCount.find(scene)); auto it = m_componentRefCount.find(scene);
if(it != m_componentRefCount.end()) if(it != m_componentRefCount.end())
{ {
it->second.second = show; it->second.second = show;
return; return;
@@ -505,8 +501,8 @@ void UILayer::showComponent(int iPad, EUIScene scene, bool show)
bool UILayer::isComponentVisible(EUIScene scene) bool UILayer::isComponentVisible(EUIScene scene)
{ {
bool visible = false; bool visible = false;
AUTO_VAR(it,m_componentRefCount.find(scene)); auto it = m_componentRefCount.find(scene);
if(it != m_componentRefCount.end()) if(it != m_componentRefCount.end())
{ {
visible = it->second.second; visible = it->second.second;
} }
@@ -515,16 +511,16 @@ bool UILayer::isComponentVisible(EUIScene scene)
UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData) UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
{ {
AUTO_VAR(it,m_componentRefCount.find(scene)); auto it = m_componentRefCount.find(scene);
if(it != m_componentRefCount.end()) if(it != m_componentRefCount.end())
{ {
++it->second.first; ++it->second.first;
for(AUTO_VAR(itComp,m_components.begin()); itComp != m_components.end(); ++itComp) for(auto& itComp : m_components)
{ {
if( (*itComp)->getSceneType() == scene ) if( itComp->getSceneType() == scene )
{ {
return *itComp; return itComp;
} }
} }
return NULL; return NULL;
@@ -586,16 +582,16 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
void UILayer::removeComponent(EUIScene scene) void UILayer::removeComponent(EUIScene scene)
{ {
AUTO_VAR(it,m_componentRefCount.find(scene)); auto it = m_componentRefCount.find(scene);
if(it != m_componentRefCount.end()) if(it != m_componentRefCount.end())
{ {
--it->second.first; --it->second.first;
if(it->second.first <= 0) if(it->second.first <= 0)
{ {
m_componentRefCount.erase(it); m_componentRefCount.erase(it);
for(AUTO_VAR(compIt, m_components.begin()) ; compIt != m_components.end(); ) for (auto compIt = m_components.begin(); compIt != m_components.end();)
{ {
if( (*compIt)->getSceneType() == scene) if( (*compIt)->getSceneType() == scene)
{ {
#ifdef __PSVITA__ #ifdef __PSVITA__
@@ -622,8 +618,8 @@ void UILayer::removeScene(UIScene *scene)
ui.TouchBoxesClear(scene); ui.TouchBoxesClear(scene);
#endif #endif
AUTO_VAR(newEnd, std::remove(m_sceneStack.begin(), m_sceneStack.end(), scene) ); auto newEnd = std::remove(m_sceneStack.begin(), m_sceneStack.end(), scene);
m_sceneStack.erase(newEnd, m_sceneStack.end()); m_sceneStack.erase(newEnd, m_sceneStack.end());
m_scenesToDelete.push_back(scene); m_scenesToDelete.push_back(scene);
@@ -645,14 +641,14 @@ void UILayer::closeAllScenes()
vector<UIScene *> temp; vector<UIScene *> temp;
temp.insert(temp.end(), m_sceneStack.begin(), m_sceneStack.end()); temp.insert(temp.end(), m_sceneStack.begin(), m_sceneStack.end());
m_sceneStack.clear(); m_sceneStack.clear();
for(AUTO_VAR(it, temp.begin()); it != temp.end(); ++it) for(auto& it : temp)
{ {
#ifdef __PSVITA__ #ifdef __PSVITA__
// remove any touchboxes // remove any touchboxes
ui.TouchBoxesClear(*it); ui.TouchBoxesClear(it);
#endif #endif
m_scenesToDelete.push_back(*it); m_scenesToDelete.push_back(it);
(*it)->handleDestroy(); // For anything that might require the pointer be valid it->handleDestroy(); // For anything that might require the pointer be valid
} }
updateFocusState(); updateFocusState();
@@ -696,8 +692,8 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */)
m_bIgnorePlayerJoinMenuDisplayed = false; m_bIgnorePlayerJoinMenuDisplayed = false;
bool layerFocusSet = false; bool layerFocusSet = false;
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *scene = *it; UIScene *scene = *it;
// UPDATE FOCUS STATES // UPDATE FOCUS STATES
@@ -730,12 +726,12 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */)
// 4J-PB - this should just be true // 4J-PB - this should just be true
m_bMenuDisplayed=true; m_bMenuDisplayed=true;
EUIScene sceneType = scene->getSceneType(); EUIScene sceneType = scene->getSceneType();
switch(sceneType) switch(sceneType)
{ {
case eUIScene_PauseMenu: case eUIScene_PauseMenu:
m_bPauseMenuDisplayed = true; m_bPauseMenuDisplayed = true;
break; break;
case eUIScene_Crafting2x2Menu: case eUIScene_Crafting2x2Menu:
case eUIScene_Crafting3x3Menu: case eUIScene_Crafting3x3Menu:
@@ -757,7 +753,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */)
// Intentional fall-through // Intentional fall-through
case eUIScene_DeathMenu: case eUIScene_DeathMenu:
case eUIScene_FullscreenProgress: case eUIScene_FullscreenProgress:
case eUIScene_SignEntryMenu: case eUIScene_SignEntryMenu:
case eUIScene_EndPoem: case eUIScene_EndPoem:
m_bIgnoreAutosaveMenuDisplayed = true; m_bIgnoreAutosaveMenuDisplayed = true;
@@ -766,7 +762,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */)
switch(sceneType) switch(sceneType)
{ {
case eUIScene_FullscreenProgress: case eUIScene_FullscreenProgress:
case eUIScene_EndPoem: case eUIScene_EndPoem:
case eUIScene_Credits: case eUIScene_Credits:
case eUIScene_LeaderboardsMenu: case eUIScene_LeaderboardsMenu:
@@ -783,7 +779,7 @@ bool UILayer::updateFocusState(bool allowedFocus /* = false */)
UIScene *UILayer::getCurrentScene() UIScene *UILayer::getCurrentScene()
{ {
// Note: reverse iterator, the last element is the top of the stack // Note: reverse iterator, the last element is the top of the stack
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for( auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *scene = *it; UIScene *scene = *it;
// 4J-PB - only used on Vita, so iPad 0 is fine // 4J-PB - only used on Vita, so iPad 0 is fine
@@ -800,13 +796,13 @@ UIScene *UILayer::getCurrentScene()
void UILayer::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) void UILayer::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
{ {
// Note: reverse iterator, the last element is the top of the stack // Note: reverse iterator, the last element is the top of the stack
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *scene = *it; UIScene *scene = *it;
if(scene->hasFocus(iPad) && scene->canHandleInput()) if(scene->hasFocus(iPad) && scene->canHandleInput())
{ {
// 4J-PB - ignore repeats of action ABXY buttons // 4J-PB - ignore repeats of action ABXY buttons
// fix for PS3 213 - [MAIN MENU] Holding down buttons will continue to activate every prompt. // fix for PS3 213 - [MAIN MENU] Holding down buttons will continue to activate every prompt.
// 4J Stu - Changed this slightly to add the allowRepeat function so we can allow repeats in the crafting menu // 4J Stu - Changed this slightly to add the allowRepeat function so we can allow repeats in the crafting menu
if(repeat && !scene->allowRepeat(key) ) if(repeat && !scene->allowRepeat(key) )
{ {
@@ -814,8 +810,8 @@ void UILayer::handleInput(int iPad, int key, bool repeat, bool pressed, bool rel
} }
scene->handleInput(iPad, key, repeat, pressed, released, handled); scene->handleInput(iPad, key, repeat, pressed, released, handled);
} }
// Fix for PS3 #444 - [IN GAME] If the user keeps pressing CROSS while on the 'Save Game' screen the title will crash. // Fix for PS3 #444 - [IN GAME] If the user keeps pressing CROSS while on the 'Save Game' screen the title will crash.
handled = handled || scene->hidesLowerScenes() || scene->blocksInput(); handled = handled || scene->hidesLowerScenes() || scene->blocksInput();
if(handled ) break; if(handled ) break;
} }
@@ -825,8 +821,8 @@ void UILayer::handleInput(int iPad, int key, bool repeat, bool pressed, bool rel
void UILayer::HandleDLCMountingComplete() void UILayer::HandleDLCMountingComplete()
{ {
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *topScene = *it; UIScene *topScene = *it;
app.DebugPrintf("UILayer::HandleDLCMountingComplete - topScene\n"); app.DebugPrintf("UILayer::HandleDLCMountingComplete - topScene\n");
topScene->HandleDLCMountingComplete(); topScene->HandleDLCMountingComplete();
@@ -835,8 +831,8 @@ void UILayer::HandleDLCMountingComplete()
void UILayer::HandleDLCInstalled() void UILayer::HandleDLCInstalled()
{ {
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *topScene = *it; UIScene *topScene = *it;
topScene->HandleDLCInstalled(); topScene->HandleDLCInstalled();
} }
@@ -845,7 +841,7 @@ void UILayer::HandleDLCInstalled()
#ifdef _XBOX_ONE #ifdef _XBOX_ONE
void UILayer::HandleDLCLicenseChange() void UILayer::HandleDLCLicenseChange()
{ {
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for( auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *topScene = *it; UIScene *topScene = *it;
topScene->HandleDLCLicenseChange(); topScene->HandleDLCLicenseChange();
@@ -855,8 +851,8 @@ void UILayer::HandleDLCLicenseChange()
void UILayer::HandleMessage(EUIMessage message, void *data) void UILayer::HandleMessage(EUIMessage message, void *data)
{ {
for(AUTO_VAR(it,m_sceneStack.rbegin()); it != m_sceneStack.rend(); ++it) for (auto it = m_sceneStack.rbegin(); it != m_sceneStack.rend(); ++it)
{ {
UIScene *topScene = *it; UIScene *topScene = *it;
topScene->HandleMessage(message, data); topScene->HandleMessage(message, data);
} }
@@ -875,9 +871,9 @@ C4JRender::eViewportType UILayer::getViewport()
void UILayer::handleUnlockFullVersion() void UILayer::handleUnlockFullVersion()
{ {
for(AUTO_VAR(it, m_sceneStack.begin()); it != m_sceneStack.end(); ++it) for(auto& it : m_sceneStack)
{ {
(*it)->handleUnlockFullVersion(); it->handleUnlockFullVersion();
} }
} }
@@ -885,20 +881,20 @@ void UILayer::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
{ {
__int64 layerStatic = 0; __int64 layerStatic = 0;
__int64 layerDynamic = 0; __int64 layerDynamic = 0;
for(AUTO_VAR(it,m_components.begin()); it != m_components.end(); ++it) for(auto& it : m_components)
{ {
(*it)->PrintTotalMemoryUsage(layerStatic, layerDynamic); it->PrintTotalMemoryUsage(layerStatic, layerDynamic);
} }
for(AUTO_VAR(it, m_sceneStack.begin()); it != m_sceneStack.end(); ++it) for(auto& it : m_sceneStack)
{ {
(*it)->PrintTotalMemoryUsage(layerStatic, layerDynamic); it->PrintTotalMemoryUsage(layerStatic, layerDynamic);
} }
app.DebugPrintf(app.USER_SR, " \\- Layer static: %d , Layer dynamic: %d\n", layerStatic, layerDynamic); app.DebugPrintf(app.USER_SR, " \\- Layer static: %d , Layer dynamic: %d\n", layerStatic, layerDynamic);
totalStatic += layerStatic; totalStatic += layerStatic;
totalDynamic += layerDynamic; totalDynamic += layerDynamic;
} }
// Returns the first scene of given type if it exists, NULL otherwise // Returns the first scene of given type if it exists, NULL otherwise
UIScene *UILayer::FindScene(EUIScene sceneType) UIScene *UILayer::FindScene(EUIScene sceneType)
{ {
for (int i = 0; i < m_sceneStack.size(); i++) for (int i = 0; i < m_sceneStack.size(); i++)

69
Minecraft.Client/Common/UI/UIScene.cpp
View File

@@ -13,7 +13,7 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
m_iPad = iPad; m_iPad = iPad;
swf = NULL; swf = NULL;
m_pItemRenderer = NULL; m_pItemRenderer = NULL;
bHasFocus = false; bHasFocus = false;
m_hasTickedOnce = false; m_hasTickedOnce = false;
m_bFocussedOnce = false; m_bFocussedOnce = false;
@@ -27,7 +27,7 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
m_bUpdateOpacity = false; m_bUpdateOpacity = false;
m_backScene = NULL; m_backScene = NULL;
m_cacheSlotRenders = false; m_cacheSlotRenders = false;
m_needsCacheRendered = true; m_needsCacheRendered = true;
m_expectedCachedSlotCount = 0; m_expectedCachedSlotCount = 0;
@@ -39,9 +39,9 @@ UIScene::~UIScene()
/* Destroy the Iggy player. */ /* Destroy the Iggy player. */
IggyPlayerDestroy( swf ); IggyPlayerDestroy( swf );
for(AUTO_VAR(it,m_registeredTextures.begin()); it != m_registeredTextures.end(); ++it) for(auto & it : m_registeredTextures)
{ {
ui.unregisterSubstitutionTexture( it->first, it->second ); ui.unregisterSubstitutionTexture( it.first, it.second );
} }
if(m_callbackUniqueId != 0) if(m_callbackUniqueId != 0)
@@ -88,14 +88,14 @@ void UIScene::reloadMovie(bool force)
handlePreReload(); handlePreReload();
// Reload controls // Reload controls
for(AUTO_VAR(it, m_controls.begin()); it != m_controls.end(); ++it) for(auto & it : m_controls)
{ {
(*it)->ReInit(); it->ReInit();
} }
updateComponents(); updateComponents();
handleReload(); handleReload();
IggyDataValue result; IggyDataValue result;
IggyDataValue value[1]; IggyDataValue value[1];
@@ -332,7 +332,7 @@ void UIScene::loadMovie()
__int64 beforeLoad = ui.iggyAllocCount; __int64 beforeLoad = ui.iggyAllocCount;
swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, NULL); swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, NULL);
__int64 afterLoad = ui.iggyAllocCount; __int64 afterLoad = ui.iggyAllocCount;
IggyPlayerInitializeAndTickRS ( swf ); IggyPlayerInitializeAndTickRS ( swf );
__int64 afterTick = ui.iggyAllocCount; __int64 afterTick = ui.iggyAllocCount;
if(!swf) if(!swf)
@@ -344,7 +344,7 @@ void UIScene::loadMovie()
app.FatalLoadError(); app.FatalLoadError();
} }
app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() ); app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() );
IggyProperties *properties = IggyPlayerProperties ( swf ); IggyProperties *properties = IggyPlayerProperties ( swf );
m_movieHeight = properties->movie_height_in_pixels; m_movieHeight = properties->movie_height_in_pixels;
m_movieWidth = properties->movie_width_in_pixels; m_movieWidth = properties->movie_width_in_pixels;
@@ -352,7 +352,7 @@ void UIScene::loadMovie()
m_renderHeight = m_movieHeight; m_renderHeight = m_movieHeight;
S32 width, height; S32 width, height;
m_parentLayer->getRenderDimensions(width, height); m_parentLayer->getRenderDimensions(width, height);
IggyPlayerSetDisplaySize( swf, width, height ); IggyPlayerSetDisplaySize( swf, width, height );
IggyPlayerSetUserdata(swf,this); IggyPlayerSetUserdata(swf,this);
@@ -373,7 +373,7 @@ void UIScene::loadMovie()
{ {
totalStatic += memoryInfo.static_allocation_bytes; totalStatic += memoryInfo.static_allocation_bytes;
totalDynamic += memoryInfo.dynamic_allocation_bytes; totalDynamic += memoryInfo.dynamic_allocation_bytes;
app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), memoryInfo.subcategory_stringlen, memoryInfo.subcategory, app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), memoryInfo.subcategory_stringlen, memoryInfo.subcategory,
memoryInfo.static_allocation_bytes, memoryInfo.static_allocation_count, memoryInfo.dynamic_allocation_bytes, memoryInfo.dynamic_allocation_count); memoryInfo.static_allocation_bytes, memoryInfo.static_allocation_count, memoryInfo.dynamic_allocation_bytes, memoryInfo.dynamic_allocation_count);
++iteration; ++iteration;
//if(memoryInfo.static_allocation_bytes > 0) getDebugMemoryUseRecursive(moviePath, memoryInfo); //if(memoryInfo.static_allocation_bytes > 0) getDebugMemoryUseRecursive(moviePath, memoryInfo);
@@ -399,7 +399,7 @@ void UIScene::getDebugMemoryUseRecursive(const wstring &moviePath, IggyMemoryUse
internalIteration , internalIteration ,
&internalMemoryInfo )) &internalMemoryInfo ))
{ {
app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory, app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory,
internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count); internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count);
++internalIteration; ++internalIteration;
if(internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen) getDebugMemoryUseRecursive(moviePath, internalMemoryInfo); if(internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen) getDebugMemoryUseRecursive(moviePath, internalMemoryInfo);
@@ -440,9 +440,9 @@ void UIScene::tick()
while(IggyPlayerReadyToTick( swf )) while(IggyPlayerReadyToTick( swf ))
{ {
tickTimers(); tickTimers();
for(AUTO_VAR(it, m_controls.begin()); it != m_controls.end(); ++it) for(auto & it : m_controls)
{ {
(*it)->tick(); it->tick();
} }
IggyPlayerTickRS( swf ); IggyPlayerTickRS( swf );
m_hasTickedOnce = true; m_hasTickedOnce = true;
@@ -468,8 +468,8 @@ void UIScene::addTimer(int id, int ms)
void UIScene::killTimer(int id) void UIScene::killTimer(int id)
{ {
AUTO_VAR(it, m_timers.find(id)); auto it = m_timers.find(id);
if(it != m_timers.end()) if(it != m_timers.end())
{ {
it->second.running = false; it->second.running = false;
} }
@@ -478,13 +478,13 @@ void UIScene::killTimer(int id)
void UIScene::tickTimers() void UIScene::tickTimers()
{ {
int currentTime = System::currentTimeMillis(); int currentTime = System::currentTimeMillis();
for(AUTO_VAR(it, m_timers.begin()); it != m_timers.end();) for (auto it = m_timers.begin(); it != m_timers.end();)
{ {
if(!it->second.running) if(!it->second.running)
{ {
it = m_timers.erase(it); it = m_timers.erase(it);
} }
else else
{ {
if(currentTime > it->second.targetTime) if(currentTime > it->second.targetTime)
{ {
@@ -501,8 +501,8 @@ void UIScene::tickTimers()
IggyName UIScene::registerFastName(const wstring &name) IggyName UIScene::registerFastName(const wstring &name)
{ {
IggyName var; IggyName var;
AUTO_VAR(it,m_fastNames.find(name)); auto it = m_fastNames.find(name);
if(it != m_fastNames.end()) if(it != m_fastNames.end())
{ {
var = it->second; var = it->second;
} }
@@ -635,17 +635,16 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iP
if(useCommandBuffers) RenderManager.CBuffStart(list, true); if(useCommandBuffers) RenderManager.CBuffStart(list, true);
#endif #endif
PIXBeginNamedEvent(0,"Draw uncached"); PIXBeginNamedEvent(0,"Draw uncached");
ui.setupCustomDrawMatrices(this, customDrawRegion); ui.setupCustomDrawMatrices(this, customDrawRegion);
_customDrawSlotControl(customDrawRegion, iPad, item, fAlpha, isFoil, bDecorations, useCommandBuffers); _customDrawSlotControl(customDrawRegion, iPad, item, fAlpha, isFoil, bDecorations, useCommandBuffers);
delete customDrawRegion; delete customDrawRegion;
PIXEndNamedEvent(); PIXEndNamedEvent();
PIXBeginNamedEvent(0,"Draw all cache"); PIXBeginNamedEvent(0,"Draw all cache");
// Draw all the cached slots // Draw all the cached slots
for(AUTO_VAR(it, m_cachedSlotDraw.begin()); it != m_cachedSlotDraw.end(); ++it) for(auto& drawData : m_cachedSlotDraw)
{ {
CachedSlotDrawData *drawData = *it; ui.setupCustomDrawMatrices(this, drawData->customDrawRegion);
ui.setupCustomDrawMatrices(this, drawData->customDrawRegion);
_customDrawSlotControl(drawData->customDrawRegion, iPad, drawData->item, drawData->fAlpha, drawData->isFoil, drawData->bDecorations, useCommandBuffers); _customDrawSlotControl(drawData->customDrawRegion, iPad, drawData->item, drawData->fAlpha, drawData->isFoil, drawData->bDecorations, useCommandBuffers);
delete drawData->customDrawRegion; delete drawData->customDrawRegion;
delete drawData; delete drawData;
@@ -699,7 +698,7 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iP
// Finish GDraw and anything else that needs to be finalised // Finish GDraw and anything else that needs to be finalised
ui.endCustomDraw(region); ui.endCustomDraw(region);
} }
} }
} }
void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations, bool usingCommandBuffer) void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations, bool usingCommandBuffer)
@@ -717,7 +716,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
// we might want separate x & y scales here // we might want separate x & y scales here
float scaleX = bwidth / 16.0f; float scaleX = bwidth / 16.0f;
float scaleY = bheight / 16.0f; float scaleY = bheight / 16.0f;
glEnable(GL_RESCALE_NORMAL); glEnable(GL_RESCALE_NORMAL);
glPushMatrix(); glPushMatrix();
@@ -755,8 +754,8 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
if(bDecorations) if(bDecorations)
{ {
if((scaleX!=1.0f) ||(scaleY!=1.0f)) if((scaleX!=1.0f) ||(scaleY!=1.0f))
{ {
glPushMatrix(); glPushMatrix();
glScalef(scaleX, scaleY, 1.0f); glScalef(scaleX, scaleY, 1.0f);
int iX= (int)(0.5f+((float)x)/scaleX); int iX= (int)(0.5f+((float)x)/scaleX);
int iY= (int)(0.5f+((float)y)/scaleY); int iY= (int)(0.5f+((float)y)/scaleY);
@@ -991,8 +990,8 @@ int UIScene::convertGameActionToIggyKeycode(int action)
bool UIScene::allowRepeat(int key) bool UIScene::allowRepeat(int key)
{ {
// 4J-PB - ignore repeats of action ABXY buttons // 4J-PB - ignore repeats of action ABXY buttons
// fix for PS3 213 - [MAIN MENU] Holding down buttons will continue to activate every prompt. // fix for PS3 213 - [MAIN MENU] Holding down buttons will continue to activate every prompt.
switch(key) switch(key)
{ {
case ACTION_MENU_OK: case ACTION_MENU_OK:
@@ -1185,9 +1184,9 @@ void UIScene::registerSubstitutionTexture(const wstring &textureName, PBYTE pbDa
bool UIScene::hasRegisteredSubstitutionTexture(const wstring &textureName) bool UIScene::hasRegisteredSubstitutionTexture(const wstring &textureName)
{ {
AUTO_VAR(it, m_registeredTextures.find( textureName ) ); auto it = m_registeredTextures.find(textureName);
return it != m_registeredTextures.end(); return it != m_registeredTextures.end();
} }
void UIScene::_handleFocusChange(F64 controlId, F64 childId) void UIScene::_handleFocusChange(F64 controlId, F64 childId)
@@ -1240,10 +1239,8 @@ UIScene *UIScene::getBackScene()
#ifdef __PSVITA__ #ifdef __PSVITA__
void UIScene::UpdateSceneControls() void UIScene::UpdateSceneControls()
{ {
AUTO_VAR(itEnd, GetControls()->end()); for ( UIControl *control : *GetControls() )
for (AUTO_VAR(it, GetControls()->begin()); it != itEnd; it++)
{ {
UIControl *control=(UIControl *)*it;
control->UpdateControl(); control->UpdateControl();
} }
} }

83
Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
View File

@@ -84,6 +84,10 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
m_iGameModeId = GameType::SURVIVAL->getId(); m_iGameModeId = GameType::SURVIVAL->getId();
m_pDLCPack = NULL; m_pDLCPack = NULL;
m_bRebuildTouchBoxes = false; m_bRebuildTouchBoxes = false;
#ifdef _WINDOWS64
m_bDirectEditing = false;
m_iDirectEditCooldown = 0;
#endif
m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
// 4J-PB - read the settings for the online flag. We'll only save this setting if the user changed it. // 4J-PB - read the settings for the online flag. We'll only save this setting if the user changed it.
@@ -289,6 +293,54 @@ void UIScene_CreateWorldMenu::tick()
{ {
UIScene::tick(); UIScene::tick();
#ifdef _WINDOWS64
if (m_iDirectEditCooldown > 0)
m_iDirectEditCooldown--;
if (m_bDirectEditing)
{
wchar_t ch;
bool changed = false;
while (g_KBMInput.ConsumeChar(ch))
{
if (ch == 0x08) // backspace
{
if (!m_worldName.empty())
{
m_worldName.pop_back();
changed = true;
}
}
else if (ch == 0x0D) // enter - confirm
{
m_bDirectEditing = false;
m_iDirectEditCooldown = 4; // absorb the matching ACTION_MENU_OK that follows
m_editWorldName.setLabel(m_worldName.c_str());
}
else if ((int)m_worldName.length() < 25)
{
m_worldName += ch;
changed = true;
}
}
// Escape cancels and restores the original name
if (m_bDirectEditing && g_KBMInput.IsKeyPressed(VK_ESCAPE))
{
m_worldName = m_worldNameBeforeEdit;
m_bDirectEditing = false;
m_iDirectEditCooldown = 4;
m_editWorldName.setLabel(m_worldName.c_str());
m_buttonCreateWorld.setEnable(!m_worldName.empty());
}
else if (changed)
{
m_editWorldName.setLabel(m_worldName.c_str());
m_buttonCreateWorld.setEnable(!m_worldName.empty());
}
}
#endif
if(m_iSetTexturePackDescription >= 0 ) if(m_iSetTexturePackDescription >= 0 )
{ {
UpdateTexturePackDescription( m_iSetTexturePackDescription ); UpdateTexturePackDescription( m_iSetTexturePackDescription );
@@ -354,6 +406,9 @@ int UIScene_CreateWorldMenu::ContinueOffline(void *pParam,int iPad,C4JStorage::E
void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
{ {
if(m_bIgnoreInput) return; if(m_bIgnoreInput) return;
#ifdef _WINDOWS64
if (m_bDirectEditing || m_iDirectEditCooldown > 0) { handled = true; return; }
#endif
ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released); ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
@@ -408,6 +463,9 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId) void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
{ {
if(m_bIgnoreInput) return; if(m_bIgnoreInput) return;
#ifdef _WINDOWS64
if (m_bDirectEditing || m_iDirectEditCooldown > 0) return;
#endif
//CD - Added for audio //CD - Added for audio
ui.PlayUISFX(eSFX_Press); ui.PlayUISFX(eSFX_Press);
@@ -417,7 +475,28 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
case eControl_EditWorldName: case eControl_EditWorldName:
{ {
m_bIgnoreInput=true; m_bIgnoreInput=true;
#ifdef _WINDOWS64
if (Win64_IsControllerConnected())
{
UIKeyboardInitData kbData;
kbData.title = app.GetString(IDS_CREATE_NEW_WORLD);
kbData.defaultText = m_editWorldName.getLabel();
kbData.maxChars = 25;
kbData.callback = &UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback;
kbData.lpParam = this;
ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
}
else
{
// PC without controller: edit the name field directly in-place.
m_bIgnoreInput = false; // Don't block input - m_bDirectEditing is the guard
m_worldNameBeforeEdit = m_worldName;
m_bDirectEditing = true;
g_KBMInput.ClearCharBuffer();
}
#else
InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD),m_editWorldName.getLabel(),(DWORD)0,25,&UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback,this,C_4JInput::EKeyboardMode_Default); InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD),m_editWorldName.getLabel(),(DWORD)0,25,&UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback,this,C_4JInput::EKeyboardMode_Default);
#endif
} }
break; break;
case eControl_GameModeToggle: case eControl_GameModeToggle:
@@ -729,7 +808,11 @@ int UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bo
{ {
uint16_t pchText[128]; uint16_t pchText[128];
ZeroMemory(pchText, 128 * sizeof(uint16_t) ); ZeroMemory(pchText, 128 * sizeof(uint16_t) );
#ifdef _WINDOWS64
Win64_GetKeyboardText(pchText, 128);
#else
InputManager.GetText(pchText); InputManager.GetText(pchText);
#endif
if(pchText[0]!=0) if(pchText[0]!=0)
{ {

6
Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
View File

@@ -51,6 +51,12 @@ private:
DLCPack * m_pDLCPack; DLCPack * m_pDLCPack;
bool m_bRebuildTouchBoxes; bool m_bRebuildTouchBoxes;
#ifdef _WINDOWS64
bool m_bDirectEditing;
wstring m_worldNameBeforeEdit;
int m_iDirectEditCooldown;
#endif
public: public:
UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer); UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer);
virtual ~UIScene_CreateWorldMenu(); virtual ~UIScene_CreateWorldMenu();

85
Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
View File

@@ -191,13 +191,13 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
switch(iTextC) switch(iTextC)
{ {
case 0: case 0:
m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des fêtes de fin d'année.<br><br>1-4 joueurs<br>2-8 joueurs en réseau<br><br> Cet article fait l’objet d’une licence ou d’une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions générales du service du réseau, au contrat d’utilisateur, aux restrictions d’utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne téléchargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. <br><br>'Minecraft' est une marque commerciale de Notch Development AB."); m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des f<EFBFBD>tes de fin d'ann<EFBFBD>e.<br><br>1-4 joueurs<br>2-8 joueurs en r<EFBFBD>seau<br><br> Cet article fait l<EFBFBD>objet d<EFBFBD>une licence ou d<EFBFBD>une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions g<EFBFBD>n<EFBFBD>rales du service du r<EFBFBD>seau, au contrat d<EFBFBD>utilisateur, aux restrictions d<EFBFBD>utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne t<EFBFBD>l<EFBFBD>chargez pas ce produit. Cet article peut <EFBFBD>tre utilis<EFBFBD> avec un maximum de deux syst<EFBFBD>mes PlayStation<EFBFBD>3 activ<EFBFBD>s associ<EFBFBD>s <EFBFBD> ce compte Sony Entertainment Network.<EFBFBD><br><br>'Minecraft' est une marque commerciale de Notch Development AB.");
break; break;
case 1: case 1:
m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br> Sony Computer Entertainment America le concede la licencia o sublicencia de este artículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así como otros términos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos términos, no descargue este artículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. <br><br>'Minecraft' es una marca comercial de Notch Development AB."); m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br> Sony Computer Entertainment America le concede la licencia o sublicencia de este art<EFBFBD>culo, que est<EFBFBD> sujeto a los t<EFBFBD>rminos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este art<EFBFBD>culo, as<EFBFBD> como otros t<EFBFBD>rminos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos t<EFBFBD>rminos, no descargue este art<EFBFBD>culo. Este art<EFBFBD>culo puede usarse en hasta dos sistemas PlayStation<EFBFBD>3 activados asociados con esta cuenta de Sony Entertainment Network.<EFBFBD><br><br>'Minecraft' es una marca comercial de Notch Development AB.");
break; break;
case 2: case 2:
m_labelHTMLSellText.init("Este é um incrível pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br> Este item está sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estão localizados em www.us.playstation.com/support/useragreements. Caso não queira aceitar todos esses termos, não baixe este item. Este item pode ser usado com até 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. <br><br>'Minecraft' é uma marca registrada da Notch Development AB"); m_labelHTMLSellText.init("Este <EFBFBD> um incr<EFBFBD>vel pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br> Este item est<EFBFBD> sendo licenciado ou sublicenciado para voc<EFBFBD> pela Sony Computer Entertainment America e est<EFBFBD> sujeito aos Termos de Servi<EFBFBD>o da Rede e Acordo do Usu<EFBFBD>rio, as restri<EFBFBD><EFBFBD>es de uso deste item e outros termos aplic<EFBFBD>veis est<EFBFBD>o localizados em www.us.playstation.com/support/useragreements. Caso n<EFBFBD>o queira aceitar todos esses termos, n<EFBFBD>o baixe este item. Este item pode ser usado com at<EFBFBD> 2 sistemas PlayStation<EFBFBD>3 ativados associados a esta Conta de Rede Sony Entertainment.<EFBFBD><br><br>'Minecraft' <EFBFBD> uma marca registrada da Notch Development AB");
break; break;
} }
iTextC++; iTextC++;
@@ -208,7 +208,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
case ACTION_MENU_OTHER_STICK_DOWN: case ACTION_MENU_OTHER_STICK_DOWN:
case ACTION_MENU_OTHER_STICK_UP: case ACTION_MENU_OTHER_STICK_UP:
// don't pass down PageUp or PageDown because this will cause conflicts between the buttonlist and scrollable html text component // don't pass down PageUp or PageDown because this will cause conflicts between the buttonlist and scrollable html text component
//case ACTION_MENU_PAGEUP: //case ACTION_MENU_PAGEUP:
//case ACTION_MENU_PAGEDOWN: //case ACTION_MENU_PAGEDOWN:
sendInputToMovie(key, repeat, pressed, released); sendInputToMovie(key, repeat, pressed, released);
break; break;
@@ -235,7 +235,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
#ifdef __PS3__ #ifdef __PS3__
// is the item purchasable? // is the item purchasable?
if(info.purchasabilityFlag==1) if(info.purchasabilityFlag==1)
{ {
// can be bought // can be bought
app.Checkout(info.skuId); app.Checkout(info.skuId);
@@ -249,7 +249,7 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
} }
#else // __ORBIS__ #else // __ORBIS__
// is the item purchasable? // is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{ {
// can be bought // can be bought
app.Checkout(info.skuId); app.Checkout(info.skuId);
@@ -280,7 +280,7 @@ void UIScene_DLCOffersMenu::handleSelectionChanged(F64 selectedId)
} }
void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId) void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
{ {
app.DebugPrintf("UIScene_DLCOffersMenu::handleFocusChange\n"); app.DebugPrintf("UIScene_DLCOffersMenu::handleFocusChange\n");
#ifdef __PSVITA__ #ifdef __PSVITA__
@@ -305,7 +305,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
#if defined __PSVITA__ || defined __ORBIS__ #if defined __PSVITA__ || defined __ORBIS__
if(m_pvProductInfo) if(m_pvProductInfo)
{ {
m_bIsSelected = true; m_bIsSelected = true;
vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin(); vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
string teststring; string teststring;
@@ -315,7 +315,7 @@ void UIScene_DLCOffersMenu::handleFocusChange(F64 controlId, F64 childId)
} }
SonyCommerce::ProductInfo info = *it; SonyCommerce::ProductInfo info = *it;
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{ {
m_bHasPurchased=false; m_bHasPurchased=false;
} }
@@ -379,7 +379,7 @@ void UIScene_DLCOffersMenu::tick()
#ifdef __PS3__ #ifdef __PS3__
// is the item purchasable? // is the item purchasable?
if(info.purchasabilityFlag==1) if(info.purchasabilityFlag==1)
{ {
// can be bought // can be bought
app.DebugPrintf("Adding DLC (%s) - not bought\n",teststring.c_str()); app.DebugPrintf("Adding DLC (%s) - not bought\n",teststring.c_str());
@@ -397,7 +397,7 @@ void UIScene_DLCOffersMenu::tick()
} }
#else // __ORBIS__ #else // __ORBIS__
// is the item purchasable? // is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{ {
// can be bought // can be bought
m_buttonListOffers.addItem(teststring,false,i); m_buttonListOffers.addItem(teststring,false,i);
@@ -445,13 +445,13 @@ void UIScene_DLCOffersMenu::tick()
// does the DLC info have an image? // does the DLC info have an image?
if(pSONYDLCInfo && pSONYDLCInfo->dwImageBytes!=0) if(pSONYDLCInfo && pSONYDLCInfo->dwImageBytes!=0)
{ {
pbImageData=pSONYDLCInfo->pbImageData; pbImageData=pSONYDLCInfo->pbImageData;
iImageDataBytes=pSONYDLCInfo->dwImageBytes; iImageDataBytes=pSONYDLCInfo->dwImageBytes;
bDeleteData=false; // we'll clean up the local LDC images bDeleteData=false; // we'll clean up the local LDC images
} }
else else
#endif #endif
if(info.imageUrl[0]!=0) if(info.imageUrl[0]!=0)
{ {
SonyHttp::getDataFromURL(info.imageUrl,(void **)&pbImageData,&iImageDataBytes); SonyHttp::getDataFromURL(info.imageUrl,(void **)&pbImageData,&iImageDataBytes);
@@ -460,7 +460,7 @@ void UIScene_DLCOffersMenu::tick()
if(iImageDataBytes!=0) if(iImageDataBytes!=0)
{ {
// set the image // set the image
registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,bDeleteData); registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,bDeleteData);
m_bitmapIconOfferImage.setTextureName(textureName); m_bitmapIconOfferImage.setTextureName(textureName);
// 4J Stu - Don't delete this // 4J Stu - Don't delete this
@@ -497,25 +497,25 @@ void UIScene_DLCOffersMenu::tick()
m_labelOffers.setLabel(app.GetString(IDS_NO_DLCCATEGORIES)); m_labelOffers.setLabel(app.GetString(IDS_NO_DLCCATEGORIES));
} }
} }
m_Timer.setVisible(false); m_Timer.setVisible(false);
m_bProductInfoShown=true; m_bProductInfoShown=true;
} }
} }
else else
{ {
#ifdef __PSVITA__ #ifdef __PSVITA__
// MGH - fixes bug 5768 on Vita - should be extended properly to work for other platforms // MGH - fixes bug 5768 on Vita - should be extended properly to work for other platforms
if((SonyCommerce_Vita::getPurchasabilityUpdated()) && app.GetCommerceProductListRetrieved()&& app.GetCommerceProductListInfoRetrieved() && m_iTotalDLC > 0) if((SonyCommerce_Vita::getPurchasabilityUpdated()) && app.GetCommerceProductListRetrieved()&& app.GetCommerceProductListInfoRetrieved() && m_iTotalDLC > 0)
{ {
{ {
vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin(); vector<SonyCommerce::ProductInfo >::iterator it = m_pvProductInfo->begin();
for(int i=0;i<m_iTotalDLC;i++) for(int i=0;i<m_iTotalDLC;i++)
{ {
SonyCommerce::ProductInfo info = *it; SonyCommerce::ProductInfo info = *it;
// is the item purchasable? // is the item purchasable?
if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED) if(info.purchasabilityFlag==SCE_TOOLKIT_NP_COMMERCE_NOT_PURCHASED)
{ {
// can be bought // can be bought
m_buttonListOffers.showTick(i, false); m_buttonListOffers.showTick(i, false);
@@ -577,11 +577,11 @@ void UIScene_DLCOffersMenu::tick()
// does the DLC info have an image? // does the DLC info have an image?
if(pSONYDLCInfo->dwImageBytes!=0) if(pSONYDLCInfo->dwImageBytes!=0)
{ {
pbImageData=pSONYDLCInfo->pbImageData; pbImageData=pSONYDLCInfo->pbImageData;
iImageDataBytes=pSONYDLCInfo->dwImageBytes; iImageDataBytes=pSONYDLCInfo->dwImageBytes;
bDeleteData=false; // we'll clean up the local LDC images bDeleteData=false; // we'll clean up the local LDC images
} }
else else
#endif #endif
{ {
@@ -601,7 +601,7 @@ void UIScene_DLCOffersMenu::tick()
else else
{ {
m_bitmapIconOfferImage.setTextureName(L""); m_bitmapIconOfferImage.setTextureName(L"");
} }
} }
else else
{ {
@@ -620,7 +620,7 @@ void UIScene_DLCOffersMenu::tick()
{ {
// DLCContentRetrieved is to see if the type of content has been retrieved - and on Durango there is only type 0 - XMARKETPLACE_OFFERING_TYPE_CONTENT // DLCContentRetrieved is to see if the type of content has been retrieved - and on Durango there is only type 0 - XMARKETPLACE_OFFERING_TYPE_CONTENT
if(app.DLCContentRetrieved(e_Marketplace_Content)) if(app.DLCContentRetrieved(e_Marketplace_Content))
{ {
m_bDLCRequiredIsRetrieved=true; m_bDLCRequiredIsRetrieved=true;
// Retrieve the info // Retrieve the info
@@ -660,29 +660,10 @@ void UIScene_DLCOffersMenu::tick()
} }
} }
} }
// if(m_bBitmapOfferIconDisplayed==false)
// {
// // do we have it yet?
// if
// }
// retrieve the icons for the DLC
// if(m_vIconRetrieval.size()>0)
// {
// // for each icon, request it, and remove it from the list
// // the callback for the retrieval will update the display if needed
//
// AUTO_VAR(itEnd, m_vIconRetrieval.end());
// for (AUTO_VAR(it, m_vIconRetrieval.begin()); it != itEnd; it++)
// {
//
// }
//
// }
#endif #endif
} }
#if defined _XBOX_ONE #if defined _XBOX_ONE
void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly ) void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
{ {
MARKETPLACE_CONTENTOFFER_INFO xOffer; MARKETPLACE_CONTENTOFFER_INFO xOffer;
@@ -719,7 +700,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
app.DebugPrintf("Unknown offer - %ls\n",xOffer.wszOfferName); app.DebugPrintf("Unknown offer - %ls\n",xOffer.wszOfferName);
} }
} }
qsort( OrderA, uiDLCCount, sizeof(SORTINDEXSTRUCT), OrderSortFunction ); qsort( OrderA, uiDLCCount, sizeof(SORTINDEXSTRUCT), OrderSortFunction );
for(int i = 0; i < uiDLCCount; i++) for(int i = 0; i < uiDLCCount; i++)
@@ -737,7 +718,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
} }
if(pDLC->eDLCType==(eDLCContentType)m_iProductInfoIndex) if(pDLC->eDLCType==(eDLCContentType)m_iProductInfoIndex)
{ {
wstring wstrTemp=xOffer.wszOfferName; wstring wstrTemp=xOffer.wszOfferName;
// 4J-PB - Rog requested we remove the Minecraft at the start of the name. It's required for the Bing search, but gets in the way here // 4J-PB - Rog requested we remove the Minecraft at the start of the name. It's required for the Bing search, but gets in the way here
@@ -774,7 +755,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
* We've filtered results out from the list, need to keep track * We've filtered results out from the list, need to keep track
* of the 'actual' list index. * of the 'actual' list index.
*/ */
iCount++; iCount++;
} }
} }
@@ -834,7 +815,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
// is the file in the local DLC images? // is the file in the local DLC images?
// is the file in the TMS XZP? // is the file in the TMS XZP?
//int iIndex = app.GetLocalTMSFileIndex(cString, true); //int iIndex = app.GetLocalTMSFileIndex(cString, true);
if(dlc->dwImageBytes!=0) if(dlc->dwImageBytes!=0)
@@ -862,7 +843,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
else else
{ {
if(hasRegisteredSubstitutionTexture(cString)==false) if(hasRegisteredSubstitutionTexture(cString)==false)
{ {
BYTE *pData=NULL; BYTE *pData=NULL;
DWORD dwSize=0; DWORD dwSize=0;
app.GetMemFileDetails(cString,&pData,&dwSize); app.GetMemFileDetails(cString,&pData,&dwSize);
@@ -879,12 +860,12 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
m_bitmapIconOfferImage.setTextureName(cString); m_bitmapIconOfferImage.setTextureName(cString);
} }
bImageAvailable=true; bImageAvailable=true;
} }
} }
m_labelHTMLSellText.setLabel(xOffer.wszSellText); m_labelHTMLSellText.setLabel(xOffer.wszSellText);
// set the price info // set the price info
m_labelPriceTag.setVisible(true); m_labelPriceTag.setVisible(true);
m_labelPriceTag.setLabel(xOffer.wszCurrencyPrice); m_labelPriceTag.setLabel(xOffer.wszCurrencyPrice);
@@ -923,7 +904,7 @@ void UIScene_DLCOffersMenu::HandleDLCInstalled()
} }
// void UIScene_DLCOffersMenu::HandleDLCMountingComplete() // void UIScene_DLCOffersMenu::HandleDLCMountingComplete()
// { // {
// app.DebugPrintf(4,"UIScene_SkinSelectMenu::HandleDLCMountingComplete\n"); // app.DebugPrintf(4,"UIScene_SkinSelectMenu::HandleDLCMountingComplete\n");
//} //}

4
Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
View File

@@ -80,7 +80,7 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa
for(unsigned int level = ench->getMinLevel(); level <= ench->getMaxLevel(); ++level) for(unsigned int level = ench->getMinLevel(); level <= ench->getMaxLevel(); ++level)
{ {
m_enchantmentIdAndLevels.push_back(pair<int,int>(ench->id,level)); m_enchantmentIdAndLevels.push_back(pair<int,int>(ench->id,level));
m_buttonListEnchantments.addItem(app.GetString( ench->getDescriptionId() ) + _toString<int>(level) ); m_buttonListEnchantments.addItem(app.GetString( ench->getDescriptionId() ) + std::to_wstring(level) );
} }
} }
@@ -196,7 +196,7 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
{ {
int id = childId; int id = childId;
if(id<m_mobFactories.size()) if(id<m_mobFactories.size())
{ {
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[id]); app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[id]);
} }
} }

16
Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
View File

@@ -61,13 +61,13 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer)
noNoiseString = replaceAll(noNoiseString,L"{*PLAYER*}",playerName); noNoiseString = replaceAll(noNoiseString,L"{*PLAYER*}",playerName);
Random random(8124371); Random random(8124371);
int found=(int)noNoiseString.find(L"{*NOISE*}"); size_t found=noNoiseString.find(L"{*NOISE*}");
int length; int length;
while (found!=string::npos) while (found!=string::npos)
{ {
length = random.nextInt(4) + 3; length = random.nextInt(4) + 3;
m_noiseLengths.push_back(length); m_noiseLengths.push_back(length);
found=(int)noNoiseString.find(L"{*NOISE*}",found+1); found=noNoiseString.find(L"{*NOISE*}",found+1);
} }
updateNoise(); updateNoise();
@@ -77,7 +77,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer)
m_paragraphs = vector<wstring>(); m_paragraphs = vector<wstring>();
int lastIndex = 0; int lastIndex = 0;
for ( int index = 0; for ( int index = 0;
index != wstring::npos; index != wstring::npos;
index = noiseString.find(L"<br /><br />", index+12, 12) index = noiseString.find(L"<br /><br />", index+12, 12)
) )
{ {
@@ -198,7 +198,7 @@ void UIScene_EndPoem::updateNoise()
{ {
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
noiseString = noNoiseString; noiseString = noNoiseString;
int length = 0; int length = 0;
wchar_t replacements[64]; wchar_t replacements[64];
wstring replaceString = L""; wstring replaceString = L"";
@@ -209,8 +209,8 @@ void UIScene_EndPoem::updateNoise()
wstring tag = L"{*NOISE*}"; wstring tag = L"{*NOISE*}";
AUTO_VAR(it, m_noiseLengths.begin()); auto it = m_noiseLengths.begin();
int found=(int)noiseString.find(tag); size_t found= noiseString.find(tag);
while (found!=string::npos && it != m_noiseLengths.end() ) while (found!=string::npos && it != m_noiseLengths.end() )
{ {
length = *it; length = *it;
@@ -229,7 +229,7 @@ void UIScene_EndPoem::updateNoise()
static wstring acceptableLetters = L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~"; static wstring acceptableLetters = L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~";
randomChar = acceptableLetters[ random->nextInt((int)acceptableLetters.length()) ]; randomChar = acceptableLetters[ random->nextInt((int)acceptableLetters.length()) ];
} }
wstring randomCharStr = L""; wstring randomCharStr = L"";
randomCharStr.push_back(randomChar); randomCharStr.push_back(randomChar);
if(randomChar == L'<') if(randomChar == L'<')
@@ -275,6 +275,6 @@ void UIScene_EndPoem::updateNoise()
//ib.put(listPos + 256 + random->nextInt(2) + 8 + (darken ? 16 : 0)); //ib.put(listPos + 256 + random->nextInt(2) + 8 + (darken ? 16 : 0));
//ib.put(listPos + pos + 32); //ib.put(listPos + pos + 32);
found=(int)noiseString.find(tag,found+1); found=noiseString.find(tag,found+1);
} }
} }

8
Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
View File

@@ -32,7 +32,7 @@ UIScene_InventoryMenu::UIScene_InventoryMenu(int iPad, void *_initData, UILayer
m_previousTutorialState = gameMode->getTutorial()->getCurrentState(); m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Inventory_Menu, this); gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Inventory_Menu, this);
} }
InventoryMenu *menu = (InventoryMenu *)initData->player->inventoryMenu; InventoryMenu *menu = (InventoryMenu *)initData->player->inventoryMenu;
initData->player->awardStat(GenericStats::openInventory(),GenericStats::param_openInventory()); initData->player->awardStat(GenericStats::openInventory(),GenericStats::param_openInventory());
@@ -261,10 +261,8 @@ void UIScene_InventoryMenu::updateEffectsDisplay()
int iValue = 0; int iValue = 0;
IggyDataValue *UpdateValue = new IggyDataValue[activeEffects->size()*2]; IggyDataValue *UpdateValue = new IggyDataValue[activeEffects->size()*2];
for(AUTO_VAR(it, activeEffects->begin()); it != activeEffects->end(); ++it) for(auto& effect : *activeEffects)
{ {
MobEffectInstance *effect = *it;
if(effect->getDuration() >= m_bEffectTime[effect->getId()]) if(effect->getDuration() >= m_bEffectTime[effect->getId()])
{ {
wstring effectString = app.GetString( effect->getDescriptionId() );//I18n.get(effect.getDescriptionId()).trim(); wstring effectString = app.GetString( effect->getDescriptionId() );//I18n.get(effect.getDescriptionId()).trim();

178
Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
View File

@@ -2,6 +2,12 @@
#include "UI.h" #include "UI.h"
#include "UIScene_Keyboard.h" #include "UIScene_Keyboard.h"
#ifdef _WINDOWS64
// Global buffer that stores the text entered in the native keyboard scene.
// Callbacks retrieve it via Win64_GetKeyboardText() declared in UIStructs.h.
wchar_t g_Win64KeyboardResult[256] = {};
#endif
#define KEYBOARD_DONE_TIMER_ID 0 #define KEYBOARD_DONE_TIMER_ID 0
#define KEYBOARD_DONE_TIMER_TIME 100 #define KEYBOARD_DONE_TIMER_TIME 100
@@ -10,31 +16,103 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
// Setup all the Iggy references we need for this scene // Setup all the Iggy references we need for this scene
initialiseMovie(); initialiseMovie();
#ifdef _WINDOWS64
m_win64Callback = NULL;
m_win64CallbackParam = NULL;
m_win64TextBuffer = L"";
m_win64MaxChars = 25;
const wchar_t* titleText = L"Enter text";
const wchar_t* defaultText = L"";
m_bPCMode = false;
if (initData)
{
UIKeyboardInitData* kbData = (UIKeyboardInitData*)initData;
m_win64Callback = kbData->callback;
m_win64CallbackParam = kbData->lpParam;
if (kbData->title) titleText = kbData->title;
if (kbData->defaultText) defaultText = kbData->defaultText;
m_win64MaxChars = kbData->maxChars;
m_bPCMode = kbData->pcMode;
}
m_win64TextBuffer = defaultText;
m_EnterTextLabel.init(titleText);
m_KeyboardTextInput.init(defaultText, -1);
m_KeyboardTextInput.SetCharLimit(m_win64MaxChars);
// Clear any leftover typed characters from a previous keyboard session
g_KBMInput.ClearCharBuffer();
g_Win64KeyboardResult[0] = L'\0';
#else
m_EnterTextLabel.init(L"Enter Sign Text"); m_EnterTextLabel.init(L"Enter Sign Text");
m_KeyboardTextInput.init(L"", -1); m_KeyboardTextInput.init(L"", -1);
m_KeyboardTextInput.SetCharLimit(15); m_KeyboardTextInput.SetCharLimit(15);
#endif
m_ButtonSpace.init(L"Space", -1); m_ButtonSpace.init(L"Space", -1);
m_ButtonCursorLeft.init(L"Cursor Left", -1); m_ButtonCursorLeft.init(L"Cur L", -1);
m_ButtonCursorRight.init(L"Cursor Right", -1); m_ButtonCursorRight.init(L"Cur R", -1);
m_ButtonCaps.init(L"Caps", -1); m_ButtonCaps.init(L"Caps", -1);
m_ButtonDone.init(L"Done", 0); // only the done button needs an id, the others will never call back! m_ButtonDone.init(L"Done", 0); // only the done button needs an id, the others will never call back!
m_ButtonSymbols.init(L"Symbols", -1); m_ButtonSymbols.init(L"Symbols", -1);
m_ButtonBackspace.init(L"Backspace", -1); m_ButtonBackspace.init(L"Backspace", -1);
// Initialise function keyboard Buttons and set alternative symbol button string // Initialise function keyboard Buttons and set alternative symbol button string
wstring label = L"Abc"; #ifdef _WINDOWS64
IggyStringUTF16 stringVal; if (!m_bPCMode)
stringVal.string = (IggyUTF16*)label.c_str(); #endif
stringVal.length = label.length(); {
wstring label = L"Abc";
IggyDataValue result; IggyStringUTF16 stringVal;
IggyDataValue value[1]; stringVal.string = (IggyUTF16*)label.c_str();
value[0].type = IGGY_DATATYPE_string_UTF16; stringVal.length = label.length();
value[0].string16 = stringVal;
IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcInitFunctionButtons , 1 , value ); IggyDataValue result;
IggyDataValue value[1];
value[0].type = IGGY_DATATYPE_string_UTF16;
value[0].string16 = stringVal;
IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcInitFunctionButtons , 1 , value );
}
#ifdef _WINDOWS64
if (m_bPCMode)
{
// PC text-input mode: hide all on-screen buttons, user types with physical keyboard
// Hide the mapped function-row buttons
m_ButtonSpace.setVisible(false);
m_ButtonCursorLeft.setVisible(false);
m_ButtonCursorRight.setVisible(false);
m_ButtonCaps.setVisible(false);
m_ButtonSymbols.setVisible(false);
m_ButtonBackspace.setVisible(false);
// Hide the letter/number key grid (Flash-baked, not mapped as UIControls)
static const char* s_keyNames[] = {
"Button_q", "Button_w", "Button_e", "Button_r", "Button_t",
"Button_y", "Button_u", "Button_i", "Button_o", "Button_p",
"Button_a", "Button_s", "Button_d", "Button_f", "Button_g",
"Button_h", "Button_j", "Button_k", "Button_l", "Button_apostraphy",
"Button_z", "Button_x", "Button_c", "Button_v", "Button_b",
"Button_n", "Button_m", "Button_comma", "Button_stop", "Button_qmark",
"Button_0", "Button_1", "Button_2", "Button_3", "Button_4",
"Button_5", "Button_6", "Button_7", "Button_8", "Button_9"
};
IggyName nameVisible = registerFastName(L"visible");
IggyValuePath* root = IggyPlayerRootPath(getMovie());
for (int i = 0; i < (int)(sizeof(s_keyNames) / sizeof(s_keyNames[0])); ++i)
{
IggyValuePath keyPath;
if (IggyValuePathMakeNameRef(&keyPath, root, s_keyNames[i]))
IggyValueSetBooleanRS(&keyPath, nameVisible, NULL, false);
}
}
#endif
m_bKeyboardDonePressed = false; m_bKeyboardDonePressed = false;
@@ -80,6 +158,46 @@ bool UIScene_Keyboard::allowRepeat(int key)
return true; return true;
} }
#ifdef _WINDOWS64
void UIScene_Keyboard::tick()
{
UIScene::tick();
// Accumulate physical keyboard chars into our own buffer, then push to Flash via setLabel.
// This bypasses Iggy's focus system (char events only route to the focused element).
// The char buffer is cleared on open so Enter/clicks from the triggering action don't leak in.
wchar_t ch;
bool changed = false;
while (g_KBMInput.ConsumeChar(ch))
{
if (ch == 0x08) // backspace
{
if (!m_win64TextBuffer.empty())
{
m_win64TextBuffer.pop_back();
changed = true;
}
}
else if (ch == 0x0D) // enter - confirm
{
if (!m_bKeyboardDonePressed)
{
addTimer(KEYBOARD_DONE_TIMER_ID, KEYBOARD_DONE_TIMER_TIME);
m_bKeyboardDonePressed = true;
}
}
else if ((int)m_win64TextBuffer.length() < m_win64MaxChars)
{
m_win64TextBuffer += ch;
changed = true;
}
}
if (changed)
m_KeyboardTextInput.setLabel(m_win64TextBuffer.c_str(), true /*instant*/);
}
#endif
void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
{ {
IggyDataValue result; IggyDataValue result;
@@ -90,7 +208,18 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
switch(key) switch(key)
{ {
case ACTION_MENU_CANCEL: case ACTION_MENU_CANCEL:
#ifdef _WINDOWS64
{
// Cache before navigateBack() destroys this scene
int(*cb)(LPVOID, const bool) = m_win64Callback;
LPVOID cbParam = m_win64CallbackParam;
navigateBack();
if (cb)
cb(cbParam, false);
}
#else
navigateBack(); navigateBack();
#endif
handled = true; handled = true;
break; break;
case ACTION_MENU_X: // X case ACTION_MENU_X: // X
@@ -173,9 +302,28 @@ void UIScene_Keyboard::handleTimerComplete(int id)
void UIScene_Keyboard::KeyboardDonePressed() void UIScene_Keyboard::KeyboardDonePressed()
{ {
// Debug #ifdef _WINDOWS64
app.DebugPrintf("UI Keyboard - DONE - [%ls]\n", m_KeyboardTextInput.getLabel()); // Use getLabel() here — this is a timer callback (not an Iggy callback) so it's safe.
// getLabel() reflects both physical keyboard input (pushed via setLabel) and
// on-screen button input (set directly by Flash ActionScript).
const wchar_t* finalText = m_KeyboardTextInput.getLabel();
app.DebugPrintf("UI Keyboard - DONE - [%ls]\n", finalText);
// ToDo: Keyboard can now pass on its final string value and close itself down // Store the typed text so callbacks can retrieve it via Win64_GetKeyboardText()
wcsncpy_s(g_Win64KeyboardResult, 256, finalText, _TRUNCATE);
// Cache callback and param before navigateBack() which destroys this scene
int(*cb)(LPVOID, const bool) = m_win64Callback;
LPVOID cbParam = m_win64CallbackParam;
// Navigate back so the scene stack is restored before the callback runs
navigateBack(); navigateBack();
// Fire callback: bRes=true means confirmed
if (cb)
cb(cbParam, true);
#else
app.DebugPrintf("UI Keyboard - DONE - [%ls]\n", m_KeyboardTextInput.getLabel());
navigateBack();
#endif
} }

16
Minecraft.Client/Common/UI/UIScene_Keyboard.h
View File

@@ -7,6 +7,14 @@ class UIScene_Keyboard : public UIScene
private: private:
bool m_bKeyboardDonePressed; bool m_bKeyboardDonePressed;
#ifdef _WINDOWS64
int(*m_win64Callback)(LPVOID, const bool);
LPVOID m_win64CallbackParam;
wstring m_win64TextBuffer;
int m_win64MaxChars;
bool m_bPCMode; // Hides on-screen keyboard buttons; physical keyboard only
#endif
protected: protected:
UIControl_Label m_EnterTextLabel; UIControl_Label m_EnterTextLabel;
UIControl_TextInput m_KeyboardTextInput; UIControl_TextInput m_KeyboardTextInput;
@@ -49,6 +57,10 @@ public:
// INPUT // INPUT
virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled); virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
#ifdef _WINDOWS64
virtual void tick();
#endif
virtual void handleTimerComplete(int id); virtual void handleTimerComplete(int id);
protected: protected:
@@ -75,5 +87,9 @@ public:
#endif #endif
// Returns true if lower scenes in this scenes layer, or in any layer below this scenes layers should be hidden // Returns true if lower scenes in this scenes layer, or in any layer below this scenes layers should be hidden
#ifdef _WINDOWS64
virtual bool hidesLowerScenes() { return true; }
#else
virtual bool hidesLowerScenes() { return false; } virtual bool hidesLowerScenes() { return false; }
#endif
}; };

9
Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
View File

@@ -2,6 +2,7 @@
#include "UI.h" #include "UI.h"
#include "UIScene_LoadMenu.h" #include "UIScene_LoadMenu.h"
#include "..\..\Minecraft.h" #include "..\..\Minecraft.h"
#include "..\..\User.h"
#include "..\..\TexturePackRepository.h" #include "..\..\TexturePackRepository.h"
#include "..\..\Options.h" #include "..\..\Options.h"
#include "..\..\MinecraftServer.h" #include "..\..\MinecraftServer.h"
@@ -273,7 +274,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
m_bIgnoreInput = false; m_bIgnoreInput = false;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
int texturePacksCount = pMinecraft->skins->getTexturePackCount(); unsigned int texturePacksCount = (unsigned int)pMinecraft->skins->getTexturePackCount();
for(unsigned int i = 0; i < texturePacksCount; ++i) for(unsigned int i = 0; i < texturePacksCount; ++i)
{ {
TexturePack *tp = pMinecraft->skins->getTexturePackByIndex(i); TexturePack *tp = pMinecraft->skins->getTexturePackByIndex(i);
@@ -1629,6 +1630,12 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
param->settings = app.GetGameHostOption( eGameHostOption_All ); param->settings = app.GetGameHostOption( eGameHostOption_All );
#ifdef _WINDOWS64
{
extern wchar_t g_Win64UsernameW[17];
Minecraft::GetInstance()->user->name = g_Win64UsernameW;
}
#endif
#ifndef _XBOX #ifndef _XBOX
g_NetworkManager.FakeLocalPlayerJoined(); g_NetworkManager.FakeLocalPlayerJoined();
#endif #endif

284
Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
View File

@@ -31,6 +31,32 @@
static wstring ReadLevelNameFromSaveFile(const wstring& filePath) static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
{ {
// Check for a worldname.txt sidecar written by the rename feature first
size_t slashPos = filePath.rfind(L'\\');
if (slashPos != wstring::npos)
{
wstring sidecarPath = filePath.substr(0, slashPos + 1) + L"worldname.txt";
FILE *fr = NULL;
if (_wfopen_s(&fr, sidecarPath.c_str(), L"r") == 0 && fr)
{
char buf[128] = {};
if (fgets(buf, sizeof(buf), fr))
{
int len = (int)strlen(buf);
while (len > 0 && (buf[len-1] == '\n' || buf[len-1] == '\r' || buf[len-1] == ' '))
buf[--len] = '\0';
fclose(fr);
if (len > 0)
{
wchar_t wbuf[128] = {};
mbstowcs(wbuf, buf, 127);
return wstring(wbuf);
}
}
else fclose(fr);
}
}
HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
if (hFile == INVALID_HANDLE_VALUE) return L""; if (hFile == INVALID_HANDLE_VALUE) return L"";
@@ -110,8 +136,8 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
if (freeSaveData) delete[] saveData; if (freeSaveData) delete[] saveData;
delete[] rawData; delete[] rawData;
// "world" is the engine default — it means no real name was ever set, so // "world" is the engine default - it means no real name was ever set,
// return empty to let the caller fall back to the save filename (timestamp). // so return empty to let the caller fall back to the save filename (timestamp).
if (result == L"world") result = L""; if (result == L"world") result = L"";
return result; return result;
} }
@@ -300,7 +326,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
bool bTexturePackAlreadyListed; bool bTexturePackAlreadyListed;
bool bNeedToGetTPD=false; bool bNeedToGetTPD=false;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
int texturePacksCount = pMinecraft->skins->getTexturePackCount(); int texturePacksCount = pMinecraft->skins->getTexturePackCount();
for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i) for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i)
{ {
@@ -407,7 +433,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
// update the tooltips // update the tooltips
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should the the View Gamercard tooltip // if the games list has focus, then we should the the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
int iLB = -1; int iLB = -1;
int iX=-1; int iX=-1;
@@ -418,7 +444,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
else if (DoesSavesListHaveFocus()) else if (DoesSavesListHaveFocus())
{ {
if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC)) if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
{ {
if(StorageManager.GetSaveDisabled()) if(StorageManager.GetSaveDisabled())
{ {
iRB=IDS_TOOLTIPS_DELETESAVE; iRB=IDS_TOOLTIPS_DELETESAVE;
@@ -474,7 +500,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
// Is there a save from PS3 or PSVita available? // Is there a save from PS3 or PSVita available?
// Sony asked that this be displayed at all times so users are aware of the functionality. We'll display some text when there's no save available // Sony asked that this be displayed at all times so users are aware of the functionality. We'll display some text when there's no save available
//if(app.getRemoteStorage()->saveIsAvailable()) //if(app.getRemoteStorage()->saveIsAvailable())
{ {
bool bSignedInLive = ProfileManager.IsSignedInLive(m_iPad); bool bSignedInLive = ProfileManager.IsSignedInLive(m_iPad);
if(bSignedInLive) if(bSignedInLive)
{ {
@@ -489,7 +515,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK, iX, iY,-1,-1,iLB,iRB); ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK, iX, iY,-1,-1,iLB,iRB);
} }
// //
void UIScene_LoadOrJoinMenu::Initialise() void UIScene_LoadOrJoinMenu::Initialise()
{ {
m_iSaveListIndex = 0; m_iSaveListIndex = 0;
@@ -577,7 +603,7 @@ void UIScene_LoadOrJoinMenu::handleGainFocus(bool navBack)
{ {
app.SetLiveLinkRequired( true ); app.SetLiveLinkRequired( true );
m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
// re-enable button presses // re-enable button presses
m_bIgnoreInput=false; m_bIgnoreInput=false;
@@ -644,8 +670,6 @@ void UIScene_LoadOrJoinMenu::tick()
{ {
UIScene::tick(); UIScene::tick();
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined _WINDOWS64 || defined __PSVITA__) #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined _WINDOWS64 || defined __PSVITA__)
if(m_bExitScene) // navigate forward or back if(m_bExitScene) // navigate forward or back
{ {
@@ -661,7 +685,7 @@ void UIScene_LoadOrJoinMenu::tick()
#ifdef SONY_REMOTE_STORAGE_DOWNLOAD #ifdef SONY_REMOTE_STORAGE_DOWNLOAD
// if the loadOrJoin menu has focus again, we can clear the saveTransfer flag now. Added so we can delay the ehternet disconnect till it's cleaned up // if the loadOrJoin menu has focus again, we can clear the saveTransfer flag now. Added so we can delay the ehternet disconnect till it's cleaned up
if(m_eSaveTransferState == eSaveTransfer_Idle) if(m_eSaveTransferState == eSaveTransfer_Idle)
m_bSaveTransferRunning = false; m_bSaveTransferRunning = false;
#endif #endif
#if defined(_XBOX_ONE) || defined(__ORBIS__) #if defined(_XBOX_ONE) || defined(__ORBIS__)
if(m_bUpdateSaveSize) if(m_bUpdateSaveSize)
@@ -978,7 +1002,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
m_pSaveDetails=StorageManager.ReturnSavesInfo(); m_pSaveDetails=StorageManager.ReturnSavesInfo();
if(m_pSaveDetails==NULL) if(m_pSaveDetails==NULL)
{ {
C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
} }
#endif #endif
@@ -1027,7 +1051,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
m_pSaveDetails=StorageManager.ReturnSavesInfo(); m_pSaveDetails=StorageManager.ReturnSavesInfo();
if(m_pSaveDetails==NULL) if(m_pSaveDetails==NULL)
{ {
C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
} }
#if TO_BE_IMPLEMENTED #if TO_BE_IMPLEMENTED
@@ -1054,10 +1078,8 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons()
int i = 0; int i = 0;
for(AUTO_VAR(it, app.getLevelGenerators()->begin()); it != app.getLevelGenerators()->end(); ++it) for ( LevelGenerationOptions *levelGen : *app.getLevelGenerators() )
{ {
LevelGenerationOptions *levelGen = *it;
// retrieve the save icon from the texture pack, if there is one // retrieve the save icon from the texture pack, if there is one
unsigned int uiTexturePackID=levelGen->getRequiredTexturePackId(); unsigned int uiTexturePackID=levelGen->getRequiredTexturePackId();
@@ -1071,7 +1093,7 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons()
continue; continue;
} }
} }
// 4J-JEV: For debug. Ignore worlds with no name. // 4J-JEV: For debug. Ignore worlds with no name.
LPCWSTR wstr = levelGen->getWorldName(); LPCWSTR wstr = levelGen->getWorldName();
m_buttonListSaves.addItem( wstr ); m_buttonListSaves.addItem( wstr );
@@ -1124,7 +1146,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
case ACTION_MENU_X: case ACTION_MENU_X:
#if TO_BE_IMPLEMENTED #if TO_BE_IMPLEMENTED
// Change device // Change device
// Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage // Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage
// device, and repeatedly backs out of the SD screen, disconnects from LIVE, and then selects a SD, the title crashes. // device, and repeatedly backs out of the SD screen, disconnects from LIVE, and then selects a SD, the title crashes.
m_bIgnoreInput=true; m_bIgnoreInput=true;
StorageManager.SetSaveDevice(&CScene_MultiGameJoinLoad::DeviceSelectReturned,this,true); StorageManager.SetSaveDevice(&CScene_MultiGameJoinLoad::DeviceSelectReturned,this,true);
@@ -1142,7 +1164,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
{ {
bool bSignedInLive = ProfileManager.IsSignedInLive(iPad); bool bSignedInLive = ProfileManager.IsSignedInLive(iPad);
if(bSignedInLive) if(bSignedInLive)
{ {
LaunchSaveTransfer(); LaunchSaveTransfer();
} }
} }
@@ -1334,10 +1356,14 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam; UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam;
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
if (bRes) if (bRes)
{ {
uint16_t ui16Text[128]; uint16_t ui16Text[128];
ZeroMemory(ui16Text, 128 * sizeof(uint16_t) ); ZeroMemory(ui16Text, 128 * sizeof(uint16_t) );
#ifdef _WINDOWS64
Win64_GetKeyboardText(ui16Text, 128);
#else
InputManager.GetText(ui16Text); InputManager.GetText(ui16Text);
#endif
// check the name is valid // check the name is valid
if(ui16Text[0]!=0) if(ui16Text[0]!=0)
@@ -1345,15 +1371,47 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined(__PSVITA__)) #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined(__PSVITA__))
// open the save and overwrite the metadata // open the save and overwrite the metadata
StorageManager.RenameSaveData(pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text,&UIScene_LoadOrJoinMenu::RenameSaveDataReturned,pClass); StorageManager.RenameSaveData(pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text,&UIScene_LoadOrJoinMenu::RenameSaveDataReturned,pClass);
#elif defined(_WINDOWS64)
{
int listPos = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC;
// Convert the ui16Text input to a wide string
wchar_t wNewName[128] = {};
for (int k = 0; k < 127 && ui16Text[k]; k++)
wNewName[k] = (wchar_t)ui16Text[k];
// Convert to narrow for storage and in-memory update
char narrowName[128] = {};
wcstombs(narrowName, wNewName, 127);
// Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt
wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
wstring sidecarPath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
FILE *fw = NULL;
if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw)
{
fputs(narrowName, fw);
fclose(fw);
}
// Update the in-memory display name so the list reflects it immediately
strncpy_s(pClass->m_saveDetails[listPos].UTF8SaveName, narrowName, 127);
pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0';
// Reuse the existing callback to trigger the list repopulate
UIScene_LoadOrJoinMenu::RenameSaveDataReturned(pClass, true);
}
#endif #endif
} }
else else
{ {
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
pClass->updateTooltips(); pClass->updateTooltips();
} }
} }
else else
{ {
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
pClass->updateTooltips(); pClass->updateTooltips();
@@ -1367,13 +1425,13 @@ void UIScene_LoadOrJoinMenu::handleInitFocus(F64 controlId, F64 childId)
app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId); app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
} }
void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId) void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId)
{ {
app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId); app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
switch((int)controlId) switch((int)controlId)
{ {
case eControl_GamesList: case eControl_GamesList:
m_iGameListIndex = childId; m_iGameListIndex = childId;
m_buttonListGames.updateChildFocus( (int) childId ); m_buttonListGames.updateChildFocus( (int) childId );
break; break;
@@ -1409,7 +1467,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
ui.PlayUISFX(eSFX_Press); ui.PlayUISFX(eSFX_Press);
if((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX) if((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX)
{ {
app.SetTutorialMode( false ); app.SetTutorialMode( false );
m_controlJoinTimer.setVisible( false ); m_controlJoinTimer.setVisible( false );
@@ -1461,7 +1519,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
} }
else else
#endif #endif
{ {
app.SetTutorialMode( false ); app.SetTutorialMode( false );
if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
@@ -1503,7 +1561,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
case eControl_GamesList: case eControl_GamesList:
{ {
m_bIgnoreInput=true; m_bIgnoreInput=true;
m_eAction = eAction_JoinGame; m_eAction = eAction_JoinGame;
//CD - Added for audio //CD - Added for audio
@@ -1538,7 +1596,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
bool bPlayStationPlus=true; bool bPlayStationPlus=true;
int iPadWithNoPlaystationPlus=0; int iPadWithNoPlaystationPlus=0;
bool isSignedInLive = true; bool isSignedInLive = true;
int iPadNotSignedInLive = -1; int iPadNotSignedInLive = -1;
for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
{ {
@@ -1631,7 +1689,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
SceNpCommerceDialogParam param; SceNpCommerceDialogParam param;
sceNpCommerceDialogParamInitialize(&param); sceNpCommerceDialogParamInitialize(&param);
param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS; param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus); param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
iResult=sceNpCommerceDialogOpen(&param); iResult=sceNpCommerceDialogOpen(&param);
@@ -1714,7 +1772,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
} }
void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen) void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
{ {
// Load data from disc // Load data from disc
//File saveFile( L"Tutorial\\Tutorial" ); //File saveFile( L"Tutorial\\Tutorial" );
//LoadSaveFromDisk(&saveFile); //LoadSaveFromDisk(&saveFile);
@@ -1812,7 +1870,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should show the View Gamercard tooltip // if the games list has focus, then we should show the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
int iX=-1; int iX=-1;
@@ -1859,10 +1917,8 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
unsigned int sessionIndex = 0; unsigned int sessionIndex = 0;
m_buttonListGames.setCurrentSelection(0); m_buttonListGames.setCurrentSelection(0);
for( AUTO_VAR(it, m_currentSessions->begin()); it < m_currentSessions->end(); ++it) for( FriendSessionInfo *sessionInfo : *m_currentSessions )
{ {
FriendSessionInfo *sessionInfo = *it;
wchar_t textureName[64] = L"\0"; wchar_t textureName[64] = L"\0";
// Is this a default game or a texture pack game? // Is this a default game or a texture pack game?
@@ -2036,7 +2092,7 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
if(iImageDataBytes!=0) if(iImageDataBytes!=0)
{ {
// set the image // set the image
registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,true); registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,true);
m_iConfigA[i]=-1; m_iConfigA[i]=-1;
} }
@@ -2049,7 +2105,7 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
bool bAllDone=true; bool bAllDone=true;
for(int i=0;i<m_iTexturePacksNotInstalled;i++) for(int i=0;i<m_iTexturePacksNotInstalled;i++)
{ {
if(m_iConfigA[i]!=-1) if(m_iConfigA[i]!=-1)
{ {
bAllDone = false; bAllDone = false;
} }
@@ -2064,13 +2120,13 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
} }
break; break;
#endif #endif
} }
} }
void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/) void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/)
{ {
// we'll only be coming in here when the tutorial is loaded now // we'll only be coming in here when the tutorial is loaded now
StorageManager.ResetSaveData(); StorageManager.ResetSaveData();
@@ -2128,7 +2184,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
#ifdef SONY_REMOTE_STORAGE_DOWNLOAD #ifdef SONY_REMOTE_STORAGE_DOWNLOAD
void UIScene_LoadOrJoinMenu::LoadSaveFromCloud() void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
{ {
wchar_t wFileName[128]; wchar_t wFileName[128];
mbstowcs(wFileName, app.getRemoteStorage()->getLocalFilename(), strlen(app.getRemoteStorage()->getLocalFilename())+1); // plus null mbstowcs(wFileName, app.getRemoteStorage()->getLocalFilename(), strlen(app.getRemoteStorage()->getLocalFilename())+1); // plus null
@@ -2193,6 +2249,31 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
#endif //SONY_REMOTE_STORAGE_DOWNLOAD #endif //SONY_REMOTE_STORAGE_DOWNLOAD
#ifdef _WINDOWS64
static bool Win64_DeleteSaveDirectory(const wchar_t* wPath)
{
wchar_t wSearch[MAX_PATH];
swprintf_s(wSearch, MAX_PATH, L"%s\\*", wPath);
WIN32_FIND_DATAW fd;
HANDLE hFind = FindFirstFileW(wSearch, &fd);
if (hFind != INVALID_HANDLE_VALUE)
{
do
{
if (wcscmp(fd.cFileName, L".") == 0 || wcscmp(fd.cFileName, L"..") == 0) continue;
wchar_t wChild[MAX_PATH];
swprintf_s(wChild, MAX_PATH, L"%s\\%s", wPath, fd.cFileName);
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
Win64_DeleteSaveDirectory(wChild);
else
DeleteFileW(wChild);
} while (FindNextFileW(hFind, &fd));
FindClose(hFind);
}
return RemoveDirectoryW(wPath) != 0;
}
#endif // _WINDOWS64
int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result) int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
{ {
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
@@ -2201,7 +2282,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
// Check that we have a valid save selected (can get a bad index if the save list has been refreshed) // Check that we have a valid save selected (can get a bad index if the save list has been refreshed)
bool validSelection= pClass->m_iDefaultButtonsC != 0 && pClass->m_iSaveListIndex >= pClass->m_iDefaultButtonsC; bool validSelection= pClass->m_iDefaultButtonsC != 0 && pClass->m_iSaveListIndex >= pClass->m_iDefaultButtonsC;
if(result==C4JStorage::EMessage_ResultDecline && validSelection) if(result==C4JStorage::EMessage_ResultDecline && validSelection)
{ {
if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
{ {
@@ -2209,7 +2290,24 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
} }
else else
{ {
#ifdef _WINDOWS64
{
// Use m_saveDetails (sorted display order) so the correct folder is targeted
int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC;
bool bSuccess = false;
if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
{
wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
mbstowcs_s(NULL, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
wchar_t wFolderPath[MAX_PATH] = {};
swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename);
bSuccess = Win64_DeleteSaveDirectory(wFolderPath);
}
UIScene_LoadOrJoinMenu::DeleteSaveDataReturned((LPVOID)pClass->GetCallbackUniqueId(), bSuccess);
}
#else
StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadOrJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId()); StorageManager.DeleteSaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC], UIScene_LoadOrJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId());
#endif
pClass->m_controlSavesTimer.setVisible( true ); pClass->m_controlSavesTimer.setVisible( true );
} }
} }
@@ -2231,7 +2329,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
if(bRes) if(bRes)
{ {
// wipe the list and repopulate it // wipe the list and repopulate it
pClass->m_iState=e_SavesRepopulateAfterDelete; pClass->m_iState=e_SavesRepopulateAfterDelete;
} }
else pClass->m_bIgnoreInput=false; else pClass->m_bIgnoreInput=false;
@@ -2285,7 +2383,21 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS
case C4JStorage::EMessage_ResultDecline: // rename case C4JStorage::EMessage_ResultDecline: // rename
{ {
pClass->m_bIgnoreInput=true; pClass->m_bIgnoreInput=true;
#ifdef _DURANGO #ifdef _WINDOWS64
{
wchar_t wSaveName[128];
ZeroMemory(wSaveName, 128 * sizeof(wchar_t));
mbstowcs_s(NULL, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
UIKeyboardInitData kbData;
kbData.title = app.GetString(IDS_RENAME_WORLD_TITLE);
kbData.defaultText = wSaveName;
kbData.maxChars = 25;
kbData.callback = &UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback;
kbData.lpParam = pClass;
kbData.pcMode = !Win64_IsControllerConnected();
ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
}
#elif defined _DURANGO
// bring up a keyboard // bring up a keyboard
InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE), (pClass->m_saveDetails[pClass->m_iSaveListIndex-pClass->m_iDefaultButtonsC]).UTF16SaveName,(DWORD)0,25,&UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default); InputManager.RequestKeyboard(app.GetString(IDS_RENAME_WORLD_TITLE), (pClass->m_saveDetails[pClass->m_iSaveListIndex-pClass->m_iDefaultButtonsC]).UTF16SaveName,(DWORD)0,25,&UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback,pClass,C_4JInput::EKeyboardMode_Default);
#else #else
@@ -2363,7 +2475,7 @@ int UIScene_LoadOrJoinMenu::MustSignInTexturePack(void *pParam,int iPad,C4JStora
{ {
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack, pClass); SQRNetworkManager_Vita::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack, pClass);
} }
@@ -2391,7 +2503,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
if(bContinue==true) if(bContinue==true)
{ {
SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
if(pSONYDLCInfo!=NULL) if(pSONYDLCInfo!=NULL)
{ {
char chName[42]; char chName[42];
@@ -2420,7 +2532,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
} }
else else
{ {
app.Checkout(chSkuID); app.Checkout(chSkuID);
} }
} }
} }
@@ -2436,7 +2548,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam; UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam;
// Exit with or without saving // Exit with or without saving
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
// we need to enable background downloading for the DLC // we need to enable background downloading for the DLC
XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
@@ -2454,7 +2566,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
} }
#endif #endif
SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId); SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
if(pSONYDLCInfo!=NULL) if(pSONYDLCInfo!=NULL)
{ {
char chName[42]; char chName[42];
@@ -2483,16 +2595,16 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
} }
else else
{ {
app.Checkout(chSkuID); app.Checkout(chSkuID);
} }
} }
} }
#endif #endif
#if defined _XBOX_ONE #if defined _XBOX_ONE
if(ProfileManager.IsSignedIn(iPad)) if(ProfileManager.IsSignedIn(iPad))
{ {
if (ProfileManager.IsSignedInLive(iPad)) if (ProfileManager.IsSignedInLive(iPad))
{ {
wstring ProductId; wstring ProductId;
@@ -2501,13 +2613,13 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL); StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
} }
else else
{ {
// 4J-JEV: Fix for XB1: #165863 - XR-074: Compliance: With no active network connection user is unable to convert from Trial to Full texture pack and is not messaged why. // 4J-JEV: Fix for XB1: #165863 - XR-074: Compliance: With no active network connection user is unable to convert from Trial to Full texture pack and is not messaged why.
UINT uiIDA[1] = { IDS_CONFIRM_OK }; UINT uiIDA[1] = { IDS_CONFIRM_OK };
ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad); ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad);
} }
} }
#endif #endif
} }
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
@@ -2519,7 +2631,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStora
{ {
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
#if defined(__PS3__) #if defined(__PS3__)
SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass); SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass);
@@ -2679,7 +2791,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
Compression::UseDefaultThreadStorage(); Compression::UseDefaultThreadStorage();
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParameter; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu *) lpParameter;
pClass->m_saveTransferDownloadCancelled = false; pClass->m_saveTransferDownloadCancelled = false;
m_bSaveTransferRunning = true; m_bSaveTransferRunning = true;
bool bAbortCalled = false; bool bAbortCalled = false;
Minecraft *pMinecraft=Minecraft::GetInstance(); Minecraft *pMinecraft=Minecraft::GetInstance();
bool bSaveFileCreated = false; bool bSaveFileCreated = false;
@@ -2728,7 +2840,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
ui.RequestAlertMessage(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_WRONG_VERSION, uiIDA, 1, ProfileManager.GetPrimaryPad(),RemoteSaveNotFoundCallback,pClass); ui.RequestAlertMessage(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_WRONG_VERSION, uiIDA, 1, ProfileManager.GetPrimaryPad(),RemoteSaveNotFoundCallback,pClass);
} }
} }
else else
{ {
// no save available, inform the user about the functionality // no save available, inform the user about the functionality
UINT uiIDA[1]; UINT uiIDA[1];
@@ -2752,7 +2864,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
DWORD dwDataSizeSaveImage=0; DWORD dwDataSizeSaveImage=0;
StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage); // Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage); // Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); // Get the default save image (as set by SetDefaultImages) for use on saving games that StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); // Get the default save image (as set by SetDefaultImages) for use on saving games that
BYTE bTextMetadata[88]; BYTE bTextMetadata[88];
ZeroMemory(bTextMetadata,88); ZeroMemory(bTextMetadata,88);
@@ -2784,7 +2896,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
{ {
// we can't cancel here, we need the saves info so we can delete the file // we can't cancel here, we need the saves info so we can delete the file
if(pClass->m_saveTransferDownloadCancelled) if(pClass->m_saveTransferDownloadCancelled)
{ {
WCHAR wcTemp[256]; WCHAR wcTemp[256];
swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download" swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download"
m_wstrStageText=wcTemp; m_wstrStageText=wcTemp;
@@ -2799,7 +2911,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
break; break;
case eSaveTransfer_GettingSavesInfo: case eSaveTransfer_GettingSavesInfo:
if(pClass->m_saveTransferDownloadCancelled) if(pClass->m_saveTransferDownloadCancelled)
{ {
WCHAR wcTemp[256]; WCHAR wcTemp[256];
swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download" swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download"
m_wstrStageText=wcTemp; m_wstrStageText=wcTemp;
@@ -2916,7 +3028,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
DWORD dwDataSizeSaveImage=0; DWORD dwDataSizeSaveImage=0;
StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage); // Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage); // Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); // Get the default save image (as set by SetDefaultImages) for use on saving games that StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize); // Get the default save image (as set by SetDefaultImages) for use on saving games that
BYTE bTextMetadata[88]; BYTE bTextMetadata[88];
ZeroMemory(bTextMetadata,88); ZeroMemory(bTextMetadata,88);
@@ -2929,12 +3041,12 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
} }
#ifdef SPLIT_SAVES #ifdef SPLIT_SAVES
ConsoleSaveFileOriginal oldFormatSave( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() ); ConsoleSaveFileOriginal oldFormatSave( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() );
pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer ); pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer );
pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING); pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
pSave->Flush(false,false); pSave->Flush(false,false);
pClass->m_eSaveTransferState = eSaveTransfer_Saving; pClass->m_eSaveTransferState = eSaveTransfer_Saving;
#else #else
pSave = new ConsoleSaveFileOriginal( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() ); pSave = new ConsoleSaveFileOriginal( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() );
@@ -2970,7 +3082,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
delete pSave; delete pSave;
pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC); pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
pClass->m_eSaveTransferState = eSaveTransfer_Succeeded; pClass->m_eSaveTransferState = eSaveTransfer_Succeeded;
} }
@@ -2984,7 +3096,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
UINT uiIDA[1]; UINT uiIDA[1];
uiIDA[0]=IDS_CONFIRM_OK; uiIDA[0]=IDS_CONFIRM_OK;
app.getRemoteStorage()->waitForStorageManagerIdle(); // wait for everything to complete before we hand control back to the player app.getRemoteStorage()->waitForStorageManagerIdle(); // wait for everything to complete before we hand control back to the player
ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass); ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass);
pClass->m_eSaveTransferState = eSaveTransfer_Finished; pClass->m_eSaveTransferState = eSaveTransfer_Finished;
} }
break; break;
@@ -2999,7 +3111,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
if(bSaveFileCreated) if(bSaveFileCreated)
{ {
if(pClass->m_saveTransferDownloadCancelled) if(pClass->m_saveTransferDownloadCancelled)
{ {
WCHAR wcTemp[256]; WCHAR wcTemp[256];
swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download" swprintf(wcTemp,256, app.GetString(IDS_CANCEL)); // MGH - should change this string to "cancelling download"
m_wstrStageText=wcTemp; m_wstrStageText=wcTemp;
@@ -3077,7 +3189,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
#endif #endif
} }
ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, errorMessage, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass); ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, errorMessage, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass);
pClass->m_eSaveTransferState = eSaveTransfer_Finished; pClass->m_eSaveTransferState = eSaveTransfer_Finished;
} }
if(bSaveFileCreated) // save file has been created, then deleted. if(bSaveFileCreated) // save file has been created, then deleted.
@@ -3223,7 +3335,7 @@ int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter )
{ {
UINT uiIDA[1]; UINT uiIDA[1];
uiIDA[0]=IDS_CONFIRM_OK; uiIDA[0]=IDS_CONFIRM_OK;
ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass); ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass);
pClass->m_eSaveUploadState = esaveUpload_Finished; pClass->m_eSaveUploadState = esaveUpload_Finished;
} }
break; break;
@@ -3240,7 +3352,7 @@ int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter )
{ {
UINT uiIDA[1]; UINT uiIDA[1];
uiIDA[0]=IDS_CONFIRM_OK; uiIDA[0]=IDS_CONFIRM_OK;
ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass); ui.RequestErrorMessage( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass);
pClass->m_eSaveUploadState = esaveUpload_Finished; pClass->m_eSaveUploadState = esaveUpload_Finished;
} }
} }
@@ -3289,7 +3401,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferDialogReturned(void *pParam,int iPad,C4J
{ {
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
// results switched for this dialog // results switched for this dialog
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
// upload the save // upload the save
pClass->LaunchSaveUpload(); pClass->LaunchSaveUpload();
@@ -3408,13 +3520,13 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
ByteArrayInputStream bais(UIScene_LoadOrJoinMenu::s_transferData); ByteArrayInputStream bais(UIScene_LoadOrJoinMenu::s_transferData);
DataInputStream dis(&bais); DataInputStream dis(&bais);
wstring saveTitle = dis.readUTF(); wstring saveTitle = dis.readUTF();
StorageManager.SetSaveTitle(saveTitle.c_str()); StorageManager.SetSaveTitle(saveTitle.c_str());
wstring saveUniqueName = dis.readUTF(); wstring saveUniqueName = dis.readUTF();
// 4J Stu - Don't set this any more. We added it so that we could share the ban list data for this save // 4J Stu - Don't set this any more. We added it so that we could share the ban list data for this save
// However if the player downloads the same save multiple times, it will overwrite the previous version // However if the player downloads the same save multiple times, it will overwrite the previous version
// with that filname, and they could have made changes to it. // with that filname, and they could have made changes to it.
//StorageManager.SetSaveUniqueFilename((wchar_t *)saveUniqueName.c_str()); //StorageManager.SetSaveUniqueFilename((wchar_t *)saveUniqueName.c_str());
@@ -3424,7 +3536,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
byteArray ba(thumbnailSize); byteArray ba(thumbnailSize);
dis.readFully(ba); dis.readFully(ba);
// retrieve the seed value from the image metadata, we need to change to host options, then set it back again // retrieve the seed value from the image metadata, we need to change to host options, then set it back again
bool bHostOptionsRead = false; bool bHostOptionsRead = false;
@@ -3458,13 +3570,13 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
case eSaveTransferFile_SaveData: case eSaveTransferFile_SaveData:
{ {
#ifdef SPLIT_SAVES #ifdef SPLIT_SAVES
if(!pStateContainer->m_bSaveTransferCancelled) if(!pStateContainer->m_bSaveTransferCancelled)
{ {
ConsoleSaveFileOriginal oldFormatSave( L"Temp name", UIScene_LoadOrJoinMenu::s_transferData.data, UIScene_LoadOrJoinMenu::s_transferData.length, false, SAVE_FILE_PLATFORM_X360 ); ConsoleSaveFileOriginal oldFormatSave( L"Temp name", UIScene_LoadOrJoinMenu::s_transferData.data, UIScene_LoadOrJoinMenu::s_transferData.length, false, SAVE_FILE_PLATFORM_X360 );
pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer ); pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer );
pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING); pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false); if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);
} }
pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Saving; pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Saving;
@@ -3485,7 +3597,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
pSave->ConvertToLocalPlatform(); pSave->ConvertToLocalPlatform();
pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING); pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false); if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);
pStateContainer->m_iProgress+=1; pStateContainer->m_iProgress+=1;
if(pStateContainer->m_iProgress==101) if(pStateContainer->m_iProgress==101)
@@ -3501,8 +3613,8 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
// On Durango/Orbis, we need to wait for all the asynchronous saving processes to complete before destroying the levels, as that will ultimately delete // On Durango/Orbis, we need to wait for all the asynchronous saving processes to complete before destroying the levels, as that will ultimately delete
// the directory level storage & therefore the ConsoleSaveSplit instance, which needs to be around until all the sub files have completed saving. // the directory level storage & therefore the ConsoleSaveSplit instance, which needs to be around until all the sub files have completed saving.
#if defined(_DURANGO) || defined(__ORBIS__) #if defined(_DURANGO) || defined(__ORBIS__)
pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC); pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
while(StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle ) while(StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle )
{ {
Sleep(10); Sleep(10);
@@ -3517,9 +3629,9 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
#ifdef _XBOX_ONE #ifdef _XBOX_ONE
pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_AND_CONVERT_COMPLETE); pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_AND_CONVERT_COMPLETE);
#endif #endif
pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Idle; pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Idle;
// wipe the list and repopulate it // wipe the list and repopulate it
if(!pStateContainer->m_bSaveTransferCancelled) pStateContainer->m_pClass->m_iState=e_SavesRepopulateAfterTransferDownload; if(!pStateContainer->m_bSaveTransferCancelled) pStateContainer->m_pClass->m_iState=e_SavesRepopulateAfterTransferDownload;
@@ -3559,7 +3671,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
} }
void UIScene_LoadOrJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass, wchar_t *filename ) void UIScene_LoadOrJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass, wchar_t *filename )
{ {
Minecraft *pMinecraft=Minecraft::GetInstance(); Minecraft *pMinecraft=Minecraft::GetInstance();
// get the save file size // get the save file size
@@ -3665,7 +3777,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned l
if(pClass->m_bSaveTransferCancelled) // was cancelled if(pClass->m_bSaveTransferCancelled) // was cancelled
{ {
pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING); pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING);
swprintf(wcTemp,app.GetString(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING)); swprintf(wcTemp,app.GetString(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING));
m_wstrStageText=wcTemp; m_wstrStageText=wcTemp;
pMinecraft->progressRenderer->progressStage( m_wstrStageText ); pMinecraft->progressRenderer->progressStage( m_wstrStageText );
@@ -3740,7 +3852,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStor
{ {
UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam; UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
LoadingInputParams *loadingParams = new LoadingInputParams(); LoadingInputParams *loadingParams = new LoadingInputParams();
@@ -3785,7 +3897,7 @@ int UIScene_LoadOrJoinMenu::CopySaveThreadProc( LPVOID lpParameter )
ui.LeaveCallbackIdCriticalSection(); ui.LeaveCallbackIdCriticalSection();
// Copy save data takes two callbacks - one for completion, and one for progress. The progress callback also lets us cancel the operation, if we return false. // Copy save data takes two callbacks - one for completion, and one for progress. The progress callback also lets us cancel the operation, if we return false.
StorageManager.CopySaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC],UIScene_LoadOrJoinMenu::CopySaveDataReturned,UIScene_LoadOrJoinMenu::CopySaveDataProgress,lpParameter); StorageManager.CopySaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC],UIScene_LoadOrJoinMenu::CopySaveDataReturned,UIScene_LoadOrJoinMenu::CopySaveDataProgress,lpParameter);
bool bContinue = true; bool bContinue = true;
do do
{ {
@@ -3822,7 +3934,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDataReturned(LPVOID lpParam, bool success, C
{ {
pClass->m_bCopying = false; pClass->m_bCopying = false;
// wipe the list and repopulate it // wipe the list and repopulate it
pClass->m_iState=e_SavesRepopulateAfterDelete; pClass->m_iState=e_SavesRepopulateAfterDelete;
ui.LeaveCallbackIdCriticalSection(); ui.LeaveCallbackIdCriticalSection();
} }
else else

38
Minecraft.Client/Common/UI/UIStructs.h
View File

@@ -282,6 +282,44 @@ typedef struct _JoinMenuInitData
int iPad; int iPad;
} JoinMenuInitData; } JoinMenuInitData;
// Native keyboard (Windows64 replacement for InputManager.RequestKeyboard WinAPI dialog)
#ifdef _WINDOWS64
typedef struct _UIKeyboardInitData
{
const wchar_t* title;
const wchar_t* defaultText;
int maxChars;
int(*callback)(LPVOID, const bool);
LPVOID lpParam;
bool pcMode; // When true, disables on-screen keyboard buttons (PC keyboard users only need the text field)
_UIKeyboardInitData() : title(nullptr), defaultText(nullptr), maxChars(25), callback(nullptr), lpParam(nullptr), pcMode(false) {}
} UIKeyboardInitData;
// Stores the text typed in UIScene_Keyboard so callbacks can retrieve it
// without calling InputManager.GetText (which shows the WinAPI dialog result).
extern wchar_t g_Win64KeyboardResult[256];
inline void Win64_GetKeyboardText(uint16_t* outBuf, int maxChars)
{
wcsncpy_s((wchar_t*)outBuf, maxChars, g_Win64KeyboardResult, _TRUNCATE);
}
// Returns true if any XInput controller is currently connected.
// Used to decide whether to show the in-game keyboard UI or fall back to PC input.
#include <Xinput.h>
inline bool Win64_IsControllerConnected()
{
XINPUT_STATE state;
for (DWORD i = 0; i < XUSER_MAX_COUNT; i++)
{
memset(&state, 0, sizeof(state));
if (XInputGetState(i, &state) == ERROR_SUCCESS)
return true;
}
return false;
}
#endif // _WINDOWS64
// More Options // More Options
typedef struct _LaunchMoreOptionsMenuInitData typedef struct _LaunchMoreOptionsMenuInitData
{ {

66
Minecraft.Client/Common/XUI/XUI_Ctrl_4JList.cpp
View File

@@ -15,7 +15,7 @@ HRESULT CXuiCtrl4JList::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFromIndex, int iSortFunction) void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFromIndex, int iSortFunction)
{ {
// need to allocate memory for the structure and its strings // need to allocate memory for the structure and its strings
// and remap the string pointers // and remap the string pointers
DWORD dwBytes=0; DWORD dwBytes=0;
DWORD dwLen1=0; DWORD dwLen1=0;
DWORD dwLen2=0; DWORD dwLen2=0;
@@ -37,7 +37,7 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
ZeroMemory(pItemInfo,dwBytes); ZeroMemory(pItemInfo,dwBytes);
XMemCpy( pItemInfo, &ItemInfo, sizeof( LIST_ITEM_INFO ) ); XMemCpy( pItemInfo, &ItemInfo, sizeof( LIST_ITEM_INFO ) );
if(dwLen1!=0) if(dwLen1!=0)
{ {
XMemCpy( &pItemInfo[1], ItemInfo.pwszText, dwLen1 ); XMemCpy( &pItemInfo[1], ItemInfo.pwszText, dwLen1 );
pItemInfo->pwszText=(LPCWSTR)&pItemInfo[1]; pItemInfo->pwszText=(LPCWSTR)&pItemInfo[1];
@@ -68,13 +68,13 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
// added to force a sort order for DLC // added to force a sort order for DLC
//pItemInfo->iSortIndex=iSortIndex; //pItemInfo->iSortIndex=iSortIndex;
m_vListData.push_back(pItemInfo); m_vListData.push_back(pItemInfo);
#ifdef _DEBUG #ifdef _DEBUG
int iCount=0; int iCount=0;
for (AUTO_VAR(it, m_vListData.begin()); it != m_vListData.end(); it++) for ( auto it : m_vListData )
{ {
PLIST_ITEM_INFO pInfo=(PLIST_ITEM_INFO)*it; PLIST_ITEM_INFO pInfo=(PLIST_ITEM_INFO)*it;
app.DebugPrintf("%d. ",iCount++); app.DebugPrintf("%d. ",iCount++);
@@ -99,22 +99,10 @@ void CXuiCtrl4JList::AddData( const LIST_ITEM_INFO& ItemInfo , int iSortListFrom
break; break;
case eSortList_Index: case eSortList_Index:
sort(m_vListData.begin()+iSortListFromIndex, m_vListData.end(),CXuiCtrl4JList::IndexSortFn); sort(m_vListData.begin()+iSortListFromIndex, m_vListData.end(),CXuiCtrl4JList::IndexSortFn);
break; break;
} }
} }
LeaveCriticalSection(&m_AccessListData); LeaveCriticalSection(&m_AccessListData);
// #ifdef _DEBUG
//
// iCount=0;
// for (AUTO_VAR(it, m_vListData.begin()); it != m_vListData.end(); it++)
// {
// PLIST_ITEM_INFO pInfo=(PLIST_ITEM_INFO)*it;
// app.DebugPrintf("After Sort - %d. ",iCount++);
// OutputDebugStringW(pInfo->pwszText);
// app.DebugPrintf(" - %d\n",pInfo->iSortIndex);
//
// }
// #endif
InsertItems( 0, 1 ); InsertItems( 0, 1 );
} }
@@ -162,13 +150,13 @@ int CXuiCtrl4JList::GetIndexByUserData(int iData)
return 0; return 0;
} }
CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetData(DWORD dw) CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetData(DWORD dw)
{ {
return *m_vListData[dw]; return *m_vListData[dw];
} }
CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetDataiData(int iData) CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetDataiData(int iData)
{ {
LIST_ITEM_INFO info; LIST_ITEM_INFO info;
for(unsigned int i=0;i<m_vListData.size();i++) for(unsigned int i=0;i<m_vListData.size();i++)
@@ -180,11 +168,11 @@ CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetDataiData(int iData)
} }
} }
return *m_vListData[0]; return *m_vListData[0];
} }
CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetData(FILETIME *pFileTime) CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetData(FILETIME *pFileTime)
{ {
LIST_ITEM_INFO info; LIST_ITEM_INFO info;
for(unsigned int i=0;i<m_vListData.size();i++) for(unsigned int i=0;i<m_vListData.size();i++)
@@ -196,13 +184,13 @@ CXuiCtrl4JList::LIST_ITEM_INFO& CXuiCtrl4JList::GetData(FILETIME *pFileTime)
} }
} }
return *m_vListData[0]; return *m_vListData[0];
} }
bool CXuiCtrl4JList::TimeSortFn(const void *a, const void *b) bool CXuiCtrl4JList::TimeSortFn(const void *a, const void *b)
{ {
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a;
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b;
if(SaveDetailsA->fTime.dwHighDateTime > SaveDetailsB->fTime.dwHighDateTime) if(SaveDetailsA->fTime.dwHighDateTime > SaveDetailsB->fTime.dwHighDateTime)
{ {
@@ -229,14 +217,14 @@ bool CXuiCtrl4JList::TimeSortFn(const void *a, const void *b)
bool CXuiCtrl4JList::AlphabeticSortFn(const void *a, const void *b) bool CXuiCtrl4JList::AlphabeticSortFn(const void *a, const void *b)
{ {
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a;
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b;
wstring wstr1=SaveDetailsA->pwszText; wstring wstr1=SaveDetailsA->pwszText;
wstring wstr2=SaveDetailsB->pwszText; wstring wstr2=SaveDetailsB->pwszText;
if(wstr1.compare(wstr2)<0) if(wstr1.compare(wstr2)<0)
{ {
return true; return true;
} }
return false; return false;
} }
@@ -244,14 +232,14 @@ bool CXuiCtrl4JList::AlphabeticSortFn(const void *a, const void *b)
bool CXuiCtrl4JList::IndexSortFn(const void *a, const void *b) bool CXuiCtrl4JList::IndexSortFn(const void *a, const void *b)
{ {
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsA=(CXuiCtrl4JList::LIST_ITEM_INFO *)a;
CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b; CXuiCtrl4JList::LIST_ITEM_INFO *SaveDetailsB=(CXuiCtrl4JList::LIST_ITEM_INFO *)b;
int iA=SaveDetailsA->iSortIndex; int iA=SaveDetailsA->iSortIndex;
int iB=SaveDetailsB->iSortIndex; int iB=SaveDetailsB->iSortIndex;
if(iA>iB) if(iA>iB)
{ {
return true; return true;
} }
return false; return false;
} }
@@ -303,10 +291,10 @@ void CXuiCtrl4JList::UpdateGraphic(FILETIME *pfTime,HXUIBRUSH hXuiBrush )
// Gets called every frame // Gets called every frame
HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceTextData,BOOL& bHandled) HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceTextData,BOOL& bHandled)
{ {
if( ( 0 == pGetSourceTextData->iData ) && ( ( pGetSourceTextData->bItemData ) ) ) if( ( 0 == pGetSourceTextData->iData ) && ( ( pGetSourceTextData->bItemData ) ) )
{ {
EnterCriticalSection(&m_AccessListData); EnterCriticalSection(&m_AccessListData);
pGetSourceTextData->szText = pGetSourceTextData->szText =
GetData(pGetSourceTextData->iItem).pwszText; GetData(pGetSourceTextData->iItem).pwszText;
LeaveCriticalSection(&m_AccessListData); LeaveCriticalSection(&m_AccessListData);
bHandled = TRUE; bHandled = TRUE;
@@ -323,7 +311,7 @@ HRESULT CXuiCtrl4JList::OnGetItemCountAll(XUIMessageGetItemCount *pGetItemCountD
HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourceImageData,BOOL& bHandled) HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourceImageData,BOOL& bHandled)
{ {
if( ( 0 == pGetSourceImageData->iData ) && ( pGetSourceImageData->bItemData ) ) if( ( 0 == pGetSourceImageData->iData ) && ( pGetSourceImageData->bItemData ) )
{ {
// Check for a brush // Check for a brush
EnterCriticalSection(&m_AccessListData); EnterCriticalSection(&m_AccessListData);
@@ -333,7 +321,7 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataImage(XUIMessageGetSourceImage *pGetSourc
} }
else else
{ {
pGetSourceImageData->szPath = pGetSourceImageData->szPath =
GetData(pGetSourceImageData->iItem).pwszImage; GetData(pGetSourceImageData->iItem).pwszImage;
} }
LeaveCriticalSection(&m_AccessListData); LeaveCriticalSection(&m_AccessListData);
@@ -347,7 +335,7 @@ HRESULT CXuiCtrl4JList::OnGetItemEnable(XUIMessageGetItemEnable *pGetItemEnableD
if(m_vListData.size()!=0) if(m_vListData.size()!=0)
{ {
EnterCriticalSection(&m_AccessListData); EnterCriticalSection(&m_AccessListData);
pGetItemEnableData->bEnabled = pGetItemEnableData->bEnabled =
GetData(pGetItemEnableData->iItem).fEnabled; GetData(pGetItemEnableData->iItem).fEnabled;
LeaveCriticalSection(&m_AccessListData); LeaveCriticalSection(&m_AccessListData);
} }
@@ -356,14 +344,14 @@ HRESULT CXuiCtrl4JList::OnGetItemEnable(XUIMessageGetItemEnable *pGetItemEnableD
} }
HRESULT CXuiCtrl4JList::SetBorder(DWORD dw,BOOL bShow) HRESULT CXuiCtrl4JList::SetBorder(DWORD dw,BOOL bShow)
{ {
CXuiControl Control; CXuiControl Control;
HXUIOBJ hVisual,hBorder; HXUIOBJ hVisual,hBorder;
GetItemControl(dw,&Control); GetItemControl(dw,&Control);
Control.GetVisual(&hVisual); Control.GetVisual(&hVisual);
XuiElementGetChildById(hVisual,L"Border",&hBorder); XuiElementGetChildById(hVisual,L"Border",&hBorder);
return XuiElementSetShow(hBorder,bShow); return XuiElementSetShow(hBorder,bShow);
} }
void CXuiCtrl4JList::SetSelectionChangedHandle(HXUIOBJ hObj) void CXuiCtrl4JList::SetSelectionChangedHandle(HXUIOBJ hObj)

4
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
View File

@@ -69,7 +69,7 @@ HRESULT CXuiCtrlEnchantmentButton::OnGetSourceDataText(XUIMessageGetSourceText *
// Light background and focus background // Light background and focus background
SetEnable(TRUE); SetEnable(TRUE);
} }
m_costString = _toString<int>(cost); m_costString = std::to_wstring(cost);
m_lastCost = cost; m_lastCost = cost;
} }
if(cost == 0) if(cost == 0)
@@ -79,7 +79,7 @@ HRESULT CXuiCtrlEnchantmentButton::OnGetSourceDataText(XUIMessageGetSourceText *
pGetSourceTextData->bDisplay = FALSE; pGetSourceTextData->bDisplay = FALSE;
} }
else else
{ {
pGetSourceTextData->szText = m_costString.c_str(); pGetSourceTextData->szText = m_costString.c_str();
pGetSourceTextData->bDisplay = TRUE; pGetSourceTextData->bDisplay = TRUE;
} }

6
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
View File

@@ -70,11 +70,11 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnRender(XUIMessageRender *pRenderData, B
D3DXMATRIX matrix; D3DXMATRIX matrix;
xuiControl.GetFullXForm(&matrix); xuiControl.GetFullXForm(&matrix);
float bwidth,bheight; float bwidth,bheight;
xuiControl.GetBounds(&bwidth,&bheight); xuiControl.GetBounds(&bwidth,&bheight);
// Annoyingly, XUI renders everything to a z of 0 so if we want to render anything that needs the z-buffer on top of it, then we need to clear it. // Annoyingly, XUI renders everything to a z of 0 so if we want to render anything that needs the z-buffer on top of it, then we need to clear it.
// Clear just the region required for this control. // Clear just the region required for this control.
D3DRECT clearRect; D3DRECT clearRect;
clearRect.x1 = (int)(matrix._41) - 2; clearRect.x1 = (int)(matrix._41) - 2;
clearRect.y1 = (int)(matrix._42) - 2; clearRect.y1 = (int)(matrix._42) - 2;
clearRect.x2 = (int)(matrix._41 + ( bwidth * matrix._11 )) + 2; clearRect.x2 = (int)(matrix._41 + ( bwidth * matrix._11 )) + 2;
@@ -124,7 +124,7 @@ HRESULT CXuiCtrlEnchantmentButtonText::OnRender(XUIMessageRender *pRenderData, B
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
if (cost != 0) if (cost != 0)
{ {
wstring line = _toString<int>(cost); wstring line = std::to_wstring(cost);
Font *font = pMinecraft->altFont; Font *font = pMinecraft->altFont;
//int col = 0x685E4A; //int col = 0x685E4A;
unsigned int col = m_textColour; unsigned int col = m_textColour;

24
Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
View File

@@ -145,7 +145,7 @@ void CXuiCtrlMinecraftSkinPreview::CycleNextAnimation()
void CXuiCtrlMinecraftSkinPreview::CyclePreviousAnimation() void CXuiCtrlMinecraftSkinPreview::CyclePreviousAnimation()
{ {
m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1); m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1);
if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1); if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1);
m_swingTime = 0.0f; m_swingTime = 0.0f;
@@ -253,13 +253,11 @@ HRESULT CXuiCtrlMinecraftSkinPreview::OnRender(XUIMessageRender *pRenderData, BO
{ {
// 4J-PB - any additional parts to turn on for this player (skin dependent) // 4J-PB - any additional parts to turn on for this player (skin dependent)
//vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts(); //vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0)
{
for(AUTO_VAR(it, m_pvAdditionalModelParts->begin()); it != m_pvAdditionalModelParts->end(); ++it)
{
ModelPart *pModelPart=*it;
if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0)
{
for(auto& pModelPart : *m_pvAdditionalModelParts)
{
pModelPart->visible=true; pModelPart->visible=true;
} }
} }
@@ -269,11 +267,9 @@ HRESULT CXuiCtrlMinecraftSkinPreview::OnRender(XUIMessageRender *pRenderData, BO
// hide the additional parts // hide the additional parts
if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0) if(m_pvAdditionalModelParts && m_pvAdditionalModelParts->size()!=0)
{ {
for(AUTO_VAR(it, m_pvAdditionalModelParts->begin()); it != m_pvAdditionalModelParts->end(); ++it) for(auto& pModelPart : *m_pvAdditionalModelParts)
{ {
ModelPart *pModelPart=*it;
pModelPart->visible=false; pModelPart->visible=false;
} }
} }
@@ -344,7 +340,7 @@ void CXuiCtrlMinecraftSkinPreview::render(EntityRenderer *renderer, double x, do
float bodyRot = m_yRot; //(mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * a); float bodyRot = m_yRot; //(mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * a);
float headRot = m_yRot; //(mob->yRotO + (mob->yRot - mob->yRotO) * a); float headRot = m_yRot; //(mob->yRotO + (mob->yRot - mob->yRotO) * a);
float headRotx = 0; //(mob->xRotO + (mob->xRot - mob->xRotO) * a); float headRotx = 0; //(mob->xRotO + (mob->xRot - mob->xRotO) * a);
//setupPosition(mob, x, y, z); //setupPosition(mob, x, y, z);
// is equivalent to // is equivalent to
glTranslatef((float) x, (float) y, (float) z); glTranslatef((float) x, (float) y, (float) z);
@@ -515,7 +511,7 @@ bool CXuiCtrlMinecraftSkinPreview::bindTexture(const wstring& urlTexture, int ba
Textures *t = Minecraft::GetInstance()->textures; Textures *t = Minecraft::GetInstance()->textures;
// 4J-PB - no http textures on the xbox, mem textures instead // 4J-PB - no http textures on the xbox, mem textures instead
//int id = t->loadHttpTexture(urlTexture, backupTexture); //int id = t->loadHttpTexture(urlTexture, backupTexture);
int id = t->loadMemTexture(urlTexture, backupTexture); int id = t->loadMemTexture(urlTexture, backupTexture);
@@ -535,7 +531,7 @@ bool CXuiCtrlMinecraftSkinPreview::bindTexture(const wstring& urlTexture, const
Textures *t = Minecraft::GetInstance()->textures; Textures *t = Minecraft::GetInstance()->textures;
// 4J-PB - no http textures on the xbox, mem textures instead // 4J-PB - no http textures on the xbox, mem textures instead
//int id = t->loadHttpTexture(urlTexture, backupTexture); //int id = t->loadHttpTexture(urlTexture, backupTexture);
int id = t->loadMemTexture(urlTexture, backupTexture); int id = t->loadMemTexture(urlTexture, backupTexture);

19
Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
View File

@@ -64,7 +64,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnCustomMessage_GetSlotItem(HXUIOBJ hObj, Cust
// 11 bits - auxval // 11 bits - auxval
// 6 bits - count // 6 bits - count
// 6 bits - scale // 6 bits - scale
pData->iDataBitField = MAKE_SLOTDISPLAY_DATA_BITMASK(pUserDataContainer->m_iPad, (int)(31*pUserDataContainer->m_fAlpha),true,item->GetCount(),7,item->popTime); pData->iDataBitField = MAKE_SLOTDISPLAY_DATA_BITMASK(pUserDataContainer->m_iPad, (int)(31*pUserDataContainer->m_fAlpha),true,item->GetCount(),7,item->popTime);
} }
else else
{ {
@@ -93,7 +93,7 @@ void CXuiCtrlSlotItemCtrlBase::SetUserIndex( HXUIOBJ hObj, int iPad )
XuiElementGetUserData( hObj, &pvUserData ); XuiElementGetUserData( hObj, &pvUserData );
SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData; SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
pUserDataContainer->m_iPad = iPad; pUserDataContainer->m_iPad = iPad;
} }
@@ -103,7 +103,7 @@ void CXuiCtrlSlotItemCtrlBase::SetAlpha( HXUIOBJ hObj, float fAlpha )
XuiElementGetUserData( hObj, &pvUserData ); XuiElementGetUserData( hObj, &pvUserData );
SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData; SlotControlUserDataContainer* pUserDataContainer = (SlotControlUserDataContainer*)pvUserData;
pUserDataContainer->m_fAlpha = fAlpha; pUserDataContainer->m_fAlpha = fAlpha;
} }
@@ -137,16 +137,15 @@ wstring CXuiCtrlSlotItemCtrlBase::GetItemDescription( HXUIOBJ hObj, vector<wstri
wstring desc = L""; wstring desc = L"";
vector<wstring> *strings = pUserDataContainer->slot->getItem()->getHoverText(Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad], false, unformattedStrings); vector<wstring> *strings = pUserDataContainer->slot->getItem()->getHoverText(Minecraft::GetInstance()->localplayers[pUserDataContainer->m_iPad], false, unformattedStrings);
bool firstLine = true; bool firstLine = true;
for(AUTO_VAR(it, strings->begin()); it != strings->end(); ++it) for ( wstring& thisString : *strings )
{ {
wstring thisString = *it;
if(!firstLine) if(!firstLine)
{ {
desc.append( L"<br />" ); desc.append( L"<br />" );
} }
else else
{ {
firstLine = false; firstLine = false;
wchar_t formatted[256]; wchar_t formatted[256];
eMinecraftColour rarityColour = pUserDataContainer->slot->getItem()->getRarity()->color; eMinecraftColour rarityColour = pUserDataContainer->slot->getItem()->getRarity()->color;
int colour = app.GetHTMLColour(rarityColour); int colour = app.GetHTMLColour(rarityColour);
@@ -156,7 +155,7 @@ wstring CXuiCtrlSlotItemCtrlBase::GetItemDescription( HXUIOBJ hObj, vector<wstri
colour = app.GetHTMLColour(eTextColor_RenamedItemTitle); colour = app.GetHTMLColour(eTextColor_RenamedItemTitle);
} }
swprintf(formatted, 256, L"<font color=\"#%08x\">%s</font>",colour,thisString.c_str()); swprintf(formatted, 256, L"<font color=\"#%08x\">%s</font>",colour,thisString.c_str());
thisString = formatted; thisString = formatted;
} }
desc.append( thisString ); desc.append( thisString );
@@ -221,7 +220,7 @@ HRESULT CXuiCtrlSlotItemCtrlBase::OnKeyDown(HXUIOBJ hObj, XUIMessageInput *pInpu
XUIMessage message; XUIMessage message;
XUIMessageInput messageInput; XUIMessageInput messageInput;
XuiMessageInput( &message, &messageInput, XUI_KEYDOWN, pInputData->dwKeyCode, pInputData->wch, pInputData->dwFlags, pInputData->UserIndex ); XuiMessageInput( &message, &messageInput, XUI_KEYDOWN, pInputData->dwKeyCode, pInputData->wch, pInputData->dwFlags, pInputData->UserIndex );
if (HRESULT_SUCCEEDED(hr)) if (HRESULT_SUCCEEDED(hr))
@@ -358,7 +357,7 @@ bool CXuiCtrlSlotItemCtrlBase::IsSameItemAs( HXUIOBJ hThisObj, HXUIOBJ hOtherObj
// 4J WESTY : Pointer Prototype : Added to support prototype only. // 4J WESTY : Pointer Prototype : Added to support prototype only.
// Returns number of items that can still be stacked into this slot. // Returns number of items that can still be stacked into this slot.
int CXuiCtrlSlotItemCtrlBase::GetEmptyStackSpace( HXUIOBJ hObj ) int CXuiCtrlSlotItemCtrlBase::GetEmptyStackSpace( HXUIOBJ hObj )
{ {
int iResult = 0; int iResult = 0;

14
Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
View File

@@ -9,7 +9,7 @@
#include "..\..\Common\GameRules\ConsoleGameRules.h" #include "..\..\Common\GameRules\ConsoleGameRules.h"
#include "XUI_DebugItemEditor.h" #include "XUI_DebugItemEditor.h"
#ifdef _DEBUG_MENUS_ENABLED #ifdef _DEBUG_MENUS_ENABLED
HRESULT CScene_DebugItemEditor::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) HRESULT CScene_DebugItemEditor::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
{ {
MapChildControls(); MapChildControls();
@@ -22,13 +22,13 @@ HRESULT CScene_DebugItemEditor::OnInit( XUIMessageInit *pInitData, BOOL &bHandle
if(m_item!=NULL) if(m_item!=NULL)
{ {
m_icon->SetIcon(m_iPad, m_item->id,m_item->getAuxValue(),m_item->count,10,31,false,m_item->isFoil()); m_icon->SetIcon(m_iPad, m_item->id,m_item->getAuxValue(),m_item->count,10,31,false,m_item->isFoil());
m_itemName.SetText( app.GetString( Item::items[m_item->id]->getDescriptionId(m_item) ) ); m_itemName.SetText( app.GetString( Item::items[m_item->id]->getDescriptionId(m_item) ) );
m_itemId .SetText( _toString<int>(m_item->id).c_str() ); m_itemId .SetText( std::to_wstring(m_item->id).c_str() );
m_itemAuxValue .SetText( _toString<int>(m_item->getAuxValue()).c_str() ); m_itemAuxValue .SetText( std::to_wstring(m_item->getAuxValue()).c_str() );
m_itemCount .SetText( _toString<int>(m_item->count).c_str() ); m_itemCount .SetText( std::to_wstring(m_item->count).c_str() );
m_item4JData .SetText( _toString<int>(m_item->get4JData()).c_str() ); m_item4JData .SetText( std::to_wstring(m_item->get4JData()).c_str() );
} }
m_itemId .SetKeyboardType(C_4JInput::EKeyboardMode_Numeric); m_itemId .SetKeyboardType(C_4JInput::EKeyboardMode_Numeric);
@@ -107,7 +107,7 @@ HRESULT CScene_DebugItemEditor::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINot
if(!value.empty()) data = _fromString<int>( value ); if(!value.empty()) data = _fromString<int>( value );
m_item->set4JData(data); m_item->set4JData(data);
} }
m_icon->SetIcon(m_iPad, m_item->id,m_item->getAuxValue(),m_item->count,10,31,false,m_item->isFoil()); m_icon->SetIcon(m_iPad, m_item->id,m_item->getAuxValue(),m_item->count,10,31,false,m_item->isFoil());
m_itemName.SetText( app.GetString( Item::items[m_item->id]->getDescriptionId(m_item) ) ); m_itemName.SetText( app.GetString( Item::items[m_item->id]->getDescriptionId(m_item) ) );

20
Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
View File

@@ -28,7 +28,7 @@
#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h" #include "..\..\..\Minecraft.World\net.minecraft.commands.common.h"
#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h" #include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
#ifdef _DEBUG_MENUS_ENABLED #ifdef _DEBUG_MENUS_ENABLED
HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled ) HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
{ {
MapChildControls(); MapChildControls();
@@ -53,7 +53,7 @@ HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
m_enchantmentIds.push_back(ench->id); m_enchantmentIds.push_back(ench->id);
m_enchantments.SetText( i, app.GetString( ench->getDescriptionId() ) ); m_enchantments.SetText( i, app.GetString( ench->getDescriptionId() ) );
} }
m_mobs.InsertItems( 0, 21 ); m_mobs.InsertItems( 0, 21 );
m_mobs.SetText( m_mobFactories.size(), L"Chicken" ); m_mobs.SetText( m_mobFactories.size(), L"Chicken" );
@@ -98,7 +98,7 @@ HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
m_mobFactories.push_back(eTYPE_BLAZE); m_mobFactories.push_back(eTYPE_BLAZE);
m_mobs.SetText( m_mobFactories.size(), L"Magma Cube" ); m_mobs.SetText( m_mobFactories.size(), L"Magma Cube" );
m_mobFactories.push_back(eTYPE_LAVASLIME); m_mobFactories.push_back(eTYPE_LAVASLIME);
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
m_setTime.SetValue( pMinecraft->level->getLevelData()->getTime() % 24000 ); m_setTime.SetValue( pMinecraft->level->getLevelData()->getTime() % 24000 );
@@ -135,7 +135,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
{ {
nIndex = m_mobs.GetCurSel(); nIndex = m_mobs.GetCurSel();
if(nIndex<m_mobFactories.size()) if(nIndex<m_mobFactories.size())
{ {
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[nIndex]); app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_SpawnMob,(void *)m_mobFactories[nIndex]);
} }
} }
@@ -171,7 +171,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
HXUIOBJ hScene; HXUIOBJ hScene;
HRESULT hr; HRESULT hr;
//const WCHAR XZP_SEPARATOR = L'#'; //const WCHAR XZP_SEPARATOR = L'#';
const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
WCHAR szResourceLocator[ LOCATOR_SIZE ]; WCHAR szResourceLocator[ LOCATOR_SIZE ];
swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/"); swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/");
@@ -189,7 +189,7 @@ HRESULT CScene_DebugOverlay::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress
HXUIOBJ hScene; HXUIOBJ hScene;
HRESULT hr; HRESULT hr;
//const WCHAR XZP_SEPARATOR = L'#'; //const WCHAR XZP_SEPARATOR = L'#';
const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
WCHAR szResourceLocator[ LOCATOR_SIZE ]; WCHAR szResourceLocator[ LOCATOR_SIZE ];
swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/"); swprintf(szResourceLocator, LOCATOR_SIZE, L"section://%X,%ls#%ls",c_ModuleHandle,L"media", L"media/");
@@ -256,7 +256,7 @@ HRESULT CScene_DebugOverlay::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotify
if( hObjSource == m_setTime ) if( hObjSource == m_setTime )
{ {
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
// Need to set the time on both levels to stop the flickering as the local level // Need to set the time on both levels to stop the flickering as the local level
// tries to predict the time // tries to predict the time
// Only works if we are on the host machine, but shouldn't break if not // Only works if we are on the host machine, but shouldn't break if not
@@ -365,11 +365,11 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
RegionFile *CScene_DebugOverlay::getRegionFile(unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ) // 4J - TODO was synchronized RegionFile *CScene_DebugOverlay::getRegionFile(unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ) // 4J - TODO was synchronized
{ {
File file( prefix + wstring(L"r.") + _toString(chunkX>>5) + L"." + _toString(chunkZ>>5) + L".mcr" ); File file( prefix + wstring(L"r.") + std::to_wstring(chunkX>>5) + L"." + std::to_wstring(chunkZ>>5) + L".mcr" );
RegionFile *ref = NULL; RegionFile *ref = NULL;
AUTO_VAR(it, newFileCache.find(file)); auto it = newFileCache.find(file);
if( it != newFileCache.end() ) if( it != newFileCache.end() )
ref = it->second; ref = it->second;
// 4J Jev, put back in. // 4J Jev, put back in.

16
Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
View File

@@ -23,7 +23,7 @@ HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled
currentPosition = new DebugSetCameraPosition(); currentPosition = new DebugSetCameraPosition();
currentPosition->player = playerNo; currentPosition->player = playerNo;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
if (pMinecraft != NULL) if (pMinecraft != NULL)
{ {
@@ -43,13 +43,13 @@ HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled
m_yRot.SetKeyboardType(C_4JInput::EKeyboardMode_Full); m_yRot.SetKeyboardType(C_4JInput::EKeyboardMode_Full);
m_elevation.SetKeyboardType(C_4JInput::EKeyboardMode_Full); m_elevation.SetKeyboardType(C_4JInput::EKeyboardMode_Full);
m_camX.SetText((CONST WCHAR *) _toString<double>(currentPosition->m_camX).c_str()); m_camX.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camX).c_str());
m_camY.SetText((CONST WCHAR *) _toString<double>(currentPosition->m_camY + 1.62).c_str()); m_camY.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camY + 1.62).c_str());
m_camZ.SetText((CONST WCHAR *) _toString<double>(currentPosition->m_camZ).c_str()); m_camZ.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_camZ).c_str());
m_yRot.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_yRot).c_str());
m_elevation.SetText((CONST WCHAR *) std::to_wstring(currentPosition->m_elev).c_str());
m_yRot.SetText((CONST WCHAR *) _toString<double>(currentPosition->m_yRot).c_str());
m_elevation.SetText((CONST WCHAR *) _toString<double>(currentPosition->m_elev).c_str());
//fpp = new FreezePlayerParam(); //fpp = new FreezePlayerParam();
//fpp->player = playerNo; //fpp->player = playerNo;
//fpp->freeze = true; //fpp->freeze = true;
@@ -69,7 +69,7 @@ HRESULT CScene_DebugSetCamera::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPre
if (hObjPressed == m_teleport) if (hObjPressed == m_teleport)
{ {
app.SetXuiServerAction( ProfileManager.GetPrimaryPad(), app.SetXuiServerAction( ProfileManager.GetPrimaryPad(),
eXuiServerAction_SetCameraLocation, eXuiServerAction_SetCameraLocation,
(void *)currentPosition); (void *)currentPosition);
rfHandled = TRUE; rfHandled = TRUE;
} }

202
Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
View File

@@ -42,13 +42,13 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
m_iTexturePacksNotInstalled=0; m_iTexturePacksNotInstalled=0;
m_iConfigA=NULL; m_iConfigA=NULL;
XuiControlSetText(m_LabelNoGames,app.GetString(IDS_NO_GAMES_FOUND)); XuiControlSetText(m_LabelNoGames,app.GetString(IDS_NO_GAMES_FOUND));
XuiControlSetText(m_GamesList,app.GetString(IDS_JOIN_GAME)); XuiControlSetText(m_GamesList,app.GetString(IDS_JOIN_GAME));
XuiControlSetText(m_SavesList,app.GetString(IDS_START_GAME)); XuiControlSetText(m_SavesList,app.GetString(IDS_START_GAME));
const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
WCHAR szResourceLocator[ LOCATOR_SIZE ]; WCHAR szResourceLocator[ LOCATOR_SIZE ];
const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL); const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
@@ -64,17 +64,17 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
m_bRetrievingSaveInfo=false; m_bRetrievingSaveInfo=false;
m_bSaveTransferInProgress=false; m_bSaveTransferInProgress=false;
// check for a default custom cloak in the global storage // check for a default custom cloak in the global storage
// 4J-PB - changed to a config file // 4J-PB - changed to a config file
// if(ProfileManager.IsSignedInLive( m_iPad )) // if(ProfileManager.IsSignedInLive( m_iPad ))
// { // {
// app.InstallDefaultCape(); // app.InstallDefaultCape();
// } // }
m_initData= new JoinMenuInitData(); m_initData= new JoinMenuInitData();
m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
XPARTY_USER_LIST partyList; XPARTY_USER_LIST partyList;
if((XPartyGetUserList( &partyList ) != XPARTY_E_NOT_IN_PARTY ) && (partyList.dwUserCount>1)) if((XPartyGetUserList( &partyList ) != XPARTY_E_NOT_IN_PARTY ) && (partyList.dwUserCount>1))
@@ -90,7 +90,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
if(m_bInParty) iLB = IDS_TOOLTIPS_PARTY_GAMES; if(m_bInParty) iLB = IDS_TOOLTIPS_PARTY_GAMES;
XuiSetTimer(m_hObj,JOIN_LOAD_ONLINE_TIMER_ID,JOIN_LOAD_ONLINE_TIMER_TIME); XuiSetTimer(m_hObj,JOIN_LOAD_ONLINE_TIMER_ID,JOIN_LOAD_ONLINE_TIMER_TIME);
m_iSaveInfoC=0; m_iSaveInfoC=0;
VOID *pObj; VOID *pObj;
@@ -110,7 +110,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
{ {
// if we're waiting for DLC to mount, don't fill the save list. The custom message on end of dlc mounting will do that // if we're waiting for DLC to mount, don't fill the save list. The custom message on end of dlc mounting will do that
m_bIgnoreInput=false; m_bIgnoreInput=false;
m_iChangingSaveGameInfoIndex = 0; m_iChangingSaveGameInfoIndex = 0;
@@ -135,7 +135,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
// saving is disabled, but we should still be able to load from a selected save device // saving is disabled, but we should still be able to load from a selected save device
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_CHANGEDEVICE,-1,-1,-1,iLB,IDS_TOOLTIPS_DELETESAVE); ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_CHANGEDEVICE,-1,-1,-1,iLB,IDS_TOOLTIPS_DELETESAVE);
GetSaveInfo(); GetSaveInfo();
} }
else else
@@ -153,7 +153,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
// 4J-PB - we need to check that there is enough space left to create a copy of the save (for a rename) // 4J-PB - we need to check that there is enough space left to create a copy of the save (for a rename)
bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame(); bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame();
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_CHANGEDEVICE,-1,-1,-1,-1,bCanRename?IDS_TOOLTIPS_SAVEOPTIONS:IDS_TOOLTIPS_DELETESAVE); ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_CHANGEDEVICE,-1,-1,-1,-1,bCanRename?IDS_TOOLTIPS_SAVEOPTIONS:IDS_TOOLTIPS_DELETESAVE);
GetSaveInfo(); GetSaveInfo();
} }
} }
@@ -165,7 +165,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
// 4J Stu - Fix for #12530 -TCR 001 BAS Game Stability: Title will crash if the player disconnects while starting a new world and then opts to play the tutorial once they have been returned to the Main Menu. // 4J Stu - Fix for #12530 -TCR 001 BAS Game Stability: Title will crash if the player disconnects while starting a new world and then opts to play the tutorial once they have been returned to the Main Menu.
MinecraftServer::resetFlags(); MinecraftServer::resetFlags();
// If we're not ignoring input, then we aren't still waiting for the DLC to mount, and can now check for corrupt dlc. Otherwise this will happen when the dlc has finished mounting. // If we're not ignoring input, then we aren't still waiting for the DLC to mount, and can now check for corrupt dlc. Otherwise this will happen when the dlc has finished mounting.
if( !m_bIgnoreInput) if( !m_bIgnoreInput)
{ {
@@ -191,7 +191,7 @@ HRESULT CScene_MultiGameJoinLoad::OnInit( XUIMessageInit* pInitData, BOOL& bHand
bool bTexturePackAlreadyListed; bool bTexturePackAlreadyListed;
bool bNeedToGetTPD=false; bool bNeedToGetTPD=false;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
int texturePacksCount = pMinecraft->skins->getTexturePackCount(); int texturePacksCount = pMinecraft->skins->getTexturePackCount();
//CXuiCtrl4JList::LIST_ITEM_INFO ListInfo; //CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
//HRESULT hr; //HRESULT hr;
@@ -267,9 +267,8 @@ void CScene_MultiGameJoinLoad::AddDefaultButtons()
int iGeneratorIndex = 0; int iGeneratorIndex = 0;
m_iMashUpButtonsC=0; m_iMashUpButtonsC=0;
for(AUTO_VAR(it, m_generators->begin()); it != m_generators->end(); ++it) for (LevelGenerationOptions *levelGen : *m_generators )
{ {
LevelGenerationOptions *levelGen = *it;
ListInfo.pwszText = levelGen->getWorldName(); ListInfo.pwszText = levelGen->getWorldName();
ListInfo.fEnabled = TRUE; ListInfo.fEnabled = TRUE;
ListInfo.iData = iGeneratorIndex++; // used to index into the list of generators ListInfo.iData = iGeneratorIndex++; // used to index into the list of generators
@@ -295,7 +294,7 @@ void CScene_MultiGameJoinLoad::AddDefaultButtons()
// increment the count of the mash-up pack worlds in the save list // increment the count of the mash-up pack worlds in the save list
m_iMashUpButtonsC++; m_iMashUpButtonsC++;
TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(levelGen->getRequiredTexturePackId()); TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackById(levelGen->getRequiredTexturePackId());
DWORD dwImageBytes; DWORD dwImageBytes;
PBYTE pbImageData = tp->getPackIcon(dwImageBytes); PBYTE pbImageData = tp->getPackIcon(dwImageBytes);
HXUIBRUSH hXuiBrush; HXUIBRUSH hXuiBrush;
@@ -353,8 +352,8 @@ HRESULT CScene_MultiGameJoinLoad::GetSaveInfo( )
ListInfo.fEnabled=TRUE; ListInfo.fEnabled=TRUE;
ListInfo.iData = -1; ListInfo.iData = -1;
m_pSavesList->AddData(ListInfo); m_pSavesList->AddData(ListInfo);
} }
m_pSavesList->SetCurSelVisible(0); m_pSavesList->SetCurSelVisible(0);
} }
else else
{ {
@@ -387,9 +386,9 @@ HRESULT CScene_MultiGameJoinLoad::OnDestroy()
{ {
g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL ); g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL );
for(AUTO_VAR(it, currentSessions.begin()); it < currentSessions.end(); ++it) for (auto& it : currentSessions )
{ {
delete (*it); delete it;
} }
if(m_bSaveTransferInProgress) if(m_bSaveTransferInProgress)
@@ -419,7 +418,7 @@ int CScene_MultiGameJoinLoad::DeviceRemovedDialogReturned(void *pParam,int iPad,
CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam; CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
// results switched for this dialog // results switched for this dialog
if(result==C4JStorage::EMessage_ResultDecline) if(result==C4JStorage::EMessage_ResultDecline)
{ {
StorageManager.SetSaveDisabled(true); StorageManager.SetSaveDisabled(true);
StorageManager.SetSaveDeviceSelected(ProfileManager.GetPrimaryPad(),false); StorageManager.SetSaveDeviceSelected(ProfileManager.GetPrimaryPad(),false);
@@ -462,7 +461,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
//CScene_MultiGameInfo::JoinMenuInitData *initData = new CScene_MultiGameInfo::JoinMenuInitData(); //CScene_MultiGameInfo::JoinMenuInitData *initData = new CScene_MultiGameInfo::JoinMenuInitData();
m_initData->iPad = m_iPad; m_initData->iPad = m_iPad;
m_initData->selectedSession = currentSessions.at( nIndex ); m_initData->selectedSession = currentSessions.at( nIndex );
// check that we have the texture pack available // check that we have the texture pack available
// If it's not the default texture pack // If it's not the default texture pack
if(m_initData->selectedSession->data.texturePackParentId!=0) if(m_initData->selectedSession->data.texturePackParentId!=0)
@@ -513,7 +512,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
return S_OK; return S_OK;
} }
} }
m_NetGamesListTimer.SetShow( FALSE ); m_NetGamesListTimer.SetShow( FALSE );
// Reset the background downloading, in case we changed it by attempting to download a texture pack // Reset the background downloading, in case we changed it by attempting to download a texture pack
@@ -536,7 +535,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
CXuiCtrl4JList::LIST_ITEM_INFO info = m_pSavesList->GetData(iIndex); CXuiCtrl4JList::LIST_ITEM_INFO info = m_pSavesList->GetData(iIndex);
if(iIndex == JOIN_LOAD_CREATE_BUTTON_INDEX) if(iIndex == JOIN_LOAD_CREATE_BUTTON_INDEX)
{ {
app.SetTutorialMode( false ); app.SetTutorialMode( false );
m_NetGamesListTimer.SetShow( FALSE ); m_NetGamesListTimer.SetShow( FALSE );
@@ -571,7 +570,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
} }
} }
else else
{ {
// check if this is a damaged save // check if this is a damaged save
if(m_pSavesList->GetData(iIndex).bIsDamaged) if(m_pSavesList->GetData(iIndex).bIsDamaged)
{ {
@@ -582,7 +581,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
StorageManager.RequestMessageBox(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2, pNotifyPressData->UserIndex,&CScene_MultiGameJoinLoad::DeleteSaveDialogReturned,this, app.GetStringTable()); StorageManager.RequestMessageBox(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2, pNotifyPressData->UserIndex,&CScene_MultiGameJoinLoad::DeleteSaveDialogReturned,this, app.GetStringTable());
} }
else else
{ {
app.SetTutorialMode( false ); app.SetTutorialMode( false );
if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
{ {
@@ -605,7 +604,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotify
} }
} }
} }
return S_OK; return S_OK;
} }
@@ -632,11 +631,11 @@ HRESULT CScene_MultiGameJoinLoad::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
app.NavigateBack(XUSER_INDEX_ANY); app.NavigateBack(XUSER_INDEX_ANY);
rfHandled = TRUE; rfHandled = TRUE;
break; break;
case VK_PAD_X: case VK_PAD_X:
// Change device // Change device
// Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage // Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage
// device, and repeatedly backs out of the SD screen, disconnects from LIVE, and then selects a SD, the title crashes. // device, and repeatedly backs out of the SD screen, disconnects from LIVE, and then selects a SD, the title crashes.
m_bIgnoreInput=true; m_bIgnoreInput=true;
StorageManager.SetSaveDevice(&CScene_MultiGameJoinLoad::DeviceSelectReturned,this,true); StorageManager.SetSaveDevice(&CScene_MultiGameJoinLoad::DeviceSelectReturned,this,true);
@@ -657,7 +656,7 @@ HRESULT CScene_MultiGameJoinLoad::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
{ {
// save transfer - make sure they want to overwrite a save that is up there // save transfer - make sure they want to overwrite a save that is up there
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
// 4J-PB - required for a delete of the save if it's found to be a corrupted save // 4J-PB - required for a delete of the save if it's found to be a corrupted save
DWORD nIndex = m_pSavesList->GetCurSel(); DWORD nIndex = m_pSavesList->GetCurSel();
m_iChangingSaveGameInfoIndex=m_pSavesList->GetData(nIndex).iIndex; m_iChangingSaveGameInfoIndex=m_pSavesList->GetData(nIndex).iIndex;
@@ -668,13 +667,13 @@ HRESULT CScene_MultiGameJoinLoad::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
ui.RequestMessageBox(IDS_SAVE_TRANSFER_TITLE, IDS_SAVE_TRANSFER_TEXT, uiIDA, 2, pInputData->UserIndex,&CScene_MultiGameJoinLoad::SaveTransferDialogReturned,this, app.GetStringTable()); ui.RequestMessageBox(IDS_SAVE_TRANSFER_TITLE, IDS_SAVE_TRANSFER_TEXT, uiIDA, 2, pInputData->UserIndex,&CScene_MultiGameJoinLoad::SaveTransferDialogReturned,this, app.GetStringTable());
} }
} }
break; break;
case VK_PAD_RSHOULDER: case VK_PAD_RSHOULDER:
if(DoesSavesListHaveFocus()) if(DoesSavesListHaveFocus())
{ {
m_bIgnoreInput = true; m_bIgnoreInput = true;
int iIndex=m_SavesList.GetCurSel(); int iIndex=m_SavesList.GetCurSel();
m_iChangingSaveGameInfoIndex=m_pSavesList->GetData(iIndex).iIndex; m_iChangingSaveGameInfoIndex=m_pSavesList->GetData(iIndex).iIndex;
@@ -755,19 +754,19 @@ HRESULT CScene_MultiGameJoinLoad::OnKeyDown(XUIMessageInput* pInputData, BOOL& r
} }
break; break;
} }
return hr; return hr;
} }
HRESULT CScene_MultiGameJoinLoad::OnNavReturn(HXUIOBJ hSceneFrom,BOOL& rfHandled) HRESULT CScene_MultiGameJoinLoad::OnNavReturn(HXUIOBJ hSceneFrom,BOOL& rfHandled)
{ {
CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE ); CXuiSceneBase::ShowLogo( DEFAULT_XUI_MENU_USER, TRUE );
// start the texture pack timer again // start the texture pack timer again
XuiSetTimer(m_hObj,CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID,CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME); XuiSetTimer(m_hObj,CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID,CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME);
m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
// re-enable button presses // re-enable button presses
m_bIgnoreInput=false; m_bIgnoreInput=false;
@@ -812,7 +811,7 @@ HRESULT CScene_MultiGameJoinLoad::OnNavReturn(HXUIOBJ hSceneFrom,BOOL& rfHandled
iY = IDS_TOOLTIPS_VIEW_GAMERCARD; iY = IDS_TOOLTIPS_VIEW_GAMERCARD;
} }
else if(DoesSavesListHaveFocus()) else if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -901,7 +900,7 @@ HRESULT CScene_MultiGameJoinLoad::OnTransitionStart( XUIMessageTransition *pTran
if(pTransition->dwTransType == XUI_TRANSITION_BACKTO) if(pTransition->dwTransType == XUI_TRANSITION_BACKTO)
{ {
// Can't call this here because if you back out of the load info screen and then go back in and load a game, it will attempt to use the dlc as it's running a mount of the dlc // Can't call this here because if you back out of the load info screen and then go back in and load a game, it will attempt to use the dlc as it's running a mount of the dlc
// block input if we're waiting for DLC to install, and wipe the saves list. The end of dlc mounting custom message will fill the list again // block input if we're waiting for DLC to install, and wipe the saves list. The end of dlc mounting custom message will fill the list again
if(app.StartInstallDLCProcess(m_iPad)==false) if(app.StartInstallDLCProcess(m_iPad)==false)
{ {
@@ -925,14 +924,14 @@ HRESULT CScene_MultiGameJoinLoad::OnFontRendererChange()
// update the tooltips // update the tooltips
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should the the View Gamercard tooltip // if the games list has focus, then we should the the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
if( DoesGamesListHaveFocus() ) if( DoesGamesListHaveFocus() )
{ {
iY = IDS_TOOLTIPS_VIEW_GAMERCARD; iY = IDS_TOOLTIPS_VIEW_GAMERCARD;
} }
else if(DoesSavesListHaveFocus()) else if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -986,12 +985,12 @@ HRESULT CScene_MultiGameJoinLoad::OnNotifySetFocus(HXUIOBJ hObjSource, XUINotify
// update the tooltips // update the tooltips
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should the the View Gamercard tooltip // if the games list has focus, then we should the the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
if( DoesGamesListHaveFocus() ) if( DoesGamesListHaveFocus() )
{ {
iY = IDS_TOOLTIPS_VIEW_GAMERCARD; iY = IDS_TOOLTIPS_VIEW_GAMERCARD;
} }
else if(DoesSavesListHaveFocus()) else if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
@@ -1118,7 +1117,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesListCallback(LPVOID lpParam)
// check this there's no save transfer in progress // check this there's no save transfer in progress
if(!pClass->m_bSaveTransferInProgress) if(!pClass->m_bSaveTransferInProgress)
{ {
pClass->UpdateGamesList(); pClass->UpdateGamesList();
} }
} }
} }
@@ -1145,17 +1144,17 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
if( pSelectedSession != NULL )selectedSessionId = pSelectedSession->sessionId; if( pSelectedSession != NULL )selectedSessionId = pSelectedSession->sessionId;
pSelectedSession = NULL; pSelectedSession = NULL;
for(AUTO_VAR(it, currentSessions.begin()); it < currentSessions.end(); ++it) for (auto& it : currentSessions )
{ {
delete (*it); delete it;
} }
currentSessions.clear(); currentSessions.clear();
m_NetGamesListTimer.SetShow( FALSE ); m_NetGamesListTimer.SetShow( FALSE );
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should show the View Gamercard tooltip // if the games list has focus, then we should show the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
if( DoesGamesListHaveFocus() ) if( DoesGamesListHaveFocus() )
@@ -1163,7 +1162,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
iY = IDS_TOOLTIPS_VIEW_GAMERCARD; iY = IDS_TOOLTIPS_VIEW_GAMERCARD;
} }
else if(DoesSavesListHaveFocus()) else if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -1248,9 +1247,8 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
unsigned int sessionIndex = 0; unsigned int sessionIndex = 0;
m_pGamesList->SetCurSel(0); m_pGamesList->SetCurSel(0);
for( AUTO_VAR(it, currentSessions.begin()); it < currentSessions.end(); ++it) for ( FriendSessionInfo *sessionInfo : currentSessions )
{ {
FriendSessionInfo *sessionInfo = *it;
HXUIBRUSH hXuiBrush; HXUIBRUSH hXuiBrush;
CXuiCtrl4JList::LIST_ITEM_INFO ListInfo; CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
@@ -1282,7 +1280,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
// is it in the tpd data ? // is it in the tpd data ?
app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes ); app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
if(dwImageBytes > 0 && pbImageData) if(dwImageBytes > 0 && pbImageData)
{ {
hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&hXuiBrush); hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&hXuiBrush);
m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush); m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush);
} }
@@ -1291,7 +1289,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
{ {
pbImageData = tp->getPackIcon(dwImageBytes); pbImageData = tp->getPackIcon(dwImageBytes);
if(dwImageBytes > 0 && pbImageData) if(dwImageBytes > 0 && pbImageData)
{ {
hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&hXuiBrush); hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&hXuiBrush);
m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush); m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush);
} }
@@ -1303,7 +1301,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList()
XuiCreateTextureBrushFromMemory(m_DefaultMinecraftIconData,m_DefaultMinecraftIconSize,&hXuiBrush); XuiCreateTextureBrushFromMemory(m_DefaultMinecraftIconData,m_DefaultMinecraftIconSize,&hXuiBrush);
m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush); m_pGamesList->UpdateGraphic(sessionIndex,hXuiBrush);
} }
if(memcmp( &selectedSessionId, &sessionInfo->sessionId, sizeof(SessionID) ) == 0) if(memcmp( &selectedSessionId, &sessionInfo->sessionId, sizeof(SessionID) ) == 0)
{ {
@@ -1324,14 +1322,14 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
if(m_searches>0) if(m_searches>0)
--m_searches; --m_searches;
if(m_searches==0) if(m_searches==0)
{ {
m_NetGamesListTimer.SetShow( FALSE ); m_NetGamesListTimer.SetShow( FALSE );
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should show the View Gamercard tooltip // if the games list has focus, then we should show the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
if( DoesGamesListHaveFocus() ) if( DoesGamesListHaveFocus() )
@@ -1374,7 +1372,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
} }
unsigned int startOffset = m_GamesList.GetItemCount(); unsigned int startOffset = m_GamesList.GetItemCount();
//m_GamesList.InsertItems(startOffset,dwNumResults); //m_GamesList.InsertItems(startOffset,dwNumResults);
//m_GamesList.SetEnable(TRUE); //m_GamesList.SetEnable(TRUE);
//XuiElementSetDisableFocusRecursion( m_GamesList.m_hObj, FALSE); //XuiElementSetDisableFocusRecursion( m_GamesList.m_hObj, FALSE);
@@ -1390,7 +1388,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
FriendSessionInfo *sessionInfo = NULL; FriendSessionInfo *sessionInfo = NULL;
bool foundSession = false; bool foundSession = false;
for(AUTO_VAR(it, friendsSessions.begin()); it < friendsSessions.end(); ++it) for( auto it = friendsSessions.begin(); it != friendsSessions.end(); ++it)
{ {
sessionInfo = *it; sessionInfo = *it;
if(memcmp( &pSearchResult->info.sessionID, &sessionInfo->sessionId, sizeof(SessionID) ) == 0) if(memcmp( &pSearchResult->info.sessionID, &sessionInfo->sessionId, sizeof(SessionID) ) == 0)
@@ -1449,7 +1447,7 @@ void CScene_MultiGameJoinLoad::UpdateGamesList(DWORD dwNumResults, IQNetGameSear
#endif #endif
} }
} }
if( m_GamesList.GetItemCount() == 0) if( m_GamesList.GetItemCount() == 0)
{ {
m_LabelNoGames.SetShow( TRUE ); m_LabelNoGames.SetShow( TRUE );
@@ -1537,14 +1535,14 @@ int CScene_MultiGameJoinLoad::DeviceSelectReturned(void *pParam,bool bContinue)
{ {
// if the saves list has focus, then we should show the Delete Save tooltip // if the saves list has focus, then we should show the Delete Save tooltip
// if the games list has focus, then we should show the View Gamercard tooltip // if the games list has focus, then we should show the View Gamercard tooltip
int iRB=-1; int iRB=-1;
int iY = -1; int iY = -1;
if( pClass->DoesGamesListHaveFocus() ) if( pClass->DoesGamesListHaveFocus() )
{ {
iY = IDS_TOOLTIPS_VIEW_GAMERCARD; iY = IDS_TOOLTIPS_VIEW_GAMERCARD;
} }
else if(pClass->DoesSavesListHaveFocus()) else if(pClass->DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( pClass->m_iPad )) if(ProfileManager.IsSignedInLive( pClass->m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -1593,7 +1591,7 @@ int CScene_MultiGameJoinLoad::DeviceSelectReturned(void *pParam,bool bContinue)
pClass->GetSaveInfo(); pClass->GetSaveInfo();
} }
else else
{ {
ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_SELECTDEVICE,iY,-1,-1,iLB,iRB); ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK,IDS_TOOLTIPS_SELECTDEVICE,iY,-1,-1,iLB,iRB);
// clear the saves list // clear the saves list
pClass->m_pSavesList->RemoveAllData(); pClass->m_pSavesList->RemoveAllData();
@@ -1623,11 +1621,11 @@ int CScene_MultiGameJoinLoad::DeviceSelectReturned(void *pParam,bool bContinue)
HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled ) HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandled )
{ {
// 4J-PB - TODO - Don't think we can do this - if a 2nd player signs in here with an offline profile, the signed in LIVE player gets re-logged in, and bMultiplayerAllowed is false briefly // 4J-PB - TODO - Don't think we can do this - if a 2nd player signs in here with an offline profile, the signed in LIVE player gets re-logged in, and bMultiplayerAllowed is false briefly
switch(pTimer->nId) switch(pTimer->nId)
{ {
case JOIN_LOAD_ONLINE_TIMER_ID: case JOIN_LOAD_ONLINE_TIMER_ID:
{ {
XPARTY_USER_LIST partyList; XPARTY_USER_LIST partyList;
@@ -1673,7 +1671,7 @@ HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandl
{ {
} }
else if(DoesSavesListHaveFocus()) else if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -1737,7 +1735,7 @@ HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandl
//CXuiCtrl4JList::LIST_ITEM_INFO ListInfo; //CXuiCtrl4JList::LIST_ITEM_INFO ListInfo;
// for each iConfig, check if the data is available, and add it to the List, then remove it from the viConfig // for each iConfig, check if the data is available, and add it to the List, then remove it from the viConfig
for(int i=0;i<m_iTexturePacksNotInstalled;i++) for(int i=0;i<m_iTexturePacksNotInstalled;i++)
{ {
if(m_iConfigA[i]!=-1) if(m_iConfigA[i]!=-1)
@@ -1760,7 +1758,7 @@ HRESULT CScene_MultiGameJoinLoad::OnTimer( XUIMessageTimer *pTimer, BOOL& bHandl
bool bAllDone=true; bool bAllDone=true;
for(int i=0;i<m_iTexturePacksNotInstalled;i++) for(int i=0;i<m_iTexturePacksNotInstalled;i++)
{ {
if(m_iConfigA[i]!=-1) if(m_iConfigA[i]!=-1)
{ {
bAllDone = false; bAllDone = false;
} }
@@ -1878,25 +1876,25 @@ int CScene_MultiGameJoinLoad::DeleteSaveDataReturned(void *pParam,bool bSuccess)
pClass->m_iSaveInfoC=0; pClass->m_iSaveInfoC=0;
pClass->GetSaveInfo(); pClass->GetSaveInfo();
} }
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
return 0; return 0;
} }
void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen) void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen)
{ {
// Load data from disc // Load data from disc
//File saveFile( L"Tutorial\\Tutorial" ); //File saveFile( L"Tutorial\\Tutorial" );
//LoadSaveFromDisk(&saveFile); //LoadSaveFromDisk(&saveFile);
// clear out the app's terrain features list // clear out the app's terrain features list
app.ClearTerrainFeaturePosition(); app.ClearTerrainFeaturePosition();
StorageManager.ResetSaveData(); StorageManager.ResetSaveData();
// Make our next save default to the name of the level // Make our next save default to the name of the level
StorageManager.SetSaveTitle(levelGen->getDefaultSaveName().c_str()); StorageManager.SetSaveTitle(levelGen->getDefaultSaveName().c_str());
bool isClientSide = false; bool isClientSide = false;
bool isPrivate = false; bool isPrivate = false;
int maxPlayers = MINECRAFT_NET_MAX_PLAYERS; int maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
@@ -1918,7 +1916,7 @@ void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen)
if(levelGen->requiresTexturePack()) if(levelGen->requiresTexturePack())
{ {
param->texturePackId = levelGen->getRequiredTexturePackId(); param->texturePackId = levelGen->getRequiredTexturePackId();
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
pMinecraft->skins->selectTexturePackById(param->texturePackId); pMinecraft->skins->selectTexturePackById(param->texturePackId);
//pMinecraft->skins->updateUI(); //pMinecraft->skins->updateUI();
@@ -1939,7 +1937,7 @@ void CScene_MultiGameJoinLoad::LoadLevelGen(LevelGenerationOptions *levelGen)
} }
void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile) void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
{ {
// we'll only be coming in here when the tutorial is loaded now // we'll only be coming in here when the tutorial is loaded now
StorageManager.ResetSaveData(); StorageManager.ResetSaveData();
@@ -1952,7 +1950,7 @@ void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
byteArray ba(fileSize); byteArray ba(fileSize);
fis.read(ba); fis.read(ba);
fis.close(); fis.close();
bool isClientSide = false; bool isClientSide = false;
bool isPrivate = false; bool isPrivate = false;
int maxPlayers = MINECRAFT_NET_MAX_PLAYERS; int maxPlayers = MINECRAFT_NET_MAX_PLAYERS;
@@ -1962,7 +1960,7 @@ void CScene_MultiGameJoinLoad::LoadSaveFromDisk(File *saveFile)
isClientSide = false; isClientSide = false;
maxPlayers = 4; maxPlayers = 4;
} }
app.SetGameHostOption(eGameHostOption_GameType,GameType::CREATIVE->getId()); app.SetGameHostOption(eGameHostOption_GameType,GameType::CREATIVE->getId());
g_NetworkManager.HostGame(0,isClientSide,isPrivate,maxPlayers,0); g_NetworkManager.HostGame(0,isClientSide,isPrivate,maxPlayers,0);
@@ -1992,7 +1990,7 @@ int CScene_MultiGameJoinLoad::DeleteSaveDialogReturned(void *pParam,int iPad,C4J
{ {
CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam; CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
// results switched for this dialog // results switched for this dialog
if(result==C4JStorage::EMessage_ResultDecline) if(result==C4JStorage::EMessage_ResultDecline)
{ {
if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled()) if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
{ {
@@ -2017,7 +2015,7 @@ int CScene_MultiGameJoinLoad::SaveTransferDialogReturned(void *pParam,int iPad,C
{ {
CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam; CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad*)pParam;
// results switched for this dialog // results switched for this dialog
if(result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultAccept)
{ {
// upload the save // upload the save
@@ -2042,7 +2040,7 @@ int CScene_MultiGameJoinLoad::SaveTransferDialogReturned(void *pParam,int iPad,C
int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter ) int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter )
{ {
CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParameter; CScene_MultiGameJoinLoad* pClass = (CScene_MultiGameJoinLoad *) lpParameter;
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
pMinecraft->progressRenderer->progressStart(IDS_SAVE_TRANSFER_TITLE); pMinecraft->progressRenderer->progressStart(IDS_SAVE_TRANSFER_TITLE);
pMinecraft->progressRenderer->progressStage( IDS_SAVE_TRANSFER_UPLOADING ); pMinecraft->progressRenderer->progressStage( IDS_SAVE_TRANSFER_UPLOADING );
@@ -2092,7 +2090,7 @@ int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
StorageManager.GetSaveCacheFileInfo(iIndex,XContentData); StorageManager.GetSaveCacheFileInfo(iIndex,XContentData);
StorageManager.GetSaveCacheFileInfo(iIndex,&pbImageData,&dwImageBytes); StorageManager.GetSaveCacheFileInfo(iIndex,&pbImageData,&dwImageBytes);
// if there is no thumbnail, retrieve the default one from the file. // if there is no thumbnail, retrieve the default one from the file.
// Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save // Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save
if(pbImageData==NULL) if(pbImageData==NULL)
{ {
@@ -2143,7 +2141,7 @@ int CScene_MultiGameJoinLoad::UploadSaveForXboxOneThreadProc( LPVOID lpParameter
return 0; return 0;
} }
// change text for completion confirmation // change text for completion confirmation
pMinecraft->progressRenderer->progressStage( IDS_SAVE_TRANSFER_UPLOADCOMPLETE ); pMinecraft->progressRenderer->progressStage( IDS_SAVE_TRANSFER_UPLOADCOMPLETE );
// done // done
@@ -2180,7 +2178,7 @@ void CScene_MultiGameJoinLoad::UploadFile(CScene_MultiGameJoinLoad *pClass, char
C4JStorage::TMS_FILETYPE_BINARY, C4JStorage::TMS_FILETYPE_BINARY,
C4JStorage::TMS_UGCTYPE_NONE, C4JStorage::TMS_UGCTYPE_NONE,
filename, filename,
(CHAR *)data, (CHAR *)data,
size, size,
&CScene_MultiGameJoinLoad::TransferComplete,pClass, 0, &CScene_MultiGameJoinLoad::TransferComplete,pClass, 0,
&CScene_MultiGameJoinLoad::Progress,pClass); &CScene_MultiGameJoinLoad::Progress,pClass);
@@ -2219,7 +2217,7 @@ bool CScene_MultiGameJoinLoad::WaitForTransferComplete( CScene_MultiGameJoinLoad
// cancelled // cancelled
return false; return false;
} }
Sleep(50); Sleep(50);
// update the progress // update the progress
pMinecraft->progressRenderer->progressStagePercentage((unsigned int)(pClass->m_fProgress*100.0f)); pMinecraft->progressRenderer->progressStagePercentage((unsigned int)(pClass->m_fProgress*100.0f));
} }
@@ -2235,7 +2233,7 @@ int CScene_MultiGameJoinLoad::SaveOptionsDialogReturned(void *pParam,int iPad,C4
// results switched for this dialog // results switched for this dialog
// EMessage_ResultAccept means cancel // EMessage_ResultAccept means cancel
if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultThirdOption) if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultThirdOption)
{ {
if(result==C4JStorage::EMessage_ResultDecline) // rename if(result==C4JStorage::EMessage_ResultDecline) // rename
{ {
@@ -2302,9 +2300,9 @@ int CScene_MultiGameJoinLoad::LoadSaveDataReturned(void *pParam,bool bContinue)
UINT uiIDA[2]; UINT uiIDA[2];
uiIDA[0]=IDS_CONFIRM_CANCEL; uiIDA[0]=IDS_CONFIRM_CANCEL;
uiIDA[1]=IDS_CONFIRM_OK; uiIDA[1]=IDS_CONFIRM_OK;
StorageManager.RequestMessageBox(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2, StorageManager.RequestMessageBox(IDS_CORRUPT_OR_DAMAGED_SAVE_TITLE, IDS_CORRUPT_OR_DAMAGED_SAVE_TEXT, uiIDA, 2,
pClass->m_iPad,&CScene_MultiGameJoinLoad::DeleteSaveDialogReturned,pClass, app.GetStringTable()); pClass->m_iPad,&CScene_MultiGameJoinLoad::DeleteSaveDialogReturned,pClass, app.GetStringTable());
} }
return 0; return 0;
@@ -2366,7 +2364,7 @@ int CScene_MultiGameJoinLoad::KeyboardReturned(void *pParam,bool bSet)
if(eLoadStatus==C4JStorage::ELoadGame_DeviceRemoved) if(eLoadStatus==C4JStorage::ELoadGame_DeviceRemoved)
{ {
// disable saving // disable saving
StorageManager.SetSaveDisabled(true); StorageManager.SetSaveDisabled(true);
StorageManager.SetSaveDeviceSelected(ProfileManager.GetPrimaryPad(),false); StorageManager.SetSaveDeviceSelected(ProfileManager.GetPrimaryPad(),false);
UINT uiIDA[1]; UINT uiIDA[1];
@@ -2375,11 +2373,11 @@ int CScene_MultiGameJoinLoad::KeyboardReturned(void *pParam,bool bSet)
} }
#else #else
// rename the save // rename the save
#endif #endif
} }
else else
{ {
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
} }
@@ -2400,7 +2398,7 @@ int CScene_MultiGameJoinLoad::LoadSaveDataForRenameReturned(void *pParam,bool bC
StorageManager.GetSaveCacheFileInfo(pClass->m_iChangingSaveGameInfoIndex-pClass->m_iDefaultButtonsC,XContentData); StorageManager.GetSaveCacheFileInfo(pClass->m_iChangingSaveGameInfoIndex-pClass->m_iDefaultButtonsC,XContentData);
StorageManager.GetSaveCacheFileInfo(pClass->m_iChangingSaveGameInfoIndex-pClass->m_iDefaultButtonsC,&pbImageData,&dwImageBytes); StorageManager.GetSaveCacheFileInfo(pClass->m_iChangingSaveGameInfoIndex-pClass->m_iDefaultButtonsC,&pbImageData,&dwImageBytes);
// if there is no thumbnail, retrieve the default one from the file. // if there is no thumbnail, retrieve the default one from the file.
// Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save // Don't delete the image data after creating the xuibrush, since we'll use it in the rename of the save
if(pbImageData==NULL) if(pbImageData==NULL)
{ {
@@ -2456,7 +2454,7 @@ int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4
// Exit with or without saving // Exit with or without saving
// Decline means install full version of the texture pack in this dialog // Decline means install full version of the texture pack in this dialog
if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultAccept) if(result==C4JStorage::EMessage_ResultDecline || result==C4JStorage::EMessage_ResultAccept)
{ {
// we need to enable background downloading for the DLC // we need to enable background downloading for the DLC
XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW); XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
@@ -2480,7 +2478,7 @@ int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4
ullIndexA[0]=pDLCInfo->ullOfferID_Trial; ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
StorageManager.InstallOffer(1,ullIndexA,NULL,NULL); StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
} }
} }
} }
pClass->m_bIgnoreInput=false; pClass->m_bIgnoreInput=false;
return 0; return 0;
@@ -2489,7 +2487,7 @@ int CScene_MultiGameJoinLoad::TexturePackDialogReturned(void *pParam,int iPad,C4
HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCInstalled() HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCInstalled()
{ {
// mounted DLC may have changed // mounted DLC may have changed
if(app.StartInstallDLCProcess(m_iPad)==false) if(app.StartInstallDLCProcess(m_iPad)==false)
{ {
// not doing a mount, so re-enable input // not doing a mount, so re-enable input
@@ -2508,7 +2506,7 @@ HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCInstalled()
} }
HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCMountingComplete() HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCMountingComplete()
{ {
VOID *pObj; VOID *pObj;
XuiObjectFromHandle( m_SavesList, &pObj ); XuiObjectFromHandle( m_SavesList, &pObj );
@@ -2534,7 +2532,7 @@ HRESULT CScene_MultiGameJoinLoad::OnCustomMessage_DLCMountingComplete()
int iY=-1; int iY=-1;
if(DoesSavesListHaveFocus()) if(DoesSavesListHaveFocus())
{ {
if(ProfileManager.IsSignedInLive( m_iPad )) if(ProfileManager.IsSignedInLive( m_iPad ))
{ {
iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE; iY=IDS_TOOLTIPS_UPLOAD_SAVE_FOR_XBOXONE;
@@ -2627,7 +2625,7 @@ void CScene_MultiGameJoinLoad::UpdateTooltips()
// 4J-PB - we need to check that there is enough space left to create a copy of the save (for a rename) // 4J-PB - we need to check that there is enough space left to create a copy of the save (for a rename)
bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame(); bool bCanRename = StorageManager.EnoughSpaceForAMinSaveGame();
if(bCanRename) if(bCanRename)
{ {
iRB=IDS_TOOLTIPS_SAVEOPTIONS; iRB=IDS_TOOLTIPS_SAVEOPTIONS;
} }
@@ -2694,11 +2692,11 @@ bool CScene_MultiGameJoinLoad::GetSavesInfoCallback(LPVOID pParam,int iTotalSave
pbCurrentImagePtr=pbImageData+InfoA[i].dwImageOffset; pbCurrentImagePtr=pbImageData+InfoA[i].dwImageOffset;
hr=XuiCreateTextureBrushFromMemory(pbCurrentImagePtr,InfoA[i].dwImageBytes,&hXuiBrush); hr=XuiCreateTextureBrushFromMemory(pbCurrentImagePtr,InfoA[i].dwImageBytes,&hXuiBrush);
pClass->m_pSavesList->UpdateGraphic(i+pClass->m_iDefaultButtonsC,hXuiBrush ); pClass->m_pSavesList->UpdateGraphic(i+pClass->m_iDefaultButtonsC,hXuiBrush );
} }
else else
{ {
// we could put in a damaged save icon here // we could put in a damaged save icon here
const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string
WCHAR szResourceLocator[ LOCATOR_SIZE ]; WCHAR szResourceLocator[ LOCATOR_SIZE ];
const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL); const ULONG_PTR c_ModuleHandle = (ULONG_PTR)GetModuleHandle(NULL);
@@ -2724,7 +2722,7 @@ bool CScene_MultiGameJoinLoad::GetSavesInfoCallback(LPVOID pParam,int iTotalSave
// It's possible that the games list is updated but we haven't displayed it yet as we were still waiting on saves list to load // It's possible that the games list is updated but we haven't displayed it yet as we were still waiting on saves list to load
// This is to fix a bug where joining a game before the saves list has loaded causes a crash when this callback is called // This is to fix a bug where joining a game before the saves list has loaded causes a crash when this callback is called
// as the scene no longer exists // as the scene no longer exists
pClass->UpdateGamesList(); pClass->UpdateGamesList();
// Fix for #45154 - Frontend: DLC: Content can only be downloaded from the frontend if you have not joined/exited multiplayer // Fix for #45154 - Frontend: DLC: Content can only be downloaded from the frontend if you have not joined/exited multiplayer
XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO); XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);

30
Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
View File

@@ -24,7 +24,7 @@
#include "XUI_Ctrl_SlotItem.h" #include "XUI_Ctrl_SlotItem.h"
#include "XUI_Ctrl_SlotItemListItem.h" #include "XUI_Ctrl_SlotItemListItem.h"
#include "XUI_Scene_AbstractContainer.h" #include "XUI_Scene_AbstractContainer.h"
#ifdef _DEBUG_MENUS_ENABLED #ifdef _DEBUG_MENUS_ENABLED
#include "XUI_DebugItemEditor.h" #include "XUI_DebugItemEditor.h"
#endif #endif
@@ -44,14 +44,14 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
// We may have varying depths of controls here, so base off the pointers parent // We may have varying depths of controls here, so base off the pointers parent
HXUIOBJ parent; HXUIOBJ parent;
XuiElementGetBounds( m_pointerControl->m_hObj, &fPointerWidth, &fPointerHeight ); XuiElementGetBounds( m_pointerControl->m_hObj, &fPointerWidth, &fPointerHeight );
XuiElementGetParent( m_pointerControl->m_hObj, &parent ); XuiElementGetParent( m_pointerControl->m_hObj, &parent );
m_pointerControl->SetShow(TRUE); m_pointerControl->SetShow(TRUE);
XuiElementGetBounds( parent, &fPanelWidth, &fPanelHeight ); XuiElementGetBounds( parent, &fPanelWidth, &fPanelHeight );
// Get size of pointer // Get size of pointer
m_fPointerImageOffsetX = floor(fPointerWidth/2.0f); m_fPointerImageOffsetX = floor(fPointerWidth/2.0f);
m_fPointerImageOffsetY = floor(fPointerHeight/2.0f); m_fPointerImageOffsetY = floor(fPointerHeight/2.0f);
m_fPanelMinX = 0.0f; m_fPanelMinX = 0.0f;
m_fPanelMaxX = fPanelWidth; m_fPanelMaxX = fPanelWidth;
m_fPanelMinY = 0.0f; m_fPanelMinY = 0.0f;
@@ -97,13 +97,13 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
m_pointerPos.x = newPointerPos.x; m_pointerPos.x = newPointerPos.x;
m_pointerPos.y = newPointerPos.y; m_pointerPos.y = newPointerPos.y;
#ifdef USE_POINTER_ACCEL #ifdef USE_POINTER_ACCEL
m_fPointerVelX = 0.0f; m_fPointerVelX = 0.0f;
m_fPointerVelY = 0.0f; m_fPointerVelY = 0.0f;
m_fPointerAccelX = 0.0f; m_fPointerAccelX = 0.0f;
m_fPointerAccelY = 0.0f; m_fPointerAccelY = 0.0f;
#endif #endif
// Add timer to poll controller stick input at 60Hz // Add timer to poll controller stick input at 60Hz
HRESULT timerResult = SetTimer( POINTER_INPUT_TIMER_ID, ( 1000 / 60 ) ); HRESULT timerResult = SetTimer( POINTER_INPUT_TIMER_ID, ( 1000 / 60 ) );
assert( timerResult == S_OK ); assert( timerResult == S_OK );
@@ -114,7 +114,7 @@ void CXuiSceneAbstractContainer::PlatformInitialize(int iPad, int startIndex)
for ( int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection ) for ( int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection )
{ {
ESceneSection eSection = ( ESceneSection )( iSection ); ESceneSection eSection = ( ESceneSection )( iSection );
if(!IsSectionSlotList(eSection)) continue; if(!IsSectionSlotList(eSection)) continue;
// Get dimensions of this section. // Get dimensions of this section.
@@ -153,7 +153,7 @@ int CXuiSceneAbstractContainer::getSectionRows(ESceneSection eSection)
return GetSectionSlotList( eSection )->GetRows(); return GetSectionSlotList( eSection )->GetRows();
} }
// Adding this so we can turn off the pointer text background, since it flickers on then off at the start of a scene where a tutorial popup is // Adding this so we can turn off the pointer text background, since it flickers on then off at the start of a scene where a tutorial popup is
HRESULT CXuiSceneAbstractContainer::OnTransitionStart( XUIMessageTransition *pTransition, BOOL& bHandled ) HRESULT CXuiSceneAbstractContainer::OnTransitionStart( XUIMessageTransition *pTransition, BOOL& bHandled )
{ {
if(pTransition->dwTransAction==XUI_TRANSITION_ACTION_DESTROY ) return S_OK; if(pTransition->dwTransAction==XUI_TRANSITION_ACTION_DESTROY ) return S_OK;
@@ -327,7 +327,7 @@ HRESULT CXuiSceneAbstractContainer::OnTimer( XUIMessageTimer *pTimer, BOOL& bHan
// Update pointer from stick input on timer. // Update pointer from stick input on timer.
if ( pTimer->nId == POINTER_INPUT_TIMER_ID ) if ( pTimer->nId == POINTER_INPUT_TIMER_ID )
{ {
onMouseTick(); onMouseTick();
D3DXVECTOR3 pointerPos; D3DXVECTOR3 pointerPos;
pointerPos.x = m_pointerPos.x; pointerPos.x = m_pointerPos.x;
@@ -348,7 +348,7 @@ HRESULT CXuiSceneAbstractContainer::OnTimer( XUIMessageTimer *pTimer, BOOL& bHan
hr = handleCustomTimer( pTimer, bHandled ); hr = handleCustomTimer( pTimer, bHandled );
} }
return hr; return hr;
} }
HRESULT CXuiSceneAbstractContainer::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHandled) HRESULT CXuiSceneAbstractContainer::OnCustomMessage_Splitscreenplayer(bool bJoining, BOOL& bHandled)
{ {
@@ -388,15 +388,15 @@ void CXuiSceneAbstractContainer::SetPointerText(const wstring &description, vect
} }
bool smallPointer = m_bSplitscreen || (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()); bool smallPointer = m_bSplitscreen || (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen());
wstring desc = L"<font size=\"" + _toString<int>(smallPointer ? 12 :14) + L"\">" + description + L"</font>"; wstring desc = L"<font size=\"" + std::to_wstring(smallPointer ? 12 :14) + L"\">" + description + L"</font>";
XUIRect tempXuiRect, xuiRect; XUIRect tempXuiRect, xuiRect;
HRESULT hr; HRESULT hr;
xuiRect.right = 0; xuiRect.right = 0;
for(AUTO_VAR(it, unformattedStrings.begin()); it != unformattedStrings.end(); ++it) for (auto& it : unformattedStrings )
{ {
XuiTextPresenterMeasureText(m_hPointerTextMeasurer, parseXMLSpecials((*it)).c_str(), &tempXuiRect); XuiTextPresenterMeasureText(m_hPointerTextMeasurer, parseXMLSpecials(it).c_str(), &tempXuiRect);
if(tempXuiRect.right > xuiRect.right) xuiRect = tempXuiRect; if(tempXuiRect.right > xuiRect.right) xuiRect = tempXuiRect;
} }
@@ -443,7 +443,7 @@ void CXuiSceneAbstractContainer::adjustPointerForSafeZone()
D3DXVECTOR2 baseSceneOrigin; D3DXVECTOR2 baseSceneOrigin;
float baseWidth, baseHeight; float baseWidth, baseHeight;
if(CXuiSceneBase::GetBaseSceneSafeZone( m_iPad, baseSceneOrigin, baseWidth, baseHeight)) if(CXuiSceneBase::GetBaseSceneSafeZone( m_iPad, baseSceneOrigin, baseWidth, baseHeight))
{ {
D3DXMATRIX pointerBackgroundMatrix; D3DXMATRIX pointerBackgroundMatrix;
XuiElementGetFullXForm( m_hPointerTextBkg, &pointerBackgroundMatrix); XuiElementGetFullXForm( m_hPointerTextBkg, &pointerBackgroundMatrix);

12
Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
View File

@@ -33,7 +33,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
{ {
if(m_bSplitscreen) if(m_bSplitscreen)
{ {
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad); app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
} }
} }
@@ -57,7 +57,7 @@ HRESULT CXuiSceneInventory::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
initData->player->awardStat(GenericStats::openInventory(), GenericStats::param_noArgs()); initData->player->awardStat(GenericStats::openInventory(), GenericStats::param_noArgs());
CXuiSceneAbstractContainer::Initialize( initData->iPad, menu, false, InventoryMenu::INV_SLOT_START, eSectionInventoryUsing, eSectionInventoryMax, initData->bNavigateBack ); CXuiSceneAbstractContainer::Initialize( initData->iPad, menu, false, InventoryMenu::INV_SLOT_START, eSectionInventoryUsing, eSectionInventoryMax, initData->bNavigateBack );
delete initData; delete initData;
float fWidth; float fWidth;
@@ -86,7 +86,7 @@ HRESULT CXuiSceneInventory::OnDestroy()
} }
// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss. // 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying) // We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer(); if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
return S_OK; return S_OK;
} }
@@ -176,8 +176,8 @@ void CXuiSceneInventory::updateEffectsDisplay()
// Fill out details for display // Fill out details for display
D3DXVECTOR3 position; D3DXVECTOR3 position;
m_hEffectDisplayA[0]->GetPosition(&position); m_hEffectDisplayA[0]->GetPosition(&position);
AUTO_VAR(it, activeEffects->begin()); auto it = activeEffects->begin();
for(unsigned int i = 0; i < MAX_EFFECTS; ++i) for(unsigned int i = 0; i < MAX_EFFECTS; ++i)
{ {
if(it != activeEffects->end()) if(it != activeEffects->end())
{ {
@@ -185,7 +185,7 @@ void CXuiSceneInventory::updateEffectsDisplay()
if(i > 0) position.y -= fNextEffectYOffset; // Stack from the bottom if(i > 0) position.y -= fNextEffectYOffset; // Stack from the bottom
m_hEffectDisplayA[i]->SetPosition(&position); m_hEffectDisplayA[i]->SetPosition(&position);
MobEffectInstance *effect = *it; MobEffectInstance *effect = *it;
MobEffect *mobEffect = MobEffect::effects[effect->getId()]; MobEffect *mobEffect = MobEffect::effects[effect->getId()];

20
Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
View File

@@ -19,11 +19,11 @@
HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{ {
MapChildControls(); MapChildControls();
//XuiControlSetText(m_villagerText,app.GetString(IDS_VILLAGER)); //XuiControlSetText(m_villagerText,app.GetString(IDS_VILLAGER));
XuiControlSetText(m_inventoryLabel,app.GetString(IDS_INVENTORY)); XuiControlSetText(m_inventoryLabel,app.GetString(IDS_INVENTORY));
XuiControlSetText(m_requiredLabel,app.GetString(IDS_REQUIRED_ITEMS_FOR_TRADE)); XuiControlSetText(m_requiredLabel,app.GetString(IDS_REQUIRED_ITEMS_FOR_TRADE));
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -36,7 +36,7 @@ HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
if(m_bSplitscreen) if(m_bSplitscreen)
{ {
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad); app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad);
} }
if( pMinecraft->localgameModes[m_iPad] != NULL ) if( pMinecraft->localgameModes[m_iPad] != NULL )
@@ -65,7 +65,7 @@ HRESULT CXuiSceneTrading::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
// store the slot 0 highlight position // store the slot 0 highlight position
m_tradingSelector.GetPosition(&m_vSelectorInitialPos); m_tradingSelector.GetPosition(&m_vSelectorInitialPos);
//app.SetRichPresenceContextValue(m_iPad,CONTEXT_GAME_STATE_FORGING); //app.SetRichPresenceContextValue(m_iPad,CONTEXT_GAME_STATE_FORGING);
XuiSetTimer(m_hObj,TRADING_UPDATE_TIMER_ID,TRADING_UPDATE_TIMER_TIME); XuiSetTimer(m_hObj,TRADING_UPDATE_TIMER_ID,TRADING_UPDATE_TIMER_TIME);
@@ -86,7 +86,7 @@ HRESULT CXuiSceneTrading::OnDestroy()
} }
// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss. // 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying) // We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)
if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer(); if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
return S_OK; return S_OK;
} }
@@ -270,15 +270,15 @@ void CXuiSceneTrading::setOfferDescription(const wstring &name, vector<wstring>
} }
bool smallPointer = m_bSplitscreen || (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()); bool smallPointer = m_bSplitscreen || (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen());
wstring desc = L"<font size=\"" + _toString<int>(smallPointer ? 12 :14) + L"\">" + name + L"</font>"; wstring desc = L"<font size=\"" + std::to_wstring(smallPointer ? 12 :14) + L"\">" + name + L"</font>";
XUIRect tempXuiRect, xuiRect; XUIRect tempXuiRect, xuiRect;
HRESULT hr; HRESULT hr;
xuiRect.right = 0; xuiRect.right = 0;
for(AUTO_VAR(it, unformattedStrings.begin()); it != unformattedStrings.end(); ++it) for (auto& it : unformattedStrings )
{ {
XuiTextPresenterMeasureText(m_hOfferInfoTextMeasurer, (*it).c_str(), &tempXuiRect); XuiTextPresenterMeasureText(m_hOfferInfoTextMeasurer, it.c_str(), &tempXuiRect);
if(tempXuiRect.right > xuiRect.right) xuiRect = tempXuiRect; if(tempXuiRect.right > xuiRect.right) xuiRect = tempXuiRect;
} }
@@ -299,7 +299,7 @@ void CXuiSceneTrading::setOfferDescription(const wstring &name, vector<wstring>
XuiElementSetBounds(m_hOfferInfoText,xuiRect.right+4.0f+4.0f,xuiRect.bottom+4.0f+4.0f); // edge graphics are 8 pixels, text is centred XuiElementSetBounds(m_hOfferInfoText,xuiRect.right+4.0f+4.0f,xuiRect.bottom+4.0f+4.0f); // edge graphics are 8 pixels, text is centred
m_offerInfoControl.SetShow(TRUE); m_offerInfoControl.SetShow(TRUE);
D3DXVECTOR3 highlightPos, offerInfoPos; D3DXVECTOR3 highlightPos, offerInfoPos;
float highlightWidth, highlightHeight; float highlightWidth, highlightHeight;
m_tradingSelector.GetPosition(&highlightPos); m_tradingSelector.GetPosition(&highlightPos);

18
Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
View File

@@ -20,7 +20,7 @@ const float CScene_Win::PLAYER_SCROLL_SPEED = 3.0f;
// Performs initialization tasks - retrieves controls. // Performs initialization tasks - retrieves controls.
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
HRESULT CScene_Win::OnInit( XUIMessageInit* pInitData, BOOL& bHandled ) HRESULT CScene_Win::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{ {
m_iPad = *(int *)pInitData->pvInitData; m_iPad = *(int *)pInitData->pvInitData;
m_bIgnoreInput = false; m_bIgnoreInput = false;
@@ -194,8 +194,8 @@ void CScene_Win::updateNoise()
{ {
Minecraft *pMinecraft = Minecraft::GetInstance(); Minecraft *pMinecraft = Minecraft::GetInstance();
noiseString = noNoiseString; noiseString = noNoiseString;
int length = 0; size_t length = 0;
wchar_t replacements[64]; wchar_t replacements[64];
wstring replaceString = L""; wstring replaceString = L"";
wchar_t randomChar = L'a'; wchar_t randomChar = L'a';
@@ -205,18 +205,18 @@ void CScene_Win::updateNoise()
wstring tag = L"{*NOISE*}"; wstring tag = L"{*NOISE*}";
AUTO_VAR(it, m_noiseLengths.begin()); auto it = m_noiseLengths.begin();
int found=(int)noiseString.find_first_of(L"{"); size_t found = noiseString.find_first_of(L"{");
while (found!=string::npos && it != m_noiseLengths.end() ) while (found!=string::npos && it != m_noiseLengths.end() )
{ {
length = *it; length = *it;
++it; ++it;
replaceString = L""; replaceString = L"";
for(int i = 0; i < length; ++i) for(size_t i = 0; i < length; ++i)
{ {
randomChar = SharedConstants::acceptableLetters[random->nextInt((int)SharedConstants::acceptableLetters.length())]; randomChar = SharedConstants::acceptableLetters[random->nextInt(SharedConstants::acceptableLetters.length())];
wstring randomCharStr = L""; wstring randomCharStr = L"";
randomCharStr.push_back(randomChar); randomCharStr.push_back(randomChar);
if(randomChar == L'<') if(randomChar == L'<')
@@ -262,7 +262,7 @@ void CScene_Win::updateNoise()
//ib.put(listPos + 256 + random->nextInt(2) + 8 + (darken ? 16 : 0)); //ib.put(listPos + 256 + random->nextInt(2) + 8 + (darken ? 16 : 0));
//ib.put(listPos + pos + 32); //ib.put(listPos + pos + 32);
found=(int)noiseString.find_first_of(L"{",found+1); found = noiseString.find_first_of(L"{",found+1);
} }
} }

16
Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
View File

@@ -53,7 +53,7 @@ HRESULT CScene_TextEntry::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINotifyVal
if(pValueChangedData->nValue==10) if(pValueChangedData->nValue==10)
{ {
LPCWSTR pText = m_EditText.GetText(); LPCWSTR pText = m_EditText.GetText();
if(pText) if(pText)
{ {
wstring wText = pText; wstring wText = pText;
@@ -61,7 +61,7 @@ HRESULT CScene_TextEntry::OnNotifyValueChanged (HXUIOBJ hObjSource, XUINotifyVal
} }
app.NavigateBack(m_iPad); app.NavigateBack(m_iPad);
rfHandled = TRUE; rfHandled = TRUE;
} }
return S_OK; return S_OK;
@@ -86,7 +86,7 @@ HRESULT CScene_TextEntry::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
app.NavigateBack(m_iPad); app.NavigateBack(m_iPad);
rfHandled = TRUE; rfHandled = TRUE;
} }
break; break;
case VK_PAD_B: case VK_PAD_B:
@@ -113,8 +113,8 @@ HRESULT CScene_TextEntry::InterpretString(wstring &wsText)
swscanf_s(wsText.c_str(), L"%s", wchCommand,40); swscanf_s(wsText.c_str(), L"%s", wchCommand,40);
#endif #endif
AUTO_VAR(it, m_CommandSet.find(wchCommand)); auto it = m_CommandSet.find(wchCommand);
if(it != m_CommandSet.end()) if(it != m_CommandSet.end())
{ {
// found it // found it
@@ -125,7 +125,7 @@ HRESULT CScene_TextEntry::InterpretString(wstring &wsText)
case eCommand_Teleport: case eCommand_Teleport:
{ {
int x,z; int x,z;
#ifdef __PS3__ #ifdef __PS3__
// 4J Stu - The Xbox version uses swscanf_s which isn't available in GCC. // 4J Stu - The Xbox version uses swscanf_s which isn't available in GCC.
swscanf(wsText.c_str(), L"%40s%c%d%c%d", wchCommand,wchSep,&x,wchSep,&z); swscanf(wsText.c_str(), L"%40s%c%d%c%d", wchCommand,wchSep,&x,wchSep,&z);
@@ -146,9 +146,9 @@ HRESULT CScene_TextEntry::InterpretString(wstring &wsText)
} }
break; break;
case eCommand_Give: case eCommand_Give:
{ {
int iItem,iCount; int iItem,iCount;
#ifdef __PS3__ #ifdef __PS3__
// 4J Stu - The Xbox version uses swscanf_s which isn't available in GCC. // 4J Stu - The Xbox version uses swscanf_s which isn't available in GCC.
swscanf(wsText.c_str(), L"%40s%c%d%c%d", wchCommand,wchSep,&iItem,wchSep,&iCount); swscanf(wsText.c_str(), L"%40s%c%d%c%d", wchCommand,wchSep,&iItem,wchSep,&iCount);

16
Minecraft.Client/CreeperModel.cpp
View File

@@ -6,35 +6,33 @@
// 4J - added // 4J - added
void CreeperModel::_init(float g) void CreeperModel::_init(float g)
{ {
int yo = 4;
head = new ModelPart(this, 0, 0); head = new ModelPart(this, 0, 0);
head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head
head->setPos(0, (float)(yo), 0); head->setPos(0, 6, 0);
hair = new ModelPart(this, 32, 0); hair = new ModelPart(this, 32, 0);
hair->addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Head hair->addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Head
hair->setPos(0, (float)(yo), 0); hair->setPos(0, 6, 0);
body = new ModelPart(this, 16, 16); body = new ModelPart(this, 16, 16);
body->addBox(-4, 0, -2, 8, 12, 4, g); // Body body->addBox(-4, 0, -2, 8, 12, 4, g); // Body
body->setPos(0, (float)(yo), 0); body->setPos(0, 6, 0);
leg0 = new ModelPart(this, 0, 16); leg0 = new ModelPart(this, 0, 16);
leg0->addBox(-2, 0, -2, 4, 6, 4, g); // Leg0 leg0->addBox(-2, 0, -2, 4, 6, 4, g); // Leg0
leg0->setPos(-2, (float)(12 + yo), 4); leg0->setPos(-2, 18, 4);
leg1 = new ModelPart(this, 0, 16); leg1 = new ModelPart(this, 0, 16);
leg1->addBox(-2, 0, -2, 4, 6, 4, g); // Leg1 leg1->addBox(-2, 0, -2, 4, 6, 4, g); // Leg1
leg1->setPos(2, (float)(12 + yo), 4); leg1->setPos(2, 18, 4);
leg2 = new ModelPart(this, 0, 16); leg2 = new ModelPart(this, 0, 16);
leg2->addBox(-2, 0, -2, 4, 6, 4, g); // Leg2 leg2->addBox(-2, 0, -2, 4, 6, 4, g); // Leg2
leg2->setPos(-2, (float)(12 + yo), -4); leg2->setPos(-2, 18, -4);
leg3 = new ModelPart(this, 0, 16); leg3 = new ModelPart(this, 0, 16);
leg3->addBox(-2, 0, -2, 4, 6, 4, g); // Leg3 leg3->addBox(-2, 0, -2, 4, 6, 4, g); // Leg3
leg3->setPos(2, (float)(12 + yo), -4); leg3->setPos(2, 18, -4);
// 4J added - compile now to avoid random performance hit first time cubes are rendered // 4J added - compile now to avoid random performance hit first time cubes are rendered
head->compile(1.0f/16.0f); head->compile(1.0f/16.0f);

2
Minecraft.Client/DeathScreen.cpp
View File

@@ -48,7 +48,7 @@ void DeathScreen::render(int xm, int ym, float a)
glScalef(2, 2, 2); glScalef(2, 2, 2);
drawCenteredString(font, L"Game over!", width / 2 / 2, 60 / 2, 0xffffff); drawCenteredString(font, L"Game over!", width / 2 / 2, 60 / 2, 0xffffff);
glPopMatrix(); glPopMatrix();
drawCenteredString(font, L"Score: &e" + _toString( minecraft->player->getScore() ), width / 2, 100, 0xffffff); drawCenteredString(font, L"Score: &e" + std::to_wstring( minecraft->player->getScore() ), width / 2, 100, 0xffffff);
Screen::render(xm, ym, a); Screen::render(xm, ym, a);

2
Minecraft.Client/DemoMode.cpp
View File

@@ -26,7 +26,7 @@ void DemoMode::tick()
{ {
if (day <= (DEMO_DAYS + 1)) if (day <= (DEMO_DAYS + 1))
{ {
minecraft->gui->displayClientMessage(L"demo.day." + _toString<__int64>(day)); minecraft->gui->displayClientMessage(L"demo.day." + std::to_wstring(day));
} }
} }
else if (day == 1) else if (day == 1)

8
Minecraft.Client/Durango/Durango_App.cpp
View File

@@ -171,7 +171,7 @@ int CConsoleMinecraftApp::LoadLocalDLCImages()
{ {
unordered_map<wstring,DLC_INFO * > *pDLCInfoA=app.GetDLCInfo(); unordered_map<wstring,DLC_INFO * > *pDLCInfoA=app.GetDLCInfo();
// 4J-PB - Any local graphic files for the Minecraft Store? // 4J-PB - Any local graphic files for the Minecraft Store?
for( AUTO_VAR(it, pDLCInfoA->begin()); it != pDLCInfoA->end(); it++ ) for (auto it = pDLCInfoA->begin(); it != pDLCInfoA->end(); it++)
{ {
DLC_INFO * pDLCInfo=(*it).second; DLC_INFO * pDLCInfo=(*it).second;
@@ -185,7 +185,7 @@ void CConsoleMinecraftApp::FreeLocalDLCImages()
// 4J-PB - Any local graphic files for the Minecraft Store? // 4J-PB - Any local graphic files for the Minecraft Store?
unordered_map<wstring,DLC_INFO * > *pDLCInfoA=app.GetDLCInfo(); unordered_map<wstring,DLC_INFO * > *pDLCInfoA=app.GetDLCInfo();
for( AUTO_VAR(it, pDLCInfoA->begin()); it != pDLCInfoA->end(); it++ ) for (auto it = pDLCInfoA->begin(); it != pDLCInfoA->end(); it++)
{ {
DLC_INFO * pDLCInfo=(*it).second; DLC_INFO * pDLCInfo=(*it).second;
@@ -567,8 +567,8 @@ int CConsoleMinecraftApp::Callback_TMSPPRetrieveFileList(void *pParam,int iPad,
// dump out the file list // dump out the file list
app.DebugPrintf("TMSPP filecount - %d\nFiles - \n",pvTmsFileDetails->size()); app.DebugPrintf("TMSPP filecount - %d\nFiles - \n",pvTmsFileDetails->size());
int iCount=0; int iCount=0;
AUTO_VAR(itEnd, pvTmsFileDetails->end()); auto itEnd = pvTmsFileDetails->end();
for( AUTO_VAR(it, pvTmsFileDetails->begin()); it != itEnd; it++ ) for (auto it = pvTmsFileDetails->begin(); it != itEnd; it++)
{ {
C4JStorage::PTMSPP_FILE_DETAILS fd = *it; C4JStorage::PTMSPP_FILE_DETAILS fd = *it;
app.DebugPrintf("%2d. %ls (size - %d)\n",iCount++,fd->wchFilename,fd->ulFileSize); app.DebugPrintf("%2d. %ls (size - %d)\n",iCount++,fd->wchFilename,fd->ulFileSize);

18
Minecraft.Client/Durango/Durango_Minecraft.cpp
View File

@@ -1102,12 +1102,12 @@ SIZE_T WINAPI XMemSize(
void DumpMem() void DumpMem()
{ {
int totalLeak = 0; int totalLeak = 0;
for(AUTO_VAR(it, allocCounts.begin()); it != allocCounts.end(); it++ ) for( auto& it : allocCounts )
{ {
if(it->second > 0 ) if(it.second > 0 )
{ {
app.DebugPrintf("%d %d %d %d\n",( it->first >> 26 ) & 0x3f,it->first & 0x03ffffff, it->second, (it->first & 0x03ffffff) * it->second); app.DebugPrintf("%d %d %d %d\n",( it.first >> 26 ) & 0x3f,it.first & 0x03ffffff, it.second, (it.first & 0x03ffffff) * it.second);
totalLeak += ( it->first & 0x03ffffff ) * it->second; totalLeak += ( it.first & 0x03ffffff ) * it.second;
} }
} }
app.DebugPrintf("Total %d\n",totalLeak); app.DebugPrintf("Total %d\n",totalLeak);
@@ -1150,13 +1150,13 @@ void MemPixStuff()
int totals[MAX_SECT] = {0}; int totals[MAX_SECT] = {0};
for(AUTO_VAR(it, allocCounts.begin()); it != allocCounts.end(); it++ ) for ( auto& it : allocCounts )
{ {
if(it->second > 0 ) if ( it.second > 0 )
{ {
int sect = ( it->first >> 26 ) & 0x3f; int sect = ( it.first >> 26 ) & 0x3f;
int bytes = it->first & 0x03ffffff; int bytes = it.first & 0x03ffffff;
totals[sect] += bytes * it->second; totals[sect] += bytes * it.second;
} }
} }

106
Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
View File

@@ -21,52 +21,52 @@ DurangoLeaderboardManager::DurangoLeaderboardManager()
m_difficulty = 0; m_difficulty = 0;
m_type = eStatsType_UNDEFINED; m_type = eStatsType_UNDEFINED;
m_statNames = ref new PC::Vector<P::String^>(); m_statNames = ref new PC::Vector<P::String^>();
m_xboxUserIds = ref new PC::Vector<P::String^>(); m_xboxUserIds = ref new PC::Vector<P::String^>();
m_leaderboardAsyncOp = nullptr; m_leaderboardAsyncOp = nullptr;
m_statsAsyncOp = nullptr; m_statsAsyncOp = nullptr;
for(unsigned int difficulty = 0; difficulty < 4; ++difficulty) for(unsigned int difficulty = 0; difficulty < 4; ++difficulty)
{ {
m_leaderboardNames[difficulty][eStatsType_Travelling] = L"LeaderboardTravelling" + _toString(difficulty); m_leaderboardNames[difficulty][eStatsType_Travelling] = L"LeaderboardTravelling" + std::to_wstring(difficulty);
m_leaderboardNames[difficulty][eStatsType_Mining] = L"LeaderboardMining" + _toString(difficulty); m_leaderboardNames[difficulty][eStatsType_Mining] = L"LeaderboardMining" + std::to_wstring(difficulty);
m_leaderboardNames[difficulty][eStatsType_Farming] = L"LeaderboardFarming" + _toString(difficulty); m_leaderboardNames[difficulty][eStatsType_Farming] = L"LeaderboardFarming" + std::to_wstring(difficulty);
m_leaderboardNames[difficulty][eStatsType_Kills] = L"LeaderboardKills" + _toString(difficulty); m_leaderboardNames[difficulty][eStatsType_Kills] = L"LeaderboardKills" + std::to_wstring(difficulty);
m_socialLeaderboardNames[difficulty][eStatsType_Travelling] = L"Leaderboard.LeaderboardId.0.DifficultyLevelId." + _toString(difficulty); m_socialLeaderboardNames[difficulty][eStatsType_Travelling] = L"Leaderboard.LeaderboardId.0.DifficultyLevelId." + std::to_wstring(difficulty);
m_socialLeaderboardNames[difficulty][eStatsType_Mining] = L"Leaderboard.LeaderboardId.1.DifficultyLevelId." + _toString(difficulty); m_socialLeaderboardNames[difficulty][eStatsType_Mining] = L"Leaderboard.LeaderboardId.1.DifficultyLevelId." + std::to_wstring(difficulty);
m_socialLeaderboardNames[difficulty][eStatsType_Farming] = L"Leaderboard.LeaderboardId.2.DifficultyLevelId." + _toString(difficulty); m_socialLeaderboardNames[difficulty][eStatsType_Farming] = L"Leaderboard.LeaderboardId.2.DifficultyLevelId." + std::to_wstring(difficulty);
m_socialLeaderboardNames[difficulty][eStatsType_Kills] = L"Leaderboard.LeaderboardId.3.DifficultyLevelId." + _toString(difficulty); m_socialLeaderboardNames[difficulty][eStatsType_Kills] = L"Leaderboard.LeaderboardId.3.DifficultyLevelId." + std::to_wstring(difficulty);
m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + _toString(difficulty) + L".TravelMethodId.0"); // Walked m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + std::to_wstring(difficulty) + L".TravelMethodId.0"); // Walked
m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + _toString(difficulty) + L".TravelMethodId.2"); // Fallen m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + std::to_wstring(difficulty) + L".TravelMethodId.2"); // Fallen
m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + _toString(difficulty) + L".TravelMethodId.4"); // Minecart m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + std::to_wstring(difficulty) + L".TravelMethodId.4"); // Minecart
m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + _toString(difficulty) + L".TravelMethodId.5"); // Boat m_leaderboardStatNames[difficulty][eStatsType_Travelling].push_back( L"DistanceTravelled.DifficultyLevelId." + std::to_wstring(difficulty) + L".TravelMethodId.5"); // Boat
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.3"); // Dirt m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.3"); // Dirt
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.4"); // Cobblestone m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.4"); // Cobblestone
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.12"); // Sand m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.12"); // Sand
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.1"); // Stone m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.1"); // Stone
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.13"); // Gravel m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.13"); // Gravel
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.82"); // Clay m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.82"); // Clay
m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.49"); // Obsidian m_leaderboardStatNames[difficulty][eStatsType_Mining].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.49"); // Obsidian
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + _toString(difficulty) + L".AcquisitionMethodId.1.ItemId.344"); // Eggs m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + std::to_wstring(difficulty) + L".AcquisitionMethodId.1.ItemId.344"); // Eggs
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.59"); // Wheat m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.59"); // Wheat
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.39"); // Mushroom m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.39"); // Mushroom
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + _toString(difficulty) + L".BlockId.83"); // Sugarcane m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"BlockBroken.DifficultyLevelId." + std::to_wstring(difficulty) + L".BlockId.83"); // Sugarcane
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + _toString(difficulty) + L".AcquisitionMethodId.2.ItemId.335"); // Milk m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + std::to_wstring(difficulty) + L".AcquisitionMethodId.2.ItemId.335"); // Milk
m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + _toString(difficulty) + L".AcquisitionMethodId.1.ItemId.86"); // Pumpkin m_leaderboardStatNames[difficulty][eStatsType_Farming].push_back( L"McItemAcquired.DifficultyLevelId." + std::to_wstring(difficulty) + L".AcquisitionMethodId.1.ItemId.86"); // Pumpkin
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.54"); // Zombie m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.54"); // Zombie
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.51"); // Skeleton m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.51"); // Skeleton
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.50"); // Creeper m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.50"); // Creeper
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.52"); // Spider m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.52"); // Spider
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.49"); // Spider Jockey m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.49"); // Spider Jockey
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.57"); // Zombie Pigman m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.57"); // Zombie Pigman
m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + _toString(difficulty) + L".EnemyRoleId.55"); // Slime m_leaderboardStatNames[difficulty][eStatsType_Kills].push_back( L"MobKilledTotal.DifficultyLevelId." + std::to_wstring(difficulty) + L".EnemyRoleId.55"); // Slime
} }
} }
void DurangoLeaderboardManager::Tick() void DurangoLeaderboardManager::Tick()
{ {
@@ -93,7 +93,7 @@ void DurangoLeaderboardManager::Tick()
{ {
app.DebugPrintf("[LeaderboardManager] Second continuation\n"); app.DebugPrintf("[LeaderboardManager] Second continuation\n");
m_statsAsyncOp = nullptr; m_statsAsyncOp = nullptr;
WFC::IVectorView<MXS::UserStatistics::UserStatisticsResult^>^ resultList = resultListTask.get(); WFC::IVectorView<MXS::UserStatistics::UserStatisticsResult^>^ resultList = resultListTask.get();
if (m_xboxLiveContext == nullptr) throw(ref new P::Exception(-1)); if (m_xboxLiveContext == nullptr) throw(ref new P::Exception(-1));
@@ -170,7 +170,7 @@ void DurangoLeaderboardManager::Tick()
eStatsReturn ret = view.m_numQueries > 0 ? eStatsReturn_Success : eStatsReturn_NoResults; eStatsReturn ret = view.m_numQueries > 0 ? eStatsReturn_Success : eStatsReturn_NoResults;
if (m_readListener != NULL) if (m_readListener != NULL)
{ {
app.DebugPrintf("[LeaderboardManager] OnStatsReadComplete(%i, %i, _)\n", ret, m_readCount); app.DebugPrintf("[LeaderboardManager] OnStatsReadComplete(%i, %i, _)\n", ret, m_readCount);
m_readListener->OnStatsReadComplete(ret, m_maxRank, view); m_readListener->OnStatsReadComplete(ret, m_maxRank, view);
@@ -380,10 +380,10 @@ void DurangoLeaderboardManager::CancelOperation()
//if (m_transactionCtx != 0) //if (m_transactionCtx != 0)
//{ //{
// int ret = sceNpScoreAbortTransaction(m_transactionCtx); // int ret = sceNpScoreAbortTransaction(m_transactionCtx);
// //
// if (ret < 0) // if (ret < 0)
// { // {
// app.DebugPrintf("[LeaderboardManager] CancelOperation(): Problem encountered aborting current operation, 0x%X.\n", ret); // app.DebugPrintf("[LeaderboardManager] CancelOperation(): Problem encountered aborting current operation, 0x%X.\n", ret);
// } // }
// else // else
// { // {
@@ -415,20 +415,20 @@ void DurangoLeaderboardManager::runLeaderboardRequest(WF::IAsyncOperation<MXSL::
app.DebugPrintf("[LeaderboardManager] Running request\n"); app.DebugPrintf("[LeaderboardManager] Running request\n");
CC::create_task(asyncOp) CC::create_task(asyncOp)
.then( [this, readCount, difficulty, type, filter] (CC::task<MXSL::LeaderboardResult^> resultTask) .then( [this, readCount, difficulty, type, filter] (CC::task<MXSL::LeaderboardResult^> resultTask)
{ {
try try
{ {
app.DebugPrintf("[LeaderboardManager] First continuation.\n"); app.DebugPrintf("[LeaderboardManager] First continuation.\n");
m_leaderboardAsyncOp = nullptr; m_leaderboardAsyncOp = nullptr;
MXSL::LeaderboardResult^ lastResult = resultTask.get(); MXSL::LeaderboardResult^ lastResult = resultTask.get();
app.DebugPrintf( app.DebugPrintf(
"Name: %ls - Filter: %ls - Rows: Retrieved=%d Total=%d Requested=%d.\n", "Name: %ls - Filter: %ls - Rows: Retrieved=%d Total=%d Requested=%d.\n",
lastResult->DisplayName->Data(), lastResult->DisplayName->Data(),
LeaderboardManager::filterNames[ (int) filter ].c_str(), LeaderboardManager::filterNames[ (int) filter ].c_str(),
lastResult->Rows->Size, lastResult->TotalRowCount, readCount lastResult->Rows->Size, lastResult->TotalRowCount, readCount
); );
@@ -459,21 +459,21 @@ void DurangoLeaderboardManager::runLeaderboardRequest(WF::IAsyncOperation<MXSL::
m_readCount = lastResult->Rows->Size; m_readCount = lastResult->Rows->Size;
if (m_scores != NULL) delete [] m_scores; if (m_scores != NULL) delete [] m_scores;
m_scores = new ReadScore[m_readCount]; m_scores = new ReadScore[m_readCount];
ZeroMemory(m_scores, sizeof(ReadScore) * m_readCount); ZeroMemory(m_scores, sizeof(ReadScore) * m_readCount);
m_xboxUserIds->Clear(); m_xboxUserIds->Clear();
app.DebugPrintf("[LeaderboardManager] Retrieved Scores:\n"); app.DebugPrintf("[LeaderboardManager] Retrieved Scores:\n");
for( UINT index = 0; index < lastResult->Rows->Size; index++ ) for( UINT index = 0; index < lastResult->Rows->Size; index++ )
{ {
MXSL::LeaderboardRow^ row = lastResult->Rows->GetAt(index); MXSL::LeaderboardRow^ row = lastResult->Rows->GetAt(index);
app.DebugPrintf( app.DebugPrintf(
"\tIndex: %d\tRank: %d\tPercentile: %.1f%%\tXboxUserId: %ls\tValue: %ls.\n", "\tIndex: %d\tRank: %d\tPercentile: %.1f%%\tXboxUserId: %ls\tValue: %ls.\n",
index, index,
row->Rank, row->Rank,
row->Percentile * 100, row->Percentile * 100,
row->XboxUserId->Data(), row->XboxUserId->Data(),
row->Values->GetAt(0)->Data() row->Values->GetAt(0)->Data()
); );
@@ -484,7 +484,7 @@ void DurangoLeaderboardManager::runLeaderboardRequest(WF::IAsyncOperation<MXSL::
// 4J-JEV: Added to help determine if this player's score is hidden due to their privacy settings. // 4J-JEV: Added to help determine if this player's score is hidden due to their privacy settings.
m_scores[index].m_totalScore = (unsigned long) _fromString<long long>(row->Values->GetAt(0)->Data()); m_scores[index].m_totalScore = (unsigned long) _fromString<long long>(row->Values->GetAt(0)->Data());
m_xboxUserIds->Append(row->XboxUserId); m_xboxUserIds->Append(row->XboxUserId);
} }
@@ -681,12 +681,12 @@ void DurangoLeaderboardManager::setState(EStatsState newState)
}; };
break; break;
}; };
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
app.DebugPrintf( app.DebugPrintf(
"[LeaderboardManager] %s state transition:\t%ls(%d) -> %ls(%d).\n", "[LeaderboardManager] %s state transition:\t%ls(%d) -> %ls(%d).\n",
(validTransition ? "Valid" : "INVALID"), (validTransition ? "Valid" : "INVALID"),
stateToString(m_eStatsState).c_str(), m_eStatsState, stateToString(m_eStatsState).c_str(), m_eStatsState,
stateToString(newState).c_str(), newState stateToString(newState).c_str(), newState
); );
#endif #endif

2
Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
View File

@@ -1460,7 +1460,7 @@ void DQRNetworkManager::UpdateRoomSyncPlayers(RoomSyncData *pNewSyncData)
{ {
PlayerSyncData *pNewPlayer = &pNewSyncData->players[i]; PlayerSyncData *pNewPlayer = &pNewSyncData->players[i];
bool bAlreadyExisted = false; bool bAlreadyExisted = false;
for( AUTO_VAR(it, tempPlayers.begin()); it != tempPlayers.end(); it++ ) for (auto it = tempPlayers.begin(); it != tempPlayers.end(); it++)
{ {
if( pNewPlayer->m_smallId == (*it)->GetSmallId() ) if( pNewPlayer->m_smallId == (*it)->GetSmallId() )
{ {

31
Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
View File

@@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "..\..\..\Minecraft.World\Socket.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "..\..\..\Minecraft.World\StringHelpers.h"
#include "PlatformNetworkManagerDurango.h" #include "PlatformNetworkManagerDurango.h"
@@ -131,9 +131,8 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl
{ {
// Do we already have a primary player for this system? // Do we already have a primary player for this system?
bool systemHasPrimaryPlayer = false; bool systemHasPrimaryPlayer = false;
for(AUTO_VAR(it, m_machineDQRPrimaryPlayers.begin()); it < m_machineDQRPrimaryPlayers.end(); ++it) for ( DQRNetworkPlayer *pQNetPrimaryPlayer : m_machineDQRPrimaryPlayers )
{ {
DQRNetworkPlayer *pQNetPrimaryPlayer = *it;
if( pDQRPlayer->IsSameSystem(pQNetPrimaryPlayer) ) if( pDQRPlayer->IsSameSystem(pQNetPrimaryPlayer) )
{ {
systemHasPrimaryPlayer = true; systemHasPrimaryPlayer = true;
@@ -145,7 +144,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl
} }
} }
g_NetworkManager.PlayerJoining( networkPlayer ); g_NetworkManager.PlayerJoining( networkPlayer );
if( createFakeSocket == true && !m_bHostChanged ) if( createFakeSocket == true && !m_bHostChanged )
{ {
g_NetworkManager.CreateSocket( networkPlayer, localPlayer ); g_NetworkManager.CreateSocket( networkPlayer, localPlayer );
@@ -164,7 +163,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerJoined(DQRNetworkPlayer *pDQRPl
g_NetworkManager.UpdateAndSetGameSessionData(); g_NetworkManager.UpdateAndSetGameSessionData();
SystemFlagAddPlayer( networkPlayer ); SystemFlagAddPlayer( networkPlayer );
} }
for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(playerChangedCallback[idx] != NULL) if(playerChangedCallback[idx] != NULL)
@@ -233,8 +232,8 @@ void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRP
break; break;
} }
} }
AUTO_VAR(it, find( m_machineDQRPrimaryPlayers.begin(), m_machineDQRPrimaryPlayers.end(), pDQRPlayer)); auto it = find(m_machineDQRPrimaryPlayers.begin(), m_machineDQRPrimaryPlayers.end(), pDQRPlayer);
if( it != m_machineDQRPrimaryPlayers.end() ) if( it != m_machineDQRPrimaryPlayers.end() )
{ {
m_machineDQRPrimaryPlayers.erase( it ); m_machineDQRPrimaryPlayers.erase( it );
} }
@@ -249,7 +248,7 @@ void CPlatformNetworkManagerDurango::HandlePlayerLeaving(DQRNetworkPlayer *pDQRP
} }
g_NetworkManager.PlayerLeaving( networkPlayer ); g_NetworkManager.PlayerLeaving( networkPlayer );
for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx) for( int idx = 0; idx < XUSER_MAX_COUNT; ++idx)
{ {
if(playerChangedCallback[idx] != NULL) if(playerChangedCallback[idx] != NULL)
@@ -322,7 +321,7 @@ bool CPlatformNetworkManagerDurango::Initialise(CGameNetworkManager *pGameNetwor
{ {
playerChangedCallback[ i ] = NULL; playerChangedCallback[ i ] = NULL;
} }
m_bLeavingGame = false; m_bLeavingGame = false;
m_bLeaveGameOnTick = false; m_bLeaveGameOnTick = false;
m_bHostChanged = false; m_bHostChanged = false;
@@ -593,7 +592,7 @@ void CPlatformNetworkManagerDurango::UnRegisterPlayerChangedCallback(int iPad, v
void CPlatformNetworkManagerDurango::HandleSignInChange() void CPlatformNetworkManagerDurango::HandleSignInChange()
{ {
return; return;
} }
void CPlatformNetworkManagerDurango::HandleAddLocalPlayerFailed(int idx, bool serverFull) void CPlatformNetworkManagerDurango::HandleAddLocalPlayerFailed(int idx, bool serverFull)
@@ -618,10 +617,10 @@ void CPlatformNetworkManagerDurango::UpdateAndSetGameSessionData(INetworkPlayer
{ {
if( this->m_bLeavingGame ) if( this->m_bLeavingGame )
return; return;
if( GetHostPlayer() == NULL ) if( GetHostPlayer() == NULL )
return; return;
m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All); m_hostGameSessionData.m_uiGameHostSettings = app.GetGameHostOption(eGameHostOption_All);
m_pDQRNet->UpdateCustomSessionData(); m_pDQRNet->UpdateCustomSessionData();
@@ -847,8 +846,8 @@ INetworkPlayer *CPlatformNetworkManagerDurango::addNetworkPlayer(DQRNetworkPlaye
void CPlatformNetworkManagerDurango::removeNetworkPlayer(DQRNetworkPlayer *pDQRPlayer) void CPlatformNetworkManagerDurango::removeNetworkPlayer(DQRNetworkPlayer *pDQRPlayer)
{ {
INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pDQRPlayer); INetworkPlayer *pNetworkPlayer = getNetworkPlayer(pDQRPlayer);
for( AUTO_VAR(it, currentNetworkPlayers.begin()); it != currentNetworkPlayers.end(); it++ ) for (auto it = currentNetworkPlayers.begin(); it != currentNetworkPlayers.end(); ++it)
{ {
if( *it == pNetworkPlayer ) if( *it == pNetworkPlayer )
{ {
currentNetworkPlayers.erase(it); currentNetworkPlayers.erase(it);
@@ -865,7 +864,7 @@ INetworkPlayer *CPlatformNetworkManagerDurango::getNetworkPlayer(DQRNetworkPlaye
INetworkPlayer *CPlatformNetworkManagerDurango::GetLocalPlayerByUserIndex(int userIndex ) INetworkPlayer *CPlatformNetworkManagerDurango::GetLocalPlayerByUserIndex(int userIndex )
{ {
return getNetworkPlayer(m_pDQRNet->GetLocalPlayerByUserIndex(userIndex)); return getNetworkPlayer(m_pDQRNet->GetLocalPlayerByUserIndex(userIndex));
} }
INetworkPlayer *CPlatformNetworkManagerDurango::GetPlayerByIndex(int playerIndex) INetworkPlayer *CPlatformNetworkManagerDurango::GetPlayerByIndex(int playerIndex)

28
Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
View File

@@ -51,7 +51,7 @@ HRESULT CDurangoTelemetryManager::Flush()
bool CDurangoTelemetryManager::RecordPlayerSessionStart(int iPad) bool CDurangoTelemetryManager::RecordPlayerSessionStart(int iPad)
{ {
durangoStats()->generatePlayerSession(); durangoStats()->generatePlayerSession();
return true; return true;
} }
@@ -123,7 +123,7 @@ bool CDurangoTelemetryManager::RecordPlayerSessionExit(int iPad, int exitStatus)
bool CDurangoTelemetryManager::RecordLevelStart(int iPad, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, int numberOfLocalPlayers, int numberOfOnlinePlayers) bool CDurangoTelemetryManager::RecordLevelStart(int iPad, ESen_FriendOrMatch friendsOrMatch, ESen_CompeteOrCoop competeOrCoop, int difficulty, int numberOfLocalPlayers, int numberOfOnlinePlayers)
{ {
CTelemetryManager::RecordLevelStart(iPad, friendsOrMatch, competeOrCoop, difficulty, numberOfLocalPlayers, numberOfOnlinePlayers); CTelemetryManager::RecordLevelStart(iPad, friendsOrMatch, competeOrCoop, difficulty, numberOfLocalPlayers, numberOfOnlinePlayers);
ULONG hr = 0; ULONG hr = 0;
// Grab player info. // Grab player info.
@@ -191,10 +191,10 @@ bool CDurangoTelemetryManager::RecordLevelStart(int iPad, ESen_FriendOrMatch fri
GetSubLevelId(iPad), GetSubLevelId(iPad),
GetLevelInstanceID(), GetLevelInstanceID(),
&ZERO_GUID, &ZERO_GUID,
friendsOrMatch, friendsOrMatch,
competeOrCoop, competeOrCoop,
difficulty, difficulty,
numberOfLocalPlayers, numberOfLocalPlayers,
numberOfOnlinePlayers, numberOfOnlinePlayers,
&ZERO_GUID &ZERO_GUID
); );
@@ -219,10 +219,10 @@ bool CDurangoTelemetryManager::RecordLevelStart(int iPad, ESen_FriendOrMatch fri
// Durango // // Durango //
/* GUID */ guid2str(DurangoStats::getPlayerSession()).c_str(), /* GUID */ guid2str(DurangoStats::getPlayerSession()).c_str(),
/* WSTR */ DurangoStats::getMultiplayerCorrelationId(), /* WSTR */ DurangoStats::getMultiplayerCorrelationId(),
/* int */ friendsOrMatch, /* int */ friendsOrMatch,
/* int */ competeOrCoop, /* int */ competeOrCoop,
/* int */ difficulty, /* int */ difficulty,
/* int */ numberOfLocalPlayers, /* int */ numberOfLocalPlayers,
/* int */ numberOfOnlinePlayers /* int */ numberOfOnlinePlayers
); );
@@ -577,7 +577,7 @@ bool CDurangoTelemetryManager::RecordMediaShareUpload(int iPad, ESen_MediaDestin
mediaDestination, mediaDestination,
mediaType mediaType
); );
#else #else
ULONG hr = -1; ULONG hr = -1;
#endif #endif
@@ -974,11 +974,11 @@ DurangoStats *CDurangoTelemetryManager::durangoStats()
wstring CDurangoTelemetryManager::guid2str(LPCGUID guid) wstring CDurangoTelemetryManager::guid2str(LPCGUID guid)
{ {
wstring out = L"GUID<"; wstring out = L"GUID<";
out += _toString<unsigned long>(guid->Data1); out += std::to_wstring(guid->Data1);
out += L":"; out += L":";
out += _toString<unsigned short>(guid->Data2); out += std::to_wstring(guid->Data2);
out += L":"; out += L":";
out += _toString<unsigned short>(guid->Data3); out += std::to_wstring(guid->Data3);
//out += L":"; //out += L":";
//out += convStringToWstring(string((char*)&guid->Data4,8)); //out += convStringToWstring(string((char*)&guid->Data4,8));
out += L">"; out += L">";

BIN
Minecraft.Client/DurangoMedia/DLC/Candy Texture Pack/Data/x16Data.pck
View File

Binary file not shown.

BIN
Minecraft.Client/DurangoMedia/DLC/Cartoon Texture Pack/Data/x32Data.pck
View File

Binary file not shown.

BIN
Minecraft.Client/DurangoMedia/DLC/City Texture Pack/Data/x32Data.pck
View File

Binary file not shown.

BIN
Minecraft.Client/DurangoMedia/DLC/Fantasy Texture Pack/Data/x32Data.pck
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More