This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp | |
index 4674b2b..40afc7d 100644 | |
--- a/src/defaultsettings.cpp | |
+++ b/src/defaultsettings.cpp | |
@@ -58,7 +58,7 @@ void set_default_settings(Settings *settings) | |
#if DEBUG | |
"KEY_F4"); | |
#else | |
- "none"); | |
+ ""); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In thread 7f935e4487c0: | |
/home/kahrl/minetest/src/keycode.cpp:289: KeyPress::KeyPress(const char*): A fatal error occurred: Unexpected multibyte character | |
Debug stacks: | |
DEBUG STACK FOR THREAD 7f935e4487c0: | |
#0 int main(int, char**) | |
Aborted |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/client.cpp b/src/client.cpp | |
index 66aac62..3a4dd9d 100644 | |
--- a/src/client.cpp | |
+++ b/src/client.cpp | |
@@ -751,6 +751,11 @@ void Client::deletingPeer(con::Peer *peer, bool timeout) | |
infostream<<"Client::deletingPeer(): " | |
"Server Peer is getting deleted " | |
<<"(timeout="<<timeout<<")"<<std::endl; | |
+ | |
+ if (timeout) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp | |
index 036b25a..b54f278 100644 | |
--- a/src/wieldmesh.cpp | |
+++ b/src/wieldmesh.cpp | |
@@ -282,6 +282,8 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename, | |
// Customize material | |
video::SMaterial &material = m_meshnode->getMaterial(0); | |
material.setTexture(0, tsrc->getTextureForMesh(imagename)); | |
+ material.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; | |
+ material.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/game.cpp b/src/game.cpp | |
index 41bfa5e..d5819f7 100644 | |
--- a/src/game.cpp | |
+++ b/src/game.cpp | |
@@ -4352,9 +4352,13 @@ void the_game(bool *kill, | |
} | |
} catch (SerializationError &e) { | |
- error_message = std::string("A serialization error occurred:\n") | |
- + e.what() + "\n\nThe server is probably " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2015-07-08 01:26:34: ERROR[main]: MAINMENU ERROR: ...us/minetest/bin/../builtin/mainmenu/tab_singleplayer.lua:45: bad argument #1 to 'min' (number expected, got nil) | |
2015-07-08 01:26:34: ERROR[main]: stack traceback: | |
2015-07-08 01:26:34: ERROR[main]: [C]: in function 'min' | |
2015-07-08 01:26:34: ERROR[main]: ...us/minetest/bin/../builtin/mainmenu/tab_singleplayer.lua:45: in function 'handle_buttons' | |
2015-07-08 01:26:34: ERROR[main]: /home/kahrl/minetest/bin/../builtin/fstk/ui.lua:140: in function 'handle_buttons' | |
2015-07-08 01:26:34: ERROR[main]: /home/kahrl/minetest/bin/../builtin/fstk/ui.lua:177: in function </home/kahrl/minetest/bin/../builtin/fstk/ui.lua:170> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. User types stuff into chat formspec. At this point it is stored as a core::stringw inside irrlicht. | |
2. User submits the form. guiFormSpecMenu.cpp converts the text to utf8 for submitting it as a formspec field. | |
3. Since this is the chat formspec, code in game.cpp intercepts the formspec submission. | |
4. game.cpp:186 calls narrow_to_wide on the string. | |
Result: a utf8 string is interpreted as a narrow string for conversion to wide string. | |
--> on Linux: no effect because narrow == utf8 | |
--> on Windows: BOOM, narrow means CP_ACP, not CP_UTF8. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <stdio.h> | |
#include <stdlib.h> | |
#include <string.h> | |
static char *pattern; | |
static size_t n; | |
static size_t *statesmem, *states, *nextstates; | |
void compileglob(const char *pattern0) | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp | |
index c937cae..9420c4b 100644 | |
--- a/src/database-sqlite3.cpp | |
+++ b/src/database-sqlite3.cpp | |
@@ -65,7 +65,9 @@ Database_SQLite3::Database_SQLite3(const std::string &savedir) : | |
m_stmt_read(NULL), | |
m_stmt_write(NULL), | |
m_stmt_list(NULL), | |
- m_stmt_delete(NULL) | |
+ m_stmt_delete(NULL), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/wieldmesh.cpp b/src/wieldmesh.cpp | |
index 7c16bdd..5351e47 100644 | |
--- a/src/wieldmesh.cpp | |
+++ b/src/wieldmesh.cpp | |
@@ -44,7 +44,7 @@ static scene::IMesh* createExtrusionMesh(int resolution_x, int resolution_y) | |
scene::IMeshBuffer *buf = new scene::SMeshBuffer(); | |
video::SColor c(255,255,255,255); | |
- v3f scale(1.0, 1.0, 0.1); | |
+ v3f scale(1.0, 1.0, 0.125); |