diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index c8d9f14b31f3cc352757d703b32bc996f61b659e..1695460c162e06e3b8b36e9c0f3b6b629390cc4a 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
{$INCLUDE ../shared/a_modes.inc}
+{$DEFINE MAP_DEBUG_ENABLED_FLAG}
unit g_map;
interface
uses
- e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
- g_phys, wadreader, BinEditor, g_panel, g_grid, z_aabbtree, md5, xprofiler;
+ e_graphics, g_basic, MAPDEF, g_textures, Classes,
+ g_phys, wadreader, BinEditor, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
type
TMapInfo = record
procedure g_Map_Free();
procedure g_Map_Update();
-procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
+procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated
+procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
procedure g_Map_DrawBack(dx, dy: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
- PanelType: Word; b1x3: Boolean): Boolean;
+ PanelType: Word; b1x3: Boolean=false): Boolean;
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
procedure g_Map_EnableWall(ID: DWORD);
procedure g_Map_DisableWall(ID: DWORD);
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
+// returns panel or nil
+// sets `ex` and `ey` to `x1` and `y1` when no hit was detected
+function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+
+// returns panel or nil
+// sets `ex` and `ey` to `x1` and `y1` when no hit was detected
+function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+
+type
+ TForEachPanelCB = function (pan: TPanel): Boolean; // return `true` to stop
+
+function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean;
+function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
+
+// trace liquid, stepping by `dx` and `dy`
+// return last seen liquid coords, and `false` if we're started outside of the liquid
+function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+
+
procedure g_Map_ProfilersBegin ();
procedure g_Map_ProfilersEnd ();
+
+function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
+
+const
+ NNF_NO_NAME = 0;
+ NNF_NAME_BEFORE = 1;
+ NNF_NAME_EQUALS = 2;
+ NNF_NAME_AFTER = 3;
+
+function g_Texture_NumNameFindStart(name: String): Boolean;
+function g_Texture_NumNameFindNext(var newName: String): Byte;
+
const
RESPAWNPOINT_PLAYER1 = 1;
RESPAWNPOINT_PLAYER2 = 2;
SKY_STRETCH: Single = 1.5;
+const
+ GridTagInvalid = 0;
+
+ (* draw order:
+ PANEL_BACK
+ PANEL_STEP
+ PANEL_WALL
+ PANEL_CLOSEDOOR
+ PANEL_ACID1
+ PANEL_ACID2
+ PANEL_WATER
+ PANEL_FORE
+ *)
+ // sorted by draw priority
+ GridTagBack = 1 shl 0;
+ GridTagStep = 1 shl 1;
+ GridTagWall = 1 shl 2;
+ GridTagDoor = 1 shl 3;
+ GridTagAcid1 = 1 shl 4;
+ GridTagAcid2 = 1 shl 5;
+ GridTagWater = 1 shl 6;
+ GridTagFore = 1 shl 7;
+ // the following are invisible
+ GridTagLift = 1 shl 8;
+ GridTagBlockMon = 1 shl 9;
+
+ GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
+
+
var
gWalls: TPanelArray;
gRenderBackgrounds: TPanelArray;
gFlags: array [FLAG_RED..FLAG_BLUE] of TFlag;
//gDOMFlags: array of TFlag;
gMapInfo: TMapInfo;
- gBackSize: TPoint;
+ gBackSize: TDFPoint;
gDoorMap: array of array of DWORD;
gLiftMap: array of array of DWORD;
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
- gdbg_map_use_grid_render: Boolean = true;
- gdbg_map_use_grid_coldet: Boolean = true;
- gdbg_map_use_tree_draw: Boolean = true;
- gdbg_map_use_tree_coldet: Boolean = false;
+ 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()`
+
+ gCurrentMap: TDynRecord = nil;
+
+
+function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
+
+
+type
+ TPanelGrid = specialize TBodyGridBase<TPanel>;
+
+var
+ mapGrid: TPanelGrid = nil; // DO NOT USE! public for debugging only!
+
implementation
uses
g_main, e_log, SysUtils, g_items, g_gfx, g_console,
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
- g_options, MAPREADER, g_triggers, g_player, MAPDEF,
+ g_options, g_triggers, g_player,
Math, g_monsters, g_saveload, g_language, g_netmsg,
- utils, sfs, binheap,
+ utils, sfs, xstreams, hashtable,
ImagingTypes, Imaging, ImagingUtility,
ImagingGif, ImagingNetworkGraphics;
MUSIC_SIGNATURE = $4953554D; // 'MUSI'
FLAG_SIGNATURE = $47414C46; // 'FLAG'
- GridTagInvalid = -1;
- GridTagWallDoor = 0;
- GridTagBack = 1;
- GridTagFore = 2;
- GridTagWater = 3;
- GridTagAcid1 = 4;
- GridTagAcid2 = 5;
- GridTagStep = 6;
- GridTagLift = 7;
- GridTagBlockMon = 8;
+
+var
+ dfmapdef: TDynMapDef = nil;
+
+procedure loadMapDefinition ();
+var
+ pr: TTextParser = nil;
+ st: TStream = nil;
+ WAD: TWADFile = nil;
+begin
+ if (dfmapdef <> nil) then exit;
+ try
+ e_LogWritefln('parsing "mapdef.txt"...', []);
+ st := openDiskFileRO(DataDir+'mapdef.txt');
+ except
+ st := nil;
+ e_LogWritefln('local "%smapdef.txt" not found', [DataDir]);
+ end;
+ if (st = nil) then
+ begin
+ WAD := TWADFile.Create();
+ if not WAD.ReadFile(GameWAD) then
+ begin
+ //raise Exception.Create('cannot load "game.wad"');
+ st := nil;
+ end
+ else
+ begin
+ st := WAD.openFileStream('mapdef.txt');
+ end;
+ end;
+
+ if (st = nil) then
+ begin
+ //raise Exception.Create('cannot open "mapdef.txt"');
+ e_LogWritefln('using default "mapdef.txt"...', [], MSG_WARNING);
+ pr := TStrTextParser.Create(defaultMapDef);
+ end
+ else
+ begin
+ pr := TFileTextParser.Create(st);
+ end;
+
+ try
+ dfmapdef := TDynMapDef.Create(pr);
+ except on e: Exception do
+ raise Exception.Create(Format('ERROR in "mapdef.txt" at (%s,%s): %s', [pr.line, pr.col, e.message]));
+ end;
+
+ st.Free();
+ WAD.Free();
+end;
+
+
+function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
+var
+ wst: TSFSMemoryChunkStream = nil;
+ pr: TTextParser = nil;
+begin
+ result := nil;
+ if (dataLen < 4) then exit;
+ loadMapDefinition();
+ if (dfmapdef = nil) then raise Exception.Create('internal map loader error');
+
+ wst := TSFSMemoryChunkStream.Create(data, dataLen);
+
+ if (PAnsiChar(data)[0] = 'M') and (PAnsiChar(data)[1] = 'A') and (PAnsiChar(data)[2] = 'P') and (PByte(data)[3] = 1) then
+ begin
+ // binary map
+ try
+ result := dfmapdef.parseBinMap(wst);
+ except on e: Exception do
+ begin
+ e_LogWritefln('ERROR: %s', [e.message]);
+ wst.Free();
+ result := nil;
+ exit;
+ end;
+ end;
+ wst.Free();
+ end
+ else
+ begin
+ // text map
+ pr := TFileTextParser.Create(wst);
+ try
+ result := dfmapdef.parseMap(pr);
+ except on e: Exception do
+ begin
+ if (pr <> nil) then e_LogWritefln('ERROR at (%s,%s): %s', [pr.line, pr.col, e.message])
+ else e_LogWritefln('ERROR: %s', [e.message]);
+ pr.Free(); // will free `wst`
+ result := nil;
+ exit;
+ end;
+ end;
+ pr.Free(); // will free `wst`
+ end;
+end;
+
+
+var
+ NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
+ NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
+ NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû
+
+
+function g_Texture_NumNameFindStart(name: String): Boolean;
+var
+ i: Integer;
+
+begin
+ Result := False;
+ NNF_PureName := '';
+ NNF_FirstNum := -1;
+ NNF_CurrentNum := -1;
+
+ for i := Length(name) downto 1 do
+ if (name[i] = '_') then // "_" - ñèìâîë íà÷àëà íîìåðíîãî ïîñòôèêñà
+ begin
+ if i = Length(name) then
+ begin // Íåò öèôð â êîíöå ñòðîêè
+ Exit;
+ end
+ else
+ begin
+ NNF_PureName := Copy(name, 1, i);
+ Delete(name, 1, i);
+ Break;
+ end;
+ end;
+
+// Íå ïåðåâåñòè â ÷èñëî:
+ if not TryStrToInt(name, NNF_FirstNum) then
+ Exit;
+
+ NNF_CurrentNum := 0;
+
+ Result := True;
+end;
+
+
+function g_Texture_NumNameFindNext(var newName: String): Byte;
+begin
+ if (NNF_PureName = '') or (NNF_CurrentNum < 0) then
+ begin
+ newName := '';
+ Result := NNF_NO_NAME;
+ Exit;
+ end;
+
+ newName := NNF_PureName + IntToStr(NNF_CurrentNum);
+
+ if NNF_CurrentNum < NNF_FirstNum then
+ Result := NNF_NAME_BEFORE
+ else
+ if NNF_CurrentNum > NNF_FirstNum then
+ Result := NNF_NAME_AFTER
+ else
+ Result := NNF_NAME_EQUALS;
+
+ Inc(NNF_CurrentNum);
+end;
function panelTypeToTag (panelType: Word): Integer;
begin
case panelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagWallDoor; // gWalls
+ PANEL_WALL: result := GridTagWall; // gWalls
+ PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagDoor; // gWalls
PANEL_BACK: result := GridTagBack; // gRenderBackgrounds
PANEL_FORE: result := GridTagFore; // gRenderForegrounds
PANEL_WATER: result := GridTagWater; // gWater
end;
+function dplLess (a, b: TObject): Boolean;
+var
+ pa, pb: TPanel;
+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);
+end;
+
+procedure dplClear ();
+begin
+ if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear();
+end;
+
+
type
TPanelID = record
PWhere: ^TPanelArray;
PArrID: Integer;
end;
-type
- TDynAABBTreeMap = class(TDynAABBTree)
- function getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boolean; override;
- end;
-
-function TDynAABBTreeMap.getFleshAABB (var aabb: AABB2D; flesh: TTreeFlesh): Boolean;
-var
- pan: TPanel;
-begin
- pan := (flesh as TPanel);
- aabb.setXYWH(pan.X, pan.Y, pan.Width, pan.Height);
- result := true;
-end;
-
var
PanelById: array of TPanelID;
Textures: TLevelTextureArray;
RespawnPoints: Array of TRespawnPoint;
FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
- gMapGrid: TBodyGrid = nil;
- mapTree: TDynAABBTree = nil;
procedure g_Map_ProfilersBegin ();
begin
- if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION', g_profile_history_size);
+ if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size);
profMapCollision.mainBegin(g_profile_collision);
// create sections
if g_profile_collision then
begin
- profMapCollision.sectionBegin('wall coldet');
+ profMapCollision.sectionBegin('*solids');
profMapCollision.sectionEnd();
- profMapCollision.sectionBegin('liquid coldet');
+ profMapCollision.sectionBegin('liquids');
profMapCollision.sectionEnd();
end;
end;
end;
+// wall index in `gWalls` or -1
+function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+var
+ ex, ey: Integer;
+begin
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor));
+ if (result <> nil) then
+ begin
+ if (hitx <> nil) then hitx^ := ex;
+ if (hity <> nil) then hity^ := ey;
+ end
+ else
+ begin
+ if (hitx <> nil) then hitx^ := x1;
+ if (hity <> nil) then hity^ := y1;
+ end;
+end;
+
+// returns panel or nil
+function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
+var
+ ex, ey: Integer;
+begin
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag);
+ if (result <> nil) then
+ begin
+ if (hitx <> nil) then hitx^ := ex;
+ if (hity <> nil) then hity^ := ey;
+ end
+ else
+ begin
+ if (hitx <> nil) then hitx^ := x1;
+ if (hity <> nil) then hity^ := y1;
+ end;
+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
+ end;
+
+var
+ tagmask: Integer = 0;
+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_ACID2) then tagmask := tagmask or GridTagAcid2;
+ if WordBool(PanelType and PANEL_STEP) then tagmask := tagmask or GridTagStep;
+ 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 exit;// just in case
+ if ((tagmask and GridTagLift) <> 0) then
+ begin
+ // slow
+ result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil);
+ end
+ else
+ begin
+ // fast
+ result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil);
+ end;
+end;
+
+
+function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel;
+begin
+ result := nil;
+ if (tagmask = 0) then exit;
+ result := mapGrid.forEachAtPoint(x, y, nil, tagmask);
+end;
+
+
function g_Map_IsSpecialTexture(Texture: String): Boolean;
begin
Result := (Texture = TEXTURE_NAME_WATER) or
PanelArray := nil;
end;
-function CreatePanel(PanelRec: TPanelRec_1; AddTextures: TAddTextureArray;
+function CreatePanel(PanelRec: TDynRecord; AddTextures: TAddTextureArray;
CurTex: Integer; sav: Boolean): Integer;
var
len: Integer;
SetLength(panels^, len + 1);
panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures);
- panels^[len].ArrIdx := len;
+ panels^[len].arrIdx := len;
+ panels^[len].proxyId := -1;
panels^[len].tag := panelTypeToTag(PanelRec.PanelType);
if sav then
panels^[len].SaveIt := True;
Width := 1;
Height := 1;
Anim := False;
- TextureID := TEXTURE_NONE;
+ TextureID := LongWord(TEXTURE_NONE);
end;
end;
TextureName := RecName;
if TextureName = TEXTURE_NAME_WATER then
- TextureID := TEXTURE_SPECIAL_WATER
+ TextureID := LongWord(TEXTURE_SPECIAL_WATER)
else
if TextureName = TEXTURE_NAME_ACID1 then
- TextureID := TEXTURE_SPECIAL_ACID1
+ TextureID := LongWord(TEXTURE_SPECIAL_ACID1)
else
if TextureName = TEXTURE_NAME_ACID2 then
- TextureID := TEXTURE_SPECIAL_ACID2;
+ TextureID := LongWord(TEXTURE_SPECIAL_ACID2);
Anim := False;
end;
end;
end;
-procedure CreateItem(Item: TItemRec_1);
+procedure CreateItem(Item: TDynRecord);
begin
if g_Game_IsClient then Exit;
gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF, GM_COOP]);
end;
-procedure CreateArea(Area: TAreaRec_1);
+procedure CreateArea(Area: TDynRecord);
var
a: Integer;
- id: DWORD;
+ id: DWORD = 0;
begin
case Area.AreaType of
AREA_DMPOINT, AREA_PLAYERPOINT1, AREA_PLAYERPOINT2,
end;
end;
-procedure CreateTrigger(Trigger: TTriggerRec_1; fTexturePanel1Type, fTexturePanel2Type: Word);
+procedure CreateTrigger(Trigger: TDynRecord; atpanid, ashotpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word);
var
_trigger: TTrigger;
begin
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
- Data.Default := Trigger.DATA;
+ trigPanelId := atpanid;
+ trigShotPanelId := ashotpanid;
+ //Data.Default := Trigger.DATA;
+ trigData := Trigger.trigRec.clone();
end;
g_Triggers_Create(_trigger);
end;
-procedure CreateMonster(monster: TMonsterRec_1);
+procedure CreateMonster(monster: TDynRecord);
var
- a, i: Integer;
+ a: Integer;
+ mon: TMonster;
begin
if g_Game_IsClient then Exit;
if (gGameSettings.GameType = GT_SINGLE)
or LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS) then
begin
- i := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y,
- TDirection(monster.Direction));
+ mon := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y, TDirection(monster.Direction));
if gTriggers <> nil then
+ begin
for a := 0 to High(gTriggers) do
- if gTriggers[a].TriggerType in [TRIGGER_PRESS,
- TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
- if (gTriggers[a].Data.MonsterID-1) = gMonsters[i].StartID then
- gMonsters[i].AddTrigger(a);
+ begin
+ if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
+ begin
+ //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a);
+ if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
+ end;
+ end;
+ end;
- if monster.MonsterType <> MONSTER_BARREL then
- Inc(gTotalMonsters);
+ if monster.MonsterType <> MONSTER_BARREL then Inc(gTotalMonsters);
end;
end;
procedure g_Map_ReAdd_DieTriggers();
-var
- i, a: Integer;
-begin
- if g_Game_IsClient then Exit;
- for i := 0 to High(gMonsters) do
- if gMonsters[i] <> nil then
+ function monsDieTrig (mon: TMonster): Boolean;
+ var
+ a: Integer;
+ begin
+ result := false; // don't stop
+ mon.ClearTriggers();
+ for a := 0 to High(gTriggers) do
+ begin
+ if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
begin
- gMonsters[i].ClearTriggers();
-
- for a := 0 to High(gTriggers) do
- if gTriggers[a].TriggerType in [TRIGGER_PRESS,
- TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
- if (gTriggers[a].Data.MonsterID-1) = gMonsters[i].StartID then
- gMonsters[i].AddTrigger(a);
+ //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a);
+ if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
end;
+ end;
+ end;
+
+begin
+ if g_Game_IsClient then Exit;
+
+ g_Mons_ForEach(monsDieTrig);
end;
function extractWadName(resourceName: string): string;
gExternalResources.Add(res);
end;
-procedure generateExternalResourcesList(mapReader: TMapReader_1);
-var
- textures: TTexturesRec1Array;
- mapHeader: TMapHeaderRec_1;
- i: integer;
- resFile: String = '';
+procedure generateExternalResourcesList({mapReader: TMapReader_1}map: TDynRecord);
+//var
+ //textures: TTexturesRec1Array;
+ //textures: TDynField;
+ //trec: TDynRecord;
+ //mapHeader: TMapHeaderRec_1;
+ //i: integer;
+ //resFile: String = '';
begin
if gExternalResources = nil then
gExternalResources := TStringList.Create;
gExternalResources.Clear;
- textures := mapReader.GetTextures();
+
+ (*
+ {
+ textures := GetTextures(map);
for i := 0 to High(textures) do
begin
addResToExternalResList(resFile);
end;
+ }
+
+ textures := map['texture'];
+ if (textures <> nil) then
+ begin
+ for trec in textures do
+ begin
+ addResToExternalResList(resFile);
+ end;
+ end;
textures := nil;
+ *)
- mapHeader := mapReader.GetMapHeader;
+ //mapHeader := GetMapHeader(map);
- addResToExternalResList(mapHeader.MusicName);
- addResToExternalResList(mapHeader.SkyName);
+ addResToExternalResList(map.MusicName);
+ addResToExternalResList(map.SkyName);
end;
+
procedure mapCreateGrid ();
var
mapX0: Integer = $3fffffff;
mapX1: Integer = -$3fffffff;
mapY1: Integer = -$3fffffff;
- procedure fixMinMax (var panels: TPanelArray);
+ procedure calcBoundingBox (constref panels: TPanelArray);
var
idx: Integer;
+ pan: TPanel;
begin
for idx := 0 to High(panels) do
begin
- if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue;
- if mapX0 > panels[idx].X then mapX0 := panels[idx].X;
- if mapY0 > panels[idx].Y then mapY0 := panels[idx].Y;
- if mapX1 < panels[idx].X+panels[idx].Width-1 then mapX1 := panels[idx].X+panels[idx].Width-1;
- if mapY1 < panels[idx].Y+panels[idx].Height-1 then mapY1 := panels[idx].Y+panels[idx].Height-1;
+ pan := panels[idx];
+ if not pan.visvalid then continue;
+ if (pan.Width < 1) or (pan.Height < 1) then continue;
+ if (mapX0 > pan.x0) then mapX0 := pan.x0;
+ if (mapY0 > pan.y0) then mapY0 := pan.y0;
+ if (mapX1 < pan.x1) then mapX1 := pan.x1;
+ if (mapY1 < pan.y1) then mapY1 := pan.y1;
end;
end;
- procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer);
+ procedure addPanelsToGrid (constref panels: TPanelArray);
var
idx: Integer;
+ pan: TPanel;
+ newtag: Integer;
begin
- tag := panelTypeToTag(tag);
- for idx := High(panels) downto 0 do
+ //tag := panelTypeToTag(tag);
+ for idx := 0 to High(panels) do
begin
- panels[idx].tag := tag;
- gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag);
- mapTree.insertObject(panels[idx], true); // as static object
+ pan := panels[idx];
+ if not pan.visvalid then continue;
+ if (pan.proxyId <> -1) then
+ begin
+ {$IF DEFINED(D2F_DEBUG)}
+ e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), MSG_NOTIFY);
+ {$ENDIF}
+ continue;
+ end;
+ case pan.PanelType of
+ PANEL_WALL: newtag := GridTagWall;
+ PANEL_OPENDOOR, PANEL_CLOSEDOOR: newtag := GridTagDoor;
+ PANEL_BACK: newtag := GridTagBack;
+ PANEL_FORE: newtag := GridTagFore;
+ PANEL_WATER: newtag := GridTagWater;
+ PANEL_ACID1: newtag := GridTagAcid1;
+ PANEL_ACID2: newtag := GridTagAcid2;
+ PANEL_STEP: newtag := GridTagStep;
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: newtag := GridTagLift;
+ PANEL_BLOCKMON: newtag := GridTagBlockMon;
+ else continue; // oops
+ end;
+ pan.tag := newtag;
+
+ pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, newtag);
+ // "enabled" flag has meaning only for doors and walls (engine assumes it); but meh...
+ mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled;
+ {$IFDEF MAP_DEBUG_ENABLED_FLAG}
+ {
+ if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
+ begin
+ e_WriteLog(Format('INSERTED wall #%d(%d) enabled (%d)', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId])]), MSG_NOTIFY);
+ end;
+ }
+ {$ENDIF}
end;
end;
begin
- gMapGrid.Free();
- gMapGrid := nil;
- mapTree.Free();
- mapTree := nil;
-
- fixMinMax(gWalls);
- fixMinMax(gRenderBackgrounds);
- fixMinMax(gRenderForegrounds);
- fixMinMax(gWater);
- fixMinMax(gAcid1);
- fixMinMax(gAcid2);
- fixMinMax(gSteps);
- fixMinMax(gLifts);
- fixMinMax(gBlockMon);
-
- if (mapX0 < 0) or (mapY0 < 0) then
- begin
- e_WriteLog(Format('funny map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
- //raise Exception.Create('we are fucked');
- end;
-
- gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1);
- mapTree := TDynAABBTreeMap.Create();
-
- addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR
- addPanelsToGrid(gRenderBackgrounds, PANEL_BACK);
- addPanelsToGrid(gRenderForegrounds, PANEL_FORE);
- addPanelsToGrid(gWater, PANEL_WATER);
- addPanelsToGrid(gAcid1, PANEL_ACID1);
- addPanelsToGrid(gAcid2, PANEL_ACID2);
- addPanelsToGrid(gSteps, PANEL_STEP);
- addPanelsToGrid(gLifts, PANEL_LIFTUP); // it doesn't matter which LIFT type is used here
- addPanelsToGrid(gBlockMon, PANEL_BLOCKMON);
-
- gMapGrid.dumpStats();
- e_WriteLog(Format('tree depth: %d; %d nodes used, %d nodes allocated', [mapTree.computeTreeHeight, mapTree.nodeCount, mapTree.nodeAlloced]), MSG_NOTIFY);
+ mapGrid.Free();
+ mapGrid := nil;
+
+ calcBoundingBox(gWalls);
+ calcBoundingBox(gRenderBackgrounds);
+ calcBoundingBox(gRenderForegrounds);
+ calcBoundingBox(gWater);
+ calcBoundingBox(gAcid1);
+ calcBoundingBox(gAcid2);
+ calcBoundingBox(gSteps);
+ calcBoundingBox(gLifts);
+ calcBoundingBox(gBlockMon);
+
+ e_LogWritefln('map dimensions: (%d,%d)-(%d,%d); editor size:(0,0)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1, gMapInfo.Width, gMapInfo.Height]);
+
+ if (mapX0 > 0) then mapX0 := 0;
+ if (mapY0 > 0) then mapY0 := 0;
+
+ if (mapX1 < gMapInfo.Width-1) then mapX1 := gMapInfo.Width-1;
+ if (mapY1 < gMapInfo.Height-1) then mapY1 := gMapInfo.Height-1;
+
+ mapGrid := TPanelGrid.Create(mapX0-128, mapY0-128, mapX1-mapX0+1+128*2, mapY1-mapY0+1+128*2);
+ //mapGrid := TPanelGrid.Create(0, 0, gMapInfo.Width, gMapInfo.Height);
+
+ addPanelsToGrid(gWalls);
+ addPanelsToGrid(gRenderBackgrounds);
+ addPanelsToGrid(gRenderForegrounds);
+ addPanelsToGrid(gWater);
+ addPanelsToGrid(gAcid1);
+ addPanelsToGrid(gAcid2);
+ addPanelsToGrid(gSteps);
+ addPanelsToGrid(gLifts); // it doesn't matter which LIFT type is used here
+ addPanelsToGrid(gBlockMon);
+
+ mapGrid.dumpStats();
+
+ g_Mons_InitTree(mapGrid.gridX0, mapGrid.gridY0, mapGrid.gridWidth, mapGrid.gridHeight);
end;
+
function g_Map_Load(Res: String): Boolean;
const
DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
DefaultSkyRes = 'Standart.wad:STDSKY\SKY0';
+type
+ PTRec = ^TTRec;
+ TTRec = record
+ //TexturePanel: Integer;
+ texPanIdx: Integer;
+ LiftPanelIdx: Integer;
+ DoorPanelIdx: Integer;
+ ShotPanelIdx: Integer;
+ trigrec: TDynRecord;
+ texPan: TDynRecord;
+ liftPan: TDynRecord;
+ doorPan: TDynRecord;
+ shotPan: TDynRecord;
+ end;
var
WAD: TWADFile;
- MapReader: TMapReader_1;
- Header: TMapHeaderRec_1;
- _textures: TTexturesRec1Array;
- _texnummap: array of Integer; // `_textures` -> `Textures`
- panels: TPanelsRec1Array;
- items: TItemsRec1Array;
- monsters: TMonsterRec1Array;
- areas: TAreasRec1Array;
- triggers: TTriggersRec1Array;
- a, b, c, k: Integer;
+ //MapReader: TMapReader_1;
+ mapReader: TDynRecord = nil;
+ //Header: TMapHeaderRec_1;
+ _textures: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
+ //_texnummap: array of Integer = nil; // `_textures` -> `Textures`
+ panels: TDynField = nil; //TPanelsRec1Array;
+ items: TDynField = nil; //TItemsRec1Array;
+ monsters: TDynField = nil; //TMonsterRec1Array;
+ areas: TDynField = nil; //TAreasRec1Array;
+ triggers: TDynField = nil; //TTriggersRec1Array;
+ b, c, k: Integer;
PanelID: DWORD;
AddTextures: TAddTextureArray;
- texture: TTextureRec_1;
- TriggersTable: Array of record
- TexturePanel: Integer;
- LiftPanel: Integer;
- DoorPanel: Integer;
- ShotPanel: Integer;
- end;
+ //texture: TTextureRec_1;
+ TriggersTable: array of TTRec;
FileName, mapResName, s, TexName: String;
Data: Pointer;
Len: Integer;
ok, isAnim, trigRef: Boolean;
CurTex, ntn: Integer;
-
+ rec, texrec: TDynRecord;
+ pttit: PTRec;
+ pannum, trignum, cnt: Integer;
+ // key: panel index; value: `TriggersTable` index
+ hashTextPan: THashIntInt = nil;
+ hashLiftPan: THashIntInt = nil;
+ hashDoorPan: THashIntInt = nil;
+ hashShotPan: THashIntInt = nil;
begin
- gMapGrid.Free();
- gMapGrid := nil;
- mapTree.Free();
- mapTree := nil;
+ mapGrid.Free();
+ mapGrid := nil;
+
+ gCurrentMap.Free();
+ gCurrentMap := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
- FillChar(texture, SizeOf(texture), 0);
+ mapReader := nil;
+ //FillChar(texture, SizeOf(texture), 0);
sfsGCDisable(); // temporary disable removing of temporary volumes
try
- // Çàãðóçêà WAD:
+ // Çàãðóçêà WAD:
FileName := g_ExtractWadName(Res);
e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
WAD.Free();
Exit;
end;
+
//k8: why loader ignores path here?
mapResName := g_ExtractFileName(Res);
if not WAD.GetMapResource(mapResName, Data, Len) then
WAD.Free();
- // Çàãðóçêà êàðòû:
- e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY);
+ if (Len < 4) then
+ begin
+ e_LogWritefln('invalid map file: ''%s''', [mapResName]);
+ FreeMem(Data);
+ exit;
+ end;
+
+ // Çàãðóçêà êàðòû:
+ e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
- MapReader := TMapReader_1.Create();
- if not MapReader.LoadMap(Data) then
- begin
+ try
+ mapReader := g_Map_ParseMap(Data, Len);
+ except
+ mapReader.Free();
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]));
FreeMem(Data);
- MapReader.Free();
Exit;
end;
FreeMem(Data);
+
+ hashTextPan := hashNewIntInt();
+ hashLiftPan := hashNewIntInt();
+ hashDoorPan := hashNewIntInt();
+ hashShotPan := hashNewIntInt();
+
generateExternalResourcesList(MapReader);
- // Çàãðóçêà òåêñòóð:
- g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False);
- _textures := MapReader.GetTextures();
- _texnummap := nil;
+ //_textures := GetTextures(mapReader);
+ _textures := mapReader['texture'];
+ //_texnummap := nil;
+ // get all other lists here too
+ //panels := GetPanels(mapReader);
+ panels := mapReader['panel'];
+ //triggers := GetTriggers(mapReader);
+ triggers := mapReader['trigger'];
+ //items := GetItems(mapReader);
+ items := mapReader['item'];
+ //areas := GetAreas(mapReader);
+ areas := mapReader['area'];
+ //monsters := GetMonsters(mapReader);
+ monsters := mapReader['monster'];
+
+ // Çàãðóçêà îïèñàíèÿ êàðòû:
+ e_WriteLog(' Reading map info...', MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False);
+ //Header := GetMapHeader(mapReader);
- // Äîáàâëåíèå òåêñòóð â Textures[]:
- if _textures <> nil then
+ with gMapInfo do
+ begin
+ Name := mapReader.MapName;
+ Description := mapReader.MapDesc;
+ Author := mapReader.MapAuthor;
+ MusicName := mapReader.MusicName;
+ SkyName := mapReader.SkyName;
+ Height := mapReader.Height;
+ Width := mapReader.Width;
+ end;
+
+ // Çàãðóçêà òåêñòóð:
+ g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False);
+ // Äîáàâëåíèå òåêñòóð â Textures[]:
+ if (_textures <> nil) and (_textures.count > 0) then
begin
e_WriteLog(' Loading textures:', MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], High(_textures), False);
- SetLength(_texnummap, length(_textures));
+ g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], _textures.count-1, False);
+ //SetLength(_texnummap, _textures.count);
- for a := 0 to High(_textures) do
+ cnt := -1;
+ for rec in _textures do
begin
- SetLength(s, 64);
- CopyMemory(@s[1], @_textures[a].Resource[0], 64);
- for b := 1 to Length(s) do
- if s[b] = #0 then
- begin
- SetLength(s, b-1);
- Break;
- end;
- e_WriteLog(Format(' Loading texture #%d: %s', [a, s]), MSG_NOTIFY);
+ Inc(cnt);
+ s := rec.Resource;
+ {$IF DEFINED(D2F_DEBUG_TXLOAD)}
+ e_WriteLog(Format(' Loading texture #%d: %s', [cnt, s]), MSG_NOTIFY);
+ {$ENDIF}
//if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY);
- // Àíèìèðîâàííàÿ òåêñòóðà:
- if ByteBool(_textures[a].Anim) then
- begin
- ntn := CreateAnimTexture(_textures[a].Resource, FileName, True);
- if ntn < 0 then
- begin
- g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s]));
- ntn := CreateNullTexture(_textures[a].Resource);
- end;
- end
- else // Îáû÷íàÿ òåêñòóðà:
- ntn := CreateTexture(_textures[a].Resource, FileName, True);
- if ntn < 0 then
- begin
- g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s]));
- ntn := CreateNullTexture(_textures[a].Resource);
- end;
+ if rec.Anim then
+ begin
+ // Àíèìèðîâàííàÿ òåêñòóðà
+ ntn := CreateAnimTexture(rec.Resource, FileName, True);
+ if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s]));
+ end
+ else
+ begin
+ // Îáû÷íàÿ òåêñòóðà
+ ntn := CreateTexture(rec.Resource, FileName, True);
+ if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s]));
+ end;
+ if (ntn < 0) then ntn := CreateNullTexture(rec.Resource);
- _texnummap[a] := ntn; // fix texture number
+ //_texnummap[a] := ntn; // fix texture number
+ rec.tagInt := ntn;
g_Game_StepLoading();
end;
+
+ // set panel tagInt to texture index
+ if (panels <> nil) then
+ begin
+ for rec in panels do
+ begin
+ texrec := rec.TextureRec;
+ if (texrec = nil) then rec.tagInt := -1 else rec.tagInt := texrec.tagInt;
+ end;
+ end;
end;
- // Çàãðóçêà òðèããåðîâ:
+ // Çàãðóçêà òðèããåðîâ
gTriggerClientID := 0;
e_WriteLog(' Loading triggers...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False);
- triggers := MapReader.GetTriggers();
- // Çàãðóçêà ïàíåëåé:
+ // Çàãðóçêà ïàíåëåé
e_WriteLog(' Loading panels...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False);
- panels := MapReader.GetPanels();
// check texture numbers for panels
- for a := 0 to High(panels) do
+ if (panels <> nil) and (panels.count > 0) then
begin
- if panels[a].TextureNum > High(_textures) then
+ for rec in panels do
begin
- e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
- result := false;
- exit;
+ if (rec.tagInt < 0) then
+ begin
+ e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
+ result := false;
+ exit;
+ end;
end;
- panels[a].TextureNum := _texnummap[panels[a].TextureNum];
end;
- // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì):
- if triggers <> nil then
+ // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì)
+ if (triggers <> nil) and (triggers.count > 0) then
begin
e_WriteLog(' Setting up trigger table...', MSG_NOTIFY);
- SetLength(TriggersTable, Length(triggers));
- g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], High(TriggersTable), False);
+ //SetLength(TriggersTable, triggers.count);
+ g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False);
- for a := 0 to High(TriggersTable) do
+ for rec in triggers do
begin
- // Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè):
- TriggersTable[a].TexturePanel := triggers[a].TexturePanel;
- // Ëèôòû:
- if triggers[a].TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then
- TriggersTable[a].LiftPanel := TTriggerData(triggers[a].DATA).PanelID
- else
- TriggersTable[a].LiftPanel := -1;
- // Äâåðè:
- if triggers[a].TriggerType in [TRIGGER_OPENDOOR,
- TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5,
- TRIGGER_CLOSETRAP, TRIGGER_TRAP] then
- TriggersTable[a].DoorPanel := TTriggerData(triggers[a].DATA).PanelID
- else
- TriggersTable[a].DoorPanel := -1;
- // Òóðåëü:
- if triggers[a].TriggerType = TRIGGER_SHOT then
- TriggersTable[a].ShotPanel := TTriggerData(triggers[a].DATA).ShotPanelID
- else
- TriggersTable[a].ShotPanel := -1;
+ SetLength(TriggersTable, Length(TriggersTable)+1);
+ pttit := @TriggersTable[High(TriggersTable)];
+ pttit.trigrec := rec;
+ pttit.texPan := mapReader.panel[rec.TexturePanel];
+ pttit.liftPan := nil;
+ pttit.doorPan := nil;
+ pttit.shotPan := nil;
+ pttit.texPanIdx := -1;
+ pttit.LiftPanelIdx := -1;
+ pttit.DoorPanelIdx := -1;
+ pttit.ShotPanelIdx := -1;
+ // Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè)
+ //if (rec.TexturePanel >= 0) and (pttit.texPan = nil) then e_WriteLog('error loading map: invalid texture panel index for trigger', MSG_WARNING);
+ // Ëèôòû
+ if rec.TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then
+ begin
+ //pttit.LiftPanel := TTriggerData(rec.DATA).PanelID
+ pttit.liftPan := mapReader.panel[rec.trigRec.tgPanelID];
+ //if (rec.trigRec.trigPanelID >= 0) and (pttit.liftPan = nil) then e_WriteLog('error loading map: invalid lift panel index for trigger', MSG_WARNING);
+ end;
+ // Äâåðè
+ if rec.TriggerType in [TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, TRIGGER_CLOSETRAP, TRIGGER_TRAP] then
+ begin
+ //pttit.DoorPanel := TTriggerData(rec.DATA).PanelID
+ pttit.doorPan := mapReader.panel[rec.trigRec.tgPanelID];
+ end;
+ // Òóðåëü
+ if (rec.TriggerType = TRIGGER_SHOT) then
+ begin
+ //pttit.ShotPanel := TTriggerData(rec.DATA).ShotPanelID
+ pttit.shotPan := mapReader.panel[rec.trigRec.tgShotPanelID];
+ end;
+
+ // update hashes
+ if (pttit.texPan <> nil) then hashTextPan.put(rec.TexturePanel, High(TriggersTable));
+ if (pttit.liftPan <> nil) then hashLiftPan.put(rec.trigRec.tgPanelID, High(TriggersTable));
+ if (pttit.doorPan <> nil) then hashDoorPan.put(rec.trigRec.tgPanelID, High(TriggersTable));
+ if (pttit.shotPan <> nil) then hashShotPan.put(rec.trigRec.tgShotPanelID, High(TriggersTable));
g_Game_StepLoading();
end;
end;
- // Ñîçäàåì ïàíåëè:
- if panels <> nil then
+ // Ñîçäàåì ïàíåëè
+ if (panels <> nil) and (panels.count > 0) then
begin
e_WriteLog(' Setting up trigger links...', MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], High(panels), False);
+ g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], panels.count-1, False);
- for a := 0 to High(panels) do
+ pannum := -1;
+ for rec in panels do
begin
+ Inc(pannum);
+ texrec := nil;
SetLength(AddTextures, 0);
trigRef := False;
CurTex := -1;
- if _textures <> nil then
- begin
- texture := _textures[panels[a].TextureNum];
- ok := True;
- end
- else
- ok := False;
+ ok := false;
+
+ if (_textures <> nil) then
+ begin
+ texrec := rec.TextureRec;
+ ok := (texrec <> nil);
+ end;
if ok then
begin
- // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû.
- // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð:
- ok := False;
+ // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû.
+ // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð
+ ok := false;
if (TriggersTable <> nil) and (_textures <> nil) then
+ begin
for b := 0 to High(TriggersTable) do
- if (TriggersTable[b].TexturePanel = a)
- or (TriggersTable[b].ShotPanel = a) then
+ begin
+ if (TriggersTable[b].texPan = rec) or (TriggersTable[b].shotPan = rec) then
begin
trigRef := True;
ok := True;
- Break;
+ break;
end;
+ end;
+ end;
end;
if ok then
- begin // Åñòü ññûëêè òðèããåðîâ íà ýòó ïàíåëü
- SetLength(s, 64);
- CopyMemory(@s[1], @texture.Resource[0], 64);
- // Èçìåðÿåì äëèíó:
- Len := Length(s);
- for c := Len downto 1 do
- if s[c] <> #0 then
- begin
- Len := c;
- Break;
- end;
- SetLength(s, Len);
+ begin
+ // Åñòü ññûëêè òðèããåðîâ íà ýòó ïàíåëü
+ s := texrec.Resource;
- // Ñïåö-òåêñòóðû çàïðåùåíû:
+ // Ñïåö-òåêñòóðû çàïðåùåíû
if g_Map_IsSpecialTexture(s) then
- ok := False
+ begin
+ ok := false
+ end
else
- // Îïðåäåëÿåì íàëè÷èå è ïîëîæåíèå öèôð â êîíöå ñòðîêè:
+ begin
+ // Îïðåäåëÿåì íàëè÷èå è ïîëîæåíèå öèôð â êîíöå ñòðîêè
ok := g_Texture_NumNameFindStart(s);
+ end;
- // Åñëè ok, çíà÷èò åñòü öèôðû â êîíöå.
- // Çàãðóæàåì òåêñòóðû ñ îñòàëüíûìè #:
+ // Åñëè ok, çíà÷èò åñòü öèôðû â êîíöå.
+ // Çàãðóæàåì òåêñòóðû ñ îñòàëüíûìè #
if ok then
begin
k := NNF_NAME_BEFORE;
- // Öèêë ïî èçìåíåíèþ èìåíè òåêñòóðû:
- while ok or (k = NNF_NAME_BEFORE) or
- (k = NNF_NAME_EQUALS) do
+ // Öèêë ïî èçìåíåíèþ èìåíè òåêñòóðû
+ while ok or (k = NNF_NAME_BEFORE) or (k = NNF_NAME_EQUALS) do
begin
k := g_Texture_NumNameFindNext(TexName);
- if (k = NNF_NAME_BEFORE) or
- (k = NNF_NAME_AFTER) then
+ if (k = NNF_NAME_BEFORE) or (k = NNF_NAME_AFTER) then
+ begin
+ // Ïðîáóåì äîáàâèòü íîâóþ òåêñòóðó
+ if texrec.Anim then
+ begin
+ // Íà÷àëüíàÿ - àíèìèðîâàííàÿ, èùåì àíèìèðîâàííóþ
+ isAnim := True;
+ ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ if not ok then
+ begin
+ // Íåò àíèìèðîâàííîé, èùåì îáû÷íóþ
+ isAnim := False;
+ ok := CreateTexture(TexName, FileName, False) >= 0;
+ end;
+ end
+ else
+ begin
+ // Íà÷àëüíàÿ - îáû÷íàÿ, èùåì îáû÷íóþ
+ isAnim := False;
+ ok := CreateTexture(TexName, FileName, False) >= 0;
+ if not ok then
+ begin
+ // Íåò îáû÷íîé, èùåì àíèìèðîâàííóþ
+ isAnim := True;
+ ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ end;
+ end;
+
+ // Îíà ñóùåñòâóåò. Çàíîñèì åå ID â ñïèñîê ïàíåëè
+ if ok then
begin
- // Ïðîáóåì äîáàâèòü íîâóþ òåêñòóðó:
- if ByteBool(texture.Anim) then
- begin // Íà÷àëüíàÿ - àíèìèðîâàííàÿ, èùåì àíèìèðîâàííóþ
- isAnim := True;
- ok := CreateAnimTexture(TexName, FileName, False) >= 0;
- if not ok then
- begin // Íåò àíèìèðîâàííîé, èùåì îáû÷íóþ
- isAnim := False;
- ok := CreateTexture(TexName, FileName, False) >= 0;
- end;
- end
- else
- begin // Íà÷àëüíàÿ - îáû÷íàÿ, èùåì îáû÷íóþ
- isAnim := False;
- ok := CreateTexture(TexName, FileName, False) >= 0;
- if not ok then
- begin // Íåò îáû÷íîé, èùåì àíèìèðîâàííóþ
- isAnim := True;
- ok := CreateAnimTexture(TexName, FileName, False) >= 0;
- end;
- end;
-
- // Îíà ñóùåñòâóåò. Çàíîñèì åå ID â ñïèñîê ïàíåëè:
- if ok then
+ for c := 0 to High(Textures) do
begin
- for c := 0 to High(Textures) do
- if Textures[c].TextureName = TexName then
- begin
- SetLength(AddTextures, Length(AddTextures)+1);
- AddTextures[High(AddTextures)].Texture := c;
- AddTextures[High(AddTextures)].Anim := isAnim;
- Break;
- end;
+ if (Textures[c].TextureName = TexName) then
+ begin
+ SetLength(AddTextures, Length(AddTextures)+1);
+ AddTextures[High(AddTextures)].Texture := c;
+ AddTextures[High(AddTextures)].Anim := isAnim;
+ break;
+ end;
end;
- end
+ end;
+ end
else
+ begin
if k = NNF_NAME_EQUALS then
- begin
- // Çàíîñèì òåêóùóþ òåêñòóðó íà ñâîå ìåñòî:
- SetLength(AddTextures, Length(AddTextures)+1);
- AddTextures[High(AddTextures)].Texture := panels[a].TextureNum;
- AddTextures[High(AddTextures)].Anim := ByteBool(texture.Anim);
- CurTex := High(AddTextures);
- ok := True;
- end
+ begin
+ // Çàíîñèì òåêóùóþ òåêñòóðó íà ñâîå ìåñòî
+ SetLength(AddTextures, Length(AddTextures)+1);
+ //AddTextures[High(AddTextures)].Texture := _texnummap[rec.TextureNum]; //panels[a].TextureNum;
+ AddTextures[High(AddTextures)].Texture := rec.tagInt; //panels[a].TextureNum;
+ AddTextures[High(AddTextures)].Anim := texrec.Anim;
+ CurTex := High(AddTextures);
+ ok := true;
+ end
else // NNF_NO_NAME
- ok := False;
+ begin
+ ok := false;
+ end;
+ end;
end; // while ok...
- ok := True;
+ ok := true;
end; // if ok - åñòü ñìåæíûå òåêñòóðû
end; // if ok - ññûëàþòñÿ òðèããåðû
if not ok then
begin
- // Çàíîñèì òîëüêî òåêóùóþ òåêñòóðó:
+ // Çàíîñèì òîëüêî òåêóùóþ òåêñòóðó
SetLength(AddTextures, 1);
- AddTextures[0].Texture := panels[a].TextureNum;
- AddTextures[0].Anim := ByteBool(texture.Anim);
+ AddTextures[0].Texture := rec.tagInt; //panels[a].TextureNum;
+ AddTextures[0].Anim := false;
+ if (texrec <> nil) then AddTextures[0].Anim := texrec.Anim;
CurTex := 0;
end;
//e_WriteLog(Format('panel #%d: TextureNum=%d; ht=%d; ht1=%d; atl=%d', [a, panels[a].TextureNum, High(_textures), High(Textures), High(AddTextures)]), MSG_NOTIFY);
- // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð:
- PanelID := CreatePanel(panels[a], AddTextures, CurTex, trigRef);
+ // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð
+ PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef);
+ //e_LogWritefln('panel #%s of type %s got id #%s', [pannum, rec.PanelType, PanelID]);
- // Åñëè èñïîëüçóåòñÿ â òðèããåðàõ, òî ñòàâèì òî÷íûé ID:
- if TriggersTable <> nil then
+ // Åñëè èñïîëüçóåòñÿ â òðèããåðàõ, òî ñòàâèì òî÷íûé ID
+ if hashTextPan.get(pannum, b) then TriggersTable[b].texPanIdx := PanelID;
+ if hashLiftPan.get(pannum, b) then TriggersTable[b].LiftPanelIdx := PanelID;
+ if hashDoorPan.get(pannum, b) then TriggersTable[b].DoorPanelIdx := PanelID;
+ if hashShotPan.get(pannum, b) then TriggersTable[b].ShotPanelIdx := PanelID;
+
+ (*
+ if (TriggersTable <> nil) then
+ begin
for b := 0 to High(TriggersTable) do
begin
- // Òðèããåð äâåðè/ëèôòà:
- if (TriggersTable[b].LiftPanel = a) or
- (TriggersTable[b].DoorPanel = a) then
- TTriggerData(triggers[b].DATA).PanelID := PanelID;
- // Òðèããåð ñìåíû òåêñòóðû:
- if TriggersTable[b].TexturePanel = a then
- triggers[b].TexturePanel := PanelID;
- // Òðèããåð "Òóðåëü":
- if TriggersTable[b].ShotPanel = a then
- TTriggerData(triggers[b].DATA).ShotPanelID := PanelID;
+ if (TriggersTable[b].texPan = rec) then TriggersTable[b].texPanIdx := PanelID;
+ if (TriggersTable[b].liftPan = rec) then TriggersTable[b].LiftPanelIdx := PanelID;
+ if (TriggersTable[b].doorPan = rec) then TriggersTable[b].DoorPanelIdx := PanelID;
+ if (TriggersTable[b].shotPan = rec) then TriggersTable[b].ShotPanelIdx := PanelID;
+ {
+ // Òðèããåð äâåðè/ëèôòà
+ if (TriggersTable[b].LiftPanel = pannum) or
+ (TriggersTable[b].DoorPanel = pannum) then
+ //TTriggerData(TriggersTable[b].trigrec.DATA).PanelID := PanelID;
+ TriggersTable[b].trigrec.trigRec.trigPanelID := PanelID;
+ // Òðèããåð ñìåíû òåêñòóðû
+ if TriggersTable[b].texPanIdx = pannum then
+ TriggersTable[b].trigrec.TexturePanel := PanelID;
+ // Òðèããåð "Òóðåëü"
+ if TriggersTable[b].ShotPanel = pannum then
+ TriggersTable[b].trigrec.trigRec.trigShotPanelID := PanelID;
+ }
end;
+ end;
+ *)
g_Game_StepLoading();
end;
end;
- // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû:
- if (triggers <> nil) and not gLoadGameMode then
+ (*
+ begin
+ for b := 0 to High(TriggersTable) do
+ begin
+ // Òðèããåð äâåðè/ëèôòà
+ if (TriggersTable[b].texPan <> nil) then e_LogWritefln('trigger #%s: textPan=%s; panidx=%s', [b, TriggersTable[b].texPanIdx, mapReader.panelIndex[TriggersTable[b].texPan]]);
+ if (TriggersTable[b].liftPan <> nil) then e_LogWritefln('trigger #%s: liftPan=%s; panidx=%s', [b, TriggersTable[b].LiftPanelIdx, mapReader.panelIndex[TriggersTable[b].liftPan]]);
+ if (TriggersTable[b].doorPan <> nil) then e_LogWritefln('trigger #%s: doorPan=%s; panidx=%s', [b, TriggersTable[b].DoorPanelIdx, mapReader.panelIndex[TriggersTable[b].doorPan]]);
+ if (TriggersTable[b].shotPan <> nil) then e_LogWritefln('trigger #%s: shotPan=%s; panidx=%s', [b, TriggersTable[b].ShotPanelIdx, mapReader.panelIndex[TriggersTable[b].shotPan]]);
+ end;
+ end;
+ *)
+
+ // create map grid, init other grids (for monsters, for example)
+ e_WriteLog('Creating map grid', MSG_NOTIFY);
+ mapCreateGrid();
+
+ // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû
+ if (triggers <> nil) and (panels <> nil) and (not gLoadGameMode) then
begin
- e_WriteLog(' Creating triggers...', MSG_NOTIFY);
+ e_LogWritefln(' Creating triggers (%d)...', [triggers.count]);
g_Game_SetLoadingText(_lc[I_LOAD_CREATE_TRIGGERS], 0, False);
- // Óêàçûâàåì òèï ïàíåëè, åñëè åñòü:
- for a := 0 to High(triggers) do
+ // Óêàçûâàåì òèï ïàíåëè, åñëè åñòü
+ trignum := -1;
+ for rec in triggers do
begin
- if triggers[a].TexturePanel <> -1 then
- b := panels[TriggersTable[a].TexturePanel].PanelType
+ Inc(trignum);
+ if (TriggersTable[trignum].texPan <> nil) then b := TriggersTable[trignum].texPan.PanelType else b := 0;
+ if (TriggersTable[trignum].shotPan <> nil) then c := TriggersTable[trignum].shotPan.PanelType else c := 0;
+ (*
+ if (rec.TexturePanel <> -1) then
+ begin
+ {
+ if (TriggersTable[trignum].TexturePanel < 0) or (TriggersTable[trignum].TexturePanel >= panels.count) then
+ begin
+ e_WriteLog('error loading map: invalid panel index for trigger', MSG_FATALERROR);
+ result := false;
+ exit;
+ end;
+ }
+ //b := panels[TriggersTable[a].TexturePanel].PanelType;
+ //b := mapReader.panel[TriggersTable[trignum].texPanIdx].PanelType;
+ assert(TriggersTable[trignum].texPanIdx >= 0);
+ b := TriggersTable[trignum].texPanIdx;
+ end
else
+ begin
b := 0;
- if (triggers[a].TriggerType = TRIGGER_SHOT) and
- (TTriggerData(triggers[a].DATA).ShotPanelID <> -1) then
- c := panels[TriggersTable[a].ShotPanel].PanelType
+ end;
+ e_LogWritefln('trigger #%s: type=%s; texPanIdx=%s; b=%s', [trignum, rec.TriggerType, TriggersTable[trignum].texPanIdx, b]);
+ if (rec.TriggerType = TRIGGER_SHOT) then e_LogWritefln(' SHOT: shotpanidx=%s', [rec.trigRec.trigShotPanelID]);
+ if (rec.TriggerType = TRIGGER_SHOT) and {(rec.trigRec.trigShotPanelID <> -1)} (TriggersTable[trignum].shotPan <> nil) then
+ begin
+ //c := panels[TriggersTable[a].ShotPanel].PanelType;
+ //c := mapReader.panel[TriggersTable[trignum].ShotPanel].PanelType;
+ assert(TriggersTable[trignum].ShotPanelIdx >= 0);
+ c := TriggersTable[trignum].ShotPanelIdx;
+ end
else
+ begin
c := 0;
- CreateTrigger(triggers[a], b, c);
+ end;
+ *)
+ //e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]);
+ CreateTrigger(rec, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx, Word(b), Word(c));
end;
end;
- // Çàãðóçêà ïðåäìåòîâ:
- e_WriteLog(' Loading triggers...', MSG_NOTIFY);
+ // Çàãðóçêà ïðåäìåòîâ
+ e_WriteLog(' Loading items...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_ITEMS], 0, False);
- items := MapReader.GetItems();
- // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû:
+ // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû
if (items <> nil) and not gLoadGameMode then
begin
e_WriteLog(' Spawning items...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_CREATE_ITEMS], 0, False);
- for a := 0 to High(items) do
- CreateItem(Items[a]);
+ for rec in items do CreateItem(rec);
end;
- // Çàãðóçêà îáëàñòåé:
+ // Çàãðóçêà îáëàñòåé
e_WriteLog(' Loading areas...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_AREAS], 0, False);
- areas := MapReader.GetAreas();
- // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè:
+ // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè
if areas <> nil then
begin
e_WriteLog(' Creating areas...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_CREATE_AREAS], 0, False);
- for a := 0 to High(areas) do
- CreateArea(areas[a]);
+ for rec in areas do CreateArea(rec);
end;
- // Çàãðóçêà ìîíñòðîâ:
+ // Çàãðóçêà ìîíñòðîâ
e_WriteLog(' Loading monsters...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_MONSTERS], 0, False);
- monsters := MapReader.GetMonsters();
gTotalMonsters := 0;
- // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ:
+ // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ
if (monsters <> nil) and not gLoadGameMode then
begin
e_WriteLog(' Spawning monsters...', MSG_NOTIFY);
g_Game_SetLoadingText(_lc[I_LOAD_CREATE_MONSTERS], 0, False);
- for a := 0 to High(monsters) do
- CreateMonster(monsters[a]);
+ for rec in monsters do CreateMonster(rec);
end;
- // Çàãðóçêà îïèñàíèÿ êàðòû:
- e_WriteLog(' Reading map info...', MSG_NOTIFY);
- g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False);
- Header := MapReader.GetMapHeader();
-
- MapReader.Free();
-
- with gMapInfo do
- begin
- Name := Header.MapName;
- Description := Header.MapDescription;
- Author := Header.MapAuthor;
- MusicName := Header.MusicName;
- SkyName := Header.SkyName;
- Height := Header.Height;
- Width := Header.Width;
- end;
+ //MapReader.Free();
+ gCurrentMap := mapReader;
+ mapReader := nil;
- // Çàãðóçêà íåáà:
+ // Çàãðóçêà íåáà
if gMapInfo.SkyName <> '' then
begin
e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
end;
- // Çàãðóçêà ìóçûêè:
+ // Çàãðóçêà ìóçûêè
ok := False;
if gMapInfo.MusicName <> '' then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MUSIC], [s]));
end;
- // Îñòàëüíûå óñòàíâêè:
+ // Îñòàëüíûå óñòàíâêè
CreateDoorMap();
CreateLiftMap();
g_Weapon_Init();
g_Monsters_Init();
- // Åñëè íå LoadState, òî ñîçäàåì êàðòó ñòîëêíîâåíèé:
- if not gLoadGameMode then
- g_GFX_Init();
+ // Åñëè íå LoadState, òî ñîçäàåì êàðòó ñòîëêíîâåíèé:
+ if not gLoadGameMode then g_GFX_Init();
- // Ñáðîñ ëîêàëüíûõ ìàññèâîâ:
+ // Ñáðîñ ëîêàëüíûõ ìàññèâîâ:
_textures := nil;
panels := nil;
items := nil;
TriggersTable := nil;
AddTextures := nil;
- // Âêëþ÷àåì ìóçûêó, åñëè ýòî íå çàãðóçêà:
+ // Âêëþ÷àåì ìóçûêó, åñëè ýòî íå çàãðóçêà:
if ok and (not gLoadGameMode) then
- begin
- gMusic.SetByName(gMapInfo.MusicName);
- gMusic.Play();
- end
+ begin
+ gMusic.SetByName(gMapInfo.MusicName);
+ gMusic.Play();
+ end
else
+ begin
gMusic.SetByName('');
+ end;
finally
sfsGCEnable(); // enable releasing unused volumes
+ mapReader.Free();
+ hashTextPan.Free();
+ hashLiftPan.Free();
+ hashDoorPan.Free();
+ hashShotPan.Free();
end;
- e_WriteLog('Creating map grid', MSG_NOTIFY);
- mapCreateGrid();
-
e_WriteLog('Done loading map.', MSG_NOTIFY);
Result := True;
end;
function g_Map_GetMapInfo(Res: String): TMapInfo;
var
WAD: TWADFile;
- MapReader: TMapReader_1;
- Header: TMapHeaderRec_1;
+ MapReader: TDynRecord;
+ //Header: TMapHeaderRec_1;
FileName: String;
Data: Pointer;
Len: Integer;
WAD.Free();
+ {
MapReader := TMapReader_1.Create();
-
if not MapReader.LoadMap(Data) then
begin
g_Console_Add(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]), True);
Result.Name := Header.MapName;
Result.Description := Header.MapDescription;
end;
+ }
+ try
+ mapReader := g_Map_ParseMap(Data, Len);
+ except
+ mapReader := nil;
+ end;
FreeMem(Data);
- MapReader.Free();
+ //MapReader.Free();
+
+ //if (mapReader <> nil) then Header := GetMapHeader(mapReader) else FillChar(Header, sizeof(Header), 0);
+ //MapReader.Free();
+
+ if (mapReader.Width > 0) and (mapReader.Height > 0) then
+ begin
+ Result.Name := mapReader.MapName;
+ Result.Description := mapReader.MapDesc;
+ Result.Map := Res;
+ Result.Author := mapReader.MapAuthor;
+ Result.Height := mapReader.Height;
+ Result.Width := mapReader.Width;
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]), True);
+ //ZeroMemory(@Header, SizeOf(Header));
+ Result.Name := _lc[I_GAME_ERROR_MAP_SELECT];
+ Result.Description := _lc[I_GAME_ERROR_MAP_SELECT];
+ Result.Map := Res;
+ Result.Author := '';
+ Result.Height := 0;
+ Result.Width := 0;
+ end;
- Result.Map := Res;
- Result.Author := Header.MapAuthor;
- Result.Height := Header.Height;
- Result.Width := Header.Width;
+ mapReader.Free();
end;
function g_Map_GetMapsList(WADName: string): SArray;
if Textures[a].Anim then
g_Frames_DeleteByID(Textures[a].FramesID)
else
- if Textures[a].TextureID <> TEXTURE_NONE then
+ if Textures[a].TextureID <> LongWord(TEXTURE_NONE) then
e_DeleteTexture(Textures[a].TextureID);
Textures := nil;
end;
-procedure g_Map_DrawPanelsOld(PanelType: Word);
+// old algo
+procedure g_Map_DrawPanels (PanelType: Word);
- procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
+ procedure DrawPanels (constref panels: TPanelArray; drawDoors: Boolean=False);
var
idx: Integer;
begin
- if (panels <> nil) and (stp >= 0) and (stp <= 6) then
+ if (panels <> nil) then
begin
// alas, no visible set
for idx := 0 to High(panels) do
begin
case PanelType of
- PANEL_WALL: DrawPanels(0, gWalls);
- PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
- PANEL_BACK: DrawPanels(1, gRenderBackgrounds);
- PANEL_FORE: DrawPanels(2, gRenderForegrounds);
- PANEL_WATER: DrawPanels(3, gWater);
- PANEL_ACID1: DrawPanels(4, gAcid1);
- PANEL_ACID2: DrawPanels(5, gAcid2);
- PANEL_STEP: DrawPanels(6, gSteps);
+ PANEL_WALL: DrawPanels(gWalls);
+ PANEL_CLOSEDOOR: DrawPanels(gWalls, True);
+ PANEL_BACK: DrawPanels(gRenderBackgrounds);
+ PANEL_FORE: DrawPanels(gRenderForegrounds);
+ PANEL_WATER: DrawPanels(gWater);
+ PANEL_ACID1: DrawPanels(gAcid1);
+ PANEL_ACID2: DrawPanels(gAcid2);
+ PANEL_STEP: DrawPanels(gSteps);
end;
end;
-var
- gDrawPanelList: TBinaryHeapObj = nil;
-
-function dplLess (a, b: TObject): Boolean;
-begin
- result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx);
-end;
-
-procedure dplClear ();
-begin
- if gDrawPanelList = nil then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear();
-end;
-
-procedure dplAddPanel (pan: TPanel);
-begin
- if pan = nil then exit;
- gDrawPanelList.insert(pan);
-end;
-
-
-procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word);
-var
- ptag: Integer;
-
- function checker (obj: TObject; tag: Integer): Boolean;
- var
- pan: TPanel;
- begin
- result := false; // don't stop, ever
- if (tag <> ptag) then exit;
- //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
-
- if obj = nil then begin e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
- if not (obj is TPanel) then begin e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end;
- //pan := (obj as TPanel);
- //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
-
- pan := (obj as TPanel);
- if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end;
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- end;
+// new algo
+procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
+ function checker (pan: TPanel; tag: Integer): Boolean;
begin
result := false; // don't stop, ever
- pan := (obj as TPanel);
- if (pan.tag <> ptag) then exit;
- if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end;
- //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY);
- dplAddPanel(pan);
- end;
-
- procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False);
- var
- idx: Integer;
- pan: TPanel;
- begin
- if (panels <> nil) and (stp >= 0) and (stp <= 6) then
- begin
- // alas, no visible set
- for idx := 0 to High(panels) do
- begin
- if not (drawDoors xor panels[idx].Door) then
- begin
- pan := panels[idx];
- {
- if (pan.Width < 1) or (pan.Height < 1) then continue;
- if (pan.X+pan.Width <= x0) or (pan.Y+pan.Height <= y0) then continue;
- if (pan.X >= x0+wdt) or (pan.Y >= y0+hgt) then continue;
- }
- pan.Draw();
- //e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY);
- end;
- end;
- end;
+ if ((tag and GridTagDoor) <> 0) <> pan.Door then exit;
+ gDrawPanelList.insert(pan);
end;
begin
- //g_Map_DrawPanelsOld(PanelType); exit;
- //e_WriteLog('==================', MSG_NOTIFY);
- //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
dplClear();
- ptag := panelTypeToTag(PanelType);
-
- if gdbg_map_use_grid_render then
- begin
- if gdbg_map_use_tree_draw then
- begin
- mapTree.aabbQuery(x0, y0, wdt, hgt, checkerTree);
- end
- else
- begin
- gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker);
- end;
- // sort and draw the list (we need to sort it, or rendering is fucked)
- while gDrawPanelList.count > 0 do
- begin
- (gDrawPanelList.front() as TPanel).Draw();
- gDrawPanelList.popFront();
- end;
- end
- else
- begin
- //e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY);
- case PanelType of
- PANEL_WALL: DrawPanels(0, gWalls);
- PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True);
- PANEL_BACK: DrawPanels(1, gRenderBackgrounds);
- PANEL_FORE: DrawPanels(2, gRenderForegrounds);
- PANEL_WATER: DrawPanels(3, gWater);
- PANEL_ACID1: DrawPanels(4, gAcid1);
- PANEL_ACID2: DrawPanels(5, gAcid2);
- PANEL_STEP: DrawPanels(6, gSteps);
- end;
- end;
-
- //e_WriteLog('==================', MSG_NOTIFY);
+ //tagmask := panelTypeToTag(PanelType);
+ mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask);
+ // list will be rendered in `g_game.DrawPlayer()`
end;
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
- function checker (obj: TObject; tag: Integer): Boolean;
- var
- pan: TPanel;
- begin
- result := false; // don't stop, ever
- if (tag <> GridTagWallDoor) then exit; // only walls
- pan := (obj as TPanel);
- pan.DrawShadowVolume(lightX, lightY, radius);
- end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
+ function checker (pan: TPanel; tag: Integer): Boolean;
begin
result := false; // don't stop, ever
- pan := (obj as TPanel);
- if (pan.tag <> GridTagWallDoor) then exit; // only walls
pan.DrawShadowVolume(lightX, lightY, radius);
end;
begin
- if gdbg_map_use_tree_draw then
- begin
- mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checkerTree);
- end
- else
- begin
- gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker);
- end;
+ mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
end;
end;
function g_Map_CollidePanelOld(X, Y: Integer; Width, Height: Word;
- PanelType: Word; b1x3: Boolean): Boolean;
+ PanelType: Word; b1x3: Boolean=false): Boolean;
var
a, h: Integer;
begin
@@ -2154,7 +2595,7 @@ function g_Map_CollideLiquid_TextureOld(X, Y: Integer; Width, Height: Word): DWO
var
texid: DWORD;
- function checkPanels (var panels: TPanelArray): Boolean;
+ function checkPanels (constref panels: TPanelArray): Boolean;
var
a: Integer;
begin
end;
begin
- texid := TEXTURE_NONE;
+ texid := LongWord(TEXTURE_NONE);
result := texid;
if not checkPanels(gWater) then
if not checkPanels(gAcid1) then
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean;
-
- function checker (obj: TObject; tag: Integer): Boolean;
- var
- pan: TPanel;
- a: Integer;
+const
+ SlowMask = GridTagLift or GridTagBlockMon;
+ function checker (pan: TPanel; tag: Integer): Boolean;
begin
- result := false; // don't stop, ever
-
- //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
-
- if obj = nil then
- begin
- e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
- end;
- if not (obj is TPanel) then
+ {
+ if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
begin
- e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY);
+ result := pan.Enabled;
exit;
end;
+ }
- pan := (obj as TPanel);
- a := pan.ArrIdx;
-
- if WordBool(PanelType and PANEL_WALL) and (tag = GridTagWallDoor) then
- begin
- if gWalls[a].Enabled and g_Collide(X, Y, Width, Height, gWalls[a].X, gWalls[a].Y, gWalls[a].Width, gWalls[a].Height) then
- begin
- result := true;
- exit;
- end;
- end;
-
- if WordBool(PanelType and PANEL_WATER) and (tag = GridTagWater) then
- begin
- if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
- begin
- result := True;
- exit;
- end;
- end;
-
- if WordBool(PanelType and PANEL_ACID1) and (tag = GridTagAcid1) then
- begin
- if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
- begin
- result := True;
- exit;
- end;
- end;
-
- if WordBool(PanelType and PANEL_ACID2) and (tag = GridTagAcid2) then
- begin
- if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
- begin
- result := True;
- exit;
- end;
- end;
-
- if WordBool(PanelType and PANEL_STEP) and (tag = GridTagStep) then
- begin
- if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then
- begin
- result := True;
- exit;
- end;
- end;
-
- if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = GridTagLift) then
+ if ((tag and GridTagLift) <> 0) then
begin
- 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
- g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then
- begin
- result := true;
- exit;
- end;
+ 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
+ g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)};
+ exit;
end;
- if WordBool(PanelType and PANEL_BLOCKMON) and (tag = GridTagBlockMon) then
+ if ((tag and GridTagBlockMon) <> 0) then
begin
- if ((not b1x3) or ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64)) and
- g_Collide(X, Y, Width, Height, gBlockMon[a].X, gBlockMon[a].Y, gBlockMon[a].Width, gBlockMon[a].Height) then
- begin
- result := True;
- exit;
- end;
+ result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ exit;
end;
- end;
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- pan := (obj as TPanel);
- result := checker(obj, pan.tag);
+ // other shit
+ //result := g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height);
+ result := true; // i found her!
end;
+var
+ tagmask: Integer = 0;
begin
- //TODO: detailed profile
- if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('wall coldet');
- try
- if gdbg_map_use_grid_coldet then
+ 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_ACID2) then tagmask := tagmask or GridTagAcid2;
+ if WordBool(PanelType and PANEL_STEP) then tagmask := tagmask or GridTagStep;
+ 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 (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids');
+ if gdbg_map_use_accel_coldet then
+ begin
+ if (Width = 1) and (Height = 1) then
begin
- if gdbg_map_use_tree_coldet then
+ if ((tagmask and SlowMask) <> 0) then
begin
- mapTree.aabbQuery(X, Y, Width, Height, checkerTree);
+ // slow
+ result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil);
end
else
begin
- result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
+ // fast
+ result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
end;
end
else
begin
- result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
+ 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;
end;
- finally
- if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ end
+ else
+ begin
+ result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3);
end;
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
var
- cctype: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing)
+ 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 (obj: TObject; tag: Integer): Boolean;
- var
- pan: TPanel;
- a: Integer;
+ function checker (pan: TPanel; tag: Integer): Boolean;
begin
result := false; // don't stop, ever
- pan := (obj as TPanel);
- a := pan.ArrIdx;
- // water
- if (tag = GridTagWater) then
- begin
- if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then
- begin
- result := true; // water has highest priority, so stop right here
- texid := gWater[a].GetTextureID();
- exit;
- end;
- end;
- // acid1
- if (cctype > 1) and (tag = GridTagAcid1) then
- begin
- if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then
- begin
- cctype := 1;
- texid := gAcid1[a].GetTextureID();
- exit;
- end;
- end;
- // acid2
- if (cctype > 2) and (tag = GridTagAcid2) then
- begin
- if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then
- begin
- cctype := 2;
- texid := gAcid2[a].GetTextureID();
- exit;
- end;
+ //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;
- end;
-
- function checkerTree (obj: TObject): Boolean;
- var
- pan: TPanel;
- begin
- pan := (obj as TPanel);
- result := checker(obj, pan.tag);
+ // 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;
begin
- //TODO: detailed profile?
- if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquid coldet');
- try
- if gdbg_map_use_grid_coldet then
+ 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
- texid := TEXTURE_NONE;
- if gdbg_map_use_tree_coldet then
- begin
- mapTree.aabbQuery(X, Y, Width, Height, checkerTree);
- end
- else
- begin
- gMapGrid.forEachInAABB(X, Y, Width, Height, checker);
- end;
- result := texid;
+ mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end
else
begin
- result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
+ mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
- finally
- if (profMapCollision <> nil) then profMapCollision.sectionEnd();
+ result := texid;
+ end
+ else
+ begin
+ result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height);
end;
+ if (profMapCollision <> nil) then profMapCollision.sectionEnd();
end;
+
procedure g_Map_EnableWall(ID: DWORD);
+var
+ pan: TPanel;
begin
- with gWalls[ID] do
- begin
- Enabled := True;
- g_Mark(X, Y, Width, Height, MARK_DOOR, True);
+ pan := gWalls[ID];
+ pan.Enabled := True;
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, True);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
- end;
+ mapGrid.proxyEnabled[pan.proxyId] := true;
+ //if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := true
+ //else pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, GridTagDoor);
+
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(gWalls[ID].PanelType, ID);
+
+ {$IFDEF MAP_DEBUG_ENABLED_FLAG}
+ //e_WriteLog(Format('ENABLE: wall #%d(%d) enabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
+ {$ENDIF}
end;
procedure g_Map_DisableWall(ID: DWORD);
+var
+ pan: TPanel;
begin
- with gWalls[ID] do
- begin
- Enabled := False;
- g_Mark(X, Y, Width, Height, MARK_DOOR, False);
+ pan := gWalls[ID];
+ pan.Enabled := False;
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, False);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
- end;
+ mapGrid.proxyEnabled[pan.proxyId] := false;
+ //if (pan.proxyId >= 0) then begin mapGrid.removeBody(pan.proxyId); pan.proxyId := -1; end;
+
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, ID);
+
+ {$IFDEF MAP_DEBUG_ENABLED_FLAG}
+ //e_WriteLog(Format('DISABLE: wall #%d(%d) disabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
+ {$ENDIF}
end;
procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0);
LiftType := t;
g_Mark(X, Y, Width, Height, MARK_LIFT, False);
+ //TODO: make separate lift tags, and change tag here
if LiftType = 0 then
g_Mark(X, Y, Width, Height, MARK_LIFTUP, True)
PAMem.LoadFromMemory(Mem);
for i := 0 to Length(panels)-1 do
+ begin
if panels[i].SaveIt then
begin
// ID ïàíåëè:
end;
// Çàãðóæàåì ïàíåëü:
panels[i].LoadState(PAMem);
+ if (panels[i].arrIdx <> i) then raise Exception.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel arrIdx');
+ if (panels[i].proxyId >= 0) then mapGrid.proxyEnabled[panels[i].proxyId] := panels[i].Enabled;
end;
+ end;
// Ýòîò ñïèñîê ïàíåëåé çàãðóæåí:
PAMem.Free();
// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó:
g_GFX_Init();
- mapCreateGrid();
+ //mapCreateGrid();
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè:
Result := Addr(Arr[PanelByID[PanelID].PArrID]);
end;
+
+// trace liquid, stepping by `dx` and `dy`
+// return last seen liquid coords, and `false` if we're started outside of the liquid
+function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+const
+ MaskLiquid = GridTagWater or GridTagAcid1 or GridTagAcid2;
+begin
+ topx := x;
+ topy := y;
+ // started outside of the liquid?
+ if (mapGrid.forEachAtPoint(x, y, nil, 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
+ topx := x;
+ topy := y;
+ end;
+end;
+
+
end.