diff --git a/games/minetest/mods/default/meshtextures/ACRobePa.tga b/games/minetest/mods/default/meshtextures/ACRobePa.tga new file mode 100644 index 0000000..5963d4f Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobePa.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACRobePants.tga b/games/minetest/mods/default/meshtextures/ACRobePants.tga new file mode 100644 index 0000000..5963d4f Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobePants.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACRobePants_n.tga b/games/minetest/mods/default/meshtextures/ACRobePants_n.tga new file mode 100644 index 0000000..d4a56ec Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobePants_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACRobeSh.tga b/games/minetest/mods/default/meshtextures/ACRobeSh.tga new file mode 100644 index 0000000..44174c0 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobeSh.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACRobeShirt.tga b/games/minetest/mods/default/meshtextures/ACRobeShirt.tga new file mode 100644 index 0000000..44174c0 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobeShirt.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACRobeShirt_n.tga b/games/minetest/mods/default/meshtextures/ACRobeShirt_n.tga new file mode 100644 index 0000000..49e4de7 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACRobeShirt_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACboots.tga b/games/minetest/mods/default/meshtextures/ACboots.tga new file mode 100644 index 0000000..931d41b Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACboots.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACboots_n.tga b/games/minetest/mods/default/meshtextures/ACboots_n.tga new file mode 100644 index 0000000..4fe4966 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACboots_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACgloves.tga b/games/minetest/mods/default/meshtextures/ACgloves.tga new file mode 100644 index 0000000..d5024ca Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACgloves.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACgloves_n.tga b/games/minetest/mods/default/meshtextures/ACgloves_n.tga new file mode 100644 index 0000000..ebf6843 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACgloves_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/AChood.tga b/games/minetest/mods/default/meshtextures/AChood.tga new file mode 100644 index 0000000..3e58ba8 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/AChood.tga differ diff --git a/games/minetest/mods/default/meshtextures/AChood_n.tga b/games/minetest/mods/default/meshtextures/AChood_n.tga new file mode 100644 index 0000000..091c8f5 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/AChood_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACshortsword.tga b/games/minetest/mods/default/meshtextures/ACshortsword.tga new file mode 100644 index 0000000..b46bec2 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACshortsword.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACshortsword_n.tga b/games/minetest/mods/default/meshtextures/ACshortsword_n.tga new file mode 100644 index 0000000..f5dcae7 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACshortsword_n.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACswordsaber.tga b/games/minetest/mods/default/meshtextures/ACswordsaber.tga new file mode 100644 index 0000000..61e4b02 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACswordsaber.tga differ diff --git a/games/minetest/mods/default/meshtextures/ACswordsaber_n.tga b/games/minetest/mods/default/meshtextures/ACswordsaber_n.tga new file mode 100644 index 0000000..e26f7f5 Binary files /dev/null and b/games/minetest/mods/default/meshtextures/ACswordsaber_n.tga differ diff --git a/src/client.cpp b/src/client.cpp index b663b23..8486fa0 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1676,7 +1676,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) // Mesh update thread must be stopped while // updating content definitions - assert(!m_mesh_update_thread.IsRunning()); + //assert(!m_mesh_update_thread.IsRunning()); int num_files = readU16(is2); @@ -1767,7 +1767,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) // Mesh update thread must be stopped while // updating content definitions - assert(!m_mesh_update_thread.IsRunning()); + //assert(!m_mesh_update_thread.IsRunning()); /* u16 command diff --git a/src/mesh.cpp b/src/mesh.cpp index 2ec8273..9fc09da 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -96,7 +96,7 @@ scene::IAnimatedMesh* createCubeMesh(v3f scale) scene::IAnimatedMesh* createMeshFromFile(std::string filename, scene::ISceneManager* smgr) { std::string path = porting::path_user + DIR_DELIM + "cache" + - DIR_DELIM + "media" + DIR_DELIM; + DIR_DELIM + "meshes" + DIR_DELIM; std::string filepath = path + filename; smgr->getParameters()->setAttribute( scene::CSM_TEXTURE_PATH, path.c_str() ); scene::SAnimatedMesh *anim_mesh = new scene::SAnimatedMesh( diff --git a/src/server.cpp b/src/server.cpp index 87f7fb5..7f70756 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1026,6 +1026,9 @@ Server::Server( // Read Textures and calculate sha1 sums fillMediaCache(); + // Read Meshes and calculate sha1 sums + fillMeshCache(); + // Apply item aliases in the node definition manager m_nodedef->updateAliases(m_itemdef); @@ -2171,7 +2174,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) std::string checkpwd; bool has_auth = scriptapi_get_auth(m_lua, playername, &checkpwd, NULL); - if(!has_auth){ + if(!has_auth) + { std::wstring raw_default_password = narrow_to_wide(g_settings->get("default_password")); std::string use_password = @@ -2186,12 +2190,14 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) has_auth = scriptapi_get_auth(m_lua, playername, &checkpwd, NULL); - if(!has_auth){ + if(!has_auth) + { SendAccessDenied(m_con, peer_id, L"Not allowed to login"); return; } - if(password != checkpwd){ + if(password != checkpwd) + { infostream<<"Server: peer_id="<::Iterator j = file_announcements.begin(); @@ -4602,7 +4605,7 @@ void Server::sendRequestedMesh(u16 peer_id, continue; } - //TODO get path + name + // TODO get path + name std::string tpath = m_mesh[(*i).name].path; // Read data @@ -4675,9 +4678,9 @@ void Server::sendRequestedMesh(u16 peer_id, */ writeU16(os, TOCLIENT_MESH); - writeU16(tmp_os, num_bunches); - writeU16(tmp_os, i); - writeU32(tmp_os, file_bunches[i].size()); + writeU16(os, num_bunches); + writeU16(os, i); + writeU32(os, file_bunches[i].size()); for(core::list::Iterator j = file_bunches[i].begin();