mirror of
https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
synced 2026-03-19 22:43:32 +00:00
i fucking FLIPPED the cape textures and fixed issues with options
were the options working for everyone else? am i stupid
This commit is contained in:
@@ -73,6 +73,8 @@
|
|||||||
#include "../util/Mth.h"
|
#include "../util/Mth.h"
|
||||||
#include "../network/packet/InteractPacket.h"
|
#include "../network/packet/InteractPacket.h"
|
||||||
#include "../network/packet/RespawnPacket.h"
|
#include "../network/packet/RespawnPacket.h"
|
||||||
|
#include "../network/packet/AdventureSettingsPacket.h"
|
||||||
|
#include "../network/packet/SetSpawnPositionPacket.h"
|
||||||
#include "IConfigListener.h"
|
#include "IConfigListener.h"
|
||||||
#include "../world/entity/MobCategory.h"
|
#include "../world/entity/MobCategory.h"
|
||||||
#include "../world/Difficulty.h"
|
#include "../world/Difficulty.h"
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ public:
|
|||||||
|
|
||||||
Options(Minecraft* minecraft, const std::string& workingDirectory = "")
|
Options(Minecraft* minecraft, const std::string& workingDirectory = "")
|
||||||
: minecraft(minecraft) {
|
: minecraft(minecraft) {
|
||||||
|
// elements werent initialized so i was getting a garbage pointer and a crash
|
||||||
|
m_options.fill(nullptr);
|
||||||
initTable();
|
initTable();
|
||||||
load();
|
load();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -176,16 +176,25 @@ void TouchscreenInput_TestFps::setKey( int key, bool state )
|
|||||||
//LOGI("key: %d, %d\n", key, state);
|
//LOGI("key: %d, %d\n", key, state);
|
||||||
|
|
||||||
int id = -1;
|
int id = -1;
|
||||||
if (key == _options->keyUp.key) id = KEY_UP;
|
// theres no keyUp etc???
|
||||||
if (key == _options->keyDown.key) id = KEY_DOWN;
|
//if (key == _options->keyUp.key) id = KEY_UP;
|
||||||
if (key == _options->keyLeft.key) id = KEY_LEFT;
|
//if (key == _options->keyDown.key) id = KEY_DOWN;
|
||||||
if (key == _options->keyRight.key) id = KEY_RIGHT;
|
//if (key == _options->keyLeft.key) id = KEY_LEFT;
|
||||||
if (key == _options->keyJump.key) id = KEY_JUMP;
|
//if (key == _options->keyRight.key) id = KEY_RIGHT;
|
||||||
if (key == _options->keySneak.key) id = KEY_SNEAK;
|
//if (key == _options->keyJump.key) id = KEY_JUMP;
|
||||||
if (key == _options->keyCraft.key) id = KEY_CRAFT;
|
//if (key == _options->keySneak.key) id = KEY_SNEAK;
|
||||||
if (id >= 0) {
|
//if (key == _options->keyCraft.key) id = KEY_CRAFT;
|
||||||
_keys[id] = state;
|
//if (id >= 0) {
|
||||||
}
|
// _keys[id] = state;
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_FORWARD)) id = KEY_UP;
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_BACK)) id = KEY_DOWN;
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_LEFT)) id = KEY_LEFT;
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_RIGHT)) id = KEY_RIGHT;
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_JUMP)) id = KEY_JUMP;
|
||||||
|
if (key == _options->getIntValue(OPTIONS_KEY_SNEAK)) id = KEY_SNEAK;
|
||||||
|
//if (key == _options->getIntValue(OPTIONS_KEY_CRAFT)) id = KEY_CRAFT;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -167,16 +167,16 @@ void HumanoidMobRenderer::additionalRendering(Mob* mob, float a) {
|
|||||||
const float depth = 1.0f;
|
const float depth = 1.0f;
|
||||||
|
|
||||||
// Front
|
// Front
|
||||||
t.tex(u0, vTop); t.vertex(-halfW, 0.0f, 0.0f);
|
t.tex(u2, vTop); t.vertex(-halfW, 0.0f, 0.0f);
|
||||||
t.tex(u1, vTop); t.vertex(halfW, 0.0f, 0.0f);
|
t.tex(u3, vTop); t.vertex(halfW, 0.0f, 0.0f);
|
||||||
t.tex(u1, vBottom); t.vertex(halfW, height, 0.0f);
|
t.tex(u3, vBottom); t.vertex(halfW, height, 0.0f);
|
||||||
t.tex(u0, vBottom); t.vertex(-halfW, height, 0.0f);
|
t.tex(u2, vBottom); t.vertex(-halfW, height, 0.0f);
|
||||||
|
|
||||||
// Back
|
// Back
|
||||||
t.tex(u2, vTop); t.vertex(halfW, 0.0f, depth);
|
t.tex(u0, vTop); t.vertex(halfW, 0.0f, depth);
|
||||||
t.tex(u3, vTop); t.vertex(-halfW, 0.0f, depth);
|
t.tex(u1, vTop); t.vertex(-halfW, 0.0f, depth);
|
||||||
t.tex(u3, vBottom); t.vertex(-halfW, height, depth);
|
t.tex(u1, vBottom); t.vertex(-halfW, height, depth);
|
||||||
t.tex(u2, vBottom); t.vertex(halfW, height, depth);
|
t.tex(u0, vBottom); t.vertex(halfW, height, depth);
|
||||||
|
|
||||||
// Left
|
// Left
|
||||||
t.tex(uL0, vTop); t.vertex(-halfW, 0.0f, depth);
|
t.tex(uL0, vTop); t.vertex(-halfW, 0.0f, depth);
|
||||||
|
|||||||
Reference in New Issue
Block a user