diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 8aa98c68cef328bdf3623d39f78f0863865aca12..96c9856d3e91ead2ac9bff6c59cc86de6c79db8c 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
glTranslatef(-x, -y, 0);
- g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
- g_Map_DrawPanels(PANEL_BACK);
- g_Map_DrawPanels(PANEL_STEP);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_BACK);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_STEP);
g_Items_Draw();
g_Weapon_Draw();
g_Player_DrawShells();
g_Player_DrawAll();
g_Player_DrawCorpses();
- g_Map_DrawPanels(PANEL_WALL);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WALL);
g_Monsters_Draw();
- g_Map_DrawPanels(PANEL_CLOSEDOOR);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_CLOSEDOOR);
g_GFX_Draw();
g_Map_DrawFlags();
- g_Map_DrawPanels(PANEL_ACID1);
- g_Map_DrawPanels(PANEL_ACID2);
- g_Map_DrawPanels(PANEL_WATER);
- g_Map_DrawPanels(PANEL_FORE);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID1);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID2);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WATER);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_FORE);
if g_debug_HealthBar then
begin
g_Monsters_DrawHealth();
g_Player_DrawHealth();
end;
- g_Map_ResetPVP();
glPopMatrix();
end;
glTranslatef(a, b+p.IncCam, 0);
- g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
-
- g_Map_DrawPanels(PANEL_BACK);
- g_Map_DrawPanels(PANEL_STEP);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_BACK);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_STEP);
g_Items_Draw();
g_Weapon_Draw();
g_Player_DrawShells();
g_Player_DrawAll();
g_Player_DrawCorpses();
- g_Map_DrawPanels(PANEL_WALL);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WALL);
g_Monsters_Draw();
- g_Map_DrawPanels(PANEL_CLOSEDOOR);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_CLOSEDOOR);
g_GFX_Draw();
g_Map_DrawFlags();
- g_Map_DrawPanels(PANEL_ACID1);
- g_Map_DrawPanels(PANEL_ACID2);
- g_Map_DrawPanels(PANEL_WATER);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID1);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_ACID2);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_WATER);
if gwin_has_stencil and (g_dynLightCount > 0) then
begin
end;
end;
- g_Map_DrawPanels(PANEL_FORE);
+ g_Map_DrawPanels(sX, sY, sWidth, sHeight, PANEL_FORE);
if g_debug_HealthBar then
begin
g_Monsters_DrawHealth();
}
glPopMatrix();
- g_Map_ResetPVP();
p.DrawPain();
p.DrawPickup();