X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_render.pas;h=90bda3b04a230a27abceb3ad4e651b518a5fad7e;hb=c7f0b67e60e7e48d12889ad331ee5d24d289a81e;hp=50e5892e9ee0366ce0f9359cafd67f66e4b408be;hpb=7a30bc0a59a9dd27264ca42946b517a9b03f4e35;p=d2df-sdl.git

diff --git a/src/game/opengl/r_render.pas b/src/game/opengl/r_render.pas
index 50e5892..90bda3b 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_map
+    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,22 @@ 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;
@@ -94,6 +111,10 @@ implementation
     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;
@@ -144,7 +165,8 @@ implementation
     gScreenWidth := w;
     gScreenHeight := h;
     e_ResizeWindow(w, h);
-    e_InitGL
+    e_InitGL;
+    r_Game_SetupScreenSize;
   end;
 
   procedure r_Render_Apply;