diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 745f26166a931226c604f90871e2213d1291f288..81eb17e904044c36be49914f5172380a7b8cbdd6 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
interface
uses
- SysUtils, Classes,
+ SysUtils, Classes, mempool,
e_graphics, g_basic, MAPDEF, g_textures,
g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
GridTagLift = 1 shl 8; // gLifts
GridTagBlockMon = 1 shl 9; // gBlockMon
+ GridTagSolid = (GridTagWall or GridTagDoor);
GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor);
GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater);
GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
+type
+ TBinHeapPanelDrawCmp = class
+ public
+ class function less (const a, b: TPanel): Boolean; inline;
+ end;
+
+ TBinHeapPanelDraw = specialize TBinaryHeapBase<TPanel, TBinHeapPanelDrawCmp>;
+
var
gWalls: TPanelArray;
gRenderBackgrounds: TPanelArray;
gdbg_map_use_accel_render: Boolean = true;
gdbg_map_use_accel_coldet: Boolean = true;
profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY!
- gDrawPanelList: TBinaryHeapObj = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()`
+ gDrawPanelList: TBinHeapPanelDraw = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()`
gCurrentMap: TDynRecord = nil;
gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading
+ gTestMap: String = '';
function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
implementation
uses
+ {$INCLUDE ../nogl/noGLuses.inc}
e_input, g_main, e_log, e_texture, g_items, g_gfx, g_console,
- GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
+ g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, g_triggers, g_player,
Math, g_monsters, g_saveload, g_language, g_netmsg,
sfs, xstreams, hashtable, wadreader,
// ////////////////////////////////////////////////////////////////////////// //
var
NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
+ NNF_PureExt: String; // extension postfix
NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû
function g_Texture_NumNameFindStart(name: String): Boolean;
var
- i: Integer;
+ i, j: Integer;
begin
Result := False;
NNF_PureName := '';
+ NNF_PureExt := '';
NNF_FirstNum := -1;
NNF_CurrentNum := -1;
end
else
begin
+ j := i + 1;
+ while (j <= Length(name)) and (name[j] <> '.') do inc(j);
NNF_PureName := Copy(name, 1, i);
- Delete(name, 1, i);
+ NNF_PureExt := Copy(name, j);
+ name := Copy(name, i + 1, j - i - 1);
Break;
end;
end;
Exit;
end;
- newName := NNF_PureName + IntToStr(NNF_CurrentNum);
+ newName := NNF_PureName + IntToStr(NNF_CurrentNum) + NNF_PureExt;
if NNF_CurrentNum < NNF_FirstNum then
Result := NNF_NAME_BEFORE
end;
-function dplLess (a, b: TObject): Boolean;
-var
- pa, pb: TPanel;
+class function TBinHeapPanelDrawCmp.less (const a, b: TPanel): Boolean; inline;
begin
- pa := TPanel(a);
- pb := TPanel(b);
- if (pa.tag < pb.tag) then begin result := true; exit; end;
- if (pa.tag > pb.tag) then begin result := false; exit; end;
- result := (pa.arrIdx < pb.arrIdx);
+ if (a.tag < b.tag) then begin result := true; exit; end;
+ if (a.tag > b.tag) then begin result := false; exit; end;
+ result := (a.arrIdx < b.arrIdx);
end;
procedure dplClear ();
begin
- if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear();
+ if (gDrawPanelList = nil) then gDrawPanelList := TBinHeapPanelDraw.Create() else gDrawPanelList.clear();
end;
procedure g_Map_ProfilersBegin ();
begin
if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size);
- profMapCollision.mainBegin(g_profile_collision);
+ if (profMapCollision <> nil) then profMapCollision.mainBegin(g_profile_collision);
// create sections
- if g_profile_collision then
+ if g_profile_collision and (profMapCollision <> nil) then
begin
profMapCollision.sectionBegin('*solids');
profMapCollision.sectionEnd();
var
ex, ey: Integer;
begin
- result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor));
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, (GridTagWall or GridTagDoor));
if (result <> nil) then
begin
if (hitx <> nil) then hitx^ := ex;
@@ -575,7 +587,7 @@ function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInt
var
ex, ey: Integer;
begin
- result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag);
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, tag);
if (result <> nil) then
begin
if (hitx <> nil) then hitx^ := ex;
end;
-function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean;
-
- function checker (pan: TPanel; tag: Integer): Boolean;
- begin
- {
- if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
- begin
- result := pan.Enabled; // stop if wall is enabled
- exit;
- end;
- }
-
- if ((tag and GridTagLift) <> 0) then
- begin
- // stop if the lift of the right type
- result :=
- ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or
- (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or
- (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or
- (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3)));
- exit;
- end;
-
- result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels
+function xxPanAtPointChecker (pan: TPanel; panelType: Word): Boolean; inline;
+begin
+ if ((pan.tag and GridTagLift) <> 0) then
+ begin
+ // stop if the lift of the right type
+ result :=
+ ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or
+ (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or
+ (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or
+ (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT)));
+ exit;
end;
+ result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels
+end;
+function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean;
var
tagmask: Integer = 0;
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
result := false;
if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon;
if (tagmask = 0) then exit;// just in case
+
if ((tagmask and GridTagLift) <> 0) then
begin
// slow
- result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil);
+ it := mapGrid.forEachAtPoint(x, y, tagmask);
+ for mwit in it do if (xxPanAtPointChecker(mwit^, PanelType)) then begin result := true; break; end;
end
else
begin
// fast
- result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil);
+ it := mapGrid.forEachAtPoint(x, y, tagmask, false, true);
+ result := (it.length <> 0); // firsthit
end;
+ it.release();
end;
function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
+var
+ it: TPanelGrid.Iter;
begin
result := nil;
if (tagmask = 0) then exit;
- result := mapGrid.forEachAtPoint(x, y, nil, tagmask);
+ it := mapGrid.forEachAtPoint(x, y, tagmask, false, true); // firsthit
+ if (it.length <> 0) then result := it.first^;
+ it.release();
end;
function CreateNullTexture(RecName: String): Integer;
begin
RecName := toLowerCase1251(RecName);
- if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if (TextNameHash = nil) then TextNameHash := THashStrInt.Create();
if TextNameHash.get(RecName, result) then exit; // i found her!
SetLength(Textures, Length(Textures)+1);
a, ResLength: Integer;
begin
RecName := toLowerCase1251(RecName);
- if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if (TextNameHash = nil) then TextNameHash := THashStrInt.Create();
if TextNameHash.get(RecName, result) then
begin
// i found her!
else // Íåò òàêîãî ðåóñðñà â WAD'å
begin
//e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING);
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if log and (not BadTextNameHash.get(RecName, a)) then
begin
e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning);
f, c, frdelay, frloop: Integer;
begin
RecName := toLowerCase1251(RecName);
- if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if (TextNameHash = nil) then TextNameHash := THashStrInt.Create();
if TextNameHash.get(RecName, result) then
begin
// i found her!
//e_LogWritefln('*** Loading animated texture "%s"', [RecName]);
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if BadTextNameHash.get(RecName, f) then
begin
//e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY);
if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength, log) then
begin
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if log and (not BadTextNameHash.get(RecName, f)) then
begin
e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning);
end
else
begin
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if log and (not BadTextNameHash.get(RecName, f)) then
begin
e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning);
end
else
begin
- if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create();
if log and (not BadTextNameHash.get(RecName, f)) then
begin
e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), TMsgType.Warning);
function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer;
var
_trigger: TTrigger;
+ tp: TPanel;
begin
result := -1;
if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
trigPanelGUID := atrigpanid;
+ // HACK: used in TPanel.CanChangeTexture. maybe there's a better way?
+ if TexturePanelGUID <> -1 then
+ begin
+ tp := g_Map_PanelByGUID(TexturePanelGUID);
+ if (tp <> nil) then tp.hasTexTrigger := True;
+ end;
end;
result := Integer(g_Triggers_Create(_trigger, Trigger));
actPanel: TDynRecord;
end;
var
- WAD: TWADFile;
+ WAD, TestWAD: TWADFile;
//mapReader: TDynRecord = nil;
mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
panels: TDynField = nil; //TPanelsRec1Array;
begin
mapGrid.Free();
mapGrid := nil;
+ TestWAD := nil;
+ Data := nil;
//gCurrentMap.Free();
//gCurrentMap := nil;
Exit;
end;
- //k8: why loader ignores path here?
- mapResName := g_ExtractFileName(Res);
- if not WAD.GetMapResource(mapResName, Data, Len) then
+ if gTestMap <> '' then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
- WAD.Free();
- Exit;
+ s := g_ExtractWadName(gTestMap);
+ TestWAD := TWADFile.Create();
+ if not TestWAD.ReadFile(s) then
+ begin
+ g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_WAD], [s]));
+ TestWAD.Free();
+ TestWAD := nil;
+ end;
+ end;
+
+ if TestWAD <> nil then
+ begin
+ mapResName := g_ExtractFileName(gTestMap);
+ if not TestWAD.GetMapResource(mapResName, Data, Len) then
+ begin
+ g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
+ Data := nil;
+ end else
+ e_WriteLog('Using test map: '+gTestMap, TMsgType.Notify);
+ TestWAD.Free();
+ TestWAD := nil;
+ end;
+
+ if Data = nil then
+ begin
+ //k8: why loader ignores path here?
+ mapResName := g_ExtractFileName(Res);
+ if not WAD.GetMapResource(mapResName, Data, Len) then
+ begin
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
+ WAD.Free();
+ Exit;
+ end;
end;
WAD.Free();
g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], mapTextureList.count-1, False);
// find used textures
- usedTextures := hashNewStrInt();
+ usedTextures := THashStrInt.Create();
try
if (panels <> nil) and (panels.count > 0) then
begin
a, d, j: Integer;
m: Word;
s: String;
+ b: Byte;
procedure UpdatePanelArray(var panels: TPanelArray);
var
s := _lc[I_PLAYER_FLAG_BLUE];
g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144);
+ if (((gPlayer1 <> nil) and (((gPlayer1.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer1.Team = TEAM_BLUE) and (a = FLAG_BLUE))))
+ or ((gPlayer2 <> nil) and (((gPlayer2.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer2.Team = TEAM_BLUE) and (a = FLAG_BLUE))))) then
+ b := 0
+ else
+ b := 1;
+
+ if not sound_ret_flag[b].IsPlaying() then
+ sound_ret_flag[b].Play();
+
if g_Game_IsNet then
MH_SEND_FlagEvent(FLAG_STATE_RETURNED, a, 0);
Continue;
// new algo
procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
-
- function checker (pan: TPanel; tag: Integer): Boolean;
- begin
- result := false; // don't stop, ever
- if ((tag and GridTagDoor) <> 0) <> pan.Door then exit;
- gDrawPanelList.insert(pan);
- end;
-
+var
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
dplClear();
- //tagmask := panelTypeToTag(PanelType);
- mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask);
+ it := mapGrid.forEachInAABB(x0, y0, wdt, hgt, GridDrawableMask);
+ for mwit in it do if (((mwit^.tag and GridTagDoor) <> 0) = mwit^.Door) then gDrawPanelList.insert(mwit^);
+ it.release();
// list will be rendered in `g_game.DrawPlayer()`
end;
-procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
-
- function checker (pan: TPanel; tag: Integer): Boolean;
- begin
- result := false; // don't stop, ever
- pan.DrawShadowVolume(lightX, lightY, radius);
- end;
-
+procedure g_Map_DrawPanelShadowVolumes (lightX: Integer; lightY: Integer; radius: Integer);
+var
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
- mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
+ it := mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, (GridTagWall or GridTagDoor));
+ for mwit in it do mwit^.DrawShadowVolume(lightX, lightY, radius);
+ it.release();
end;
h := High(gLifts);
for a := 0 to h do
- if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or
- (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or
- (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or
- (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and
+ if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = LIFTTYPE_UP)) or
+ (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = LIFTTYPE_DOWN)) or
+ (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = LIFTTYPE_LEFT)) or
+ (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = LIFTTYPE_RIGHT))) and
g_Collide(X, Y, Width, Height,
gLifts[a].X, gLifts[a].Y,
gLifts[a].Width, gLifts[a].Height) then
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
const
SlowMask = GridTagLift or GridTagBlockMon;
+
function checker (pan: TPanel; tag: Integer): Boolean;
begin
{
if ((tag and GridTagLift) <> 0) then
begin
result :=
- ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or
- (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or
- (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or
- (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))) {and
+ ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or
+ (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or
+ (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or
+ (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and
g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)};
exit;
end;
var
tagmask: Integer = 0;
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
+ pan: TPanel;
begin
+ result := false;
if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor);
if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater;
if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1;
if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift;
if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon;
- if (tagmask = 0) then begin result := false; exit; end; // just in case
+ if (tagmask = 0) then exit; // just in case
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids');
if gdbg_map_use_accel_coldet then
begin
- if (Width = 1) and (Height = 1) then
+ if ((tagmask and SlowMask) <> 0) then
begin
- if ((tagmask and SlowMask) <> 0) then
- begin
- // slow
- result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil);
- end
- else
+ // slow
+ it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask);
+ for mwit in it do
begin
- // fast
- result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
+ pan := mwit^;
+ if ((pan.tag and GridTagLift) <> 0) then
+ begin
+ result :=
+ ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or
+ (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or
+ (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or
+ (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and
+ g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)};
+ end
+ else if ((pan.tag and GridTagBlockMon) <> 0) then
+ begin
+ result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ end
+ else
+ begin
+ // other shit
+ result := true; // i found her!
+ end;
+ if (result) then break;
end;
end
else
begin
- if ((tagmask and SlowMask) <> 0) then
- begin
- // slow
- result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil);
- end
- else
- begin
- // fast
- result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil);
- end;
+ // fast
+ it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask, false, true); // return first hit
+ result := (it.length > 0);
end;
+ it.release();
end
else
begin
end;
+// returns `true` if we need to stop
+function liquidChecker (pan: TPanel; var texid: DWORD; var cctype: Integer): Boolean; inline;
+begin
+ result := false;
+ //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit;
+ // check priorities
+ case cctype of
+ 0: if ((pan.tag and GridTagWater) = 0) then exit; // allowed: water
+ 1: if ((pan.tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1
+ //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2
+ end;
+ // collision?
+ //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit;
+ // yeah
+ texid := pan.GetTextureID();
+ // water? water has the highest priority, so stop right here
+ if ((pan.tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end;
+ // acid2?
+ if ((pan.tag and GridTagAcid2) <> 0) then cctype := 2;
+ // acid1?
+ if ((pan.tag and GridTagAcid1) <> 0) then cctype := 1;
+end;
+
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
var
cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit
- texid: DWORD;
-
- // slightly different from the old code, but meh...
- function checker (pan: TPanel; tag: Integer): Boolean;
- begin
- result := false; // don't stop, ever
- //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit;
- // check priorities
- case cctype of
- 0: if ((tag and GridTagWater) = 0) then exit; // allowed: water
- 1: if ((tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1
- //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2
- end;
- // collision?
- //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit;
- // yeah
- texid := pan.GetTextureID();
- // water? water has the highest priority, so stop right here
- if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end;
- // acid2?
- if ((tag and GridTagAcid2) <> 0) then cctype := 2;
- // acid1?
- if ((tag and GridTagAcid1) <> 0) then cctype := 1;
- end;
-
+ mwit: PPanel;
+ it: TPanelGrid.Iter;
begin
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids');
if gdbg_map_use_accel_coldet then
begin
- texid := LongWord(TEXTURE_NONE);
- if (Width = 1) and (Height = 1) then
- begin
- mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
- end
- else
- begin
- mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
- end;
- result := texid;
+ result := LongWord(TEXTURE_NONE);
+ it := mapGrid.forEachInAABB(X, Y, Width, Height, (GridTagWater or GridTagAcid1 or GridTagAcid2));
+ for mwit in it do if (liquidChecker(mwit^, result, cctype)) then break;
+ it.release();
end
else
begin
//TODO: make separate lift tags, and change tag here
case LiftType of
- 0: g_Mark(X, Y, Width, Height, MARK_LIFTUP);
- 1: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN);
- 2: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT);
- 3: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT);
+ LIFTTYPE_UP: g_Mark(X, Y, Width, Height, MARK_LIFTUP);
+ LIFTTYPE_DOWN: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN);
+ LIFTTYPE_LEFT: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT);
+ LIFTTYPE_RIGHT: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT);
end;
//if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid);
topx := x;
topy := y;
// started outside of the liquid?
- if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end;
+ //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end;
+ if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then begin result := false; exit; end;
if (dx = 0) and (dy = 0) then begin result := false; exit; end; // sanity check
result := true;
while true do
begin
Inc(x, dx);
Inc(y, dy);
- if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit
+ //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit
+ if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then exit; // out of the water, just exit
topx := x;
topy := y;
end;