cleanup

nem0 · May 24, 2017 · d37d1b5 · d37d1b5
1 parent afd805d
commit d37d1b5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/src/engine/resource_manager_base.cpp b/src/engine/resource_manager_base.cpp
@@ -131,8 +131,7 @@ namespace Lumix
 	}
 
 	ResourceManagerBase::ResourceManagerBase(IAllocator& allocator)
-		: m_size(0)
-		, m_resources(allocator)
+		: m_resources(allocator)
 		, m_allocator(allocator)
 		, m_owner(nullptr)
 		, m_is_unload_enabled(true)

diff --git a/src/engine/resource_manager_base.h b/src/engine/resource_manager_base.h
@@ -54,7 +54,6 @@ class LUMIX_ENGINE_API ResourceManagerBase
 
 private:
 	IAllocator& m_allocator;
-	u32 m_size;
 	ResourceTable m_resources;
 	ResourceManager* m_owner;
 	bool m_is_unload_enabled;

diff --git a/src/engine/universe/universe.h b/src/engine/universe/universe.h
@@ -8,6 +8,7 @@
 #include "engine/matrix.h"
 #include "engine/quat.h"
 #include "engine/string.h"
+#include "engine/iplugin.h"
 
 
 namespace Lumix

diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp
@@ -536,24 +536,6 @@ struct RendererImpl LUMIX_FINAL : public Renderer
 			uint32_t size,
 			bool yflip) override
 		{
-			#pragma pack(1)
-				struct TGAHeader
-				{
-					char idLength;
-					char colourMapType;
-					char dataType;
-					short int colourMapOrigin;
-					short int colourMapLength;
-					char colourMapDepth;
-					short int xOrigin;
-					short int yOrigin;
-					short int width;
-					short int height;
-					char bitsPerPixel;
-					char imageDescriptor;
-				};
-			#pragma pack()
-
 			TGAHeader header;
 			setMemory(&header, 0, sizeof(header));
 			int bytes_per_pixel = 4;