diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 7d6f3dddd37d8472a5340620de86bdea06d6cb2f..642beaade9c2576106db385248eef6d277819d09 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
interface
uses
- e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
- g_phys, wadreader, BinEditor, g_panel, g_grid, z_aabbtree, md5, binheap, 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
function g_Map_GetMapInfo(Res: String): TMapInfo;
function g_Map_GetMapsList(WADName: String): SArray;
function g_Map_Exist(Res: String): Boolean;
-procedure g_Map_Free();
+procedure g_Map_Free(freeTextures: Boolean=true);
procedure g_Map_Update();
+function g_Map_PanelByGUID (aguid: Integer): TPanel; inline;
+
procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated
procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
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_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0);
-procedure g_Map_SetLift(ID: DWORD; t: Integer);
+
+procedure g_Map_EnableWallGUID (pguid: Integer);
+procedure g_Map_DisableWallGUID (pguid: Integer);
+procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer);
+
+// HACK!!!
+procedure g_Map_EnableWall_XXX (ID: DWORD);
+procedure g_Map_DisableWall_XXX (ID: DWORD);
+procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer);
+
+procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
+
procedure g_Map_ReAdd_DieTriggers();
function g_Map_IsSpecialTexture(Texture: String): Boolean;
procedure g_Map_ResetFlag(Flag: Byte);
procedure g_Map_DrawFlags();
-function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
-
procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer);
-// returns wall index in `gWalls` or -1
-function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Boolean;
+// 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_TraceLiquid (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+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;
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;
+ GridTagBack = 1 shl 0; // gRenderBackgrounds
+ GridTagStep = 1 shl 1; // gSteps
+ GridTagWall = 1 shl 2; // gWalls
+ GridTagDoor = 1 shl 3; // gWalls
+ GridTagAcid1 = 1 shl 4; // gAcid1
+ GridTagAcid2 = 1 shl 5; // gAcid2
+ GridTagWater = 1 shl 6; // gWater
+ GridTagFore = 1 shl 7; // gRenderForegrounds
// the following are invisible
- GridTagLift = 1 shl 8;
- GridTagBlockMon = 1 shl 9;
+ GridTagLift = 1 shl 8; // gLifts
+ GridTagBlockMon = 1 shl 9; // gBlockMon
GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
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;
+ gMovingWallIds: array of Integer = nil;
gdbg_map_use_accel_render: Boolean = true;
gdbg_map_use_accel_coldet: Boolean = true;
- //gdbg_map_use_tree_draw: Boolean = false;
- //gdbg_map_use_tree_coldet: Boolean = false;
- //gdbg_map_dump_coldet_tree_queries: Boolean = false;
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;
+ gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading
+
+
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,
+ e_input, 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,
+ utils, sfs, xstreams, hashtable,
ImagingTypes, Imaging, ImagingUtility,
ImagingGif, ImagingNetworkGraphics;
FLAG_SIGNATURE = $47414C46; // 'FLAG'
-type
- TPanelGrid = specialize TBodyGridBase<TPanel>;
+var
+ panByGUID: array of TPanel = nil;
- {
- TDynAABBTreePanelBase = specialize TDynAABBTreeBase<TPanel>;
- TDynAABBTreeMap = class(TDynAABBTreePanelBase)
- function getFleshAABB (out aabb: AABB2D; pan: TPanel; tag: Integer): Boolean; override;
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Map_PanelByGUID (aguid: Integer): TPanel; inline;
+begin
+ //if (panByGUID = nil) or (not panByGUID.get(aguid, result)) then result := nil;
+ if (aguid >= 0) and (aguid < Length(panByGUID)) then result := panByGUID[aguid] else result := nil;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+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;
- {
-{
-function TDynAABBTreeMap.getFleshAABB (out aabb: AABB2D; pan: TPanel; tag: Integer): Boolean;
+ st.Free();
+ WAD.Free();
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
+var
+ wst: TSFSMemoryChunkStream = nil;
+ pr: TTextParser = nil;
begin
- result := false;
- if (pan = nil) then begin aabb := AABB2D.Create(0, 0, 0, 0); exit; end;
- aabb := AABB2D.Create(pan.X, pan.Y, pan.X+pan.Width-1, pan.Y+pan.Height-1);
- if (pan.Width < 1) or (pan.Height < 1) then exit;
- if not aabb.valid then raise Exception.Create('wutafuuuuuuu?!');
- result := true;
+ 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
end;
-type
- TPanelID = record
- PWhere: ^TPanelArray;
- PArrID: Integer;
- end;
-
var
- PanelById: array of TPanelID;
- Textures: TLevelTextureArray;
- RespawnPoints: Array of TRespawnPoint;
- FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
+ Textures: TLevelTextureArray = nil;
+ TextNameHash: THashStrInt = nil; // key: texture name; value: index in `Textures`
+ BadTextNameHash: THashStrInt = nil; // set; so we won't spam with non-existing texture messages
+ RespawnPoints: array of TRespawnPoint;
+ FlagPoints: array[FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
- mapGrid: TPanelGrid = nil;
- //mapTree: TDynAABBTreeMap = nil;
procedure g_Map_ProfilersBegin ();
// wall index in `gWalls` or -1
-(*
-function g_Map_traceToNearestWallOld (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Integer;
-
- function sqchecker (pan: TPanel; var ray: Ray2D): Single;
- var
- aabb: AABB2D;
- tmin: Single;
- begin
- result := -666.0; // invalid
- if not pan.Enabled then exit;
- aabb := AABB2D.CreateWH(pan.X, pan.Y, pan.Width, pan.Height);
- if not aabb.valid then exit;
- if aabb.intersects(ray, @tmin) then
- begin
- //if (tmin*tmin > maxDistSq) then exit;
- if (tmin >= 0.0) then
- begin
- //e_WriteLog(Format('sqchecker(%d,%d,%d,%d): panel #%d (%d,%d)-(%d,%d); tmin=%f', [x0, y0, x1, y1, pan.arrIdx, pan.X, pan.Y, pan.Width, pan.Height, tmin]), MSG_NOTIFY);
- //if (tmin < 0.0) then tmin := 0.0;
- result := tmin;
- end;
- end;
- end;
-
+function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel;
var
- qr: TDynAABBTreeMap.TSegmentQueryResult;
- ray: Ray2D;
- hxf, hyf: Single;
- hx, hy: Integer;
- maxDistSq: Single;
+ ex, ey: Integer;
begin
- result := -1;
- if (mapTree = nil) then exit;
- if mapTree.segmentQuery(qr, x0, y0, x1, y1, sqchecker, (GridTagWall or GridTagDoor)) then
+ result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor));
+ if (result <> nil) then
begin
- maxDistSq := (x1-x0)*(x1-x0)+(y1-y0)*(y1-y0);
- if (qr.flesh <> nil) and (qr.time*qr.time <= maxDistSq) then
- begin
- result := qr.flesh.arrIdx;
- if (hitx <> nil) or (hity <> nil) then
- begin
- ray := Ray2D.Create(x0, y0, x1, y1);
- hxf := ray.origX+ray.dirX*qr.time;
- hyf := ray.origY+ray.dirY*qr.time;
- while true do
- begin
- hx := trunc(hxf);
- hy := trunc(hyf);
- if (hx >= qr.flesh.X) and (hy >= qr.flesh.Y) and (hx < qr.flesh.X+qr.flesh.Width) and (hy < qr.flesh.Y+qr.flesh.Height) then
- begin
- // go back a little
- hxf -= ray.dirX;
- hyf -= ray.dirY;
- end
- else
- begin
- break;
- end;
- end;
- if (hitx <> nil) then hitx^ := hx;
- if (hity <> nil) then hity^ := hy;
- end;
- end;
+ 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;
-*)
-
-// wall index in `gWalls` or -1
-function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): Boolean;
-(*
-var
- lastX, lastY, lastDistSq: Integer;
- wasHit: Boolean = false;
-
- // pan=nil: before processing new tile
- function sqchecker (pan: TPanel; tag: Integer; x, y, prevx, prevy: Integer): Boolean;
- var
- distSq: Integer;
- begin
- if (pan = nil) then
- begin
- // stop if something was hit at the previous tile
- result := wasHit;
- end
- else
- begin
- result := false;
- if ((tag and (GridTagWall or GridTagDoor)) <> 0) then
- begin
- if not pan.Enabled then exit;
- end;
- distSq := (prevx-x0)*(prevx-x0)+(prevy-y0)*(prevy-y0);
- if (distSq < lastDistSq) then
- begin
- wasHit := true;
- lastDistSq := distSq;
- lastX := prevx;
- lastY := prevy;
- end;
- 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 := false;
- if (mapGrid = nil) then exit;
- lastDistSq := (x1-x0)*(x1-x0)+(y1-y0)*(y1-y0)+1;
- lastX := 0;
- lastY := 0;
- result := mapGrid.traceRay(x0, y0, x1, y1, sqchecker, (GridTagWall or GridTagDoor));
- if (hitx <> nil) then hitx^ := lastX;
- if (hity <> nil) then hity^ := lastY;
- *)
- result := (mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor)) <> nil);
+ 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;
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;
- CurTex: Integer; sav: Boolean): Integer;
+function CreatePanel (PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer; sav: Boolean): Integer;
var
len: Integer;
panels: ^TPanelArray;
+ pan: TPanel;
+ pguid: Integer;
begin
Result := -1;
case PanelRec.PanelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR:
- panels := @gWalls;
- PANEL_BACK:
- panels := @gRenderBackgrounds;
- PANEL_FORE:
- panels := @gRenderForegrounds;
- PANEL_WATER:
- panels := @gWater;
- PANEL_ACID1:
- panels := @gAcid1;
- PANEL_ACID2:
- panels := @gAcid2;
- PANEL_STEP:
- panels := @gSteps;
- PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT:
- panels := @gLifts;
- PANEL_BLOCKMON:
- panels := @gBlockMon;
- else
- Exit;
+ PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: panels := @gWalls;
+ PANEL_BACK: panels := @gRenderBackgrounds;
+ PANEL_FORE: panels := @gRenderForegrounds;
+ PANEL_WATER: panels := @gWater;
+ PANEL_ACID1: panels := @gAcid1;
+ PANEL_ACID2: panels := @gAcid2;
+ PANEL_STEP: panels := @gSteps;
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: panels := @gLifts;
+ PANEL_BLOCKMON: panels := @gBlockMon;
+ else exit;
end;
len := Length(panels^);
- SetLength(panels^, len + 1);
-
- panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures);
- panels^[len].arrIdx := len;
- panels^[len].proxyId := -1;
- panels^[len].tag := panelTypeToTag(PanelRec.PanelType);
- if sav then
- panels^[len].SaveIt := True;
-
- Result := len;
-
- len := Length(PanelByID);
- SetLength(PanelByID, len + 1);
- PanelByID[len].PWhere := panels;
- PanelByID[len].PArrID := Result;
+ SetLength(panels^, len+1);
+
+ pguid := Length(panByGUID);
+ SetLength(panByGUID, pguid+1); //FIXME!
+ pan := TPanel.Create(PanelRec, AddTextures, CurTex, Textures, pguid);
+ assert(pguid >= 0);
+ assert(pguid < Length(panByGUID));
+ panByGUID[pguid] := pan;
+ panels^[len] := pan;
+ pan.arrIdx := len;
+ pan.proxyId := -1;
+ pan.tag := panelTypeToTag(PanelRec.PanelType);
+ if sav then pan.SaveIt := True;
+
+ PanelRec.user['panel_guid'] := pguid;
+
+ //result := len;
+ result := pguid;
end;
+
function CreateNullTexture(RecName: String): Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then exit; // i found her!
+
SetLength(Textures, Length(Textures)+1);
result := High(Textures);
Width := 1;
Height := 1;
Anim := False;
- TextureID := TEXTURE_NONE;
+ TextureID := LongWord(TEXTURE_NONE);
end;
+
+ TextNameHash.put(RecName, result);
end;
-function CreateTexture(RecName: String; Map: string; log: Boolean): Integer;
+
+function CreateTexture(RecName: AnsiString; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
TextureData: Pointer;
- WADName, txname: String;
+ WADName: String;
a, ResLength: Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then
+ begin
+ // i found her!
+ //e_LogWritefln('texture ''%s'' already loaded', [RecName]);
+ exit;
+ end;
+
Result := -1;
+ if (BadTextNameHash <> nil) and BadTextNameHash.has(RecName) then exit; // don't do it again and again
+
+ {
if Textures <> nil then
+ begin
for a := 0 to High(Textures) do
- if Textures[a].TextureName = RecName then
+ begin
+ if (Textures[a].TextureName = RecName) then
begin // Òåêñòóðà ñ òàêèì èìåíåì óæå åñòü
+ e_LogWritefln('texture ''%s'' already loaded', [RecName]);
Result := a;
Exit;
end;
+ end;
+ end;
+ }
-// Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà):
+ // Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà):
if (RecName = TEXTURE_NAME_WATER) or
(RecName = TEXTURE_NAME_ACID1) or
(RecName = TEXTURE_NAME_ACID2) then
with Textures[High(Textures)] do
begin
TextureName := RecName;
-
- if TextureName = TEXTURE_NAME_WATER then
- TextureID := TEXTURE_SPECIAL_WATER
- else
- if TextureName = TEXTURE_NAME_ACID1 then
- TextureID := TEXTURE_SPECIAL_ACID1
- else
- if TextureName = TEXTURE_NAME_ACID2 then
- TextureID := TEXTURE_SPECIAL_ACID2;
+ if (TextureName = TEXTURE_NAME_WATER) then TextureID := LongWord(TEXTURE_SPECIAL_WATER)
+ else if (TextureName = TEXTURE_NAME_ACID1) then TextureID := LongWord(TEXTURE_SPECIAL_ACID1)
+ else if (TextureName = TEXTURE_NAME_ACID2) then TextureID := LongWord(TEXTURE_SPECIAL_ACID2);
Anim := False;
end;
result := High(Textures);
+ TextNameHash.put(RecName, result);
Exit;
end;
-// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
+ // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
- if WADName <> '' then
- WADName := GameDir+'/wads/'+WADName
- else
- WADName := Map;
+ if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map;
WAD.ReadFile(WADName);
- txname := RecName;
+ //txname := RecName;
{
if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
begin
end;
}
- if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
+ if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength, log) then
+ begin
+ SetLength(Textures, Length(Textures)+1);
+ if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
begin
- SetLength(Textures, Length(Textures)+1);
- if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
- Exit;
- e_GetTextureSize(Textures[High(Textures)].TextureID,
- @Textures[High(Textures)].Width,
- @Textures[High(Textures)].Height);
- FreeMem(TextureData);
- Textures[High(Textures)].TextureName := {RecName}txname;
- Textures[High(Textures)].Anim := False;
-
- result := High(Textures);
- end
+ SetLength(Textures, Length(Textures)-1);
+ Exit;
+ end;
+ e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height);
+ FreeMem(TextureData);
+ Textures[High(Textures)].TextureName := RecName;
+ Textures[High(Textures)].Anim := False;
+
+ result := High(Textures);
+ TextNameHash.put(RecName, result);
+ end
else // Íåò òàêîãî ðåóñðñà â WAD'å
begin
- //e_WriteLog(Format('SHIT! Error loading texture %s : %s : %s', [RecName, txname, g_ExtractFilePathName(RecName)]), MSG_WARNING);
- if log then
- begin
- e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
- //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
- end;
+ //e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, a)) then
+ begin
+ e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
WAD.Free();
end;
+
function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
ia: TDynImageDataArray = nil;
f, c, frdelay, frloop: Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then
+ begin
+ // i found her!
+ //e_LogWritefln('animated texture ''%s'' already loaded', [RecName]);
+ exit;
+ end;
+
result := -1;
- //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY);
+ //e_LogWritefln('*** Loading animated texture "%s"', [RecName]);
+
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if BadTextNameHash.get(RecName, f) then
+ begin
+ //e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY);
+ exit;
+ end;
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
try
- if WADName <> '' then
- WADName := GameDir+'/wads/'+WADName
- else
- WADName := Map;
+ if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map;
WAD.ReadFile(WADName);
- if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then
+ if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength, log) then
begin
- if log then
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
begin
e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if ResLength < 6 then
begin
e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if not WAD.ReadMemory(TextureWAD, ResLength) then
begin
e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then
begin
e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if TextureResource = '' then
begin
e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then
begin
e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
FramesCount := _framecount;
Speed := _speed;
result := High(Textures);
+ TextNameHash.put(RecName, result);
end
else
begin
- if log then e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
+ begin
+ e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
end;
end
if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
begin
e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if length(ia) = 0 then
begin
e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
Textures[High(Textures)].FramesCount := length(ia);
Textures[High(Textures)].Speed := _speed;
result := High(Textures);
+ TextNameHash.put(RecName, result);
//writeln(' CREATED!');
end
else
begin
- if log then e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
+ begin
+ e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
end;
finally
for f := 0 to High(ia) do FreeImage(ia[f]);
WAD.Free();
cfg.Free();
- if TextureWAD <> nil then FreeMem(TextureWAD);
- if TextData <> nil then FreeMem(TextData);
- if TextureData <> nil then FreeMem(TextureData);
+ if (TextureWAD <> nil) then FreeMem(TextureWAD);
+ if (TextData <> nil) then FreeMem(TextData);
+ if (TextureData <> nil) then FreeMem(TextureData);
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 (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word);
var
_trigger: TTrigger;
begin
with _trigger do
begin
+ mapId := Trigger.id;
+ mapIndex := amapIdx;
X := Trigger.X;
Y := Trigger.Y;
Width := Trigger.Width;
Height := Trigger.Height;
- Enabled := ByteBool(Trigger.Enabled);
- TexturePanel := Trigger.TexturePanel;
+ Enabled := Trigger.Enabled;
+ //TexturePanel := Trigger.TexturePanel;
+ TexturePanelGUID := atpanid;
TexturePanelType := fTexturePanel1Type;
ShotPanelType := fTexturePanel2Type;
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
- Data.Default := Trigger.DATA;
+ trigPanelGUID := atrigpanid;
+ //trigShotPanelId := ashotpanid;
+ //Data.Default := Trigger.DATA;
+ if (Trigger.trigRec = nil) then
+ begin
+ trigData := nil;
+ if (TriggerType <> TRIGGER_SECRET) then
+ begin
+ e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING);
+ end;
+ end
+ else
+ begin
+ trigData := Trigger.trigRec.clone();
+ end;
end;
g_Triggers_Create(_trigger);
end;
-procedure CreateMonster(monster: TMonsterRec_1);
+procedure CreateMonster(monster: TDynRecord);
var
a: Integer;
mon: TMonster;
begin
if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
begin
- if (gTriggers[a].Data.MonsterID-1) = mon.StartID then mon.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;
function monsDieTrig (mon: TMonster): Boolean;
var
a: Integer;
+ //tw: TStrTextWriter;
begin
result := false; // don't stop
mon.ClearTriggers();
begin
if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
begin
- if (gTriggers[a].Data.MonsterID-1) = mon.StartID then mon.AddTrigger(a);
+ //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a);
+ {
+ tw := TStrTextWriter.Create();
+ try
+ gTriggers[a].trigData.writeTo(tw);
+ e_LogWritefln('=== trigger #%s ==='#10'%s'#10'---', [a, tw.str]);
+ finally
+ tw.Free();
+ end;
+ }
+ if (gTriggers[a].trigData.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a);
end;
end;
end;
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;
end;
end;
- procedure addPanelsToGrid (constref 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
pan := panels[idx];
- pan.tag := tag;
if not pan.visvalid then continue;
- pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, tag);
+ 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}
- //mapTree.insertObject(pan, tag, true); // as static object
end;
end;
begin
mapGrid.Free();
mapGrid := nil;
- //mapTree.Free();
- //mapTree := nil;
calcBoundingBox(gWalls);
calcBoundingBox(gRenderBackgrounds);
calcBoundingBox(gLifts);
calcBoundingBox(gBlockMon);
- e_WriteLog(Format('map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING);
+ 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;
- mapGrid := TPanelGrid.Create(mapX0-512, mapY0-512, mapX1-mapX0+1+512*2, mapY1-mapY0+1+512*2);
- //mapTree := TDynAABBTreeMap.Create();
+ if (mapX1 < gMapInfo.Width-1) then mapX1 := gMapInfo.Width-1;
+ if (mapY1 < gMapInfo.Height-1) then mapY1 := gMapInfo.Height-1;
- addPanelsToGrid(gWalls, PANEL_WALL);
- addPanelsToGrid(gWalls, PANEL_CLOSEDOOR);
- addPanelsToGrid(gWalls, PANEL_OPENDOOR);
- 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);
+ 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();
- //e_WriteLog(Format('tree depth: %d; %d nodes used, %d nodes allocated', [mapTree.computeTreeHeight, mapTree.nodeCount, mapTree.nodeAlloced]), MSG_NOTIFY);
- //mapTree.forEachLeaf(nil);
+
+ 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;
+ MPlatPanelIdx: Integer;
+ trigrec: TDynRecord;
+ texPan: TDynRecord;
+ liftPan: TDynRecord;
+ doorPan: TDynRecord;
+ shotPan: TDynRecord;
+ mplatPan: 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: TDynRecord = nil;
+ mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index
+ 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;
+ 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, tgpid: Integer;
+ stt: UInt64;
+ moveSpeed{, moveStart, moveEnd}: TDFPoint;
+ //moveActive: Boolean;
begin
mapGrid.Free();
mapGrid := nil;
- //mapTree.Free();
- //mapTree := nil;
+
+ gCurrentMap.Free();
+ gCurrentMap := nil;
+
+ panByGUID := nil;
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
- FillChar(texture, SizeOf(texture), 0);
+ mapReader := nil;
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
+ stt := curTimeMicro();
+
+ 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);
- generateExternalResourcesList(MapReader);
- // Çàãðóçêà òåêñòóð:
- g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False);
- _textures := MapReader.GetTextures();
- _texnummap := nil;
- // Äîáàâëåíèå òåêñòóð â Textures[]:
- if _textures <> nil then
+ generateExternalResourcesList(mapReader);
+ mapTextureList := mapReader['texture'];
+ // get all other lists here too
+ panels := mapReader['panel'];
+ triggers := mapReader['trigger'];
+ items := mapReader['item'];
+ areas := mapReader['area'];
+ monsters := mapReader['monster'];
+
+ // Çàãðóçêà îïèñàíèÿ êàðòû:
+ e_WriteLog(' Reading map info...', MSG_NOTIFY);
+ g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False);
+
+ 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 (mapTextureList <> nil) and (mapTextureList.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], mapTextureList.count-1, False);
- for a := 0 to High(_textures) do
+ cnt := -1;
+ for rec in mapTextureList 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
+ rec.tagInt := ntn; // remember texture number
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.mplatPan := nil;
+ pttit.texPanIdx := -1;
+ pttit.LiftPanelIdx := -1;
+ pttit.DoorPanelIdx := -1;
+ pttit.ShotPanelIdx := -1;
+ pttit.MPlatPanelIdx := -1;
+ // Ëèôòû
+ if rec.TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then
+ begin
+ pttit.liftPan := mapReader.panel[rec.trigRec.tgPanelID];
+ end;
+ // Äâåðè
+ if rec.TriggerType in [TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, TRIGGER_CLOSETRAP, TRIGGER_TRAP] then
+ begin
+ pttit.doorPan := mapReader.panel[rec.trigRec.tgPanelID];
+ end;
+ // Òóðåëü
+ if (rec.TriggerType = TRIGGER_SHOT) then
+ begin
+ pttit.shotPan := mapReader.panel[rec.trigRec.tgShotPanelID];
+ end;
+ //
+ if rec.TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
+ begin
+ pttit.mplatPan := mapReader.panel[rec.trigRec.tgPanelID];
+ end;
+
+ if (pttit.texPan <> nil) then pttit.texPan.userPanelTrigRef := true;
+ if (pttit.liftPan <> nil) then pttit.liftPan.userPanelTrigRef := true;
+ if (pttit.doorPan <> nil) then pttit.doorPan.userPanelTrigRef := true;
+ if (pttit.shotPan <> nil) then pttit.shotPan.userPanelTrigRef := true;
+ if (pttit.mplatPan <> nil) then pttit.mplatPan.userPanelTrigRef := true;
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);
+ //e_LogWritefln('PANSTART: pannum=%s', [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 (mapTextureList <> nil) then
+ begin
+ texrec := rec.TextureRec;
+ ok := (texrec <> nil);
+ end;
if ok then
begin
- // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû.
- // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð:
- ok := False;
- if (TriggersTable <> nil) and (_textures <> nil) then
+ // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû.
+ // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð
+ ok := false;
+ if (TriggersTable <> nil) and (mapTextureList <> 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;
+ }
+ if rec.userPanelTrigRef then
+ begin
+ // e_LogWritefln('trigref for panel %s', [pannum]);
+ trigRef := True;
+ ok := True;
+ 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
- // Ïðîáóåì äîáàâèòü íîâóþ òåêñòóðó:
- 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
+ // Íà÷àëüíàÿ - àíèìèðîâàííàÿ, èùåì àíèìèðîâàííóþ
+ isAnim := True;
+ //e_LogWritefln('000: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('001: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ if not ok then
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;
+ // Íåò àíèìèðîâàííîé, èùåì îáû÷íóþ
+ isAnim := False;
+ //e_LogWritefln('002: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ ok := CreateTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('003: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
end;
end
- else
- if k = NNF_NAME_EQUALS then
+ else
+ begin
+ // Íà÷àëüíàÿ - îáû÷íàÿ, èùåì îáû÷íóþ
+ isAnim := False;
+ //e_LogWritefln('004: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ ok := CreateTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('005: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ if not ok then
+ begin
+ // Íåò îáû÷íîé, èùåì àíèìèðîâàííóþ
+ isAnim := True;
+ //e_LogWritefln('006: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('007: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
+ end;
+ end;
+
+ // Îíà ñóùåñòâóåò. Çàíîñèì åå ID â ñïèñîê ïàíåëè
+ if ok then
+ begin
+ {
+ for c := 0 to High(Textures) do
+ begin
+ 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;
+ }
+ if (TextNameHash <> nil) and TextNameHash.get(toLowerCase1251(TexName), c) 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
+ AddTextures[High(AddTextures)].Texture := c;
+ AddTextures[High(AddTextures)].Anim := isAnim;
+ end;
+ end;
+ end
+ else
+ begin
+ if k = NNF_NAME_EQUALS then
+ begin
+ // Çàíîñèì òåêóùóþ òåêñòóðó íà ñâîå ìåñòî
+ SetLength(AddTextures, Length(AddTextures)+1);
+ AddTextures[High(AddTextures)].Texture := rec.tagInt; // internal texture number, not map index
+ 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; // internal texture number, not map index
+ 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);
+ //e_WriteLog(Format('panel #%d: TextureNum=%d; ht=%d; ht1=%d; atl=%d', [a, panels[a].TextureNum, High(mapTextureList), High(Textures), High(AddTextures)]), MSG_NOTIFY);
- // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð:
- PanelID := CreatePanel(panels[a], AddTextures, CurTex, trigRef);
+ //e_LogWritefln('PANADD: pannum=%s', [pannum]);
- // Åñëè èñïîëüçóåòñÿ â òðèããåðàõ, òî ñòàâèì òî÷íûé ID:
- if TriggersTable <> nil then
- 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;
- end;
+ // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID
+ PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef);
+ //e_LogWritefln('panel #%s of type %s got guid #%s', [pannum, rec.PanelType, PanelID]);
+ rec.userPanelId := PanelID; // remember game panel id, we'll fix triggers later
+
+ // setup lifts
+ moveSpeed := rec.moveSpeed;
+ //moveStart := rec.moveStart;
+ //moveEnd := rec.moveEnd;
+ //moveActive := rec['move_active'].varvalue;
+ if not moveSpeed.isZero then
+ begin
+ SetLength(gMovingWallIds, Length(gMovingWallIds)+1);
+ gMovingWallIds[High(gMovingWallIds)] := PanelID;
+ //e_LogWritefln('found moving panel ''%s'' (idx=%s; id=%s)', [rec.id, pannum, PanelID]);
+ end;
+
+ //e_LogWritefln('PANEND: pannum=%s', [pannum]);
g_Game_StepLoading();
end;
end;
- // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû:
- if (triggers <> nil) and not gLoadGameMode then
+ // ×èíèì ID'û ïàíåëåé, êîòîðûå èñïîëüçóþòñÿ â òðèããåðàõ
+ for b := 0 to High(TriggersTable) do
+ begin
+ if (TriggersTable[b].texPan <> nil) then TriggersTable[b].texPanIdx := TriggersTable[b].texPan.userPanelId;
+ if (TriggersTable[b].liftPan <> nil) then TriggersTable[b].LiftPanelIdx := TriggersTable[b].liftPan.userPanelId;
+ if (TriggersTable[b].doorPan <> nil) then TriggersTable[b].DoorPanelIdx := TriggersTable[b].doorPan.userPanelId;
+ if (TriggersTable[b].shotPan <> nil) then TriggersTable[b].ShotPanelIdx := TriggersTable[b].shotPan.userPanelId;
+ if (TriggersTable[b].mplatPan <> nil) then TriggersTable[b].MPlatPanelIdx := TriggersTable[b].mplatPan.userPanelId;
+ 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
- else
- b := 0;
- if (triggers[a].TriggerType = TRIGGER_SHOT) and
- (TTriggerData(triggers[a].DATA).ShotPanelID <> -1) then
- c := panels[TriggersTable[a].ShotPanel].PanelType
- else
- c := 0;
- CreateTrigger(triggers[a], b, c);
+ 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;
+ // we can have only one of those
+ if (TriggersTable[trignum].LiftPanelIdx <> -1) then tgpid := TriggersTable[trignum].LiftPanelIdx
+ else if (TriggersTable[trignum].DoorPanelIdx <> -1) then tgpid := TriggersTable[trignum].DoorPanelIdx
+ else if (TriggersTable[trignum].ShotPanelIdx <> -1) then tgpid := TriggersTable[trignum].ShotPanelIdx
+ else if (TriggersTable[trignum].MPlatPanelIdx <> -1) then tgpid := TriggersTable[trignum].MPlatPanelIdx
+ else tgpid := -1;
+ //e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]);
+ CreateTrigger(trignum, rec, TriggersTable[trignum].texPanIdx, tgpid, 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();
+ gCurrentMap := mapReader; // this will be our current map now
+ gCurrentMapFileName := Res;
+ mapReader := nil;
- 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;
-
- // Çàãðóçêà íåáà:
+ // Çàãðóçêà íåáà
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;
+ // Ñáðîñ ëîêàëüíûõ ìàññèâîâ:
+ mapTextureList := nil;
panels := nil;
items := nil;
areas := 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;
+
+ stt := curTimeMicro()-stt;
+ e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
finally
sfsGCEnable(); // enable releasing unused volumes
+ mapReader.Free();
+ e_ClearInputBuffer(); // why not?
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);
- ZeroMemory(@Header, SizeOf(Header));
- Result.Name := _lc[I_GAME_ERROR_MAP_SELECT];
- Result.Description := _lc[I_GAME_ERROR_MAP_SELECT];
- end
- else
- begin
- Header := MapReader.GetMapHeader();
- Result.Name := Header.MapName;
- Result.Description := Header.MapDescription;
- end;
+ try
+ mapReader := g_Map_ParseMap(Data, Len);
+ except
+ mapReader := nil;
+ end;
FreeMem(Data);
- MapReader.Free();
- Result.Map := Res;
- Result.Author := Header.MapAuthor;
- Result.Height := Header.Height;
- Result.Width := Header.Width;
+ 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;
+
+ mapReader.Free();
end;
function g_Map_GetMapsList(WADName: string): SArray;
end;
end;
-procedure g_Map_Free();
+procedure g_Map_Free(freeTextures: Boolean=true);
var
a: Integer;
//gDOMFlags := nil;
- if Textures <> nil then
+ if (Length(gCurrentMapFileName) <> 0) then
begin
- for a := 0 to High(Textures) do
- if not g_Map_IsSpecialTexture(Textures[a].TextureName) then
- if Textures[a].Anim then
- g_Frames_DeleteByID(Textures[a].FramesID)
- else
- if Textures[a].TextureID <> TEXTURE_NONE then
- e_DeleteTexture(Textures[a].TextureID);
-
- Textures := nil;
+ e_LogWritefln('g_Map_Free: previous map was ''%s''...', [gCurrentMapFileName]);
+ end
+ else
+ begin
+ e_LogWritefln('g_Map_Free: no previous map.', []);
+ end;
+ if freeTextures then
+ begin
+ e_LogWritefln('g_Map_Free: clearing textures...', []);
+ if (Textures <> nil) then
+ begin
+ for a := 0 to High(Textures) do
+ begin
+ if not g_Map_IsSpecialTexture(Textures[a].TextureName) then
+ begin
+ if Textures[a].Anim then
+ begin
+ g_Frames_DeleteByID(Textures[a].FramesID)
+ end
+ else
+ begin
+ if (Textures[a].TextureID <> LongWord(TEXTURE_NONE)) then
+ begin
+ e_DeleteTexture(Textures[a].TextureID);
+ end;
+ end;
+ end;
+ end;
+ Textures := nil;
+ end;
+ TextNameHash.Free();
+ TextNameHash := nil;
+ BadTextNameHash.Free();
+ BadTextNameHash := nil;
end;
+ panByGUID := nil;
+
FreePanelArray(gWalls);
FreePanelArray(gRenderBackgrounds);
FreePanelArray(gRenderForegrounds);
FreePanelArray(gSteps);
FreePanelArray(gLifts);
FreePanelArray(gBlockMon);
+ gMovingWallIds := nil;
if BackID <> DWORD(-1) then
begin
gDoorMap := nil;
gLiftMap := nil;
-
- PanelByID := nil;
end;
procedure g_Map_Update();
i: Integer;
begin
- if panels <> nil then
- for i := 0 to High(panels) do
- panels[i].Update();
+ for i := 0 to High(panels) do panels[i].Update();
end;
begin
if gGameSettings.GameMode = GM_CTF then
begin
for a := FLAG_RED to FLAG_BLUE do
+ begin
if not (gFlags[a].State in [FLAG_STATE_NONE, FLAG_STATE_CAPTURED]) then
+ begin
with gFlags[a] do
begin
- if gFlags[a].Animation <> nil then
- gFlags[a].Animation.Update();
+ if gFlags[a].Animation <> nil then gFlags[a].Animation.Update();
m := g_Obj_Move(@Obj, True, True);
- if gTime mod (GAME_TICK*2) <> 0 then
- Continue;
+ if gTime mod (GAME_TICK*2) <> 0 then Continue;
- // Ñîïðîòèâëåíèå âîçäóõà:
+ // Ñîïðîòèâëåíèå âîçäóõà
Obj.Vel.X := z_dec(Obj.Vel.X, 1);
- // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó:
+ // Òàéìàóò ïîòåðÿííîãî ôëàãà, ëèáî îí âûïàë çà êàðòó
if ((Count = 0) or ByteBool(m and MOVE_FALLOUT)) and g_Game_IsServer then
begin
g_Map_ResetFlag(a);
Continue;
end;
- if Count > 0 then
- Count := Count - 1;
+ if Count > 0 then Count -= 1;
- // Èãðîê áåðåò ôëàã:
+ // Èãðîê áåðåò ôëàã
if gPlayers <> nil then
begin
j := Random(Length(gPlayers)) - 1;
-
for d := 0 to High(gPlayers) do
begin
Inc(j);
- if j > High(gPlayers) then
- j := 0;
-
+ if j > High(gPlayers) then j := 0;
if gPlayers[j] <> nil then
- if gPlayers[j].Live and
- g_Obj_Collide(@Obj, @gPlayers[j].Obj) then
+ begin
+ if gPlayers[j].Live and g_Obj_Collide(@Obj, @gPlayers[j].Obj) then
begin
- if gPlayers[j].GetFlag(a) then
- Break;
+ if gPlayers[j].GetFlag(a) then Break;
end;
+ end;
end;
end;
end;
+ end;
+ end;
end;
end;
begin
dplClear();
//tagmask := panelTypeToTag(PanelType);
-
- {if gdbg_map_use_tree_draw then
- begin
- mapTree.aabbQuery(x0, y0, wdt, hgt, checker, (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore));
- end
- else}
- begin
- mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask, true);
- end;
+ mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask);
// list will be rendered in `g_game.DrawPlayer()`
end;
@@ -2164,14 +2522,7 @@ procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius:
end;
begin
- {if gdbg_map_use_tree_draw then
- begin
- mapTree.aabbQuery(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
- end
- else}
- begin
- mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor), true);
- end;
+ mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor));
end;
end;
begin
- texid := TEXTURE_NONE;
+ texid := LongWord(TEXTURE_NONE);
result := texid;
if not checkPanels(gWater) then
if not checkPanels(gAcid1) then
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids');
if gdbg_map_use_accel_coldet then
begin
- {if gdbg_map_use_tree_coldet then
+ if (Width = 1) and (Height = 1) then
begin
- //e_WriteLog(Format('coldet query: x=%d; y=%d; w=%d; h=%d', [X, Y, Width, Height]), MSG_NOTIFY);
- result := (mapTree.aabbQuery(X, Y, Width, Height, checker, tagmask) <> nil);
- if (gdbg_map_dump_coldet_tree_queries) and (mapTree.nodesVisited <> 0) then
+ if ((tagmask and SlowMask) <> 0) then
+ begin
+ // slow
+ result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil);
+ end
+ else
begin
- //e_WriteLog(Format('map collision: %d nodes visited (%d deep)', [mapTree.nodesVisited, mapTree.nodesDeepVisited]), MSG_NOTIFY);
- g_Console_Add(Format('map collision: %d nodes visited (%d deep)', [mapTree.nodesVisited, mapTree.nodesDeepVisited]));
+ // fast
+ result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
end;
end
- else}
+ else
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
- begin
- // fast
- result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil);
- end;
+ // slow
+ result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil);
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
+ result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil);
end;
end;
end
if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids');
if gdbg_map_use_accel_coldet then
begin
- texid := TEXTURE_NONE;
- {if gdbg_map_use_tree_coldet then
+ texid := LongWord(TEXTURE_NONE);
+ if (Width = 1) and (Height = 1) then
begin
- mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
+ mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end
- else}
+ else
begin
- 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;
+ mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2));
end;
result := texid;
end
end;
-procedure g_Map_EnableWall(ID: DWORD);
+procedure g_Map_EnableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_EnableWallGUID(gWalls[ID].guid); end;
+procedure g_Map_DisableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_DisableWallGUID(gWalls[ID].guid); end;
+procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer); begin if (ID < Length(gLifts)) then g_Map_SetLiftGUID(gLifts[ID].guid, t); end;
+
+
+procedure g_Map_EnableWallGUID (pguid: Integer);
var
pan: TPanel;
begin
- pan := gWalls[ID];
+ //pan := gWalls[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
pan.Enabled := True;
- g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, True);
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, true);
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);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState({gWalls[ID]}pan.PanelType, pguid);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
- e_WriteLog(Format('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);
+ //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);
+
+procedure g_Map_DisableWallGUID (pguid: Integer);
var
pan: TPanel;
begin
- pan := gWalls[ID];
+ //pan := gWalls[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
pan.Enabled := False;
- g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, False);
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, false);
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);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, pguid);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
- e_WriteLog(Format('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);
+ //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);
+
+procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
var
tp: TPanel;
begin
+ tp := g_Map_PanelByGUID(pguid);
+ if (tp = nil) then exit;
+ {
case PanelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR:
- tp := gWalls[ID];
- PANEL_FORE:
- tp := gRenderForegrounds[ID];
- PANEL_BACK:
- tp := gRenderBackgrounds[ID];
- PANEL_WATER:
- tp := gWater[ID];
- PANEL_ACID1:
- tp := gAcid1[ID];
- PANEL_ACID2:
- tp := gAcid2[ID];
- PANEL_STEP:
- tp := gSteps[ID];
- else
- Exit;
+ PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: tp := gWalls[ID];
+ PANEL_FORE: tp := gRenderForegrounds[ID];
+ PANEL_BACK: tp := gRenderBackgrounds[ID];
+ PANEL_WATER: tp := gWater[ID];
+ PANEL_ACID1: tp := gAcid1[ID];
+ PANEL_ACID2: tp := gAcid2[ID];
+ PANEL_STEP: tp := gSteps[ID];
+ else exit;
end;
+ }
tp.NextTexture(AnimLoop);
- if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_PanelTexture(PanelType, ID, AnimLoop);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(PanelType, pguid, AnimLoop);
end;
-procedure g_Map_SetLift(ID: DWORD; t: Integer);
+
+procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer);
+var
+ pan: TPanel;
begin
- if gLifts[ID].LiftType = t then
- Exit;
+ //pan := gLifts[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
+ if not pan.isGLift then exit;
+
+ if ({gLifts[ID]}pan.LiftType = t) then exit; //!FIXME!TRIGANY!
- with gLifts[ID] do
+ with {gLifts[ID]} pan do
begin
LiftType := t;
- g_Mark(X, Y, Width, Height, MARK_LIFT, False);
+ 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)
- else if LiftType = 1 then
- g_Mark(X, Y, Width, Height, MARK_LIFTDOWN, True)
- else if LiftType = 2 then
- g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True)
- else if LiftType = 3 then
- g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True);
+ 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);
+ end;
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, pguid);
end;
end;
-function g_Map_GetPoint(PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
+
+function g_Map_GetPoint (PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
var
a: Integer;
PointsArray: Array of TRespawnPoint;
i := 0;
while i < Length(panels) do
begin
- if panels[i].SaveIt then
+ if true{panels[i].SaveIt} then
begin
// ID ïàíåëè:
PAMem.WriteInt(i);
PAMem.LoadFromMemory(Mem);
for i := 0 to Length(panels)-1 do
- if panels[i].SaveIt then
+ begin
+ if true{panels[i].SaveIt} then
begin
// ID ïàíåëè:
PAMem.ReadInt(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();
///// Çàãðóæàåì ìóçûêó: /////
// Ñèãíàòóðà ìóçûêè:
///// /////
end;
-function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
-var
- Arr: TPanelArray;
-begin
- Result := nil;
- if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit;
- Arr := PanelByID[PanelID].PWhere^;
- PanelArrayID := PanelByID[PanelID].PArrID;
- 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_TraceLiquid (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
+function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean;
const
MaskLiquid = GridTagWater or GridTagAcid1 or GridTagAcid2;
begin