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/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp | |
index b0cfa38..c6fe226 100644 | |
--- a/src/guiFormSpecMenu.cpp | |
+++ b/src/guiFormSpecMenu.cpp | |
@@ -1149,9 +1149,8 @@ void GUIFormSpecMenu::parseTabHeader(parserData* data,std::string element) { | |
e->setNotClipped(true); | |
for (unsigned int i=0; i< buttons.size(); i++) { | |
- wchar_t* wbutton = 0; | |
- |
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/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp | |
index 6417d1e..832069f 100644 | |
--- a/src/script/lua_api/l_mainmenu.cpp | |
+++ b/src/script/lua_api/l_mainmenu.cpp | |
@@ -980,8 +980,15 @@ int ModApiMainMenu::l_download_file(lua_State *L) | |
int ModApiMainMenu::l_gettext(lua_State *L) | |
{ | |
const char* str = luaL_checkstring(L, 1); | |
- str = gettext(str); | |
- lua_pushstring(L, str); |
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 650b5e2..3a4a724 100644 | |
--- a/src/game.cpp | |
+++ b/src/game.cpp | |
@@ -902,6 +902,198 @@ bool nodePlacementPrediction(Client &client, | |
return false; | |
} | |
+void drawAll(IrrlichtDevice *device, scene::ISceneManager* smgr, | |
+ video::IVideoDriver* driver, video::SColor skycolor, |
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/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp | |
index 02b114f..b162e8e 100644 | |
--- a/src/guiFormSpecMenu.cpp | |
+++ b/src/guiFormSpecMenu.cpp | |
@@ -1069,7 +1069,7 @@ void GUIFormSpecMenu::parseVertLabel(parserData* data,std::string element) { | |
if (parts.size() == 2) { | |
std::vector<std::string> v_pos = split(parts[0],','); | |
- std::string text = parts[1]; | |
+ std::wstring text = narrow_to_wide(unescape_string(parts[1])); |
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
local vm = get_vmanip(minp, maxp) | |
local data = vm:get_data() | |
local old_data = copy(data) | |
for i in data do | |
i = "air" | |
end | |
vm:set_data(data) |
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
local SERVER_RULES_FORMSPEC = "size[5,5;]".. | |
"label[1,1;Test text]" | |
minetest.reigster_on_joinplayer(function(player) | |
minetest.after(3, function(player) | |
minetest.show_formspec(player:get_player_name(), "server_rules", SERVER_RULES_FORMSPEC) | |
end, player) | |
end) |
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
minetest.register_on_craft(func(itemstack, player, old_craft_grid, craft_inv)) | |
^ Called when player crafts something | |
^ itemstack is the output | |
^ old_craft_grid contains the recipe (Note: the one in the inventory is cleared) | |
^ craft_inv is the inventory with the crafting grid | |
^ Return either an ItemStack, to replace the output, or nil, to not modify it |
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/mods/default/player.lua b/mods/default/player.lua | |
index bf08149..298583a 100644 | |
--- a/mods/default/player.lua | |
+++ b/mods/default/player.lua | |
@@ -34,6 +34,23 @@ function player_get_animations(model) | |
walk_mine_END = 219 | |
} | |
end | |
+ | |
+ minetest.log("error", "player_get_animations(): unknown model name: "..model) |
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
if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light") | |
and nodedef.liquidtype == "none" | |
and (minetest.get_node_light(above) >= 13 or 0) then | |
if name == "default:snow" or name == "default:snowblock" then | |
minetest.set_node(pos, {name = "default:dirt_with_snow"}) | |
else | |
minetest.set_node(pos, {name = "default:dirt_with_grass"}) | |
end | |
end |
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/mods/default/player.lua b/mods/default/player.lua | |
index 102afa2..071eff4 100644 | |
--- a/mods/default/player.lua | |
+++ b/mods/default/player.lua | |
@@ -111,7 +111,7 @@ function default.player_set_model(player, model_name) | |
default.player_set_animation(player, "stand") | |
else | |
player:set_properties({ | |
- textures = { "player_front.png", "player_back.png", }, | |
+ textures = { "player.png", "player_back.png", }, |