Merge branch 'master' of https://github.com/mc-server/MCServer

src/Generating/NetherFortGen.cpp

@@ -70,6 +70,40 @@ public:
 
 
 
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Performance test of the NetherFort generator:
+
+/*
+#include "OSSupport/Timer.h"
+static class cNetherFortPerfTest
+{
+public:
+	cNetherFortPerfTest(void)
+	{
+		cTimer Timer;
+		long long StartTime = Timer.GetNowTime();
+		
+		const int GridSize = 512;
+		const int MaxDepth = 12;
+		const int NumIterations = 100;
+		for (int i = 0; i < NumIterations; i++)
+		{
+			cNetherFortGen FortGen(i, GridSize, MaxDepth);
+			delete new cNetherFortGen::cNetherFort(FortGen, 0, 0, GridSize, MaxDepth, i);
+		}
+		
+		long long EndTime = Timer.GetNowTime();
+		printf("%d forts took %lld msec (%f sec) to generate\n", NumIterations, EndTime - StartTime, ((double)(EndTime - StartTime)) / 1000);
+		exit(0);
+	}
+	
+} g_PerfTest;
+//*/
+
+
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cNetherFortGen:
 

src/Generating/NetherFortGen.h

@@ -26,6 +26,7 @@ public:
 	virtual ~cNetherFortGen();
 	
 protected:
+	friend class cNetherFortPerfTest;  // fwd: NetherFortGen.cpp
 	class cNetherFort;  // fwd: NetherFortGen.cpp
 	typedef std::list<cNetherFort *> cNetherForts;