diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index bd2b4508903eba80ee82a6956af853c201594878..00f39a188463600e838906f1726e382dbf102801 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
function g_Map_GetMapInfo(Res: String): TMapInfo;
function g_Map_GetMapsList(WADName: String): SArray;
function g_Map_Exist(Res: String): Boolean;
-procedure g_Map_Free();
+procedure g_Map_Free(freeTextures: Boolean=true);
procedure g_Map_Update();
+function g_Map_PanelByGUID (aguid: Integer): TPanel; inline;
+
procedure g_Map_DrawPanels (PanelType: Word); // unaccelerated
procedure g_Map_CollectDrawPanels (x0, y0, wdt, hgt: Integer);
function g_Map_CollidePanel(X, Y: Integer; Width, Height: Word;
PanelType: Word; b1x3: Boolean=false): Boolean;
function g_Map_CollideLiquid_Texture(X, Y: Integer; Width, Height: Word): DWORD;
-procedure g_Map_EnableWall(ID: DWORD);
-procedure g_Map_DisableWall(ID: DWORD);
-procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0);
-procedure g_Map_SetLift(ID: DWORD; t: Integer);
+
+procedure g_Map_EnableWallGUID (pguid: Integer);
+procedure g_Map_DisableWallGUID (pguid: Integer);
+procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer);
+
+// HACK!!!
+procedure g_Map_EnableWall_XXX (ID: DWORD);
+procedure g_Map_DisableWall_XXX (ID: DWORD);
+procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer);
+
+procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
+
procedure g_Map_ReAdd_DieTriggers();
function g_Map_IsSpecialTexture(Texture: String): Boolean;
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);
PANEL_FORE
*)
// sorted by draw priority
- GridTagBack = 1 shl 0;
- GridTagStep = 1 shl 1;
- GridTagWall = 1 shl 2;
- GridTagDoor = 1 shl 3;
- GridTagAcid1 = 1 shl 4;
- GridTagAcid2 = 1 shl 5;
- GridTagWater = 1 shl 6;
- GridTagFore = 1 shl 7;
+ GridTagBack = 1 shl 0; // gRenderBackgrounds
+ GridTagStep = 1 shl 1; // gSteps
+ GridTagWall = 1 shl 2; // gWalls
+ GridTagDoor = 1 shl 3; // gWalls
+ GridTagAcid1 = 1 shl 4; // gAcid1
+ GridTagAcid2 = 1 shl 5; // gAcid2
+ GridTagWater = 1 shl 6; // gWater
+ GridTagFore = 1 shl 7; // gRenderForegrounds
// the following are invisible
- GridTagLift = 1 shl 8;
- GridTagBlockMon = 1 shl 9;
+ GridTagLift = 1 shl 8; // gLifts
+ GridTagBlockMon = 1 shl 9; // gBlockMon
GridDrawableMask = (GridTagBack or GridTagStep or GridTagWall or GridTagDoor or GridTagAcid1 or GridTagAcid2 or GridTagWater or GridTagFore);
gWADHash: TMD5Digest;
BackID: DWORD = DWORD(-1);
gExternalResources: TStringList;
+ gMovingWallIds: array of Integer = nil;
gdbg_map_use_accel_render: Boolean = true;
gdbg_map_use_accel_coldet: Boolean = true;
gDrawPanelList: TBinaryHeapObj = nil; // binary heap of all walls we have to render, populated by `g_Map_CollectDrawPanels()`
gCurrentMap: TDynRecord = nil;
+ gCurrentMapFileName: AnsiString = ''; // so we can skip texture reloading
function panelTypeToTag (panelType: Word): Integer; // returns GridTagXXX
implementation
uses
- g_main, e_log, SysUtils, g_items, g_gfx, g_console,
+ e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console,
GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
g_options, g_triggers, g_player,
Math, g_monsters, g_saveload, g_language, g_netmsg,
FLAG_SIGNATURE = $47414C46; // 'FLAG'
+{
+type
+ THashIntPanel = specialize THashBase<Integer, TPanel>;
+
+function hashNewIntPanel (): THashIntPanel;
+begin
+ result := THashIntPanel.Create(hiihash, hiiequ);
+end;
+}
+
+
+var
+ //panByGUID: THashIntPanel = nil;
+ panByGUID: array of TPanel = nil;
+ //panLastGUID: Integer = 0;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function g_Map_PanelByGUID (aguid: Integer): TPanel; inline;
+begin
+ //if (panByGUID = nil) or (not panByGUID.get(aguid, result)) then result := nil;
+ if (aguid >= 0) and (aguid < Length(panByGUID)) then result := panByGUID[aguid] else result := nil;
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
var
dfmapdef: TDynMapDef = nil;
end;
+// ////////////////////////////////////////////////////////////////////////// //
function g_Map_ParseMap (data: Pointer; dataLen: Integer): TDynRecord;
var
wst: TSFSMemoryChunkStream = nil;
end;
+// ////////////////////////////////////////////////////////////////////////// //
var
NNF_PureName: String; // Èìÿ òåêñòóðû áåç öèôð â êîíöå
NNF_FirstNum: Integer; // ×èñëî ó íà÷àëüíîé òåêñòóðû
end;
+// ////////////////////////////////////////////////////////////////////////// //
function panelTypeToTag (panelType: Word): Integer;
begin
case panelType of
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;
+ Textures: TLevelTextureArray = nil;
+ TextNameHash: THashStrInt = nil; // key: texture name; value: index in `Textures`
+ BadTextNameHash: THashStrInt = nil; // set; so we won't spam with non-existing texture messages
+ RespawnPoints: array of TRespawnPoint;
+ FlagPoints: array[FLAG_RED..FLAG_BLUE] of PFlagPoint;
//DOMFlagPoints: Array of TFlagPoint;
var
len: Integer;
panels: ^TPanelArray;
+ pan: TPanel;
+ pguid: Integer;
begin
Result := -1;
case PanelRec.PanelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR:
- panels := @gWalls;
- PANEL_BACK:
- panels := @gRenderBackgrounds;
- PANEL_FORE:
- panels := @gRenderForegrounds;
- PANEL_WATER:
- panels := @gWater;
- PANEL_ACID1:
- panels := @gAcid1;
- PANEL_ACID2:
- panels := @gAcid2;
- PANEL_STEP:
- panels := @gSteps;
- PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT:
- panels := @gLifts;
- PANEL_BLOCKMON:
- panels := @gBlockMon;
- else
- Exit;
+ PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: panels := @gWalls;
+ PANEL_BACK: panels := @gRenderBackgrounds;
+ PANEL_FORE: panels := @gRenderForegrounds;
+ PANEL_WATER: panels := @gWater;
+ PANEL_ACID1: panels := @gAcid1;
+ PANEL_ACID2: panels := @gAcid2;
+ PANEL_STEP: panels := @gSteps;
+ PANEL_LIFTUP, PANEL_LIFTDOWN, PANEL_LIFTLEFT, PANEL_LIFTRIGHT: panels := @gLifts;
+ PANEL_BLOCKMON: panels := @gBlockMon;
+ else exit;
end;
len := Length(panels^);
- SetLength(panels^, len + 1);
-
- panels^[len] := TPanel.Create(PanelRec, AddTextures, CurTex, Textures);
- panels^[len].arrIdx := len;
- panels^[len].proxyId := -1;
- panels^[len].tag := panelTypeToTag(PanelRec.PanelType);
- if sav then
- panels^[len].SaveIt := True;
-
- Result := len;
-
- len := Length(PanelByID);
- SetLength(PanelByID, len + 1);
- PanelByID[len].PWhere := panels;
- PanelByID[len].PArrID := Result;
+ SetLength(panels^, len+1);
+
+ //Inc(panLastGUID);
+ pguid := Length(panByGUID);
+ SetLength(panByGUID, pguid+1); //FIXME!
+ pan := TPanel.Create(PanelRec, AddTextures, CurTex, Textures, pguid);
+ panels^[len] := pan;
+ pan.arrIdx := len;
+ pan.proxyId := -1;
+ pan.tag := panelTypeToTag(PanelRec.PanelType);
+ if sav then pan.SaveIt := True;
+
+ PanelRec.user['panel_guid'] := pan.guid;
+ //panByGUID.put(pan.guid, pan);
+
+ result := len;
end;
+
function CreateNullTexture(RecName: String): Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then exit; // i found her!
+
SetLength(Textures, Length(Textures)+1);
result := High(Textures);
Anim := False;
TextureID := LongWord(TEXTURE_NONE);
end;
+
+ TextNameHash.put(RecName, result);
end;
-function CreateTexture(RecName: String; Map: string; log: Boolean): Integer;
+
+function CreateTexture(RecName: AnsiString; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
TextureData: Pointer;
- WADName, txname: String;
+ WADName: String;
a, ResLength: Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then
+ begin
+ // i found her!
+ //e_LogWritefln('texture ''%s'' already loaded', [RecName]);
+ exit;
+ end;
+
Result := -1;
+ if (BadTextNameHash <> nil) and BadTextNameHash.has(RecName) then exit; // don't do it again and again
+
+ {
if Textures <> nil then
+ begin
for a := 0 to High(Textures) do
- if Textures[a].TextureName = RecName then
+ begin
+ if (Textures[a].TextureName = RecName) then
begin // Òåêñòóðà ñ òàêèì èìåíåì óæå åñòü
+ e_LogWritefln('texture ''%s'' already loaded', [RecName]);
Result := a;
Exit;
end;
+ end;
+ end;
+ }
-// Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà):
+ // Òåêñòóðû ñî ñïåöèàëüíûìè èìåíàìè (âîäà, ëàâà, êèñëîòà):
if (RecName = TEXTURE_NAME_WATER) or
(RecName = TEXTURE_NAME_ACID1) or
(RecName = TEXTURE_NAME_ACID2) then
with Textures[High(Textures)] do
begin
TextureName := RecName;
-
- if TextureName = TEXTURE_NAME_WATER then
- TextureID := LongWord(TEXTURE_SPECIAL_WATER)
- else
- if TextureName = TEXTURE_NAME_ACID1 then
- TextureID := LongWord(TEXTURE_SPECIAL_ACID1)
- else
- if TextureName = TEXTURE_NAME_ACID2 then
- TextureID := LongWord(TEXTURE_SPECIAL_ACID2);
+ if (TextureName = TEXTURE_NAME_WATER) then TextureID := LongWord(TEXTURE_SPECIAL_WATER)
+ else if (TextureName = TEXTURE_NAME_ACID1) then TextureID := LongWord(TEXTURE_SPECIAL_ACID1)
+ else if (TextureName = TEXTURE_NAME_ACID2) then TextureID := LongWord(TEXTURE_SPECIAL_ACID2);
Anim := False;
end;
result := High(Textures);
+ TextNameHash.put(RecName, result);
Exit;
end;
-// Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
+ // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
- if WADName <> '' then
- WADName := GameDir+'/wads/'+WADName
- else
- WADName := Map;
+ if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map;
WAD.ReadFile(WADName);
- txname := RecName;
+ //txname := RecName;
{
if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
begin
end;
}
- if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
+ if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength, log) then
+ begin
+ SetLength(Textures, Length(Textures)+1);
+ if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
begin
- SetLength(Textures, Length(Textures)+1);
- if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
- Exit;
- e_GetTextureSize(Textures[High(Textures)].TextureID,
- @Textures[High(Textures)].Width,
- @Textures[High(Textures)].Height);
- FreeMem(TextureData);
- Textures[High(Textures)].TextureName := {RecName}txname;
- Textures[High(Textures)].Anim := False;
-
- result := High(Textures);
- end
+ SetLength(Textures, Length(Textures)-1);
+ Exit;
+ end;
+ e_GetTextureSize(Textures[High(Textures)].TextureID, @Textures[High(Textures)].Width, @Textures[High(Textures)].Height);
+ FreeMem(TextureData);
+ Textures[High(Textures)].TextureName := RecName;
+ Textures[High(Textures)].Anim := False;
+
+ result := High(Textures);
+ TextNameHash.put(RecName, result);
+ end
else // Íåò òàêîãî ðåóñðñà â WAD'å
begin
- //e_WriteLog(Format('SHIT! Error loading texture %s : %s : %s', [RecName, txname, g_ExtractFilePathName(RecName)]), MSG_WARNING);
- if log then
- begin
- e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
- //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
- end;
+ //e_WriteLog(Format('SHIT! Error loading texture %s : %s', [RecName, g_ExtractFilePathName(RecName)]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, a)) then
+ begin
+ e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
WAD.Free();
end;
+
function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
var
WAD: TWADFile;
ia: TDynImageDataArray = nil;
f, c, frdelay, frloop: Integer;
begin
+ RecName := toLowerCase1251(RecName);
+ if (TextNameHash = nil) then TextNameHash := hashNewStrInt();
+ if TextNameHash.get(RecName, result) then
+ begin
+ // i found her!
+ //e_LogWritefln('animated texture ''%s'' already loaded', [RecName]);
+ exit;
+ end;
+
result := -1;
- //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY);
+ //e_LogWritefln('*** Loading animated texture "%s"', [RecName]);
+
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if BadTextNameHash.get(RecName, f) then
+ begin
+ //e_WriteLog(Format('no animation texture %s (don''t worry)', [RecName]), MSG_NOTIFY);
+ exit;
+ end;
// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
WADName := g_ExtractWadName(RecName);
WAD := TWADFile.Create();
try
- if WADName <> '' then
- WADName := GameDir+'/wads/'+WADName
- else
- WADName := Map;
+ if WADName <> '' then WADName := GameDir+'/wads/'+WADName else WADName := Map;
WAD.ReadFile(WADName);
- if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then
+ if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength, log) then
begin
- if log then
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
begin
e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
//e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
end;
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if ResLength < 6 then
begin
e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if not WAD.ReadMemory(TextureWAD, ResLength) then
begin
e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then
begin
e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if TextureResource = '' then
begin
e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
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);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
FramesCount := _framecount;
Speed := _speed;
result := High(Textures);
+ TextNameHash.put(RecName, result);
end
else
begin
- if log then e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
+ begin
+ e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
end;
end
if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
begin
e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
if length(ia) = 0 then
begin
e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING);
+ BadTextNameHash.put(RecName, -1);
exit;
end;
Textures[High(Textures)].FramesCount := length(ia);
Textures[High(Textures)].Speed := _speed;
result := High(Textures);
+ TextNameHash.put(RecName, result);
//writeln(' CREATED!');
end
else
begin
- if log then e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+ if (BadTextNameHash = nil) then BadTextNameHash := hashNewStrInt();
+ if log and (not BadTextNameHash.get(RecName, f)) then
+ begin
+ e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+ end;
+ BadTextNameHash.put(RecName, -1);
end;
end;
finally
for f := 0 to High(ia) do FreeImage(ia[f]);
WAD.Free();
cfg.Free();
- if TextureWAD <> nil then FreeMem(TextureWAD);
- if TextData <> nil then FreeMem(TextData);
- if TextureData <> nil then FreeMem(TextureData);
+ if (TextureWAD <> nil) then FreeMem(TextureWAD);
+ if (TextData <> nil) then FreeMem(TextData);
+ if (TextureData <> nil) then FreeMem(TextureData);
end;
end;
Height := Trigger.Height;
Enabled := Trigger.Enabled;
//TexturePanel := Trigger.TexturePanel;
- TexturePanel := atpanid;
+ TexturePanelGUID := atpanid;
TexturePanelType := fTexturePanel1Type;
ShotPanelType := fTexturePanel2Type;
TriggerType := Trigger.TriggerType;
ActivateType := Trigger.ActivateType;
Keys := Trigger.Keys;
- trigPanelId := atrigpanid;
+ trigPanelGUID := atrigpanid;
//trigShotPanelId := ashotpanid;
//Data.Default := Trigger.DATA;
if (Trigger.trigRec = nil) then
LiftPanelIdx: Integer;
DoorPanelIdx: Integer;
ShotPanelIdx: Integer;
+ MPlatPanelIdx: Integer;
trigrec: TDynRecord;
texPan: TDynRecord;
liftPan: TDynRecord;
doorPan: TDynRecord;
shotPan: TDynRecord;
+ mplatPan: TDynRecord;
end;
var
WAD: TWADFile;
pttit: PTRec;
pannum, trignum, cnt, tgpid: Integer;
stt: UInt64;
+ moveSpeed{, moveStart, moveEnd}: TDFPoint;
+ //moveActive: Boolean;
begin
mapGrid.Free();
mapGrid := nil;
gCurrentMap.Free();
gCurrentMap := nil;
+ //panByGUID.Free();
+ //panByGUID := hashNewIntPanel();
+ //panLastGUID := 0;
+ panByGUID := nil;
+
Result := False;
gMapInfo.Map := Res;
TriggersTable := nil;
pttit.liftPan := nil;
pttit.doorPan := nil;
pttit.shotPan := nil;
+ pttit.mplatPan := nil;
pttit.texPanIdx := -1;
pttit.LiftPanelIdx := -1;
pttit.DoorPanelIdx := -1;
pttit.ShotPanelIdx := -1;
+ pttit.MPlatPanelIdx := -1;
// Ëèôòû
if rec.TriggerType in [TRIGGER_LIFTUP, TRIGGER_LIFTDOWN, TRIGGER_LIFT] then
begin
begin
pttit.shotPan := mapReader.panel[rec.trigRec.tgShotPanelID];
end;
+ //
+ if rec.TriggerType in [TRIGGER_PRESS, TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF] then
+ begin
+ pttit.mplatPan := mapReader.panel[rec.trigRec.tgPanelID];
+ end;
+
+ if (pttit.texPan <> nil) then pttit.texPan.userPanelTrigRef := true;
+ if (pttit.liftPan <> nil) then pttit.liftPan.userPanelTrigRef := true;
+ if (pttit.doorPan <> nil) then pttit.doorPan.userPanelTrigRef := true;
+ if (pttit.shotPan <> nil) then pttit.shotPan.userPanelTrigRef := true;
+ if (pttit.mplatPan <> nil) then pttit.mplatPan.userPanelTrigRef := true;
g_Game_StepLoading();
end;
for rec in panels do
begin
Inc(pannum);
+ //e_LogWritefln('PANSTART: pannum=%s', [pannum]);
texrec := nil;
SetLength(AddTextures, 0);
trigRef := False;
ok := false;
if (TriggersTable <> nil) and (mapTextureList <> nil) then
begin
+ {
for b := 0 to High(TriggersTable) do
begin
if (TriggersTable[b].texPan = rec) or (TriggersTable[b].shotPan = rec) then
break;
end;
end;
+ }
+ if rec.userPanelTrigRef then
+ begin
+ // e_LogWritefln('trigref for panel %s', [pannum]);
+ trigRef := True;
+ ok := True;
+ end;
end;
end;
begin
// Íà÷àëüíàÿ - àíèìèðîâàííàÿ, èùåì àíèìèðîâàííóþ
isAnim := True;
+ //e_LogWritefln('000: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('001: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
if not ok then
begin
// Íåò àíèìèðîâàííîé, èùåì îáû÷íóþ
isAnim := False;
+ //e_LogWritefln('002: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
ok := CreateTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('003: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
end;
end
else
begin
// Íà÷àëüíàÿ - îáû÷íàÿ, èùåì îáû÷íóþ
isAnim := False;
+ //e_LogWritefln('004: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
ok := CreateTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('005: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
if not ok then
begin
// Íåò îáû÷íîé, èùåì àíèìèðîâàííóþ
isAnim := True;
+ //e_LogWritefln('006: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
ok := CreateAnimTexture(TexName, FileName, False) >= 0;
+ //e_LogWritefln('007: pannum=%s; TexName=[%s]; FileName=[%s]', [pannum, TexName, FileName]);
end;
end;
// Îíà ñóùåñòâóåò. Çàíîñèì åå ID â ñïèñîê ïàíåëè
if ok then
begin
+ {
for c := 0 to High(Textures) do
begin
if (Textures[c].TextureName = TexName) then
break;
end;
end;
+ }
+ if (TextNameHash <> nil) and TextNameHash.get(toLowerCase1251(TexName), c) then
+ begin
+ SetLength(AddTextures, Length(AddTextures)+1);
+ AddTextures[High(AddTextures)].Texture := c;
+ AddTextures[High(AddTextures)].Anim := isAnim;
+ end;
end;
end
else
//e_WriteLog(Format('panel #%d: TextureNum=%d; ht=%d; ht1=%d; atl=%d', [a, panels[a].TextureNum, High(mapTextureList), High(Textures), High(AddTextures)]), MSG_NOTIFY);
+ //e_LogWritefln('PANADD: pannum=%s', [pannum]);
+
// Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð
PanelID := CreatePanel(rec, AddTextures, CurTex, trigRef);
//e_LogWritefln('panel #%s of type %s got id #%s', [pannum, rec.PanelType, PanelID]);
// set 'gamePanelId' field to panel id
- rec.gamePanelId := PanelID; // remember game panel id, we'll fix triggers later
+ rec.userPanelId := PanelID; // remember game panel id, we'll fix triggers later
+
+ // setup lifts
+ moveSpeed := rec.moveSpeed;
+ //moveStart := rec.moveStart;
+ //moveEnd := rec.moveEnd;
+ //moveActive := rec['move_active'].varvalue;
+ if not moveSpeed.isZero then
+ begin
+ SetLength(gMovingWallIds, Length(gMovingWallIds)+1);
+ gMovingWallIds[High(gMovingWallIds)] := PanelID;
+ //e_LogWritefln('found moving panel ''%s'' (idx=%s; id=%s)', [rec.id, pannum, PanelID]);
+ end;
+
+ //e_LogWritefln('PANEND: pannum=%s', [pannum]);
g_Game_StepLoading();
end;
// ×èíèì ID'û ïàíåëåé, êîòîðûå èñïîëüçóþòñÿ â òðèããåðàõ
for b := 0 to High(TriggersTable) do
begin
- if (TriggersTable[b].texPan <> nil) then TriggersTable[b].texPanIdx := TriggersTable[b].texPan.gamePanelId;
- if (TriggersTable[b].liftPan <> nil) then TriggersTable[b].LiftPanelIdx := TriggersTable[b].liftPan.gamePanelId;
- if (TriggersTable[b].doorPan <> nil) then TriggersTable[b].DoorPanelIdx := TriggersTable[b].doorPan.gamePanelId;
- if (TriggersTable[b].shotPan <> nil) then TriggersTable[b].ShotPanelIdx := TriggersTable[b].shotPan.gamePanelId;
+ if (TriggersTable[b].texPan <> nil) then TriggersTable[b].texPanIdx := TriggersTable[b].texPan.userPanelId;
+ if (TriggersTable[b].liftPan <> nil) then TriggersTable[b].LiftPanelIdx := TriggersTable[b].liftPan.userPanelId;
+ if (TriggersTable[b].doorPan <> nil) then TriggersTable[b].DoorPanelIdx := TriggersTable[b].doorPan.userPanelId;
+ if (TriggersTable[b].shotPan <> nil) then TriggersTable[b].ShotPanelIdx := TriggersTable[b].shotPan.userPanelId;
+ if (TriggersTable[b].mplatPan <> nil) then TriggersTable[b].MPlatPanelIdx := TriggersTable[b].mplatPan.userPanelId;
end;
// create map grid, init other grids (for monsters, for example)
if (TriggersTable[trignum].LiftPanelIdx <> -1) then tgpid := TriggersTable[trignum].LiftPanelIdx
else if (TriggersTable[trignum].DoorPanelIdx <> -1) then tgpid := TriggersTable[trignum].DoorPanelIdx
else if (TriggersTable[trignum].ShotPanelIdx <> -1) then tgpid := TriggersTable[trignum].ShotPanelIdx
+ else if (TriggersTable[trignum].MPlatPanelIdx <> -1) then tgpid := TriggersTable[trignum].MPlatPanelIdx
else tgpid := -1;
//e_LogWritefln('creating trigger #%s; texpantype=%s; shotpantype=%s (%d,%d)', [trignum, b, c, TriggersTable[trignum].texPanIdx, TriggersTable[trignum].ShotPanelIdx]);
CreateTrigger(trignum, rec, TriggersTable[trignum].texPanIdx, tgpid, Word(b), Word(c));
end;
gCurrentMap := mapReader; // this will be our current map now
+ gCurrentMapFileName := Res;
mapReader := nil;
// Çàãðóçêà íåáà
finally
sfsGCEnable(); // enable releasing unused volumes
mapReader.Free();
+ e_ClearInputBuffer(); // why not?
end;
e_WriteLog('Done loading map.', MSG_NOTIFY);
WAD.Free();
- {
- MapReader := TMapReader_1.Create();
- if not MapReader.LoadMap(Data) then
- begin
- g_Console_Add(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Res]), True);
- ZeroMemory(@Header, SizeOf(Header));
- Result.Name := _lc[I_GAME_ERROR_MAP_SELECT];
- Result.Description := _lc[I_GAME_ERROR_MAP_SELECT];
- end
- else
- begin
- Header := MapReader.GetMapHeader();
- Result.Name := Header.MapName;
- Result.Description := Header.MapDescription;
- end;
- }
try
mapReader := g_Map_ParseMap(Data, Len);
except
end;
FreeMem(Data);
- //MapReader.Free();
-
- //if (mapReader <> nil) then Header := GetMapHeader(mapReader) else FillChar(Header, sizeof(Header), 0);
- //MapReader.Free();
if (mapReader.Width > 0) and (mapReader.Height > 0) then
begin
end;
end;
-procedure g_Map_Free();
+procedure g_Map_Free(freeTextures: Boolean=true);
var
a: Integer;
//gDOMFlags := nil;
- if Textures <> nil then
+ if (Length(gCurrentMapFileName) <> 0) then
begin
- for a := 0 to High(Textures) do
- if not g_Map_IsSpecialTexture(Textures[a].TextureName) then
- if Textures[a].Anim then
- g_Frames_DeleteByID(Textures[a].FramesID)
- else
- if Textures[a].TextureID <> LongWord(TEXTURE_NONE) then
- e_DeleteTexture(Textures[a].TextureID);
-
- Textures := nil;
+ e_LogWritefln('g_Map_Free: previous map was ''%s''...', [gCurrentMapFileName]);
+ end
+ else
+ begin
+ e_LogWritefln('g_Map_Free: no previous map.', []);
+ end;
+ if freeTextures then
+ begin
+ e_LogWritefln('g_Map_Free: clearing textures...', []);
+ if (Textures <> nil) then
+ begin
+ for a := 0 to High(Textures) do
+ begin
+ if not g_Map_IsSpecialTexture(Textures[a].TextureName) then
+ begin
+ if Textures[a].Anim then
+ begin
+ g_Frames_DeleteByID(Textures[a].FramesID)
+ end
+ else
+ begin
+ if (Textures[a].TextureID <> LongWord(TEXTURE_NONE)) then
+ begin
+ e_DeleteTexture(Textures[a].TextureID);
+ end;
+ end;
+ end;
+ end;
+ Textures := nil;
+ end;
+ TextNameHash.Free();
+ TextNameHash := nil;
+ BadTextNameHash.Free();
+ BadTextNameHash := nil;
end;
+ //panByGUID.Free();
+ //panByGUID := nil;
+ //panLastGUID := 0;
+ panByGUID := nil;
+
FreePanelArray(gWalls);
FreePanelArray(gRenderBackgrounds);
FreePanelArray(gRenderForegrounds);
FreePanelArray(gSteps);
FreePanelArray(gLifts);
FreePanelArray(gBlockMon);
+ gMovingWallIds := nil;
if BackID <> DWORD(-1) then
begin
gDoorMap := nil;
gLiftMap := nil;
-
- PanelByID := nil;
end;
procedure g_Map_Update();
i: Integer;
begin
- if panels <> nil then
- for i := 0 to High(panels) do
- panels[i].Update();
+ for i := 0 to High(panels) do panels[i].Update();
end;
begin
end;
-procedure g_Map_EnableWall(ID: DWORD);
+procedure g_Map_EnableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_EnableWallGUID(gWalls[ID].guid); end;
+procedure g_Map_DisableWall_XXX (ID: DWORD); begin if (ID < Length(gWalls)) then g_Map_DisableWallGUID(gWalls[ID].guid); end;
+procedure g_Map_SetLift_XXX (ID: DWORD; t: Integer); begin if (ID < Length(gLifts)) then g_Map_SetLiftGUID(gLifts[ID].guid, t); end;
+
+
+procedure g_Map_EnableWallGUID (pguid: Integer);
var
pan: TPanel;
begin
- pan := gWalls[ID];
+ //pan := gWalls[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
pan.Enabled := True;
- g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, True);
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, true);
mapGrid.proxyEnabled[pan.proxyId] := true;
//if (pan.proxyId >= 0) then mapGrid.proxyEnabled[pan.proxyId] := true
//else pan.proxyId := mapGrid.insertBody(pan, pan.X, pan.Y, pan.Width, pan.Height, GridTagDoor);
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(gWalls[ID].PanelType, ID);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState({gWalls[ID]}pan.PanelType, pguid);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
//e_WriteLog(Format('ENABLE: wall #%d(%d) enabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
{$ENDIF}
end;
-procedure g_Map_DisableWall(ID: DWORD);
+
+procedure g_Map_DisableWallGUID (pguid: Integer);
var
pan: TPanel;
begin
- pan := gWalls[ID];
+ //pan := gWalls[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
pan.Enabled := False;
- g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, False);
+ g_Mark(pan.X, pan.Y, pan.Width, pan.Height, MARK_DOOR, false);
mapGrid.proxyEnabled[pan.proxyId] := false;
//if (pan.proxyId >= 0) then begin mapGrid.removeBody(pan.proxyId); pan.proxyId := -1; end;
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, ID);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(pan.PanelType, pguid);
{$IFDEF MAP_DEBUG_ENABLED_FLAG}
//e_WriteLog(Format('DISABLE: wall #%d(%d) disabled (%d) (%d,%d)-(%d,%d)', [Integer(ID), Integer(pan.proxyId), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.x, pan.y, pan.width, pan.height]), MSG_NOTIFY);
{$ENDIF}
end;
-procedure g_Map_SwitchTexture(PanelType: Word; ID: DWORD; AnimLoop: Byte = 0);
+
+procedure g_Map_SwitchTextureGUID (PanelType: Word; pguid: Integer; AnimLoop: Byte = 0);
var
tp: TPanel;
begin
+ tp := g_Map_PanelByGUID(pguid);
+ if (tp = nil) then exit;
+ {
case PanelType of
- PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR:
- tp := gWalls[ID];
- PANEL_FORE:
- tp := gRenderForegrounds[ID];
- PANEL_BACK:
- tp := gRenderBackgrounds[ID];
- PANEL_WATER:
- tp := gWater[ID];
- PANEL_ACID1:
- tp := gAcid1[ID];
- PANEL_ACID2:
- tp := gAcid2[ID];
- PANEL_STEP:
- tp := gSteps[ID];
- else
- Exit;
+ PANEL_WALL, PANEL_OPENDOOR, PANEL_CLOSEDOOR: tp := gWalls[ID];
+ PANEL_FORE: tp := gRenderForegrounds[ID];
+ PANEL_BACK: tp := gRenderBackgrounds[ID];
+ PANEL_WATER: tp := gWater[ID];
+ PANEL_ACID1: tp := gAcid1[ID];
+ PANEL_ACID2: tp := gAcid2[ID];
+ PANEL_STEP: tp := gSteps[ID];
+ else exit;
end;
+ }
tp.NextTexture(AnimLoop);
- if g_Game_IsServer and g_Game_IsNet then
- MH_SEND_PanelTexture(PanelType, ID, AnimLoop);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelTexture(PanelType, pguid, AnimLoop);
end;
-procedure g_Map_SetLift(ID: DWORD; t: Integer);
+
+procedure g_Map_SetLiftGUID (pguid: Integer; t: Integer);
+var
+ pan: TPanel;
begin
- if gLifts[ID].LiftType = t then
- Exit;
+ //pan := gLifts[ID];
+ pan := g_Map_PanelByGUID(pguid);
+ if (pan = nil) then exit;
+ if not pan.isGLift then exit;
- with gLifts[ID] do
+ if ({gLifts[ID]}pan.LiftType = t) then exit; //!FIXME!TRIGANY!
+
+ with {gLifts[ID]} pan do
begin
LiftType := t;
- g_Mark(X, Y, Width, Height, MARK_LIFT, False);
+ g_Mark(X, Y, Width, Height, MARK_LIFT, false);
//TODO: make separate lift tags, and change tag here
- if LiftType = 0 then
- g_Mark(X, Y, Width, Height, MARK_LIFTUP, True)
- else if LiftType = 1 then
- g_Mark(X, Y, Width, Height, MARK_LIFTDOWN, True)
- else if LiftType = 2 then
- g_Mark(X, Y, Width, Height, MARK_LIFTLEFT, True)
- else if LiftType = 3 then
- g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT, True);
+ case LiftType of
+ 0: g_Mark(X, Y, Width, Height, MARK_LIFTUP);
+ 1: g_Mark(X, Y, Width, Height, MARK_LIFTDOWN);
+ 2: g_Mark(X, Y, Width, Height, MARK_LIFTLEFT);
+ 3: g_Mark(X, Y, Width, Height, MARK_LIFTRIGHT);
+ end;
- if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, ID);
+ if g_Game_IsServer and g_Game_IsNet then MH_SEND_PanelState(PanelType, pguid);
end;
end;
-function g_Map_GetPoint(PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
+
+function g_Map_GetPoint (PointType: Byte; var RespawnPoint: TRespawnPoint): Boolean;
var
a: Integer;
PointsArray: Array of TRespawnPoint;
i := 0;
while i < Length(panels) do
begin
- if panels[i].SaveIt then
+ if true{panels[i].SaveIt} then
begin
// ID ïàíåëè:
PAMem.WriteInt(i);
for i := 0 to Length(panels)-1 do
begin
- if panels[i].SaveIt then
+ if true{panels[i].SaveIt} then
begin
// ID ïàíåëè:
PAMem.ReadInt(id);
///// /////
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;
-
// trace liquid, stepping by `dx` and `dy`
// return last seen liquid coords, and `false` if we're started outside of the liquid