X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=81eb17e904044c36be49914f5172380a7b8cbdd6;hb=05c4488d67219fb60a2687af2a06397fea1dffbb;hp=9c696cb656b766b347129617d92d92e523ad32a4;hpb=d64cda34a561a8aba09f3f37c121fdf12d0d7beb;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 9c696cb..81eb17e 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -1,4 +1,4 @@ -(* Copyright (C) DooM 2D:Forever Developers +(* Copyright (C) Doom 2D: Forever Developers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,8 +20,9 @@ unit g_map; interface uses - e_graphics, g_basic, MAPDEF, g_textures, Classes, - g_phys, wadreader, BinEditor, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; + SysUtils, Classes, mempool, + e_graphics, g_basic, MAPDEF, g_textures, + g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec; type TMapInfo = record @@ -58,7 +59,7 @@ type function g_Map_Load(Res: String): Boolean; function g_Map_GetMapInfo(Res: String): TMapInfo; -function g_Map_GetMapsList(WADName: String): SArray; +function g_Map_GetMapsList(WADName: String): SSArray; function g_Map_Exist(Res: String): Boolean; procedure g_Map_Free(freeTextures: Boolean=true); procedure g_Map_Update(); @@ -82,7 +83,7 @@ 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_SwitchTextureGUID (pguid: Integer; AnimLoop: Byte = 0); procedure g_Map_ReAdd_DieTriggers(); function g_Map_IsSpecialTexture(Texture: String): Boolean; @@ -95,8 +96,8 @@ function g_Map_HaveFlagPoints(): Boolean; procedure g_Map_ResetFlag(Flag: Byte); procedure g_Map_DrawFlags(); -procedure g_Map_SaveState(Var Mem: TBinMemoryWriter); -procedure g_Map_LoadState(Var Mem: TBinMemoryReader); +procedure g_Map_SaveState (st: TStream); +procedure g_Map_LoadState (st: TStream); procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); @@ -195,12 +196,21 @@ const GridTagLift = 1 shl 8; // gLifts GridTagBlockMon = 1 shl 9; // gBlockMon + GridTagSolid = (GridTagWall or GridTagDoor); GridTagObstacle = (GridTagStep or GridTagWall or GridTagDoor); GridTagLiquid = (GridTagAcid1 or GridTagAcid2 or GridTagWater); GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore); +type + TBinHeapPanelDrawCmp = class + public + class function less (const a, b: TPanel): Boolean; inline; + end; + + TBinHeapPanelDraw = specialize TBinaryHeapBase; + var gWalls: TPanelArray; gRenderBackgrounds: TPanelArray; @@ -223,10 +233,11 @@ var gdbg_map_use_accel_render: Boolean = true; gdbg_map_use_accel_coldet: Boolean = true; profMapCollision: TProfiler = nil; //WARNING: FOR DEBUGGING ONLY! - gDrawPanelList: TBinaryHeapObj = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()` + gDrawPanelList: TBinHeapPanelDraw = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()` gCurrentMap: TDynRecord = nil; gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading + gTestMap: String = ''; function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX @@ -242,11 +253,12 @@ var implementation uses - e_input, g_main, e_log, e_texture, SysUtils, g_items, g_gfx, g_console, - GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG, + {$INCLUDE ../nogl/noGLuses.inc} + e_input, g_main, e_log, e_texture, g_items, g_gfx, g_console, + g_weapons, g_game, g_sound, e_sound, CONFIG, g_options, g_triggers, g_player, Math, g_monsters, g_saveload, g_language, g_netmsg, - utils, sfs, xstreams, hashtable, + sfs, xstreams, hashtable, wadreader, ImagingTypes, Imaging, ImagingUtility, ImagingGif, ImagingNetworkGraphics; @@ -256,6 +268,21 @@ const FLAG_SIGNATURE = $47414C46; // 'FLAG' +// ////////////////////////////////////////////////////////////////////////// // +procedure mapWarningCB (const msg: AnsiString; line, col: Integer); +begin + if (line > 0) then + begin + e_LogWritefln('parse error at (%s,%s): %s', [line, col, msg], TMsgType.Warning); + end + else + begin + e_LogWritefln('parse error: %s', [msg], TMsgType.Warning); + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // var panByGUID: array of TPanel = nil; @@ -409,17 +436,19 @@ end; // ////////////////////////////////////////////////////////////////////////// // var NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå + NNF_PureExt: String; // extension postfix NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû NNF_CurrentNum: Integer; // Ñëåäóþùåå ÷èñëî ó òåêñòóðû function g_Texture_NumNameFindStart(name: String): Boolean; var - i: Integer; + i, j: Integer; begin Result := False; NNF_PureName := ''; + NNF_PureExt := ''; NNF_FirstNum := -1; NNF_CurrentNum := -1; @@ -432,8 +461,11 @@ begin end else begin + j := i + 1; + while (j <= Length(name)) and (name[j] <> '.') do inc(j); NNF_PureName := Copy(name, 1, i); - Delete(name, 1, i); + NNF_PureExt := Copy(name, j); + name := Copy(name, i + 1, j - i - 1); Break; end; end; @@ -457,7 +489,7 @@ begin Exit; end; - newName := NNF_PureName + IntToStr(NNF_CurrentNum); + newName := NNF_PureName + IntToStr(NNF_CurrentNum) + NNF_PureExt; if NNF_CurrentNum < NNF_FirstNum then Result := NNF_NAME_BEFORE @@ -490,20 +522,16 @@ begin end; -function dplLess (a, b: TObject): Boolean; -var - pa, pb: TPanel; +class function TBinHeapPanelDrawCmp.less (const a, b: TPanel): Boolean; inline; begin - pa := TPanel(a); - pb := TPanel(b); - if (pa.tag < pb.tag) then begin result := true; exit; end; - if (pa.tag > pb.tag) then begin result := false; exit; end; - result := (pa.arrIdx < pb.arrIdx); + if (a.tag < b.tag) then begin result := true; exit; end; + if (a.tag > b.tag) then begin result := false; exit; end; + result := (a.arrIdx < b.arrIdx); end; procedure dplClear (); begin - if (gDrawPanelList = nil) then gDrawPanelList := TBinaryHeapObj.Create(@dplLess) else gDrawPanelList.clear(); + if (gDrawPanelList = nil) then gDrawPanelList := TBinHeapPanelDraw.Create() else gDrawPanelList.clear(); end; @@ -519,9 +547,9 @@ var procedure g_Map_ProfilersBegin (); begin if (profMapCollision = nil) then profMapCollision := TProfiler.Create('COLSOLID', g_profile_history_size); - profMapCollision.mainBegin(g_profile_collision); + if (profMapCollision <> nil) then profMapCollision.mainBegin(g_profile_collision); // create sections - if g_profile_collision then + if g_profile_collision and (profMapCollision <> nil) then begin profMapCollision.sectionBegin('*solids'); profMapCollision.sectionEnd(); @@ -541,7 +569,7 @@ function g_Map_traceToNearestWall (x0, y0, x1, y1: Integer; hitx: PInteger=nil; var ex, ey: Integer; begin - result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, (GridTagWall or GridTagDoor)); + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, (GridTagWall or GridTagDoor)); if (result <> nil) then begin if (hitx <> nil) then hitx^ := ex; @@ -559,7 +587,7 @@ function g_Map_traceToNearest (x0, y0, x1, y1: Integer; tag: Integer; hitx: PInt var ex, ey: Integer; begin - result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, nil, tag); + result := mapGrid.traceRay(ex, ey, x0, y0, x1, y1, tag); if (result <> nil) then begin if (hitx <> nil) then hitx^ := ex; @@ -573,34 +601,26 @@ begin 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 +function xxPanAtPointChecker (pan: TPanel; panelType: Word): Boolean; inline; +begin + if ((pan.tag and GridTagLift) <> 0) then + begin + // stop if the lift of the right type + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))); + exit; end; + result := true; // otherwise, stop anyway, 'cause `forEachAtPoint()` is guaranteed to call this only for correct panels +end; +function g_Map_HasAnyPanelAtPoint (x, y: Integer; panelType: Word): Boolean; var tagmask: Integer = 0; + mwit: PPanel; + it: TPanelGrid.Iter; begin result := false; @@ -613,24 +633,32 @@ begin if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; if (tagmask = 0) then exit;// just in case + if ((tagmask and GridTagLift) <> 0) then begin // slow - result := (mapGrid.forEachAtPoint(x, y, checker, tagmask) <> nil); + it := mapGrid.forEachAtPoint(x, y, tagmask); + for mwit in it do if (xxPanAtPointChecker(mwit^, PanelType)) then begin result := true; break; end; end else begin // fast - result := (mapGrid.forEachAtPoint(x, y, nil, tagmask) <> nil); + it := mapGrid.forEachAtPoint(x, y, tagmask, false, true); + result := (it.length <> 0); // firsthit end; + it.release(); end; function g_Map_PanelAtPoint (x, y: Integer; tagmask: Integer=-1): TPanel; +var + it: TPanelGrid.Iter; begin result := nil; if (tagmask = 0) then exit; - result := mapGrid.forEachAtPoint(x, y, nil, tagmask); + it := mapGrid.forEachAtPoint(x, y, tagmask, false, true); // firsthit + if (it.length <> 0) then result := it.first^; + it.release(); end; @@ -853,7 +881,7 @@ end; function CreateNullTexture(RecName: String): Integer; begin RecName := toLowerCase1251(RecName); - if (TextNameHash = nil) then TextNameHash := hashNewStrInt(); + if (TextNameHash = nil) then TextNameHash := THashStrInt.Create(); if TextNameHash.get(RecName, result) then exit; // i found her! SetLength(Textures, Length(Textures)+1); @@ -878,14 +906,13 @@ var TextureData: Pointer; WADName: String; a, ResLength: Integer; - oldFilter: Integer; begin RecName := toLowerCase1251(RecName); - if (TextNameHash = nil) then TextNameHash := hashNewStrInt(); + if (TextNameHash = nil) then TextNameHash := THashStrInt.Create(); if TextNameHash.get(RecName, result) then begin // i found her! - //e_LogWritefln('texture ''%s'' already loaded', [RecName]); + //e_LogWritefln('texture ''%s'' already loaded (%s)', [RecName, result]); exit; end; @@ -948,38 +975,34 @@ begin end; } - oldFilter := TEXTUREFILTER; - TEXTUREFILTER := GL_NEAREST; - try - if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength, log) 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 - begin - 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; + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning); + SetLength(Textures, Length(Textures)-1); + result := -1; + Exit; + end; + e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height); + FreeMem(TextureData); + Textures[High(Textures)].TextureName := RecName; + Textures[High(Textures)].Anim := False; - result := High(Textures); - TextNameHash.put(RecName, result); - end - else // Íåò òàêîãî ðåóñðñà â WAD'å + result := High(Textures); + TextNameHash.put(RecName, result); + end + else // Íåò òàêîãî ðåóñðñà â WAD'å + begin + //e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING); + if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create(); + if log and (not BadTextNameHash.get(RecName, a)) then begin - //e_WriteLog(Format('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); + e_WriteLog(Format('Error loading texture %s', [RecName]), TMsgType.Warning); + //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; - finally - TEXTUREFILTER := oldFilter; + BadTextNameHash.put(RecName, -1); end; WAD.Free(); @@ -1003,11 +1026,11 @@ var f, c, frdelay, frloop: Integer; begin RecName := toLowerCase1251(RecName); - if (TextNameHash = nil) then TextNameHash := hashNewStrInt(); + if (TextNameHash = nil) then TextNameHash := THashStrInt.Create(); if TextNameHash.get(RecName, result) then begin // i found her! - //e_LogWritefln('animated texture ''%s'' already loaded', [RecName]); + //e_LogWritefln('animated texture ''%s'' already loaded (%s)', [RecName, result]); exit; end; @@ -1015,7 +1038,7 @@ begin //e_LogWritefln('*** Loading animated texture "%s"', [RecName]); - if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create(); if BadTextNameHash.get(RecName, f) then begin //e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY); @@ -1033,10 +1056,10 @@ begin if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength, log) then begin - if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING); end; BadTextNameHash.put(RecName, -1); @@ -1055,7 +1078,7 @@ begin if ResLength < 6 then begin - e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1067,7 +1090,7 @@ begin // íåò, ýòî ñóïåðìåí! if not WAD.ReadMemory(TextureWAD, ResLength) then begin - e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1075,7 +1098,7 @@ begin // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè: if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then begin - e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1085,7 +1108,7 @@ begin TextureResource := cfg.ReadStr('', 'resource', ''); if TextureResource = '' then begin - e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1102,7 +1125,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); + e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1127,10 +1150,10 @@ begin end else begin - if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture %s', [RecName]), TMsgType.Warning); end; BadTextNameHash.put(RecName, -1); end; @@ -1151,13 +1174,13 @@ begin GlobalMetadata.ClearMetaItemsForSaving(); if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then begin - e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; if length(ia) = 0 then begin - e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING); + e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), TMsgType.Warning); BadTextNameHash.put(RecName, -1); exit; end; @@ -1201,7 +1224,7 @@ begin //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...'); //for f := 0 to high(ia) do writeln(' frame #', f, ': ', ia[f].width, 'x', ia[f].height); f := ord(_backanimation); - e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY); + e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), TMsgType.Notify); SetLength(Textures, Length(Textures)+1); // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê @@ -1219,10 +1242,10 @@ begin end else begin - if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt(); + if (BadTextNameHash = nil) then BadTextNameHash := THashStrInt.Create(); if log and (not BadTextNameHash.get(RecName, f)) then begin - e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING); + e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), TMsgType.Warning); end; BadTextNameHash.put(RecName, -1); end; @@ -1319,9 +1342,10 @@ begin end; end; -function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer; fTexturePanel1Type, fTexturePanel2Type: Word): Integer; +function CreateTrigger (amapIdx: Integer; Trigger: TDynRecord; atpanid, atrigpanid: Integer): Integer; var _trigger: TTrigger; + tp: TPanel; begin result := -1; if g_Game_IsClient and not (Trigger.TriggerType in [TRIGGER_SOUND, TRIGGER_MUSIC]) then Exit; @@ -1335,16 +1359,17 @@ begin Width := Trigger.Width; Height := Trigger.Height; Enabled := Trigger.Enabled; - //TexturePanel := Trigger.TexturePanel; TexturePanelGUID := atpanid; - TexturePanelType := fTexturePanel1Type; - ShotPanelType := fTexturePanel2Type; TriggerType := Trigger.TriggerType; ActivateType := Trigger.ActivateType; Keys := Trigger.Keys; trigPanelGUID := atrigpanid; - //trigShotPanelId := ashotpanid; - //Data.Default := Trigger.DATA; + // HACK: used in TPanel.CanChangeTexture. maybe there's a better way? + if TexturePanelGUID <> -1 then + begin + tp := g_Map_PanelByGUID(TexturePanelGUID); + if (tp <> nil) then tp.hasTexTrigger := True; + end; end; result := Integer(g_Triggers_Create(_trigger, Trigger)); @@ -1510,7 +1535,7 @@ var if (pan.proxyId <> -1) then begin {$IF DEFINED(D2F_DEBUG)} - e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), MSG_NOTIFY); + e_WriteLog(Format('DUPLICATE wall #%d(%d) enabled (%d); type:%08x', [Integer(idx), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.PanelType]), TMsgType.Notify); {$ENDIF} continue; end; @@ -1603,8 +1628,8 @@ type actPanel: TDynRecord; end; var - WAD: TWADFile; - mapReader: TDynRecord = nil; + WAD, TestWAD: TWADFile; + //mapReader: TDynRecord = nil; mapTextureList: TDynField = nil; //TTexturesRec1Array; tagInt: texture index panels: TDynField = nil; //TPanelsRec1Array; items: TDynField = nil; //TItemsRec1Array; @@ -1615,7 +1640,7 @@ var PanelID: DWORD; AddTextures: TAddTextureArray; TriggersTable: array of TTRec; - FileName, mapResName, s, TexName: String; + FileName, mapResName, TexName, s: AnsiString; Data: Pointer; Len: Integer; ok, isAnim: Boolean; @@ -1628,100 +1653,140 @@ var //moveActive: Boolean; pan: TPanel; mapOk: Boolean = false; + usedTextures: THashStrInt = nil; // key: mapTextureList begin mapGrid.Free(); mapGrid := nil; + TestWAD := nil; + Data := nil; - gCurrentMap.Free(); - gCurrentMap := nil; + //gCurrentMap.Free(); + //gCurrentMap := nil; panByGUID := nil; Result := False; gMapInfo.Map := Res; TriggersTable := nil; - mapReader := nil; + //mapReader := nil; sfsGCDisable(); // temporary disable removing of temporary volumes try - // Çàãðóçêà WAD: - FileName := g_ExtractWadName(Res); - e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); - - WAD := TWADFile.Create(); - if not WAD.ReadFile(FileName) then + // Çàãðóçêà WAD (åñëè ó íàñ íåò óæå çàãðóæåíîé êàðòû) + if (gCurrentMap = nil) then begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName])); - WAD.Free(); - Exit; - end; + FileName := g_ExtractWadName(Res); + e_WriteLog('Loading map WAD: '+FileName, TMsgType.Notify); + g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False); + + WAD := TWADFile.Create(); + if not WAD.ReadFile(FileName) then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName])); + WAD.Free(); + Exit; + end; + + if gTestMap <> '' then + begin + s := g_ExtractWadName(gTestMap); + TestWAD := TWADFile.Create(); + if not TestWAD.ReadFile(s) then + begin + g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_WAD], [s])); + TestWAD.Free(); + TestWAD := nil; + end; + end; + + if TestWAD <> nil then + begin + mapResName := g_ExtractFileName(gTestMap); + if not TestWAD.GetMapResource(mapResName, Data, Len) then + begin + g_SimpleError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); + Data := nil; + end else + e_WriteLog('Using test map: '+gTestMap, TMsgType.Notify); + TestWAD.Free(); + TestWAD := nil; + end; + + if Data = nil then + begin + //k8: why loader ignores path here? + mapResName := g_ExtractFileName(Res); + if not WAD.GetMapResource(mapResName, Data, Len) then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); + WAD.Free(); + Exit; + end; + end; - //k8: why loader ignores path here? - mapResName := g_ExtractFileName(Res); - if not WAD.GetMapResource(mapResName, Data, Len) then - begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName])); WAD.Free(); - Exit; - end; - WAD.Free(); + if (Len < 4) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + FreeMem(Data); + exit; + end; - if (Len < 4) then - begin - e_LogWritefln('invalid map file: ''%s''', [mapResName]); - FreeMem(Data); - exit; - end; + // Çàãðóçêà êàðòû: + e_LogWritefln('Loading map: %s', [mapResName], TMsgType.Notify); + g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); - // Çàãðóçêà êàðòû: - e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY); - g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False); + stt := getTimeMicro(); - stt := getTimeMicro(); + try + gCurrentMap := g_Map_ParseMap(Data, Len); + except + gCurrentMap.Free(); + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res])); + FreeMem(Data); + gCurrentMapFileName := ''; + Exit; + end; - try - mapReader := g_Map_ParseMap(Data, Len); - except - mapReader.Free(); - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res])); FreeMem(Data); - Exit; - end; - FreeMem(Data); - - if (mapReader = nil) then + if (gCurrentMap = nil) then + begin + e_LogWritefln('invalid map file: ''%s''', [mapResName]); + gCurrentMapFileName := ''; + exit; + end; + end + else begin - e_LogWritefln('invalid map file: ''%s''', [mapResName]); - exit; + stt := getTimeMicro(); end; - gCurrentMap := mapReader; + //gCurrentMap := mapReader; - generateExternalResourcesList(mapReader); - mapTextureList := mapReader['texture']; + generateExternalResourcesList(gCurrentMap); + mapTextureList := gCurrentMap['texture']; // get all other lists here too - panels := mapReader['panel']; - triggers := mapReader['trigger']; - items := mapReader['item']; - areas := mapReader['area']; - monsters := mapReader['monster']; + panels := gCurrentMap['panel']; + triggers := gCurrentMap['trigger']; + items := gCurrentMap['item']; + areas := gCurrentMap['area']; + monsters := gCurrentMap['monster']; // Çàãðóçêà îïèñàíèÿ êàðòû: - e_WriteLog(' Reading map info...', MSG_NOTIFY); + e_WriteLog(' Reading map info...', TMsgType.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; + Name := gCurrentMap.MapName; + Description := gCurrentMap.MapDesc; + Author := gCurrentMap.MapAuthor; + MusicName := gCurrentMap.MusicName; + SkyName := gCurrentMap.SkyName; + Height := gCurrentMap.Height; + Width := gCurrentMap.Width; end; // Çàãðóçêà òåêñòóð: @@ -1729,34 +1794,56 @@ begin // Äîáàâëåíèå òåêñòóð â Textures[]: if (mapTextureList <> nil) and (mapTextureList.count > 0) then begin - e_WriteLog(' Loading textures:', MSG_NOTIFY); + e_WriteLog(' Loading textures:', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], mapTextureList.count-1, False); - cnt := -1; - for rec in mapTextureList do - begin - 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 rec.Anim then + // find used textures + usedTextures := THashStrInt.Create(); + try + if (panels <> nil) and (panels.count > 0) 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])); + for rec in panels do + begin + texrec := rec.TextureRec; + if (texrec <> nil) then usedTextures.put(toLowerCase1251(texrec.Resource), 42); + end; end; - if (ntn < 0) then ntn := CreateNullTexture(rec.Resource); - rec.tagInt := ntn; // remember texture number - g_Game_StepLoading(); + cnt := -1; + for rec in mapTextureList do + begin + Inc(cnt); + if not usedTextures.has(toLowerCase1251(rec.Resource)) then + begin + rec.tagInt := -1; // just in case + e_LogWritefln(' Unused texture #%d: %s', [cnt, rec.Resource]); + end + else + begin + {$IF DEFINED(D2F_DEBUG_TXLOAD)} + e_LogWritefln(' Loading texture #%d: %s', [cnt, rec.Resource]); + {$ENDIF} + //if g_Map_IsSpecialTexture(s) then e_WriteLog(' SPECIAL!', MSG_NOTIFY); + if rec.Anim then + begin + // Àíèìèðîâàííàÿ òåêñòóðà + ntn := CreateAnimTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [rec.Resource])); + end + else + begin + // Îáû÷íàÿ òåêñòóðà + ntn := CreateTexture(rec.Resource, FileName, True); + if (ntn < 0) then g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [rec.Resource])); + end; + if (ntn < 0) then ntn := CreateNullTexture(rec.Resource); + + rec.tagInt := ntn; // remember texture number + end; + g_Game_StepLoading(); + end; + finally + usedTextures.Free(); end; // set panel tagInt to texture index @@ -1770,13 +1857,14 @@ begin end; end; + // Çàãðóçêà òðèããåðîâ gTriggerClientID := 0; - e_WriteLog(' Loading triggers...', MSG_NOTIFY); + e_WriteLog(' Loading triggers...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS], 0, False); // Çàãðóçêà ïàíåëåé - e_WriteLog(' Loading panels...', MSG_NOTIFY); + e_WriteLog(' Loading panels...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False); // check texture numbers for panels @@ -1786,8 +1874,9 @@ begin begin if (rec.tagInt < 0) then begin - e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR); + e_WriteLog('error loading map: invalid texture index for panel', TMsgType.Fatal); result := false; + gCurrentMap.Free(); gCurrentMap := nil; gCurrentMapFileName := ''; exit; @@ -1798,7 +1887,7 @@ begin // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì) if (triggers <> nil) and (triggers.count > 0) then begin - e_WriteLog(' Setting up trigger table...', MSG_NOTIFY); + e_WriteLog(' Setting up trigger table...', TMsgType.Notify); //SetLength(TriggersTable, triggers.count); g_Game_SetLoadingText(_lc[I_LOAD_TRIGGERS_TABLE], triggers.count-1, False); @@ -1826,7 +1915,7 @@ begin // Ñîçäàåì ïàíåëè if (panels <> nil) and (panels.count > 0) then begin - e_WriteLog(' Setting up trigger links...', MSG_NOTIFY); + e_WriteLog(' Setting up trigger links...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_LINK_TRIGGERS], panels.count-1, False); pannum := -1; @@ -1982,6 +2071,7 @@ begin //e_LogWritefln('PANADD: pannum=%s', [pannum]); // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå GUID + //e_LogWritefln('new panel; tcount=%s; curtex=%s', [Length(AddTextures), CurTex]); PanelID := CreatePanel(rec, AddTextures, CurTex); //e_LogWritefln('panel #%s of type %s got guid #%s', [pannum, rec.PanelType, PanelID]); rec.userPanelId := PanelID; // remember game panel id, we'll fix triggers later @@ -2012,7 +2102,7 @@ begin end; // create map grid, init other grids (for monsters, for example) - e_WriteLog('Creating map grid', MSG_NOTIFY); + e_WriteLog('Creating map grid', TMsgType.Notify); mapCreateGrid(); // Åñëè íå LoadState, òî ñîçäàåì òðèããåðû @@ -2025,13 +2115,10 @@ begin for rec in triggers do begin Inc(trignum); - if (TriggersTable[trignum].texPanel <> nil) then b := TriggersTable[trignum].texPanel.PanelType else b := 0; - if (TriggersTable[trignum].actPanel <> nil) then c := TriggersTable[trignum].actPanel.PanelType else c := 0; - // we can have only one of those tgpid := TriggersTable[trignum].actPanelIdx; //e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]); TriggersTable[trignum].tnum := trignum; - TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanelIdx, tgpid, Word(b), Word(c)); + TriggersTable[trignum].id := CreateTrigger(trignum, rec, TriggersTable[trignum].texPanelIdx, tgpid); end; end; @@ -2049,31 +2136,31 @@ begin end; // Çàãðóçêà ïðåäìåòîâ - e_WriteLog(' Loading items...', MSG_NOTIFY); + e_WriteLog(' Loading items...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_ITEMS], 0, False); // Åñëè íå LoadState, òî ñîçäàåì ïðåäìåòû if (items <> nil) and not gLoadGameMode then begin - e_WriteLog(' Spawning items...', MSG_NOTIFY); + e_WriteLog(' Spawning items...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_ITEMS], 0, False); for rec in items do CreateItem(rec); end; // Çàãðóçêà îáëàñòåé - e_WriteLog(' Loading areas...', MSG_NOTIFY); + e_WriteLog(' Loading areas...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_AREAS], 0, False); // Åñëè íå LoadState, òî ñîçäàåì îáëàñòè if areas <> nil then begin - e_WriteLog(' Creating areas...', MSG_NOTIFY); + e_WriteLog(' Creating areas...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_AREAS], 0, False); for rec in areas do CreateArea(rec); end; // Çàãðóçêà ìîíñòðîâ - e_WriteLog(' Loading monsters...', MSG_NOTIFY); + e_WriteLog(' Loading monsters...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MONSTERS], 0, False); gTotalMonsters := 0; @@ -2081,32 +2168,37 @@ begin // Åñëè íå LoadState, òî ñîçäàåì ìîíñòðîâ if (monsters <> nil) and not gLoadGameMode then begin - e_WriteLog(' Spawning monsters...', MSG_NOTIFY); + e_WriteLog(' Spawning monsters...', TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_CREATE_MONSTERS], 0, False); for rec in monsters do CreateMonster(rec); end; - gCurrentMap := mapReader; // this will be our current map now + //gCurrentMap := mapReader; // this will be our current map now gCurrentMapFileName := Res; - mapReader := nil; + //mapReader := nil; // Çàãðóçêà íåáà if (gMapInfo.SkyName <> '') then begin - e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY); + e_WriteLog(' Loading sky: ' + gMapInfo.SkyName, TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False); FileName := g_ExtractWadName(gMapInfo.SkyName); if (FileName <> '') then FileName := GameDir+'/wads/'+FileName else FileName := g_ExtractWadName(Res); - s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName); - if g_Texture_CreateWAD(BackID, s) then - begin - g_Game_SetupScreenSize(); - end - else - begin - g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s])); + if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST; + try + s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName); + if g_Texture_CreateWAD(BackID, s) then + begin + g_Game_SetupScreenSize(); + end + else + begin + g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s])); + end; + finally + TEXTUREFILTER := GL_NEAREST; end; end; @@ -2114,7 +2206,7 @@ begin ok := False; if gMapInfo.MusicName <> '' then begin - e_WriteLog(' Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY); + e_WriteLog(' Loading music: ' + gMapInfo.MusicName, TMsgType.Notify); g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False); FileName := g_ExtractWadName(gMapInfo.MusicName); @@ -2168,16 +2260,17 @@ begin mapOk := true; finally sfsGCEnable(); // enable releasing unused volumes - mapReader.Free(); + //mapReader.Free(); e_ClearInputBuffer(); // why not? if not mapOk then begin + gCurrentMap.Free(); gCurrentMap := nil; gCurrentMapFileName := ''; end; end; - e_WriteLog('Done loading map.', MSG_NOTIFY); + e_WriteLog('Done loading map.', TMsgType.Notify); Result := True; end; @@ -2246,11 +2339,11 @@ begin mapReader.Free(); end; -function g_Map_GetMapsList(WADName: string): SArray; +function g_Map_GetMapsList(WADName: string): SSArray; var WAD: TWADFile; a: Integer; - ResList: SArray; + ResList: SSArray; begin Result := nil; WAD := TWADFile.Create(); @@ -2275,7 +2368,7 @@ function g_Map_Exist(Res: string): Boolean; var WAD: TWADFile; FileName, mnn: string; - ResList: SArray; + ResList: SSArray; a: Integer; begin Result := False; @@ -2348,6 +2441,7 @@ begin begin e_LogWritefln('g_Map_Free: no previous map.', []); end; + if freeTextures then begin e_LogWritefln('g_Map_Free: clearing textures...', []); @@ -2376,6 +2470,9 @@ begin TextNameHash := nil; BadTextNameHash.Free(); BadTextNameHash := nil; + gCurrentMapFileName := ''; + gCurrentMap.Free(); + gCurrentMap := nil; end; panByGUID := nil; @@ -2418,6 +2515,7 @@ var a, d, j: Integer; m: Word; s: String; + b: Byte; procedure UpdatePanelArray(var panels: TPanelArray); var @@ -2468,6 +2566,15 @@ begin s := _lc[I_PLAYER_FLAG_BLUE]; g_Game_Message(Format(_lc[I_MESSAGE_FLAG_RETURN], [AnsiUpperCase(s)]), 144); + if (((gPlayer1 <> nil) and (((gPlayer1.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer1.Team = TEAM_BLUE) and (a = FLAG_BLUE)))) + or ((gPlayer2 <> nil) and (((gPlayer2.Team = TEAM_RED) and (a = FLAG_RED)) or ((gPlayer2.Team = TEAM_BLUE) and (a = FLAG_BLUE))))) then + b := 0 + else + b := 1; + + if not sound_ret_flag[b].IsPlaying() then + sound_ret_flag[b].Play(); + if g_Game_IsNet then MH_SEND_FlagEvent(FLAG_STATE_RETURNED, a, 0); Continue; @@ -2532,32 +2639,26 @@ end; // new algo procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - if ((tag and GridTagDoor) <> 0) <> pan.Door then exit; - gDrawPanelList.insert(pan); - end; - +var + mwit: PPanel; + it: TPanelGrid.Iter; begin dplClear(); - //tagmask := panelTypeToTag(PanelType); - mapGrid.forEachInAABB(x0, y0, wdt, hgt, checker, GridDrawableMask); + it := mapGrid.forEachInAABB(x0, y0, wdt, hgt, GridDrawableMask); + for mwit in it do if (((mwit^.tag and GridTagDoor) <> 0) = mwit^.Door) then gDrawPanelList.insert(mwit^); + it.release(); // list will be rendered in `g_game.DrawPlayer()` end; -procedure g_Map_DrawPanelShadowVolumes(lightX: Integer; lightY: Integer; radius: Integer); - - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - pan.DrawShadowVolume(lightX, lightY, radius); - end; - +procedure g_Map_DrawPanelShadowVolumes (lightX: Integer; lightY: Integer; radius: Integer); +var + mwit: PPanel; + it: TPanelGrid.Iter; begin - mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, checker, (GridTagWall or GridTagDoor)); + it := mapGrid.forEachInAABB(lightX-radius, lightY-radius, radius*2, radius*2, (GridTagWall or GridTagDoor)); + for mwit in it do mwit^.DrawShadowVolume(lightX, lightY, radius); + it.release(); end; @@ -2658,10 +2759,10 @@ begin h := High(gLifts); for a := 0 to h do - if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = 0)) or - (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = 1)) or - (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = 2)) or - (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = 3))) and + if ((WordBool(PanelType and (PANEL_LIFTUP)) and (gLifts[a].LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and (PANEL_LIFTDOWN)) and (gLifts[a].LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and (PANEL_LIFTLEFT)) and (gLifts[a].LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and (PANEL_LIFTRIGHT)) and (gLifts[a].LiftType = LIFTTYPE_RIGHT))) and g_Collide(X, Y, Width, Height, gLifts[a].X, gLifts[a].Y, gLifts[a].Width, gLifts[a].Height) then @@ -2723,6 +2824,7 @@ end; function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word; PanelType: Word; b1x3: Boolean): Boolean; const SlowMask = GridTagLift or GridTagBlockMon; + function checker (pan: TPanel; tag: Integer): Boolean; begin { @@ -2736,10 +2838,10 @@ const if ((tag and GridTagLift) <> 0) then begin result := - ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = 0)) or - (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = 1)) or - (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = 2)) or - (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = 3))) {and + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; exit; end; @@ -2757,7 +2859,11 @@ const var tagmask: Integer = 0; + mwit: PPanel; + it: TPanelGrid.Iter; + pan: TPanel; begin + result := false; if WordBool(PanelType and (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR)) then tagmask := tagmask or (GridTagWall or GridTagDoor); if WordBool(PanelType and PANEL_WATER) then tagmask := tagmask or GridTagWater; if WordBool(PanelType and PANEL_ACID1) then tagmask := tagmask or GridTagAcid1; @@ -2766,37 +2872,46 @@ begin if WordBool(PanelType and (PANEL_LIFTUP or PANEL_LIFTDOWN or PANEL_LIFTLEFT or PANEL_LIFTRIGHT)) then tagmask := tagmask or GridTagLift; if WordBool(PanelType and PANEL_BLOCKMON) then tagmask := tagmask or GridTagBlockMon; - if (tagmask = 0) then begin result := false; exit; end; // just in case + if (tagmask = 0) then exit; // just in case if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('*solids'); if gdbg_map_use_accel_coldet then begin - if (Width = 1) and (Height = 1) then + if ((tagmask and SlowMask) <> 0) then begin - if ((tagmask and SlowMask) <> 0) then - begin - // slow - result := (mapGrid.forEachAtPoint(X, Y, checker, tagmask) <> nil); - end - else + // slow + it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask); + for mwit in it do begin - // fast - result := (mapGrid.forEachAtPoint(X, Y, nil, tagmask) <> nil); + pan := mwit^; + if ((pan.tag and GridTagLift) <> 0) then + begin + result := + ((WordBool(PanelType and PANEL_LIFTUP) and (pan.LiftType = LIFTTYPE_UP)) or + (WordBool(PanelType and PANEL_LIFTDOWN) and (pan.LiftType = LIFTTYPE_DOWN)) or + (WordBool(PanelType and PANEL_LIFTLEFT) and (pan.LiftType = LIFTTYPE_LEFT)) or + (WordBool(PanelType and PANEL_LIFTRIGHT) and (pan.LiftType = LIFTTYPE_RIGHT))) {and + g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height)}; + end + else if ((pan.tag and GridTagBlockMon) <> 0) then + begin + result := ((not b1x3) or (pan.Width+pan.Height >= 64)); //and g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height); + end + else + begin + // other shit + result := true; // i found her! + end; + if (result) then break; end; end else begin - if ((tagmask and SlowMask) <> 0) then - begin - // slow - result := (mapGrid.forEachInAABB(X, Y, Width, Height, checker, tagmask) <> nil); - end - else - begin - // fast - result := (mapGrid.forEachInAABB(X, Y, Width, Height, nil, tagmask) <> nil); - end; + // fast + it := mapGrid.forEachInAABB(X, Y, Width, Height, tagmask, false, true); // return first hit + result := (it.length > 0); end; + it.release(); end else begin @@ -2806,48 +2921,42 @@ begin end; +// returns `true` if we need to stop +function liquidChecker (pan: TPanel; var texid: DWORD; var cctype: Integer): Boolean; inline; +begin + result := false; + //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; + // check priorities + case cctype of + 0: if ((pan.tag and GridTagWater) = 0) then exit; // allowed: water + 1: if ((pan.tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 + //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 + end; + // collision? + //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; + // yeah + texid := pan.GetTextureID(); + // water? water has the highest priority, so stop right here + if ((pan.tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; + // acid2? + if ((pan.tag and GridTagAcid2) <> 0) then cctype := 2; + // acid1? + if ((pan.tag and GridTagAcid1) <> 0) then cctype := 1; +end; + function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD; var cctype: Integer = 3; // priority: 0: water was hit, 1: acid1 was hit, 2: acid2 was hit; 3: nothing was hit - texid: DWORD; - - // slightly different from the old code, but meh... - function checker (pan: TPanel; tag: Integer): Boolean; - begin - result := false; // don't stop, ever - //if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2)) = 0) then exit; - // check priorities - case cctype of - 0: if ((tag and GridTagWater) = 0) then exit; // allowed: water - 1: if ((tag and (GridTagWater or GridTagAcid1)) = 0) then exit; // allowed: water, acid1 - //2: if ((tag and (GridTagWater or GridTagAcid1 or GridTagAcid2) = 0) then exit; // allowed: water, acid1, acid2 - end; - // collision? - //if not g_Collide(X, Y, Width, Height, pan.X, pan.Y, pan.Width, pan.Height) then exit; - // yeah - texid := pan.GetTextureID(); - // water? water has the highest priority, so stop right here - if ((tag and GridTagWater) <> 0) then begin cctype := 0; result := true; exit; end; - // acid2? - if ((tag and GridTagAcid2) <> 0) then cctype := 2; - // acid1? - if ((tag and GridTagAcid1) <> 0) then cctype := 1; - end; - + mwit: PPanel; + it: TPanelGrid.Iter; begin if (profMapCollision <> nil) then profMapCollision.sectionBeginAccum('liquids'); if gdbg_map_use_accel_coldet then begin - texid := LongWord(TEXTURE_NONE); - if (Width = 1) and (Height = 1) then - begin - mapGrid.forEachAtPoint(X, Y, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); - end - else - begin - mapGrid.forEachInAABB(X, Y, Width, Height, checker, (GridTagWater or GridTagAcid1 or GridTagAcid2)); - end; - result := texid; + result := LongWord(TEXTURE_NONE); + it := mapGrid.forEachInAABB(X, Y, Width, Height, (GridTagWater or GridTagAcid1 or GridTagAcid2)); + for mwit in it do if (liquidChecker(mwit^, result, cctype)) then break; + it.release(); end else begin @@ -2913,25 +3022,12 @@ begin end; -procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0); +procedure g_Map_SwitchTextureGUID (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; - end; - } - tp.NextTexture(AnimLoop); if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(pguid, AnimLoop); end; @@ -2956,10 +3052,10 @@ begin //TODO: make separate lift tags, and change tag here 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); + LIFTTYPE_UP: g_Mark(X, Y, Width, Height, MARK_LIFTUP); + LIFTTYPE_DOWN: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN); + LIFTTYPE_LEFT: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT); + LIFTTYPE_RIGHT: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT); end; //if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pguid); @@ -3021,7 +3117,7 @@ begin Obj.Y := -1000; Obj.Vel.X := 0; Obj.Vel.Y := 0; - Direction := D_LEFT; + Direction := TDirection.D_LEFT; State := FLAG_STATE_NONE; if FlagPoints[Flag] <> nil then begin @@ -3049,14 +3145,14 @@ begin if State = FLAG_STATE_NONE then continue; - if Direction = D_LEFT then + if Direction = TDirection.D_LEFT then begin - Mirror := M_HORIZONTAL; + Mirror := TMirrorType.Horizontal; dx := -1; end else begin - Mirror := M_NONE; + Mirror := TMirrorType.None; dx := 1; end; @@ -3074,80 +3170,62 @@ begin end; -procedure g_Map_SaveState (var Mem: TBinMemoryWriter); +procedure g_Map_SaveState (st: TStream); var - dw: DWORD; - b: Byte; str: String; - boo: Boolean; procedure savePanels (); var - PAMem: TBinMemoryWriter; pan: TPanel; begin - // Ñîçäàåì íîâûé ñïèñîê ñîõðàíÿåìûõ ïàíåëåé - PAMem := TBinMemoryWriter.Create((Length(panByGUID)+1) * 40); - // Ñîõðàíÿåì ïàíåëè - //Mem.WriteInt(Length(panByGUID)); - for pan in panByGUID do pan.SaveState(PAMem); - - // Ñîõðàíÿåì ýòîò ñïèñîê ïàíåëåé - PAMem.SaveToMemory(Mem); - PAMem.Free(); + utils.writeInt(st, LongInt(Length(panByGUID))); + for pan in panByGUID do pan.SaveState(st); end; - procedure SaveFlag (flag: PFlag); + procedure saveFlag (flag: PFlag); + var + b: Byte; begin - // Ñèãíàòóðà ôëàãà - dw := FLAG_SIGNATURE; // 'FLAG' - Mem.WriteDWORD(dw); + utils.writeSign(st, 'FLAG'); + utils.writeInt(st, Byte(0)); // version // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà - Mem.WriteByte(flag^.RespawnType); + utils.writeInt(st, Byte(flag^.RespawnType)); // Ñîñòîÿíèå ôëàãà - Mem.WriteByte(flag^.State); + utils.writeInt(st, Byte(flag^.State)); // Íàïðàâëåíèå ôëàãà - if flag^.Direction = D_LEFT then b := 1 else b := 2; // D_RIGHT - Mem.WriteByte(b); + if flag^.Direction = TDirection.D_LEFT then b := 1 else b := 2; // D_RIGHT + utils.writeInt(st, Byte(b)); // Îáúåêò ôëàãà - Obj_SaveState(@flag^.Obj, Mem); + Obj_SaveState(st, @flag^.Obj); end; begin - Mem := TBinMemoryWriter.Create(1024 * 1024); // 1 MB - - ///// Ñîõðàíÿåì ñïèñêè ïàíåëåé: ///// savePanels(); - ///// ///// - ///// Ñîõðàíÿåì ìóçûêó: ///// - // Ñèãíàòóðà ìóçûêè: - dw := MUSIC_SIGNATURE; // 'MUSI' - Mem.WriteDWORD(dw); - // Íàçâàíèå ìóçûêè: - Assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); + // Ñîõðàíÿåì ìóçûêó + utils.writeSign(st, 'MUSI'); + utils.writeInt(st, Byte(0)); + // Íàçâàíèå ìóçûêè + assert(gMusic <> nil, 'g_Map_SaveState: gMusic = nil'); if gMusic.NoMusic then str := '' else str := gMusic.Name; - Mem.WriteString(str, 64); + utils.writeStr(st, str); // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè - dw := gMusic.GetPosition(); - Mem.WriteDWORD(dw); + utils.writeInt(st, LongWord(gMusic.GetPosition())); // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå - boo := gMusic.SpecPause; - Mem.WriteBoolean(boo); - ///// ///// + utils.writeBool(st, gMusic.SpecPause); ///// Ñîõðàíÿåì êîëè÷åñòâî ìîíñòðîâ: ///// - Mem.WriteInt(gTotalMonsters); + utils.writeInt(st, LongInt(gTotalMonsters)); ///// ///// //// Ñîõðàíÿåì ôëàãè, åñëè ýòî CTF: ///// - if gGameSettings.GameMode = GM_CTF then + if (gGameSettings.GameMode = GM_CTF) then begin // Ôëàã Êðàñíîé êîìàíäû - SaveFlag(@gFlags[FLAG_RED]); + saveFlag(@gFlags[FLAG_RED]); // Ôëàã Ñèíåé êîìàíäû - SaveFlag(@gFlags[FLAG_BLUE]); + saveFlag(@gFlags[FLAG_BLUE]); end; ///// ///// @@ -3155,64 +3233,53 @@ begin if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin // Î÷êè Êðàñíîé êîìàíäû - Mem.WriteSmallInt(gTeamStat[TEAM_RED].Goals); + utils.writeInt(st, SmallInt(gTeamStat[TEAM_RED].Goals)); // Î÷êè Ñèíåé êîìàíäû - Mem.WriteSmallInt(gTeamStat[TEAM_BLUE].Goals); + utils.writeInt(st, SmallInt(gTeamStat[TEAM_BLUE].Goals)); end; ///// ///// end; -procedure g_Map_LoadState (var Mem: TBinMemoryReader); +procedure g_Map_LoadState (st: TStream); var dw: DWORD; - b: Byte; str: String; boo: Boolean; procedure loadPanels (); var - PAMem: TBinMemoryReader; pan: TPanel; - //count: LongInt; begin - // Çàãðóæàåì òåêóùèé ñïèñîê ïàíåëåé - PAMem := TBinMemoryReader.Create(); - PAMem.LoadFromMemory(Mem); - // Çàãðóæàåì ïàíåëè - //PAMem.ReadInt(count); - //if (count <> Length(panByGUID)) then raise EBinSizeError.Create('g_Map_LoadState: LoadPanelArray: invalid number of panels'); - //if (count <> Length(panByGUID)) then raise EBinSizeError.Create(Format('g_Map_LoadState: LoadPanelArray: invalid number of panels (%d : %d)', [count, Length(panByGUID)])); + if (Length(panByGUID) <> utils.readLongInt(st)) then raise XStreamError.Create('invalid number of saved panels'); for pan in panByGUID do begin - pan.LoadState(PAMem); + pan.LoadState(st); if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := pan.Enabled; end; - - // Ýòîò ñïèñîê ïàíåëåé çàãðóæåí - PAMem.Free(); end; - procedure LoadFlag(flag: PFlag); + procedure loadFlag (flag: PFlag); + var + b: Byte; begin // Ñèãíàòóðà ôëàãà - Mem.ReadDWORD(dw); - // 'FLAG' - if dw <> FLAG_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: LoadFlag: Wrong Flag Signature'); + if not utils.checkSign(st, 'FLAG') then raise XStreamError.Create('invalid flag signature'); + if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid flag version'); // Âðåìÿ ïåðåïîÿâëåíèÿ ôëàãà - Mem.ReadByte(flag^.RespawnType); + flag^.RespawnType := utils.readByte(st); // Ñîñòîÿíèå ôëàãà - Mem.ReadByte(flag^.State); + flag^.State := utils.readByte(st); // Íàïðàâëåíèå ôëàãà - Mem.ReadByte(b); - if b = 1 then flag^.Direction := D_LEFT else flag^.Direction := D_RIGHT; // b = 2 + b := utils.readByte(st); + if (b = 1) then flag^.Direction := TDirection.D_LEFT else flag^.Direction := TDirection.D_RIGHT; // b = 2 // Îáúåêò ôëàãà - Obj_LoadState(@flag^.Obj, Mem); + Obj_LoadState(@flag^.Obj, st); end; begin - if Mem = nil then Exit; + if (st = nil) then exit; ///// Çàãðóæàåì ñïèñêè ïàíåëåé: ///// loadPanels(); @@ -3223,36 +3290,34 @@ begin //mapCreateGrid(); ///// Çàãðóæàåì ìóçûêó: ///// - // Ñèãíàòóðà ìóçûêè - Mem.ReadDWORD(dw); - // 'MUSI' - if dw <> MUSIC_SIGNATURE then raise EBinSizeError.Create('g_Map_LoadState: Wrong Music Signature'); + if not utils.checkSign(st, 'MUSI') then raise XStreamError.Create('invalid music signature'); + if (utils.readByte(st) <> 0) then raise XStreamError.Create('invalid music version'); // Íàçâàíèå ìóçûêè - Assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); - Mem.ReadString(str); + assert(gMusic <> nil, 'g_Map_LoadState: gMusic = nil'); + str := utils.readStr(st); // Ïîçèöèÿ ïðîèãðûâàíèÿ ìóçûêè - Mem.ReadDWORD(dw); + dw := utils.readLongWord(st); // Ñòîèò ëè ìóçûêà íà ñïåö-ïàóçå - Mem.ReadBoolean(boo); + boo := utils.readBool(st); // Çàïóñêàåì ýòó ìóçûêó gMusic.SetByName(str); gMusic.SpecPause := boo; gMusic.Play(); - gMusic.Pause(True); + gMusic.Pause(true); gMusic.SetPosition(dw); ///// ///// ///// Çàãðóæàåì êîëè÷åñòâî ìîíñòðîâ: ///// - Mem.ReadInt(gTotalMonsters); + gTotalMonsters := utils.readLongInt(st); ///// ///// //// Çàãðóæàåì ôëàãè, åñëè ýòî CTF: ///// - if gGameSettings.GameMode = GM_CTF then + if (gGameSettings.GameMode = GM_CTF) then begin // Ôëàã Êðàñíîé êîìàíäû - LoadFlag(@gFlags[FLAG_RED]); + loadFlag(@gFlags[FLAG_RED]); // Ôëàã Ñèíåé êîìàíäû - LoadFlag(@gFlags[FLAG_BLUE]); + loadFlag(@gFlags[FLAG_BLUE]); end; ///// ///// @@ -3260,9 +3325,9 @@ begin if gGameSettings.GameMode in [GM_TDM, GM_CTF] then begin // Î÷êè Êðàñíîé êîìàíäû - Mem.ReadSmallInt(gTeamStat[TEAM_RED].Goals); + gTeamStat[TEAM_RED].Goals := utils.readSmallInt(st); // Î÷êè Ñèíåé êîìàíäû - Mem.ReadSmallInt(gTeamStat[TEAM_BLUE].Goals); + gTeamStat[TEAM_BLUE].Goals := utils.readSmallInt(st); end; ///// ///// end; @@ -3277,18 +3342,22 @@ begin topx := x; topy := y; // started outside of the liquid? - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then begin result := false; exit; end; + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then begin result := false; exit; end; if (dx = 0) and (dy = 0) then begin result := false; exit; end; // sanity check result := true; while true do begin Inc(x, dx); Inc(y, dy); - if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + //if (mapGrid.forEachAtPoint(x, y, nil, MaskLiquid) = nil) then exit; // out of the water, just exit + if (g_Map_PanelAtPoint(x, y, MaskLiquid) = nil) then exit; // out of the water, just exit topx := x; topy := y; end; end; +begin + DynWarningCB := mapWarningCB; end.