X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=e976be49c616045a92b12fd0b2c4844fd9227be2;hb=db4e988645273fe1c11611d84e03f0199cd181f7;hp=54d3763290be72f4d486f905a6d08265f5f18af1;hpb=dd0d8ac4cc2a0aa774f25c8a1a774f7358acfae7;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 54d3763..e976be4 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -14,13 +14,14 @@ * along with this program. If not, see . *) {$INCLUDE ../shared/a_modes.inc} +{$DEFINE MAP_DEBUG_ENABLED_FLAG} unit g_map; interface uses - e_graphics, g_basic, MAPSTRUCT, g_textures, Classes, - g_phys, wadreader, BinEditor, g_panel, g_grid, md5; + e_graphics, g_basic, MAPDEF, g_textures, Classes, + g_phys, wadreader, BinEditor, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; type TMapInfo = record @@ -59,19 +60,30 @@ function g_Map_Load(Res: String): Boolean; function g_Map_GetMapInfo(Res: String): TMapInfo; function g_Map_GetMapsList(WADName: String): SArray; function g_Map_Exist(Res: String): Boolean; -procedure g_Map_Free(); +procedure g_Map_Free(freeTextures: Boolean=true); procedure g_Map_Update(); -procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word); +function g_Map_PanelByGUID (aguid: Integer): TPanel; inline; + +procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated +procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); procedure g_Map_DrawBack(dx, dy: Integer); function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; - PanelType: Word; b1x3: Boolean): Boolean; + PanelType: Word; b1x3: Boolean=false): Boolean; function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; -procedure g_Map_EnableWall(ID: DWORD); -procedure g_Map_DisableWall(ID: DWORD); -procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0); -procedure g_Map_SetLift(ID: DWORD; t: Integer); + +procedure g_Map_EnableWallGUID (pguid: Integer); +procedure g_Map_DisableWallGUID (pguid: Integer); +procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer); + +// HACK!!! +procedure g_Map_EnableWall_XXX (ID: DWORD); +procedure g_Map_DisableWall_XXX (ID: DWORD); +procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer); + +procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0); + procedure g_Map_ReAdd_DieTriggers(); function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -83,13 +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_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); +// returns panel or nil +// sets `ex` and `ey` to `x1` and `y1` when no hit was detected +function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel; + +// returns panel or nil +// sets `ex` and `ey` to `x1` and `y1` when no hit was detected +function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel; + +type + TForEachPanelCB = function (pan: TPanel): Boolean 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_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; @@ -113,6 +169,38 @@ const SKY_STRETCH: Single = 1.5; +const + GridTagInvalid = 0; + + (* draw order: + PANEL_BACK + PANEL_STEP + PANEL_WALL + PANEL_CLOSEDOOR + PANEL_ACID1 + PANEL_ACID2 + PANEL_WATER + PANEL_FORE + *) + // sorted by draw priority + GridTagBack = 1 shl 0; // 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; // gLifts + GridTagBlockMon = 1 shl 9; // gBlockMon + + 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); + + var gWalls: TPanelArray; gRenderBackgrounds: TPanelArray; @@ -124,21 +212,41 @@ 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; + 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()` + + gCurrentMap: TDynRecord = nil; + gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading + + +function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX + + +type + TPanelGrid = specialize TBodyGridBase; + +var + mapGrid: TPanelGrid = nil; // DO NOT USE! public for debugging only! + implementation uses - g_main, e_log, SysUtils, g_items, g_gfx, g_console, + e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console, GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG, - g_options, MAPREADER, g_triggers, g_player, MAPDEF, + g_options, g_triggers, g_player, Math, g_monsters, g_saveload, g_language, g_netmsg, - utils, sfs, + utils, sfs, xstreams, hashtable, ImagingTypes, Imaging, ImagingUtility, ImagingGif, ImagingNetworkGraphics; @@ -147,22 +255,228 @@ const MUSIC_SIGNATURE = $4953554D; // 'MUSI' FLAG_SIGNATURE = $47414C46; // 'FLAG' - GridTagInvalid = -1; - GridTagWallDoor = 0; - GridTagBack = 1; - GridTagFore = 2; - GridTagWater = 3; - GridTagAcid1 = 4; - GridTagAcid2 = 5; - GridTagStep = 6; - GridTagLift = 7; - GridTagBlockMon = 8; +var + 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 := openDiskFileRO(DataDir+'mapdef.txt'); + e_LogWritefln('found local "%smapdef.txt"', [DataDir]); + 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_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû + NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû + + +function g_Texture_NumNameFindStart(name: String): Boolean; +var + i: Integer; + +begin + Result := False; + NNF_PureName := ''; + NNF_FirstNum := -1; + NNF_CurrentNum := -1; + + for i := Length(name) downto 1 do + if (name[i] = '_') then // "_" - ñèìâîë íà÷àëà íîìåðíîãî ïîñòôèêñà + begin + if i = Length(name) then + begin // Íåò öèôð â êîíöå ñòðîêè + Exit; + end + else + begin + NNF_PureName := Copy(name, 1, i); + Delete(name, 1, i); + Break; + end; + end; + +// Íå ïåðåâåñòè â ÷èñëî: + if not TryStrToInt(name, NNF_FirstNum) then + Exit; + + NNF_CurrentNum := 0; + + Result := True; +end; + + +function g_Texture_NumNameFindNext(var newName: String): Byte; +begin + if (NNF_PureName = '') or (NNF_CurrentNum < 0) then + begin + newName := ''; + Result := NNF_NO_NAME; + Exit; + end; + + newName := NNF_PureName + IntToStr(NNF_CurrentNum); + if NNF_CurrentNum < NNF_FirstNum then + Result := NNF_NAME_BEFORE + else + if NNF_CurrentNum > NNF_FirstNum then + Result := NNF_NAME_AFTER + else + Result := NNF_NAME_EQUALS; + + Inc(NNF_CurrentNum); +end; + + +// ////////////////////////////////////////////////////////////////////////// // function panelTypeToTag (panelType: Word): Integer; begin case panelType of - PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagWallDoor; // gWalls + PANEL_WALL: result := GridTagWall; // gWalls + PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := GridTagDoor; // gWalls PANEL_BACK: result := GridTagBack; // gRenderBackgrounds PANEL_FORE: result := GridTagFore; // gRenderForegrounds PANEL_WATER: result := GridTagWater; // gWater @@ -176,19 +490,148 @@ begin end; -type - TPanelID = record - PWhere: ^TPanelArray; - PArrID: Integer; - end; +function dplLess (a, b: TObject): Boolean; +var + pa, pb: TPanel; +begin + pa := TPanel(a); + pb := TPanel(b); + if (pa.tag < pb.tag) then begin result := true; exit; end; + if (pa.tag > pb.tag) then begin result := false; exit; end; + result := (pa.arrIdx < pb.arrIdx); +end; + +procedure dplClear (); +begin + if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); +end; + 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; - gMapGrid: TBodyGrid = nil; + + +procedure g_Map_ProfilersBegin (); +begin + if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size); + profMapCollision.mainBegin(g_profile_collision); + // create sections + if g_profile_collision then + begin + profMapCollision.sectionBegin('*solids'); + profMapCollision.sectionEnd(); + profMapCollision.sectionBegin('liquids'); + profMapCollision.sectionEnd(); + end; +end; + +procedure g_Map_ProfilersEnd (); +begin + if (profMapCollision <> nil) then profMapCollision.mainEnd(); +end; + + +// wall index in `gWalls` or -1 +function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel; +var + ex, ey: Integer; +begin + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor)); + if (result <> nil) then + begin + if (hitx <> nil) then hitx^ := ex; + if (hity <> nil) then hity^ := ey; + end + else + begin + if (hitx <> nil) then hitx^ := x1; + if (hity <> nil) then hity^ := y1; + end; +end; + +// returns panel or nil +function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInteger=nil; hity: PInteger=nil): TPanel; +var + ex, ey: Integer; +begin + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag); + if (result <> nil) then + begin + if (hitx <> nil) then hitx^ := ex; + if (hity <> nil) then hity^ := ey; + end + else + begin + if (hitx <> nil) then hitx^ := x1; + if (hity <> nil) then hity^ := y1; + end; +end; + + +function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; + + function checker (pan: TPanel; tag: Integer): Boolean; + begin + { + if ((tag and (GridTagWall or GridTagDoor)) <> 0) then + begin + result := pan.Enabled; // stop if wall is enabled + exit; + end; + } + + if ((tag and GridTagLift) <> 0) then + begin + // stop if the lift of the right type + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))); + exit; + end; + + result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels + end; + +var + tagmask: Integer = 0; +begin + result := false; + + if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor); + if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater; + if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1; + if WordBool(PanelType and PANEL_ACID2) then tagmask := tagmask or GridTagAcid2; + if WordBool(PanelType and PANEL_STEP) then tagmask := tagmask or GridTagStep; + if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift; + if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; + + if (tagmask = 0) then exit;// just in case + if ((tagmask and GridTagLift) <> 0) then + begin + // slow + result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil); + end + else + begin + // fast + result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil); + end; +end; + + +function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; +begin + result := nil; + if (tagmask = 0) then exit; + result := mapGrid.forEachAtPoint(x, y, nil, tagmask); +end; function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -364,55 +807,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; - 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 := hashNewStrInt(); + if TextNameHash.get(RecName, result) then exit; // i found her! + SetLength(Textures, Length(Textures)+1); result := High(Textures); @@ -422,28 +865,49 @@ 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 CreateTexture(RecName: AnsiString; Map: string; log: Boolean): Integer; var WAD: TWADFile; TextureData: Pointer; - WADName, txname: String; + WADName: String; a, ResLength: Integer; begin + RecName := toLowerCase1251(RecName); + if (TextNameHash = nil) then TextNameHash := hashNewStrInt(); + if TextNameHash.get(RecName, result) then + begin + // i found her! + //e_LogWritefln('texture ''%s'' already loaded', [RecName]); + exit; + end; + Result := -1; + if (BadTextNameHash <> nil) and BadTextNameHash.has(RecName) then exit; // don't do it again and again + + { if Textures <> nil then + begin for a := 0 to High(Textures) do - if Textures[a].TextureName = RecName then + begin + if (Textures[a].TextureName = RecName) then begin // Òåêñòóðà ñ òàêèì èìåíåì óæå åñòü + e_LogWritefln('texture ''%s'' already loaded', [RecName]); Result := a; Exit; end; + end; + end; + } -// Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà): + // Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà): if (RecName = TEXTURE_NAME_WATER) or (RecName = TEXTURE_NAME_ACID1) or (RecName = TEXTURE_NAME_ACID2) then @@ -453,36 +917,28 @@ 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'à: + // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à: WADName := g_ExtractWadName(RecName); WAD := TWADFile.Create(); - if WADName <> '' then - WADName := GameDir+'/wads/'+WADName - else - WADName := Map; + if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map; WAD.ReadFile(WADName); - txname := RecName; + //txname := RecName; { if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then begin @@ -491,33 +947,38 @@ begin end; } - if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then + if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength, log) then + begin + SetLength(Textures, Length(Textures)+1); + if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then begin - SetLength(Textures, Length(Textures)+1); - if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then - Exit; - e_GetTextureSize(Textures[High(Textures)].TextureID, - @Textures[High(Textures)].Width, - @Textures[High(Textures)].Height); - FreeMem(TextureData); - Textures[High(Textures)].TextureName := {RecName}txname; - Textures[High(Textures)].Anim := False; - - result := High(Textures); - end + SetLength(Textures, Length(Textures)-1); + Exit; + end; + e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height); + FreeMem(TextureData); + Textures[High(Textures)].TextureName := RecName; + Textures[High(Textures)].Anim := False; + + result := High(Textures); + TextNameHash.put(RecName, result); + end else // Íåò òàêîãî ðåóñðñà â WAD'å begin - //e_WriteLog(Format('SHIT! Error loading texture %s : %s : %s', [RecName, txname, g_ExtractFilePathName(RecName)]), MSG_WARNING); - if log then - begin - e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING); - //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); - end; + //e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING); + if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if log and (not BadTextNameHash.get(RecName, a)) then + begin + e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING); + //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); + end; + BadTextNameHash.put(RecName, -1); end; WAD.Free(); end; + function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer; var WAD: TWADFile; @@ -534,29 +995,44 @@ var ia: TDynImageDataArray = nil; f, c, frdelay, frloop: Integer; begin + RecName := toLowerCase1251(RecName); + if (TextNameHash = nil) then TextNameHash := hashNewStrInt(); + if TextNameHash.get(RecName, result) then + begin + // i found her! + //e_LogWritefln('animated texture ''%s'' already loaded', [RecName]); + exit; + end; + result := -1; - //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY); + //e_LogWritefln('*** Loading animated texture "%s"', [RecName]); + + if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if BadTextNameHash.get(RecName, f) then + begin + //e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY); + exit; + end; // ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü: WADName := g_ExtractWadName(RecName); WAD := TWADFile.Create(); try - if WADName <> '' then - WADName := GameDir+'/wads/'+WADName - else - WADName := Map; + if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map; WAD.ReadFile(WADName); - if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then + if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength, log) then begin - if log then + if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if log and (not BadTextNameHash.get(RecName, f)) then begin e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; + BadTextNameHash.put(RecName, -1); exit; end; @@ -573,6 +1049,7 @@ begin if ResLength < 6 then begin e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; @@ -584,6 +1061,7 @@ begin if not WAD.ReadMemory(TextureWAD, ResLength) then begin e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; @@ -591,6 +1069,7 @@ begin if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then begin e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; @@ -600,6 +1079,7 @@ begin if TextureResource = '' then begin e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; @@ -616,6 +1096,7 @@ 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); + BadTextNameHash.put(RecName, -1); exit; end; @@ -635,10 +1116,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 := hashNewStrInt(); + if log and (not BadTextNameHash.get(RecName, f)) then + begin + e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + end; + BadTextNameHash.put(RecName, -1); end; end; end @@ -658,11 +1145,13 @@ begin if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then begin e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; if length(ia) = 0 then begin e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING); + BadTextNameHash.put(RecName, -1); exit; end; @@ -718,24 +1207,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 := hashNewStrInt(); + if log and (not BadTextNameHash.get(RecName, f)) then + begin + e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING); + end; + BadTextNameHash.put(RecName, -1); end; end; finally for f := 0 to High(ia) do FreeImage(ia[f]); WAD.Free(); cfg.Free(); - if TextureWAD <> nil then FreeMem(TextureWAD); - if TextData <> nil then FreeMem(TextData); - if TextureData <> nil then FreeMem(TextureData); + if (TextureWAD <> nil) then FreeMem(TextureWAD); + if (TextData <> nil) then FreeMem(TextData); + if (TextureData <> nil) then FreeMem(TextureData); end; end; -procedure CreateItem(Item: TItemRec_1); +procedure CreateItem(Item: TDynRecord); begin if g_Game_IsClient then Exit; @@ -747,10 +1242,10 @@ 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; + id: DWORD = 0; begin case Area.AreaType of AREA_DMPOINT, AREA_PLAYERPOINT1, AREA_PLAYERPOINT2, @@ -817,72 +1312,110 @@ begin end; end; -procedure CreateTrigger(Trigger: TTriggerRec_1; fTexturePanel1Type, fTexturePanel2Type: Word); +function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word): Integer; var _trigger: TTrigger; 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; + Enabled := Trigger.Enabled; + //TexturePanel := Trigger.TexturePanel; + TexturePanelGUID := atpanid; TexturePanelType := fTexturePanel1Type; ShotPanelType := fTexturePanel2Type; TriggerType := Trigger.TriggerType; ActivateType := Trigger.ActivateType; Keys := Trigger.Keys; - Data.Default := Trigger.DATA; + trigPanelGUID := atrigpanid; + //trigShotPanelId := ashotpanid; + //Data.Default := Trigger.DATA; + if (Trigger.trigRec = nil) then + begin + trigDataRec := nil; + //HACK! + if (TriggerType <> TRIGGER_SECRET) then + begin + e_LogWritefln('trigger of type %s has no triggerdata; wtf?!', [TriggerType], MSG_WARNING); + end; + end + else + begin + trigDataRec := Trigger.trigRec.clone(nil); + end; end; - g_Triggers_Create(_trigger); + result := Integer(g_Triggers_Create(_trigger)); end; -procedure CreateMonster(monster: TMonsterRec_1); +procedure CreateMonster(monster: TDynRecord); var - a, i: Integer; + a: Integer; + mon: TMonster; begin if g_Game_IsClient then Exit; if (gGameSettings.GameType = GT_SINGLE) or LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS) then begin - i := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y, - TDirection(monster.Direction)); + mon := g_Monsters_Create(monster.MonsterType, monster.X, monster.Y, TDirection(monster.Direction)); if gTriggers <> nil then + begin for a := 0 to High(gTriggers) do - if gTriggers[a].TriggerType in [TRIGGER_PRESS, - TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then - if (gTriggers[a].Data.MonsterID-1) = gMonsters[i].StartID then - gMonsters[i].AddTrigger(a); + begin + if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then + begin + //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a); + if (gTriggers[a].trigDataRec.trigMonsterId) = Integer(mon.StartID) then mon.AddTrigger(a); + end; + end; + end; - if monster.MonsterType <> MONSTER_BARREL then - Inc(gTotalMonsters); + if monster.MonsterType <> MONSTER_BARREL then Inc(gTotalMonsters); end; end; procedure g_Map_ReAdd_DieTriggers(); -var - i, a: Integer; -begin - if g_Game_IsClient then Exit; - for i := 0 to High(gMonsters) do - if gMonsters[i] <> nil then + function monsDieTrig (mon: TMonster): Boolean; + var + a: Integer; + //tw: TStrTextWriter; + begin + result := false; // don't stop + mon.ClearTriggers(); + for a := 0 to High(gTriggers) do + begin + if gTriggers[a].TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then begin - gMonsters[i].ClearTriggers(); - - for a := 0 to High(gTriggers) do - if gTriggers[a].TriggerType in [TRIGGER_PRESS, - TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then - if (gTriggers[a].Data.MonsterID-1) = gMonsters[i].StartID then - gMonsters[i].AddTrigger(a); + //if (gTriggers[a].Data.MonsterID-1) = Integer(mon.StartID) then mon.AddTrigger(a); + { + 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; + +begin + if g_Game_IsClient then Exit; + + g_Mons_ForEach(monsDieTrig); end; function extractWadName(resourceName: string): string; @@ -903,31 +1436,48 @@ begin gExternalResources.Add(res); end; -procedure generateExternalResourcesList(mapReader: TMapReader_1); -var - textures: TTexturesRec1Array; - mapHeader: TMapHeaderRec_1; - i: integer; - resFile: String = ''; +procedure generateExternalResourcesList({mapReader: TMapReader_1}map: TDynRecord); +//var + //textures: TTexturesRec1Array; + //textures: TDynField; + //trec: TDynRecord; + //mapHeader: TMapHeaderRec_1; + //i: integer; + //resFile: String = ''; begin if gExternalResources = nil then gExternalResources := TStringList.Create; gExternalResources.Clear; - textures := mapReader.GetTextures(); + + (* + { + textures := GetTextures(map); for i := 0 to High(textures) do begin addResToExternalResList(resFile); end; + } + + textures := map['texture']; + if (textures <> nil) then + begin + for trec in textures do + begin + addResToExternalResList(resFile); + end; + end; textures := nil; + *) - mapHeader := mapReader.GetMapHeader; + //mapHeader := GetMapHeader(map); - addResToExternalResList(mapHeader.MusicName); - addResToExternalResList(mapHeader.SkyName); + addResToExternalResList(map.MusicName); + addResToExternalResList(map.SkyName); end; + procedure mapCreateGrid (); var mapX0: Integer = $3fffffff; @@ -935,109 +1485,175 @@ var mapX1: Integer = -$3fffffff; mapY1: Integer = -$3fffffff; - procedure fixMinMax (var panels: TPanelArray); + procedure calcBoundingBox (constref panels: TPanelArray); var idx: Integer; + pan: TPanel; begin for idx := 0 to High(panels) do begin - if (panels[idx].Width < 1) or (panels[idx].Height < 1) then continue; - if mapX0 > panels[idx].X then mapX0 := panels[idx].X; - if mapY0 > panels[idx].Y then mapY0 := panels[idx].Y; - if mapX1 < panels[idx].X+panels[idx].Width-1 then mapX1 := panels[idx].X+panels[idx].Width-1; - if mapY1 < panels[idx].Y+panels[idx].Height-1 then mapY1 := panels[idx].Y+panels[idx].Height-1; + pan := panels[idx]; + if not pan.visvalid then continue; + if (pan.Width < 1) or (pan.Height < 1) then continue; + if (mapX0 > pan.x0) then mapX0 := pan.x0; + if (mapY0 > pan.y0) then mapY0 := pan.y0; + if (mapX1 < pan.x1) then mapX1 := pan.x1; + if (mapY1 < pan.y1) then mapY1 := pan.y1; end; end; - procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer); + procedure addPanelsToGrid (constref panels: TPanelArray); var idx: Integer; + pan: TPanel; + newtag: Integer; begin - tag := panelTypeToTag(tag); - for idx := High(panels) downto 0 do + //tag := panelTypeToTag(tag); + for idx := 0 to High(panels) do begin - gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag); + pan := panels[idx]; + if not pan.visvalid then continue; + if (pan.proxyId <> -1) then + begin + {$IF DEFINED(D2F_DEBUG)} + e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), MSG_NOTIFY); + {$ENDIF} + continue; + end; + case pan.PanelType of + PANEL_WALL: newtag := GridTagWall; + PANEL_OPENDOOR, PANEL_CLOSEDOOR: newtag := GridTagDoor; + PANEL_BACK: newtag := GridTagBack; + PANEL_FORE: newtag := GridTagFore; + PANEL_WATER: newtag := GridTagWater; + PANEL_ACID1: newtag := GridTagAcid1; + PANEL_ACID2: newtag := GridTagAcid2; + PANEL_STEP: newtag := GridTagStep; + PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: newtag := GridTagLift; + PANEL_BLOCKMON: newtag := GridTagBlockMon; + else continue; // oops + end; + pan.tag := newtag; + + pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, newtag); + // "enabled" flag has meaning only for doors and walls (engine assumes it); but meh... + mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; + {$IFDEF MAP_DEBUG_ENABLED_FLAG} + { + if ((tag and (GridTagWall or GridTagDoor)) <> 0) then + begin + e_WriteLog(Format('INSERTED wall #%d(%d) enabled (%d)', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId])]), MSG_NOTIFY); + end; + } + {$ENDIF} end; end; begin - gMapGrid.Free(); - gMapGrid := nil; - - fixMinMax(gWalls); - fixMinMax(gRenderBackgrounds); - fixMinMax(gRenderForegrounds); - fixMinMax(gWater); - fixMinMax(gAcid1); - fixMinMax(gAcid2); - fixMinMax(gSteps); - fixMinMax(gLifts); - fixMinMax(gBlockMon); - - if (mapX0 < 0) or (mapY0 < 0) then - begin - e_WriteLog(Format('funny map dimensions: (%d,%d)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1]), MSG_WARNING); - //raise Exception.Create('we are fucked'); - end; - - gMapGrid := TBodyGrid.Create(mapX0, mapY0, mapX1-mapX0+1, mapY1-mapY0+1); - - addPanelsToGrid(gWalls, PANEL_WALL); // and PANEL_CLOSEDOOR - addPanelsToGrid(gRenderBackgrounds, PANEL_BACK); - addPanelsToGrid(gRenderForegrounds, PANEL_FORE); - addPanelsToGrid(gWater, PANEL_WATER); - addPanelsToGrid(gAcid1, PANEL_ACID1); - addPanelsToGrid(gAcid2, PANEL_ACID2); - addPanelsToGrid(gSteps, PANEL_STEP); - addPanelsToGrid(gLifts, PANEL_LIFTUP); // it doesn't matter which LIFT type is used here - addPanelsToGrid(gBlockMon, PANEL_BLOCKMON); - - gMapGrid.dumpStats(); + mapGrid.Free(); + mapGrid := nil; + + calcBoundingBox(gWalls); + calcBoundingBox(gRenderBackgrounds); + calcBoundingBox(gRenderForegrounds); + calcBoundingBox(gWater); + calcBoundingBox(gAcid1); + calcBoundingBox(gAcid2); + calcBoundingBox(gSteps); + calcBoundingBox(gLifts); + calcBoundingBox(gBlockMon); + + e_LogWritefln('map dimensions: (%d,%d)-(%d,%d); editor size:(0,0)-(%d,%d)', [mapX0, mapY0, mapX1, mapY1, gMapInfo.Width, gMapInfo.Height]); + + if (mapX0 > 0) then mapX0 := 0; + if (mapY0 > 0) then mapY0 := 0; + + if (mapX1 < gMapInfo.Width-1) then mapX1 := gMapInfo.Width-1; + if (mapY1 < gMapInfo.Height-1) then mapY1 := gMapInfo.Height-1; + + mapGrid := TPanelGrid.Create(mapX0-128, mapY0-128, mapX1-mapX0+1+128*2, mapY1-mapY0+1+128*2); + //mapGrid := TPanelGrid.Create(0, 0, gMapInfo.Width, gMapInfo.Height); + + addPanelsToGrid(gWalls); + addPanelsToGrid(gRenderBackgrounds); + addPanelsToGrid(gRenderForegrounds); + addPanelsToGrid(gWater); + addPanelsToGrid(gAcid1); + addPanelsToGrid(gAcid2); + addPanelsToGrid(gSteps); + addPanelsToGrid(gLifts); // it doesn't matter which LIFT type is used here + addPanelsToGrid(gBlockMon); + + mapGrid.dumpStats(); + + g_Mons_InitTree(mapGrid.gridX0, mapGrid.gridY0, mapGrid.gridWidth, mapGrid.gridHeight); end; + function g_Map_Load(Res: String): Boolean; const DefaultMusRes = 'Standart.wad:STDMUS\MUS1'; DefaultSkyRes = 'Standart.wad:STDSKY\SKY0'; +type + PTRec = ^TTRec; + TTRec = record + //TexturePanel: Integer; + tnum: Integer; + id: Integer; + texPanIdx: Integer; + LiftPanelIdx: Integer; + DoorPanelIdx: Integer; + ShotPanelIdx: Integer; + MPlatPanelIdx: Integer; + trigrec: TDynRecord; + texPan: TDynRecord; + liftPan: TDynRecord; + doorPan: TDynRecord; + shotPan: TDynRecord; + mplatPan: TDynRecord; + end; var WAD: TWADFile; - MapReader: TMapReader_1; - Header: TMapHeaderRec_1; - _textures: TTexturesRec1Array; - _texnummap: array of Integer; // `_textures` -> `Textures` - panels: TPanelsRec1Array; - items: TItemsRec1Array; - monsters: TMonsterRec1Array; - areas: TAreasRec1Array; - triggers: TTriggersRec1Array; - a, b, c, k: Integer; + mapReader: TDynRecord = nil; + mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index + panels: TDynField = nil; //TPanelsRec1Array; + items: TDynField = nil; //TItemsRec1Array; + monsters: TDynField = nil; //TMonsterRec1Array; + areas: TDynField = nil; //TAreasRec1Array; + triggers: TDynField = nil; //TTriggersRec1Array; + b, c, k: Integer; PanelID: DWORD; AddTextures: TAddTextureArray; - texture: TTextureRec_1; - TriggersTable: Array of record - TexturePanel: Integer; - LiftPanel: Integer; - DoorPanel: Integer; - ShotPanel: Integer; - end; + TriggersTable: array of TTRec; FileName, mapResName, s, TexName: String; Data: Pointer; Len: Integer; - ok, isAnim, trigRef: Boolean; + 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; begin - gMapGrid.Free(); - gMapGrid := nil; + mapGrid.Free(); + mapGrid := nil; + + gCurrentMap.Free(); + gCurrentMap := nil; + + panByGUID := nil; Result := False; gMapInfo.Map := Res; TriggersTable := nil; - FillChar(texture, SizeOf(texture), 0); + mapReader := nil; sfsGCDisable(); // temporary disable removing of temporary volumes try - // Çàãðóçêà WAD: + // Çàãðóçêà WAD: FileName := g_ExtractWadName(Res); e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); @@ -1049,6 +1665,7 @@ begin WAD.Free(); Exit; end; + //k8: why loader ignores path here? mapResName := g_ExtractFileName(Res); if not WAD.GetMapResource(mapResName, Data, Len) then @@ -1060,365 +1677,458 @@ begin WAD.Free(); - // Çàãðóçêà êàðòû: - e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY); + if (Len < 4) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + FreeMem(Data); + exit; + end; + + // Çàãðóçêà êàðòû: + e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); - MapReader := TMapReader_1.Create(); - if not MapReader.LoadMap(Data) then - begin + stt := curTimeMicro(); + + try + mapReader := g_Map_ParseMap(Data, Len); + except + mapReader.Free(); g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res])); FreeMem(Data); - MapReader.Free(); Exit; end; FreeMem(Data); - generateExternalResourcesList(MapReader); - // Çàãðóçêà òåêñòóð: - g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False); - _textures := MapReader.GetTextures(); - _texnummap := nil; - // Äîáàâëåíèå òåêñòóð â Textures[]: - if _textures <> nil then + if (mapReader = nil) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + exit; + end; + + generateExternalResourcesList(mapReader); + mapTextureList := mapReader['texture']; + // get all other lists here too + panels := mapReader['panel']; + triggers := mapReader['trigger']; + items := mapReader['item']; + areas := mapReader['area']; + monsters := mapReader['monster']; + + // Çàãðóçêà îïèñàíèÿ êàðòû: + e_WriteLog(' Reading map info...', MSG_NOTIFY); + g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False); + + with gMapInfo do + begin + Name := mapReader.MapName; + Description := mapReader.MapDesc; + Author := mapReader.MapAuthor; + MusicName := mapReader.MusicName; + SkyName := mapReader.SkyName; + Height := mapReader.Height; + Width := mapReader.Width; + end; + + // Çàãðóçêà òåêñòóð: + g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False); + // Äîáàâëåíèå òåêñòóð â Textures[]: + if (mapTextureList <> nil) and (mapTextureList.count > 0) then begin e_WriteLog(' Loading textures:', MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], High(_textures), False); - SetLength(_texnummap, length(_textures)); + g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], mapTextureList.count-1, False); - for a := 0 to High(_textures) do + cnt := -1; + for rec in mapTextureList do begin - SetLength(s, 64); - CopyMemory(@s[1], @_textures[a].Resource[0], 64); - for b := 1 to Length(s) do - if s[b] = #0 then - begin - SetLength(s, b-1); - Break; - end; - e_WriteLog(Format(' Loading texture #%d: %s', [a, s]), MSG_NOTIFY); + Inc(cnt); + s := rec.Resource; + {$IF DEFINED(D2F_DEBUG_TXLOAD)} + e_WriteLog(Format(' Loading texture #%d: %s', [cnt, s]), MSG_NOTIFY); + {$ENDIF} //if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY); - // Àíèìèðîâàííàÿ òåêñòóðà: - if ByteBool(_textures[a].Anim) then - begin - ntn := CreateAnimTexture(_textures[a].Resource, FileName, True); - if ntn < 0 then - begin - g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s])); - ntn := CreateNullTexture(_textures[a].Resource); - end; - end - else // Îáû÷íàÿ òåêñòóðà: - ntn := CreateTexture(_textures[a].Resource, FileName, True); - if ntn < 0 then - begin - g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s])); - ntn := CreateNullTexture(_textures[a].Resource); - end; + if rec.Anim then + begin + // Àíèìèðîâàííàÿ òåêñòóðà + ntn := CreateAnimTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s])); + end + else + begin + // Îáû÷íàÿ òåêñòóðà + ntn := CreateTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s])); + end; + if (ntn < 0) then ntn := CreateNullTexture(rec.Resource); - _texnummap[a] := ntn; // fix texture number + rec.tagInt := ntn; // remember texture number g_Game_StepLoading(); end; + + // set panel tagInt to texture index + if (panels <> nil) then + begin + for rec in panels do + begin + texrec := rec.TextureRec; + if (texrec = nil) then rec.tagInt := -1 else rec.tagInt := texrec.tagInt; + end; + end; end; - // Çàãðóçêà òðèããåðîâ: + // Çàãðóçêà òðèããåðîâ gTriggerClientID := 0; e_WriteLog(' Loading triggers...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False); - triggers := MapReader.GetTriggers(); - // Çàãðóçêà ïàíåëåé: + // Çàãðóçêà ïàíåëåé e_WriteLog(' Loading panels...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False); - panels := MapReader.GetPanels(); // check texture numbers for panels - for a := 0 to High(panels) do + if (panels <> nil) and (panels.count > 0) then begin - if panels[a].TextureNum > High(_textures) then + for rec in panels do begin - e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR); - result := false; - exit; + if (rec.tagInt < 0) then + begin + e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR); + result := false; + exit; + end; end; - panels[a].TextureNum := _texnummap[panels[a].TextureNum]; end; - // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì): - if triggers <> nil then + // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì) + if (triggers <> nil) and (triggers.count > 0) then begin e_WriteLog(' Setting up trigger table...', MSG_NOTIFY); - SetLength(TriggersTable, Length(triggers)); - g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], High(TriggersTable), False); + //SetLength(TriggersTable, triggers.count); + g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False); - for a := 0 to High(TriggersTable) do + for rec in triggers do begin - // Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè): - TriggersTable[a].TexturePanel := triggers[a].TexturePanel; - // Ëèôòû: - if triggers[a].TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then - TriggersTable[a].LiftPanel := TTriggerData(triggers[a].DATA).PanelID - else - TriggersTable[a].LiftPanel := -1; - // Äâåðè: - if triggers[a].TriggerType in [TRIGGER_OPENDOOR, - TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, - TRIGGER_CLOSETRAP, TRIGGER_TRAP] then - TriggersTable[a].DoorPanel := TTriggerData(triggers[a].DATA).PanelID - else - TriggersTable[a].DoorPanel := -1; - // Òóðåëü: - if triggers[a].TriggerType = TRIGGER_SHOT then - TriggersTable[a].ShotPanel := TTriggerData(triggers[a].DATA).ShotPanelID - else - TriggersTable[a].ShotPanel := -1; + SetLength(TriggersTable, Length(TriggersTable)+1); + pttit := @TriggersTable[High(TriggersTable)]; + pttit.trigrec := rec; + // Ñìåíà òåêñòóðû (âîçìîæíî, êíîïêè) + pttit.texPan := mapReader.panel[rec.TexturePanel]; + pttit.liftPan := nil; + pttit.doorPan := nil; + pttit.shotPan := nil; + pttit.mplatPan := nil; + pttit.texPanIdx := -1; + pttit.LiftPanelIdx := -1; + pttit.DoorPanelIdx := -1; + pttit.ShotPanelIdx := -1; + pttit.MPlatPanelIdx := -1; + // Ëèôòû + if rec.TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then + begin + pttit.liftPan := mapReader.panel[rec.trigRec.tgPanelID]; + end; + // Äâåðè + if rec.TriggerType in [TRIGGER_OPENDOOR, TRIGGER_CLOSEDOOR, TRIGGER_DOOR, TRIGGER_DOOR5, TRIGGER_CLOSETRAP, TRIGGER_TRAP] then + begin + pttit.doorPan := mapReader.panel[rec.trigRec.tgPanelID]; + end; + // Òóðåëü + if (rec.TriggerType = TRIGGER_SHOT) then + begin + pttit.shotPan := mapReader.panel[rec.trigRec.tgShotPanelID]; + end; + // + if rec.TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then + begin + pttit.mplatPan := mapReader.panel[rec.trigRec.tgPanelID]; + end; + + if (pttit.texPan <> nil) then pttit.texPan.userPanelTrigRef := true; + if (pttit.liftPan <> nil) then pttit.liftPan.userPanelTrigRef := true; + if (pttit.doorPan <> nil) then pttit.doorPan.userPanelTrigRef := true; + if (pttit.shotPan <> nil) then pttit.shotPan.userPanelTrigRef := true; + if (pttit.mplatPan <> nil) then pttit.mplatPan.userPanelTrigRef := true; g_Game_StepLoading(); end; end; - // Ñîçäàåì ïàíåëè: - if panels <> nil then + // Ñîçäàåì ïàíåëè + if (panels <> nil) and (panels.count > 0) then begin e_WriteLog(' Setting up trigger links...', MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], High(panels), False); + g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], panels.count-1, False); - for a := 0 to High(panels) do + pannum := -1; + for rec in panels do begin + Inc(pannum); + //e_LogWritefln('PANSTART: pannum=%s', [pannum]); + texrec := nil; SetLength(AddTextures, 0); - trigRef := False; CurTex := -1; - if _textures <> nil then - begin - texture := _textures[panels[a].TextureNum]; - ok := True; - end - else - ok := False; + ok := false; - if 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 + 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; - // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû: - if (triggers <> nil) and not gLoadGameMode then + // ×èíèì ID'û ïàíåëåé, êîòîðûå èñïîëüçóþòñÿ â òðèããåðàõ + for b := 0 to High(TriggersTable) do + begin + if (TriggersTable[b].texPan <> nil) then TriggersTable[b].texPanIdx := TriggersTable[b].texPan.userPanelId; + if (TriggersTable[b].liftPan <> nil) then TriggersTable[b].LiftPanelIdx := TriggersTable[b].liftPan.userPanelId; + if (TriggersTable[b].doorPan <> nil) then TriggersTable[b].DoorPanelIdx := TriggersTable[b].doorPan.userPanelId; + if (TriggersTable[b].shotPan <> nil) then TriggersTable[b].ShotPanelIdx := TriggersTable[b].shotPan.userPanelId; + if (TriggersTable[b].mplatPan <> nil) then TriggersTable[b].MPlatPanelIdx := TriggersTable[b].mplatPan.userPanelId; + end; + + // create map grid, init other grids (for monsters, for example) + e_WriteLog('Creating map grid', MSG_NOTIFY); + mapCreateGrid(); + + // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû + if (triggers <> nil) and (panels <> nil) and (not gLoadGameMode) then begin - e_WriteLog(' Creating triggers...', MSG_NOTIFY); + e_LogWritefln(' Creating triggers (%d)...', [triggers.count]); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_TRIGGERS], 0, False); - // Óêàçûâàåì òèï ïàíåëè, åñëè åñòü: - for a := 0 to High(triggers) do + // Óêàçûâàåì òèï ïàíåëè, åñëè åñòü + trignum := -1; + for rec in triggers do begin - if triggers[a].TexturePanel <> -1 then - b := panels[TriggersTable[a].TexturePanel].PanelType - else - b := 0; - if (triggers[a].TriggerType = TRIGGER_SHOT) and - (TTriggerData(triggers[a].DATA).ShotPanelID <> -1) then - c := panels[TriggersTable[a].ShotPanel].PanelType - else - c := 0; - CreateTrigger(triggers[a], b, c); + Inc(trignum); + if (TriggersTable[trignum].texPan <> nil) then b := TriggersTable[trignum].texPan.PanelType else b := 0; + if (TriggersTable[trignum].shotPan <> nil) then c := TriggersTable[trignum].shotPan.PanelType else c := 0; + // we can have only one of those + if (TriggersTable[trignum].LiftPanelIdx <> -1) then tgpid := TriggersTable[trignum].LiftPanelIdx + else if (TriggersTable[trignum].DoorPanelIdx <> -1) then tgpid := TriggersTable[trignum].DoorPanelIdx + else if (TriggersTable[trignum].ShotPanelIdx <> -1) then tgpid := TriggersTable[trignum].ShotPanelIdx + else if (TriggersTable[trignum].MPlatPanelIdx <> -1) then tgpid := TriggersTable[trignum].MPlatPanelIdx + else tgpid := -1; + //e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]); + TriggersTable[trignum].tnum := trignum; + TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanIdx, tgpid, Word(b), Word(c)); end; end; - // Çàãðóçêà ïðåäìåòîâ: - e_WriteLog(' Loading triggers...', MSG_NOTIFY); + //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 items...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_ITEMS], 0, False); - items := MapReader.GetItems(); - // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû: + // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû if (items <> nil) and not gLoadGameMode then begin e_WriteLog(' Spawning items...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_ITEMS], 0, False); - for a := 0 to High(items) do - CreateItem(Items[a]); + for rec in items do CreateItem(rec); end; - // Çàãðóçêà îáëàñòåé: + // Çàãðóçêà îáëàñòåé e_WriteLog(' Loading areas...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_AREAS], 0, False); - areas := MapReader.GetAreas(); - // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè: + // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè if areas <> nil then begin e_WriteLog(' Creating areas...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_AREAS], 0, False); - for a := 0 to High(areas) do - CreateArea(areas[a]); + for rec in areas do CreateArea(rec); end; - // Çàãðóçêà ìîíñòðîâ: + // Çàãðóçêà ìîíñòðîâ e_WriteLog(' Loading monsters...', MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_MONSTERS], 0, False); - monsters := MapReader.GetMonsters(); gTotalMonsters := 0; - // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ: - if (monsters <> nil) and not gLoadGameMode then - begin - e_WriteLog(' Spawning monsters...', MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_CREATE_MONSTERS], 0, False); - for a := 0 to High(monsters) do - CreateMonster(monsters[a]); - end; - - // Çàãðóçêà îïèñàíèÿ êàðòû: - e_WriteLog(' Reading map info...', MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_MAP_HEADER], 0, False); - Header := MapReader.GetMapHeader(); - - MapReader.Free(); - - with gMapInfo do + // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ + if (monsters <> nil) and not gLoadGameMode then begin - Name := Header.MapName; - Description := Header.MapDescription; - Author := Header.MapAuthor; - MusicName := Header.MusicName; - SkyName := Header.SkyName; - Height := Header.Height; - Width := Header.Width; + e_WriteLog(' Spawning monsters...', MSG_NOTIFY); + g_Game_SetLoadingText(_lc[I_LOAD_CREATE_MONSTERS], 0, False); + for rec in monsters do CreateMonster(rec); end; - // Çàãðóçêà íåáà: + gCurrentMap := mapReader; // this will be our current map now + gCurrentMapFileName := Res; + mapReader := nil; + + // Çàãðóçêà íåáà if gMapInfo.SkyName <> '' then begin e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY); @@ -1441,7 +2151,7 @@ begin g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s])); end; - // Çàãðóçêà ìóçûêè: + // Çàãðóçêà ìóçûêè ok := False; if gMapInfo.MusicName <> '' then begin @@ -1463,7 +2173,7 @@ begin g_FatalError(Format(_lc[I_GAME_ERROR_MUSIC], [s])); end; - // Îñòàëüíûå óñòàíâêè: + // Îñòàëüíûå óñòàíâêè CreateDoorMap(); CreateLiftMap(); @@ -1471,12 +2181,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; @@ -1484,30 +2193,35 @@ 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 := curTimeMicro()-stt; + e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]); finally sfsGCEnable(); // enable releasing unused volumes + mapReader.Free(); + e_ClearInputBuffer(); // why not? end; - e_WriteLog('Creating map grid', MSG_NOTIFY); - mapCreateGrid(); - e_WriteLog('Done loading map.', MSG_NOTIFY); Result := True; end; + function g_Map_GetMapInfo(Res: String): TMapInfo; var WAD: TWADFile; - MapReader: TMapReader_1; - Header: TMapHeaderRec_1; + mapReader: TDynRecord; + //Header: TMapHeaderRec_1; FileName: String; Data: Pointer; Len: Integer; @@ -1531,29 +2245,40 @@ 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; @@ -1611,7 +2336,7 @@ begin end; end; -procedure g_Map_Free(); +procedure g_Map_Free(freeTextures: Boolean=true); var a: Integer; @@ -1650,19 +2375,46 @@ 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); - - Textures := nil; + e_LogWritefln('g_Map_Free: previous map was ''%s''...', [gCurrentMapFileName]); + end + else + begin + e_LogWritefln('g_Map_Free: no previous map.', []); + end; + if freeTextures then + begin + e_LogWritefln('g_Map_Free: clearing textures...', []); + if (Textures <> nil) then + begin + for a := 0 to High(Textures) do + begin + if not g_Map_IsSpecialTexture(Textures[a].TextureName) then + begin + if Textures[a].Anim then + begin + g_Frames_DeleteByID(Textures[a].FramesID) + end + else + begin + if (Textures[a].TextureID <> LongWord(TEXTURE_NONE)) then + begin + e_DeleteTexture(Textures[a].TextureID); + end; + end; + end; + end; + Textures := nil; + end; + TextNameHash.Free(); + TextNameHash := nil; + BadTextNameHash.Free(); + BadTextNameHash := nil; end; + panByGUID := nil; + FreePanelArray(gWalls); FreePanelArray(gRenderBackgrounds); FreePanelArray(gRenderForegrounds); @@ -1672,6 +2424,7 @@ begin FreePanelArray(gSteps); FreePanelArray(gLifts); FreePanelArray(gBlockMon); + gMovingWallIds := nil; if BackID <> DWORD(-1) then begin @@ -1693,8 +2446,6 @@ begin gDoorMap := nil; gLiftMap := nil; - - PanelByID := nil; end; procedure g_Map_Update(); @@ -1708,12 +2459,12 @@ 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); @@ -1722,24 +2473,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); @@ -1755,41 +2508,40 @@ begin 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; -procedure g_Map_DrawPanelsOld(PanelType: Word); +// old algo +procedure g_Map_DrawPanels (PanelType: Word); - procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False); + procedure DrawPanels (constref panels: TPanelArray; drawDoors: Boolean=False); var idx: Integer; begin - if (panels <> nil) and (stp >= 0) and (stp <= 6) then + if (panels <> nil) then begin // alas, no visible set for idx := 0 to High(panels) do @@ -1801,129 +2553,46 @@ procedure g_Map_DrawPanelsOld(PanelType: Word); begin case PanelType of - PANEL_WALL: DrawPanels(0, gWalls); - PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True); - PANEL_BACK: DrawPanels(1, gRenderBackgrounds); - PANEL_FORE: DrawPanels(2, gRenderForegrounds); - PANEL_WATER: DrawPanels(3, gWater); - PANEL_ACID1: DrawPanels(4, gAcid1); - PANEL_ACID2: DrawPanels(5, gAcid2); - PANEL_STEP: DrawPanels(6, gSteps); + PANEL_WALL: DrawPanels(gWalls); + PANEL_CLOSEDOOR: DrawPanels(gWalls, True); + PANEL_BACK: DrawPanels(gRenderBackgrounds); + PANEL_FORE: DrawPanels(gRenderForegrounds); + PANEL_WATER: DrawPanels(gWater); + PANEL_ACID1: DrawPanels(gAcid1); + PANEL_ACID2: DrawPanels(gAcid2); + PANEL_STEP: DrawPanels(gSteps); end; end; -var - gDrawPanelList: TBinaryHeapObj = nil; - -function dplLess (a, b: TObject): Boolean; -begin - result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx); -end; - -procedure dplClear (); -begin - if gDrawPanelList = nil then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); -end; - -procedure dplAddPanel (pan: TPanel); -begin - if pan = nil then exit; - gDrawPanelList.insert(pan); -end; +// new algo +procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); - -procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word); -var - ptag: Integer; - - function checker (obj: TObject; tag: Integer): Boolean; - var - pan: TPanel; + function checker (pan: TPanel; tag: Integer): Boolean; begin result := false; // don't stop, ever - if (tag <> ptag) then exit; - //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); - - if obj = nil then begin e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end; - if not (obj is TPanel) then begin e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); exit; end; - //pan := (obj as TPanel); - //e_WriteLog(Format(' !body: (%d,%d)-(%dx%d) tag:%d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY); - - pan := (obj as TPanel); - if (PanelType = PANEL_CLOSEDOOR) then begin if not pan.Door then exit; end else begin if pan.Door then exit; end; - //e_WriteLog(Format(' body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, tag, PanelType]), MSG_NOTIFY); - dplAddPanel(pan); - end; - - procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False); - var - idx: Integer; - pan: TPanel; - begin - if (panels <> nil) and (stp >= 0) and (stp <= 6) then - begin - // alas, no visible set - for idx := 0 to High(panels) do - begin - if not (drawDoors xor panels[idx].Door) then - begin - pan := panels[idx]; - if (pan.Width < 1) or (pan.Height < 1) then continue; - if (pan.X+pan.Width <= x0) or (pan.Y+pan.Height <= y0) then continue; - if (pan.X >= x0+wdt) or (pan.Y >= y0+hgt) then continue; - e_WriteLog(Format(' *body hit: (%d,%d)-(%dx%d) tag: %d; qtag:%d', [pan.X, pan.Y, pan.Width, pan.Height, PanelType, PanelType]), MSG_NOTIFY); - end; - end; - end; + if ((tag and GridTagDoor) <> 0) <> pan.Door then exit; + gDrawPanelList.insert(pan); end; begin - //g_Map_DrawPanelsOld(PanelType); exit; - //e_WriteLog('==================', MSG_NOTIFY); - //e_WriteLog(Format('***QQQ: qtag:%d', [PanelType]), MSG_NOTIFY); dplClear(); - ptag := panelTypeToTag(PanelType); - gMapGrid.forEachInAABB(x0, y0, wdt, hgt, checker); - - // debug - { - e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY); - case PanelType of - PANEL_WALL: DrawPanels(0, gWalls); - PANEL_CLOSEDOOR: DrawPanels(0, gWalls, True); - PANEL_BACK: DrawPanels(1, gRenderBackgrounds); - PANEL_FORE: DrawPanels(2, gRenderForegrounds); - PANEL_WATER: DrawPanels(3, gWater); - PANEL_ACID1: DrawPanels(4, gAcid1); - PANEL_ACID2: DrawPanels(5, gAcid2); - PANEL_STEP: DrawPanels(6, gSteps); - end; - e_WriteLog('==================', MSG_NOTIFY); - } - - // sort and draw the list (we need to sort it, or rendering is fucked) - while gDrawPanelList.count > 0 do - begin - (gDrawPanelList.front() as TPanel).Draw(); - gDrawPanelList.popFront(); - end; + //tagmask := panelTypeToTag(PanelType); + mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask); + // list will be rendered in `g_game.DrawPlayer()` end; procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); - function checker (obj: TObject; tag: Integer): Boolean; - var - pan: TPanel; + + function checker (pan: TPanel; tag: Integer): Boolean; begin result := false; // don't stop, ever - if (tag <> GridTagWallDoor) then exit; // only walls - pan := (obj as TPanel); pan.DrawShadowVolume(lightX, lightY, radius); end; begin - gMapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker); + mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor)); end; @@ -1935,9 +2604,8 @@ begin e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); end; -(* function g_Map_CollidePanelOld(X, Y: Integer; Width, Height: Word; - PanelType: Word; b1x3: Boolean): Boolean; + PanelType: Word; b1x3: Boolean=false): Boolean; var a, h: Integer; begin @@ -2055,233 +2723,288 @@ begin end; end; end; -*) -function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; +function g_Map_CollideLiquid_TextureOld(X, Y: Integer; Width, Height: Word): DWORD; +var + texid: DWORD; - function checker (obj: TObject; tag: Integer): Boolean; + function checkPanels (constref panels: TPanelArray): Boolean; var - pan: TPanel; a: Integer; begin - result := false; // don't stop, ever - - //e_WriteLog(Format(' *body: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); - - if obj = nil then - begin - e_WriteLog(Format(' !bodyFUUUUU0: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); - end; - if not (obj is TPanel) then - begin - e_WriteLog(Format(' !bodyFUUUUU1: tag:%d; qtag:%d', [tag, PanelType]), MSG_NOTIFY); - exit; - end; - - pan := (obj as TPanel); - a := pan.ArrIdx; - - if WordBool(PanelType and PANEL_WALL) and (tag = GridTagWallDoor) then + result := false; + if panels = nil then exit; + for a := 0 to High(panels) do begin - if gWalls[a].Enabled and g_Collide(X, Y, Width, Height, gWalls[a].X, gWalls[a].Y, gWalls[a].Width, gWalls[a].Height) then + if g_Collide(X, Y, Width, Height, panels[a].X, panels[a].Y, panels[a].Width, panels[a].Height) then begin result := true; + texid := panels[a].GetTextureID(); exit; end; end; + end; - if WordBool(PanelType and PANEL_WATER) and (tag = GridTagWater) then - begin - if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then - begin - result := True; - exit; - end; - end; +begin + texid := LongWord(TEXTURE_NONE); + result := texid; + if not checkPanels(gWater) then + if not checkPanels(gAcid1) then + if not checkPanels(gAcid2) then exit; + result := texid; +end; - if WordBool(PanelType and PANEL_ACID1) and (tag = GridTagAcid1) then + +function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; +const + SlowMask = GridTagLift or GridTagBlockMon; + function checker (pan: TPanel; tag: Integer): Boolean; + begin + { + if ((tag and (GridTagWall or GridTagDoor)) <> 0) then begin - if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then - begin - result := True; - exit; - end; + result := pan.Enabled; + exit; end; + } - if WordBool(PanelType and PANEL_ACID2) and (tag = GridTagAcid2) then + if ((tag and GridTagLift) <> 0) then begin - if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then - begin - result := True; - exit; - end; + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))) {and + g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; + exit; end; - if WordBool(PanelType and PANEL_STEP) and (tag = GridTagStep) then + if ((tag and GridTagBlockMon) <> 0) then begin - if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then - begin - result := True; - exit; - end; + result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height); + exit; end; - if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = GridTagLift) then + // other shit + //result := g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height); + result := true; // i found her! + end; + +var + tagmask: Integer = 0; +begin + if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor); + if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater; + if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1; + if WordBool(PanelType and PANEL_ACID2) then tagmask := tagmask or GridTagAcid2; + if WordBool(PanelType and PANEL_STEP) then tagmask := tagmask or GridTagStep; + if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift; + if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; + + if (tagmask = 0) then begin result := false; exit; end; // just in case + + if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids'); + if gdbg_map_use_accel_coldet then + begin + if (Width = 1) and (Height = 1) then begin - if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or - (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or - (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or - (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and - g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then + if ((tagmask and SlowMask) <> 0) then begin - result := true; - exit; + // slow + result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil); + end + else + begin + // fast + result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil); end; - end; - - if WordBool(PanelType and PANEL_BLOCKMON)and (tag = GridTagBlockMon) then + end + else begin - if ((not b1x3) or ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64)) and - g_Collide(X, Y, Width, Height, gBlockMon[a].X, gBlockMon[a].Y, gBlockMon[a].Width, gBlockMon[a].Height) then + if ((tagmask and SlowMask) <> 0) then begin - result := True; - exit; + // slow + result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil); + end + else + begin + // fast + result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil); end; end; + end + else + begin + result := g_Map_CollidePanelOld(X, Y, Width, Height, PanelType, b1x3); end; - -begin - result := gMapGrid.forEachInAABB(X, Y, Width, Height, checker); + if (profMapCollision <> nil) then profMapCollision.sectionEnd(); end; function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; var - cctype: Integer = 3; // priority: 0: water, 1: acid1, 2: acid2; 3: others (nothing) + cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit texid: DWORD; // slightly different from the old code, but meh... - function checker (obj: TObject; tag: Integer): Boolean; - var - pan: TPanel; - a: Integer; + function checker (pan: TPanel; tag: Integer): Boolean; begin result := false; // don't stop, ever - pan := (obj as TPanel); - a := pan.ArrIdx; - // water - if (tag = GridTagWater) then - begin - if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then - begin - result := true; // water has highest priority, so stop right here - texid := gWater[a].GetTextureID(); - exit; - end; + //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; - // acid1 - if (cctype > 1) and (tag = GridTagAcid1) then + // collision? + //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; + // yeah + texid := pan.GetTextureID(); + // water? water has the highest priority, so stop right here + if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; + // acid2? + if ((tag and GridTagAcid2) <> 0) then cctype := 2; + // acid1? + if ((tag and GridTagAcid1) <> 0) then cctype := 1; + end; + +begin + if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids'); + if gdbg_map_use_accel_coldet then + begin + texid := LongWord(TEXTURE_NONE); + if (Width = 1) and (Height = 1) then begin - if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then - begin - cctype := 1; - texid := gAcid1[a].GetTextureID(); - exit; - end; - end; - // acid2 - if (cctype > 2) and (tag = GridTagAcid2) then + mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); + end + else begin - if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then - begin - cctype := 2; - texid := gAcid2[a].GetTextureID(); - exit; - end; + mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); end; + result := texid; + end + else + begin + result := g_Map_CollideLiquid_TextureOld(X, Y, Width, Height); end; - -begin - texid := TEXTURE_NONE; - gMapGrid.forEachInAABB(X, Y, Width, Height, checker); - result := texid; + if (profMapCollision <> nil) then profMapCollision.sectionEnd(); 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 - with gWalls[ID] do - begin - Enabled := True; - g_Mark(X, Y, Width, Height, MARK_DOOR, True); + //pan := gWalls[ID]; + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; + if pan.Enabled and mapGrid.proxyEnabled[pan.proxyId] then exit; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID); - end; + pan.Enabled := 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(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 - with gWalls[ID] do - begin - Enabled := False; - g_Mark(X, Y, Width, Height, MARK_DOOR, False); + //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; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID); - end; + pan.Enabled := 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(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 (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0); var tp: TPanel; begin + tp := g_Map_PanelByGUID(pguid); + if (tp = nil) then exit; + { case PanelType of - PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: - tp := gWalls[ID]; - PANEL_FORE: - tp := gRenderForegrounds[ID]; - PANEL_BACK: - tp := gRenderBackgrounds[ID]; - PANEL_WATER: - tp := gWater[ID]; - PANEL_ACID1: - tp := gAcid1[ID]; - PANEL_ACID2: - tp := gAcid2[ID]; - PANEL_STEP: - tp := gSteps[ID]; - else - Exit; + PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: tp := gWalls[ID]; + PANEL_FORE: tp := gRenderForegrounds[ID]; + PANEL_BACK: tp := gRenderBackgrounds[ID]; + PANEL_WATER: tp := gWater[ID]; + PANEL_ACID1: tp := gAcid1[ID]; + PANEL_ACID2: tp := gAcid2[ID]; + PANEL_STEP: tp := gSteps[ID]; + else exit; end; + } tp.NextTexture(AnimLoop); - if g_Game_IsServer and g_Game_IsNet then - MH_SEND_PanelTexture(PanelType, ID, AnimLoop); + if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop); end; -procedure g_Map_SetLift(ID: DWORD; t: Integer); + +procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer); +var + pan: TPanel; begin - if gLifts[ID].LiftType = t then - Exit; + //pan := gLifts[ID]; + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; + if not pan.isGLift then exit; + + if ({gLifts[ID]}pan.LiftType = t) then exit; //!FIXME!TRIGANY! - with gLifts[ID] do + with {gLifts[ID]} pan do begin LiftType := t; - g_Mark(X, Y, Width, Height, MARK_LIFT, False); + g_Mark(X, Y, Width, Height, MARK_LIFT, false); + //TODO: make separate lift tags, and change tag here - if LiftType = 0 then - g_Mark(X, Y, Width, Height, MARK_LIFTUP, True) - else if LiftType = 1 then - g_Mark(X, Y, Width, Height, MARK_LIFTDOWN, True) - else if LiftType = 2 then - g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True) - else if LiftType = 3 then - g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True); + case LiftType of + 0: g_Mark(X, Y, Width, Height, MARK_LIFTUP); + 1: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN); + 2: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT); + 3: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT); + end; - if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID); + //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(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; @@ -2385,262 +3108,223 @@ begin end; end; -procedure g_Map_SaveState(Var Mem: TBinMemoryWriter); + +procedure g_Map_SaveState (var Mem: TBinMemoryWriter); var dw: DWORD; b: Byte; str: String; boo: Boolean; - procedure SavePanelArray(var panels: TPanelArray); + procedure savePanels (); var PAMem: TBinMemoryWriter; - i: Integer; + pan: TPanel; + count: Integer; begin - // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé: - PAMem := TBinMemoryWriter.Create((Length(panels)+1) * 40); + // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé + PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40); - 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; + // Ñîõðàíÿåì ïàíåëè + count := Length(panByGUID); + Mem.WriteInt(count); + for pan in panByGUID do pan.SaveState(PAMem); - // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé: + // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé PAMem.SaveToMemory(Mem); PAMem.Free(); end; - procedure SaveFlag(flag: PFlag); + 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; + // Íàïðàâëåíèå ôëàãà + if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT 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); -///// ///// - -///// Ñîõðàíÿåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: + ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: ///// + savePanels(); + ///// ///// + + ///// Ñîõðàíÿåì ìóçûêó: ///// + // Ñèãíàòóðà ìóçûêè: dw := MUSIC_SIGNATURE; // 'MUSI' Mem.WriteDWORD(dw); -// Íàçâàíèå ìóçûêè: + // Íàçâàíèå ìóçûêè: Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); - if gMusic.NoMusic then - str := '' - else - str := gMusic.Name; + 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: ///// + //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// if gGameSettings.GameMode = GM_CTF then begin - // Ôëàã Êðàñíîé êîìàíäû: + // Ôëàã Êðàñíîé êîìàíäû 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); end; -///// ///// + ///// ///// end; -procedure g_Map_LoadState(Var Mem: TBinMemoryReader); + +procedure g_Map_LoadState (var Mem: TBinMemoryReader); var dw: DWORD; b: Byte; str: String; boo: Boolean; - procedure LoadPanelArray(var panels: TPanelArray); + procedure loadPanels (); var PAMem: TBinMemoryReader; - i, id: Integer; + pan: TPanel; + count: LongInt; 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.ReadInt(count); + if (count <> Length(panByGUID)) then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: invalid number of panels'); + for pan in panByGUID do + begin + pan.LoadState(PAMem); + if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; + end; - // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí: + // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí PAMem.Free(); end; procedure LoadFlag(flag: PFlag); begin - // Ñèãíàòóðà ôëàãà: + // Ñèãíàòóðà ôëàãà Mem.ReadDWORD(dw); - if dw <> FLAG_SIGNATURE then // 'FLAG' - begin - raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); - end; - // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà: + // 'FLAG' + if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); + // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà 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; - // Îáúåêò ôëàãà: + if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2 + // Îáúåêò ôëàãà Obj_LoadState(@flag^.Obj, Mem); end; begin - if Mem = nil then - Exit; + if Mem = 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(); + //mapCreateGrid(); -///// Çàãðóæàåì ìóçûêó: ///// -// Ñèãíàòóðà ìóçûêè: + ///// Çàãðóæàåì ìóçûêó: ///// + // Ñèãíàòóðà ìóçûêè Mem.ReadDWORD(dw); - if dw <> MUSIC_SIGNATURE then // 'MUSI' - begin - raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); - end; -// Íàçâàíèå ìóçûêè: + // 'MUSI' + if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); + // Íàçâàíèå ìóçûêè Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); Mem.ReadString(str); -// Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè: + // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè Mem.ReadDWORD(dw); -// Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå: + // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå Mem.ReadBoolean(boo); -// Çàïóñêàåì ýòó ìóçûêó: + // Çàïóñêàåì ýòó ìóçûêó gMusic.SetByName(str); gMusic.SpecPause := boo; gMusic.Play(); gMusic.Pause(True); gMusic.SetPosition(dw); -///// ///// + ///// ///// -///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// + ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// Mem.ReadInt(gTotalMonsters); -///// ///// + ///// ///// -//// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// + //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// if gGameSettings.GameMode = GM_CTF then begin - // Ôëàã Êðàñíîé êîìàíäû: + // Ôëàã Êðàñíîé êîìàíäû 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); end; -///// ///// + ///// ///// end; -function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; -var - Arr: TPanelArray; + +// trace liquid, stepping by `dx` and `dy` +// return last seen liquid coords, and `false` if we're started outside of the liquid +function g_Map_TraceLiquidNonPrecise (x, y, dx, dy: Integer; out topx, topy: Integer): Boolean; +const + MaskLiquid = GridTagWater or GridTagAcid1 or GridTagAcid2; begin - 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]); + topx := x; + topy := y; + // started outside of the liquid? + if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + if (dx = 0) and (dy = 0) then begin result := false; exit; end; // sanity check + result := true; + while true do + begin + Inc(x, dx); + Inc(y, dy); + if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + topx := x; + topy := y; + end; end; + end.