X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=cb934b81705666abe9dcd89ace6d7ae251fa47cb;hb=0aed9f9d49f034aad7d8856db00fe42f3303826d;hp=5bca6b012ad82226e39827f88ec5c92fd89d7add;hpb=e8f8394426db6b11bc3e15ca60e413fade0b16e1;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 5bca6b0..cb934b8 100644 --- a/src/game/g_map.pas +++ b/src/game/g_map.pas @@ -1,3 +1,18 @@ +(* 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} unit g_map; @@ -118,7 +133,7 @@ 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, g_scripts, ImagingTypes, Imaging, ImagingUtility, ImagingGif, ImagingNetworkGraphics; @@ -469,13 +484,9 @@ var TextureResource: String; _width, _height, _framecount, _speed: Integer; _backanimation: Boolean; - imgfmt: string; + //imgfmt: string; ia: TDynImageDataArray = nil; - il: TImageFileFormat = nil; - meta: TMetadata = nil; - f, c: Integer; - gf: TGIFFileFormat; - pf: TPNGFileFormat; + f, c, frdelay, frloop: Integer; begin result := -1; @@ -588,43 +599,17 @@ begin 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; - if imgfmt = 'gif' then - begin - meta := TMetadata.Create(); - gf := TGIFFileFormat.Create(meta); - gf.LoadAnimated := true; - il := gf; - end - else if imgfmt = 'png' then - begin - meta := TMetadata.Create(); - pf := TPNGFileFormat.Create(meta); - pf.LoadAnimated := true; - il := pf; - end; - if il <> nil then - begin - if not il.LoadFromMemory(TextureWAD, ResLength, ia) then - begin - e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING); - exit; - end; - end - else if LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then - begin - if length(ia) > 1 then - begin - for f := 1 to High(ia) do FreeImage(ia[f]); - SetLength(ia, 1); - end; - end - else + } + 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; @@ -643,36 +628,38 @@ begin _framecount := length(ia); _speed := 1; _backanimation := false; - if meta <> nil then + frdelay := -1; + frloop := -666; + if GlobalMetadata.HasMetaItem(SMetaFrameDelay) then begin - if meta.HasMetaItem(SMetaFrameDelay) then - begin - //writeln(' frame delay: ', meta.MetaItems[SMetaFrameDelay]); - try - f := meta.MetaItems[SMetaFrameDelay]; - if f < 0 then f := 0; - // rounding ;-) - c := f mod 27; - if c < 13 then c := 0 else c := 1; - f := (f div 27)+c; - if f < 1 then f := 1 else if f > 255 then f := 255; - _speed := f; - except - end; + //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; - if meta.HasMetaItem(SMetaAnimationLoops) then - begin - //writeln(' frame loop : ', meta.MetaItems[SMetaAnimationLoops]); - try - f := meta.MetaItems[SMetaAnimationLoops]; - if f <> 0 then _backanimation := true; - 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); - //e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d), %dx%d', [RecName, length(ia), _speed, _width, _height]), MSG_NOTIFY); + 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îçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê @@ -694,8 +681,6 @@ begin end; finally for f := 0 to High(ia) do FreeImage(ia[f]); - il.Free(); - //???meta.Free(); WAD.Free(); cfg.Free(); if TextureWAD <> nil then FreeMem(TextureWAD); @@ -922,9 +907,10 @@ var DoorPanel: Integer; ShotPanel: Integer; end; - FileName, mapResName, s, TexName: String; - Data: Pointer; - Len: Integer; + FileName, mapResName, s, TexName, ScrStr: String; + Data, ScrText: Pointer; + ScrEnd: PByte; + Len, ScrLen: Integer; ok, isAnim, trigRef: Boolean; CurTex, ntn: Integer; begin @@ -955,6 +941,19 @@ begin WAD.Free(); Exit; end; + + // try to load the map script + g_Scripts_Reset(RESET_MAP); + ScrText := nil; + ScrLen := 0; + if WAD.GetResource('SCRIPTS/'+mapResName, ScrText, ScrLen) then + begin + g_Console_Add('SCRIPT: Found script for this map. Loading...'); + SetString(ScrStr, ScrText, ScrLen); + g_Scripts_Load(ScrStr); + FreeMem(ScrText); + end; + WAD.Free(); // Çàãðóçêà êàðòû: