forked from mirrors/kolyah35-minecraft-pe-0.6.1
Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
5d415dcca1
12 changed files with 142 additions and 47 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#include "OptionsFile.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <platform/log.h>
|
||||
|
||||
OptionsFile::OptionsFile() {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue