Some random code cleanups

Author: sfan5

CMakeLists.txt

@@ -100,7 +100,6 @@ endif()
 
 
 if(TRUE)
-	message(STATUS "Using imported IrrlichtMt at subdirectory 'irr'")
 	if(BUILD_CLIENT)
 		add_subdirectory(irr EXCLUDE_FROM_ALL)
 

irr/include/EGUIElementTypes.h

@@ -55,6 +55,9 @@ enum EGUI_ELEMENT_TYPE
 	//! A tool bar (IGUIToolBar)
 	EGUIET_TOOL_BAR,
 
+	// (static_text.cpp in Luanti source)
+	EGUIET_ENRICHED_STATIC_TEXT,
+
 	//! Unknown type.
 	EGUIET_ELEMENT,
 

src/client/camera.h

@@ -10,7 +10,7 @@
 #include "util/numeric.h"
 #include <plane3d.h>
 #include <array>
-#include <list>
+#include <vector>
 #include <optional>
 
 class LocalPlayer;
@@ -255,7 +255,7 @@ class Camera
 	f32 m_cache_view_bobbing_amount;
 	bool m_arm_inertia;
 
-	std::list<Nametag *> m_nametags;
+	std::vector<Nametag*> m_nametags;
 	bool m_show_nametag_backgrounds;
 
 	// Last known light color of the player

src/client/mesh_generator_thread.h

@@ -16,7 +16,7 @@
 class Map;
 class MapBlock;
 class MapBlockMesh;
-class MeshMakeData;
+struct MeshMakeData;
 class Client;
 
 struct QueuedMeshUpdate

src/client/minimap.cpp

@@ -534,10 +534,10 @@ v3f Minimap::getYawVec()
 		return v3f(
 			std::cos(m_angle * core::DEGTORAD),
 			std::sin(m_angle * core::DEGTORAD),
-			1.0);
+			1.0f);
 	}
 
-	return v3f(1.0, 0.0, 1.0);
+	return v3f(1.0f, 0.0, 1.0f);
 }
 
 irr_ptr<scene::SMeshBuffer> Minimap::createMinimapMeshBuffer()
@@ -651,18 +651,16 @@ void Minimap::drawMinimap(core::rect<s32> rect)
 	static const video::SColor c[4] = {col, col, col, col};
 	f32 sin_angle = std::sin(m_angle * core::DEGTORAD);
 	f32 cos_angle = std::cos(m_angle * core::DEGTORAD);
