X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=6b343b325fa8913fa7f3cae31a27e42418be4659;hp=8445e7825e307e89348d740d87c6779970f3362c;hb=0d83f3f36628c487c98470a87440c87b3467f5e4;hpb=8f815647c61a98e32b85066bf245b262694ac634 diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 8445e78..6b343b3 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -1,11 +1,27 @@ +(* Copyright (C) DooM 2D:Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) {$MODE DELPHI} +{$modeswitch nestedprocvars} unit g_map; interface uses e_graphics, g_basic, MAPSTRUCT, g_textures, Classes, - g_phys, wadreader, BinEditor, g_panel, md5; + g_phys, wadreader, BinEditor, g_panel, g_grid, md5; type TMapInfo = record @@ -40,14 +56,15 @@ type Direction: TDirection; end; - 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_Update(); -procedure g_Map_DrawPanels(PanelType: Word); + +procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word); + procedure g_Map_DrawBack(dx, dy: Integer); function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; @@ -67,9 +84,13 @@ 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); + const RESPAWNPOINT_PLAYER1 = 1; RESPAWNPOINT_PLAYER2 = 2; @@ -118,18 +139,46 @@ uses GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG, g_options, MAPREADER, g_triggers, g_player, MAPDEF, Math, g_monsters, g_saveload, g_language, g_netmsg, - utils, sfs; + utils, sfs, + ImagingTypes, Imaging, ImagingUtility, + ImagingGif, ImagingNetworkGraphics; const FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52); MUSIC_SIGNATURE = $4953554D; // 'MUSI' FLAG_SIGNATURE = $47414C46; // 'FLAG' + +function panelTypeToTag (panelType: Word): Integer; +begin + case panelType of + PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: result := 0; // gWalls + PANEL_BACK: result := 1; // gRenderBackgrounds + PANEL_FORE: result := 2; // gRenderForegrounds + PANEL_WATER: result := 3; // gWater + PANEL_ACID1: result := 4; // gAcid1 + PANEL_ACID2: result := 5; // gAcid2 + PANEL_STEP: result := 6; // gSteps + PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: result := 7; // gLifts -- this is for all lifts + PANEL_BLOCKMON: result := 8; // gBlockMon -- this is for all blockmons + else result := -1; + end; +end; + + +type + TPanelID = record + PWhere: ^TPanelArray; + PArrID: Integer; + end; + var + PanelById: array of TPanelID; Textures: TLevelTextureArray; RespawnPoints: Array of TRespawnPoint; FlagPoints: Array [FLAG_RED..FLAG_BLUE] of PFlagPoint; //DOMFlagPoints: Array of TFlagPoint; + gMapGrid: TBodyGrid = nil; function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -339,12 +388,17 @@ begin len := Length(panels^); SetLength(panels^, len + 1); - panels^[len] := TPanel.Create(PanelRec, AddTextures, - CurTex, Textures); + 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; end; function CreateNullTexture(RecName: String): Integer; @@ -366,9 +420,7 @@ function CreateTexture(RecName: String; Map: string; log: Boolean): Integer; var WAD: TWADFile; TextureData: Pointer; - WADName: String; - SectionName: String; - TextureName: String; + WADName, txname: String; a, ResLength: Integer; begin Result := -1; @@ -409,7 +461,7 @@ begin end; // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à: - g_ProcessResourceStr(RecName, WADName, SectionName, TextureName); + WADName := g_ExtractWadName(RecName); WAD := TWADFile.Create(); @@ -420,7 +472,16 @@ begin WAD.ReadFile(WADName); - if WAD.GetResource(SectionName, TextureName, TextureData, ResLength) then + txname := RecName; + { + if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then + begin + FreeMem(TextureData); + RecName := 'COMMON\ALIEN'; + end; + } + + if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then begin SetLength(Textures, Length(Textures)+1); if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then @@ -429,17 +490,20 @@ begin @Textures[High(Textures)].Width, @Textures[High(Textures)].Height); FreeMem(TextureData); - Textures[High(Textures)].TextureName := RecName; + Textures[High(Textures)].TextureName := {RecName}txname; Textures[High(Textures)].Anim := False; result := High(Textures); 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; + end; WAD.Free(); end; @@ -447,115 +511,218 @@ end; function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer; var WAD: TWADFile; - TextureWAD: Pointer; - TextData: Pointer; - TextureData: Pointer; - cfg: TConfig; + TextureWAD: PChar = nil; + TextData: Pointer = nil; + TextureData: Pointer = nil; + cfg: TConfig = nil; WADName: String; - SectionName: String; - TextureName: String; ResLength: Integer; TextureResource: String; _width, _height, _framecount, _speed: Integer; _backanimation: Boolean; + //imgfmt: string; + ia: TDynImageDataArray = nil; + f, c, frdelay, frloop: Integer; begin - Result := -1; + result := -1; -// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü: - g_ProcessResourceStr(RecName, WADName, SectionName, TextureName); + //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY); + + // ×èòàåì 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); - WAD.ReadFile(WADName); + if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then + begin + if log 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; + exit; + end; - if not WAD.GetResource(SectionName, TextureName, TextureWAD, ResLength) then - begin - if log then + {TEST + if WADName = Map then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); - //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); + //FreeMem(TextureWAD); + if not WAD.GetResource('COMMON/animation', TextureWAD, ResLength) then Halt(1); end; - WAD.Free(); - Exit; - end; + } - WAD.FreeWAD(); + WAD.FreeWAD(); - if not WAD.ReadMemory(TextureWAD, ResLength) then - begin - FreeMem(TextureWAD); - WAD.Free(); - Exit; - end; + if ResLength < 6 then + begin + e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING); + exit; + end; -// ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè: - if not WAD.GetResource('TEXT', 'ANIM', TextData, ResLength) then - begin - FreeMem(TextureWAD); - WAD.Free(); - Exit; - end; + // ýòî ïòèöà? ýòî ñàìîë¸ò? + if (TextureWAD[0] = 'D') and (TextureWAD[1] = 'F') and + (TextureWAD[2] = 'W') and (TextureWAD[3] = 'A') and (TextureWAD[4] = 'D') then + begin + // íåò, ýòî ñóïåðìåí! + if not WAD.ReadMemory(TextureWAD, ResLength) then + begin + e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING); + exit; + end; - cfg := TConfig.CreateMem(TextData, ResLength); + // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè: + if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then + begin + e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING); + exit; + end; - TextureResource := cfg.ReadStr('', 'resource', ''); + cfg := TConfig.CreateMem(TextData, ResLength); - if TextureResource = '' then - begin - FreeMem(TextureWAD); - FreeMem(TextData); - WAD.Free(); - cfg.Free(); - Exit; - end; + TextureResource := cfg.ReadStr('', 'resource', ''); + if TextureResource = '' then + begin + e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING); + exit; + end; - _width := cfg.ReadInt('', 'framewidth', 0); - _height := cfg.ReadInt('', 'frameheight', 0); - _framecount := cfg.ReadInt('', 'framecount', 0); - _speed := cfg.ReadInt('', 'waitcount', 0); - _backanimation := cfg.ReadBool('', 'backanimation', False); + _width := cfg.ReadInt('', 'framewidth', 0); + _height := cfg.ReadInt('', 'frameheight', 0); + _framecount := cfg.ReadInt('', 'framecount', 0); + _speed := cfg.ReadInt('', 'waitcount', 0); + _backanimation := cfg.ReadBool('', 'backanimation', False); - cfg.Free(); + cfg.Free(); + cfg := nil; -// ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü: - if not WAD.GetResource('TEXTURES', TextureResource, TextureData, ResLength) then - begin - FreeMem(TextureWAD); - FreeMem(TextData); - WAD.Free(); - Exit; - end; + // ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü: + if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then + begin + e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), MSG_WARNING); + exit; + end; - WAD.Free(); + WAD.Free(); + WAD := nil; - SetLength(Textures, Length(Textures)+1); - with Textures[High(Textures)] do - begin - // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè: - if g_Frames_CreateMemory(@FramesID, '', TextureData, ResLength, - _width, _height, _framecount, _backanimation) then + SetLength(Textures, Length(Textures)+1); + with Textures[High(Textures)] do begin - TextureName := RecName; - Width := _width; - Height := _height; - Anim := True; - FramesCount := _framecount; - Speed := _speed; + // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè: + if g_Frames_CreateMemory(@FramesID, '', TextureData, ResLength, _width, _height, _framecount, _backanimation) then + begin + TextureName := RecName; + Width := _width; + Height := _height; + Anim := True; + FramesCount := _framecount; + Speed := _speed; + result := High(Textures); + end + else + begin + if log then e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + end; + end; + end + else + begin + // try animated image + { + imgfmt := DetermineMemoryFormat(TextureWAD, ResLength); + if length(imgfmt) = 0 then + begin + e_WriteLog(Format('Animated texture file "%s" has unknown format', [RecName]), MSG_WARNING); + exit; + end; + } + GlobalMetadata.ClearMetaItems(); + GlobalMetadata.ClearMetaItemsForSaving(); + if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then + begin + e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); + exit; + end; + if length(ia) = 0 then + begin + e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING); + exit; + end; + WAD.Free(); + WAD := nil; + + _width := ia[0].width; + _height := ia[0].height; + _framecount := length(ia); + _speed := 1; + _backanimation := false; + frdelay := -1; + frloop := -666; + if GlobalMetadata.HasMetaItem(SMetaFrameDelay) then + begin + //writeln(' frame delay: ', GlobalMetadata.MetaItems[SMetaFrameDelay]); + try + f := GlobalMetadata.MetaItems[SMetaFrameDelay]; + frdelay := f; + if f < 0 then f := 0; + // rounding ;-) + c := f mod 28; + if c < 13 then c := 0 else c := 1; + f := (f div 28)+c; + if f < 1 then f := 1 else if f > 255 then f := 255; + _speed := f; + except + end; + end; + if GlobalMetadata.HasMetaItem(SMetaAnimationLoops) then + begin + //writeln(' frame loop : ', GlobalMetadata.MetaItems[SMetaAnimationLoops]); + try + f := GlobalMetadata.MetaItems[SMetaAnimationLoops]; + frloop := f; + if f <> 0 then _backanimation := true; // non-infinite looping == forth-and-back + except + end; + end; + //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...'); + //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height); + f := ord(_backanimation); + e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY); + + SetLength(Textures, Length(Textures)+1); + // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê + if g_CreateFramesImg(ia, @Textures[High(Textures)].FramesID, '', _backanimation) then + begin + Textures[High(Textures)].TextureName := RecName; + Textures[High(Textures)].Width := _width; + Textures[High(Textures)].Height := _height; + Textures[High(Textures)].Anim := True; + Textures[High(Textures)].FramesCount := length(ia); + Textures[High(Textures)].Speed := _speed; result := High(Textures); + //writeln(' CREATED!'); end - else - if log then - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + else + begin + if log then e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING); + 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); end; - - FreeMem(TextureWAD); - FreeMem(TextData); end; procedure CreateItem(Item: TItemRec_1); @@ -751,6 +918,73 @@ begin addResToExternalResList(mapHeader.SkyName); end; +procedure mapCreateGrid (); +var + mapX0: Integer = $3fffffff; + mapY0: Integer = $3fffffff; + mapX1: Integer = -$3fffffff; + mapY1: Integer = -$3fffffff; + + procedure fixMinMax (var panels: TPanelArray); + var + idx: Integer; + 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; + end; + end; + + procedure addPanelsToGrid (var panels: TPanelArray; tag: Integer); + var + idx: Integer; + begin + tag := panelTypeToTag(tag); + for idx := High(panels) downto 0 do + begin + gMapGrid.insertBody(panels[idx], panels[idx].X, panels[idx].Y, panels[idx].Width, panels[idx].Height, tag); + 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(); +end; + function g_Map_Load(Res: String): Boolean; const DefaultMusRes = 'Standart.wad:STDMUS\MUS1'; @@ -776,13 +1010,16 @@ var DoorPanel: Integer; ShotPanel: Integer; end; - FileName, SectionName, ResName, - FileName2, s, TexName: String; + FileName, mapResName, s, TexName: String; Data: Pointer; Len: Integer; ok, isAnim, trigRef: Boolean; CurTex, ntn: Integer; + begin + gMapGrid.Free(); + gMapGrid := nil; + Result := False; gMapInfo.Map := Res; TriggersTable := nil; @@ -791,8 +1028,8 @@ begin sfsGCDisable(); // temporary disable removing of temporary volumes try // Çàãðóçêà WAD: - g_ProcessResourceStr(Res, FileName, SectionName, ResName); - e_WriteLog('Loading map WAD: ' + FileName, MSG_NOTIFY); + FileName := g_ExtractWadName(Res); + e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); WAD := TWADFile.Create(); @@ -802,16 +1039,19 @@ begin WAD.Free(); Exit; end; - if not WAD.GetResource('', ResName, Data, Len) then + //k8: why loader ignores path here? + mapResName := g_ExtractFileName(Res); + if not WAD.GetMapResource(mapResName, Data, Len) then begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [ResName])); + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); WAD.Free(); Exit; end; + WAD.Free(); // Çàãðóçêà êàðòû: - e_WriteLog('Loading map: ' + ResName, MSG_NOTIFY); + e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); MapReader := TMapReader_1.Create(); @@ -1173,17 +1413,16 @@ begin begin e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False); - g_ProcessResourceStr(gMapInfo.SkyName, FileName, SectionName, ResName); + FileName := g_ExtractWadName(gMapInfo.SkyName); if FileName <> '' then FileName := GameDir+'/wads/'+FileName else begin - g_ProcessResourceStr(Res, @FileName2, nil, nil); - FileName := FileName2; + FileName := g_ExtractWadName(Res); end; - s := FileName+':'+SectionName+'/'+ResName; + s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName); if g_Texture_CreateWAD(BackID, s) then begin g_Game_SetupScreenSize(); @@ -1198,17 +1437,16 @@ begin begin e_WriteLog(' Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY); g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False); - g_ProcessResourceStr(gMapInfo.MusicName, FileName, SectionName, ResName); + FileName := g_ExtractWadName(gMapInfo.MusicName); if FileName <> '' then FileName := GameDir+'/wads/'+FileName else begin - g_ProcessResourceStr(Res, @FileName2, nil, nil); - FileName := FileName2; + FileName := g_ExtractWadName(Res); end; - s := FileName+':'+SectionName+'/'+ResName; + s := FileName+':'+g_ExtractFilePathName(gMapInfo.MusicName); if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then ok := True else @@ -1248,6 +1486,9 @@ begin sfsGCEnable(); // enable releasing unused volumes end; + e_WriteLog('Creating map grid', MSG_NOTIFY); + mapCreateGrid(); + e_WriteLog('Done loading map.', MSG_NOTIFY); Result := True; end; @@ -1257,12 +1498,12 @@ var WAD: TWADFile; MapReader: TMapReader_1; Header: TMapHeaderRec_1; - FileName, SectionName, ResName: String; + FileName: String; Data: Pointer; Len: Integer; begin FillChar(Result, SizeOf(Result), 0); - g_ProcessResourceStr(Res, FileName, SectionName, ResName); + FileName := g_ExtractWadName(Res); WAD := TWADFile.Create(); if not WAD.ReadFile(FileName) then @@ -1271,7 +1512,8 @@ begin Exit; end; - if not WAD.GetResource('', ResName, Data, Len) then + //k8: it ignores path again + if not WAD.GetMapResource(g_ExtractFileName(Res), Data, Len) then begin WAD.Free(); Exit; @@ -1309,52 +1551,36 @@ var WAD: TWADFile; a: Integer; ResList: SArray; - Data: Pointer; - Len: Integer; - Sign: Array [0..2] of Char; begin Result := nil; - WAD := TWADFile.Create(); if not WAD.ReadFile(WADName) then begin WAD.Free(); Exit; end; - - ResList := WAD.GetResourcesList(''); - + ResList := WAD.GetMapResources(); if ResList <> nil then + begin for a := 0 to High(ResList) do begin - if not WAD.GetResource('', ResList[a], Data, Len) then Continue; - CopyMemory(@Sign[0], Data, 3); - FreeMem(Data); - - if Sign = MAP_SIGNATURE then - begin - SetLength(Result, Length(Result)+1); - Result[High(Result)] := ResList[a]; - end; - - Sign := ''; + SetLength(Result, Length(Result)+1); + Result[High(Result)] := ResList[a]; end; - + end; WAD.Free(); end; function g_Map_Exist(Res: string): Boolean; var WAD: TWADFile; - FileName, SectionName, ResName: string; + FileName, mnn: string; ResList: SArray; a: Integer; begin Result := False; - g_ProcessResourceStr(Res, FileName, SectionName, ResName); - - FileName := addWadExtension(FileName); + FileName := addWadExtension(g_ExtractWadName(Res)); WAD := TWADFile.Create; if not WAD.ReadFile(FileName) then @@ -1363,11 +1589,12 @@ begin Exit; end; - ResList := WAD.GetResourcesList(''); + ResList := WAD.GetMapResources(); WAD.Free(); + mnn := g_ExtractFileName(Res); if ResList <> nil then - for a := 0 to High(ResList) do if ResList[a] = ResName then + for a := 0 to High(ResList) do if StrEquCI1251(ResList[a], mnn) then begin Result := True; Exit; @@ -1456,6 +1683,8 @@ begin gDoorMap := nil; gLiftMap := nil; + + PanelByID := nil; end; procedure g_Map_Update(); @@ -1543,33 +1772,151 @@ begin end; end; -procedure g_Map_DrawPanels(PanelType: Word); - procedure DrawPanels(var panels: TPanelArray; - drawDoors: Boolean = False); +procedure g_Map_DrawPanelsOld(PanelType: Word); + + procedure DrawPanels (stp: Integer; var panels: TPanelArray; drawDoors: Boolean=False); var - a: Integer; + idx: Integer; + 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 panels[idx].Draw(); + end; + end; + end; + +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); + end; +end; + +var + gDrawPanelList: TBinaryHeapObj = nil; + +function dplLess (a, b: TObject): Boolean; +begin + result := ((a as TPanel).ArrIdx < (b as TPanel).ArrIdx); +end; + +procedure dplClear (); +begin + if gDrawPanelList = nil then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); +end; + +procedure dplAddPanel (pan: TPanel); +begin + if pan = nil then exit; + gDrawPanelList.insert(pan); +end; + + +procedure g_Map_DrawPanels(x0, y0, wdt, hgt: Integer; PanelType: Word); +var + ptag: Integer; + + function qq (obj: TObject; tag: Integer): Boolean; + var + pan: TPanel; begin - if panels <> nil then - for a := 0 to High(panels) do - if not (drawDoors xor panels[a].Door) then - panels[a].Draw(); + 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; 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, qq); + + // debug + { + e_WriteLog(Format('+++QQQ: qtag:%d', [PanelType]), MSG_NOTIFY); case PanelType of - 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); + 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; end; + +procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); + function qq (obj: TObject; tag: Integer): Boolean; + var + pan: TPanel; + begin + result := false; // don't stop, ever + if (tag <> 0 {panelTypeToTag(PANEL_WALL)}) 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, qq); +end; + + procedure g_Map_DrawBack(dx, dy: Integer); begin if gDrawBackGround and (BackID <> DWORD(-1)) then @@ -1578,7 +1925,7 @@ begin e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); end; -function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; +function g_Map_CollidePanelOld(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; var a, h: Integer; @@ -1698,6 +2045,104 @@ begin end; end; +function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; + + function qq (obj: TObject; tag: Integer): 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 = panelTypeToTag(PANEL_WALL)) then + begin + if gWalls[a].Enabled and g_Collide(X, Y, Width, Height, gWalls[a].X, gWalls[a].Y, gWalls[a].Width, gWalls[a].Height) then + begin + result := true; + exit; + end; + end; + + if WordBool(PanelType and PANEL_WATER) and (tag = panelTypeToTag(PANEL_WATER)) then + begin + if g_Collide(X, Y, Width, Height, gWater[a].X, gWater[a].Y, gWater[a].Width, gWater[a].Height) then + begin + result := True; + exit; + end; + end; + + if WordBool(PanelType and PANEL_ACID1) and (tag = panelTypeToTag(PANEL_ACID1)) then + begin + if g_Collide(X, Y, Width, Height, gAcid1[a].X, gAcid1[a].Y, gAcid1[a].Width, gAcid1[a].Height) then + begin + result := True; + exit; + end; + end; + + if WordBool(PanelType and PANEL_ACID2) and (tag = panelTypeToTag(PANEL_ACID2)) then + begin + if g_Collide(X, Y, Width, Height, gAcid2[a].X, gAcid2[a].Y, gAcid2[a].Width, gAcid2[a].Height) then + begin + result := True; + exit; + end; + end; + + if WordBool(PanelType and PANEL_STEP) and (tag = panelTypeToTag(PANEL_STEP)) then + begin + if g_Collide(X, Y, Width, Height, gSteps[a].X, gSteps[a].Y, gSteps[a].Width, gSteps[a].Height) then + begin + result := True; + exit; + end; + end; + + if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) and (tag = panelTypeToTag(PANEL_LIFTUP)) then + begin + if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or + (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or + (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or + (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and + g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then + begin + result := true; + exit; + end; + end; + + if WordBool(PanelType and PANEL_BLOCKMON)and (tag = panelTypeToTag(PANEL_BLOCKMON)) then + begin + if ((not b1x3) or ((gBlockMon[a].Width + gBlockMon[a].Height) >= 64)) and + g_Collide(X, Y, Width, Height, gBlockMon[a].X, gBlockMon[a].Y, gBlockMon[a].Width, gBlockMon[a].Height) then + begin + result := True; + exit; + end; + end; + end; + +begin + result := gMapGrid.forEachInAABB(X, Y, Width, Height, qq); +end; + + function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; var a, h: Integer; @@ -2121,8 +2566,9 @@ begin LoadPanelArray(gLifts); ///// ///// -// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé: +// Îáíîâëÿåì êàðòó ñòîëêíîâåíèé è ñåòêó: g_GFX_Init(); + mapCreateGrid(); ///// Çàãðóæàåì ìóçûêó: ///// // Ñèãíàòóðà ìóçûêè: @@ -2171,4 +2617,15 @@ begin ///// ///// end; +function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel; +var + Arr: TPanelArray; +begin + Result := nil; + if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit; + Arr := PanelByID[PanelID].PWhere^; + PanelArrayID := PanelByID[PanelID].PArrID; + Result := Addr(Arr[PanelByID[PanelID].PArrID]); +end; + end.