lolcat/minecraft-pe-0.6.1
1
0
Fork 0
mirror of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git synced 2026-03-22 07:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/main'

Browse Source
This commit is contained in:
Kolyah35
2026-03-20 19:57:24 +03:00
parent a317bf66af cb28b78776
commit 5d415dcca1
12 changed files with 142 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/OptionsFile.cpp
View File

@@ -1,6 +1,7 @@
#include "OptionsFile.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <platform/log.h>
OptionsFile::OptionsFile() {

4
src/client/gui/Gui.cpp
View File

@@ -430,9 +430,9 @@ void Gui::onConfigChanged( const Config& c ) {
// Create outer feedback circle
//
#ifdef ANDROID
const float mm = 12;
const float mm = 50; //20
#else
const float mm = 12;
const float mm = 50; //20
#endif
const float maxRadius = minecraft->pixelCalcUi.millimetersToPixels(mm);
const float radius = Mth::Min(80.0f/2, maxRadius);

10
src/client/player/LocalPlayer.cpp
View File

@@ -24,12 +24,14 @@
#include "../../platform/HttpClient.h"
#include "../../platform/CThread.h"
#include "../../util/StringUtils.h"
#include "client/Options.h"
#if defined(_WIN32)
#include <direct.h>
#else
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#endif
#ifndef STANDALONE_SERVER
@@ -328,12 +330,12 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
{
this->dimension = dimension;
_init();
#ifndef STANDALONE_SERVER
printf("%s \n", name.c_str());
if (!name.empty()) {
this->name = name;
if (minecraft->options.getStringValue(OPTIONS_USERNAME).size() != 0) {
textureName = "mob/char.png";
this->name = minecraft->options.getStringValue(OPTIONS_USERNAME);
printf("test \n");
// Fetch user skin and cape from Mojang servers in the background (avoids blocking the main thread)
// TODO: Fix this memory leak

4
src/client/player/input/touchscreen/TouchscreenInput.cpp
View File

@@ -126,8 +126,8 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
// If too large (like playing on Tablet)
PixelCalc& pc = _minecraft->pixelCalc;
if (pc.pixelsToMillimeters(Bw) > 14) {
Bw = Bh = pc.millimetersToPixels(14);
if (pc.pixelsToMillimeters(Bw) > 200) { //14
Bw = Bh = pc.millimetersToPixels(200); //14
}
// temp data
float xx;