-	s32 marker_size2 =  0.025 * (float)rect.getWidth();;
-	for (auto i = m_active_markers.begin();
-			i != m_active_markers.end(); ++i) {
-		v2f posf = *i;
+	s32 marker_size2 = 0.025f * (float)rect.getWidth();
+	for (v2f posf : m_active_markers) {
 		if (data->minimap_shape_round) {
 			f32 t1 = posf.X * cos_angle - posf.Y * sin_angle;
 			f32 t2 = posf.X * sin_angle + posf.Y * cos_angle;
 			posf.X = t1;
 			posf.Y = t2;
 		}
-		posf.X = (posf.X + 0.5) * (float)rect.getWidth();
-		posf.Y = (posf.Y + 0.5) * (float)rect.getHeight();
+		posf.X = (posf.X + 0.5f) * (float)rect.getWidth();
+		posf.Y = (posf.Y + 0.5f) * (float)rect.getHeight();
 		core::rect<s32> dest_rect(
 			s_pos.X + posf.X - marker_size2,
 			s_pos.Y + posf.Y - marker_size2,
@@ -683,8 +681,14 @@ MinimapMarker *Minimap::addMarker(scene::ISceneNode *parent_node)
 
 void Minimap::removeMarker(MinimapMarker **m)
 {
-	m_markers.remove_if([ptr = *m](const auto &up) { return up.get() == ptr; });
+	MinimapMarker *ptr = *m;
 	*m = nullptr;
+
+	auto it = std::find_if(m_markers.begin(), m_markers.end(), [&] (const auto &it) {
+		return it.get() == ptr;
+	});
+	assert(it != m_markers.end());
+	m_markers.erase(it);
 }
 
 void Minimap::updateActiveMarkers()

src/client/minimap.h

@@ -53,10 +53,11 @@ struct MinimapModeDef {
 struct MinimapMarker {
 	MinimapMarker(scene::ISceneNode *parent_node):
 		parent_node(parent_node)
-	{
-	}
+	{}
+
 	scene::ISceneNode *parent_node;
 };
+
 struct MinimapPixel {
 	//! The topmost node that the minimap displays.
 	MapNode n;
@@ -158,21 +159,22 @@ class Minimap {
 	void updateActiveMarkers();
 	void drawMinimap(core::rect<s32> rect);
 
-	video::IVideoDriver *driver;
-	Client* client;
+	video::IVideoDriver *driver = nullptr;
+	Client *client = nullptr;
 	std::unique_ptr<MinimapData> data;
 
 private:
-	ITextureSource *m_tsrc;
-	IShaderSource *m_shdrsrc;
-	const NodeDefManager *m_ndef;
+	ITextureSource *m_tsrc = nullptr;
+	IShaderSource *m_shdrsrc = nullptr;
+	const NodeDefManager *m_ndef = nullptr;
 	std::unique_ptr<MinimapUpdateThread> m_minimap_update_thread;
 	irr_ptr<scene::SMeshBuffer> m_meshbuffer;
 	std::vector<MinimapModeDef> m_modes;
 	size_t m_current_mode_index;
 	u16 m_surface_mode_scan_height;
 	f32 m_angle;
+
 	std::mutex m_mutex;
-	std::list<std::unique_ptr<MinimapMarker>> m_markers;
-	std::list<v2f> m_active_markers;
+	std::vector<std::unique_ptr<MinimapMarker>> m_markers;
+	std::vector<v2f> m_active_markers;
 };

src/gui/guiEditBoxWithScrollbar.cpp

@@ -43,8 +43,6 @@ void GUIEditBoxWithScrollBar::draw()
 	if (!skin)
 		return;
 
-	video::SColor default_bg_color;
-
 	if (m_bg_color_used) {
 		OverrideBgColor = m_bg_color;
 	} else if (IsWritable) {

src/gui/guiScrollBar.h

@@ -21,7 +21,7 @@ class ISimpleTextureSource;
 
 using namespace gui;
 
-class GUIScrollBar : public IGUIScrollBar
+class GUIScrollBar final : public IGUIScrollBar
 {
 public:
 	GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s32 id,

src/irrlicht_changes/CGUITTFont.h

@@ -242,7 +242,7 @@ namespace gui
 	};
 
 	//! Class representing a TrueType font.
-	class CGUITTFont : public IGUIFont
+	class CGUITTFont final : public IGUIFont
 	{
 		public:
 			//! Creates a new TrueType font and returns a pointer to it.  The pointer must be drop()'ed when finished.

src/irrlicht_changes/static_text.h

@@ -16,10 +16,7 @@
 
 namespace gui
 {
-
-	const EGUI_ELEMENT_TYPE EGUIET_ENRICHED_STATIC_TEXT = (EGUI_ELEMENT_TYPE)(0x1000);
-
-	class StaticText : public IGUIStaticText
+	class StaticText final : public IGUIStaticText
 	{
 	public:
 
@@ -155,10 +152,6 @@ namespace gui
 			return (t == EGUIET_ENRICHED_STATIC_TEXT) || (t == EGUIET_STATIC_TEXT);
 		};
 
-		virtual bool hasType(EGUI_ELEMENT_TYPE t) {
-			return (t == EGUIET_ENRICHED_STATIC_TEXT) || (t == EGUIET_STATIC_TEXT);
-		};
-
 		void setText(const EnrichedString &text);
 
 	private: