summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50fbfd6)
raw | patch | inline | side by side (parent: 50fbfd6)
author | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Mon, 21 Aug 2017 21:01:24 +0000 (00:01 +0300) | ||
committer | Ketmar Dark <ketmar@ketmar.no-ip.org> | |
Mon, 21 Aug 2017 21:02:16 +0000 (00:02 +0300) |
src/game/g_gfx.pas | patch | blob | history | |
src/game/g_map.pas | patch | blob | history |
diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index 4fcd318df451b0abdf0f4ab2177d3b71118aa281..e96350ebad5d913f5aab3ca4da94d85074916c9b 100644 (file)
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
procedure g_GFX_OnceAnim(X, Y: Integer; Anim: TAnimation; AnimType: Byte = 0);
-procedure g_Mark(x, y, Width, Height: Integer; t: Byte; st: Boolean);
+//procedure g_Mark(x, y, Width, Height: Integer; t: Byte; st: Boolean);
procedure g_GFX_Update();
procedure g_GFX_Draw();
end;
-procedure g_Mark(x, y, Width, Height: Integer; t: Byte; st: Boolean);
{$IF DEFINED(HAS_COLLIDE_BITMAP)}
+procedure g_Mark(x, y, Width, Height: Integer; t: Byte; st: Boolean);
var
yy, y2, xx, x2: Integer;
-{$ENDIF}
begin
-{$IF DEFINED(HAS_COLLIDE_BITMAP)}
if x < 0 then
begin
Width := Width + x;
for xx := x to x2 do
gCollideMap[yy][xx] := gCollideMap[yy][xx] and t;
end;
-{$ENDIF}
end;
+{$ENDIF}
+
-procedure CreateCollideMap();
{$IF DEFINED(HAS_COLLIDE_BITMAP)}
+procedure CreateCollideMap();
var
a: Integer;
-{$ENDIF}
begin
-{$IF DEFINED(HAS_COLLIDE_BITMAP)}
g_Game_SetLoadingText(_lc[I_LOAD_COLLIDE_MAP]+' 1/6', 0, False);
SetLength(gCollideMap, gMapInfo.Height+1);
for a := 0 to High(gCollideMap) do
g_Mark(X, Y, Width, Height, MARK_WALL, True);
end;
end;
-{$ENDIF}
end;
+{$ENDIF}
+
procedure g_GFX_Init();
begin
- CreateCollideMap();
+ //CreateCollideMap();
end;
+
procedure g_GFX_Free();
var
a: Integer;
diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index cc6d9d2715d304e6b89c553117e3cf745445a540..d6f9657de2ad3afd05557ee0e8bed17aa68589c3 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
with gWalls[ID] do
begin
Enabled := True;
- g_Mark(X, Y, Width, Height, MARK_DOOR, True);
+ //g_Mark(X, Y, Width, Height, MARK_DOOR, True);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;
with gWalls[ID] do
begin
Enabled := False;
- g_Mark(X, Y, Width, Height, MARK_DOOR, False);
+ //g_Mark(X, Y, Width, Height, MARK_DOOR, False);
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;
begin
LiftType := t;
+ {
g_Mark(X, Y, Width, Height, MARK_LIFT, False);
if LiftType = 0 then
g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True)
else if LiftType = 3 then
g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True);
+ }
if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
end;