X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_render.pas;h=2eec521475ec4c7806fa08c8d63a59538c1da293;hb=c49ad9c9183b5120afb2d64af2584febe6a1c856;hp=b26d0ecbea851752387b952675dc49f0e074789a;hpb=b07cc041c0c2cbb70ddddaddf81e3b03533d3ac8;p=d2df-sdl.git

diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas
index b26d0ec..2eec521 100644
--- a/src/game/opengl/r_render.pas
+++ b/src/game/opengl/r_render.pas
@@ -20,11 +20,14 @@ interface
   procedure r_Render_Initialize;
   procedure r_Render_Finalize;
 
-  procedure r_Render_Resize (w, h: Integer);
-
   procedure r_Render_Load;
   procedure r_Render_Free;
 
+  procedure r_Render_LoadTextures;
+  procedure r_Render_FreeTextures;
+
+  procedure r_Render_Resize (w, h: Integer);
+
   procedure r_Render_Update;
 
   procedure r_Render_Apply;
@@ -36,8 +39,8 @@ implementation
     SysUtils, Classes, Math,
     e_log, g_system,
     g_game, g_options, g_console,
-    r_window, r_graphics, r_console, r_playermodel,
-    r_weapons, r_items, r_gfx, r_monsters
+    r_window, r_graphics, r_console, r_playermodel, r_textures, r_animations,
+    r_weapons, r_items, r_gfx, r_monsters, r_map, r_player, r_game
   ;
 
   var
@@ -76,8 +79,23 @@ implementation
     end
   end;
 
+  procedure r_Render_LoadTextures;
+  begin
+    r_Game_LoadTextures;
+    r_Map_LoadTextures;
+  end;
+
+  procedure r_Render_FreeTextures;
+  begin
+    r_Map_FreeTextures;
+    r_Game_FreeTextures;
+  end;
+
   procedure r_Render_Load;
   begin
+    r_Game_Load; // load first!
+    r_Player_Load;
+    r_Map_Load;
     r_PlayerModel_Load;
     r_Monsters_Load;
     r_Weapon_Load;
@@ -92,6 +110,11 @@ implementation
     r_Weapon_Free;
     r_Monsters_Free;
     r_PlayerModel_Free;
+    r_Map_Free;
+    r_Player_Free;
+    r_Game_Free;
+    g_Texture_DeleteAll;
+    g_Frames_DeleteAll;
   end;
 
   procedure r_Render_Initialize;
@@ -102,10 +125,12 @@ implementation
     r_Window_Initialize;
     r_Console_Init;
     r_PlayerModel_Initialize;
+    r_Map_Initialize;
   end;
 
   procedure r_Render_Finalize;
   begin
+    r_Map_Finalize;
     r_PlayerModel_Finalize;
     FreeGL;
     e_ReleaseEngine
@@ -113,6 +138,7 @@ implementation
 
   procedure r_Render_Update;
   begin
+    r_Map_Update;
     r_PlayerModel_Update;
   end;