X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=9cc29e34dfd3e2e0db4e340896bd3d32d1b07e0d;hb=6dca9a5144a2784e929d75aeeb6326d4625257b7;hp=7babdd636e6046470ad45153e0ad8b6436fed789;hpb=83dba8e8957923e6a8f6541d7935345a59cf5bde;p=d2df-sdl.git diff --git a/src/game/g_map.pas b/src/game/g_map.pas index 7babdd6..9cc29e3 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; @@ -40,7 +55,6 @@ 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; @@ -67,6 +81,8 @@ 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); @@ -118,7 +134,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; @@ -127,7 +143,14 @@ const MUSIC_SIGNATURE = $4953554D; // 'MUSI' FLAG_SIGNATURE = $47414C46; // 'FLAG' +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; @@ -347,6 +370,11 @@ begin 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; @@ -892,9 +920,9 @@ var DoorPanel: Integer; ShotPanel: Integer; end; - FileName, mapResName, s, TexName: String; - Data: Pointer; - Len: Integer; + FileName, mapResName, s, TexName, ScrStr: String; + Data, ScrText: Pointer; + Len, ScrLen: Integer; ok, isAnim, trigRef: Boolean; CurTex, ntn: Integer; begin @@ -925,6 +953,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(); // Çàãðóçêà êàðòû: @@ -1557,6 +1598,8 @@ begin gDoorMap := nil; gLiftMap := nil; + + PanelByID := nil; end; procedure g_Map_Update(); @@ -2272,4 +2315,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.