diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp index 1dcb5cc..1ae58c5 100755 --- a/src/client/Minecraft.cpp +++ b/src/client/Minecraft.cpp @@ -73,6 +73,8 @@ #include "../util/Mth.h" #include "../network/packet/InteractPacket.h" #include "../network/packet/RespawnPacket.h" +#include "../network/packet/AdventureSettingsPacket.h" +#include "../network/packet/SetSpawnPositionPacket.h" #include "IConfigListener.h" #include "../world/entity/MobCategory.h" #include "../world/Difficulty.h" diff --git a/src/client/Options.h b/src/client/Options.h index 3cf2a52..6401471 100755 --- a/src/client/Options.h +++ b/src/client/Options.h @@ -97,6 +97,8 @@ public: Options(Minecraft* minecraft, const std::string& workingDirectory = "") : minecraft(minecraft) { + // elements werent initialized so i was getting a garbage pointer and a crash + m_options.fill(nullptr); initTable(); load(); } diff --git a/src/client/player/input/touchscreen/TouchscreenInput.cpp b/src/client/player/input/touchscreen/TouchscreenInput.cpp index ce08b8d..d997f76 100755 --- a/src/client/player/input/touchscreen/TouchscreenInput.cpp +++ b/src/client/player/input/touchscreen/TouchscreenInput.cpp @@ -170,22 +170,31 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) { //rebuild(); } -void TouchscreenInput_TestFps::setKey( int key, bool state ) +void TouchscreenInput_TestFps::setKey(int key, bool state) { #ifdef WIN32 - //LOGI("key: %d, %d\n", key, state); + //LOGI("key: %d, %d\n", key, state); int id = -1; - if (key == _options->keyUp.key) id = KEY_UP; - if (key == _options->keyDown.key) id = KEY_DOWN; - if (key == _options->keyLeft.key) id = KEY_LEFT; - if (key == _options->keyRight.key) id = KEY_RIGHT; - if (key == _options->keyJump.key) id = KEY_JUMP; - if (key == _options->keySneak.key) id = KEY_SNEAK; - if (key == _options->keyCraft.key) id = KEY_CRAFT; - if (id >= 0) { - _keys[id] = state; - } + // theres no keyUp etc??? + //if (key == _options->keyUp.key) id = KEY_UP; + //if (key == _options->keyDown.key) id = KEY_DOWN; + //if (key == _options->keyLeft.key) id = KEY_LEFT; + //if (key == _options->keyRight.key) id = KEY_RIGHT; + //if (key == _options->keyJump.key) id = KEY_JUMP; + //if (key == _options->keySneak.key) id = KEY_SNEAK; + //if (key == _options->keyCraft.key) id = KEY_CRAFT; + //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 } diff --git a/src/client/renderer/entity/HumanoidMobRenderer.cpp b/src/client/renderer/entity/HumanoidMobRenderer.cpp index b6f68f0..0922767 100755 --- a/src/client/renderer/entity/HumanoidMobRenderer.cpp +++ b/src/client/renderer/entity/HumanoidMobRenderer.cpp @@ -167,16 +167,16 @@ void HumanoidMobRenderer::additionalRendering(Mob* mob, float a) { const float depth = 1.0f; // Front - t.tex(u0, vTop); t.vertex(-halfW, 0.0f, 0.0f); - t.tex(u1, vTop); t.vertex(halfW, 0.0f, 0.0f); - t.tex(u1, vBottom); t.vertex(halfW, height, 0.0f); - t.tex(u0, vBottom); t.vertex(-halfW, height, 0.0f); + t.tex(u2, vTop); t.vertex(-halfW, 0.0f, 0.0f); + t.tex(u3, vTop); t.vertex(halfW, 0.0f, 0.0f); + t.tex(u3, vBottom); t.vertex(halfW, height, 0.0f); + t.tex(u2, vBottom); t.vertex(-halfW, height, 0.0f); - // Back - t.tex(u2, vTop); t.vertex(halfW, 0.0f, depth); - t.tex(u3, vTop); t.vertex(-halfW, 0.0f, depth); - t.tex(u3, vBottom); t.vertex(-halfW, height, depth); - t.tex(u2, vBottom); t.vertex(halfW, height, depth); + // Back + t.tex(u0, vTop); t.vertex(halfW, 0.0f, depth); + t.tex(u1, vTop); t.vertex(-halfW, 0.0f, depth); + t.tex(u1, vBottom); t.vertex(-halfW, height, depth); + t.tex(u0, vBottom); t.vertex(halfW, height, depth); // Left t.tex(uL0, vTop); t.vertex(-halfW, 0.0f, depth);