minetest-stuffs
/
dragonfire-engine-teran
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of https://github.com/minetest/minetest

master
Elias Fleckenstein 2022-05-18 16:00:53 +02:00
parent ccd4c504d5 273bfee9a1
commit 8d19b99c5b
No known key found for this signature in database
GPG Key ID: 06927A5199D6C9B2
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
misc/net.minetest.minetest.appdata.xml
View File

@ -68,12 +68,14 @@
<keyword>mining</keyword>
<keyword>multiplayer</keyword>
</keywords>
<url type="homepage">http://minetest.net</url>
<url type="bugtracker">http://www.minetest.net/development/#reporting-issues</url>
<url type="translate">http://dev.minetest.net/Translation</url>
<url type="donation">http://www.minetest.net/development/#donate</url>
<url type="faq">http://wiki.minetest.net/FAQ</url>
<url type="help">http://wiki.minetest.net</url>
<url type="homepage">https://www.minetest.net</url>
<url type="bugtracker">https://www.minetest.net/development/#reporting-issues</url>
<url type="translate">https://dev.minetest.net/Translation</url>
<url type="donation">https://www.minetest.net/development/#donate</url>
<url type="faq">https://wiki.minetest.net/FAQ</url>
<url type="help">https://wiki.minetest.net</url>
<url type="vcs-browser">https://github.com/minetest/minetest</url>
<url type="contribute">https://www.minetest.net/get-involved/</url>
<provides>
<binary>minetest</binary>
</provides>

1
src/client/mesh.cpp
View File

@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mesh.h"
#include "debug.h"
#include "log.h"
#include "irrMap.h"
#include <cmath>
#include <iostream>
#include <IAnimatedMesh.h>

2
src/gui/guiKeyChangeMenu.cpp
View File

@ -146,7 +146,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 600 * s, 40 * s);
rect += topleft + v2s32(25 * s, 3 * s);
//gui::IGUIStaticText *t =
const wchar_t *text = wgettext("Keybindings. (If this menu screws up, remove stuff from minetest.conf)");
const wchar_t *text = wgettext("Keybindings.");
Environment->addStaticText(text,
rect, false, true, this, -1);
delete[] text;

42
src/irrlicht_changes/CGUITTFont.cpp
View File

@ -59,7 +59,7 @@ struct SGUITTFace : public virtual irr::IReferenceCounted
// Static variables.
FT_Library CGUITTFont::c_library;
core::map<io::path, SGUITTFace*> CGUITTFont::c_faces;
std::map<io::path, SGUITTFace*> CGUITTFont::c_faces;
bool CGUITTFont::c_libraryLoaded = false;
scene::IMesh* CGUITTFont::shared_plane_ptr_ = 0;
scene::SMesh CGUITTFont::shared_plane_;
@ -320,11 +320,11 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
// Grab the face.
SGUITTFace* face = 0;
core::map<io::path, SGUITTFace*>::Node* node = c_faces.find(filename);
if (node == 0)
auto node = c_faces.find(filename);
if (node == c_faces.end())
{
face = new SGUITTFace();
c_faces.set(filename, face);
c_faces.emplace(filename, face);
if (filesystem)
{
@ -334,7 +334,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{
if (logger) logger->log(L"CGUITTFont", L"Failed to open the file.", irr::ELL_INFORMATION);
c_faces.remove(filename);
c_faces.erase(filename);
delete face;
face = 0;
return false;
@ -349,7 +349,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{
if (logger) logger->log(L"CGUITTFont", L"FT_New_Memory_Face failed.", irr::ELL_INFORMATION);
c_faces.remove(filename);
c_faces.erase(filename);
delete face;
face = 0;
return false;
@ -362,7 +362,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{
if (logger) logger->log(L"CGUITTFont", L"FT_New_Face failed.", irr::ELL_INFORMATION);
c_faces.remove(filename);
c_faces.erase(filename);
delete face;
face = 0;
return false;
@ -372,7 +372,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
else
{
// Using another instance of this face.
face = node->getValue();
face = node->second;
face->grab();
}
@ -415,17 +415,17 @@ CGUITTFont::~CGUITTFont()
//Glyphs.clear();
// We aren't using this face anymore.
core::map<io::path, SGUITTFace*>::Node* n = c_faces.find(filename);
if (n)
auto n = c_faces.find(filename);
if (n != c_faces.end())
{
SGUITTFace* f = n->getValue();
SGUITTFace* f = n->second;
// Drop our face. If this was the last face, the destructor will clean up.
if (f->drop())
c_faces.remove(filename);
c_faces.erase(filename);
// If there are no more faces referenced by FreeType, clean up.
if (c_faces.size() == 0)
if (c_faces.empty())
{
FT_Done_FreeType(c_library);
c_libraryLoaded = false;
@ -585,7 +585,7 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
core::ustring utext = text.getString();
// Set up our render map.
core::map<u32, CGUITTGlyphPage*> Render_Map;
std::map<u32, CGUITTGlyphPage*> Render_Map;
// Start parsing characters.
u32 n;
@ -640,7 +640,7 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
page->render_colors.push_back(colors[iter.getPos()]);
else
page->render_colors.push_back(video::SColor(255,255,255,255));
Render_Map.set(glyph.glyph_page, page);
Render_Map[glyph.glyph_page] = page;
}
if (n > 0)
{
@ -673,14 +673,12 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
// Draw now.
update_glyph_pages();
core::map<u32, CGUITTGlyphPage*>::Iterator j = Render_Map.getIterator();
while (!j.atEnd())
auto it = Render_Map.begin();
auto ie = Render_Map.end();
while (it != ie)
{
core::map<u32, CGUITTGlyphPage*>::Node* n = j.getNode();
j++;
if (n == 0) continue;
CGUITTGlyphPage* page = n->getValue();
CGUITTGlyphPage* page = it->second;
++it;
if (shadow_offset) {
for (size_t i = 0; i < page->render_positions.size(); ++i)

3
src/irrlicht_changes/CGUITTFont.h
View File

@ -34,6 +34,7 @@
#include <irrlicht.h>
#include <ft2build.h>
#include <vector>
#include <map>
#include <irrUString.h>
#include "util/enriched_string.h"
#include FT_FREETYPE_H
@ -345,7 +346,7 @@ namespace gui
private:
// Manages the FreeType library.
static FT_Library c_library;
static core::map<io::path, SGUITTFace*> c_faces;
static std::map<io::path, SGUITTFace*> c_faces;
static bool c_libraryLoaded;
static scene::IMesh* shared_plane_ptr_;
static scene::SMesh shared_plane_;

6
src/unittest/test.cpp
View File

@ -535,7 +535,7 @@ struct TestMapBlock: public TestBase
parent.node.setContent(CONTENT_AIR);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN);
parent.node.setLight(LIGHTBANK_NIGHT, 0);
core::map<v3s16, bool> light_sources;
std::map<v3s16, bool> light_sources;
// The bottom block is invalid, because we have a shadowing node
UASSERT(b.propagateSunlight(light_sources) == false);
UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
@ -562,7 +562,7 @@ struct TestMapBlock: public TestBase
parent.position_valid = true;
b.setIsUnderground(true);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources;
std::map<v3s16, bool> light_sources;
// The block below should be valid because there shouldn't be
// sunlight in there either
UASSERT(b.propagateSunlight(light_sources, true) == true);
@ -603,7 +603,7 @@ struct TestMapBlock: public TestBase
}
// Lighting value for the valid nodes
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources;
std::map<v3s16, bool> light_sources;
// Bottom block is not valid
UASSERT(b.propagateSunlight(light_sources) == false);
}