render: separate weapon shots logic and drawing

[d2df-sdl.git] / src / game / opengl / r_game.pas

diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas
index 8015bb4ca6740a2fb1704722aa461d19e7f53b0d..c3577ccace0f47fd5332ab7839612e7aa90bfacb 100644 (file)
--- a/src/game/opengl/r_game.pas
+++ b/src/game/opengl/r_game.pas
@@ -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, r_panel
+    g_game, r_console, r_gfx, r_items, r_map, r_panel, r_monsters, r_weapons
   ;
 
   var
@@ -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;