tmj merge

EU07.cpp

@@ -20,7 +20,10 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others
 #include <png.h>
 #include <thread>
 
+#include "World.h"
+#include "simulation.h"
 #include "Globals.h"
+#include "Timer.h"
 #include "Logs.h"
 #include "keyboardinput.h"
 #include "mouseinput.h"
@@ -332,16 +335,6 @@ int main(int argc, char *argv[])
     BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc );
     // switch off the topmost flag
     ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE );
-
-    const HANDLE icon = ::LoadImage(
-        ::GetModuleHandle( 0 ),
-        MAKEINTRESOURCE( IDI_ICON1 ),
-        IMAGE_ICON,
-        ::GetSystemMetrics( SM_CXSMICON ),
-        ::GetSystemMetrics( SM_CYSMICON ),
-        0 );
-    if( icon )
-        ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>( icon ) );
 #endif
 
 	try {
@@ -419,9 +412,11 @@ int main(int argc, char *argv[])
 
 #ifdef _WIN32
     Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej)
-	delete pConsole;
+	SafeDelete( pConsole );
 #endif
 
+    SafeDelete( simulation::Region );
+
 	glfwDestroyWindow(window);
 	glfwTerminate();