X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=e99d47b19186dd65974751d9a2dd3e90539e3439;hb=93f620df25ad634372657a64d609dcaf44e718bd;hp=bbe1d6c3c7dc535a53ed9b84e1ffd31d84e459c1;hpb=a17222535319cb4089e3f9a92711731c015819b3;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index bbe1d6c..e99d47b 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -1,9 +1,8 @@ -(* Copyright (C) DooM 2D:Forever Developers +(* Copyright (C) Doom 2D: Forever Developers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,8 +19,9 @@ unit g_map; interface uses - e_graphics, g_basic, MAPSTRUCT, g_textures, Classes, - g_phys, wadreader, BinEditor, g_panel, g_grid, md5, binheap, xprofiler; + SysUtils, Classes, mempool, + e_graphics, g_basic, MAPDEF, g_textures, + g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; type TMapInfo = record @@ -58,22 +58,32 @@ type function g_Map_Load(Res: String): Boolean; function g_Map_GetMapInfo(Res: String): TMapInfo; -function g_Map_GetMapsList(WADName: String): SArray; +function g_Map_GetMapsList(WADName: String): SSArray; function g_Map_Exist(Res: String): Boolean; -procedure g_Map_Free(); +procedure g_Map_Free(freeTextures: Boolean=true); procedure g_Map_Update(); -procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated +function g_Map_PanelByGUID (aguid: Integer): TPanel; inline; + +procedure g_Map_DrawPanels (PanelType: Word; hasAmbient: Boolean; constref ambColor: TDFColor); // 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=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 (pguid: Integer; AnimLoop: Byte = 0); + procedure g_Map_ReAdd_DieTriggers(); function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -85,30 +95,57 @@ function g_Map_HaveFlagPoints(): 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_SaveState (st: TStream); +procedure g_Map_LoadState (st: TStream); procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); -// returns wall index in `gWalls` or -1 +// 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 + TForEachPanelCB = function (pan: TPanel): Boolean is nested; // 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; + + +// return `true` from `cb` to stop +function g_Map_ForEachPanel (cb: TForEachPanelCB): TPanel; + +procedure g_Map_NetSendInterestingPanels (); // yay! procedure g_Map_ProfilersBegin (); procedure g_Map_ProfilersEnd (); +function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord; + + +function g_Map_MinX (): Integer; inline; +function g_Map_MinY (): Integer; inline; +function g_Map_MaxX (): Integer; inline; +function g_Map_MaxY (): Integer; inline; + +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; @@ -146,21 +183,33 @@ const 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 + + GridTagSolid = (GridTagWall or GridTagDoor); + GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor); + GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater); GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore); +type + TBinHeapPanelDrawCmp = class + public + class function less (const a, b: TPanel): Boolean; inline; + end; + + TBinHeapPanelDraw = specialize TBinaryHeapBase; + var gWalls: TPanelArray; gRenderBackgrounds: TPanelArray; @@ -172,17 +221,22 @@ var 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; + gExternalResources: array of TDiskFileInfo = nil; + gMovingWallIds: array of Integer = nil; gdbg_map_use_accel_render: Boolean = true; gdbg_map_use_accel_coldet: Boolean = true; profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY! - gDrawPanelList: TBinaryHeapObj = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()` + gDrawPanelList: TBinHeapPanelDraw = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()` + + gCurrentMap: TDynRecord = nil; + gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading + gTestMap: String = ''; function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX @@ -192,19 +246,21 @@ type TPanelGrid = specialize TBodyGridBase; var - mapGrid: TPanelGrid = nil; + 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, + {$INCLUDE ../nogl/noGLuses.inc} + e_input, g_main, e_log, e_texture, e_res, g_items, g_gfx, g_console, + g_weapons, g_game, g_sound, e_sound, CONFIG, + g_options, g_triggers, g_player, Math, g_monsters, g_saveload, g_language, g_netmsg, - utils, sfs, + sfs, xstreams, hashtable, wadreader, ImagingTypes, Imaging, ImagingUtility, - ImagingGif, ImagingNetworkGraphics; + ImagingGif, ImagingNetworkGraphics, + g_res_downloader; const FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52); @@ -212,6 +268,242 @@ const FLAG_SIGNATURE = $47414C46; // 'FLAG' +// ////////////////////////////////////////////////////////////////////////// // +procedure mapWarningCB (const msg: AnsiString; line, col: Integer); +begin + if (line > 0) then + begin + e_LogWritefln('parse error at (%s,%s): %s', [line, col, msg], TMsgType.Warning); + end + else + begin + e_LogWritefln('parse error: %s', [msg], TMsgType.Warning); + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +var + panByGUID: array of TPanel = nil; + + +// ////////////////////////////////////////////////////////////////////////// // +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; + + +// return `true` from `cb` to stop +function g_Map_ForEachPanel (cb: TForEachPanelCB): TPanel; +var + pan: TPanel; +begin + result := nil; + if not assigned(cb) then exit; + for pan in panByGUID do + begin + if cb(pan) then begin result := pan; exit; end; + end; +end; + + +procedure g_Map_NetSendInterestingPanels (); +var + pan: TPanel; +begin + if g_Game_IsServer and g_Game_IsNet then + begin + for pan in panByGUID do + begin + if pan.gncNeedSend then MH_SEND_PanelState(pan.guid); + end; + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +function g_Map_MinX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0 else result := 0; end; +function g_Map_MinY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0 else result := 0; end; +function g_Map_MaxX (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridX0+mapGrid.gridWidth-1 else result := 0; end; +function g_Map_MaxY (): Integer; inline; begin if (mapGrid <> nil) then result := mapGrid.gridY0+mapGrid.gridHeight-1 else result := 0; 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 := e_OpenResourceRO(DataDirs, 'mapdef.txt'); + e_LogWritefln('found local "mapdef.txt"', []); + except + st := nil; + 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; + + try + if (st = nil) then + begin + //raise Exception.Create('cannot open "mapdef.txt"'); + e_LogWriteln('using default "mapdef.txt"...'); + pr := TStrTextParser.Create(defaultMapDef); + end + else + begin + pr := TFileTextParser.Create(st); + end; + except on e: Exception do + begin + e_LogWritefln('something is VERY wrong here! -- ', [e.message]); + raise; + end; + end; + + try + dfmapdef := TDynMapDef.Create(pr); + except + on e: TDynParseException do + raise Exception.CreateFmt('ERROR in "mapdef.txt" at (%s,%s): %s', [e.tokLine, e.tokCol, e.message]); + on e: Exception do + raise Exception.CreateFmt('ERROR in "mapdef.txt" at (%s,%s): %s', [pr.tokLine, pr.tokCol, e.message]); + end; + + st.Free(); + WAD.Free(); +end; + + +// ////////////////////////////////////////////////////////////////////////// // +function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord; +var + wst: TSFSMemoryChunkStream = nil; +begin + result := nil; + if (dataLen < 4) then exit; + + if (dfmapdef = nil) then writeln('need to load mapdef'); + loadMapDefinition(); + if (dfmapdef = nil) then raise Exception.Create('internal map loader error'); + + wst := TSFSMemoryChunkStream.Create(data, dataLen); + try + result := dfmapdef.parseMap(wst); + except + on e: TDynParseException do + begin + e_LogWritefln('ERROR at (%s,%s): %s', [e.tokLine, e.tokCol, e.message]); + wst.Free(); + result := nil; + exit; + end; + on e: Exception do + begin + e_LogWritefln('ERROR: %s', [e.message]); + wst.Free(); + result := nil; + exit; + end; + end; + + //e_LogWriteln('map parsed.'); +end; + + +// ////////////////////////////////////////////////////////////////////////// // +var + NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå + NNF_PureExt: String; // extension postfix + NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû + NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû + + +function g_Texture_NumNameFindStart(name: String): Boolean; +var + i, j: Integer; + +begin + Result := False; + NNF_PureName := ''; + NNF_PureExt := ''; + 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 + j := i + 1; + while (j <= Length(name)) and (name[j] <> '.') do inc(j); + NNF_PureName := Copy(name, 1, i); + NNF_PureExt := Copy(name, j); + name := Copy(name, i + 1, j - i - 1); + 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) + NNF_PureExt; + + 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 @@ -230,43 +522,34 @@ begin end; -function dplLess (a, b: TObject): Boolean; -var - pa, pb: TPanel; +class function TBinHeapPanelDrawCmp.less (const a, b: TPanel): Boolean; inline; begin - pa := TPanel(a); - pb := TPanel(b); - if (pa.tag < pb.tag) then begin result := true; exit; end; - if (pa.tag > pb.tag) then begin result := false; exit; end; - result := (pa.arrIdx < pb.arrIdx); + if (a.tag < b.tag) then begin result := true; exit; end; + if (a.tag > b.tag) then begin result := false; exit; end; + result := (a.arrIdx < b.arrIdx); end; procedure dplClear (); begin - if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); + if (gDrawPanelList = nil) then gDrawPanelList := TBinHeapPanelDraw.Create() else gDrawPanelList.clear(); end; -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; procedure g_Map_ProfilersBegin (); begin if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size); - profMapCollision.mainBegin(g_profile_collision); + if (profMapCollision <> nil) then profMapCollision.mainBegin(g_profile_collision); // create sections - if g_profile_collision then + if g_profile_collision and (profMapCollision <> nil) then begin profMapCollision.sectionBegin('*solids'); profMapCollision.sectionEnd(); @@ -286,7 +569,7 @@ function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; var ex, ey: Integer; begin - result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor)); + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, (GridTagWall or GridTagDoor)); if (result <> nil) then begin if (hitx <> nil) then hitx^ := ex; @@ -299,35 +582,45 @@ begin end; end; - -function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; - - function checker (pan: TPanel; tag: Integer): Boolean; +// 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, tag); + if (result <> nil) then begin - { - if ((tag and (GridTagWall or GridTagDoor)) <> 0) then - begin - result := pan.Enabled; // stop if wall is enabled - exit; - 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; - if ((tag and GridTagLift) <> 0) then - begin - // stop if the lift of the right type - result := - ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or - (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or - (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or - (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))); - exit; - end; - result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels +function xxPanAtPointChecker (pan: TPanel; panelType: Word): Boolean; inline; +begin + if ((pan.tag and GridTagLift) <> 0) then + begin + // stop if the lift of the right type + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))); + exit; end; + result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels +end; +function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; var tagmask: Integer = 0; + mwit: PPanel; + it: TPanelGrid.Iter; begin result := false; @@ -340,16 +633,32 @@ begin if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; if (tagmask = 0) then exit;// just in case + if ((tagmask and GridTagLift) <> 0) then begin // slow - result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil); + it := mapGrid.forEachAtPoint(x, y, tagmask); + for mwit in it do if (xxPanAtPointChecker(mwit^, PanelType)) then begin result := true; break; end; end else begin // fast - result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil); + it := mapGrid.forEachAtPoint(x, y, tagmask, false, true); + result := (it.length <> 0); // firsthit end; + it.release(); +end; + + +function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; +var + it: TPanelGrid.Iter; +begin + result := nil; + if (tagmask = 0) then exit; + it := mapGrid.forEachAtPoint(x, y, tagmask, false, true); // firsthit + if (it.length <> 0) then result := it.first^; + it.release(); end; @@ -526,57 +835,55 @@ begin PanelArray := nil; end; -function CreatePanel(PanelRec: TPanelRec_1; AddTextures: TAddTextureArray; - CurTex: Integer; sav: Boolean): Integer; +function CreatePanel (PanelRec: TDynRecord; AddTextures: TAddTextureArray; CurTex: Integer): 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); + + PanelRec.user['panel_guid'] := pguid; + + //result := len; + result := pguid; end; + function CreateNullTexture(RecName: String): Integer; begin + RecName := toLowerCase1251(RecName); + if (TextNameHash = nil) then TextNameHash := THashStrInt.Create(); + if TextNameHash.get(RecName, result) then exit; // i found her! + SetLength(Textures, Length(Textures)+1); result := High(Textures); @@ -586,28 +893,142 @@ begin 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 extractWadName (resourceName: string): string; +var + posN: Integer; +begin + posN := Pos(':', resourceName); + if posN > 0 then + Result:= Copy(resourceName, 0, posN-1) + else + Result := ''; +end; + + +procedure addResToExternalResList (res: AnsiString); +var + uname: AnsiString; + f: Integer; + fi: TDiskFileInfo; +begin + if g_Game_IsClient or not g_Game_IsNet then exit; + if (length(res) = 0) then exit; // map wad + //res := extractWadName(res); + //if (length(res) = 0) then exit; // map wad + uname := toLowerCase1251(res); + // do not add duplicates + for f := 0 to High(gExternalResources) do + begin + if (gExternalResources[f].userName = uname) then exit; + end; + //writeln('***(000) addResToExternalResList: res=[', res, ']'); + // add new resource + fi.userName := uname; + if not findFileCI(res) then exit; + //writeln('***(001) addResToExternalResList: res=[', res, ']'); + fi.diskName := res; + if (not GetDiskFileInfo(res, fi)) then + begin + fi.tag := -1; + end + else + begin + //writeln('***(002) addResToExternalResList: res=[', res, ']'); + fi.tag := 0; // non-zero means "cannot caclucate hash" + try + fi.hash := MD5File(fi.diskName); + except + fi.tag := -1; + end; + end; + //e_LogWritefln('addext: res=[%s]; uname=[%s]; diskName=[%s]', [res, fi.userName, fi.diskName]); + SetLength(gExternalResources, length(gExternalResources)+1); + gExternalResources[High(gExternalResources)] := fi; +end; + + +procedure compactExtResList (); +var + src, dest: Integer; +begin + src := 0; + dest := 0; + for src := 0 to High(gExternalResources) do + begin + if (gExternalResources[src].tag = 0) then + begin + // copy it + if (dest <> src) then gExternalResources[dest] := gExternalResources[src]; + Inc(dest); + end; + end; + if (dest <> length(gExternalResources)) then SetLength(gExternalResources, dest); +end; + + +function GetReplacementWad (WadName: AnsiString): AnsiString; +begin + result := ''; + if WadName <> '' then + begin + result := WadName; + if g_Game_IsClient then result := g_Res_FindReplacementWad(WadName); + if (result = WadName) then result := e_FindWad(WadDirs, result) + end; +end; + + +procedure generateExternalResourcesList (map: TDynRecord); +begin + SetLength(gExternalResources, 0); + addResToExternalResList(GetReplacementWad(g_ExtractWadName(map.MusicName))); + addResToExternalResList(GetReplacementWad(g_ExtractWadName(map.SkyName))); +end; + + +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 := THashStrInt.Create(); + if TextNameHash.get(RecName, result) then + begin + // i found her! + //e_LogWritefln('texture ''%s'' already loaded (%s)', [RecName, result]); + 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 @@ -617,36 +1038,27 @@ begin 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'à: - WADName := g_ExtractWadName(RecName); + // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à: + WADName := GetReplacementWad(g_ExtractWadName(RecName)); + if (WADName <> '') then addResToExternalResList(WADName); + if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else WAD := TWADFile.Create(); - - 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 @@ -655,33 +1067,40 @@ 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 + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning); + SetLength(Textures, Length(Textures)-1); + result := -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 := THashStrInt.Create(); + if log and (not BadTextNameHash.get(RecName, a)) then + begin + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.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; @@ -698,29 +1117,46 @@ var ia: TDynImageDataArray = nil; f, c, frdelay, frloop: Integer; begin + RecName := toLowerCase1251(RecName); + if (TextNameHash = nil) then TextNameHash := THashStrInt.Create(); + if TextNameHash.get(RecName, result) then + begin + // i found her! + //e_LogWritefln('animated texture ''%s'' already loaded (%s)', [RecName, result]); + 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 := THashStrInt.Create(); + 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); + WADName := GetReplacementWad(g_ExtractWadName(RecName)); + if (WADName <> '') then addResToExternalResList(WADName); + if WADName = '' then WADName := Map; //WADName := GameDir+'/wads/'+WADName else 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 := THashStrInt.Create(); + if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; + BadTextNameHash.put(RecName, -1); exit; end; @@ -736,25 +1172,27 @@ begin if ResLength < 6 then begin - e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; // ýòî ïòèöà? ýòî ñàìîë¸ò? - if (TextureWAD[0] = 'D') and (TextureWAD[1] = 'F') and - (TextureWAD[2] = 'W') and (TextureWAD[3] = 'A') and (TextureWAD[4] = 'D') then + if isWadData(TextureWAD, ResLength) then begin // íåò, ýòî ñóïåðìåí! if not WAD.ReadMemory(TextureWAD, ResLength) then begin - e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè: if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then begin - e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; @@ -763,7 +1201,8 @@ begin TextureResource := cfg.ReadStr('', 'resource', ''); if TextureResource = '' then begin - e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; @@ -779,7 +1218,8 @@ begin // ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü: 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); + e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; @@ -799,10 +1239,16 @@ begin 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 := THashStrInt.Create(); + if log and (not BadTextNameHash.get(RecName, f)) then + begin + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); + end; + BadTextNameHash.put(RecName, -1); end; end; end @@ -821,12 +1267,14 @@ begin GlobalMetadata.ClearMetaItemsForSaving(); if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then begin - e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), TMsgType.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); + e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), TMsgType.Warning); + BadTextNameHash.put(RecName, -1); exit; end; @@ -869,7 +1317,7 @@ begin //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...'); //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height); f := ord(_backanimation); - e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY); + e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), TMsgType.Notify); SetLength(Textures, Length(Textures)+1); // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê @@ -882,24 +1330,30 @@ begin 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 := THashStrInt.Create(); + if log and (not BadTextNameHash.get(RecName, f)) then + begin + e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), TMsgType.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; @@ -911,7 +1365,7 @@ begin 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 = 0; @@ -981,32 +1435,40 @@ begin end; end; -procedure CreateTrigger(Trigger: TTriggerRec_1; fTexturePanel1Type, fTexturePanel2Type: Word); +function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer; var _trigger: TTrigger; + tp: TPanel; begin + result := -1; if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit; 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; - TexturePanelType := fTexturePanel1Type; - ShotPanelType := fTexturePanel2Type; + Enabled := Trigger.Enabled; + TexturePanelGUID := atpanid; TriggerType := Trigger.TriggerType; ActivateType := Trigger.ActivateType; Keys := Trigger.Keys; - Data.Default := Trigger.DATA; + trigPanelGUID := atrigpanid; + // HACK: used in TPanel.CanChangeTexture. maybe there's a better way? + if TexturePanelGUID <> -1 then + begin + tp := g_Map_PanelByGUID(TexturePanelGUID); + if (tp <> nil) then tp.hasTexTrigger := True; + end; end; - g_Triggers_Create(_trigger); + result := Integer(g_Triggers_Create(_trigger, Trigger)); end; -procedure CreateMonster(monster: TMonsterRec_1); +procedure CreateMonster(monster: TDynRecord); var a: Integer; mon: TMonster; @@ -1024,7 +1486,8 @@ begin 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].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); end; end; end; @@ -1038,6 +1501,7 @@ procedure g_Map_ReAdd_DieTriggers(); function monsDieTrig (mon: TMonster): Boolean; var a: Integer; + //tw: TStrTextWriter; begin result := false; // don't stop mon.ClearTriggers(); @@ -1045,7 +1509,17 @@ procedure g_Map_ReAdd_DieTriggers(); 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].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); end; end; end; @@ -1056,50 +1530,6 @@ begin g_Mons_ForEach(monsDieTrig); end; -function extractWadName(resourceName: string): string; -var - posN: Integer; -begin - posN := Pos(':', resourceName); - if posN > 0 then - Result:= Copy(resourceName, 0, posN-1) - else - Result := ''; -end; - -procedure addResToExternalResList(res: string); -begin - res := extractWadName(res); - if (res <> '') and (gExternalResources.IndexOf(res) = -1) then - gExternalResources.Add(res); -end; - -procedure generateExternalResourcesList(mapReader: TMapReader_1); -var - textures: TTexturesRec1Array; - mapHeader: TMapHeaderRec_1; - i: integer; - resFile: String = ''; -begin - if gExternalResources = nil then - gExternalResources := TStringList.Create; - - gExternalResources.Clear; - textures := mapReader.GetTextures(); - for i := 0 to High(textures) do - begin - addResToExternalResList(resFile); - end; - - textures := nil; - - mapHeader := mapReader.GetMapHeader; - - addResToExternalResList(mapHeader.MusicName); - addResToExternalResList(mapHeader.SkyName); -end; - - procedure mapCreateGrid (); var mapX0: Integer = $3fffffff; @@ -1138,7 +1568,7 @@ var 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); + e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), TMsgType.Notify); {$ENDIF} continue; end; @@ -1185,7 +1615,7 @@ begin calcBoundingBox(gLifts); calcBoundingBox(gBlockMon); - e_WriteLog(Format('map dimensions: (%d,%d)-(%d,%d); editor size:(0,0)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1, gMapInfo.Width, gMapInfo.Height]), 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; @@ -1194,6 +1624,7 @@ begin 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); @@ -1215,477 +1646,602 @@ 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; + tnum: Integer; + id: Integer; + trigrec: TDynRecord; + // texture pane; + texPanelIdx: Integer; + texPanel: TDynRecord; + // "action" panel + actPanelIdx: Integer; + actPanel: 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; + WAD, TestWAD: TWADFile; + //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; - FileName, mapResName, s, TexName: String; + TriggersTable: array of TTRec; + FileName, mapResName, TexName, s: AnsiString; Data: Pointer; Len: Integer; - ok, isAnim, trigRef: Boolean; + ok, isAnim: Boolean; CurTex, ntn: Integer; - + rec, texrec: TDynRecord; + pttit: PTRec; + pannum, trignum, cnt, tgpid: Integer; + stt: UInt64; + moveSpeed{, moveStart, moveEnd}: TDFPoint; + //moveActive: Boolean; + pan: TPanel; + mapOk: Boolean = false; + usedTextures: THashStrInt = nil; // key: mapTextureList begin mapGrid.Free(); mapGrid := nil; - //mapTree.Free(); - //mapTree := nil; + TestWAD := nil; + Data := 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: - FileName := g_ExtractWadName(Res); - e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); - - WAD := TWADFile.Create(); - if not WAD.ReadFile(FileName) then - begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName])); - WAD.Free(); - Exit; - end; - //k8: why loader ignores path here? - mapResName := g_ExtractFileName(Res); - if not WAD.GetMapResource(mapResName, Data, Len) then + // Çàãðóçêà WAD (åñëè ó íàñ íåò óæå çàãðóæåíîé êàðòû) + if (gCurrentMap = nil) then begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); + FileName := g_ExtractWadName(Res); + e_LogWritefln('Loading map WAD [%s] (res=[%s])', [FileName, Res], TMsgType.Notify); + g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); + + WAD := TWADFile.Create(); + if not WAD.ReadFile(FileName) then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName])); + WAD.Free(); + Exit; + end; + + if gTestMap <> '' then + begin + s := g_ExtractWadName(gTestMap); + TestWAD := TWADFile.Create(); + if not TestWAD.ReadFile(s) then + begin + g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_WAD], [s])); + TestWAD.Free(); + TestWAD := nil; + end; + end; + + if TestWAD <> nil then + begin + mapResName := g_ExtractFileName(gTestMap); + if not TestWAD.GetMapResource(mapResName, Data, Len) then + begin + g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); + Data := nil; + end else + e_WriteLog('Using test map: '+gTestMap, TMsgType.Notify); + TestWAD.Free(); + TestWAD := nil; + end; + + if Data = nil then + begin + //k8: why loader ignores path here? + mapResName := g_ExtractFileName(Res); + if not WAD.GetMapResource(mapResName, Data, Len) then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); + WAD.Free(); + Exit; + end; + end; + WAD.Free(); - Exit; - end; - WAD.Free(); + if (Len < 4) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + FreeMem(Data); + exit; + end; - // Çàãðóçêà êàðòû: - e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); - MapReader := TMapReader_1.Create(); + // Çàãðóçêà êàðòû: + e_LogWritefln('Loading map: %s', [mapResName], TMsgType.Notify); + g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); + + stt := getTimeMicro(); + + try + gCurrentMap := g_Map_ParseMap(Data, Len); + except + gCurrentMap.Free(); + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res])); + FreeMem(Data); + gCurrentMapFileName := ''; + Exit; + end; - if not MapReader.LoadMap(Data) then - begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res])); FreeMem(Data); - MapReader.Free(); - Exit; + + if (gCurrentMap = nil) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + gCurrentMapFileName := ''; + exit; + end; + end + else + begin + stt := getTimeMicro(); end; - FreeMem(Data); - generateExternalResourcesList(MapReader); - // Çàãðóçêà òåêñòóð: - g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False); - _textures := MapReader.GetTextures(); - _texnummap := nil; + //gCurrentMap := mapReader; - // Çàãðóçêà îïèñàíèÿ êàðòû: - e_WriteLog(' Reading map info...', MSG_NOTIFY); + generateExternalResourcesList(gCurrentMap); + mapTextureList := gCurrentMap['texture']; + // get all other lists here too + panels := gCurrentMap['panel']; + triggers := gCurrentMap['trigger']; + items := gCurrentMap['item']; + areas := gCurrentMap['area']; + monsters := gCurrentMap['monster']; + + // Çàãðóçêà îïèñàíèÿ êàðòû: + e_WriteLog(' Reading map info...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False); - Header := MapReader.GetMapHeader(); 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; + Name := gCurrentMap.MapName; + Description := gCurrentMap.MapDesc; + Author := gCurrentMap.MapAuthor; + MusicName := gCurrentMap.MusicName; + SkyName := gCurrentMap.SkyName; + Height := gCurrentMap.Height; + Width := gCurrentMap.Width; end; - // Äîáàâëåíèå òåêñòóð â Textures[]: - if _textures <> nil then + // Çàãðóçêà òåêñòóð: + 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)); + e_WriteLog(' Loading textures:', TMsgType.Notify); + g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], mapTextureList.count-1, False); - for a := 0 to High(_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 + // find used textures + usedTextures := THashStrInt.Create(); + try + if (panels <> nil) and (panels.count > 0) then + begin + for rec in panels do begin - SetLength(s, b-1); - Break; + texrec := rec.TextureRec; + if (texrec <> nil) then usedTextures.put(toLowerCase1251(texrec.Resource), 42); end; - e_WriteLog(Format(' Loading texture #%d: %s', [a, s]), MSG_NOTIFY); - //if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY); - // Àíèìèðîâàííàÿ òåêñòóðà: - if ByteBool(_textures[a].Anim) then + end; + + cnt := -1; + for rec in mapTextureList do + begin + Inc(cnt); + if not usedTextures.has(toLowerCase1251(rec.Resource)) 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; + rec.tagInt := -1; // just in case + e_LogWritefln(' Unused texture #%d: %s', [cnt, rec.Resource]); end - else // Îáû÷íàÿ òåêñòóðà: - ntn := CreateTexture(_textures[a].Resource, FileName, True); - if ntn < 0 then + else begin - g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s])); - ntn := CreateNullTexture(_textures[a].Resource); + {$IF DEFINED(D2F_DEBUG_TXLOAD)} + e_LogWritefln(' Loading texture #%d: %s', [cnt, rec.Resource]); + {$ENDIF} + //if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY); + if rec.Anim then + begin + // Àíèìèðîâàííàÿ òåêñòóðà + ntn := CreateAnimTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [rec.Resource])); + end + else + begin + // Îáû÷íàÿ òåêñòóðà + ntn := CreateTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [rec.Resource])); + end; + if (ntn < 0) then ntn := CreateNullTexture(rec.Resource); + + rec.tagInt := ntn; // remember texture number end; + g_Game_StepLoading(); + end; + finally + usedTextures.Free(); + end; - _texnummap[a] := ntn; // fix texture number - g_Game_StepLoading(); + // 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); + e_WriteLog(' Loading triggers...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False); - triggers := MapReader.GetTriggers(); - // Çàãðóçêà ïàíåëåé: - e_WriteLog(' Loading panels...', MSG_NOTIFY); + // Çàãðóçêà ïàíåëåé + e_WriteLog(' Loading panels...', TMsgType.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', TMsgType.Fatal); + result := false; + gCurrentMap.Free(); + gCurrentMap := nil; + gCurrentMapFileName := ''; + 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); + e_WriteLog(' Setting up trigger table...', TMsgType.Notify); + //SetLength(TriggersTable, triggers.count); + g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False); - for a := 0 to High(TriggersTable) do + SetLength(TriggersTable, triggers.count); + trignum := -1; + 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; - + Inc(trignum); + pttit := @TriggersTable[trignum]; + pttit.trigrec := rec; + // Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè) + pttit.texPanelIdx := -1; // will be fixed later + pttit.texPanel := rec.TexturePanelRec; + // action panel + pttit.actPanelIdx := -1; + if (rec.trigRec <> nil) then pttit.actPanel := rec.trigRec.tgPanelRec else pttit.actPanel := nil; + // set flag + if (pttit.texPanel <> nil) then pttit.texPanel.userPanelTrigRef := true; + if (pttit.actPanel <> nil) then pttit.actPanel.userPanelTrigRef := true; + // update progress 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); + e_WriteLog(' Setting up trigger links...', TMsgType.Notify); + 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 ok then + if (mapTextureList <> nil) then begin - // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû. - // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð: - ok := False; - if (TriggersTable <> nil) and (_textures <> nil) then - for b := 0 to High(TriggersTable) do - if (TriggersTable[b].TexturePanel = a) - or (TriggersTable[b].ShotPanel = a) then - begin - trigRef := True; - ok := True; - Break; - end; + texrec := rec.TextureRec; + ok := (texrec <> nil); 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 + // Ñìîòðèì, ññûëàþòñÿ ëè íà ýòó ïàíåëü òðèããåðû. + // Åñëè äà - òî íàäî ñîçäàòü åùå òåêñòóð + ok := false; + if (TriggersTable <> nil) and (mapTextureList <> nil) then + begin + if rec.userPanelTrigRef then begin - Len := c; - Break; + // e_LogWritefln('trigref for panel %s', [pannum]); + ok := True; end; - SetLength(s, Len); + end; + end; + + if ok then + 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 + //e_LogWritefln('new panel; tcount=%s; curtex=%s', [Length(AddTextures), CurTex]); + PanelID := CreatePanel(rec, AddTextures, CurTex); + //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'].value; + 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; + // ×èíèì ID'û ïàíåëåé, êîòîðûå èñïîëüçóþòñÿ â òðèããåðàõ + for b := 0 to High(TriggersTable) do + begin + if (TriggersTable[b].texPanel <> nil) then TriggersTable[b].texPanelIdx := TriggersTable[b].texPanel.userPanelId; + if (TriggersTable[b].actPanel <> nil) then TriggersTable[b].actPanelIdx := TriggersTable[b].actPanel.userPanelId; + end; + // create map grid, init other grids (for monsters, for example) - e_WriteLog('Creating map grid', MSG_NOTIFY); + e_WriteLog('Creating map grid', TMsgType.Notify); mapCreateGrid(); - // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû: - if (triggers <> nil) and not gLoadGameMode then + // Åñëè íå 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); + tgpid := TriggersTable[trignum].actPanelIdx; + //e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]); + TriggersTable[trignum].tnum := trignum; + TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanelIdx, tgpid); + end; + end; + + //FIXME: use hashtable! + for pan in panByGUID do + begin + if (pan.endPosTrigId >= 0) and (pan.endPosTrigId < Length(TriggersTable)) then + begin + pan.endPosTrigId := TriggersTable[pan.endPosTrigId].id; + end; + if (pan.endSizeTrigId >= 0) and (pan.endSizeTrigId < Length(TriggersTable)) then + begin + pan.endSizeTrigId := TriggersTable[pan.endSizeTrigId].id; end; end; - // Çàãðóçêà ïðåäìåòîâ: - e_WriteLog(' Loading triggers...', MSG_NOTIFY); + // Çàãðóçêà ïðåäìåòîâ + e_WriteLog(' Loading items...', TMsgType.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); + e_WriteLog(' Spawning items...', TMsgType.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); + // Çàãðóçêà îáëàñòåé + e_WriteLog(' Loading areas...', TMsgType.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); + e_WriteLog(' Creating areas...', TMsgType.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); + // Çàãðóçêà ìîíñòðîâ + e_WriteLog(' Loading monsters...', TMsgType.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); + e_WriteLog(' Spawning monsters...', TMsgType.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; - MapReader.Free(); + //gCurrentMap := mapReader; // this will be our current map now + gCurrentMapFileName := Res; + //mapReader := nil; - // Çàãðóçêà íåáà: - if gMapInfo.SkyName <> '' then + // Çàãðóçêà íåáà + if (gMapInfo.SkyName <> '') then begin - e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY); + e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False); - FileName := g_ExtractWadName(gMapInfo.SkyName); - - if FileName <> '' then - FileName := GameDir+'/wads/'+FileName - else - begin - FileName := g_ExtractWadName(Res); - end; - - s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName); - if g_Texture_CreateWAD(BackID, s) then - begin - g_Game_SetupScreenSize(); - end - else - g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s])); + if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST; + try + s := e_GetResourcePath(WadDirs, gMapInfo.SkyName, g_ExtractWadName(Res)); + if g_Texture_CreateWAD(BackID, s) then + g_Game_SetupScreenSize + else + g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s])) + finally + TEXTUREFILTER := GL_NEAREST; + end; end; - // Çàãðóçêà ìóçûêè: + // Çàãðóçêà ìóçûêè ok := False; if gMapInfo.MusicName <> '' then begin - e_WriteLog(' Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY); + e_WriteLog(' Loading music: ' + gMapInfo.MusicName, TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False); - FileName := g_ExtractWadName(gMapInfo.MusicName); - - if FileName <> '' then - FileName := GameDir+'/wads/'+FileName - else - begin - FileName := g_ExtractWadName(Res); - end; - s := FileName+':'+g_ExtractFilePathName(gMapInfo.MusicName); + s := e_GetResourcePath(WadDirs, gMapInfo.MusicName, g_ExtractWadName(Res)); if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then ok := True else g_FatalError(Format(_lc[I_GAME_ERROR_MUSIC], [s])); end; - // Îñòàëüíûå óñòàíâêè: + // Îñòàëüíûå óñòàíâêè CreateDoorMap(); CreateLiftMap(); @@ -1693,12 +2249,11 @@ begin 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; @@ -1706,27 +2261,43 @@ begin 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 := getTimeMicro()-stt; + e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]); + mapOk := true; finally sfsGCEnable(); // enable releasing unused volumes + //mapReader.Free(); + e_UnpressAllKeys; // why not? + if not mapOk then + begin + gCurrentMap.Free(); + gCurrentMap := nil; + gCurrentMapFileName := ''; + end; end; - e_WriteLog('Done loading map.', MSG_NOTIFY); + compactExtResList(); + e_WriteLog('Done loading map.', TMsgType.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; @@ -1750,36 +2321,47 @@ begin 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; + FreeMem(Data); + exit; + end; FreeMem(Data); - MapReader.Free(); - Result.Map := Res; - Result.Author := Header.MapAuthor; - Result.Height := Header.Height; - Result.Width := Header.Width; + if (mapReader = nil) then exit; + + 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; +function g_Map_GetMapsList(WADName: string): SSArray; var WAD: TWADFile; a: Integer; - ResList: SArray; + ResList: SSArray; begin Result := nil; WAD := TWADFile.Create(); @@ -1804,7 +2386,7 @@ function g_Map_Exist(Res: string): Boolean; var WAD: TWADFile; FileName, mnn: string; - ResList: SArray; + ResList: SSArray; a: Integer; begin Result := False; @@ -1830,7 +2412,7 @@ begin end; end; -procedure g_Map_Free(); +procedure g_Map_Free(freeTextures: Boolean=true); var a: Integer; @@ -1869,19 +2451,50 @@ begin //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); + e_LogWritefln('g_Map_Free: previous map was ''%s''...', [gCurrentMapFileName]); + end + else + begin + e_LogWritefln('g_Map_Free: no previous map.', []); + end; - Textures := nil; + 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; + gCurrentMapFileName := ''; + gCurrentMap.Free(); + gCurrentMap := nil; end; + panByGUID := nil; + FreePanelArray(gWalls); FreePanelArray(gRenderBackgrounds); FreePanelArray(gRenderForegrounds); @@ -1891,6 +2504,7 @@ begin FreePanelArray(gSteps); FreePanelArray(gLifts); FreePanelArray(gBlockMon); + gMovingWallIds := nil; if BackID <> DWORD(-1) then begin @@ -1912,8 +2526,6 @@ begin gDoorMap := nil; gLiftMap := nil; - - PanelByID := nil; end; procedure g_Map_Update(); @@ -1921,18 +2533,19 @@ var a, d, j: Integer; m: Word; s: String; + b: Byte; procedure UpdatePanelArray(var panels: TPanelArray); var 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 g_dbgpan_mplat_step then g_dbgpan_mplat_active := true; + UpdatePanelArray(gWalls); UpdatePanelArray(gRenderBackgrounds); UpdatePanelArray(gRenderForegrounds); @@ -1941,24 +2554,26 @@ begin UpdatePanelArray(gAcid2); UpdatePanelArray(gSteps); + if g_dbgpan_mplat_step then begin g_dbgpan_mplat_step := false; g_dbgpan_mplat_active := false; end; + 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); @@ -1969,41 +2584,48 @@ begin s := _lc[I_PLAYER_FLAG_BLUE]; g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144); + if (((gPlayer1 <> nil) and (((gPlayer1.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer1.Team = TEAM_BLUE) and (a = FLAG_BLUE)))) + or ((gPlayer2 <> nil) and (((gPlayer2.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer2.Team = TEAM_BLUE) and (a = FLAG_BLUE))))) then + b := 0 + else + b := 1; + + if not sound_ret_flag[b].IsPlaying() then + sound_ret_flag[b].Play(); + if g_Game_IsNet then MH_SEND_FlagEvent(FLAG_STATE_RETURNED, a, 0); Continue; 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].alive 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; // old algo -procedure g_Map_DrawPanels (PanelType: Word); +procedure g_Map_DrawPanels (PanelType: Word; hasAmbient: Boolean; constref ambColor: TDFColor); procedure DrawPanels (constref panels: TPanelArray; drawDoors: Boolean=False); var @@ -2014,7 +2636,7 @@ procedure g_Map_DrawPanels (PanelType: Word); // alas, no visible set for idx := 0 to High(panels) do begin - if not (drawDoors xor panels[idx].Door) then panels[idx].Draw(); + if not (drawDoors xor panels[idx].Door) then panels[idx].Draw(hasAmbient, ambColor); end; end; end; @@ -2035,47 +2657,26 @@ end; // new algo procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - if ((tag and GridTagDoor) <> 0) <> pan.Door then exit; - gDrawPanelList.insert(pan); - end; - +var + mwit: PPanel; + it: TPanelGrid.Iter; begin dplClear(); - //tagmask := panelTypeToTag(PanelType); - - {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); - end; + it := mapGrid.forEachInAABB(x0, y0, wdt, hgt, GridDrawableMask); + for mwit in it do if (((mwit^.tag and GridTagDoor) <> 0) = mwit^.Door) then gDrawPanelList.insert(mwit^); + it.release(); // list will be rendered in `g_game.DrawPlayer()` end; -procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - pan.DrawShadowVolume(lightX, lightY, radius); - end; - +procedure g_Map_DrawPanelShadowVolumes (lightX: Integer; lightY: Integer; radius: Integer); +var + mwit: PPanel; + it: TPanelGrid.Iter; begin - {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)); - end; + it := mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, (GridTagWall or GridTagDoor)); + for mwit in it do mwit^.DrawShadowVolume(lightX, lightY, radius); + it.release(); end; @@ -2176,10 +2777,10 @@ begin h := High(gLifts); for a := 0 to h do - if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or - (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or - (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or - (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and + if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = LIFTTYPE_RIGHT))) and g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then @@ -2229,7 +2830,7 @@ var end; begin - texid := TEXTURE_NONE; + texid := LongWord(TEXTURE_NONE); result := texid; if not checkPanels(gWater) then if not checkPanels(gAcid1) then @@ -2241,6 +2842,7 @@ end; function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; const SlowMask = GridTagLift or GridTagBlockMon; + function checker (pan: TPanel; tag: Integer): Boolean; begin { @@ -2254,10 +2856,10 @@ const if ((tag and GridTagLift) <> 0) then begin result := - ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or - (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or - (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or - (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))) {and + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; exit; end; @@ -2275,7 +2877,11 @@ const var tagmask: Integer = 0; + mwit: PPanel; + it: TPanelGrid.Iter; + pan: TPanel; begin + result := false; if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor); if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater; if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1; @@ -2284,50 +2890,46 @@ begin if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift; if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; - if (tagmask = 0) then begin result := false; exit; end; // just in case + if (tagmask = 0) then exit; // just in case if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids'); if gdbg_map_use_accel_coldet then begin - {if gdbg_map_use_tree_coldet 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 - 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])); - end; - end - else} + if ((tagmask and SlowMask) <> 0) then begin - if (Width = 1) and (Height = 1) then + // slow + it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask); + for mwit in it do begin - if ((tagmask and SlowMask) <> 0) then + pan := mwit^; + if ((pan.tag and GridTagLift) <> 0) then begin - // slow - result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil); + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and + g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; end - else + else if ((pan.tag and GridTagBlockMon) <> 0) then begin - // fast - result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil); - end; - end - else - begin - if ((tagmask and SlowMask) <> 0) then - begin - // slow - result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil); + result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height); end else begin - // fast - result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil); + // other shit + result := true; // i found her! end; + if (result) then break; end; + end + else + begin + // fast + it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask, false, true); // return first hit + result := (it.length > 0); end; + it.release(); end else begin @@ -2337,55 +2939,42 @@ begin end; +// returns `true` if we need to stop +function liquidChecker (pan: TPanel; var texid: DWORD; var cctype: Integer): Boolean; inline; +begin + result := false; + //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; + // check priorities + case cctype of + 0: if ((pan.tag and GridTagWater) = 0) then exit; // allowed: water + 1: if ((pan.tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 + //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 + end; + // collision? + //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; + // yeah + texid := pan.GetTextureID(); + // water? water has the highest priority, so stop right here + if ((pan.tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; + // acid2? + if ((pan.tag and GridTagAcid2) <> 0) then cctype := 2; + // acid1? + if ((pan.tag and GridTagAcid1) <> 0) then cctype := 1; +end; + function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; var cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit - texid: DWORD; - - // slightly different from the old code, but meh... - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; - // check priorities - case cctype of - 0: if ((tag and GridTagWater) = 0) then exit; // allowed: water - 1: if ((tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 - //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 - end; - // collision? - //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; - // yeah - texid := pan.GetTextureID(); - // water? water has the highest priority, so stop right here - if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; - // acid2? - if ((tag and GridTagAcid2) <> 0) then cctype := 2; - // acid1? - if ((tag and GridTagAcid1) <> 0) then cctype := 1; - end; - + mwit: PPanel; + it: TPanelGrid.Iter; begin if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids'); if gdbg_map_use_accel_coldet then begin - texid := TEXTURE_NONE; - {if gdbg_map_use_tree_coldet then - begin - mapTree.aabbQuery(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); - end - 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; - end; - result := texid; + result := LongWord(TEXTURE_NONE); + it := mapGrid.forEachInAABB(X, Y, Width, Height, (GridTagWater or GridTagAcid1 or GridTagAcid2)); + for mwit in it do if (liquidChecker(mwit^, result, cctype)) then break; + it.release(); end else begin @@ -2395,97 +2984,106 @@ begin 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; + if pan.Enabled and mapGrid.proxyEnabled[pan.proxyId] 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(pguid); + // mark platform as interesting + pan.setDirty(); {$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); + +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; + if (not pan.Enabled) and (not mapGrid.proxyEnabled[pan.proxyId]) 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(pguid); + // mark platform as interesting + pan.setDirty(); {$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); + +procedure g_Map_SwitchTextureGUID (pguid: Integer; AnimLoop: Byte = 0); var tp: TPanel; begin - 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; - end; - + tp := g_Map_PanelByGUID(pguid); + if (tp = nil) then exit; 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(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 + LIFTTYPE_UP: g_Mark(X, Y, Width, Height, MARK_LIFTUP); + LIFTTYPE_DOWN: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN); + LIFTTYPE_LEFT: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT); + LIFTTYPE_RIGHT: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT); + end; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); + // mark platform as interesting + pan.setDirty(); 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; @@ -2537,7 +3135,7 @@ begin Obj.Y := -1000; Obj.Vel.X := 0; Obj.Vel.Y := 0; - Direction := D_LEFT; + Direction := TDirection.D_LEFT; State := FLAG_STATE_NONE; if FlagPoints[Flag] <> nil then begin @@ -2565,14 +3163,14 @@ begin if State = FLAG_STATE_NONE then continue; - if Direction = D_LEFT then + if Direction = TDirection.D_LEFT then begin - Mirror := M_HORIZONTAL; + Mirror := TMirrorType.Horizontal; dx := -1; end else begin - Mirror := M_NONE; + Mirror := TMirrorType.None; dx := 1; end; @@ -2589,286 +3187,195 @@ begin end; end; -procedure g_Map_SaveState(Var Mem: TBinMemoryWriter); + +procedure g_Map_SaveState (st: TStream); var - dw: DWORD; - b: Byte; str: String; - boo: Boolean; - procedure SavePanelArray(var panels: TPanelArray); + procedure savePanels (); var - PAMem: TBinMemoryWriter; - i: Integer; + pan: TPanel; begin - // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé: - PAMem := TBinMemoryWriter.Create((Length(panels)+1) * 40); + // Ñîõðàíÿåì ïàíåëè + utils.writeInt(st, LongInt(Length(panByGUID))); + for pan in panByGUID do pan.SaveState(st); + end; - i := 0; - while i < Length(panels) do - begin - if panels[i].SaveIt then - begin - // ID ïàíåëè: - PAMem.WriteInt(i); - // Ñîõðàíÿåì ïàíåëü: - panels[i].SaveState(PAMem); - end; - Inc(i); - end; - - // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé: - PAMem.SaveToMemory(Mem); - PAMem.Free(); - end; - - procedure SaveFlag(flag: PFlag); - begin - // Ñèãíàòóðà ôëàãà: - dw := FLAG_SIGNATURE; // 'FLAG' - Mem.WriteDWORD(dw); - // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà: - Mem.WriteByte(flag^.RespawnType); - // Ñîñòîÿíèå ôëàãà: - Mem.WriteByte(flag^.State); - // Íàïðàâëåíèå ôëàãà: - if flag^.Direction = D_LEFT then - b := 1 - else // D_RIGHT - b := 2; - Mem.WriteByte(b); - // Îáúåêò ôëàãà: - Obj_SaveState(@flag^.Obj, Mem); - end; - -begin - Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB - -///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: ///// -// Ñîõðàíÿåì ïàíåëè ñòåí è äâåðåé: - SavePanelArray(gWalls); -// Ñîõðàíÿåì ïàíåëè ôîíà: - SavePanelArray(gRenderBackgrounds); -// Ñîõðàíÿåì ïàíåëè ïåðåäíåãî ïëàíà: - SavePanelArray(gRenderForegrounds); -// Ñîõðàíÿåì ïàíåëè âîäû: - SavePanelArray(gWater); -// Ñîõðàíÿåì ïàíåëè êèñëîòû-1: - SavePanelArray(gAcid1); -// Ñîõðàíÿåì ïàíåëè êèñëîòû-2: - SavePanelArray(gAcid2); -// Ñîõðàíÿåì ïàíåëè ñòóïåíåé: - SavePanelArray(gSteps); -// Ñîõðàíÿåì ïàíåëè ëèôòîâ: - SavePanelArray(gLifts); -///// ///// - -///// Ñîõðàíÿåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: - dw := MUSIC_SIGNATURE; // 'MUSI' - Mem.WriteDWORD(dw); -// Íàçâàíèå ìóçûêè: - Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); - if gMusic.NoMusic then - str := '' - else - str := gMusic.Name; - Mem.WriteString(str, 64); -// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè: - dw := gMusic.GetPosition(); - Mem.WriteDWORD(dw); -// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå: - boo := gMusic.SpecPause; - Mem.WriteBoolean(boo); -///// ///// - -///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: ///// - Mem.WriteInt(gTotalMonsters); -///// ///// - -//// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// - if gGameSettings.GameMode = GM_CTF then + procedure saveFlag (flag: PFlag); + var + b: Byte; + begin + utils.writeSign(st, 'FLAG'); + utils.writeInt(st, Byte(0)); // version + // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà + utils.writeInt(st, Byte(flag^.RespawnType)); + // Ñîñòîÿíèå ôëàãà + utils.writeInt(st, Byte(flag^.State)); + // Íàïðàâëåíèå ôëàãà + if flag^.Direction = TDirection.D_LEFT then b := 1 else b := 2; // D_RIGHT + utils.writeInt(st, Byte(b)); + // Îáúåêò ôëàãà + Obj_SaveState(st, @flag^.Obj); + end; + +begin + savePanels(); + + // Ñîõðàíÿåì ìóçûêó + utils.writeSign(st, 'MUSI'); + utils.writeInt(st, Byte(0)); + // Íàçâàíèå ìóçûêè + assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); + if gMusic.NoMusic then str := '' else str := gMusic.Name; + utils.writeStr(st, str); + // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè + utils.writeInt(st, LongWord(gMusic.GetPosition())); + // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå + utils.writeBool(st, gMusic.SpecPause); + + ///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: ///// + utils.writeInt(st, LongInt(gTotalMonsters)); + ///// ///// + + //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// + if (gGameSettings.GameMode = GM_CTF) then begin - // Ôëàã Êðàñíîé êîìàíäû: - SaveFlag(@gFlags[FLAG_RED]); - // Ôëàã Ñèíåé êîìàíäû: - SaveFlag(@gFlags[FLAG_BLUE]); + // Ôëàã Êðàñíîé êîìàíäû + saveFlag(@gFlags[FLAG_RED]); + // Ôëàã Ñèíåé êîìàíäû + saveFlag(@gFlags[FLAG_BLUE]); end; -///// ///// + ///// ///// -///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// + ///// Ñîõðàíÿåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - // Î÷êè Êðàñíîé êîìàíäû: - Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals); - // Î÷êè Ñèíåé êîìàíäû: - Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals); + // Î÷êè Êðàñíîé êîìàíäû + utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Goals)); + // Î÷êè Ñèíåé êîìàíäû + utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Goals)); end; -///// ///// + ///// ///// end; -procedure g_Map_LoadState(Var Mem: TBinMemoryReader); + +procedure g_Map_LoadState (st: TStream); var dw: DWORD; - b: Byte; str: String; boo: Boolean; - procedure LoadPanelArray(var panels: TPanelArray); + procedure loadPanels (); var - PAMem: TBinMemoryReader; - i, id: Integer; + pan: TPanel; begin - // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé: - PAMem := TBinMemoryReader.Create(); - PAMem.LoadFromMemory(Mem); - - for i := 0 to Length(panels)-1 do - if panels[i].SaveIt then - begin - // ID ïàíåëè: - PAMem.ReadInt(id); - if id <> i then - begin - raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: Wrong Panel ID'); - end; - // Çàãðóæàåì ïàíåëü: - panels[i].LoadState(PAMem); - end; - - // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí: - PAMem.Free(); + // Çàãðóæàåì ïàíåëè + if (Length(panByGUID) <> utils.readLongInt(st)) then raise XStreamError.Create('invalid number of saved panels'); + for pan in panByGUID do + begin + pan.LoadState(st); + if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; + end; end; - procedure LoadFlag(flag: PFlag); + procedure loadFlag (flag: PFlag); + var + b: Byte; begin - // Ñèãíàòóðà ôëàãà: - Mem.ReadDWORD(dw); - if dw <> FLAG_SIGNATURE then // 'FLAG' - begin - raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); - end; - // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà: - Mem.ReadByte(flag^.RespawnType); - // Ñîñòîÿíèå ôëàãà: - Mem.ReadByte(flag^.State); - // Íàïðàâëåíèå ôëàãà: - Mem.ReadByte(b); - if b = 1 then - flag^.Direction := D_LEFT - else // b = 2 - flag^.Direction := D_RIGHT; - // Îáúåêò ôëàãà: - Obj_LoadState(@flag^.Obj, Mem); + // Ñèãíàòóðà ôëàãà + if not utils.checkSign(st, 'FLAG') then raise XStreamError.Create('invalid flag signature'); + if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid flag version'); + // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà + flag^.RespawnType := utils.readByte(st); + // Ñîñòîÿíèå ôëàãà + flag^.State := utils.readByte(st); + // Íàïðàâëåíèå ôëàãà + b := utils.readByte(st); + if (b = 1) then flag^.Direction := TDirection.D_LEFT else flag^.Direction := TDirection.D_RIGHT; // b = 2 + // Îáúåêò ôëàãà + Obj_LoadState(@flag^.Obj, st); end; begin - if Mem = nil then - Exit; + if (st = nil) then exit; -///// Çàãðóæàåì ñïèñêè ïàíåëåé: ///// -// Çàãðóæàåì ïàíåëè ñòåí è äâåðåé: - LoadPanelArray(gWalls); -// Çàãðóæàåì ïàíåëè ôîíà: - LoadPanelArray(gRenderBackgrounds); -// Çàãðóæàåì ïàíåëè ïåðåäíåãî ïëàíà: - LoadPanelArray(gRenderForegrounds); -// Çàãðóæàåì ïàíåëè âîäû: - LoadPanelArray(gWater); -// Çàãðóæàåì ïàíåëè êèñëîòû-1: - LoadPanelArray(gAcid1); -// Çàãðóæàåì ïàíåëè êèñëîòû-2: - LoadPanelArray(gAcid2); -// Çàãðóæàåì ïàíåëè ñòóïåíåé: - LoadPanelArray(gSteps); -// Çàãðóæàåì ïàíåëè ëèôòîâ: - LoadPanelArray(gLifts); -///// ///// - -// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó: + ///// Çàãðóæàåì ñïèñêè ïàíåëåé: ///// + loadPanels(); + ///// ///// + + // Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó g_GFX_Init(); - mapCreateGrid(); - -///// Çàãðóæàåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: - Mem.ReadDWORD(dw); - if dw <> MUSIC_SIGNATURE then // 'MUSI' - begin - raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); - end; -// Íàçâàíèå ìóçûêè: - Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); - Mem.ReadString(str); -// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè: - Mem.ReadDWORD(dw); -// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå: - Mem.ReadBoolean(boo); -// Çàïóñêàåì ýòó ìóçûêó: + //mapCreateGrid(); + + ///// Çàãðóæàåì ìóçûêó: ///// + if not utils.checkSign(st, 'MUSI') then raise XStreamError.Create('invalid music signature'); + if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid music version'); + // Íàçâàíèå ìóçûêè + assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); + str := utils.readStr(st); + // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè + dw := utils.readLongWord(st); + // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå + boo := utils.readBool(st); + // Çàïóñêàåì ýòó ìóçûêó gMusic.SetByName(str); gMusic.SpecPause := boo; gMusic.Play(); - gMusic.Pause(True); + gMusic.Pause(true); gMusic.SetPosition(dw); -///// ///// + ///// ///// -///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// - Mem.ReadInt(gTotalMonsters); -///// ///// + ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// + gTotalMonsters := utils.readLongInt(st); + ///// ///// -//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// - if gGameSettings.GameMode = GM_CTF then + //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// + if (gGameSettings.GameMode = GM_CTF) then begin - // Ôëàã Êðàñíîé êîìàíäû: - LoadFlag(@gFlags[FLAG_RED]); - // Ôëàã Ñèíåé êîìàíäû: - LoadFlag(@gFlags[FLAG_BLUE]); + // Ôëàã Êðàñíîé êîìàíäû + loadFlag(@gFlags[FLAG_RED]); + // Ôëàã Ñèíåé êîìàíäû + loadFlag(@gFlags[FLAG_BLUE]); end; -///// ///// + ///// ///// -///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// + ///// Çàãðóæàåì êîëè÷åñòâî ïîáåä, åñëè ýòî TDM/CTF: ///// if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin - // Î÷êè Êðàñíîé êîìàíäû: - Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals); - // Î÷êè Ñèíåé êîìàíäû: - Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals); + // Î÷êè Êðàñíîé êîìàíäû + gTeamStat[TEAM_RED].Goals := utils.readSmallInt(st); + // Î÷êè Ñèíåé êîìàíäû + gTeamStat[TEAM_BLUE].Goals := utils.readSmallInt(st); end; -///// ///// -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 topx := x; topy := y; // started outside of the liquid? - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then begin result := false; exit; end; if (dx = 0) and (dy = 0) then begin result := false; exit; end; // sanity check result := true; while true do begin Inc(x, dx); Inc(y, dy); - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then exit; // out of the water, just exit topx := x; topy := y; end; end; +begin + DynWarningCB := mapWarningCB; end.