X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_game.pas;h=c3577ccace0f47fd5332ab7839612e7aa90bfacb;hb=17a3d3f944849de3be0b3fae36c935367648a179;hp=0d623dd29481b56f03311aef5873ef3b61b2474d;hpb=0a15e02146dcf1f0ebbd1d99d0f1350c4bc7d63b;p=d2df-sdl.git

diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas
index 0d623dd..c3577cc 100644
--- a/src/game/opengl/r_game.pas
+++ b/src/game/opengl/r_game.pas
@@ -18,8 +18,8 @@ unit r_game;
 interface
 
   procedure r_Game_Draw;
-  procedure DrawLoadingStat;
-  procedure DrawMenuBackground (tex: AnsiString);
+  procedure r_Game_DrawLoadingStat;
+  procedure r_Game_DrawMenuBackground (tex: AnsiString);
 
 implementation
 
@@ -32,7 +32,7 @@ implementation
     g_textures, e_input, e_sound,
     g_language, g_console, g_menu, g_triggers, g_player, g_options, g_monsters, g_map, g_panel, g_window,
     g_items, g_weapons, g_gfx, g_phys, g_net, g_gui, g_netmaster,
-    g_game, r_console, r_gfx, r_items, r_map
+    g_game, r_console, r_gfx, r_items, r_map, r_panel, r_monsters, r_weapons
   ;
 
   var
@@ -660,7 +660,7 @@ begin
     end;
 end;
 
-procedure DrawLoadingStat();
+procedure r_Game_DrawLoadingStat;
   procedure drawRect (x, y, w, h: Integer);
   begin
     if (w < 1) or (h < 1) then exit;
@@ -801,7 +801,7 @@ begin
   end;
 end;
 
-procedure DrawMenuBackground(tex: AnsiString);
+procedure r_Game_DrawMenuBackground (tex: AnsiString);
 var
   w, h: Word;
   ID: DWord;
@@ -1180,7 +1180,7 @@ var
       begin
         pan := TPanel(gDrawPanelList.front());
         if ((pan.tag and tagmask) = 0) then break;
-        if doDraw then pan.Draw(doAmbient, ambColor);
+        if doDraw then r_Panel_Draw(pan, doAmbient, ambColor);
         gDrawPanelList.popFront();
       end;
     end
@@ -1239,12 +1239,12 @@ begin
   drawPanelType('*back', PANEL_BACK, g_rlayer_back);
   drawPanelType('*step', PANEL_STEP, g_rlayer_step);
   drawOther('items', @r_Items_Draw);
-  drawOther('weapons', @g_Weapon_Draw);
+  drawOther('weapons', @r_Weapon_Draw);
   drawOther('shells', @g_Player_DrawShells);
   drawOther('drawall', @g_Player_DrawAll);
   drawOther('corpses', @g_Player_DrawCorpses);
   drawPanelType('*wall', PANEL_WALL, g_rlayer_wall);
-  drawOther('monsters', @g_Monsters_Draw);
+  drawOther('monsters', @r_Monsters_Draw);
   drawOther('itemdrop', @r_Items_DrawDrop);
   drawPanelType('*door', PANEL_CLOSEDOOR, g_rlayer_door);
   drawOther('gfx', @r_GFX_Draw);
@@ -1265,7 +1265,7 @@ begin
 
   if g_debug_HealthBar then
   begin
-    g_Monsters_DrawHealth();
+    r_Monsters_DrawHealth();
     g_Player_DrawHealth();
   end;
 
@@ -1716,7 +1716,7 @@ begin
   begin
     if (gState = STATE_MENU) then
     begin
-      if (g_ActiveWindow = nil) or (g_ActiveWindow.BackTexture = '') then DrawMenuBackground('MENU_BACKGROUND');
+      if (g_ActiveWindow = nil) or (g_ActiveWindow.BackTexture = '') then r_Game_DrawMenuBackground('MENU_BACKGROUND');
       // F3 at menu will show game loading dialog
       if e_KeyPressed(IK_F3) then g_Menu_Show_LoadMenu(true);
       if (g_ActiveWindow <> nil) then
@@ -1751,7 +1751,7 @@ begin
       else
         back := 'INTER';
 
-      DrawMenuBackground(back);
+      r_Game_DrawMenuBackground(back);
 
       DrawCustomStat();
 
@@ -1772,7 +1772,7 @@ begin
       begin
         back := 'INTER';
 
-        DrawMenuBackground(back);
+        r_Game_DrawMenuBackground(back);
 
         DrawSingleStat();
 
@@ -1787,8 +1787,8 @@ begin
     if gState = STATE_ENDPIC then
     begin
       ID := DWORD(-1);
-      if g_Texture_Get('TEXTURE_endpic', ID) then DrawMenuBackground('TEXTURE_endpic')
-      else DrawMenuBackground(_lc[I_TEXTURE_ENDPIC]);
+      if g_Texture_Get('TEXTURE_endpic', ID) then r_Game_DrawMenuBackground('TEXTURE_endpic')
+      else r_Game_DrawMenuBackground(_lc[I_TEXTURE_ENDPIC]);
 
       if g_ActiveWindow <> nil then
       begin
@@ -1804,7 +1804,7 @@ begin
 //        e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight);
 //        //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
 //      end;
-      DrawMenuBackground('MENU_BACKGROUND');
+      r_Game_DrawMenuBackground('MENU_BACKGROUND');
       e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
       g_Serverlist_Draw(slCurrent, slTable);
     end;